- {
+ {
setSelectedResult(data)
setCodeModalOpen(true)
}}>
@@ -6213,6 +6253,123 @@ const AngularWorkflow = (props) => {
}
+
+ const curapp = !codeModalOpen ? {} : apps.find(a => a.name === selectedResult.action.app_name && a.app_version === selectedResult.action.app_version)
+ const imgsize = 50
+ const statusColor = !codeModalOpen ? "red" : selectedResult.status === "FINISHED" || selectedResult.status === "SUCCESS" ? "green" : selectedResult.status === "ABORTED" || selectedResult.status === "FAILURE" ? "red" : "orange"
+ const validate = !codeModalOpen ? "" : validateJson(selectedResult.result.trim())
+
+ const codePopoutModal = !codeModalOpen ? null :
+
{
+ console.log("DRAGGING")
+ if (!dragging) {
+ setDragging(true)
+ }
+ }}
+ onStop={(e) => {
+ if (!dragging) {
+ console.log("Not dragging. Return!")
+ return
+ }
+
+ setDragging(false)
+
+ const newoffsetX = parseInt(dragPosition.x)-parseInt(e.layerX-e.offsetX)
+ const newoffsetY = parseInt(dragPosition.y)-parseInt(e.layerY-e.offsetY)
+ if ((newoffsetX <= 40 && newoffsetX >= -40) && (newoffsetY <= 40 && newoffsetY >= -40)) {
+ console.log("SKIP X & Y")
+ return
+ }
+
+ setDragPosition({
+ x: e.layerX-e.offsetX,
+ y: e.layerY-e.offsetY,
+ })
+ }}
+ position={dragPosition}
+ >
+
+
const newView = isLoggedIn ?
@@ -6637,87 +6794,7 @@ const AngularWorkflow = (props) => {
)
}
- const CodePopoutModal = (props) => {
- const {codeModalOpen, setCodeModalOpen, selectedResult} = props
- if (!codeModalOpen) {
- return null
- }
-
- const curapp = apps.find(a => a.name === selectedResult.action.app_name && a.app_version === selectedResult.action.app_version)
- const imgsize = 50
- const statusColor = selectedResult.status === "FINISHED" || selectedResult.status === "SUCCESS" ? "green" : selectedResult.status === "ABORTED" || selectedResult.status === "FAILURE" ? "red" : "orange"
- const validate = validateJson(selectedResult.result.trim())
-
- return (
-
-
-
- )
- }
+
// This whole part is redundant. Made it part of Arguments instead.
const authenticationModal = authenticationModalOpen ?
@@ -6746,15 +6823,13 @@ const AngularWorkflow = (props) => {
{executionVariableModal}
{conditionsModal}
{authenticationModal}
-
- {/*
+ {codePopoutModal}
- */}
:
diff --git a/frontend/src/views/Workflows.jsx b/frontend/src/views/Workflows.jsx
index 57379cad..c761f6a7 100644
--- a/frontend/src/views/Workflows.jsx
+++ b/frontend/src/views/Workflows.jsx
@@ -818,8 +818,6 @@ const Workflows = (props) => {
if (selectedExecution.result !== undefined && selectedExecution.result.length > 0) {
var showResult = selectedExecution.result.trim()
const validate = validateJson(showResult)
- console.log("VALID: ", validate)
-
lastresult = validate.valid ?