diff --git a/backend/build.sh b/backend/build.sh index 5679ae8b..bb1f4a28 100644 --- a/backend/build.sh +++ b/backend/build.sh @@ -4,6 +4,7 @@ docker rm shuffle-backend docker rmi frikky/shuffle:backend docker build . -t frikky/shuffle:backend +docker push frikky/shuffle:backend echo "Starting server" #docker run -it \ diff --git a/backend/go-app/main.go b/backend/go-app/main.go index ba9a5477..dc73b5c4 100644 --- a/backend/go-app/main.go +++ b/backend/go-app/main.go @@ -5248,12 +5248,9 @@ func handleSwaggerValidation(body []byte) (ParsedOpenApi, error) { body = swaggerdata } - //parsed := ParsedOpenApi{} - if !isJson { - //yaml.l - log.Printf("Parsing from YAML to json!") - body = swaggerdata - } + // Overwrite with new json data + _ = isJson + body = swaggerdata // Parsing it to swagger 3 parsed = ParsedOpenApi{ diff --git a/docker-compose.yml b/docker-compose.yml index e04cdbbe..569130f4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,7 +46,7 @@ services: - database orborus: #build: ./functions/onprem/orborus - image: frikky/shuffle:orborus + image: frikky/orborus:latest container_name: shuffle-orborus hostname: shuffle-orborus networks: diff --git a/frontend/run.sh b/frontend/run.sh index c0253440..819c0116 100755 --- a/frontend/run.sh +++ b/frontend/run.sh @@ -1,17 +1,17 @@ #!/bin/sh -docker stop frikky/shuffle:frontend -docker rm frikky/shuffle:frontend +docker stop shuffle-frontend +docker rm shuffle-frontend docker rmi frikky/shuffle:frontend echo "Running build for website" -sudo npm run build +#sudo npm run build docker build . -t frikky/shuffle:frontend echo "Starting server" # Rerun build locally for it to update :) -docker run -it \ - -p 3001:80 \ - -p 3002:443 \ - -v $(pwd)/build:/usr/share/nginx/html:ro \ - --rm \ - nginx +#docker run -it \ +# -p 3001:80 \ +# -p 3002:443 \ +# -v $(pwd)/build:/usr/share/nginx/html:ro \ +# --rm \ +# nginx diff --git a/frontend/src/AngularWorkflow.js b/frontend/src/AngularWorkflow.js index 5ad736b9..c963707b 100644 --- a/frontend/src/AngularWorkflow.js +++ b/frontend/src/AngularWorkflow.js @@ -3,7 +3,9 @@ import { useInterval } from 'react-powerhooks'; import uuid from "uuid"; +import {Link} from 'react-router-dom'; import TextField from '@material-ui/core/TextField'; +import Drawer from '@material-ui/core/Drawer'; import Button from '@material-ui/core/Button'; import Paper from '@material-ui/core/Paper'; import Grid from '@material-ui/core/Grid'; @@ -23,7 +25,11 @@ import Input from '@material-ui/core/Input'; import FormGroup from '@material-ui/core/FormGroup'; import FormControlLabel from '@material-ui/core/FormControlLabel'; import Checkbox from '@material-ui/core/Checkbox'; +import Breadcrumbs from '@material-ui/core/Breadcrumbs'; +import CircularProgress from '@material-ui/core/CircularProgress'; +import ReactJson from 'react-json-view' +import PolymerIcon from '@material-ui/icons/Polymer'; import CreateIcon from '@material-ui/icons/Create'; import PlayArrowIcon from '@material-ui/icons/PlayArrow'; import AspectRatioIcon from '@material-ui/icons/AspectRatio'; @@ -111,6 +117,7 @@ const AngularWorkflow = (props) => { const [workflowDone, setWorkflowDone] = React.useState(false) const [localFirstrequest, setLocalFirstrequest] = React.useState(true) const [requiresAuthentication, setRequiresAuthentication] = React.useState(true) + const [rightSideBarOpen, setRightSideBarOpen] = React.useState(false) const [variableAnchorEl, setVariableAnchorEl] = React.useState(null) @@ -148,6 +155,8 @@ const AngularWorkflow = (props) => { const [, setExecutingNodes] = React.useState([]) const [executionRunning, setExecutionRunning] = React.useState(false) + const [executionModalOpen, setExecutionModalOpen] = React.useState(true) + const [executionData, setExecutionData] = React.useState({}) const [lastSaved, setLastSaved] = React.useState(true) @@ -269,6 +278,11 @@ const AngularWorkflow = (props) => { //console.log(responseJson) // Loop nodes and find results // Update on every interval? idk + + if (JSON.stringify(responseJson) !== JSON.stringify(executionData)) { + console.log("Executiondata: ", responseJson) + setExecutionData(responseJson) + } if (responseJson.execution_id !== executionRequest.execution_id) { cy.elements().removeClass('success-highlight failure-highlight executing-highlight') return @@ -640,6 +654,8 @@ const AngularWorkflow = (props) => { "authorization": responseJson.authorization, }) setExecutingNodes([workflow.start]) + setExecutionData({}) + setExecutionModalOpen(true) start() }) .catch(error => { @@ -792,7 +808,8 @@ const AngularWorkflow = (props) => { //setSelectedTriggerIndex(-1) //setTriggerFolders([]) - //setLocalFirstrequest(true) + // Can be used for right side view + setRightSideBarOpen(false) console.timeEnd("UNSELECT") } @@ -2520,10 +2537,10 @@ const AngularWorkflow = (props) => { const appApiView = Object.getOwnPropertyNames(selectedAction).length > 0 && Object.getOwnPropertyNames(selectedApp).length > 0 ?
-
+

{selectedAction.app_name}

- What are apps? + What are apps?
: - +