From d28cbdc4681f0e0cb6e70b41ef6165941adc0d3e Mon Sep 17 00:00:00 2001
From: Tom Szendrey <T.Szendrey@hotmail.com>
Date: Wed, 23 Oct 2024 16:41:46 -0400
Subject: [PATCH 1/8] first step

---
 .../tera-optimize-ciemss-drilldown.vue        | 58 ++++++++++++++++---
 1 file changed, 49 insertions(+), 9 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
index 6a9c8e87c9..64bab9d13a 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
@@ -25,7 +25,21 @@
 								:disabled="_.isEmpty(node.outputs[0].value)"
 							/>
 							<tera-pyciemss-cancel-button class="mr-auto" :simulation-run-id="cancelRunId" />
-							<Button :disabled="isRunDisabled" label="Run" icon="pi pi-play" @click="runOptimize" />
+							<div
+								v-tooltip="{
+									value: `${runButtonMessage}`,
+									pt: {
+										arrow: {
+											style: {
+												borderBottomColor: 'var(--p-primary-color)'
+											}
+										},
+										text: '!bg-primary !text-primary-contrast !font-medium'
+									}
+								}"
+							>
+								<Button :disabled="isRunDisabled" label="Run" icon="pi pi-play" @click="runOptimize" />
+							</div>
 						</span>
 					</div>
 
@@ -405,7 +419,6 @@ import { logger } from '@/utils/logger';
 import { nodeMetadata } from '@/components/workflow/util';
 import { WorkflowNode } from '@/types/workflow';
 import TeraSliderPanel from '@/components/widgets/tera-slider-panel.vue';
-
 import TeraNotebookError from '@/components/drilldown/tera-notebook-error.vue';
 import { flattenInterventionData, getInterventionPolicyById } from '@/services/intervention-policy';
 import TeraCheckbox from '@/components/widgets/tera-checkbox.vue';
@@ -512,14 +525,41 @@ const datasetId = computed(() => {
 
 const displayOptimizationResultMessage = ref(true);
 
-const isRunDisabled = computed(() => {
+// Checks for disabling run button:
+const isCriteriaReady = computed(() => {
 	const activeConstraintGroups = knobs.value.constraintGroups.filter((ele) => ele.isActive);
-	return (
-		activeConstraintGroups.length === 0 ||
-		!activeConstraintGroups.every((ele) => ele.targetVariable) ||
-		knobs.value.interventionPolicyGroups.length === 0 ||
-		activePolicyGroups.value.length <= 0
-	);
+	return activeConstraintGroups.length !== 0 && activeConstraintGroups.every((ele) => ele.targetVariable);
+});
+
+const isInterventionReady = computed(
+	() => knobs.value.interventionPolicyGroups.length !== 0 && activePolicyGroups.value.length >= 0
+);
+
+const isEndTimeValid = computed(() =>
+	activePolicyGroups.value.every((ele) => {
+		if (
+			[OptimizationInterventionObjective.startTime, OptimizationInterventionObjective.paramValueAndStartTime].includes(
+				ele.optimizationType
+			)
+		) {
+			return ele.endTime <= knobs.value.endTime;
+		}
+		return true;
+	})
+);
+
+const isRunDisabled = computed(() => !isCriteriaReady.value || !isInterventionReady.value || !isEndTimeValid.value);
+
+const criteriaReadyMessage = '-All success criteria must be filled in.';
+const interventionReadyMessage = '-Must contain at least one active intervention policy that is filled in.';
+const endTimeMessage = '-Optimize setting end time must be greater than or equal to all intervention end times';
+
+const runButtonMessage = computed(() => {
+	let aString = '';
+	if (!isCriteriaReady.value) aString = `${aString + criteriaReadyMessage}\n`;
+	if (!isInterventionReady.value) aString = `${aString + interventionReadyMessage}\n`;
+	if (!isEndTimeValid.value) aString = `${aString + endTimeMessage}\n`;
+	return aString;
 });
 
 const presetType = computed(() => {

From b93fb40e011afc3f2cb8645d831cd4d89719429e Mon Sep 17 00:00:00 2001
From: Tom Szendrey <T.Szendrey@hotmail.com>
Date: Fri, 25 Oct 2024 09:54:20 -0400
Subject: [PATCH 2/8] add Required icons to criteria

---
 .../tera-optimize-criterion-group-form.vue           | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-criterion-group-form.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-criterion-group-form.vue
index 3fa23350a7..99f1da3eac 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-criterion-group-form.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-criterion-group-form.vue
@@ -28,8 +28,10 @@
 				option-value="value"
 				v-model="config.targetVariable"
 				placeholder="Select"
+				:invalid="_.isEmpty(config.targetVariable)"
 				@update:model-value="emit('update-self', config)"
 			/>
+			<i v-if="_.isEmpty(config.targetVariable)" class="pi pi-exclamation-circle" v-tooltip="requiredTooltip" />
 			is
 			<Dropdown
 				class="toolbar-button"
@@ -44,6 +46,7 @@
 			/>
 			a threshold of
 			<tera-input-number v-model="config.threshold" @update:model-value="emit('update-self', config)" />
+			<i v-if="!config.threshold" class="pi pi-exclamation-circle" v-tooltip="requiredTooltip" />
 			at
 			<Dropdown
 				:options="[
@@ -56,8 +59,11 @@
 				@update:model-value="emit('update-self', config)"
 			/>
 			in
-			<tera-input-number v-model="config.riskTolerance" @update:model-value="emit('update-self', config)" />% of
-			simulated outcomes
+			<tera-input-number v-model="config.riskTolerance" @update:model-value="emit('update-self', config)" /><i
+				v-if="!config.riskTolerance"
+				class="pi pi-exclamation-circle"
+				v-tooltip="requiredTooltip"
+			/>% of simulated outcomes
 		</div>
 		<div v-else class="section-row">
 			Ensure <b>{{ config.targetVariable }}</b> is <b>{{ config.isMinimized ? 'below' : 'above' }}</b> a threshold of
@@ -84,7 +90,7 @@ const props = defineProps<{
 const emit = defineEmits(['update-self', 'delete-self']);
 
 const config = ref<Criterion>(_.cloneDeep(props.criterion));
-
+const requiredTooltip = 'Required';
 const isEditing = ref<boolean>(false);
 
 const onEdit = () => {

From 9e4126cc0ca6de6bf28290c8996e58e9b7f9af88 Mon Sep 17 00:00:00 2001
From: Tom Szendrey <T.Szendrey@hotmail.com>
Date: Fri, 25 Oct 2024 09:54:50 -0400
Subject: [PATCH 3/8] add some tooltips to required sections

---
 .../tera-optimize-ciemss-drilldown.vue        | 50 ++++++++-----------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
index 64bab9d13a..79d012b703 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
@@ -25,19 +25,7 @@
 								:disabled="_.isEmpty(node.outputs[0].value)"
 							/>
 							<tera-pyciemss-cancel-button class="mr-auto" :simulation-run-id="cancelRunId" />
-							<div
-								v-tooltip="{
-									value: `${runButtonMessage}`,
-									pt: {
-										arrow: {
-											style: {
-												borderBottomColor: 'var(--p-primary-color)'
-											}
-										},
-										text: '!bg-primary !text-primary-contrast !font-medium'
-									}
-								}"
-							>
+							<div v-tooltip="runButtonMessage">
 								<Button :disabled="isRunDisabled" label="Run" icon="pi pi-play" @click="runOptimize" />
 							</div>
 						</span>
@@ -62,7 +50,10 @@
 						/>
 					</section>
 					<section class="form-section">
-						<h5>Intervention policy</h5>
+						<h5>
+							Intervention policy
+							<i v-if="!isInterventionReady" v-tooltip="interventionReadyMessage" class="pi pi-exclamation-circle" />
+						</h5>
 						<template v-for="(cfg, idx) in knobs.interventionPolicyGroups">
 							<tera-static-intervention-policy-group
 								v-if="
@@ -531,9 +522,7 @@ const isCriteriaReady = computed(() => {
 	return activeConstraintGroups.length !== 0 && activeConstraintGroups.every((ele) => ele.targetVariable);
 });
 
-const isInterventionReady = computed(
-	() => knobs.value.interventionPolicyGroups.length !== 0 && activePolicyGroups.value.length >= 0
-);
+const isInterventionReady = computed(() => activePolicyGroups.value.length > 0);
 
 const isEndTimeValid = computed(() =>
 	activePolicyGroups.value.every((ele) => {
@@ -549,18 +538,23 @@ const isEndTimeValid = computed(() =>
 );
 
 const isRunDisabled = computed(() => !isCriteriaReady.value || !isInterventionReady.value || !isEndTimeValid.value);
+console.log(isInterventionReady);
+console.log(isRunDisabled);
+const criteriaReadyMessage = computed(() =>
+	!isCriteriaReady.value ? 'All success criteria must be filled in. \n' : ''
+);
+const interventionReadyMessage = computed(() =>
+	!isInterventionReady.value ? 'Must contain at least one active intervention policy that is filled in. \n' : ''
+);
+const endTimeMessage = computed(() =>
+	!isEndTimeValid.value
+		? 'Optimize setting end time must be greater than or equal to all intervention end times. \n'
+		: ''
+);
 
-const criteriaReadyMessage = '-All success criteria must be filled in.';
-const interventionReadyMessage = '-Must contain at least one active intervention policy that is filled in.';
-const endTimeMessage = '-Optimize setting end time must be greater than or equal to all intervention end times';
-
-const runButtonMessage = computed(() => {
-	let aString = '';
-	if (!isCriteriaReady.value) aString = `${aString + criteriaReadyMessage}\n`;
-	if (!isInterventionReady.value) aString = `${aString + interventionReadyMessage}\n`;
-	if (!isEndTimeValid.value) aString = `${aString + endTimeMessage}\n`;
-	return aString;
-});
+const runButtonMessage = computed(
+	() => `${criteriaReadyMessage.value} ${interventionReadyMessage.value} ${endTimeMessage.value}`
+);
 
 const presetType = computed(() => {
 	if (

From 94a1744c7d1a5ada7d1e4e4e5959e3d81b84583a Mon Sep 17 00:00:00 2001
From: Tom Szendrey <T.Szendrey@hotmail.com>
Date: Fri, 25 Oct 2024 10:38:14 -0400
Subject: [PATCH 4/8] adding tooltip for endtime

---
 .../ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
index 79d012b703..5fef640b94 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
@@ -97,8 +97,10 @@
 								label="End time"
 								:start-date="modelConfiguration.temporalContext"
 								:calendar-settings="getCalendarSettingsFromModel(model)"
+								:invalid="!isEndTimeValid"
 								v-model="knobs.endTime"
 							/>
+							<i v-if="!isEndTimeValid" v-tooltip="endTimeMessage" class="pi pi-exclamation-circle" />
 						</div>
 						<div class="input-row">
 							<div class="label-and-input">

From aa4e151b4f59162f2c5ddb793175183002702a8a Mon Sep 17 00:00:00 2001
From: Tom Szendrey <T.Szendrey@hotmail.com>
Date: Fri, 25 Oct 2024 11:10:42 -0400
Subject: [PATCH 5/8] icon style to fit content

---
 .../ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
index 5fef640b94..ac08ff2a6f 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
@@ -100,7 +100,12 @@
 								:invalid="!isEndTimeValid"
 								v-model="knobs.endTime"
 							/>
-							<i v-if="!isEndTimeValid" v-tooltip="endTimeMessage" class="pi pi-exclamation-circle" />
+							<i
+								class="pi pi-exclamation-circle"
+								style="max-width: fit-content"
+								v-if="!isEndTimeValid"
+								v-tooltip="endTimeMessage"
+							/>
 						</div>
 						<div class="input-row">
 							<div class="label-and-input">

From 10e9a95d695e9a989fae20998388b3216b71ae8c Mon Sep 17 00:00:00 2001
From: Tom Szendrey <T.Szendrey@hotmail.com>
Date: Fri, 25 Oct 2024 11:13:07 -0400
Subject: [PATCH 6/8] updating tooltip messages var rename

---
 .../tera-optimize-ciemss-drilldown.vue        | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
index ac08ff2a6f..a3278c928b 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
@@ -52,7 +52,7 @@
 					<section class="form-section">
 						<h5>
 							Intervention policy
-							<i v-if="!isInterventionReady" v-tooltip="interventionReadyMessage" class="pi pi-exclamation-circle" />
+							<i v-if="!isInterventionReady" v-tooltip="interventionReadyTooltip" class="pi pi-exclamation-circle" />
 						</h5>
 						<template v-for="(cfg, idx) in knobs.interventionPolicyGroups">
 							<tera-static-intervention-policy-group
@@ -104,7 +104,7 @@
 								class="pi pi-exclamation-circle"
 								style="max-width: fit-content"
 								v-if="!isEndTimeValid"
-								v-tooltip="endTimeMessage"
+								v-tooltip="endTimeTooltip"
 							/>
 						</div>
 						<div class="input-row">
@@ -545,22 +545,17 @@ const isEndTimeValid = computed(() =>
 );
 
 const isRunDisabled = computed(() => !isCriteriaReady.value || !isInterventionReady.value || !isEndTimeValid.value);
-console.log(isInterventionReady);
-console.log(isRunDisabled);
-const criteriaReadyMessage = computed(() =>
-	!isCriteriaReady.value ? 'All success criteria must be filled in. \n' : ''
-);
-const interventionReadyMessage = computed(() =>
-	!isInterventionReady.value ? 'Must contain at least one active intervention policy that is filled in. \n' : ''
+
+const criteriaReadyTooltip = computed(() => (!isCriteriaReady.value ? 'Success criteria must be filled in. \n' : ''));
+const interventionReadyTooltip = computed(() =>
+	!isInterventionReady.value ? 'Must contain at least one active intervention policy.\n' : ''
 );
-const endTimeMessage = computed(() =>
-	!isEndTimeValid.value
-		? 'Optimize setting end time must be greater than or equal to all intervention end times. \n'
-		: ''
+const endTimeTooltip = computed(() =>
+	!isEndTimeValid.value ? 'End time must be greater than or equal to all intervention policy end times. \n' : ''
 );
 
 const runButtonMessage = computed(
-	() => `${criteriaReadyMessage.value} ${interventionReadyMessage.value} ${endTimeMessage.value}`
+	() => `${criteriaReadyTooltip.value} ${interventionReadyTooltip.value} ${endTimeTooltip.value}`
 );
 
 const presetType = computed(() => {

From 15fda0a7794e745da3b19c7a4d6b070db70c0177 Mon Sep 17 00:00:00 2001
From: Tom Szendrey <T.Szendrey@hotmail.com>
Date: Fri, 25 Oct 2024 11:32:25 -0400
Subject: [PATCH 7/8] no spaces in empty runButtonMessage

---
 .../ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
index a3278c928b..d5c1e2b6f2 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
@@ -554,8 +554,8 @@ const endTimeTooltip = computed(() =>
 	!isEndTimeValid.value ? 'End time must be greater than or equal to all intervention policy end times. \n' : ''
 );
 
-const runButtonMessage = computed(
-	() => `${criteriaReadyTooltip.value} ${interventionReadyTooltip.value} ${endTimeTooltip.value}`
+const runButtonMessage = computed(() =>
+	isRunDisabled.value ? `${criteriaReadyTooltip.value} ${interventionReadyTooltip.value} ${endTimeTooltip.value}` : ''
 );
 
 const presetType = computed(() => {

From db51e012d11cbeb22f4d9e3b854bab2ed9a2f6a9 Mon Sep 17 00:00:00 2001
From: Tom Szendrey <T.Szendrey@hotmail.com>
Date: Fri, 25 Oct 2024 11:37:00 -0400
Subject: [PATCH 8/8] remove red if not used everywhere.

---
 .../ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue       | 1 -
 .../ops/optimize-ciemss/tera-optimize-criterion-group-form.vue   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
index d5c1e2b6f2..306e85f3f0 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
@@ -97,7 +97,6 @@
 								label="End time"
 								:start-date="modelConfiguration.temporalContext"
 								:calendar-settings="getCalendarSettingsFromModel(model)"
-								:invalid="!isEndTimeValid"
 								v-model="knobs.endTime"
 							/>
 							<i
diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-criterion-group-form.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-criterion-group-form.vue
index 99f1da3eac..548c2af493 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-criterion-group-form.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-criterion-group-form.vue
@@ -28,7 +28,6 @@
 				option-value="value"
 				v-model="config.targetVariable"
 				placeholder="Select"
-				:invalid="_.isEmpty(config.targetVariable)"
 				@update:model-value="emit('update-self', config)"
 			/>
 			<i v-if="_.isEmpty(config.targetVariable)" class="pi pi-exclamation-circle" v-tooltip="requiredTooltip" />