diff --git a/docker-compose.yml b/docker-compose.yml
index 0ce198d8..834385e3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,8 @@
version: '3'
services:
frontend:
- #build: ./frontend
- image: ghcr.io/frikky/shuffle-frontend:0.8.46
+ build: ./frontend
+ image: ghcr.io/frikky/shuffle-frontend:0.8.48
container_name: shuffle-frontend
hostname: shuffle-frontend
ports:
@@ -16,7 +16,7 @@ services:
depends_on:
- backend
backend:
- build: ./backend
+ #build: ./backend
image: ghcr.io/frikky/shuffle-backend:0.8.46
container_name: shuffle-backend
hostname: ${BACKEND_HOSTNAME}
diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx
index c5df42a2..0c55816e 100644
--- a/frontend/src/views/AngularWorkflow.jsx
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -41,7 +41,11 @@ import NestedMenuItem from "material-ui-nested-menu-item";
import Fade from '@material-ui/core/Fade';
import ArrowUpwardIcon from '@material-ui/icons/ArrowUpward';
+import VisibilityIcon from '@material-ui/icons/Visibility';
+import DoneIcon from '@material-ui/icons/Done';
import CloseIcon from '@material-ui/icons/Close';
+import ErrorIcon from '@material-ui/icons/Error';
+import FindReplaceIcon from '@material-ui/icons/FindReplace';
import ArrowLeftIcon from '@material-ui/icons/ArrowLeft';
import CachedIcon from '@material-ui/icons/Cached';
import AddIcon from '@material-ui/icons/Add';
@@ -276,7 +280,7 @@ const AngularWorkflow = (props) => {
// FIXME: Sort this by time
setWorkflowExecutions(responseJson)
}
- alert.info("Refrshed executions")
+ alert.info("Loaded executions")
//setWorkflowExecutions(responseJson)
})
.catch(error => {
@@ -4524,7 +4528,7 @@ const AngularWorkflow = (props) => {
{condition.condition.value}
-
+
{condition.destination.value}
@@ -4558,7 +4562,7 @@ const AngularWorkflow = (props) => {
deleteCondition(index)
}} key={"Delete"}>{"Delete"}
@@ -6285,14 +6289,12 @@ const AngularWorkflow = (props) => {
const codePopoutModal = !codeModalOpen ? null :
{
- console.log("DRAGGING")
if (!dragging) {
setDragging(true)
}
}}
onStop={(e) => {
if (!dragging) {
- console.log("Not dragging. Return!")
return
}
@@ -6331,13 +6333,60 @@ const AngularWorkflow = (props) => {
},
}}
>
- {
- e.preventDefault()
- //console.log("CLICKING EXIT")
- setCodeModalOpen(false)
- }}>
-
-
+
+ {
+ e.preventDefault()
+ for (var key in workflowExecutions) {
+ const execution = workflowExecutions[key]
+ //console.log(execution.results[0])
+ const result = execution.results.find(data => data.status === "SUCCESS" && data.action.id === selectedResult.action.id)
+ if (result !== undefined) {
+ setSelectedResult(result)
+ break
+ }
+ }
+ }}>
+
+
+
+
+ {
+ e.preventDefault()
+ for (var key in workflowExecutions) {
+ const execution = workflowExecutions[key]
+ //console.log(execution.results[0])
+ const result = execution.results.find(data => data.action.id === selectedResult.action.id && data.status !== "SUCCESS" && data.status !== "SKIPPED" && data.status !== "WAITING")
+ if (result !== undefined) {
+ setSelectedResult(result)
+ break
+ }
+ }
+ }}>
+
+
+
+
+ {
+ e.preventDefault()
+ const executionIndex = workflowExecutions.findIndex(data => data.execution_id === selectedResult.execution_id)
+ if (executionIndex !== -1) {
+ setExecutionModalOpen(true)
+ setExecutionModalView(1)
+ setExecutionData(workflowExecutions[executionIndex])
+ }
+ }}>
+
+
+
+
+ {
+ e.preventDefault()
+ //console.log("CLICKING EXIT")
+ setCodeModalOpen(false)
+ }}>
+
+
+
{
//event.preventDefault()
}}>
@@ -6841,7 +6890,7 @@ const AngularWorkflow = (props) => {
id="copy_element_shuffle"
value={to_be_copied}
disabled={true}
- style={{height: 0, width: 0, margin: 0, padding: 0, zIndex: -10, position: "fixed",}}
+ style={{height: 0, width: 0, margin: 0, padding: 0, zIndex: "auto", position: "fixed",}}
/>
: