From e6ff93a9d3a74bf70027ac325aec0da9b0cd4b5c Mon Sep 17 00:00:00 2001 From: Lucio Lelii Date: Fri, 1 Aug 2025 14:37:23 +0200 Subject: [PATCH] added user interaction node --- .../definitions/InputNodeDefinition.java | 2 +- .../manager/model/steps/UserDefinedStep.java | 2 + src/test/resources/interactionFlow.json | 84 ++++++++++++++----- 3 files changed, 68 insertions(+), 20 deletions(-) diff --git a/src/main/java/it/cnr/isti/workflow/manager/entities/nodes/definitions/InputNodeDefinition.java b/src/main/java/it/cnr/isti/workflow/manager/entities/nodes/definitions/InputNodeDefinition.java index aa8b6f9..ddc1425 100644 --- a/src/main/java/it/cnr/isti/workflow/manager/entities/nodes/definitions/InputNodeDefinition.java +++ b/src/main/java/it/cnr/isti/workflow/manager/entities/nodes/definitions/InputNodeDefinition.java @@ -20,7 +20,7 @@ public class InputNodeDefinition extends SystemNodeDefinition { public static final String OUTPUT_NAME = "value"; - public static final String DEFAULT_VALUE = "output"; + public static final String DEFAULT_VALUE = "input"; @Builder public InputNodeDefinition(String name, IOType outputType, boolean simulable) { diff --git a/src/main/java/it/cnr/isti/workflow/manager/model/steps/UserDefinedStep.java b/src/main/java/it/cnr/isti/workflow/manager/model/steps/UserDefinedStep.java index c4f106f..c96395d 100644 --- a/src/main/java/it/cnr/isti/workflow/manager/model/steps/UserDefinedStep.java +++ b/src/main/java/it/cnr/isti/workflow/manager/model/steps/UserDefinedStep.java @@ -22,10 +22,12 @@ import it.cnr.isti.workflow.manager.model.types.IOType; import it.cnr.isti.workflow.manager.model.types.Translator; import lombok.Builder; import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NonNull; import lombok.ToString; @ToString +@Getter @EqualsAndHashCode(callSuper = true) @JsonTypeName("execution") public class UserDefinedStep extends ExecutionStep implements InputReadyListener, ExecutableStep { diff --git a/src/test/resources/interactionFlow.json b/src/test/resources/interactionFlow.json index 9b40c9c..9b6cfe3 100644 --- a/src/test/resources/interactionFlow.json +++ b/src/test/resources/interactionFlow.json @@ -4,27 +4,27 @@ "description": null, "nodes": [ { - "key": "0414f102-fa57-47a5-994d-575bee0443fa", + "key": "5f1c6535-364c-45e3-a984-6ea404c35ff3", "name": "newNode", "createdBy": null, "outputs": [ { - "key": "8dda93d6-7bc6-485e-8375-7c56ca676979", + "key": "b0108ffe-71d7-49c5-bde2-80b9b3b5a248", "type": "TEXT", "name": "output" } ], "inputs": [ { - "key": "57a64d4c-bbbf-4c56-a0d2-7a2b6de2da09", + "key": "1a25c345-71ab-4742-9809-b4197e83bf06", "type": "TEXT", "name": "input" } ], "color": "#A8E6CF", "position": { - "x": 325, - "y": 145 + "x": 550, + "y": 139 }, "parameters": { "action_description": "correct the phrase" @@ -60,12 +60,12 @@ "type": "Human Interaction" }, { - "key": "59d68aed-6de8-4305-9a3c-249069474d2e", + "key": "4d167578-e181-40e2-9163-0b7fe80bdf4c", "name": "newNode", "createdBy": null, "outputs": [ { - "key": "05d80c69-0c16-454a-ac81-ae8fa1278667", + "key": "2cf4d671-8699-4e8e-ab6e-711fbcccc168", "type": "TEXT", "name": "value" } @@ -73,8 +73,8 @@ "inputs": [], "color": "#A8E6CF", "position": { - "x": 99, - "y": 214 + "x": -417, + "y": 184 }, "parameters": null, "description": null, @@ -106,21 +106,67 @@ "type": "Text Input" }, { - "key": "f9095513-fa24-4238-9b08-2a2b959e3978", + "key": "16ce57f5-4364-4246-ac0f-ded81e0ec04c", + "name": "newNode", + "createdBy": null, + "outputs": [ + { + "key": "db131490-1ef5-4388-8928-e008b1422585", + "type": "TEXT", + "name": "value" + } + ], + "inputs": [], + "color": "#A8E6CF", + "position": { + "x": 196, + "y": 155 + }, + "parameters": null, + "description": null, + "nodeDefinition": { + "type": "system", + "name": "Text Input", + "createdBy": null, + "category": "input", + "color": "green", + "fixedParameters": {}, + "runtimeParameters": { + "name": { + "name": "name", + "label": "Input Name", + "description": "Input name", + "type": "String", + "required": false, + "defaultValue": "output", + "validations": [], + "specificAttributes": null + } + }, + "inputs": null, + "outputs": { + "value": "TEXT" + }, + "simulable": false + }, + "type": "Text Input" + }, + { + "key": "f6e0a4a7-d0ec-48ed-ba42-f704d96978ef", "name": "newNode", "createdBy": null, "outputs": [], "inputs": [ { - "key": "8daefe93-5998-4362-b24a-5087c1b2f859", + "key": "dd2ab7fb-7342-4580-8f68-3256e0702488", "type": "TEXT", "name": "value" } ], "color": "#A8E6CF", "position": { - "x": 697, - "y": 200 + "x": 782, + "y": 157 }, "parameters": null, "description": null, @@ -154,14 +200,14 @@ ], "connections": [ { - "key": "e8474793-a8d9-4fd2-9da6-1a7c5b8657d2", - "from": "05d80c69-0c16-454a-ac81-ae8fa1278667", - "to": "57a64d4c-bbbf-4c56-a0d2-7a2b6de2da09" + "key": "bed33a34-aeb1-4cfd-a71e-d62c69770e11", + "from": "db131490-1ef5-4388-8928-e008b1422585", + "to": "1a25c345-71ab-4742-9809-b4197e83bf06" }, { - "key": "7f21e4aa-d554-4fdf-ba95-c331a48ccf92", - "from": "8dda93d6-7bc6-485e-8375-7c56ca676979", - "to": "8daefe93-5998-4362-b24a-5087c1b2f859" + "key": "cc486c7c-848b-410a-a917-596ce9e642c8", + "from": "b0108ffe-71d7-49c5-bde2-80b9b3b5a248", + "to": "dd2ab7fb-7342-4580-8f68-3256e0702488" } ], "public": false