[Task]: Update Optimize Input Designs

packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/optimize-ciemss-operation.ts

@@ -16,7 +16,6 @@ export enum ContextMethods {
 }
 
 export interface InterventionPolicyGroup {
-	borderColour: string;
 	name: string;
 	parameter: string;
 	startTime: number;
@@ -27,6 +26,16 @@ export interface InterventionPolicyGroup {
 	paramValue: number;
 }
 
+export interface ConstraintGroup {
+	name: string; // Title of the group
+	targetVariable: string;
+	qoiMethod: ContextMethods;
+	riskTolerance: number;
+	threshold: number;
+	isMinimized: boolean;
+	isActive: boolean; // Denotes whether or not this should be used when user hits run.
+}
+
 export interface OptimizeCiemssOperationState extends BaseState {
 	// Settings
 	endTime: number;
@@ -37,12 +46,9 @@ export interface OptimizeCiemssOperationState extends BaseState {
 	// Intervention policies
 	interventionType: InterventionTypes;
 	interventionPolicyGroups: InterventionPolicyGroup[];
-	// Constraints
-	qoiMethod: ContextMethods;
-	targetVariables: string[];
-	riskTolerance: number;
-	threshold: number;
-	isMinimized: boolean;
+	// Constraints:
+	constraintGroups: ConstraintGroup[];
+	// Charts + Outputs:
 	chartConfigs: string[][];
 	inProgressOptimizeId: string;
 	inProgressForecastId: string;
@@ -53,7 +59,6 @@ export interface OptimizeCiemssOperationState extends BaseState {
 }
 
 export const blankInterventionPolicyGroup: InterventionPolicyGroup = {
-	borderColour: '#cee2a4',
 	name: 'Policy bounds',
 	parameter: '',
 	startTime: 0,
@@ -64,6 +69,16 @@ export const blankInterventionPolicyGroup: InterventionPolicyGroup = {
 	paramValue: 0
 };
 
+export const defaultConstraintGroup: ConstraintGroup = {
+	name: 'Constraint',
+	qoiMethod: ContextMethods.max,
+	targetVariable: '',
+	riskTolerance: 5,
+	threshold: 1,
+	isMinimized: true,
+	isActive: true
+};
+
 export const OptimizeCiemssOperation: Operation = {
 	name: WorkflowOperationTypes.OPTIMIZE_CIEMSS,
 	displayName: 'Optimize with PyCIEMSS',
@@ -85,11 +100,7 @@ export const OptimizeCiemssOperation: Operation = {
 			maxfeval: 25,
 			interventionType: InterventionTypes.paramValue,
 			interventionPolicyGroups: [blankInterventionPolicyGroup],
-			qoiMethod: ContextMethods.max,
-			targetVariables: [],
-			riskTolerance: 5,
-			threshold: 1,
-			isMinimized: true,
+			constraintGroups: [defaultConstraintGroup],
 			chartConfigs: [],
 			inProgressOptimizeId: '',
 			inProgressForecastId: '',

packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-intervention-policy-group-form.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="policy-group" :style="`border-left: 9px solid ${props.config.borderColour}`">
+	<div class="policy-group">
 		<div class="form-header">
 			<div>
 				<InputText