From ec82cde8e4dc193f7c98c036e598152aad86fcfc Mon Sep 17 00:00:00 2001
From: asylves1 <asylvester@uncharted.software>
Date: Fri, 20 Sep 2024 13:36:06 -0400
Subject: [PATCH 1/5] UX changes to create intervention policy

---
 .../intervention-policy-operation.ts          |  5 ++-
 .../tera-intervention-card.vue                | 19 ++++++++--
 .../tera-intervention-policy-drilldown.vue    | 37 ++++++++++++++++++-
 3 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/intervention-policy-operation.ts b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/intervention-policy-operation.ts
index 038f4b9f9e..6a48a1c576 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/intervention-policy-operation.ts
+++ b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/intervention-policy-operation.ts
@@ -12,7 +12,10 @@ export const InterventionPolicyOperation: Operation = {
 	description: 'Create intervention policy',
 	displayName: 'Create intervention policy',
 	isRunnable: true,
-	inputs: [{ type: 'modelId', label: 'Model' }],
+	inputs: [
+		{ type: 'modelId', label: 'Model' },
+		{ type: 'documentId', label: 'Document', isOptional: true }
+	],
 	outputs: [{ type: 'policyInterventionId', label: 'Intervention Policy' }],
 	action: () => {},
 
diff --git a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue
index e91609d077..bc8d5bbaf8 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue
@@ -118,7 +118,7 @@
 						@update:model-value="(val) => onUpdateThreshold(val, 0)"
 						placeholder="threshold"
 					/>
-					.
+					{{ dynamicInterventionUnits }}.
 				</template>
 			</div>
 		</section>
@@ -149,8 +149,8 @@ import Divider from 'primevue/divider';
 const emit = defineEmits(['update', 'delete', 'add']);
 const props = defineProps<{
 	intervention: Intervention;
-	parameterOptions: { label: string; value: string }[];
-	stateOptions: { label: string; value: string }[];
+	parameterOptions: { label: string; value: string; units?: string }[];
+	stateOptions: { label: string; value: string; units?: string }[];
 }>();
 
 const interventionSemanticOptions = [
@@ -175,6 +175,19 @@ const interventionType = computed(() => {
 	return 'static';
 });
 
+const dynamicInterventionUnits = computed(() => {
+	let units = '';
+	const type = props.intervention.type;
+	const appliedTo = props.intervention.appliedTo;
+
+	if (type === InterventionSemanticType.Parameter) {
+		units = props.parameterOptions.find((parameter) => parameter.label === appliedTo)?.units ?? '';
+	} else {
+		units = props.stateOptions.find((state) => state.label === appliedTo)?.units ?? '';
+	}
+	return units;
+});
+
 const comparisonOperations = [
 	{ label: 'increases to above', value: true },
 	{ label: 'decreases to below', value: false }
diff --git a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue
index c646a4ea1c..2c3b0f67b0 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue
@@ -15,6 +15,16 @@
 			>
 				<template #content>
 					<section>
+						<nav class="inline-flex">
+							<!-- Disabled until Backend code is complete -->
+							<!-- <Button class="flex-1 mr-1" outlined severity="secondary" label="Extract from inputs" /> -->
+							<Button
+								class="flex-1 ml-1"
+								label="Create New"
+								:disabled="!model?.id"
+								@click="createNewInterventionPolicy"
+							/>
+						</nav>
 						<tera-input-text v-model="filterInterventionsText" placeholder="Filter" />
 						<ul v-if="!isFetchingPolicies">
 							<li v-for="policy in interventionPoliciesFiltered" :key="policy.id">
@@ -145,6 +155,14 @@
 		@close-modal="showSaveModal = false"
 		@on-save="onSaveAsInterventionPolicy"
 	/>
+	<tera-save-asset-modal
+		initial-name="New Intervention Policy"
+		:is-visible="showCreatePolicyModal"
+		:asset-type="AssetType.InterventionPolicy"
+		:asset="newBlankInterventionPolicy"
+		@close-modal="showCreatePolicyModal = false"
+		@on-save="onSaveAsInterventionPolicy"
+	/>
 </template>
 
 <script setup lang="ts">
@@ -205,7 +223,14 @@ const knobs = ref<BasicKnobs>({
 	}
 });
 
+const newBlankInterventionPolicy = ref({
+	name: '',
+	modelId: '',
+	interventions: []
+});
+
 const showSaveModal = ref(false);
+const showCreatePolicyModal = ref(false);
 const isSidebarOpen = ref(true);
 const filterInterventionsText = ref('');
 const model = ref<Model | null>(null);
@@ -249,7 +274,8 @@ const parameterOptions = computed(() => {
 	if (!model.value) return [];
 	return getParameters(model.value).map((parameter) => ({
 		label: parameter.id,
-		value: parameter.id
+		value: parameter.id,
+		units: parameter.units?.expression
 	}));
 });
 
@@ -257,7 +283,8 @@ const stateOptions = computed(() => {
 	if (!model.value) return [];
 	return getStates(model.value).map((state) => ({
 		label: state.id,
-		value: state.id
+		value: state.id,
+		units: state.units?.expression
 	}));
 });
 
@@ -426,6 +453,12 @@ const onSaveInterventionPolicy = async () => {
 	}
 };
 
+const createNewInterventionPolicy = () => {
+	if (!model.value?.id) return;
+	newBlankInterventionPolicy.value.modelId = model.value?.id;
+	showCreatePolicyModal.value = true;
+};
+
 watch(
 	() => knobs.value,
 	async () => {

From 56dc91fb4ba471ef3c0374534d39fcd659f2743e Mon Sep 17 00:00:00 2001
From: asylves1 <asylvester@uncharted.software>
Date: Fri, 20 Sep 2024 13:52:22 -0400
Subject: [PATCH 2/5] dropdown style change

---
 .../tera-intervention-card.vue                | 44 ++++++++++++-------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue
index bc8d5bbaf8..98893e3c0e 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue
@@ -26,22 +26,25 @@
 		<section>
 			<div class="flex align-items-center flex-wrap gap-2">
 				Set
-				<Dropdown
-					:model-value="intervention.type"
-					@change="onSemanticChange"
-					:options="interventionSemanticOptions"
-					option-label="label"
-					option-value="value"
-				/>
-				<Dropdown
-					:model-value="intervention.appliedTo"
-					@change="onAppliedToParameterChange"
-					:options="semanticOptions"
-					option-label="label"
-					option-value="value"
-					placeholder="Select"
-				/>
-
+				<section>
+					<Dropdown
+						class="type-menu"
+						:model-value="intervention.type"
+						@change="onSemanticChange"
+						:options="interventionSemanticOptions"
+						option-label="label"
+						option-value="value"
+					/>
+					<Dropdown
+						class="applied-to-menu"
+						:model-value="intervention.appliedTo"
+						@change="onAppliedToParameterChange"
+						:options="semanticOptions"
+						option-label="label"
+						option-value="value"
+						placeholder="Select"
+					/>
+				</section>
 				<!-- Static -->
 				<template v-if="interventionType === 'static'">
 					to
@@ -302,6 +305,15 @@ const debounceUpdateState = debounce((intervention) => {
 	}
 }
 
+.type-menu {
+	border-radius: 5px 0 0 5px;
+	background: var(--surface-200);
+}
+
+.applied-to-menu {
+	border-radius: 0 5px 5px 0;
+}
+
 .intervention-card {
 	background-color: var(--surface-50);
 	border: 1px solid var(--surface-border-light);

From 9b7596dfefb6c611aec3968faf7accf5dd04dc82 Mon Sep 17 00:00:00 2001
From: asylves1 <asylvester@uncharted.software>
Date: Fri, 20 Sep 2024 15:02:43 -0400
Subject: [PATCH 3/5] suggested changes

---
 .../ops/intervention-policy/tera-intervention-card.vue        | 4 ++--
 .../tera-intervention-policy-drilldown.vue                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue
index 98893e3c0e..b4d93ca503 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue
@@ -306,12 +306,12 @@ const debounceUpdateState = debounce((intervention) => {
 }
 
 .type-menu {
-	border-radius: 5px 0 0 5px;
+	border-radius: var(--border-radius) 0 0 var(--border-radius);
 	background: var(--surface-200);
 }
 
 .applied-to-menu {
-	border-radius: 0 5px 5px 0;
+	border-radius: 0 var(--border-radius) var(--border-radius) 0;
 }
 
 .intervention-card {
diff --git a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue
index 2c3b0f67b0..4d0f96dd70 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue
@@ -226,7 +226,7 @@ const knobs = ref<BasicKnobs>({
 const newBlankInterventionPolicy = ref({
 	name: '',
 	modelId: '',
-	interventions: []
+	interventions: [blankIntervention]
 });
 
 const showSaveModal = ref(false);
@@ -455,7 +455,7 @@ const onSaveInterventionPolicy = async () => {
 
 const createNewInterventionPolicy = () => {
 	if (!model.value?.id) return;
-	newBlankInterventionPolicy.value.modelId = model.value?.id;
+	newBlankInterventionPolicy.value.modelId = model.value.id;
 	showCreatePolicyModal.value = true;
 };
 

From 848666416100f3886ad69771383356c9eff7e51f Mon Sep 17 00:00:00 2001
From: asylves1 <asylvester@uncharted.software>
Date: Mon, 23 Sep 2024 10:44:11 -0400
Subject: [PATCH 4/5] suggested changes

---
 .../tera-intervention-policy-drilldown.vue       | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue
index 4d0f96dd70..b2777263b4 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-policy-drilldown.vue
@@ -148,21 +148,13 @@
 		</tera-columnar-panel>
 	</tera-drilldown>
 	<tera-save-asset-modal
-		:initial-name="knobs.transientInterventionPolicy.name"
+		:initial-name="showCreatePolicyModal ? 'New Intervention Policy' : knobs.transientInterventionPolicy.name"
 		:is-visible="showSaveModal"
-		:asset="knobs.transientInterventionPolicy"
+		:asset="showCreatePolicyModal ? newBlankInterventionPolicy : knobs.transientInterventionPolicy"
 		:asset-type="AssetType.InterventionPolicy"
 		@close-modal="showSaveModal = false"
 		@on-save="onSaveAsInterventionPolicy"
 	/>
-	<tera-save-asset-modal
-		initial-name="New Intervention Policy"
-		:is-visible="showCreatePolicyModal"
-		:asset-type="AssetType.InterventionPolicy"
-		:asset="newBlankInterventionPolicy"
-		@close-modal="showCreatePolicyModal = false"
-		@on-save="onSaveAsInterventionPolicy"
-	/>
 </template>
 
 <script setup lang="ts">
@@ -432,6 +424,7 @@ const onResetPolicy = () => {
 };
 
 const onSaveAsInterventionPolicy = (data: InterventionPolicy) => {
+	showCreatePolicyModal.value = false;
 	applyInterventionPolicy(data);
 };
 
@@ -455,8 +448,9 @@ const onSaveInterventionPolicy = async () => {
 
 const createNewInterventionPolicy = () => {
 	if (!model.value?.id) return;
-	newBlankInterventionPolicy.value.modelId = model.value.id;
 	showCreatePolicyModal.value = true;
+	newBlankInterventionPolicy.value.modelId = model.value.id;
+	showSaveModal.value = true;
 };
 
 watch(

From 4d9e61ff0c17247e9940ddedd43290931ce819e0 Mon Sep 17 00:00:00 2001
From: asylves1 <asylvester@uncharted.software>
Date: Mon, 23 Sep 2024 10:52:17 -0400
Subject: [PATCH 5/5] removed unused code

---
 .../ops/intervention-policy/tera-intervention-card.vue       | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue
index ad3780dfcd..b9f473f09a 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/intervention-policy/tera-intervention-card.vue
@@ -185,11 +185,6 @@ const dynamicInterventionUnits = computed(() => {
 	return units;
 });
 
-const comparisonOperations = [
-	{ label: 'increases to above', value: true },
-	{ label: 'decreases to below', value: false }
-];
-
 const onUpdateName = (name: string) => {
 	const intervention = cloneDeep(props.intervention);
 	intervention.name = name;