From d2e0de9a659e6b3165dc24b284f4f6ede81af9e8 Mon Sep 17 00:00:00 2001
From: Adrian <95376249+asylves1@users.noreply.github.com>
Date: Wed, 25 Sep 2024 08:22:12 -0400
Subject: [PATCH] 4751 feat create intervention policy   misc adjustments
 (#4902)

Co-authored-by: dvince <dvince@uncharted.software>
---
 .../intervention-policy-operation.ts          |   2 -
 .../tera-intervention-card.vue                | 168 ++++++++++++------
 .../tera-intervention-policy-drilldown.vue    |  11 +-
 .../optimize-ciemss-operation.ts              |  20 +--
 ...tera-dynamic-intervention-policy-group.vue |   2 +-
 .../tera-optimize-ciemss-drilldown.vue        |  15 +-
 .../tera-static-intervention-policy-group.vue |  11 +-
 .../tera-intervention-summary-card.vue        |   6 +-
 .../src/services/intervention-policy.ts       |  13 +-
 packages/client/hmi-client/src/types/Types.ts |   6 +-
 .../interventions/DynamicIntervention.java    |   4 +
 .../interventions/Intervention.java           |   5 +-
 .../interventions/StaticIntervention.java     |   4 +
 13 files changed, 171 insertions(+), 96 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 6a48a1c576..5d96c4e32b 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
@@ -48,8 +48,6 @@ export const isInterventionPoliciesValuesEqual = (
 	if (originalPolicy.interventions.length !== newPolicy.interventions.length) return false;
 
 	const notEqual = originalPolicy.interventions.some((intervention, index) => {
-		if (intervention.appliedTo !== newPolicy.interventions[index].appliedTo) return true;
-		if (intervention.type !== newPolicy.interventions[index].type) return true;
 		if (!isEqual(intervention.staticInterventions, newPolicy.interventions[index].staticInterventions)) return true;
 		if (!isEqual(intervention.dynamicInterventions, newPolicy.interventions[index].dynamicInterventions)) return true;
 		return false;
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 b9f473f09a..66578b70eb 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
@@ -1,6 +1,6 @@
 <template>
 	<div class="intervention-card">
-		<header class="flex align-items-center gap-2">
+		<header class="card-section">
 			<tera-toggleable-input :model-value="intervention.name" @update:model-value="onUpdateName($event)" tag="h6" />
 			<div class="flex align-items-center ml-auto">
 				<RadioButton
@@ -24,65 +24,101 @@
 			</div>
 		</header>
 		<section>
-			<div class="flex align-items-center flex-wrap gap-2">
-				Set
-				<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>
+			<div v-if="interventionType === 'static'" class="card-section pb-2">
+				Starting at day
+				<tera-input-number
+					auto-width
+					:model-value="intervention.staticInterventions[0].timestep"
+					@update:model-value="(val) => onUpdateThreshold(val, 0)"
+					placeholder="timestep"
+				/>
+				,
+			</div>
+			<div class="card-section">
+				<template v-if="interventionType === 'dynamic'">
+					Set
+					<section>
+						<Dropdown
+							class="type-menu"
+							:model-value="intervention.dynamicInterventions[0].type"
+							@change="onSemanticChange($event, 0)"
+							:options="interventionSemanticOptions"
+							option-label="label"
+							option-value="value"
+						/>
+						<Dropdown
+							class="applied-to-menu"
+							:model-value="intervention.dynamicInterventions[0].appliedTo"
+							@change="onAppliedToParameterChange($event, 0)"
+							:options="semanticOptions(intervention.dynamicInterventions[0].type)"
+							option-label="label"
+							option-value="value"
+							placeholder="Select"
+						/>
+					</section>
+				</template>
 				<!-- Static -->
 				<template v-if="interventionType === 'static'">
-					to
-					<template v-if="intervention.staticInterventions.length > 1">...</template>
-					<template v-else-if="intervention.staticInterventions.length === 1">
+					<template v-if="intervention.staticInterventions.length === 1">
+						Set
+						<section>
+							<Dropdown
+								class="type-menu"
+								:model-value="intervention.staticInterventions[0].type"
+								@change="onSemanticChange($event, 0)"
+								:options="interventionSemanticOptions"
+								option-label="label"
+								option-value="value"
+							/>
+							<Dropdown
+								class="applied-to-menu"
+								:model-value="intervention.staticInterventions[0].appliedTo"
+								@change="onAppliedToParameterChange($event, 0)"
+								:options="semanticOptions(intervention.staticInterventions[0].type)"
+								option-label="label"
+								option-value="value"
+								placeholder="Select"
+							/>
+						</section>
+						to
 						<tera-input-number
 							auto-width
 							:model-value="intervention.staticInterventions[0].value"
 							@update:model-value="(val) => onUpdateValue(val, 0)"
 							placeholder="value"
 						/>
-						starting at
-						<tera-input-number
-							auto-width
-							:model-value="intervention.staticInterventions[0].timestep"
-							@update:model-value="(val) => onUpdateThreshold(val, 0)"
-							placeholder="timestep"
-						/>
-						.
 					</template>
 
 					<ul v-if="intervention.staticInterventions.length > 1" class="w-full">
 						<li v-for="(i, index) in intervention.staticInterventions" class="flex-1" :key="index">
 							<div class="flex align-items-center pt-2 pb-2 gap-2">
+								Set
+								<section>
+									<Dropdown
+										class="type-menu"
+										:model-value="i.type"
+										@change="onSemanticChange($event, index)"
+										:options="interventionSemanticOptions"
+										option-label="label"
+										option-value="value"
+									/>
+									<Dropdown
+										class="applied-to-menu"
+										:model-value="i.appliedTo"
+										@change="onAppliedToParameterChange($event, index)"
+										:options="semanticOptions(i.type)"
+										option-label="label"
+										option-value="value"
+										placeholder="Select"
+									/>
+								</section>
+								to
 								<tera-input-number
 									auto-width
 									:model-value="i.value"
 									@update:model-value="(val) => onUpdateValue(val, index)"
 									placeholder="value"
 								/>
-								starting at
-								<tera-input-number
-									auto-width
-									:model-value="i.timestep"
-									@update:model-value="(val) => onUpdateThreshold(val, index)"
-									placeholder="timestep"
-								/>
-								.
 								<Button class="ml-auto" icon="pi pi-times" text @click="onRemoveStaticIntervention(index)" />
 							</div>
 							<Divider />
@@ -155,12 +191,12 @@ const interventionSemanticOptions = [
 	{ label: 'State', value: InterventionSemanticType.State }
 ];
 
-const semanticOptions = computed(() => {
-	if (props.intervention.type === InterventionSemanticType.State) {
+const semanticOptions = (type) => {
+	if (type === InterventionSemanticType.State) {
 		return props.stateOptions;
 	}
 	return props.parameterOptions;
-});
+};
 
 const interventionType = computed(() => {
 	if (props.intervention.staticInterventions.length > 0) {
@@ -174,8 +210,8 @@ const interventionType = computed(() => {
 
 const dynamicInterventionUnits = computed(() => {
 	let units = '';
-	const type = props.intervention.type;
-	const appliedTo = props.intervention.appliedTo;
+	const type = props.intervention.dynamicInterventions[0].type;
+	const appliedTo = props.intervention.dynamicInterventions[0].appliedTo;
 
 	if (type === InterventionSemanticType.Parameter) {
 		units = props.parameterOptions.find((parameter) => parameter.label === appliedTo)?.units ?? '';
@@ -191,16 +227,21 @@ const onUpdateName = (name: string) => {
 	debounceUpdateState(intervention);
 };
 
-const onAppliedToParameterChange = (event: DropdownChangeEvent) => {
+const onAppliedToParameterChange = (event: DropdownChangeEvent, index: number) => {
 	const intervention = cloneDeep(props.intervention);
-	intervention.appliedTo = event.value;
+	const item =
+		interventionType.value === 'static' ? intervention.staticInterventions : intervention.dynamicInterventions;
+	item[index].appliedTo = event.value;
 	emit('update', intervention);
 };
 
 const onUpdateThreshold = (value: number, index: number) => {
 	const intervention = cloneDeep(props.intervention);
 	if (interventionType.value === 'static') {
-		intervention.staticInterventions[index].timestep = value;
+		// The timestep value is the same only for static interventions
+		intervention.staticInterventions.forEach((item) => {
+			item.timestep = value;
+		});
 	} else {
 		intervention.dynamicInterventions[index].threshold = value;
 	}
@@ -227,7 +268,9 @@ const onAddNewStaticIntervention = () => {
 	const intervention = cloneDeep(props.intervention);
 	intervention.staticInterventions.push({
 		timestep: Number.NaN,
-		value: Number.NaN
+		value: Number.NaN,
+		appliedTo: '',
+		type: InterventionSemanticType.Parameter
 	});
 	emit('update', intervention);
 };
@@ -238,7 +281,9 @@ const onInterventionTypeChange = (value: string) => {
 		intervention.staticInterventions = [
 			{
 				timestep: Number.NaN,
-				value: Number.NaN
+				value: Number.NaN,
+				appliedTo: '',
+				type: InterventionSemanticType.Parameter
 			}
 		];
 		intervention.dynamicInterventions = [];
@@ -248,7 +293,9 @@ const onInterventionTypeChange = (value: string) => {
 			{
 				threshold: Number.NaN,
 				value: Number.NaN,
-				parameter: ''
+				parameter: '',
+				appliedTo: '',
+				type: InterventionSemanticType.Parameter
 			}
 		];
 	}
@@ -262,13 +309,15 @@ const onTargetParameterChange = (event: DropdownChangeEvent) => {
 	emit('update', intervention);
 };
 
-const onSemanticChange = (event: DropdownChangeEvent) => {
+const onSemanticChange = (event: DropdownChangeEvent, index: number) => {
 	const intervention = cloneDeep(props.intervention);
-	intervention.type = event.value;
+	const item =
+		interventionType.value === 'static' ? intervention.staticInterventions : intervention.dynamicInterventions;
+	item[index].type = event.value;
 	if (event.value === InterventionSemanticType.State) {
-		intervention.appliedTo = '';
+		item[index].appliedTo = '';
 	} else {
-		intervention.appliedTo = '';
+		item[index].appliedTo = '';
 	}
 	emit('update', intervention);
 };
@@ -287,6 +336,13 @@ const debounceUpdateState = debounce((intervention) => {
 	}
 }
 
+.card-section {
+	display: flex;
+	flex-wrap: wrap;
+	align-items: center;
+	gap: var(--gap-2);
+}
+
 .type-menu {
 	border-radius: var(--border-radius) 0 0 var(--border-radius);
 	background: var(--surface-200);
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 978642ccb2..cfc7e2a1df 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
@@ -121,13 +121,13 @@
 												:key="staticIntervention.timestep"
 											>
 												<p>
-													Set {{ intervention.type }} {{ appliedTo }} to {{ staticIntervention.value }} at time step
-													{{ staticIntervention.timestep }}.
+													Set {{ staticIntervention.type }} {{ appliedTo }} to {{ staticIntervention.value }} at time
+													step {{ staticIntervention.timestep }}.
 												</p>
 											</li>
 										</ul>
 										<p v-else-if="!isEmpty(intervention.dynamicInterventions)">
-											Set {{ intervention.type }} {{ appliedTo }} to
+											Set {{ intervention.dynamicInterventions[0].type }} {{ appliedTo }} to
 											{{ intervention.dynamicInterventions[0].value }} when the
 											{{ intervention.dynamicInterventions[0].parameter }}
 											when it crosses the threshold value
@@ -279,7 +279,10 @@ const stateOptions = computed(() => {
 });
 
 const groupedOutputParameters = computed(() =>
-	groupBy(knobs.value.transientInterventionPolicy.interventions, 'appliedTo')
+	groupBy(
+		knobs.value.transientInterventionPolicy.interventions,
+		(item) => item.dynamicInterventions[0]?.appliedTo || item.staticInterventions[0]?.appliedTo
+	)
 );
 
 const preparedCharts = computed(() =>
diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/optimize-ciemss-operation.ts b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/optimize-ciemss-operation.ts
index 6412cfeae8..feb9f9e38b 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/optimize-ciemss-operation.ts
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/optimize-ciemss-operation.ts
@@ -175,11 +175,9 @@ export async function getOptimizedInterventions(optimizeRunId: string) {
 	// From snake case -> camel case.
 	simulationStaticInterventions.forEach((inter) => {
 		const newIntervetion: Intervention = {
-			appliedTo: inter.applied_to,
 			dynamicInterventions: inter.dynamic_interventions,
 			name: inter.name,
-			staticInterventions: inter.static_interventions,
-			type: inter.type
+			staticInterventions: inter.static_interventions
 		};
 		allInterventions.push(newIntervetion);
 	});
@@ -199,10 +197,10 @@ export async function getOptimizedInterventions(optimizeRunId: string) {
 		for (let i = 0; i < paramNames.length; i++) {
 			allInterventions.push({
 				name: `Optimized ${paramNames[i]}`,
-				appliedTo: paramNames[i],
-				type: InterventionSemanticType.Parameter,
 				staticInterventions: [
 					{
+						appliedTo: paramNames[i],
+						type: InterventionSemanticType.Parameter,
 						timestep: policyResult[i],
 						value: paramValues[i]
 					}
@@ -215,12 +213,12 @@ export async function getOptimizedInterventions(optimizeRunId: string) {
 		for (let i = 0; i < paramNames.length; i++) {
 			allInterventions.push({
 				name: `Optimized ${paramNames[i]}`,
-				appliedTo: paramNames[i],
-				type: InterventionSemanticType.Parameter,
 				staticInterventions: [
 					{
 						timestep: startTimes[i],
-						value: policyResult[i]
+						value: policyResult[i],
+						appliedTo: paramNames[i],
+						type: InterventionSemanticType.Parameter
 					}
 				],
 				dynamicInterventions: []
@@ -232,12 +230,12 @@ export async function getOptimizedInterventions(optimizeRunId: string) {
 		for (let i = 0; i < paramNames.length; i++) {
 			allInterventions.push({
 				name: `Optimized ${paramNames[i]}`,
-				appliedTo: paramNames[i],
-				type: InterventionSemanticType.Parameter,
 				staticInterventions: [
 					{
 						timestep: policyResult[i * 2],
-						value: policyResult[i * 2 + 1]
+						value: policyResult[i * 2 + 1],
+						appliedTo: paramNames[i],
+						type: InterventionSemanticType.Parameter
 					}
 				],
 				dynamicInterventions: []
diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-dynamic-intervention-policy-group.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-dynamic-intervention-policy-group.vue
index 3e3b93d7b2..e9a6f0e726 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-dynamic-intervention-policy-group.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-dynamic-intervention-policy-group.vue
@@ -8,7 +8,7 @@
 			</aside>
 		</div>
 		<p>
-			Set the {{ config.intervention?.type }}&nbsp; <strong>{{ config.intervention?.appliedTo }}</strong> to
+			Set the {{ dynamicInterventions[0].type }}&nbsp; <strong>{{ dynamicInterventions[0].appliedTo }}</strong> to
 			<strong>{{ dynamicInterventions[0].threshold }}</strong> days when it crosses the threshold value
 			<strong>{{ dynamicInterventions[0].value }}</strong> person.
 		</p>
diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
index 830c445961..0e4335320a 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
@@ -733,7 +733,8 @@ const runOptimize = async () => {
 	const objectiveFunctionOption: string[] = [];
 
 	activePolicyGroups.value.forEach((ele) => {
-		paramNames.push(ele.intervention.appliedTo);
+		// Only allowed to optimize on interventions that arent grouped aka staticInterventions' length is 1
+		paramNames.push(ele.intervention.staticInterventions[0].appliedTo);
 		paramValues.push(ele.intervention.staticInterventions[0].value);
 		startTime.push(ele.intervention.staticInterventions[0].timestep);
 		objectiveFunctionOption.push(ele.objectiveFunctionOption);
@@ -823,10 +824,14 @@ const setOutputSettingDefaults = () => {
 	const selectedSimulationVariables: Array<string> = [];
 
 	if (!knobs.value.selectedInterventionVariables.length) {
-		knobs.value.interventionPolicyGroups.forEach((intervention) =>
-			selectedInterventionVariables.push(intervention.intervention.appliedTo)
-		);
-		knobs.value.selectedInterventionVariables = [...new Set(selectedInterventionVariables)];
+		activePolicyGroups.value.forEach((ele) => {
+			ele.intervention.staticInterventions.forEach((staticInt) =>
+				selectedInterventionVariables.push(staticInt.appliedTo)
+			);
+			ele.intervention.dynamicInterventions.forEach((dynamicsInt) =>
+				selectedInterventionVariables.push(dynamicsInt.appliedTo)
+			);
+		});
 	}
 
 	if (!knobs.value.selectedSimulationVariables.length) {
diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-static-intervention-policy-group.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-static-intervention-policy-group.vue
index 83f199b385..7d2cc48d74 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-static-intervention-policy-group.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-static-intervention-policy-group.vue
@@ -19,7 +19,11 @@
 						:options="OPTIMIZATION_TYPE_MAP"
 						@change="emit('update-self', knobs)"
 					/>
-					for the {{ knobs.intervention.type }}&nbsp;<strong>{{ knobs.intervention.appliedTo }}</strong>
+					<template v-if="knobs.intervention.staticInterventions.length === 1">
+						for the {{ knobs.intervention.staticInterventions[0].type }}&nbsp;<strong>{{
+							knobs.intervention.staticInterventions[0].appliedTo
+						}}</strong>
+					</template>
 				</p>
 				<p v-if="showNewValueOptions && staticInterventions.length === 1">
 					at the start time <strong>{{ staticInterventions[0].timestep }}</strong>
@@ -104,9 +108,8 @@
 		<template v-else>
 			<ul>
 				<li class="list-position-inside" v-for="(staticIntervention, index) in staticInterventions" :key="index">
-					Set the <strong>{{ config.intervention?.type }}</strong>
-					<strong>{{ config.intervention?.appliedTo }}</strong> to the value of
-					<strong>{{ staticIntervention.value }}</strong> day at start time
+					Set the <strong>{{ staticIntervention.type }}</strong> <strong>{{ staticIntervention.appliedTo }}</strong> to
+					the value of <strong>{{ staticIntervention.value }}</strong> day at start time
 					<strong>{{ staticIntervention.timestep }}</strong> day.
 				</li>
 			</ul>
diff --git a/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-intervention-summary-card.vue b/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-intervention-summary-card.vue
index 519d8e4396..39eecab607 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-intervention-summary-card.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-intervention-summary-card.vue
@@ -3,13 +3,13 @@
 		<h5>{{ intervention.name }}</h5>
 		<ul>
 			<li v-for="(staticIntervention, index) in intervention.staticInterventions" :key="index">
-				Set the <strong>{{ intervention?.type }}</strong
-				>&nbsp; <strong>{{ intervention?.appliedTo }}</strong> to the value of
+				Set the <strong>{{ staticIntervention.type }}</strong
+				>&nbsp; <strong>{{ staticIntervention.appliedTo }}</strong> to the value of
 				<strong>{{ staticIntervention.value }}</strong> day at start time
 				<strong>{{ staticIntervention.timestep }}</strong> day.
 			</li>
 			<li v-for="(dynamicIntervention, index) in intervention.dynamicInterventions" :key="`dynamic_${index}`">
-				Set the {{ intervention?.type }}&nbsp; <strong>{{ intervention?.appliedTo }}</strong> to
+				Set the {{ dynamicIntervention.type }}&nbsp; <strong>{{ dynamicIntervention.appliedTo }}</strong> to
 				<strong>{{ dynamicIntervention.threshold }}</strong> days when it crosses the threshold value
 				<strong>{{ dynamicIntervention.value }}</strong> person.
 			</li>
diff --git a/packages/client/hmi-client/src/services/intervention-policy.ts b/packages/client/hmi-client/src/services/intervention-policy.ts
index d06af2e5b7..3763266d25 100644
--- a/packages/client/hmi-client/src/services/intervention-policy.ts
+++ b/packages/client/hmi-client/src/services/intervention-policy.ts
@@ -4,9 +4,14 @@ import { InterventionSemanticType } from '@/types/Types';
 
 export const blankIntervention: Intervention = {
 	name: 'New Intervention',
-	appliedTo: '',
-	type: InterventionSemanticType.Parameter,
-	staticInterventions: [{ timestep: Number.NaN, value: Number.NaN }],
+	staticInterventions: [
+		{
+			timestep: Number.NaN,
+			value: Number.NaN,
+			type: InterventionSemanticType.Parameter,
+			appliedTo: ''
+		}
+	],
 	dynamicInterventions: []
 };
 
@@ -42,6 +47,6 @@ export const flattenInterventionData = (
 			name: intervention.name,
 			value: staticIntervention.value,
 			time: staticIntervention.timestep,
-			appliedTo: intervention.appliedTo
+			appliedTo: staticIntervention.appliedTo
 		}))
 	);
diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
index 9a568ae891..e57f5f9ce3 100644
--- a/packages/client/hmi-client/src/types/Types.ts
+++ b/packages/client/hmi-client/src/types/Types.ts
@@ -593,12 +593,12 @@ export interface DynamicIntervention {
     parameter: string;
     threshold: number;
     value: number;
+    appliedTo: string;
+    type: InterventionSemanticType;
 }
 
 export interface Intervention {
     name: string;
-    appliedTo: string;
-    type: InterventionSemanticType;
     staticInterventions: StaticIntervention[];
     dynamicInterventions: DynamicIntervention[];
 }
@@ -611,6 +611,8 @@ export interface InterventionPolicy extends TerariumAsset {
 export interface StaticIntervention {
     timestep: number;
     value: number;
+    appliedTo: string;
+    type: InterventionSemanticType;
 }
 
 export interface DatasetLocation {
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/interventions/DynamicIntervention.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/interventions/DynamicIntervention.java
index 98ef3eb6fa..54e5630882 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/interventions/DynamicIntervention.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/interventions/DynamicIntervention.java
@@ -10,6 +10,8 @@ public class DynamicIntervention {
 	private String parameter;
 	private Number threshold;
 	private Number value;
+	private String appliedTo;
+	private InterventionSemanticType type;
 
 	@Override
 	public DynamicIntervention clone() {
@@ -17,6 +19,8 @@ public DynamicIntervention clone() {
 		clone.parameter = this.parameter;
 		clone.threshold = this.threshold;
 		clone.value = this.value;
+		clone.appliedTo = this.appliedTo;
+		clone.type = this.type;
 		return clone;
 	}
 }
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/interventions/Intervention.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/interventions/Intervention.java
index 5b9d6bfe3d..e97d909341 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/interventions/Intervention.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/interventions/Intervention.java
@@ -10,8 +10,6 @@
 public class Intervention {
 
 	private String name;
-	private String appliedTo;
-	private InterventionSemanticType type;
 	private List<StaticIntervention> staticInterventions;
 	private List<DynamicIntervention> dynamicInterventions;
 
@@ -19,8 +17,7 @@ public class Intervention {
 	public Intervention clone() {
 		Intervention intervention = new Intervention();
 		intervention.setName(name);
-		intervention.setAppliedTo(appliedTo);
-		intervention.setType(type);
+
 		if (staticInterventions != null) {
 			intervention.setStaticInterventions(new ArrayList<>());
 			for (StaticIntervention staticIntervention : staticInterventions) {
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/interventions/StaticIntervention.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/interventions/StaticIntervention.java
index c760c3c8ef..86184d709a 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/interventions/StaticIntervention.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/interventions/StaticIntervention.java
@@ -9,12 +9,16 @@ public class StaticIntervention {
 
 	private Number timestep;
 	private Number value;
+	private String appliedTo;
+	private InterventionSemanticType type;
 
 	@Override
 	public StaticIntervention clone() {
 		StaticIntervention staticIntervention = new StaticIntervention();
 		staticIntervention.timestep = this.timestep;
 		staticIntervention.value = this.value;
+		staticIntervention.appliedTo = this.appliedTo;
+		staticIntervention.type = this.type;
 		return staticIntervention;
 	}
 }