Continuing forparser for app_sdk
This commit is contained in:
@@ -285,7 +285,6 @@ const AngularWorkflow = (props) => {
|
||||
currentnode = currentnode[0]
|
||||
const outgoingEdges = currentnode.outgoers('edge')
|
||||
const incomingEdges = currentnode.incomers('edge')
|
||||
console.log("NODE: ", currentnode)
|
||||
|
||||
//currentnode.removeClass('success-highlight failure-highlight executing-highlight')
|
||||
switch (item.status) {
|
||||
@@ -668,6 +667,56 @@ const AngularWorkflow = (props) => {
|
||||
// // FIXME - handle this, as we can't have more than one of each :)
|
||||
// //setVersionedApps(newapps)
|
||||
//}
|
||||
|
||||
// Builtin actions that should ran in Worker and not apps
|
||||
const getExtraApps = () => {
|
||||
const data = [{
|
||||
name: "Filter",
|
||||
is_valid: true,
|
||||
id: "0ca8887e-b4af-4e3e-887c-87e9d3bc3d3e",
|
||||
link: "https://shuffler.io",
|
||||
app_version: "1.0.0",
|
||||
generated: true,
|
||||
downloaded: false,
|
||||
sharing: false,
|
||||
verified: false,
|
||||
tested: false,
|
||||
owner: "",
|
||||
private_id: "",
|
||||
description: "Filter",
|
||||
environment: "Shuffle",
|
||||
small_image: "",
|
||||
large_image: "",
|
||||
contact_info: {name: "", url: ""},
|
||||
authentication: {required: false, parameters: [],},
|
||||
actions: [{
|
||||
description: "Filter cases",
|
||||
id: "",
|
||||
name: "filter_cases",
|
||||
node_type: "action",
|
||||
environment: "Shuffle",
|
||||
sharing: false,
|
||||
private_id: "",
|
||||
app_id: "",
|
||||
authentication: null,
|
||||
tested: true,
|
||||
parameters: [{
|
||||
description: "",
|
||||
id: "",
|
||||
name: "Field to look for",
|
||||
example: "$testing_1.#.id",
|
||||
value: "",
|
||||
multiline: true,
|
||||
action_field: "",
|
||||
variant: "",
|
||||
required: true,
|
||||
schema: {type: "string"},
|
||||
}]
|
||||
}],
|
||||
}]
|
||||
|
||||
return data
|
||||
}
|
||||
|
||||
const getApps = () => {
|
||||
fetch(globalUrl+"/api/v1/workflows/apps", {
|
||||
@@ -688,9 +737,12 @@ const AngularWorkflow = (props) => {
|
||||
.then((responseJson) => {
|
||||
// FIXME - handle versions on left bar
|
||||
//handleAppVersioning(responseJson)
|
||||
setApps(responseJson)
|
||||
setFilteredApps(responseJson)
|
||||
})
|
||||
var tmpapps = []
|
||||
tmpapps = tmpapps.concat(getExtraApps())
|
||||
tmpapps = tmpapps.concat(responseJson)
|
||||
setApps(tmpapps)
|
||||
setFilteredApps(tmpapps)
|
||||
})
|
||||
.catch(error => {
|
||||
alert.error(error.toString())
|
||||
});
|
||||
@@ -780,6 +832,7 @@ const AngularWorkflow = (props) => {
|
||||
}
|
||||
|
||||
console.log("Selected: ", data.id)
|
||||
console.log(curaction)
|
||||
|
||||
setRequiresAuthentication(curapp.authentication.required)
|
||||
setSelectedApp(curapp)
|
||||
@@ -1848,7 +1901,7 @@ const AngularWorkflow = (props) => {
|
||||
authentication: [],
|
||||
}
|
||||
|
||||
console.log(newAppData)
|
||||
// const image = "url("+app.large_image+")"
|
||||
|
||||
// FIXME - find the cytoscape offset position
|
||||
// Can this be done with zoom calculations?
|
||||
@@ -2358,7 +2411,8 @@ const AngularWorkflow = (props) => {
|
||||
<b>{data.name}: </b>
|
||||
</div>
|
||||
<Tooltip color="primary" title="Static data" placement="top">
|
||||
<div style={{cursor: "pointer", color: staticcolor}} onClick={() => {
|
||||
<div style={{cursor: "pointer", color: staticcolor}} onClick={(e) => {
|
||||
e.preventDefault()
|
||||
changeActionParameterVariant("STATIC_VALUE", count)
|
||||
}}>
|
||||
<CreateIcon />
|
||||
@@ -2366,7 +2420,8 @@ const AngularWorkflow = (props) => {
|
||||
</Tooltip>
|
||||
|
|
||||
<Tooltip color="primary" title="Data from previous action" placement="top">
|
||||
<div style={{cursor: "pointer", color: actioncolor}} onClick={() => {
|
||||
<div style={{cursor: "pointer", color: actioncolor}} onClick={(e) => {
|
||||
e.preventDefault()
|
||||
changeActionParameterVariant("ACTION_RESULT", count)
|
||||
}}>
|
||||
<AppsIcon />
|
||||
@@ -2374,7 +2429,8 @@ const AngularWorkflow = (props) => {
|
||||
</Tooltip>
|
||||
|
|
||||
<Tooltip color="primary" title="Use local variable" placement="top">
|
||||
<div style={{cursor: "pointer", color: varcolor}} onClick={() => {
|
||||
<div style={{cursor: "pointer", color: varcolor}} onClick={(e) => {
|
||||
e.preventDefault()
|
||||
changeActionParameterVariant("WORKFLOW_VARIABLE", count)
|
||||
}}>
|
||||
<FavoriteBorderIcon />
|
||||
|
||||
+2
-2
@@ -38,12 +38,12 @@ import AlertTemplate from "react-alert-template-basic";
|
||||
import { positions, Provider } from "react-alert";
|
||||
|
||||
// Testing - localhost
|
||||
//const globalUrl = "http://192.168.3.6:5001"
|
||||
const globalUrl = "http://192.168.3.6:5001"
|
||||
//console.log("HOST: ", process.env)
|
||||
|
||||
|
||||
// Production - backend proxy forwarding in nginx
|
||||
const globalUrl = window.location.origin
|
||||
//const globalUrl = window.location.origin
|
||||
|
||||
const surfaceColor = "#27292D"
|
||||
const inputColor = "#383B40"
|
||||
|
||||
+8
-11
@@ -55,6 +55,11 @@ const Apps = (props) => {
|
||||
useEffect(() => {
|
||||
if (apps.length <= 0 && firstrequest) {
|
||||
document.title = "Shuffle - Apps"
|
||||
|
||||
if (!isLoggedIn && isLoaded) {
|
||||
window.location = "/login"
|
||||
}
|
||||
|
||||
setFirstrequest(false)
|
||||
getApps()
|
||||
}
|
||||
@@ -79,7 +84,7 @@ const Apps = (props) => {
|
||||
|
||||
const getApps = () => {
|
||||
fetch(globalUrl+"/api/v1/workflows/apps", {
|
||||
method: 'GET',
|
||||
method: 'GET',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Accept': 'application/json',
|
||||
@@ -93,7 +98,7 @@ const Apps = (props) => {
|
||||
|
||||
return response.json()
|
||||
})
|
||||
.then((responseJson) => {
|
||||
.then((responseJson) => {
|
||||
setApps(responseJson)
|
||||
setFilteredApps(responseJson)
|
||||
if (responseJson.length > 0) {
|
||||
@@ -452,15 +457,7 @@ const Apps = (props) => {
|
||||
</div>
|
||||
</div>
|
||||
:
|
||||
<div style={{width: "600px", margin: "auto", color: "white", paddingBottom: "50px"}}>
|
||||
<h2>Available integrations</h2>
|
||||
<Divider style={{marginBottom: "10px", height: "1px", width: "100%", backgroundColor: dividerColor}}/>
|
||||
{apps.map(data => {
|
||||
return (
|
||||
appPaper(data)
|
||||
)
|
||||
})}
|
||||
</div>
|
||||
null
|
||||
|
||||
// Gets the URL itself (hopefully this works in most cases?
|
||||
// Will then forward the data to an internal endpoint to validate the api
|
||||
|
||||
@@ -22,6 +22,7 @@ import PlayArrowIcon from '@material-ui/icons/PlayArrow';
|
||||
//import JSONPrettyMon from 'react-json-pretty/dist/monikai'
|
||||
import ReactJson from 'react-json-view'
|
||||
|
||||
import {Link} from 'react-router-dom';
|
||||
import { useAlert } from "react-alert";
|
||||
|
||||
import Dialog from '@material-ui/core/Dialog';
|
||||
@@ -398,13 +399,13 @@ const Workflows = (props) => {
|
||||
}
|
||||
}}>
|
||||
<Grid item style={{flex: "1", justifyContent: "center"}}>
|
||||
<a href={"/workflows/"+data.id}>
|
||||
<Link to={"/workflows/"+data.id}>
|
||||
<Tooltip color="primary" title="Edit workflow" placement="bottom">
|
||||
<Button style={{}} color="primary" variant="text" style={{marginRight: 10}} onClick={() => {}}>
|
||||
<EditIcon style={{marginRight: 10}}/> Edit
|
||||
</Button>
|
||||
</Tooltip>
|
||||
</a>
|
||||
</Link>
|
||||
<Tooltip color="primary" title="Execute workflow" placement="bottom">
|
||||
<Button style={{}} color="secondary" variant="text" onClick={() => executeWorkflow(data.id)}>
|
||||
<PlayArrowIcon />
|
||||
@@ -889,7 +890,7 @@ const Workflows = (props) => {
|
||||
</div>
|
||||
<div>
|
||||
<p>
|
||||
<b>Shuffle</b> is a flexible, easy to use, automation framework allowing users to integrate their services and devices to reduce the amount of manual labor required for those tasks. <a href="/docs/workflows" style={{textDecoration: "none", color: "#f85a3e"}}>Click here for more information.</a>
|
||||
<b>Shuffle</b> is a flexible, easy to use, automation framework allowing users to integrate their services and devices to reduce the amount of manual labor required for those tasks. <Link to="/docs/workflows" style={{textDecoration: "none", color: "#f85a3e"}}>Click here for more information.</Link>
|
||||
</p>
|
||||
</div>
|
||||
<div>
|
||||
|
||||
Reference in New Issue
Block a user