From 4e7f4128d8ef5ab225dd04857f5d26596ffaeb89 Mon Sep 17 00:00:00 2001
From: Cole Blanchard <cblanchard@Coles-MacBook-Pro.local>
Date: Tue, 1 Aug 2023 16:06:53 -0400
Subject: [PATCH 01/12] task: init draft commit

---
 .../src/components/workflow/tera-calibration-node-ciemss.vue  | 4 +++-
 packages/client/hmi-client/src/types/Types.ts                 | 1 +
 .../terarium/hmiserver/models/dataservice/Simulation.java     | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
index cd659327d1..fad47edec8 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
@@ -98,7 +98,7 @@
 		/>
 	</section>
 	<section v-else>
-		<div><i class="pi pi-spin pi-spinner"></i> loading...</div>
+		<div><i class="pi pi-spin pi-spinner"></i> loading... {{ '(' + progress + '%)' }}</div>
 	</section>
 </template>
 
@@ -153,6 +153,7 @@ const simulationIds: ComputedRef<any | undefined> = computed(
 const mapping = ref<CalibrateMap[]>(props.node.state.mapping);
 const csvAsset = shallowRef<CsvAsset | undefined>(undefined);
 const showSpinner = ref(false);
+const progress = ref<number | undefined>(0);
 
 // EXTRA section
 const numSamples = ref(100);
@@ -239,6 +240,7 @@ const getStatus = async () => {
 	} else if (currentSimulation && ongoingStatusList.includes(currentSimulation.status)) {
 		// recursively call until all runs retrieved
 		setTimeout(getStatus, 3000);
+		progress.value = progress.value! + 5;
 	} else {
 		// throw if there are any failed runs for now
 		console.error('Failed', startedRunId.value);
diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
index 1bd23bea70..cfd48362f7 100644
--- a/packages/client/hmi-client/src/types/Types.ts
+++ b/packages/client/hmi-client/src/types/Types.ts
@@ -115,6 +115,7 @@ export interface Simulation {
     workflowId: string;
     userId?: number;
     projectId?: number;
+    progress?: number;
 }
 
 export interface Dataset {
diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/Simulation.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/Simulation.java
index 2e83f24a6d..fae6671ffe 100644
--- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/Simulation.java
+++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/Simulation.java
@@ -49,4 +49,8 @@ public class Simulation {
 	@TSOptional
 	private Integer projectId;
 
+	@JsonAlias("progress")
+	@TSOptional
+	private Number progress;
+
 }

From c9ad812cb3c646b5c93b2cfe40bcdf21d8cfd993 Mon Sep 17 00:00:00 2001
From: Cole Blanchard <cblanchard@Coles-MacBook-Pro.local>
Date: Wed, 2 Aug 2023 14:50:28 -0400
Subject: [PATCH 02/12] task: use poller when getting status

---
 .../tera-calibrate-ensemble-node-ciemss.vue   | 38 +++++++++-------
 .../workflow/tera-calibration-node-ciemss.vue | 44 ++++++++++++-------
 .../workflow/tera-calibration-node-julia.vue  | 44 ++++++++++---------
 .../workflow/tera-simulate-ciemss-node.vue    | 43 +++++++++++-------
 .../tera-simulate-ensemble-node-ciemss.vue    | 41 +++++++++--------
 .../workflow/tera-simulate-julia-node.vue     | 44 ++++++++++++-------
 6 files changed, 148 insertions(+), 106 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
index 5eaaeab94e..489c1c38ee 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
@@ -48,12 +48,7 @@ import { ref, watch, computed, ComputedRef } from 'vue';
 import { WorkflowNode, WorkflowStatus } from '@/types/workflow';
 // import { getModelConfigurationById } from '@/services/model-configurations';
 import { workflowEventBus } from '@/services/workflow';
-import {
-	EnsembleCalibrationCiemssRequest,
-	Simulation,
-	TimeSpan,
-	EnsembleModelConfigs
-} from '@/types/Types';
+import { EnsembleCalibrationCiemssRequest, TimeSpan, EnsembleModelConfigs } from '@/types/Types';
 import {
 	getSimulation,
 	makeEnsembleCiemssCalibration,
@@ -62,6 +57,7 @@ import {
 import Button from 'primevue/button';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
 import { setupDatasetInput } from '@/services/calibrate-workflow';
+import { Poller } from '@/api/api';
 import {
 	CalibrateEnsembleCiemssOperationState,
 	CalibrateEnsembleCiemssOperation,
@@ -121,21 +117,31 @@ const runEnsemble = async () => {
 const getStatus = async () => {
 	if (!startedRunId.value) return;
 
-	const currentSimulation: Simulation | null = await getSimulation(startedRunId.value); // get TDS's simulation object
-	const ongoingStatusList = ['running', 'queued'];
+	const poller = new Poller<object>()
+		.setInterval(3000)
+		.setThreshold(300)
+		.setPollAction(async () => {
+			const response = await getSimulation(startedRunId.value!);
+			if (response?.status === 'complete') {
+				return {
+					data: response,
+					progress: null,
+					error: null
+				};
+			}
+			return {
+				data: null,
+				progress: null,
+				error: null
+			};
+		});
+	const pollerResults = await poller.start();
 
-	if (currentSimulation && currentSimulation.status === 'complete') {
+	if (pollerResults.data) {
 		completedRunId.value = startedRunId.value;
 		updateOutputPorts(completedRunId);
 		addChart();
 		showSpinner.value = false;
-	} else if (currentSimulation && ongoingStatusList.includes(currentSimulation.status)) {
-		// recursively call until all runs retrieved
-		setTimeout(getStatus, 3000);
-	} else {
-		// throw if there are any failed runs for now
-		console.error('Failed', startedRunId.value);
-		throw Error('Failed Runs');
 	}
 };
 
diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
index fad47edec8..49ccd7628b 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
@@ -98,7 +98,7 @@
 		/>
 	</section>
 	<section v-else>
-		<div><i class="pi pi-spin pi-spinner"></i> loading... {{ '(' + progress + '%)' }}</div>
+		<div><i class="pi pi-spin pi-spinner"></i> loading...</div>
 	</section>
 </template>
 
@@ -112,7 +112,7 @@ import Column from 'primevue/column';
 import Accordion from 'primevue/accordion';
 import AccordionTab from 'primevue/accordiontab';
 import InputNumber from 'primevue/inputnumber';
-import { CalibrationRequestCiemss, CsvAsset, Simulation, ModelConfiguration } from '@/types/Types';
+import { CalibrationRequestCiemss, CsvAsset, ModelConfiguration } from '@/types/Types';
 import {
 	makeCalibrateJobCiemss,
 	getSimulation,
@@ -122,6 +122,7 @@ import { setupModelInput, setupDatasetInput } from '@/services/calibrate-workflo
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
 import { workflowEventBus } from '@/services/workflow';
 import _ from 'lodash';
+import { Poller } from '@/api/api';
 import {
 	CalibrationOperationCiemss,
 	CalibrationOperationStateCiemss,
@@ -153,7 +154,6 @@ const simulationIds: ComputedRef<any | undefined> = computed(
 const mapping = ref<CalibrateMap[]>(props.node.state.mapping);
 const csvAsset = shallowRef<CsvAsset | undefined>(undefined);
 const showSpinner = ref(false);
-const progress = ref<number | undefined>(0);
 
 // EXTRA section
 const numSamples = ref(100);
@@ -225,27 +225,37 @@ const runCalibrate = async () => {
 	getStatus();
 	showSpinner.value = true;
 };
-// Retrieve run ids
-// FIXME: Replace with API.poller
+
 const getStatus = async () => {
 	if (!startedRunId.value) return;
 
-	const currentSimulation: Simulation | null = await getSimulation(startedRunId.value); // get TDS's simulation object
-	const ongoingStatusList = ['running', 'queued'];
+	const poller = new Poller<object>()
+		.setInterval(3000)
+		.setThreshold(300)
+		.setPollAction(async () => {
+			const response = await getSimulation(startedRunId.value!);
+			if (response?.status === 'complete') {
+				return {
+					data: response,
+					progress: null,
+					error: null
+				};
+			}
+			if (response?.status === 'running') {
+				// handle intermediate data here
+			}
+			return {
+				data: null,
+				progress: null,
+				error: null
+			};
+		});
+	const pollerResults = await poller.start();
 
-	if (currentSimulation && currentSimulation.status === 'complete') {
+	if (pollerResults.data) {
 		completedRunId.value = startedRunId.value;
 		updateOutputPorts(completedRunId);
 		showSpinner.value = false;
-	} else if (currentSimulation && ongoingStatusList.includes(currentSimulation.status)) {
-		// recursively call until all runs retrieved
-		setTimeout(getStatus, 3000);
-		progress.value = progress.value! + 5;
-	} else {
-		// throw if there are any failed runs for now
-		console.error('Failed', startedRunId.value);
-		showSpinner.value = false;
-		throw Error('Failed Runs');
 	}
 };
 
diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
index 30c3317b2a..cf5266bce9 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
@@ -113,13 +113,7 @@ import Button from 'primevue/button';
 import Column from 'primevue/column';
 import Accordion from 'primevue/accordion';
 import AccordionTab from 'primevue/accordiontab';
-import {
-	CalibrationRequestJulia,
-	CsvAsset,
-	Simulation,
-	ModelConfiguration,
-	TimeSpan
-} from '@/types/Types';
+import { CalibrationRequestJulia, CsvAsset, ModelConfiguration, TimeSpan } from '@/types/Types';
 import {
 	makeCalibrateJobJulia,
 	getSimulation,
@@ -133,6 +127,7 @@ import _ from 'lodash';
 import InputNumber from 'primevue/inputnumber';
 import InputText from 'primevue/inputtext';
 import Dropdown from 'primevue/dropdown';
+import { Poller } from '@/api/api';
 import TeraSimulateChart from './tera-simulate-chart.vue';
 import {
 	CalibrationOperationJulia,
@@ -225,26 +220,33 @@ const runCalibrate = async () => {
 	getStatus();
 	showSpinner.value = true;
 };
-// Retrieve run ids
-// FIXME: Replace with API.poller
+
 const getStatus = async () => {
 	if (!startedRunId.value) return;
+	const poller = new Poller<object>()
+		.setInterval(3000)
+		.setThreshold(300)
+		.setPollAction(async () => {
+			const response = await getSimulation(startedRunId.value!);
+			if (response?.status === 'complete') {
+				return {
+					data: response,
+					progress: null,
+					error: null
+				};
+			}
+			return {
+				data: null,
+				progress: null,
+				error: null
+			};
+		});
+	const pollerResults = await poller.start();
 
-	const currentSimulation: Simulation | null = await getSimulation(startedRunId.value); // get TDS's simulation object
-	const ongoingStatusList = ['running', 'queued'];
-
-	if (currentSimulation && currentSimulation.status === 'complete') {
+	if (pollerResults.data) {
 		completedRunId.value = startedRunId.value;
 		updateOutputPorts(completedRunId);
 		showSpinner.value = false;
-	} else if (currentSimulation && ongoingStatusList.includes(currentSimulation.status)) {
-		// recursively call until all runs retrieved
-		setTimeout(getStatus, 3000);
-	} else {
-		// throw if there are any failed runs for now
-		console.error('Failed', startedRunId.value);
-		showSpinner.value = false;
-		throw Error('Failed Runs');
 	}
 };
 
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
index 5915589f7a..f7b3e6e204 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
@@ -53,6 +53,8 @@ import InputNumber from 'primevue/inputnumber';
 import { WorkflowNode } from '@/types/workflow';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
 import { workflowEventBus } from '@/services/workflow';
+import { Simulation } from '@/types/Types';
+import { Poller } from '@/api/api';
 import TeraSimulateChart from './tera-simulate-chart.vue';
 import { SimulateCiemssOperation, SimulateCiemssOperationState } from './simulate-ciemss-operation';
 
@@ -101,27 +103,34 @@ const runSimulate = async () => {
 	showSpinner.value = true;
 };
 
-// Retrieve run ids
-// FIXME: Replace with API.poller
 const getStatus = async () => {
-	const requestList: any[] = [];
-	startedRunIdList.value.forEach((id) => {
-		requestList.push(getSimulation(id));
-	});
-
-	const currentSimulations = await Promise.all(requestList);
-	const ongoingStatusList = ['running', 'queued'];
+	const poller = new Poller<object>()
+		.setInterval(3000)
+		.setThreshold(300)
+		.setPollAction(async () => {
+			const requestList: Promise<Simulation | null>[] = [];
+			startedRunIdList.value.forEach((id) => {
+				requestList.push(getSimulation(id));
+			});
+			const response = await Promise.all(requestList);
+			if (response.every((simulation) => simulation!.status === 'complete')) {
+				return {
+					data: response,
+					progress: null,
+					error: null
+				};
+			}
+			return {
+				data: null,
+				progress: null,
+				error: null
+			};
+		});
+	const pollerResults = await poller.start();
 
-	if (currentSimulations.every(({ status }) => status === 'complete')) {
+	if (pollerResults.data) {
 		completedRunIdList.value = startedRunIdList.value;
 		showSpinner.value = false;
-	} else if (currentSimulations.some(({ status }) => ongoingStatusList.includes(status))) {
-		// recursively call until all runs retrieved
-		setTimeout(getStatus, 3000);
-	} else {
-		// throw if there are any failed runs for now
-		console.error('Failed', startedRunIdList.value);
-		throw Error('Failed Runs');
 	}
 };
 
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
index 62a2d68df7..7a9f0de1c2 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
@@ -48,12 +48,7 @@ import { ref, watch, computed, ComputedRef } from 'vue';
 import { WorkflowNode, WorkflowStatus } from '@/types/workflow';
 // import { getModelConfigurationById } from '@/services/model-configurations';
 import { workflowEventBus } from '@/services/workflow';
-import {
-	EnsembleSimulationCiemssRequest,
-	Simulation,
-	TimeSpan,
-	EnsembleModelConfigs
-} from '@/types/Types';
+import { EnsembleSimulationCiemssRequest, TimeSpan, EnsembleModelConfigs } from '@/types/Types';
 import {
 	getSimulation,
 	makeEnsembleCiemssSimulation,
@@ -61,6 +56,7 @@ import {
 } from '@/services/models/simulation-service';
 import Button from 'primevue/button';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
+import { Poller } from '@/api/api';
 import {
 	SimulateEnsembleCiemssOperationState,
 	SimulateEnsembleCiemssOperation
@@ -125,22 +121,31 @@ const addChart = () => {
 
 const getStatus = async () => {
 	if (!startedRunId.value) return;
-
-	const currentSimulation: Simulation | null = await getSimulation(startedRunId.value); // get TDS's simulation object
-	const ongoingStatusList = ['running', 'queued'];
-
-	if (currentSimulation && currentSimulation.status === 'complete') {
+	const poller = new Poller<object>()
+		.setInterval(3000)
+		.setThreshold(300)
+		.setPollAction(async () => {
+			const response = await getSimulation(startedRunId.value!);
+			if (response?.status === 'complete') {
+				return {
+					data: response,
+					progress: null,
+					error: null
+				};
+			}
+			return {
+				data: null,
+				progress: null,
+				error: null
+			};
+		});
+	const pollerResults = await poller.start();
+
+	if (pollerResults.data) {
 		completedRunId.value = startedRunId.value;
 		updateOutputPorts(completedRunId);
 		addChart();
 		showSpinner.value = false;
-	} else if (currentSimulation && ongoingStatusList.includes(currentSimulation.status)) {
-		// recursively call until all runs retrieved
-		setTimeout(getStatus, 3000);
-	} else {
-		// throw if there are any failed runs for now
-		console.error('Failed', startedRunId.value);
-		throw Error('Failed Runs');
 	}
 };
 
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
index ddd61d9adf..97c599fac6 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
@@ -23,7 +23,7 @@ import _ from 'lodash';
 import { ref, watch, computed, onMounted } from 'vue';
 import Button from 'primevue/button';
 import { csvParse } from 'd3';
-import { ModelConfiguration } from '@/types/Types';
+import { ModelConfiguration, Simulation } from '@/types/Types';
 
 import { makeForecastJob, getSimulation, getRunResult } from '@/services/models/simulation-service';
 import { WorkflowNode } from '@/types/workflow';
@@ -31,6 +31,7 @@ import { ChartConfig, RunResults } from '@/types/SimulateConfig';
 
 import { getModelConfigurationById } from '@/services/model-configurations';
 import { workflowEventBus } from '@/services/workflow';
+import { Poller } from '@/api/api';
 import TeraSimulateChart from './tera-simulate-chart.vue';
 import { SimulateJuliaOperation, SimulateJuliaOperationState } from './simulate-julia-operation';
 
@@ -76,24 +77,33 @@ const runSimulate = async () => {
 // Retrieve run ids
 // FIXME: Replace with API.poller
 const getStatus = async () => {
-	const requestList: any[] = [];
-	startedRunIdList.value.forEach((id) => {
-		requestList.push(getSimulation(id));
-	});
-
-	const currentSimulations = await Promise.all(requestList);
-	const ongoingStatusList = ['running', 'queued'];
-
-	if (currentSimulations.every(({ status }) => status === 'complete')) {
+	const poller = new Poller<object>()
+		.setInterval(3000)
+		.setThreshold(300)
+		.setPollAction(async () => {
+			const requestList: Promise<Simulation | null>[] = [];
+			startedRunIdList.value.forEach((id) => {
+				requestList.push(getSimulation(id));
+			});
+			const response = await Promise.all(requestList);
+			if (response.every((simulation) => simulation!.status === 'complete')) {
+				return {
+					data: response,
+					progress: null,
+					error: null
+				};
+			}
+			return {
+				data: null,
+				progress: null,
+				error: null
+			};
+		});
+	const pollerResults = await poller.start();
+
+	if (pollerResults.data) {
 		completedRunIdList.value = startedRunIdList.value;
 		showSpinner.value = false;
-	} else if (currentSimulations.some(({ status }) => ongoingStatusList.includes(status))) {
-		// recursively call until all runs retrieved
-		setTimeout(getStatus, 3000);
-	} else {
-		// throw if there are any failed runs for now
-		console.error('Failed', startedRunIdList.value);
-		throw Error('Failed Runs');
 	}
 };
 

From 0bf452f671f88f10340a1c1127dac8606b1f9819 Mon Sep 17 00:00:00 2001
From: Cole Blanchard <cblanchard@Coles-MacBook-Pro.local>
Date: Wed, 2 Aug 2023 15:11:11 -0400
Subject: [PATCH 03/12] task: handle errors on polling

---
 .../tera-calibrate-ensemble-node-ciemss.vue       | 15 ++++++++++-----
 .../workflow/tera-calibration-node-ciemss.vue     | 12 ++++++++----
 .../workflow/tera-calibration-node-julia.vue      | 12 ++++++++----
 .../workflow/tera-simulate-ciemss-node.vue        | 10 +++++++---
 .../tera-simulate-ensemble-node-ciemss.vue        | 14 +++++++++-----
 .../workflow/tera-simulate-julia-node.vue         | 10 +++++++---
 6 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
index 489c1c38ee..490b074f08 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
@@ -57,7 +57,7 @@ import {
 import Button from 'primevue/button';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
 import { setupDatasetInput } from '@/services/calibrate-workflow';
-import { Poller } from '@/api/api';
+import { Poller, PollerState } from '@/api/api';
 import {
 	CalibrateEnsembleCiemssOperationState,
 	CalibrateEnsembleCiemssOperation,
@@ -137,12 +137,17 @@ const getStatus = async () => {
 		});
 	const pollerResults = await poller.start();
 
-	if (pollerResults.data) {
-		completedRunId.value = startedRunId.value;
-		updateOutputPorts(completedRunId);
-		addChart();
+	if (pollerResults.state !== PollerState.Done || !pollerResults.data) {
+		// handle error
+		// throw if there are any failed runs for now
+		console.error('Failed', startedRunId.value);
 		showSpinner.value = false;
+		throw Error('Failed Runs');
 	}
+	completedRunId.value = startedRunId.value;
+	updateOutputPorts(completedRunId);
+	addChart();
+	showSpinner.value = false;
 };
 
 const updateOutputPorts = async (runId) => {
diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
index 49ccd7628b..b36f157eb5 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
@@ -122,7 +122,7 @@ import { setupModelInput, setupDatasetInput } from '@/services/calibrate-workflo
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
 import { workflowEventBus } from '@/services/workflow';
 import _ from 'lodash';
-import { Poller } from '@/api/api';
+import { Poller, PollerState } from '@/api/api';
 import {
 	CalibrationOperationCiemss,
 	CalibrationOperationStateCiemss,
@@ -252,11 +252,15 @@ const getStatus = async () => {
 		});
 	const pollerResults = await poller.start();
 
-	if (pollerResults.data) {
-		completedRunId.value = startedRunId.value;
-		updateOutputPorts(completedRunId);
+	if (pollerResults.state !== PollerState.Done || !pollerResults.data) {
+		// throw if there are any failed runs for now
+		console.error('Failed', startedRunId.value);
 		showSpinner.value = false;
+		throw Error('Failed Runs');
 	}
+	completedRunId.value = startedRunId.value;
+	updateOutputPorts(completedRunId);
+	showSpinner.value = false;
 };
 
 const updateOutputPorts = async (runId) => {
diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
index cf5266bce9..3159c87c9c 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
@@ -127,7 +127,7 @@ import _ from 'lodash';
 import InputNumber from 'primevue/inputnumber';
 import InputText from 'primevue/inputtext';
 import Dropdown from 'primevue/dropdown';
-import { Poller } from '@/api/api';
+import { Poller, PollerState } from '@/api/api';
 import TeraSimulateChart from './tera-simulate-chart.vue';
 import {
 	CalibrationOperationJulia,
@@ -243,11 +243,15 @@ const getStatus = async () => {
 		});
 	const pollerResults = await poller.start();
 
-	if (pollerResults.data) {
-		completedRunId.value = startedRunId.value;
-		updateOutputPorts(completedRunId);
+	if (pollerResults.state !== PollerState.Done || !pollerResults.data) {
+		// throw if there are any failed runs for now
+		console.error('Failed', startedRunId.value);
 		showSpinner.value = false;
+		throw Error('Failed Runs');
 	}
+	completedRunId.value = startedRunId.value;
+	updateOutputPorts(completedRunId);
+	showSpinner.value = false;
 };
 
 const updateOutputPorts = async (runId) => {
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
index f7b3e6e204..0dc22e6c8c 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
@@ -54,7 +54,7 @@ import { WorkflowNode } from '@/types/workflow';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
 import { workflowEventBus } from '@/services/workflow';
 import { Simulation } from '@/types/Types';
-import { Poller } from '@/api/api';
+import { Poller, PollerState } from '@/api/api';
 import TeraSimulateChart from './tera-simulate-chart.vue';
 import { SimulateCiemssOperation, SimulateCiemssOperationState } from './simulate-ciemss-operation';
 
@@ -128,10 +128,14 @@ const getStatus = async () => {
 		});
 	const pollerResults = await poller.start();
 
-	if (pollerResults.data) {
-		completedRunIdList.value = startedRunIdList.value;
+	if (pollerResults.state !== PollerState.Done || !pollerResults.data) {
+		// throw if there are any failed runs for now
+		console.error('Failed', startedRunIdList.value);
 		showSpinner.value = false;
+		throw Error('Failed Runs');
 	}
+	completedRunIdList.value = startedRunIdList.value;
+	showSpinner.value = false;
 };
 
 // assume only one run for now
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
index 7a9f0de1c2..6f51e9503e 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
@@ -56,7 +56,7 @@ import {
 } from '@/services/models/simulation-service';
 import Button from 'primevue/button';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
-import { Poller } from '@/api/api';
+import { Poller, PollerState } from '@/api/api';
 import {
 	SimulateEnsembleCiemssOperationState,
 	SimulateEnsembleCiemssOperation
@@ -141,12 +141,16 @@ const getStatus = async () => {
 		});
 	const pollerResults = await poller.start();
 
-	if (pollerResults.data) {
-		completedRunId.value = startedRunId.value;
-		updateOutputPorts(completedRunId);
-		addChart();
+	if (pollerResults.state !== PollerState.Done || !pollerResults.data) {
+		// throw if there are any failed runs for now
+		console.error('Failed', startedRunId.value);
 		showSpinner.value = false;
+		throw Error('Failed Runs');
 	}
+	completedRunId.value = startedRunId.value;
+	updateOutputPorts(completedRunId);
+	addChart();
+	showSpinner.value = false;
 };
 
 const updateOutputPorts = async (runId) => {
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
index 97c599fac6..0f7552c461 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
@@ -31,7 +31,7 @@ import { ChartConfig, RunResults } from '@/types/SimulateConfig';
 
 import { getModelConfigurationById } from '@/services/model-configurations';
 import { workflowEventBus } from '@/services/workflow';
-import { Poller } from '@/api/api';
+import { Poller, PollerState } from '@/api/api';
 import TeraSimulateChart from './tera-simulate-chart.vue';
 import { SimulateJuliaOperation, SimulateJuliaOperationState } from './simulate-julia-operation';
 
@@ -101,10 +101,14 @@ const getStatus = async () => {
 		});
 	const pollerResults = await poller.start();
 
-	if (pollerResults.data) {
-		completedRunIdList.value = startedRunIdList.value;
+	if (pollerResults.state !== PollerState.Done || !pollerResults.data) {
+		// throw if there are any failed runs for now
+		console.error('Failed', startedRunIdList.value);
 		showSpinner.value = false;
+		throw Error('Failed Runs');
 	}
+	completedRunIdList.value = startedRunIdList.value;
+	showSpinner.value = false;
 };
 
 const watchCompletedRunList = async (runIdList: string[]) => {

From 7fe48e5ec3f0138b9d2006a5ef03bcf1de36efe3 Mon Sep 17 00:00:00 2001
From: Cole Blanchard <cblanchard@Coles-MacBook-Pro.local>
Date: Thu, 3 Aug 2023 20:06:09 -0400
Subject: [PATCH 04/12] task: add progress bar

---
 .../components/widgets/tera-progress-bar.vue  | 23 +++++++++++++++++++
 .../workflow/tera-calibration-node-ciemss.vue | 19 ++++++++++++---
 .../client/hmi-client/src/types/workflow.ts   |  6 +++++
 3 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 packages/client/hmi-client/src/components/widgets/tera-progress-bar.vue

diff --git a/packages/client/hmi-client/src/components/widgets/tera-progress-bar.vue b/packages/client/hmi-client/src/components/widgets/tera-progress-bar.vue
new file mode 100644
index 0000000000..fba642c858
--- /dev/null
+++ b/packages/client/hmi-client/src/components/widgets/tera-progress-bar.vue
@@ -0,0 +1,23 @@
+<template>
+	<div>
+		<i class="pi pi-spin pi-spinner"></i>
+		<span>{{ props.status }}...{{ '(' + props.value + '%)' }}</span>
+		<ProgressBar class="progress-bar" :value="props.value"></ProgressBar>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { ProgressState } from '@/types/workflow';
+import ProgressBar from 'primevue/progressbar';
+
+const props = defineProps<{
+	status: ProgressState;
+	value: number;
+}>();
+</script>
+
+<style scoped>
+.progress-bar {
+	width: 100%;
+}
+</style>
diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
index b36f157eb5..763d234b0a 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
@@ -98,13 +98,13 @@
 		/>
 	</section>
 	<section v-else>
-		<div><i class="pi pi-spin pi-spinner"></i> loading...</div>
+		<tera-progress-bar :value="progress.value" :status="progress.status"></tera-progress-bar>
 	</section>
 </template>
 
 <script setup lang="ts">
 import { computed, shallowRef, watch, ref, ComputedRef } from 'vue';
-import { WorkflowNode } from '@/types/workflow';
+import { ProgressState, WorkflowNode } from '@/types/workflow';
 import DataTable from 'primevue/datatable';
 import Button from 'primevue/button';
 import Dropdown from 'primevue/dropdown';
@@ -123,6 +123,7 @@ import { ChartConfig, RunResults } from '@/types/SimulateConfig';
 import { workflowEventBus } from '@/services/workflow';
 import _ from 'lodash';
 import { Poller, PollerState } from '@/api/api';
+import TeraProgressBar from '../widgets/tera-progress-bar.vue';
 import {
 	CalibrationOperationCiemss,
 	CalibrationOperationStateCiemss,
@@ -154,6 +155,7 @@ const simulationIds: ComputedRef<any | undefined> = computed(
 const mapping = ref<CalibrateMap[]>(props.node.state.mapping);
 const csvAsset = shallowRef<CsvAsset | undefined>(undefined);
 const showSpinner = ref(false);
+const progress = ref({ status: ProgressState.QUEUED, value: 0 });
 
 // EXTRA section
 const numSamples = ref(100);
@@ -242,8 +244,19 @@ const getStatus = async () => {
 				};
 			}
 			if (response?.status === 'running') {
-				// handle intermediate data here
+				progress.value = {
+					status: ProgressState.RUNNING,
+					value: progress.value.value + 5
+				};
 			}
+
+			if (response?.status === 'queued') {
+				progress.value = {
+					status: ProgressState.QUEUED,
+					value: 50
+				};
+			}
+
 			return {
 				data: null,
 				progress: null,
diff --git a/packages/client/hmi-client/src/types/workflow.ts b/packages/client/hmi-client/src/types/workflow.ts
index ee76e3fc42..f13d1b44a1 100644
--- a/packages/client/hmi-client/src/types/workflow.ts
+++ b/packages/client/hmi-client/src/types/workflow.ts
@@ -131,3 +131,9 @@ export interface Size {
 	width: number;
 	height: number;
 }
+
+export enum ProgressState {
+	QUEUED = 'queued',
+	RUNNING = 'running',
+	COMPLETE = 'complete'
+}

From 0836363591a8033cb3e57b664c8fa275306b5d33 Mon Sep 17 00:00:00 2001
From: Cole Blanchard <cblanchard@Coles-MacBook-Pro.local>
Date: Fri, 4 Aug 2023 19:39:20 -0400
Subject: [PATCH 05/12] task: persist simulation state

---
 .../tera-calibrate-ensemble-node-ciemss.vue   | 83 ++++++++++++++----
 .../workflow/tera-calibration-node-ciemss.vue | 68 +++++++++++----
 .../workflow/tera-calibration-node-julia.vue  | 73 +++++++++++++---
 .../workflow/tera-simulate-ciemss-node.vue    | 56 +++++++++---
 .../tera-simulate-ensemble-node-ciemss.vue    | 85 +++++++++++++++----
 .../workflow/tera-simulate-julia-node.vue     | 62 +++++++++++---
 .../workflow/tera-simulation-workflow.vue     | 11 +++
 .../src/services/models/simulation-service.ts | 81 ++++++++++++++++++
 packages/client/hmi-client/src/types/Types.ts |  1 -
 .../client/hmi-client/src/types/workflow.ts   |  6 ++
 .../models/dataservice/Simulation.java        |  4 -
 11 files changed, 439 insertions(+), 91 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
index 490b074f08..3fa102a9c3 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
@@ -35,24 +35,30 @@
 		</section>
 	</section>
 	<section v-else>
-		<div>loading...</div>
+		<tera-progress-bar :value="progress.value" :status="progress.status"></tera-progress-bar>
 	</section>
 </template>
 
 <script setup lang="ts">
 import _ from 'lodash';
-import { ref, watch, computed, ComputedRef } from 'vue';
+import { ref, watch, computed, ComputedRef, onMounted } from 'vue';
 // import { csvParse } from 'd3';
 // import { ModelConfiguration } from '@/types/Types';
 // import { getRunResult } from '@/services/models/simulation-service';
-import { WorkflowNode, WorkflowStatus } from '@/types/workflow';
+import {
+	ProgressState,
+	SimulationStateOperation,
+	WorkflowNode,
+	WorkflowStatus
+} from '@/types/workflow';
 // import { getModelConfigurationById } from '@/services/model-configurations';
 import { workflowEventBus } from '@/services/workflow';
 import { EnsembleCalibrationCiemssRequest, TimeSpan, EnsembleModelConfigs } from '@/types/Types';
 import {
 	getSimulation,
 	makeEnsembleCiemssCalibration,
-	getRunResultCiemss
+	getRunResultCiemss,
+	handleSimulationsInProgress
 } from '@/services/models/simulation-service';
 import Button from 'primevue/button';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
@@ -64,11 +70,12 @@ import {
 	EnsembleCalibrateExtraCiemss
 } from './calibrate-ensemble-ciemss-operation';
 import TeraSimulateChart from './tera-simulate-chart.vue';
+import TeraProgressBar from '../widgets/tera-progress-bar.vue';
 
 const props = defineProps<{
 	node: WorkflowNode;
 }>();
-const emit = defineEmits(['append-output-port']);
+const emit = defineEmits(['append-output-port', 'update-state']);
 
 const showSpinner = ref(false);
 const modelConfigIds = computed<string[]>(() => props.node.inputs[0].value as string[]);
@@ -89,6 +96,14 @@ const simulationIds: ComputedRef<any | undefined> = computed(
 	<any | undefined>(() => props.node.outputs[0]?.value)
 );
 const datasetColumnNames = ref<string[]>();
+const progress = ref({ status: ProgressState.QUEUED, value: 0 });
+
+onMounted(() => {
+	const runIds = handleSimulationsInProgress(SimulationStateOperation.QUERY, props.node);
+	if (runIds.length > 0) {
+		getStatus(runIds[0]);
+	}
+});
 
 const runEnsemble = async () => {
 	if (!datasetId.value || !currentDatasetFileName.value) return;
@@ -109,26 +124,65 @@ const runEnsemble = async () => {
 	};
 	const response = await makeEnsembleCiemssCalibration(params);
 	startedRunId.value = response.simulationId;
-
-	showSpinner.value = true;
-	getStatus();
+	if (response.simulationId) {
+		getStatus(response.simulationId);
+	}
 };
 
-const getStatus = async () => {
-	if (!startedRunId.value) return;
+const getStatus = async (simulationId: string) => {
+	showSpinner.value = true;
+	if (!simulationId) return;
 
 	const poller = new Poller<object>()
 		.setInterval(3000)
 		.setThreshold(300)
 		.setPollAction(async () => {
-			const response = await getSimulation(startedRunId.value!);
-			if (response?.status === 'complete') {
+			const response = await getSimulation(simulationId);
+			if (response?.status === ProgressState.COMPLETE) {
+				const newState = handleSimulationsInProgress(
+					SimulationStateOperation.DELETE,
+					props.node,
+					simulationId
+				);
+				if (newState) {
+					emit('update-state', newState);
+				}
 				return {
 					data: response,
 					progress: null,
 					error: null
 				};
 			}
+			if (response?.status === ProgressState.RUNNING) {
+				const newState = handleSimulationsInProgress(
+					SimulationStateOperation.ADD,
+					props.node,
+					simulationId
+				);
+				if (newState) {
+					emit('update-state', newState);
+				}
+				progress.value = {
+					status: ProgressState.RUNNING,
+					value: progress.value.value + 5
+				};
+			}
+
+			if (response?.status === ProgressState.QUEUED) {
+				const newState = handleSimulationsInProgress(
+					SimulationStateOperation.ADD,
+					props.node,
+					simulationId
+				);
+				if (newState) {
+					emit('update-state', newState);
+				}
+				progress.value = {
+					status: ProgressState.QUEUED,
+					value: 0
+				};
+			}
+
 			return {
 				data: null,
 				progress: null,
@@ -138,13 +192,12 @@ const getStatus = async () => {
 	const pollerResults = await poller.start();
 
 	if (pollerResults.state !== PollerState.Done || !pollerResults.data) {
-		// handle error
 		// throw if there are any failed runs for now
-		console.error('Failed', startedRunId.value);
+		console.error('Failed', simulationId);
 		showSpinner.value = false;
 		throw Error('Failed Runs');
 	}
-	completedRunId.value = startedRunId.value;
+	completedRunId.value = simulationId;
 	updateOutputPorts(completedRunId);
 	addChart();
 	showSpinner.value = false;
diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
index 26f746c46f..d04b4fb25c 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
@@ -104,8 +104,8 @@
 </template>
 
 <script setup lang="ts">
-import { computed, shallowRef, watch, ref, ComputedRef } from 'vue';
-import { ProgressState, WorkflowNode } from '@/types/workflow';
+import { computed, shallowRef, watch, ref, ComputedRef, onMounted } from 'vue';
+import { ProgressState, SimulationStateOperation, WorkflowNode } from '@/types/workflow';
 import DataTable from 'primevue/datatable';
 import Button from 'primevue/button';
 import Dropdown from 'primevue/dropdown';
@@ -117,32 +117,32 @@ import { CalibrationRequestCiemss, CsvAsset, ModelConfiguration } from '@/types/
 import {
 	makeCalibrateJobCiemss,
 	getSimulation,
-	getRunResultCiemss
+	getRunResultCiemss,
+	handleSimulationsInProgress
 } from '@/services/models/simulation-service';
 import { setupModelInput, setupDatasetInput } from '@/services/calibrate-workflow';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
 import { workflowEventBus } from '@/services/workflow';
 import _ from 'lodash';
 import { Poller, PollerState } from '@/api/api';
-import TeraProgressBar from '../widgets/tera-progress-bar.vue';
 import {
 	CalibrationOperationCiemss,
 	CalibrationOperationStateCiemss,
 	CalibrateMap
 } from './calibrate-operation-ciemss';
 import TeraSimulateChart from './tera-simulate-chart.vue';
+import TeraProgressBar from '../widgets/tera-progress-bar.vue';
 
 const props = defineProps<{
 	node: WorkflowNode;
 }>();
 
-const emit = defineEmits(['append-output-port']);
+const emit = defineEmits(['append-output-port', 'update-state']);
 
 const modelConfigId = computed(() => props.node.inputs[0].value?.[0] as string | undefined);
 const datasetId = computed(() => props.node.inputs[1].value?.[0] as string | undefined);
 const currentDatasetFileName = ref<string>();
 const modelConfig = ref<ModelConfiguration>();
-const startedRunId = ref<string>();
 const completedRunId = ref<string>();
 const parameterResult = ref<{ [index: string]: any }>();
 
@@ -173,6 +173,13 @@ const disableRunButton = computed(
 		!datasetId.value
 );
 
+onMounted(() => {
+	const runIds = handleSimulationsInProgress(SimulationStateOperation.QUERY, props.node);
+	if (runIds.length > 0) {
+		getStatus(runIds[0]);
+	}
+});
+
 const runCalibrate = async () => {
 	if (
 		!modelConfigId.value ||
@@ -224,37 +231,62 @@ const runCalibrate = async () => {
 	};
 	const response = await makeCalibrateJobCiemss(calibrationRequest);
 
-	startedRunId.value = response.simulationId;
-	getStatus();
-	showSpinner.value = true;
+	if (response.simulationId) {
+		getStatus(response.simulationId);
+	}
 };
 
-const getStatus = async () => {
-	if (!startedRunId.value) return;
+const getStatus = async (simulationId: string) => {
+	showSpinner.value = true;
+	if (!simulationId) return;
 
 	const poller = new Poller<object>()
 		.setInterval(3000)
 		.setThreshold(300)
 		.setPollAction(async () => {
-			const response = await getSimulation(startedRunId.value!);
-			if (response?.status === 'complete') {
+			const response = await getSimulation(simulationId);
+			if (response?.status === ProgressState.COMPLETE) {
+				const newState = handleSimulationsInProgress(
+					SimulationStateOperation.DELETE,
+					props.node,
+					simulationId
+				);
+				if (newState) {
+					emit('update-state', newState);
+				}
 				return {
 					data: response,
 					progress: null,
 					error: null
 				};
 			}
-			if (response?.status === 'running') {
+			if (response?.status === ProgressState.RUNNING) {
+				const newState = handleSimulationsInProgress(
+					SimulationStateOperation.ADD,
+					props.node,
+					simulationId
+				);
+				if (newState) {
+					emit('update-state', newState);
+				}
 				progress.value = {
 					status: ProgressState.RUNNING,
 					value: progress.value.value + 5
 				};
 			}
 
-			if (response?.status === 'queued') {
+			if (response?.status === ProgressState.QUEUED) {
+				const newState = handleSimulationsInProgress(
+					SimulationStateOperation.ADD,
+					props.node,
+					simulationId
+				);
+				if (newState) {
+					emit('update-state', newState);
+				}
 				progress.value = {
 					status: ProgressState.QUEUED,
-					value: 50
+					value: 0
 				};
 			}
 
@@ -268,11 +300,11 @@ const getStatus = async () => {
 
 	if (pollerResults.state !== PollerState.Done || !pollerResults.data) {
 		// throw if there are any failed runs for now
-		console.error('Failed', startedRunId.value);
+		console.error('Failed', simulationId);
 		showSpinner.value = false;
 		throw Error('Failed Runs');
 	}
-	completedRunId.value = startedRunId.value;
+	completedRunId.value = simulationId;
 	updateOutputPorts(completedRunId);
 	showSpinner.value = false;
 };
diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
index cb74848be3..f9a55e0603 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
@@ -101,13 +101,13 @@
 		/>
 	</section>
 	<section v-else>
-		<div><i class="pi pi-spin pi-spinner"></i> Loading...</div>
+		<tera-progress-bar :value="progress.value" :status="progress.status"></tera-progress-bar>
 	</section>
 </template>
 
 <script setup lang="ts">
-import { computed, shallowRef, watch, ref, ComputedRef } from 'vue';
-import { WorkflowNode } from '@/types/workflow';
+import { computed, shallowRef, watch, ref, ComputedRef, onMounted } from 'vue';
+import { ProgressState, SimulationStateOperation, WorkflowNode } from '@/types/workflow';
 import DataTable from 'primevue/datatable';
 import Button from 'primevue/button';
 import Column from 'primevue/column';
@@ -117,7 +117,8 @@ import { CalibrationRequestJulia, CsvAsset, ModelConfiguration, TimeSpan } from
 import {
 	makeCalibrateJobJulia,
 	getSimulation,
-	getRunResultJulia
+	getRunResultJulia,
+	handleSimulationsInProgress
 } from '@/services/models/simulation-service';
 import { setupModelInput, setupDatasetInput } from '@/services/calibrate-workflow';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
@@ -129,6 +130,7 @@ import InputText from 'primevue/inputtext';
 import Dropdown from 'primevue/dropdown';
 import { Poller, PollerState } from '@/api/api';
 import TeraSimulateChart from './tera-simulate-chart.vue';
+import TeraProgressBar from '../widgets/tera-progress-bar.vue';
 import {
 	CalibrationOperationJulia,
 	CalibrationOperationStateJulia,
@@ -141,7 +143,7 @@ const props = defineProps<{
 	node: WorkflowNode;
 }>();
 
-const emit = defineEmits(['append-output-port']);
+const emit = defineEmits(['append-output-port', 'update-state']);
 
 const modelConfigId = computed(() => props.node.inputs[0].value?.[0] as string | undefined);
 const datasetId = computed(() => props.node.inputs[1].value?.[0] as string | undefined);
@@ -164,6 +166,14 @@ const timeSpan = ref<TimeSpan>(props.node.state.timeSpan);
 
 const csvAsset = shallowRef<CsvAsset | undefined>(undefined);
 const showSpinner = ref(false);
+const progress = ref({ status: ProgressState.QUEUED, value: 0 });
+
+onMounted(() => {
+	const runIds = handleSimulationsInProgress(SimulationStateOperation.QUERY, props.node);
+	if (runIds.length > 0) {
+		getStatus(runIds[0]);
+	}
+});
 
 const disableRunButton = computed(
 	() =>
@@ -216,24 +226,65 @@ const runCalibrate = async () => {
 	};
 	const response = await makeCalibrateJobJulia(calibrationRequest);
 	startedRunId.value = response.simulationId;
-	getStatus();
-	showSpinner.value = true;
+	if (response.simulationId) {
+		getStatus(response.simulationId);
+	}
 };
 
-const getStatus = async () => {
-	if (!startedRunId.value) return;
+const getStatus = async (simulationId: string) => {
+	showSpinner.value = true;
+	if (!simulationId) return;
+
 	const poller = new Poller<object>()
 		.setInterval(3000)
 		.setThreshold(300)
 		.setPollAction(async () => {
-			const response = await getSimulation(startedRunId.value!);
-			if (response?.status === 'complete') {
+			const response = await getSimulation(simulationId);
+			if (response?.status === ProgressState.COMPLETE) {
+				const newState = handleSimulationsInProgress(
+					SimulationStateOperation.DELETE,
+					props.node,
+					simulationId
+				);
+				if (newState) {
+					emit('update-state', newState);
+				}
 				return {
 					data: response,
 					progress: null,
 					error: null
 				};
 			}
+			if (response?.status === ProgressState.RUNNING) {
+				const newState = handleSimulationsInProgress(
+					SimulationStateOperation.ADD,
+					props.node,
+					simulationId
+				);
+				if (newState) {
+					emit('update-state', newState);
+				}
+				progress.value = {
+					status: ProgressState.RUNNING,
+					value: progress.value.value + 5
+				};
+			}
+
+			if (response?.status === ProgressState.QUEUED) {
+				const newState = handleSimulationsInProgress(
+					SimulationStateOperation.ADD,
+					props.node,
+					simulationId
+				);
+				if (newState) {
+					emit('update-state', newState);
+				}
+				progress.value = {
+					status: ProgressState.QUEUED,
+					value: 0
+				};
+			}
+
 			return {
 				data: null,
 				progress: null,
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
index 0dc22e6c8c..9535ebbeb6 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
@@ -47,10 +47,11 @@ import Dropdown from 'primevue/dropdown';
 import {
 	makeForecastJobCiemss as makeForecastJob,
 	getSimulation,
-	getRunResultCiemss
+	getRunResultCiemss,
+	handleSimulationsInProgress
 } from '@/services/models/simulation-service';
 import InputNumber from 'primevue/inputnumber';
-import { WorkflowNode } from '@/types/workflow';
+import { ProgressState, SimulationStateOperation, WorkflowNode } from '@/types/workflow';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
 import { workflowEventBus } from '@/services/workflow';
 import { Simulation } from '@/types/Types';
@@ -61,7 +62,7 @@ import { SimulateCiemssOperation, SimulateCiemssOperationState } from './simulat
 const props = defineProps<{
 	node: WorkflowNode;
 }>();
-const emit = defineEmits(['append-output-port']);
+const emit = defineEmits(['append-output-port', 'update-state']);
 // const openedWorkflowNodeStore = useOpenedWorkflowNodeStore();
 
 const showSpinner = ref(false);
@@ -70,7 +71,6 @@ const numSamples = ref(props.node.state.numSamples);
 const method = ref(props.node.state.method);
 const ciemssMethodOptions = ref(['dopri5', 'euler']);
 
-const startedRunIdList = ref<string[]>([]);
 const completedRunIdList = ref<string[]>([]);
 const runResults = ref<RunResults>({});
 const runConfigs = ref<{ [paramKey: string]: number[] }>({});
@@ -98,28 +98,60 @@ const runSimulate = async () => {
 		return response.id;
 	});
 
-	startedRunIdList.value = await Promise.all(simulationRequests);
-	getStatus();
-	showSpinner.value = true;
+	const response = await Promise.all(simulationRequests);
+	getStatus(response);
 };
 
-const getStatus = async () => {
+onMounted(() => {
+	const runIds = handleSimulationsInProgress(SimulationStateOperation.QUERY, props.node);
+	if (runIds.length > 0) {
+		getStatus(runIds);
+	}
+});
+
+const getStatus = async (simulationIds: string[]) => {
+	showSpinner.value = true;
 	const poller = new Poller<object>()
 		.setInterval(3000)
 		.setThreshold(300)
 		.setPollAction(async () => {
 			const requestList: Promise<Simulation | null>[] = [];
-			startedRunIdList.value.forEach((id) => {
+			simulationIds.forEach((id) => {
 				requestList.push(getSimulation(id));
 			});
 			const response = await Promise.all(requestList);
-			if (response.every((simulation) => simulation!.status === 'complete')) {
+
+			if (response.every((simulation) => simulation!.status === ProgressState.COMPLETE)) {
+				const newState = handleSimulationsInProgress(
+					SimulationStateOperation.DELETE,
+					props.node,
+					simulationIds
+				);
+				if (newState) {
+					emit('update-state', newState);
+				}
 				return {
 					data: response,
 					progress: null,
 					error: null
 				};
 			}
+			if (
+				response.find(
+					(simulation) =>
+						simulation?.status === ProgressState.QUEUED ||
+						simulation?.status === ProgressState.RUNNING
+				)
+			) {
+				const newState = handleSimulationsInProgress(
+					SimulationStateOperation.ADD,
+					props.node,
+					simulationIds
+				);
+				if (newState) {
+					emit('update-state', newState);
+				}
+			}
 			return {
 				data: null,
 				progress: null,
@@ -130,11 +162,11 @@ const getStatus = async () => {
 
 	if (pollerResults.state !== PollerState.Done || !pollerResults.data) {
 		// throw if there are any failed runs for now
-		console.error('Failed', startedRunIdList.value);
+		console.error('Failed', simulationIds);
 		showSpinner.value = false;
 		throw Error('Failed Runs');
 	}
-	completedRunIdList.value = startedRunIdList.value;
+	completedRunIdList.value = simulationIds;
 	showSpinner.value = false;
 };
 
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
index 6f51e9503e..9512d1454d 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
@@ -35,24 +35,30 @@
 		</section>
 	</section>
 	<section v-else>
-		<div>loading...</div>
+		<tera-progress-bar :value="progress.value" :status="progress.status"></tera-progress-bar>
 	</section>
 </template>
 
 <script setup lang="ts">
 import _ from 'lodash';
-import { ref, watch, computed, ComputedRef } from 'vue';
+import { ref, watch, computed, ComputedRef, onMounted } from 'vue';
 // import { csvParse } from 'd3';
 // import { ModelConfiguration } from '@/types/Types';
 // import { getRunResult } from '@/services/models/simulation-service';
-import { WorkflowNode, WorkflowStatus } from '@/types/workflow';
+import {
+	ProgressState,
+	SimulationStateOperation,
+	WorkflowNode,
+	WorkflowStatus
+} from '@/types/workflow';
 // import { getModelConfigurationById } from '@/services/model-configurations';
 import { workflowEventBus } from '@/services/workflow';
 import { EnsembleSimulationCiemssRequest, TimeSpan, EnsembleModelConfigs } from '@/types/Types';
 import {
 	getSimulation,
 	makeEnsembleCiemssSimulation,
-	getRunResultCiemss
+	getRunResultCiemss,
+	handleSimulationsInProgress
 } from '@/services/models/simulation-service';
 import Button from 'primevue/button';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
@@ -62,15 +68,15 @@ import {
 	SimulateEnsembleCiemssOperation
 } from './simulate-ensemble-ciemss-operation';
 import TeraSimulateChart from './tera-simulate-chart.vue';
+import TeraProgressBar from '../widgets/tera-progress-bar.vue';
 
 const props = defineProps<{
 	node: WorkflowNode;
 }>();
-const emit = defineEmits(['append-output-port']);
+const emit = defineEmits(['append-output-port', 'update-state']);
 
 const showSpinner = ref(false);
 const modelConfigIds = computed<string[]>(() => props.node.inputs[0].value as string[]);
-const startedRunId = ref<string>();
 const completedRunId = ref<string>();
 const disableRunButton = computed(() => !ensembleConfigs?.value[0]?.weight);
 const ensembleConfigs = computed<EnsembleModelConfigs[]>(() => props.node.state.mapping);
@@ -80,6 +86,14 @@ const runResults = ref<RunResults>({});
 const simulationIds: ComputedRef<any | undefined> = computed(
 	<any | undefined>(() => props.node.outputs[0]?.value)
 );
+const progress = ref({ status: ProgressState.QUEUED, value: 0 });
+
+onMounted(() => {
+	const runIds = handleSimulationsInProgress(SimulationStateOperation.QUERY, props.node);
+	if (runIds.length > 0) {
+		getStatus(runIds[0]);
+	}
+});
 
 const runEnsemble = async () => {
 	const params: EnsembleSimulationCiemssRequest = {
@@ -89,10 +103,9 @@ const runEnsemble = async () => {
 		extra: { num_samples: numSamples.value }
 	};
 	const response = await makeEnsembleCiemssSimulation(params);
-	startedRunId.value = response.simulationId;
-
-	showSpinner.value = true;
-	getStatus();
+	if (response.simulationId) {
+		getStatus(response.simulationId);
+	}
 };
 
 // Tom TODO: Make this generic, its copy paste from drilldown
@@ -119,20 +132,60 @@ const addChart = () => {
 	});
 };
 
-const getStatus = async () => {
-	if (!startedRunId.value) return;
+const getStatus = async (simulationId: string) => {
+	showSpinner.value = true;
+	if (!simulationId) return;
+
 	const poller = new Poller<object>()
 		.setInterval(3000)
 		.setThreshold(300)
 		.setPollAction(async () => {
-			const response = await getSimulation(startedRunId.value!);
-			if (response?.status === 'complete') {
+			const response = await getSimulation(simulationId);
+			if (response?.status === ProgressState.COMPLETE) {
+				const newState = handleSimulationsInProgress(
+					SimulationStateOperation.DELETE,
+					props.node,
+					simulationId
+				);
+				if (newState) {
+					emit('update-state', newState);
+				}
 				return {
 					data: response,
 					progress: null,
 					error: null
 				};
 			}
+			if (response?.status === ProgressState.RUNNING) {
+				const newState = handleSimulationsInProgress(
+					SimulationStateOperation.ADD,
+					props.node,
+					simulationId
+				);
+				if (newState) {
+					emit('update-state', newState);
+				}
+				progress.value = {
+					status: ProgressState.RUNNING,
+					value: progress.value.value + 5
+				};
+			}
+
+			if (response?.status === ProgressState.QUEUED) {
+				const newState = handleSimulationsInProgress(
+					SimulationStateOperation.ADD,
+					props.node,
+					simulationId
+				);
+				if (newState) {
+					emit('update-state', newState);
+				}
+				progress.value = {
+					status: ProgressState.QUEUED,
+					value: 0
+				};
+			}
+
 			return {
 				data: null,
 				progress: null,
@@ -143,11 +196,11 @@ const getStatus = async () => {
 
 	if (pollerResults.state !== PollerState.Done || !pollerResults.data) {
 		// throw if there are any failed runs for now
-		console.error('Failed', startedRunId.value);
+		console.error('Failed', simulationId);
 		showSpinner.value = false;
 		throw Error('Failed Runs');
 	}
-	completedRunId.value = startedRunId.value;
+	completedRunId.value = simulationId;
 	updateOutputPorts(completedRunId);
 	addChart();
 	showSpinner.value = false;
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
index 0f7552c461..0e88ed7ab1 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
@@ -25,8 +25,13 @@ import Button from 'primevue/button';
 import { csvParse } from 'd3';
 import { ModelConfiguration, Simulation } from '@/types/Types';
 
-import { makeForecastJob, getSimulation, getRunResult } from '@/services/models/simulation-service';
-import { WorkflowNode } from '@/types/workflow';
+import {
+	makeForecastJob,
+	getSimulation,
+	getRunResult,
+	handleSimulationsInProgress
+} from '@/services/models/simulation-service';
+import { ProgressState, SimulationStateOperation, WorkflowNode } from '@/types/workflow';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
 
 import { getModelConfigurationById } from '@/services/model-configurations';
@@ -38,17 +43,22 @@ import { SimulateJuliaOperation, SimulateJuliaOperationState } from './simulate-
 const props = defineProps<{
 	node: WorkflowNode;
 }>();
-const emit = defineEmits(['append-output-port']);
+const emit = defineEmits(['append-output-port', 'update-state']);
 
 const showSpinner = ref(false);
-
-const startedRunIdList = ref<string[]>([]);
 const completedRunIdList = ref<string[]>([]);
 const runResults = ref<RunResults>({});
 
 const modelConfiguration = ref<ModelConfiguration | null>(null);
 const modelConfigId = computed<string | undefined>(() => props.node.inputs[0].value?.[0]);
 
+onMounted(() => {
+	const runIds = handleSimulationsInProgress(SimulationStateOperation.QUERY, props.node);
+	if (runIds.length > 0) {
+		getStatus(runIds);
+	}
+});
+
 const runSimulate = async () => {
 	const modelConfigurationList = props.node.inputs[0].value;
 	if (!modelConfigurationList?.length) return;
@@ -69,30 +79,54 @@ const runSimulate = async () => {
 		return response.id;
 	});
 
-	startedRunIdList.value = await Promise.all(simulationRequests);
-	getStatus();
+	const response = await Promise.all(simulationRequests);
+	getStatus(response);
 	showSpinner.value = true;
 };
 
-// Retrieve run ids
-// FIXME: Replace with API.poller
-const getStatus = async () => {
+const getStatus = async (simulationIds: string[]) => {
+	showSpinner.value = true;
 	const poller = new Poller<object>()
 		.setInterval(3000)
 		.setThreshold(300)
 		.setPollAction(async () => {
 			const requestList: Promise<Simulation | null>[] = [];
-			startedRunIdList.value.forEach((id) => {
+			simulationIds.forEach((id) => {
 				requestList.push(getSimulation(id));
 			});
 			const response = await Promise.all(requestList);
-			if (response.every((simulation) => simulation!.status === 'complete')) {
+
+			if (response.every((simulation) => simulation!.status === ProgressState.COMPLETE)) {
+				const newState = handleSimulationsInProgress(
+					SimulationStateOperation.DELETE,
+					props.node,
+					simulationIds
+				);
+				if (newState) {
+					emit('update-state', newState);
+				}
 				return {
 					data: response,
 					progress: null,
 					error: null
 				};
 			}
+			if (
+				response.find(
+					(simulation) =>
+						simulation?.status === ProgressState.QUEUED ||
+						simulation?.status === ProgressState.RUNNING
+				)
+			) {
+				const newState = handleSimulationsInProgress(
+					SimulationStateOperation.ADD,
+					props.node,
+					simulationIds
+				);
+				if (newState) {
+					emit('update-state', newState);
+				}
+			}
 			return {
 				data: null,
 				progress: null,
@@ -103,11 +137,11 @@ const getStatus = async () => {
 
 	if (pollerResults.state !== PollerState.Done || !pollerResults.data) {
 		// throw if there are any failed runs for now
-		console.error('Failed', startedRunIdList.value);
+		console.error('Failed', simulationIds);
 		showSpinner.value = false;
 		throw Error('Failed Runs');
 	}
-	completedRunIdList.value = startedRunIdList.value;
+	completedRunIdList.value = simulationIds;
 	showSpinner.value = false;
 };
 
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulation-workflow.vue b/packages/client/hmi-client/src/components/workflow/tera-simulation-workflow.vue
index 59129e4f10..29a51b65cb 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulation-workflow.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulation-workflow.vue
@@ -79,32 +79,38 @@
 						v-else-if="node.operationType === WorkflowOperationTypes.SIMULATE_JULIA"
 						:node="node"
 						@append-output-port="(event) => appendOutputPort(node, event)"
+						@update-state="(event) => updateWorkflowNodeState(node, event)"
 					/>
 					<tera-simulate-ciemss-node
 						v-else-if="node.operationType === WorkflowOperationTypes.SIMULATE_CIEMSS"
 						:node="node"
 						@append-output-port="(event) => appendOutputPort(node, event)"
+						@update-state="(event) => updateWorkflowNodeState(node, event)"
 					/>
 					<tera-calibration-julia-node
 						v-else-if="node.operationType === WorkflowOperationTypes.CALIBRATION_JULIA"
 						:node="node"
 						@append-output-port="(event) => appendOutputPort(node, event)"
+						@update-state="(event) => updateWorkflowNodeState(node, event)"
 					/>
 					<tera-calibration-ciemss-node
 						v-else-if="node.operationType === WorkflowOperationTypes.CALIBRATION_CIEMSS"
 						:node="node"
 						@append-output-port="(event) => appendOutputPort(node, event)"
+						@update-state="(event) => updateWorkflowNodeState(node, event)"
 					/>
 					<tera-stratify-node v-else-if="node.operationType === WorkflowOperationTypes.STRATIFY" />
 					<tera-simulate-ensemble-ciemss-node
 						v-else-if="node.operationType === WorkflowOperationTypes.SIMULATE_ENSEMBLE_CIEMSS"
 						:node="node"
 						@append-output-port="(event) => appendOutputPort(node, event)"
+						@update-state="(event) => updateWorkflowNodeState(node, event)"
 					/>
 					<tera-calibrate-ensemble-ciemss-node
 						v-else-if="node.operationType === WorkflowOperationTypes.CALIBRATE_ENSEMBLE_CIEMSS"
 						:node="node"
 						@append-output-port="(event) => appendOutputPort(node, event)"
+						@update-state="(event) => updateWorkflowNodeState(node, event)"
 					/>
 					<div v-else>
 						<Button @click="testNode(node)">Test run</Button
@@ -407,6 +413,11 @@ function appendOutputPort(node: WorkflowNode, port: { type: string; label?: stri
 	workflowDirty = true;
 }
 
+function updateWorkflowNodeState(node: WorkflowNode, state: any) {
+	workflowService.updateNodeState(wf.value, node.id, state);
+	workflowDirty = true;
+}
+
 // Run testOperation
 const testNode = (node: WorkflowNode) => {
 	const value = (node.inputs[0].value?.[0] ?? 0) + Math.round(Math.random() * 10);
diff --git a/packages/client/hmi-client/src/services/models/simulation-service.ts b/packages/client/hmi-client/src/services/models/simulation-service.ts
index de7037b292..047212dc66 100644
--- a/packages/client/hmi-client/src/services/models/simulation-service.ts
+++ b/packages/client/hmi-client/src/services/models/simulation-service.ts
@@ -13,6 +13,8 @@ import {
 import { RunResults } from '@/types/SimulateConfig';
 import * as EventService from '@/services/event';
 import useResourcesStore from '@/stores/resources';
+import { SimulationStateOperation, WorkflowNode } from '@/types/workflow';
+import { cloneDeep } from 'lodash';
 
 export async function makeForecastJob(simulationParam: SimulationRequest) {
 	try {
@@ -195,3 +197,82 @@ export async function makeEnsembleCiemssCalibration(params: EnsembleCalibrationC
 		return null;
 	}
 }
+
+// add a simulation in progress if it does not exist
+const addSimulationInProgress = (node: WorkflowNode, runIds: string | string[]) => {
+	const state = cloneDeep(node.state);
+
+	if (!state.simulationsInProgress) {
+		state.simulationsInProgress = [];
+	}
+
+	if (typeof runIds === 'string') {
+		// single run id
+		if (!state.simulationsInProgress.find((simulation) => simulation === runIds)) {
+			state.simulationsInProgress.push(runIds);
+			return state;
+		}
+		return null;
+	}
+
+	// array of run ids
+	let allExist = false;
+	runIds.forEach((runId) => {
+		if (!state.simulationsInProgress.includes(runId)) {
+			state.simulationsInProgress.push(runId);
+			allExist = true;
+		}
+	});
+	return allExist ? state : null;
+};
+
+// delete a simulation in progress
+const deleteSimulationInProgress = (node: WorkflowNode, runIds: string | string[]) => {
+	const state = cloneDeep(node.state);
+
+	if (state.simulationsInProgress) {
+		if (typeof runIds === 'string') {
+			state.simulationsInProgress = state.simulationsInProgress.filter(
+				(simulation) => simulation !== runIds
+			);
+			return state;
+		}
+		runIds.forEach((runId) => {
+			const index = state.simulationsInProgress.indexOf(runId);
+			if (index !== -1) {
+				state.simulationsInProgress.splice(index, 1);
+			}
+		});
+		return state;
+	}
+
+	return null;
+};
+
+const querySimulationInProgress = (node: WorkflowNode): string[] => {
+	const state = node.state;
+	if (state.simulationsInProgress && state.simulationsInProgress.length > 0) {
+		return state.simulationsInProgress; // getStatus(state.simulationsInProgress[0])
+	}
+
+	return [];
+};
+
+// handle all simulation in progress operations
+export function handleSimulationsInProgress(
+	operation: SimulationStateOperation,
+	node: WorkflowNode,
+	runId: string | string[] = ''
+) {
+	switch (operation) {
+		case SimulationStateOperation.ADD:
+			return addSimulationInProgress(node, runId);
+		case SimulationStateOperation.DELETE:
+			return deleteSimulationInProgress(node, runId);
+		case SimulationStateOperation.QUERY:
+			return querySimulationInProgress(node);
+		default:
+			break;
+	}
+	return null;
+}
diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
index cfd48362f7..1bd23bea70 100644
--- a/packages/client/hmi-client/src/types/Types.ts
+++ b/packages/client/hmi-client/src/types/Types.ts
@@ -115,7 +115,6 @@ export interface Simulation {
     workflowId: string;
     userId?: number;
     projectId?: number;
-    progress?: number;
 }
 
 export interface Dataset {
diff --git a/packages/client/hmi-client/src/types/workflow.ts b/packages/client/hmi-client/src/types/workflow.ts
index f13d1b44a1..30a9f7e06b 100644
--- a/packages/client/hmi-client/src/types/workflow.ts
+++ b/packages/client/hmi-client/src/types/workflow.ts
@@ -137,3 +137,9 @@ export enum ProgressState {
 	RUNNING = 'running',
 	COMPLETE = 'complete'
 }
+
+export enum SimulationStateOperation {
+	DELETE = 'delete',
+	ADD = 'add',
+	QUERY = 'query'
+}
diff --git a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/Simulation.java b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/Simulation.java
index fae6671ffe..2e83f24a6d 100644
--- a/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/Simulation.java
+++ b/packages/services/hmi-server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/Simulation.java
@@ -49,8 +49,4 @@ public class Simulation {
 	@TSOptional
 	private Integer projectId;
 
-	@JsonAlias("progress")
-	@TSOptional
-	private Number progress;
-
 }

From 9008d556d53e365d41608294fb3d25bf24ee0f97 Mon Sep 17 00:00:00 2001
From: Cole Blanchard <cblanchard@Coles-MacBook-Pro.local>
Date: Tue, 8 Aug 2023 09:40:47 -0400
Subject: [PATCH 06/12] chore: final touches

---
 .../workflow/tera-calibrate-ensemble-node-ciemss.vue      | 2 +-
 .../components/workflow/tera-calibration-node-ciemss.vue  | 2 +-
 .../components/workflow/tera-calibration-node-julia.vue   | 2 +-
 .../src/components/workflow/tera-simulate-ciemss-node.vue | 8 +++++++-
 .../workflow/tera-simulate-ensemble-node-ciemss.vue       | 2 +-
 .../src/components/workflow/tera-simulate-julia-node.vue  | 8 +++++++-
 .../hmi-client/src/services/models/simulation-service.ts  | 3 +++
 7 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
index 3fa102a9c3..9553a04911 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
@@ -164,7 +164,7 @@ const getStatus = async (simulationId: string) => {
 				}
 				progress.value = {
 					status: ProgressState.RUNNING,
-					value: progress.value.value + 5
+					value: 0
 				};
 			}
 
diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
index d04b4fb25c..6ef97b68d8 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
@@ -271,7 +271,7 @@ const getStatus = async (simulationId: string) => {
 				}
 				progress.value = {
 					status: ProgressState.RUNNING,
-					value: progress.value.value + 5
+					value: 0
 				};
 			}
 
diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
index f9a55e0603..ad59744a8f 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
@@ -266,7 +266,7 @@ const getStatus = async (simulationId: string) => {
 				}
 				progress.value = {
 					status: ProgressState.RUNNING,
-					value: progress.value.value + 5
+					value: 0
 				};
 			}
 
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
index 9535ebbeb6..95028dc534 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
@@ -33,7 +33,7 @@
 		</Accordion>
 	</section>
 	<section v-else>
-		<div>loading...</div>
+		<tera-progress-bar :value="progress.value" :status="progress.status"></tera-progress-bar>
 	</section>
 </template>
 
@@ -58,6 +58,7 @@ import { Simulation } from '@/types/Types';
 import { Poller, PollerState } from '@/api/api';
 import TeraSimulateChart from './tera-simulate-chart.vue';
 import { SimulateCiemssOperation, SimulateCiemssOperationState } from './simulate-ciemss-operation';
+import TeraProgressBar from '../widgets/tera-progress-bar.vue';
 
 const props = defineProps<{
 	node: WorkflowNode;
@@ -74,6 +75,7 @@ const ciemssMethodOptions = ref(['dopri5', 'euler']);
 const completedRunIdList = ref<string[]>([]);
 const runResults = ref<RunResults>({});
 const runConfigs = ref<{ [paramKey: string]: number[] }>({});
+const progress = ref({ status: ProgressState.QUEUED, value: 0 });
 
 const runSimulate = async () => {
 	const modelConfigurationList = props.node.inputs[0].value;
@@ -148,6 +150,10 @@ const getStatus = async (simulationIds: string[]) => {
 					props.node,
 					simulationIds
 				);
+				progress.value = {
+					status: ProgressState.RUNNING,
+					value: 0
+				};
 				if (newState) {
 					emit('update-state', newState);
 				}
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
index 9512d1454d..4432c366d5 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
@@ -167,7 +167,7 @@ const getStatus = async (simulationId: string) => {
 				}
 				progress.value = {
 					status: ProgressState.RUNNING,
-					value: progress.value.value + 5
+					value: 0
 				};
 			}
 
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
index 0e88ed7ab1..d8a6549869 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
@@ -14,7 +14,7 @@
 		<Button class="add-chart" text @click="addChart" label="Add Chart" icon="pi pi-plus"></Button>
 	</section>
 	<section v-else>
-		<div>loading...</div>
+		<tera-progress-bar :value="progress.value" :status="progress.status"></tera-progress-bar>
 	</section>
 </template>
 
@@ -39,6 +39,7 @@ import { workflowEventBus } from '@/services/workflow';
 import { Poller, PollerState } from '@/api/api';
 import TeraSimulateChart from './tera-simulate-chart.vue';
 import { SimulateJuliaOperation, SimulateJuliaOperationState } from './simulate-julia-operation';
+import TeraProgressBar from '../widgets/tera-progress-bar.vue';
 
 const props = defineProps<{
 	node: WorkflowNode;
@@ -51,6 +52,7 @@ const runResults = ref<RunResults>({});
 
 const modelConfiguration = ref<ModelConfiguration | null>(null);
 const modelConfigId = computed<string | undefined>(() => props.node.inputs[0].value?.[0]);
+const progress = ref({ status: ProgressState.QUEUED, value: 0 });
 
 onMounted(() => {
 	const runIds = handleSimulationsInProgress(SimulationStateOperation.QUERY, props.node);
@@ -126,6 +128,10 @@ const getStatus = async (simulationIds: string[]) => {
 				if (newState) {
 					emit('update-state', newState);
 				}
+				progress.value = {
+					status: ProgressState.RUNNING,
+					value: 0
+				};
 			}
 			return {
 				data: null,
diff --git a/packages/client/hmi-client/src/services/models/simulation-service.ts b/packages/client/hmi-client/src/services/models/simulation-service.ts
index 047212dc66..f4ea9d748d 100644
--- a/packages/client/hmi-client/src/services/models/simulation-service.ts
+++ b/packages/client/hmi-client/src/services/models/simulation-service.ts
@@ -231,12 +231,15 @@ const deleteSimulationInProgress = (node: WorkflowNode, runIds: string | string[
 	const state = cloneDeep(node.state);
 
 	if (state.simulationsInProgress) {
+		// handle single run id
 		if (typeof runIds === 'string') {
 			state.simulationsInProgress = state.simulationsInProgress.filter(
 				(simulation) => simulation !== runIds
 			);
 			return state;
 		}
+
+		// handle array of run ids
 		runIds.forEach((runId) => {
 			const index = state.simulationsInProgress.indexOf(runId);
 			if (index !== -1) {

From f15cfffe7929917d1323e08263ae338709b8d1b3 Mon Sep 17 00:00:00 2001
From: Cole Blanchard <cblanchard@Coles-MacBook-Pro.local>
Date: Tue, 8 Aug 2023 10:23:36 -0400
Subject: [PATCH 07/12] chore: hide progress bar for now

---
 .../hmi-client/src/components/widgets/tera-progress-bar.vue   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/hmi-client/src/components/widgets/tera-progress-bar.vue b/packages/client/hmi-client/src/components/widgets/tera-progress-bar.vue
index fba642c858..6396b75e58 100644
--- a/packages/client/hmi-client/src/components/widgets/tera-progress-bar.vue
+++ b/packages/client/hmi-client/src/components/widgets/tera-progress-bar.vue
@@ -1,8 +1,8 @@
 <template>
 	<div>
 		<i class="pi pi-spin pi-spinner"></i>
-		<span>{{ props.status }}...{{ '(' + props.value + '%)' }}</span>
-		<ProgressBar class="progress-bar" :value="props.value"></ProgressBar>
+		<span>{{ props.status }}...{{ props.value ? '(' + props.value + '%)' : null }}</span>
+		<ProgressBar v-if="props.value" class="progress-bar" :value="props.value"></ProgressBar>
 	</div>
 </template>
 

From 5d2166da5959e471e359c88733594dbd4b77e64a Mon Sep 17 00:00:00 2001
From: Cole Blanchard <cblanchard@Coles-MacBook-Pro.local>
Date: Tue, 8 Aug 2023 12:33:18 -0400
Subject: [PATCH 08/12] chore: extract poller handler

---
 .../tera-calibrate-ensemble-node-ciemss.vue   | 59 ++----------------
 .../workflow/tera-calibration-node-ciemss.vue | 59 ++----------------
 .../workflow/tera-calibration-node-julia.vue  | 59 ++----------------
 .../workflow/tera-simulate-ciemss-node.vue    | 60 ++----------------
 .../tera-simulate-ensemble-node-ciemss.vue    | 59 ++----------------
 .../workflow/tera-simulate-julia-node.vue     | 61 +++----------------
 .../src/services/models/simulation-service.ts | 51 +++++++++++++++-
 7 files changed, 79 insertions(+), 329 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
index 9553a04911..bb403edc7a 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
@@ -55,10 +55,10 @@ import {
 import { workflowEventBus } from '@/services/workflow';
 import { EnsembleCalibrationCiemssRequest, TimeSpan, EnsembleModelConfigs } from '@/types/Types';
 import {
-	getSimulation,
 	makeEnsembleCiemssCalibration,
 	getRunResultCiemss,
-	handleSimulationsInProgress
+	handleSimulationsInProgress,
+	simulationPollAction
 } from '@/services/models/simulation-service';
 import Button from 'primevue/button';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
@@ -133,62 +133,11 @@ const getStatus = async (simulationId: string) => {
 	showSpinner.value = true;
 	if (!simulationId) return;
 
+	const runIds = [simulationId];
 	const poller = new Poller<object>()
 		.setInterval(3000)
 		.setThreshold(300)
-		.setPollAction(async () => {
-			const response = await getSimulation(simulationId);
-			if (response?.status === ProgressState.COMPLETE) {
-				const newState = handleSimulationsInProgress(
-					SimulationStateOperation.DELETE,
-					props.node,
-					simulationId
-				);
-				if (newState) {
-					emit('update-state', newState);
-				}
-				return {
-					data: response,
-					progress: null,
-					error: null
-				};
-			}
-			if (response?.status === ProgressState.RUNNING) {
-				const newState = handleSimulationsInProgress(
-					SimulationStateOperation.ADD,
-					props.node,
-					simulationId
-				);
-				if (newState) {
-					emit('update-state', newState);
-				}
-				progress.value = {
-					status: ProgressState.RUNNING,
-					value: 0
-				};
-			}
-
-			if (response?.status === ProgressState.QUEUED) {
-				const newState = handleSimulationsInProgress(
-					SimulationStateOperation.ADD,
-					props.node,
-					simulationId
-				);
-				if (newState) {
-					emit('update-state', newState);
-				}
-				progress.value = {
-					status: ProgressState.QUEUED,
-					value: 0
-				};
-			}
-
-			return {
-				data: null,
-				progress: null,
-				error: null
-			};
-		});
+		.setPollAction(async () => simulationPollAction(runIds, props.node, progress, emit));
 	const pollerResults = await poller.start();
 
 	if (pollerResults.state !== PollerState.Done || !pollerResults.data) {
diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
index 6ef97b68d8..fb368e49fb 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
@@ -116,9 +116,9 @@ import InputNumber from 'primevue/inputnumber';
 import { CalibrationRequestCiemss, CsvAsset, ModelConfiguration } from '@/types/Types';
 import {
 	makeCalibrateJobCiemss,
-	getSimulation,
 	getRunResultCiemss,
-	handleSimulationsInProgress
+	handleSimulationsInProgress,
+	simulationPollAction
 } from '@/services/models/simulation-service';
 import { setupModelInput, setupDatasetInput } from '@/services/calibrate-workflow';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
@@ -240,62 +240,11 @@ const getStatus = async (simulationId: string) => {
 	showSpinner.value = true;
 	if (!simulationId) return;
 
+	const runIds = [simulationId];
 	const poller = new Poller<object>()
 		.setInterval(3000)
 		.setThreshold(300)
-		.setPollAction(async () => {
-			const response = await getSimulation(simulationId);
-			if (response?.status === ProgressState.COMPLETE) {
-				const newState = handleSimulationsInProgress(
-					SimulationStateOperation.DELETE,
-					props.node,
-					simulationId
-				);
-				if (newState) {
-					emit('update-state', newState);
-				}
-				return {
-					data: response,
-					progress: null,
-					error: null
-				};
-			}
-			if (response?.status === ProgressState.RUNNING) {
-				const newState = handleSimulationsInProgress(
-					SimulationStateOperation.ADD,
-					props.node,
-					simulationId
-				);
-				if (newState) {
-					emit('update-state', newState);
-				}
-				progress.value = {
-					status: ProgressState.RUNNING,
-					value: 0
-				};
-			}
-
-			if (response?.status === ProgressState.QUEUED) {
-				const newState = handleSimulationsInProgress(
-					SimulationStateOperation.ADD,
-					props.node,
-					simulationId
-				);
-				if (newState) {
-					emit('update-state', newState);
-				}
-				progress.value = {
-					status: ProgressState.QUEUED,
-					value: 0
-				};
-			}
-
-			return {
-				data: null,
-				progress: null,
-				error: null
-			};
-		});
+		.setPollAction(async () => simulationPollAction(runIds, props.node, progress, emit));
 	const pollerResults = await poller.start();
 
 	if (pollerResults.state !== PollerState.Done || !pollerResults.data) {
diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
index ad59744a8f..9e47f04180 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
@@ -116,9 +116,9 @@ import AccordionTab from 'primevue/accordiontab';
 import { CalibrationRequestJulia, CsvAsset, ModelConfiguration, TimeSpan } from '@/types/Types';
 import {
 	makeCalibrateJobJulia,
-	getSimulation,
 	getRunResultJulia,
-	handleSimulationsInProgress
+	handleSimulationsInProgress,
+	simulationPollAction
 } from '@/services/models/simulation-service';
 import { setupModelInput, setupDatasetInput } from '@/services/calibrate-workflow';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
@@ -235,62 +235,11 @@ const getStatus = async (simulationId: string) => {
 	showSpinner.value = true;
 	if (!simulationId) return;
 
+	const runIds = [simulationId];
 	const poller = new Poller<object>()
 		.setInterval(3000)
 		.setThreshold(300)
-		.setPollAction(async () => {
-			const response = await getSimulation(simulationId);
-			if (response?.status === ProgressState.COMPLETE) {
-				const newState = handleSimulationsInProgress(
-					SimulationStateOperation.DELETE,
-					props.node,
-					simulationId
-				);
-				if (newState) {
-					emit('update-state', newState);
-				}
-				return {
-					data: response,
-					progress: null,
-					error: null
-				};
-			}
-			if (response?.status === ProgressState.RUNNING) {
-				const newState = handleSimulationsInProgress(
-					SimulationStateOperation.ADD,
-					props.node,
-					simulationId
-				);
-				if (newState) {
-					emit('update-state', newState);
-				}
-				progress.value = {
-					status: ProgressState.RUNNING,
-					value: 0
-				};
-			}
-
-			if (response?.status === ProgressState.QUEUED) {
-				const newState = handleSimulationsInProgress(
-					SimulationStateOperation.ADD,
-					props.node,
-					simulationId
-				);
-				if (newState) {
-					emit('update-state', newState);
-				}
-				progress.value = {
-					status: ProgressState.QUEUED,
-					value: 0
-				};
-			}
-
-			return {
-				data: null,
-				progress: null,
-				error: null
-			};
-		});
+		.setPollAction(async () => simulationPollAction(runIds, props.node, progress, emit));
 	const pollerResults = await poller.start();
 
 	if (pollerResults.state !== PollerState.Done || !pollerResults.data) {
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
index 95028dc534..65d4a7ac6f 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
@@ -46,15 +46,14 @@ import AccordionTab from 'primevue/accordiontab';
 import Dropdown from 'primevue/dropdown';
 import {
 	makeForecastJobCiemss as makeForecastJob,
-	getSimulation,
 	getRunResultCiemss,
-	handleSimulationsInProgress
+	handleSimulationsInProgress,
+	simulationPollAction
 } from '@/services/models/simulation-service';
 import InputNumber from 'primevue/inputnumber';
 import { ProgressState, SimulationStateOperation, WorkflowNode } from '@/types/workflow';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
 import { workflowEventBus } from '@/services/workflow';
-import { Simulation } from '@/types/Types';
 import { Poller, PollerState } from '@/api/api';
 import TeraSimulateChart from './tera-simulate-chart.vue';
 import { SimulateCiemssOperation, SimulateCiemssOperationState } from './simulate-ciemss-operation';
@@ -111,68 +110,21 @@ onMounted(() => {
 	}
 });
 
-const getStatus = async (simulationIds: string[]) => {
+const getStatus = async (runIds: string[]) => {
 	showSpinner.value = true;
 	const poller = new Poller<object>()
 		.setInterval(3000)
 		.setThreshold(300)
-		.setPollAction(async () => {
-			const requestList: Promise<Simulation | null>[] = [];
-			simulationIds.forEach((id) => {
-				requestList.push(getSimulation(id));
-			});
-			const response = await Promise.all(requestList);
-
-			if (response.every((simulation) => simulation!.status === ProgressState.COMPLETE)) {
-				const newState = handleSimulationsInProgress(
-					SimulationStateOperation.DELETE,
-					props.node,
-					simulationIds
-				);
-				if (newState) {
-					emit('update-state', newState);
-				}
-				return {
-					data: response,
-					progress: null,
-					error: null
-				};
-			}
-			if (
-				response.find(
-					(simulation) =>
-						simulation?.status === ProgressState.QUEUED ||
-						simulation?.status === ProgressState.RUNNING
-				)
-			) {
-				const newState = handleSimulationsInProgress(
-					SimulationStateOperation.ADD,
-					props.node,
-					simulationIds
-				);
-				progress.value = {
-					status: ProgressState.RUNNING,
-					value: 0
-				};
-				if (newState) {
-					emit('update-state', newState);
-				}
-			}
-			return {
-				data: null,
-				progress: null,
-				error: null
-			};
-		});
+		.setPollAction(async () => simulationPollAction(runIds, props.node, progress, emit));
 	const pollerResults = await poller.start();
 
 	if (pollerResults.state !== PollerState.Done || !pollerResults.data) {
 		// throw if there are any failed runs for now
-		console.error('Failed', simulationIds);
+		console.error('Failed', runIds);
 		showSpinner.value = false;
 		throw Error('Failed Runs');
 	}
-	completedRunIdList.value = simulationIds;
+	completedRunIdList.value = runIds;
 	showSpinner.value = false;
 };
 
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
index 4432c366d5..6f385bb5fa 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
@@ -55,10 +55,10 @@ import {
 import { workflowEventBus } from '@/services/workflow';
 import { EnsembleSimulationCiemssRequest, TimeSpan, EnsembleModelConfigs } from '@/types/Types';
 import {
-	getSimulation,
 	makeEnsembleCiemssSimulation,
 	getRunResultCiemss,
-	handleSimulationsInProgress
+	handleSimulationsInProgress,
+	simulationPollAction
 } from '@/services/models/simulation-service';
 import Button from 'primevue/button';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
@@ -136,62 +136,11 @@ const getStatus = async (simulationId: string) => {
 	showSpinner.value = true;
 	if (!simulationId) return;
 
+	const runIds = [simulationId];
 	const poller = new Poller<object>()
 		.setInterval(3000)
 		.setThreshold(300)
-		.setPollAction(async () => {
-			const response = await getSimulation(simulationId);
-			if (response?.status === ProgressState.COMPLETE) {
-				const newState = handleSimulationsInProgress(
-					SimulationStateOperation.DELETE,
-					props.node,
-					simulationId
-				);
-				if (newState) {
-					emit('update-state', newState);
-				}
-				return {
-					data: response,
-					progress: null,
-					error: null
-				};
-			}
-			if (response?.status === ProgressState.RUNNING) {
-				const newState = handleSimulationsInProgress(
-					SimulationStateOperation.ADD,
-					props.node,
-					simulationId
-				);
-				if (newState) {
-					emit('update-state', newState);
-				}
-				progress.value = {
-					status: ProgressState.RUNNING,
-					value: 0
-				};
-			}
-
-			if (response?.status === ProgressState.QUEUED) {
-				const newState = handleSimulationsInProgress(
-					SimulationStateOperation.ADD,
-					props.node,
-					simulationId
-				);
-				if (newState) {
-					emit('update-state', newState);
-				}
-				progress.value = {
-					status: ProgressState.QUEUED,
-					value: 0
-				};
-			}
-
-			return {
-				data: null,
-				progress: null,
-				error: null
-			};
-		});
+		.setPollAction(async () => simulationPollAction(runIds, props.node, progress, emit));
 	const pollerResults = await poller.start();
 
 	if (pollerResults.state !== PollerState.Done || !pollerResults.data) {
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
index d8a6549869..2948167686 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
@@ -23,13 +23,13 @@ import _ from 'lodash';
 import { ref, watch, computed, onMounted } from 'vue';
 import Button from 'primevue/button';
 import { csvParse } from 'd3';
-import { ModelConfiguration, Simulation } from '@/types/Types';
+import { ModelConfiguration } from '@/types/Types';
 
 import {
 	makeForecastJob,
-	getSimulation,
 	getRunResult,
-	handleSimulationsInProgress
+	handleSimulationsInProgress,
+	simulationPollAction
 } from '@/services/models/simulation-service';
 import { ProgressState, SimulationStateOperation, WorkflowNode } from '@/types/workflow';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
@@ -86,68 +86,21 @@ const runSimulate = async () => {
 	showSpinner.value = true;
 };
 
-const getStatus = async (simulationIds: string[]) => {
+const getStatus = async (runIds: string[]) => {
 	showSpinner.value = true;
 	const poller = new Poller<object>()
 		.setInterval(3000)
 		.setThreshold(300)
-		.setPollAction(async () => {
-			const requestList: Promise<Simulation | null>[] = [];
-			simulationIds.forEach((id) => {
-				requestList.push(getSimulation(id));
-			});
-			const response = await Promise.all(requestList);
-
-			if (response.every((simulation) => simulation!.status === ProgressState.COMPLETE)) {
-				const newState = handleSimulationsInProgress(
-					SimulationStateOperation.DELETE,
-					props.node,
-					simulationIds
-				);
-				if (newState) {
-					emit('update-state', newState);
-				}
-				return {
-					data: response,
-					progress: null,
-					error: null
-				};
-			}
-			if (
-				response.find(
-					(simulation) =>
-						simulation?.status === ProgressState.QUEUED ||
-						simulation?.status === ProgressState.RUNNING
-				)
-			) {
-				const newState = handleSimulationsInProgress(
-					SimulationStateOperation.ADD,
-					props.node,
-					simulationIds
-				);
-				if (newState) {
-					emit('update-state', newState);
-				}
-				progress.value = {
-					status: ProgressState.RUNNING,
-					value: 0
-				};
-			}
-			return {
-				data: null,
-				progress: null,
-				error: null
-			};
-		});
+		.setPollAction(async () => simulationPollAction(runIds, props.node, progress, emit));
 	const pollerResults = await poller.start();
 
 	if (pollerResults.state !== PollerState.Done || !pollerResults.data) {
 		// throw if there are any failed runs for now
-		console.error('Failed', simulationIds);
+		console.error('Failed', runIds);
 		showSpinner.value = false;
 		throw Error('Failed Runs');
 	}
-	completedRunIdList.value = simulationIds;
+	completedRunIdList.value = runIds;
 	showSpinner.value = false;
 };
 
diff --git a/packages/client/hmi-client/src/services/models/simulation-service.ts b/packages/client/hmi-client/src/services/models/simulation-service.ts
index f4ea9d748d..626d47eb38 100644
--- a/packages/client/hmi-client/src/services/models/simulation-service.ts
+++ b/packages/client/hmi-client/src/services/models/simulation-service.ts
@@ -13,7 +13,7 @@ import {
 import { RunResults } from '@/types/SimulateConfig';
 import * as EventService from '@/services/event';
 import useResourcesStore from '@/stores/resources';
-import { SimulationStateOperation, WorkflowNode } from '@/types/workflow';
+import { ProgressState, SimulationStateOperation, WorkflowNode } from '@/types/workflow';
 import { cloneDeep } from 'lodash';
 
 export async function makeForecastJob(simulationParam: SimulationRequest) {
@@ -279,3 +279,52 @@ export function handleSimulationsInProgress(
 	}
 	return null;
 }
+
+export async function simulationPollAction(
+	simulationIds: string[],
+	node: WorkflowNode,
+	progress,
+	emitFn: (event: 'append-output-port' | 'update-state', ...args: any[]) => void
+) {
+	const requestList: Promise<Simulation | null>[] = [];
+	simulationIds.forEach((id) => {
+		requestList.push(getSimulation(id));
+	});
+	const response = await Promise.all(requestList);
+	if (response.every((simulation) => simulation!.status === ProgressState.COMPLETE)) {
+		const newState = handleSimulationsInProgress(
+			SimulationStateOperation.DELETE,
+			node,
+			simulationIds
+		);
+		if (newState) {
+			emitFn('update-state', newState);
+		}
+		return {
+			data: response,
+			progress: null,
+			error: null
+		};
+	}
+	if (
+		response.find(
+			(simulation) =>
+				simulation?.status === ProgressState.QUEUED || simulation?.status === ProgressState.RUNNING
+		)
+	) {
+		const newState = handleSimulationsInProgress(SimulationStateOperation.ADD, node, simulationIds);
+		if (newState) {
+			emitFn('update-state', newState);
+		}
+		progress.value = {
+			status: ProgressState.RUNNING,
+			value: 0
+		};
+	}
+
+	return {
+		data: null,
+		progress: null,
+		error: null
+	};
+}

From f5ca69ea414497e625faf40cb5fc2cbb23a3737c Mon Sep 17 00:00:00 2001
From: Cole Blanchard <cblanchard@Coles-MacBook-Pro.local>
Date: Tue, 8 Aug 2023 16:25:18 -0400
Subject: [PATCH 09/12] chore: address comments

---
 .../calibrate-ensemble-ciemss-operation.ts    |  4 +-
 .../workflow/calibrate-operation-ciemss.ts    |  4 +-
 .../workflow/calibrate-operation-julia.ts     |  4 +-
 .../workflow/simulate-ciemss-operation.ts     |  4 +-
 .../simulate-ensemble-ciemss-operation.ts     |  4 +-
 .../workflow/simulate-julia-operation.ts      |  4 +-
 .../tera-calibrate-ensemble-node-ciemss.vue   | 15 ++--
 .../workflow/tera-calibration-node-ciemss.vue | 10 +--
 .../workflow/tera-calibration-node-julia.vue  | 10 +--
 .../tera-progress-bar.vue                     |  0
 .../workflow/tera-simulate-ciemss-node.vue    | 10 +--
 .../tera-simulate-ensemble-node-ciemss.vue    | 15 ++--
 .../workflow/tera-simulate-julia-node.vue     | 10 +--
 .../src/services/models/simulation-service.ts | 78 +++++--------------
 .../client/hmi-client/src/types/workflow.ts   |  6 --
 15 files changed, 67 insertions(+), 111 deletions(-)
 rename packages/client/hmi-client/src/components/{widgets => workflow}/tera-progress-bar.vue (100%)

diff --git a/packages/client/hmi-client/src/components/workflow/calibrate-ensemble-ciemss-operation.ts b/packages/client/hmi-client/src/components/workflow/calibrate-ensemble-ciemss-operation.ts
index e2c83e3a1f..13950b76cf 100644
--- a/packages/client/hmi-client/src/components/workflow/calibrate-ensemble-ciemss-operation.ts
+++ b/packages/client/hmi-client/src/components/workflow/calibrate-ensemble-ciemss-operation.ts
@@ -16,6 +16,7 @@ export interface CalibrateEnsembleCiemssOperationState {
 	mapping: EnsembleModelConfigs[];
 	timeSpan: TimeSpan;
 	extra: EnsembleCalibrateExtraCiemss;
+	simulationsInProgress: string[];
 }
 
 export const CalibrateEnsembleCiemssOperation: Operation = {
@@ -45,7 +46,8 @@ export const CalibrateEnsembleCiemssOperation: Operation = {
 				numSamples: 50,
 				totalPopulation: 1000,
 				numIterations: 10
-			}
+			},
+			simulationsInProgress: []
 		};
 		return init;
 	}
diff --git a/packages/client/hmi-client/src/components/workflow/calibrate-operation-ciemss.ts b/packages/client/hmi-client/src/components/workflow/calibrate-operation-ciemss.ts
index dd1f837f39..3ddfe9aaca 100644
--- a/packages/client/hmi-client/src/components/workflow/calibrate-operation-ciemss.ts
+++ b/packages/client/hmi-client/src/components/workflow/calibrate-operation-ciemss.ts
@@ -14,6 +14,7 @@ export interface CalibrationOperationStateCiemss {
 	chartConfigs: ChartConfig[];
 	mapping: CalibrateMap[];
 	timeSpan: TimeSpan;
+	simulationsInProgress: string[];
 }
 
 export const CalibrationOperationCiemss: Operation = {
@@ -55,7 +56,8 @@ export const CalibrationOperationCiemss: Operation = {
 		const init: CalibrationOperationStateCiemss = {
 			chartConfigs: [],
 			mapping: [{ modelVariable: '', datasetVariable: '' }],
-			timeSpan: { start: 0, end: 90 }
+			timeSpan: { start: 0, end: 90 },
+			simulationsInProgress: []
 		};
 		return init;
 	}
diff --git a/packages/client/hmi-client/src/components/workflow/calibrate-operation-julia.ts b/packages/client/hmi-client/src/components/workflow/calibrate-operation-julia.ts
index 3cd6a32bdf..a3f9e982bf 100644
--- a/packages/client/hmi-client/src/components/workflow/calibrate-operation-julia.ts
+++ b/packages/client/hmi-client/src/components/workflow/calibrate-operation-julia.ts
@@ -28,6 +28,7 @@ export interface CalibrationOperationStateJulia {
 	mapping: CalibrateMap[];
 	extra: CalibrateExtraJulia;
 	timeSpan: TimeSpan;
+	simulationsInProgress: string[];
 }
 
 export const CalibrationOperationJulia: Operation = {
@@ -75,7 +76,8 @@ export const CalibrationOperationJulia: Operation = {
 				odeMethod: 'default',
 				calibrateMethod: CalibrateMethodOptions.GLOBAL
 			},
-			timeSpan: { start: 0, end: 90 }
+			timeSpan: { start: 0, end: 90 },
+			simulationsInProgress: []
 		};
 		return init;
 	}
diff --git a/packages/client/hmi-client/src/components/workflow/simulate-ciemss-operation.ts b/packages/client/hmi-client/src/components/workflow/simulate-ciemss-operation.ts
index 7a6c3eab38..208f2d593a 100644
--- a/packages/client/hmi-client/src/components/workflow/simulate-ciemss-operation.ts
+++ b/packages/client/hmi-client/src/components/workflow/simulate-ciemss-operation.ts
@@ -7,6 +7,7 @@ export interface SimulateCiemssOperationState {
 	currentTimespan: TimeSpan;
 	numSamples: number;
 	method: string;
+	simulationsInProgress: string[];
 }
 
 export const SimulateCiemssOperation: Operation = {
@@ -22,7 +23,8 @@ export const SimulateCiemssOperation: Operation = {
 			chartConfigs: [],
 			currentTimespan: { start: 1, end: 100 },
 			numSamples: 100,
-			method: 'dopri5'
+			method: 'dopri5',
+			simulationsInProgress: []
 		};
 		return init;
 	},
diff --git a/packages/client/hmi-client/src/components/workflow/simulate-ensemble-ciemss-operation.ts b/packages/client/hmi-client/src/components/workflow/simulate-ensemble-ciemss-operation.ts
index 4531733f16..acf14453a6 100644
--- a/packages/client/hmi-client/src/components/workflow/simulate-ensemble-ciemss-operation.ts
+++ b/packages/client/hmi-client/src/components/workflow/simulate-ensemble-ciemss-operation.ts
@@ -10,6 +10,7 @@ export interface SimulateEnsembleCiemssOperationState {
 	mapping: EnsembleModelConfigs[];
 	timeSpan: TimeSpan;
 	numSamples: number;
+	simulationsInProgress: string[];
 }
 
 export const SimulateEnsembleCiemssOperation: Operation = {
@@ -32,7 +33,8 @@ export const SimulateEnsembleCiemssOperation: Operation = {
 			chartConfigs: [],
 			mapping: [],
 			timeSpan: { start: 0, end: 40 },
-			numSamples: 40
+			numSamples: 40,
+			simulationsInProgress: []
 		};
 		return init;
 	}
diff --git a/packages/client/hmi-client/src/components/workflow/simulate-julia-operation.ts b/packages/client/hmi-client/src/components/workflow/simulate-julia-operation.ts
index 9efdec2c9b..3813b6a93c 100644
--- a/packages/client/hmi-client/src/components/workflow/simulate-julia-operation.ts
+++ b/packages/client/hmi-client/src/components/workflow/simulate-julia-operation.ts
@@ -5,6 +5,7 @@ import { ChartConfig } from '@/types/SimulateConfig';
 export interface SimulateJuliaOperationState {
 	chartConfigs: ChartConfig[];
 	currentTimespan: TimeSpan;
+	simulationsInProgress: string[];
 }
 
 export const SimulateJuliaOperation: Operation = {
@@ -18,7 +19,8 @@ export const SimulateJuliaOperation: Operation = {
 	initState: () => {
 		const init: SimulateJuliaOperationState = {
 			chartConfigs: [],
-			currentTimespan: { start: 1, end: 100 }
+			currentTimespan: { start: 1, end: 100 },
+			simulationsInProgress: []
 		};
 		return init;
 	},
diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
index bb403edc7a..f9ede893b9 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
@@ -45,20 +45,15 @@ import { ref, watch, computed, ComputedRef, onMounted } from 'vue';
 // import { csvParse } from 'd3';
 // import { ModelConfiguration } from '@/types/Types';
 // import { getRunResult } from '@/services/models/simulation-service';
-import {
-	ProgressState,
-	SimulationStateOperation,
-	WorkflowNode,
-	WorkflowStatus
-} from '@/types/workflow';
+import { ProgressState, WorkflowNode, WorkflowStatus } from '@/types/workflow';
 // import { getModelConfigurationById } from '@/services/model-configurations';
 import { workflowEventBus } from '@/services/workflow';
 import { EnsembleCalibrationCiemssRequest, TimeSpan, EnsembleModelConfigs } from '@/types/Types';
 import {
 	makeEnsembleCiemssCalibration,
 	getRunResultCiemss,
-	handleSimulationsInProgress,
-	simulationPollAction
+	simulationPollAction,
+	querySimulationInProgress
 } from '@/services/models/simulation-service';
 import Button from 'primevue/button';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
@@ -70,7 +65,7 @@ import {
 	EnsembleCalibrateExtraCiemss
 } from './calibrate-ensemble-ciemss-operation';
 import TeraSimulateChart from './tera-simulate-chart.vue';
-import TeraProgressBar from '../widgets/tera-progress-bar.vue';
+import TeraProgressBar from './tera-progress-bar.vue';
 
 const props = defineProps<{
 	node: WorkflowNode;
@@ -99,7 +94,7 @@ const datasetColumnNames = ref<string[]>();
 const progress = ref({ status: ProgressState.QUEUED, value: 0 });
 
 onMounted(() => {
-	const runIds = handleSimulationsInProgress(SimulationStateOperation.QUERY, props.node);
+	const runIds = querySimulationInProgress(props.node);
 	if (runIds.length > 0) {
 		getStatus(runIds[0]);
 	}
diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
index fb368e49fb..134fede4e8 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
@@ -105,7 +105,7 @@
 
 <script setup lang="ts">
 import { computed, shallowRef, watch, ref, ComputedRef, onMounted } from 'vue';
-import { ProgressState, SimulationStateOperation, WorkflowNode } from '@/types/workflow';
+import { ProgressState, WorkflowNode } from '@/types/workflow';
 import DataTable from 'primevue/datatable';
 import Button from 'primevue/button';
 import Dropdown from 'primevue/dropdown';
@@ -117,8 +117,8 @@ import { CalibrationRequestCiemss, CsvAsset, ModelConfiguration } from '@/types/
 import {
 	makeCalibrateJobCiemss,
 	getRunResultCiemss,
-	handleSimulationsInProgress,
-	simulationPollAction
+	simulationPollAction,
+	querySimulationInProgress
 } from '@/services/models/simulation-service';
 import { setupModelInput, setupDatasetInput } from '@/services/calibrate-workflow';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
@@ -131,7 +131,7 @@ import {
 	CalibrateMap
 } from './calibrate-operation-ciemss';
 import TeraSimulateChart from './tera-simulate-chart.vue';
-import TeraProgressBar from '../widgets/tera-progress-bar.vue';
+import TeraProgressBar from './tera-progress-bar.vue';
 
 const props = defineProps<{
 	node: WorkflowNode;
@@ -174,7 +174,7 @@ const disableRunButton = computed(
 );
 
 onMounted(() => {
-	const runIds = handleSimulationsInProgress(SimulationStateOperation.QUERY, props.node);
+	const runIds = querySimulationInProgress(props.node);
 	if (runIds.length > 0) {
 		getStatus(runIds[0]);
 	}
diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
index 9e47f04180..842ca0ac12 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
@@ -107,7 +107,7 @@
 
 <script setup lang="ts">
 import { computed, shallowRef, watch, ref, ComputedRef, onMounted } from 'vue';
-import { ProgressState, SimulationStateOperation, WorkflowNode } from '@/types/workflow';
+import { ProgressState, WorkflowNode } from '@/types/workflow';
 import DataTable from 'primevue/datatable';
 import Button from 'primevue/button';
 import Column from 'primevue/column';
@@ -117,8 +117,8 @@ import { CalibrationRequestJulia, CsvAsset, ModelConfiguration, TimeSpan } from
 import {
 	makeCalibrateJobJulia,
 	getRunResultJulia,
-	handleSimulationsInProgress,
-	simulationPollAction
+	simulationPollAction,
+	querySimulationInProgress
 } from '@/services/models/simulation-service';
 import { setupModelInput, setupDatasetInput } from '@/services/calibrate-workflow';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
@@ -130,7 +130,7 @@ import InputText from 'primevue/inputtext';
 import Dropdown from 'primevue/dropdown';
 import { Poller, PollerState } from '@/api/api';
 import TeraSimulateChart from './tera-simulate-chart.vue';
-import TeraProgressBar from '../widgets/tera-progress-bar.vue';
+import TeraProgressBar from './tera-progress-bar.vue';
 import {
 	CalibrationOperationJulia,
 	CalibrationOperationStateJulia,
@@ -169,7 +169,7 @@ const showSpinner = ref(false);
 const progress = ref({ status: ProgressState.QUEUED, value: 0 });
 
 onMounted(() => {
-	const runIds = handleSimulationsInProgress(SimulationStateOperation.QUERY, props.node);
+	const runIds = querySimulationInProgress(props.node);
 	if (runIds.length > 0) {
 		getStatus(runIds[0]);
 	}
diff --git a/packages/client/hmi-client/src/components/widgets/tera-progress-bar.vue b/packages/client/hmi-client/src/components/workflow/tera-progress-bar.vue
similarity index 100%
rename from packages/client/hmi-client/src/components/widgets/tera-progress-bar.vue
rename to packages/client/hmi-client/src/components/workflow/tera-progress-bar.vue
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
index 65d4a7ac6f..c7dceb8417 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
@@ -47,17 +47,17 @@ import Dropdown from 'primevue/dropdown';
 import {
 	makeForecastJobCiemss as makeForecastJob,
 	getRunResultCiemss,
-	handleSimulationsInProgress,
-	simulationPollAction
+	simulationPollAction,
+	querySimulationInProgress
 } from '@/services/models/simulation-service';
 import InputNumber from 'primevue/inputnumber';
-import { ProgressState, SimulationStateOperation, WorkflowNode } from '@/types/workflow';
+import { ProgressState, WorkflowNode } from '@/types/workflow';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
 import { workflowEventBus } from '@/services/workflow';
 import { Poller, PollerState } from '@/api/api';
 import TeraSimulateChart from './tera-simulate-chart.vue';
 import { SimulateCiemssOperation, SimulateCiemssOperationState } from './simulate-ciemss-operation';
-import TeraProgressBar from '../widgets/tera-progress-bar.vue';
+import TeraProgressBar from './tera-progress-bar.vue';
 
 const props = defineProps<{
 	node: WorkflowNode;
@@ -104,7 +104,7 @@ const runSimulate = async () => {
 };
 
 onMounted(() => {
-	const runIds = handleSimulationsInProgress(SimulationStateOperation.QUERY, props.node);
+	const runIds = querySimulationInProgress(props.node);
 	if (runIds.length > 0) {
 		getStatus(runIds);
 	}
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
index 6f385bb5fa..f7aa51e8d2 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
@@ -45,20 +45,15 @@ import { ref, watch, computed, ComputedRef, onMounted } from 'vue';
 // import { csvParse } from 'd3';
 // import { ModelConfiguration } from '@/types/Types';
 // import { getRunResult } from '@/services/models/simulation-service';
-import {
-	ProgressState,
-	SimulationStateOperation,
-	WorkflowNode,
-	WorkflowStatus
-} from '@/types/workflow';
+import { ProgressState, WorkflowNode, WorkflowStatus } from '@/types/workflow';
 // import { getModelConfigurationById } from '@/services/model-configurations';
 import { workflowEventBus } from '@/services/workflow';
 import { EnsembleSimulationCiemssRequest, TimeSpan, EnsembleModelConfigs } from '@/types/Types';
 import {
 	makeEnsembleCiemssSimulation,
 	getRunResultCiemss,
-	handleSimulationsInProgress,
-	simulationPollAction
+	simulationPollAction,
+	querySimulationInProgress
 } from '@/services/models/simulation-service';
 import Button from 'primevue/button';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
@@ -68,7 +63,7 @@ import {
 	SimulateEnsembleCiemssOperation
 } from './simulate-ensemble-ciemss-operation';
 import TeraSimulateChart from './tera-simulate-chart.vue';
-import TeraProgressBar from '../widgets/tera-progress-bar.vue';
+import TeraProgressBar from './tera-progress-bar.vue';
 
 const props = defineProps<{
 	node: WorkflowNode;
@@ -89,7 +84,7 @@ const simulationIds: ComputedRef<any | undefined> = computed(
 const progress = ref({ status: ProgressState.QUEUED, value: 0 });
 
 onMounted(() => {
-	const runIds = handleSimulationsInProgress(SimulationStateOperation.QUERY, props.node);
+	const runIds = querySimulationInProgress(props.node);
 	if (runIds.length > 0) {
 		getStatus(runIds[0]);
 	}
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
index 2948167686..0fa7947d6c 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
@@ -28,10 +28,10 @@ import { ModelConfiguration } from '@/types/Types';
 import {
 	makeForecastJob,
 	getRunResult,
-	handleSimulationsInProgress,
-	simulationPollAction
+	simulationPollAction,
+	querySimulationInProgress
 } from '@/services/models/simulation-service';
-import { ProgressState, SimulationStateOperation, WorkflowNode } from '@/types/workflow';
+import { ProgressState, WorkflowNode } from '@/types/workflow';
 import { ChartConfig, RunResults } from '@/types/SimulateConfig';
 
 import { getModelConfigurationById } from '@/services/model-configurations';
@@ -39,7 +39,7 @@ import { workflowEventBus } from '@/services/workflow';
 import { Poller, PollerState } from '@/api/api';
 import TeraSimulateChart from './tera-simulate-chart.vue';
 import { SimulateJuliaOperation, SimulateJuliaOperationState } from './simulate-julia-operation';
-import TeraProgressBar from '../widgets/tera-progress-bar.vue';
+import TeraProgressBar from './tera-progress-bar.vue';
 
 const props = defineProps<{
 	node: WorkflowNode;
@@ -55,7 +55,7 @@ const modelConfigId = computed<string | undefined>(() => props.node.inputs[0].va
 const progress = ref({ status: ProgressState.QUEUED, value: 0 });
 
 onMounted(() => {
-	const runIds = handleSimulationsInProgress(SimulationStateOperation.QUERY, props.node);
+	const runIds = querySimulationInProgress(props.node);
 	if (runIds.length > 0) {
 		getStatus(runIds);
 	}
diff --git a/packages/client/hmi-client/src/services/models/simulation-service.ts b/packages/client/hmi-client/src/services/models/simulation-service.ts
index 626d47eb38..8ab7d31b40 100644
--- a/packages/client/hmi-client/src/services/models/simulation-service.ts
+++ b/packages/client/hmi-client/src/services/models/simulation-service.ts
@@ -13,8 +13,8 @@ import {
 import { RunResults } from '@/types/SimulateConfig';
 import * as EventService from '@/services/event';
 import useResourcesStore from '@/stores/resources';
-import { ProgressState, SimulationStateOperation, WorkflowNode } from '@/types/workflow';
-import { cloneDeep } from 'lodash';
+import { ProgressState, WorkflowNode } from '@/types/workflow';
+import { cloneDeep, isEqual } from 'lodash';
 
 export async function makeForecastJob(simulationParam: SimulationRequest) {
 	try {
@@ -199,87 +199,49 @@ export async function makeEnsembleCiemssCalibration(params: EnsembleCalibrationC
 }
 
 // add a simulation in progress if it does not exist
-const addSimulationInProgress = (node: WorkflowNode, runIds: string | string[]) => {
+const addSimulationInProgress = (node: WorkflowNode, runIds: string[]) => {
 	const state = cloneDeep(node.state);
 
 	if (!state.simulationsInProgress) {
 		state.simulationsInProgress = [];
 	}
-
-	if (typeof runIds === 'string') {
-		// single run id
-		if (!state.simulationsInProgress.find((simulation) => simulation === runIds)) {
-			state.simulationsInProgress.push(runIds);
-			return state;
-		}
-		return null;
-	}
-
-	// array of run ids
-	let allExist = false;
 	runIds.forEach((runId) => {
 		if (!state.simulationsInProgress.includes(runId)) {
 			state.simulationsInProgress.push(runId);
-			allExist = true;
 		}
 	});
-	return allExist ? state : null;
+
+	return state;
 };
 
-// delete a simulation in progress
-const deleteSimulationInProgress = (node: WorkflowNode, runIds: string | string[]) => {
+// delete a simulation in progress if it exists
+const deleteSimulationInProgress = (node: WorkflowNode, runIds: string[]) => {
 	const state = cloneDeep(node.state);
 
 	if (state.simulationsInProgress) {
-		// handle single run id
-		if (typeof runIds === 'string') {
-			state.simulationsInProgress = state.simulationsInProgress.filter(
-				(simulation) => simulation !== runIds
-			);
-			return state;
-		}
-
-		// handle array of run ids
 		runIds.forEach((runId) => {
 			const index = state.simulationsInProgress.indexOf(runId);
 			if (index !== -1) {
 				state.simulationsInProgress.splice(index, 1);
 			}
 		});
-		return state;
 	}
 
-	return null;
+	return state;
 };
 
-const querySimulationInProgress = (node: WorkflowNode): string[] => {
+// This function returns a string array of run ids.
+export const querySimulationInProgress = (node: WorkflowNode): string[] => {
 	const state = node.state;
 	if (state.simulationsInProgress && state.simulationsInProgress.length > 0) {
-		return state.simulationsInProgress; // getStatus(state.simulationsInProgress[0])
+		// return all run ids on the node
+		return state.simulationsInProgress;
 	}
 
+	// return an empty array if no run ids are present
 	return [];
 };
 
-// handle all simulation in progress operations
-export function handleSimulationsInProgress(
-	operation: SimulationStateOperation,
-	node: WorkflowNode,
-	runId: string | string[] = ''
-) {
-	switch (operation) {
-		case SimulationStateOperation.ADD:
-			return addSimulationInProgress(node, runId);
-		case SimulationStateOperation.DELETE:
-			return deleteSimulationInProgress(node, runId);
-		case SimulationStateOperation.QUERY:
-			return querySimulationInProgress(node);
-		default:
-			break;
-	}
-	return null;
-}
-
 export async function simulationPollAction(
 	simulationIds: string[],
 	node: WorkflowNode,
@@ -292,12 +254,9 @@ export async function simulationPollAction(
 	});
 	const response = await Promise.all(requestList);
 	if (response.every((simulation) => simulation!.status === ProgressState.COMPLETE)) {
-		const newState = handleSimulationsInProgress(
-			SimulationStateOperation.DELETE,
-			node,
-			simulationIds
-		);
-		if (newState) {
+		const newState = deleteSimulationInProgress(node, simulationIds);
+		// only update state if it is different from the current one
+		if (!isEqual(node.state, newState)) {
 			emitFn('update-state', newState);
 		}
 		return {
@@ -312,8 +271,9 @@ export async function simulationPollAction(
 				simulation?.status === ProgressState.QUEUED || simulation?.status === ProgressState.RUNNING
 		)
 	) {
-		const newState = handleSimulationsInProgress(SimulationStateOperation.ADD, node, simulationIds);
-		if (newState) {
+		const newState = addSimulationInProgress(node, simulationIds);
+		// only update state if it is different from the current one
+		if (!isEqual(node.state, newState)) {
 			emitFn('update-state', newState);
 		}
 		progress.value = {
diff --git a/packages/client/hmi-client/src/types/workflow.ts b/packages/client/hmi-client/src/types/workflow.ts
index 30a9f7e06b..f13d1b44a1 100644
--- a/packages/client/hmi-client/src/types/workflow.ts
+++ b/packages/client/hmi-client/src/types/workflow.ts
@@ -137,9 +137,3 @@ export enum ProgressState {
 	RUNNING = 'running',
 	COMPLETE = 'complete'
 }
-
-export enum SimulationStateOperation {
-	DELETE = 'delete',
-	ADD = 'add',
-	QUERY = 'query'
-}

From d66dc438b0d28bfbef95b8ff5e1d6b451c237abc Mon Sep 17 00:00:00 2001
From: Cole Blanchard <cblanchard@Coles-MacBook-Pro.local>
Date: Tue, 8 Aug 2023 16:44:30 -0400
Subject: [PATCH 10/12] chore: stop poller when unmounted

---
 .../workflow/tera-calibrate-ensemble-node-ciemss.vue   | 10 ++++++++--
 .../workflow/tera-calibration-node-ciemss.vue          | 10 ++++++++--
 .../workflow/tera-calibration-node-julia.vue           | 10 ++++++++--
 .../components/workflow/tera-simulate-ciemss-node.vue  | 10 ++++++++--
 .../workflow/tera-simulate-ensemble-node-ciemss.vue    | 10 ++++++++--
 .../components/workflow/tera-simulate-julia-node.vue   | 10 ++++++++--
 6 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
index f9ede893b9..9b18272da4 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
@@ -41,7 +41,7 @@
 
 <script setup lang="ts">
 import _ from 'lodash';
-import { ref, watch, computed, ComputedRef, onMounted } from 'vue';
+import { ref, watch, computed, ComputedRef, onMounted, onUnmounted } from 'vue';
 // import { csvParse } from 'd3';
 // import { ModelConfiguration } from '@/types/Types';
 // import { getRunResult } from '@/services/models/simulation-service';
@@ -93,6 +93,8 @@ const simulationIds: ComputedRef<any | undefined> = computed(
 const datasetColumnNames = ref<string[]>();
 const progress = ref({ status: ProgressState.QUEUED, value: 0 });
 
+const poller = new Poller();
+
 onMounted(() => {
 	const runIds = querySimulationInProgress(props.node);
 	if (runIds.length > 0) {
@@ -100,6 +102,10 @@ onMounted(() => {
 	}
 });
 
+onUnmounted(() => {
+	poller.stop();
+});
+
 const runEnsemble = async () => {
 	if (!datasetId.value || !currentDatasetFileName.value) return;
 
@@ -129,7 +135,7 @@ const getStatus = async (simulationId: string) => {
 	if (!simulationId) return;
 
 	const runIds = [simulationId];
-	const poller = new Poller<object>()
+	poller
 		.setInterval(3000)
 		.setThreshold(300)
 		.setPollAction(async () => simulationPollAction(runIds, props.node, progress, emit));
diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
index 134fede4e8..dc11d1d1e2 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
@@ -104,7 +104,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, shallowRef, watch, ref, ComputedRef, onMounted } from 'vue';
+import { computed, shallowRef, watch, ref, ComputedRef, onMounted, onUnmounted } from 'vue';
 import { ProgressState, WorkflowNode } from '@/types/workflow';
 import DataTable from 'primevue/datatable';
 import Button from 'primevue/button';
@@ -164,6 +164,8 @@ const numIterations = ref(100);
 const method = ref('dopri5');
 const ciemssMethodOptions = ref(['dopri5', 'euler']);
 
+const poller = new Poller();
+
 const disableRunButton = computed(
 	() =>
 		!currentDatasetFileName.value ||
@@ -180,6 +182,10 @@ onMounted(() => {
 	}
 });
 
+onUnmounted(() => {
+	poller.stop();
+});
+
 const runCalibrate = async () => {
 	if (
 		!modelConfigId.value ||
@@ -241,7 +247,7 @@ const getStatus = async (simulationId: string) => {
 	if (!simulationId) return;
 
 	const runIds = [simulationId];
-	const poller = new Poller<object>()
+	poller
 		.setInterval(3000)
 		.setThreshold(300)
 		.setPollAction(async () => simulationPollAction(runIds, props.node, progress, emit));
diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
index 842ca0ac12..dbf57c8876 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
@@ -106,7 +106,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, shallowRef, watch, ref, ComputedRef, onMounted } from 'vue';
+import { computed, shallowRef, watch, ref, ComputedRef, onMounted, onUnmounted } from 'vue';
 import { ProgressState, WorkflowNode } from '@/types/workflow';
 import DataTable from 'primevue/datatable';
 import Button from 'primevue/button';
@@ -168,6 +168,8 @@ const csvAsset = shallowRef<CsvAsset | undefined>(undefined);
 const showSpinner = ref(false);
 const progress = ref({ status: ProgressState.QUEUED, value: 0 });
 
+const poller = new Poller();
+
 onMounted(() => {
 	const runIds = querySimulationInProgress(props.node);
 	if (runIds.length > 0) {
@@ -175,6 +177,10 @@ onMounted(() => {
 	}
 });
 
+onUnmounted(() => {
+	poller.stop();
+});
+
 const disableRunButton = computed(
 	() =>
 		!currentDatasetFileName.value ||
@@ -236,7 +242,7 @@ const getStatus = async (simulationId: string) => {
 	if (!simulationId) return;
 
 	const runIds = [simulationId];
-	const poller = new Poller<object>()
+	poller
 		.setInterval(3000)
 		.setThreshold(300)
 		.setPollAction(async () => simulationPollAction(runIds, props.node, progress, emit));
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
index c7dceb8417..e68cec95be 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
@@ -39,7 +39,7 @@
 
 <script setup lang="ts">
 import _ from 'lodash';
-import { ref, watch, onMounted } from 'vue';
+import { ref, watch, onMounted, onUnmounted } from 'vue';
 import Button from 'primevue/button';
 import Accordion from 'primevue/accordion';
 import AccordionTab from 'primevue/accordiontab';
@@ -76,6 +76,8 @@ const runResults = ref<RunResults>({});
 const runConfigs = ref<{ [paramKey: string]: number[] }>({});
 const progress = ref({ status: ProgressState.QUEUED, value: 0 });
 
+const poller = new Poller();
+
 const runSimulate = async () => {
 	const modelConfigurationList = props.node.inputs[0].value;
 	if (!modelConfigurationList?.length) return;
@@ -110,9 +112,13 @@ onMounted(() => {
 	}
 });
 
+onUnmounted(() => {
+	poller.stop();
+});
+
 const getStatus = async (runIds: string[]) => {
 	showSpinner.value = true;
-	const poller = new Poller<object>()
+	poller
 		.setInterval(3000)
 		.setThreshold(300)
 		.setPollAction(async () => simulationPollAction(runIds, props.node, progress, emit));
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
index f7aa51e8d2..6aa8004b93 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
@@ -41,7 +41,7 @@
 
 <script setup lang="ts">
 import _ from 'lodash';
-import { ref, watch, computed, ComputedRef, onMounted } from 'vue';
+import { ref, watch, computed, ComputedRef, onMounted, onUnmounted } from 'vue';
 // import { csvParse } from 'd3';
 // import { ModelConfiguration } from '@/types/Types';
 // import { getRunResult } from '@/services/models/simulation-service';
@@ -83,6 +83,8 @@ const simulationIds: ComputedRef<any | undefined> = computed(
 );
 const progress = ref({ status: ProgressState.QUEUED, value: 0 });
 
+const poller = new Poller();
+
 onMounted(() => {
 	const runIds = querySimulationInProgress(props.node);
 	if (runIds.length > 0) {
@@ -90,6 +92,10 @@ onMounted(() => {
 	}
 });
 
+onUnmounted(() => {
+	poller.stop();
+});
+
 const runEnsemble = async () => {
 	const params: EnsembleSimulationCiemssRequest = {
 		modelConfigs: ensembleConfigs.value,
@@ -132,7 +138,7 @@ const getStatus = async (simulationId: string) => {
 	if (!simulationId) return;
 
 	const runIds = [simulationId];
-	const poller = new Poller<object>()
+	poller
 		.setInterval(3000)
 		.setThreshold(300)
 		.setPollAction(async () => simulationPollAction(runIds, props.node, progress, emit));
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
index 0fa7947d6c..ce867aee5b 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
@@ -20,7 +20,7 @@
 
 <script setup lang="ts">
 import _ from 'lodash';
-import { ref, watch, computed, onMounted } from 'vue';
+import { ref, watch, computed, onMounted, onUnmounted } from 'vue';
 import Button from 'primevue/button';
 import { csvParse } from 'd3';
 import { ModelConfiguration } from '@/types/Types';
@@ -54,6 +54,8 @@ const modelConfiguration = ref<ModelConfiguration | null>(null);
 const modelConfigId = computed<string | undefined>(() => props.node.inputs[0].value?.[0]);
 const progress = ref({ status: ProgressState.QUEUED, value: 0 });
 
+const poller = new Poller();
+
 onMounted(() => {
 	const runIds = querySimulationInProgress(props.node);
 	if (runIds.length > 0) {
@@ -61,6 +63,10 @@ onMounted(() => {
 	}
 });
 
+onUnmounted(() => {
+	poller.stop();
+});
+
 const runSimulate = async () => {
 	const modelConfigurationList = props.node.inputs[0].value;
 	if (!modelConfigurationList?.length) return;
@@ -88,7 +94,7 @@ const runSimulate = async () => {
 
 const getStatus = async (runIds: string[]) => {
 	showSpinner.value = true;
-	const poller = new Poller<object>()
+	poller
 		.setInterval(3000)
 		.setThreshold(300)
 		.setPollAction(async () => simulationPollAction(runIds, props.node, progress, emit));

From 53d1b83613749e5d1b305e89138d73017f4479d0 Mon Sep 17 00:00:00 2001
From: Cole Blanchard <cblanchard@Coles-MacBook-Pro.local>
Date: Wed, 9 Aug 2023 16:17:40 -0400
Subject: [PATCH 11/12] chore: progress bar tweaks

---
 .../workflow/tera-calibrate-ensemble-node-ciemss.vue         | 2 +-
 .../src/components/workflow/tera-calibration-node-ciemss.vue | 2 +-
 .../src/components/workflow/tera-calibration-node-julia.vue  | 2 +-
 .../hmi-client/src/components/workflow/tera-progress-bar.vue | 5 ++++-
 .../src/components/workflow/tera-simulate-ciemss-node.vue    | 2 +-
 .../workflow/tera-simulate-ensemble-node-ciemss.vue          | 2 +-
 .../src/components/workflow/tera-simulate-julia-node.vue     | 2 +-
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
index 9b18272da4..0a1d3a1a36 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibrate-ensemble-node-ciemss.vue
@@ -35,7 +35,7 @@
 		</section>
 	</section>
 	<section v-else>
-		<tera-progress-bar :value="progress.value" :status="progress.status"></tera-progress-bar>
+		<tera-progress-bar :value="progress.value" :status="progress.status" />
 	</section>
 </template>
 
diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
index dc11d1d1e2..40f93ea11a 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-ciemss.vue
@@ -99,7 +99,7 @@
 		/>
 	</section>
 	<section v-else>
-		<tera-progress-bar :value="progress.value" :status="progress.status"></tera-progress-bar>
+		<tera-progress-bar :value="progress.value" :status="progress.status" />
 	</section>
 </template>
 
diff --git a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
index dbf57c8876..aafc8e7e35 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-calibration-node-julia.vue
@@ -101,7 +101,7 @@
 		/>
 	</section>
 	<section v-else>
-		<tera-progress-bar :value="progress.value" :status="progress.status"></tera-progress-bar>
+		<tera-progress-bar :value="progress.value" :status="progress.status" />
 	</section>
 </template>
 
diff --git a/packages/client/hmi-client/src/components/workflow/tera-progress-bar.vue b/packages/client/hmi-client/src/components/workflow/tera-progress-bar.vue
index 6396b75e58..03df7cfcc3 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-progress-bar.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-progress-bar.vue
@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<i class="pi pi-spin pi-spinner"></i>
-		<span>{{ props.status }}...{{ props.value ? '(' + props.value + '%)' : null }}</span>
+		<p>{{ message }}</p>
 		<ProgressBar v-if="props.value" class="progress-bar" :value="props.value"></ProgressBar>
 	</div>
 </template>
@@ -9,6 +9,9 @@
 <script setup lang="ts">
 import { ProgressState } from '@/types/workflow';
 import ProgressBar from 'primevue/progressbar';
+import { computed } from 'vue';
+
+const message = computed(() => `${props.status}...${props.value ? `(${props.value}%)` : ''}`);
 
 const props = defineProps<{
 	status: ProgressState;
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
index e68cec95be..ab3f4d0ae7 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-ciemss-node.vue
@@ -33,7 +33,7 @@
 		</Accordion>
 	</section>
 	<section v-else>
-		<tera-progress-bar :value="progress.value" :status="progress.status"></tera-progress-bar>
+		<tera-progress-bar :value="progress.value" :status="progress.status" />
 	</section>
 </template>
 
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
index 6aa8004b93..83e84ac558 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-ensemble-node-ciemss.vue
@@ -35,7 +35,7 @@
 		</section>
 	</section>
 	<section v-else>
-		<tera-progress-bar :value="progress.value" :status="progress.status"></tera-progress-bar>
+		<tera-progress-bar :value="progress.value" :status="progress.status" />
 	</section>
 </template>
 
diff --git a/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue b/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
index ce867aee5b..df4d05fbb6 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-simulate-julia-node.vue
@@ -14,7 +14,7 @@
 		<Button class="add-chart" text @click="addChart" label="Add Chart" icon="pi pi-plus"></Button>
 	</section>
 	<section v-else>
-		<tera-progress-bar :value="progress.value" :status="progress.status"></tera-progress-bar>
+		<tera-progress-bar :value="progress.value" :status="progress.status" />
 	</section>
 </template>
 

From 7ebad1daff9f634e20e2a38ef36cc3c703bd8ea2 Mon Sep 17 00:00:00 2001
From: Cole Blanchard <cblanchard@Coles-MacBook-Pro.local>
Date: Thu, 10 Aug 2023 09:09:18 -0400
Subject: [PATCH 12/12] chore: type progress state

---
 .../hmi-client/src/services/models/simulation-service.ts       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/hmi-client/src/services/models/simulation-service.ts b/packages/client/hmi-client/src/services/models/simulation-service.ts
index 8ab7d31b40..1680736f55 100644
--- a/packages/client/hmi-client/src/services/models/simulation-service.ts
+++ b/packages/client/hmi-client/src/services/models/simulation-service.ts
@@ -15,6 +15,7 @@ import * as EventService from '@/services/event';
 import useResourcesStore from '@/stores/resources';
 import { ProgressState, WorkflowNode } from '@/types/workflow';
 import { cloneDeep, isEqual } from 'lodash';
+import { Ref } from 'vue';
 
 export async function makeForecastJob(simulationParam: SimulationRequest) {
 	try {
@@ -245,7 +246,7 @@ export const querySimulationInProgress = (node: WorkflowNode): string[] => {
 export async function simulationPollAction(
 	simulationIds: string[],
 	node: WorkflowNode,
-	progress,
+	progress: Ref<{ status: ProgressState; value: number }>,
 	emitFn: (event: 'append-output-port' | 'update-state', ...args: any[]) => void
 ) {
 	const requestList: Promise<Simulation | null>[] = [];