STNG-132 Final touches on sandbox state in the UI

dcsaorg · Aug 11, 2024 · ffad2d1 · ffad2d1
1 parent 1910bec
commit ffad2d1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/...ssuance/src/main/java/org/dcsa/conformance/standards/eblissuance/EblIssuanceStandard.java b/...ssuance/src/main/java/org/dcsa/conformance/standards/eblissuance/EblIssuanceStandard.java
@@ -15,7 +15,6 @@ private EblIssuanceStandard() {
   public SortedMap<String, SortedSet<String>> 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/...ender/src/main/java/org/dcsa/conformance/standards/eblsurrender/EblSurrenderStandard.java b/...ender/src/main/java/org/dcsa/conformance/standards/eblsurrender/EblSurrenderStandard.java
@@ -15,7 +15,6 @@ private EblSurrenderStandard() {
   public SortedMap<String, SortedSet<String>> 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
@@ -475,7 +475,7 @@ public static ObjectNode handleActionInput(
     return OBJECT_MAPPER.createObjectNode();
   }
 
-  public static JsonNode startOrStopScenario(
+  public static void startOrStopScenario(
       ConformancePersistenceProvider persistenceProvider,
       Consumer<JsonNode> 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
@@ -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
@@ -39,7 +39,7 @@
             <div class="pageTitle">Current action: <b>{{getCurrentActionTitle()}}</b></div>
 
             <div *ngIf="scenarioStatus.promptText">
-                <div class="paragraph">{{scenarioStatus.promptText}}</div>
+                <div class="paragraph">▶️ {{scenarioStatus.promptText}}</div>
 
                 <div *ngIf="scenarioStatus.jsonForPromptText" class="paragraph">
                     <pre>{{getJsonForPromptText()}}</pre>