Merge branch 'feat/kcs_hazards_step' into develop

Author: luisrodriguezgalvez

src/components/SelectionList.vue

@@ -2,7 +2,7 @@
   <div class="selection-list pa-4">
     <v-select
       v-model="model"
-      :items="options"
+      :items="filteredOptions"
       :label="label"
       item-title="name"
       item-value="id"
@@ -34,6 +34,7 @@
     label: { type: String, required: true },
     options: { type: Array, required: true },
     selectionKey: { type: String, default: null },
+    conditionSource: { type: String, default: null },
     /** When true, store + step-complete only after the confirm button (dropdown is pending until then). */
     confirmSelection: { type: Boolean, default: false },
     confirmLabel: { type: String, default: 'Confirm' },
@@ -55,6 +56,15 @@
     },
   })
 
+  const filteredOptions = computed(() => {
+    if (!props.conditionSource) {
+      return props.options
+    }
+    const raw = appStore.selections[props.conditionSource]
+    const selectedId = raw != null && typeof raw === 'object' && 'id' in raw ? raw.id : raw
+    return props.options.filter(option => !option.condition || option.condition === selectedId)
+  })
+
   function selectionToStore (value) {
     if (!props.selectionKey || value == null) return
     const option = props.options.find(o => o.id === value)
@@ -94,4 +104,18 @@
       emit('step-complete', { value })
     }
   })
+
+  // Keep state consistent when a dependency changes and current value becomes invalid.
+  watch(filteredOptions, (nextOptions) => {
+    const allowedIds = new Set(nextOptions.map(o => o.id))
+    if (committed.value != null && !allowedIds.has(committed.value)) {
+      committed.value = null
+      if (props.selectionKey) {
+        appStore.setSelection(props.selectionKey, null)
+      }
+    }
+    if (props.confirmSelection && pending.value != null && !allowedIds.has(pending.value)) {
+      pending.value = null
+    }
+  }, { immediate: true })
 </script>

src/config/workflow.json

@@ -164,69 +164,12 @@
         }
       ]
     },
-    {
-      "id": "archetypeSelection",
-      "title": "Archetype Selection",
-      "drawerTitle": "Select the archetype",
-      "requiredSteps": [
-        "uom"
-      ],
-      "explanation": "Select the archetype and confirm to continue.",
-      "requiresConfirmation": true,
-      "confirmationSource": "component",
-      "wps": {
-        "identifier": "lare_coastal",
-        "trigger": "stepComplete",
-        "inputs": [
-          {
-            "id": "sessionid",
-            "type": "LiteralData",
-            "source": "store:app.wpsResults.initialSetup.sessionid"
-          }
-        ],
-        "storeResultAs": "coastalUseCase",
-        "outputActions": [
-          {
-            "action": "removeLayer",
-            "fromResultKey": "uom",
-            "path": "layers"
-          },
-          {
-            "action": "addLayer",
-            "path": "layers"
-          }
-        ]
-      },
-      "components": [
-        {
-          "component": "SelectionList",
-          "componentProps": {
-            "label": "Archetypes",
-            "selectionKey": "archetypeSelection",
-            "options": [
-              {
-                "id": "coastal",
-                "name": "Urban Coastal"
-              },
-              {
-                "id": "agricultural_land",
-                "name": "Agricultural Land"
-              },
-              {
-                "id": "rural_settlements",
-                "name": "Rural Settlements"
-              }
-            ]
-          }
-        }
-      ]
-    },
     {
       "id": "kcsSelection",
       "title": "KCS & Hazards",
       "drawerTitle": "Select KCS and hazard",
       "requiredSteps": [
-        "archetypeSelection"
+        "uom"
       ],
       "explanation": "Select KCS and hazard type, then confirm to run the UOM KCS calculation.",
       "requiresConfirmation": true,
@@ -268,25 +211,59 @@
         {
           "component": "SelectionList",
           "componentProps": {
-            "label": "KCS",
-            "selectionKey": "kcsSelection",
+            "label": "Hazards",
+            "selectionKey": "hazardSelection",
+            "conditionSource": "uomArchetype",
             "options": [
               {
-                "id": "transport",
-                "name": "Transport"
+                "id": "salinization",
+                "name": "Salinization",
+                "condition": "coastal"
+              },
+              {
+                "id": "flood",
+                "name": "Flood",
+                "condition": "coastal"
+              },
+              {
+                "id": "heat",
+                "name": "Heat",
+                "condition": "urban"
+              },
+              {
+                "id": "drought",
+                "name": "Drought",
+                "condition": "rural"
               }
             ]
           }
         },
         {
           "component": "SelectionList",
           "componentProps": {
-            "label": "Hazards",
-            "selectionKey": "hazardSelection",
+            "label": "KCS",
+            "selectionKey": "kcsSelection",
+            "conditionSource": "hazardSelection",
             "options": [
               {
-                "id": "pluvial_RP200",
-                "name": "Pluvial floods"
+                "id": "agriculture",
+                "name": "Agriculture",
+                "condition": "salinization"
+              },
+              {
+                "id": "transport",
+                "name": "Transport",
+                "condition": "flood"
+              },
+              {
+                "id": "agriculture",
+                "name": "Agriculture",
+                "condition": "drought"
+              },
+              {
+                "id": "vulnerable_population_hospitals",
+                "name": "Vulnerable population (Hospitals)",
+                "condition": "salinization"
               }
             ]
           }