From c14bbe4955dcdae5756073d22a900e568d350e56 Mon Sep 17 00:00:00 2001
From: Thomas Heartman <thomas@getunleash.io>
Date: Wed, 7 May 2025 11:12:15 +0200
Subject: [PATCH] iron out some date bugs

---
 .../FeatureStrategyConstraints/AddValuesWidget.tsx |  2 +-
 .../EditableConstraintWrapper.tsx                  | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/AddValuesWidget.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/AddValuesWidget.tsx
index 890b06b211..f2b7fc47c6 100644
--- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/AddValuesWidget.tsx
+++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/AddValuesWidget.tsx
@@ -28,7 +28,7 @@ const AddValuesButton = styled('button')(({ theme }) => ({
 }));
 
 interface AddValuesProps {
-    onAddValues: (newValues: Set<string>) => void;
+    onAddValues: (newValues: string[]) => void;
     helpText?: string;
     validator: (...values: string[]) => ConstraintValidatorOutput;
 }
diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/EditableConstraintWrapper.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/EditableConstraintWrapper.tsx
index 83e6d71549..eddb1a535c 100644
--- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/EditableConstraintWrapper.tsx
+++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/EditableConstraintWrapper.tsx
@@ -84,6 +84,7 @@ export const EditableConstraintWrapper = ({
                 ) {
                     return cleanConstraint({
                         ...state,
+                        contextName: action.payload,
                         operator: DATE_AFTER,
                         values: new Set(),
                         value: new Date().toISOString(),
@@ -95,8 +96,8 @@ export const EditableConstraintWrapper = ({
                     return cleanConstraint({
                         ...state,
                         operator: IN,
+                        contextName: action.payload,
                         values: new Set(),
-
                         value: '',
                     });
                 }
@@ -109,11 +110,20 @@ export const EditableConstraintWrapper = ({
                     value: '',
                 });
             case 'set operator':
+                if (
+                    dateOperators.includes(state.operator) &&
+                    dateOperators.includes(action.payload)
+                ) {
+                    return cleanConstraint({
+                        ...state,
+                        operator: action.payload,
+                        value: state.value,
+                    });
+                }
                 return cleanConstraint({
                     ...state,
                     operator: action.payload,
                     values: new Set(),
-
                     value: '',
                 });
             case 'add value(s)': {