diff --git a/ebl-issuance/src/main/java/org/dcsa/conformance/standards/eblissuance/EblIssuanceStandard.java b/ebl-issuance/src/main/java/org/dcsa/conformance/standards/eblissuance/EblIssuanceStandard.java index 53657a91..91667b83 100644 --- a/ebl-issuance/src/main/java/org/dcsa/conformance/standards/eblissuance/EblIssuanceStandard.java +++ b/ebl-issuance/src/main/java/org/dcsa/conformance/standards/eblissuance/EblIssuanceStandard.java @@ -15,7 +15,6 @@ private EblIssuanceStandard() { public SortedMap> getScenarioSuitesByStandardVersion() { return new TreeMap<>( Map.ofEntries( - Map.entry("2.0.0", new TreeSet<>(Set.of("Conformance"))), Map.entry("3.0.0", new TreeSet<>(Set.of("Conformance"))))); } diff --git a/ebl-surrender/src/main/java/org/dcsa/conformance/standards/eblsurrender/EblSurrenderStandard.java b/ebl-surrender/src/main/java/org/dcsa/conformance/standards/eblsurrender/EblSurrenderStandard.java index b8f4577a..eb66d255 100644 --- a/ebl-surrender/src/main/java/org/dcsa/conformance/standards/eblsurrender/EblSurrenderStandard.java +++ b/ebl-surrender/src/main/java/org/dcsa/conformance/standards/eblsurrender/EblSurrenderStandard.java @@ -15,7 +15,6 @@ private EblSurrenderStandard() { public SortedMap> getScenarioSuitesByStandardVersion() { return new TreeMap<>( Map.ofEntries( - Map.entry("2.0.0", new TreeSet<>(Set.of("Conformance"))), Map.entry("3.0.0", new TreeSet<>(Set.of("Conformance"))))); } diff --git a/sandbox/src/main/java/org/dcsa/conformance/sandbox/ConformanceSandbox.java b/sandbox/src/main/java/org/dcsa/conformance/sandbox/ConformanceSandbox.java index 9e23dc94..de30ca65 100644 --- a/sandbox/src/main/java/org/dcsa/conformance/sandbox/ConformanceSandbox.java +++ b/sandbox/src/main/java/org/dcsa/conformance/sandbox/ConformanceSandbox.java @@ -475,7 +475,7 @@ public static ObjectNode handleActionInput( return OBJECT_MAPPER.createObjectNode(); } - public static JsonNode startOrStopScenario( + public static void startOrStopScenario( ConformancePersistenceProvider persistenceProvider, Consumer deferredSandboxTaskConsumer, String sandboxId, @@ -486,10 +486,9 @@ public static JsonNode startOrStopScenario( ConformanceSandbox._asyncSendOutboundWebRequest( deferredSandboxTaskConsumer, conformanceWebRequest), sandboxId, - "starting in sandbox %s scenario %s".formatted(sandboxId, scenarioId), + "starting or stopping in sandbox %s scenario %s".formatted(sandboxId, scenarioId), orchestrator -> orchestrator.startOrStopScenario(scenarioId)) .run(); - return OBJECT_MAPPER.createObjectNode(); } public static JsonNode completeCurrentAction( diff --git a/sandbox/src/main/java/org/dcsa/conformance/sandbox/ConformanceWebuiHandler.java b/sandbox/src/main/java/org/dcsa/conformance/sandbox/ConformanceWebuiHandler.java index 8ea891b4..cbf6ff5d 100644 --- a/sandbox/src/main/java/org/dcsa/conformance/sandbox/ConformanceWebuiHandler.java +++ b/sandbox/src/main/java/org/dcsa/conformance/sandbox/ConformanceWebuiHandler.java @@ -389,11 +389,13 @@ private JsonNode _handleActionInput(String userId, JsonNode requestNode) { private JsonNode _startOrStopScenario(String userId, JsonNode requestNode) { String sandboxId = requestNode.get("sandboxId").asText(); accessChecker.checkUserSandboxAccess(userId, sandboxId); - return ConformanceSandbox.startOrStopScenario( + ConformanceSandbox.startOrStopScenario( persistenceProvider, deferredSandboxTaskConsumer, sandboxId, requestNode.get("scenarioId").asText()); + ConformanceSandbox.resetParty(persistenceProvider, deferredSandboxTaskConsumer, sandboxId); + return OBJECT_MAPPER.createObjectNode(); } private JsonNode _completeCurrentAction(String userId, JsonNode requestNode) { diff --git a/webui/src/app/pages/scenario/scenario.component.html b/webui/src/app/pages/scenario/scenario.component.html index 6f26a3f7..216311ec 100644 --- a/webui/src/app/pages/scenario/scenario.component.html +++ b/webui/src/app/pages/scenario/scenario.component.html @@ -39,7 +39,7 @@
Current action: {{getCurrentActionTitle()}}
-
{{scenarioStatus.promptText}}
+
▶️ {{scenarioStatus.promptText}}
{{getJsonForPromptText()}}