fix: default segments should only be selected when using default stra… (

#4040)
Unleash · Jun 21, 2023 · 3763e1b · 3763e1b
1 parent 197df96
commit 3763e1b
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/...end/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx b/...end/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx
@@ -40,7 +40,7 @@ export const FeatureStrategyCreate = () => {
     const featureId = useRequiredPathParam('featureId');
     const environmentId = useRequiredQueryParam('environmentId');
     const strategyName = useRequiredQueryParam('strategyName');
-    const useDefaultStrategy: boolean = JSON.parse(
+    const shouldUseDefaultStrategy: boolean = JSON.parse(
         useQueryParams().get('defaultStrategy') || 'false'
     );
     const { project } = useProject(projectId);
@@ -56,7 +56,9 @@ export const FeatureStrategyCreate = () => {
 
     const [strategy, setStrategy] = useState<Partial<IFeatureStrategy>>({});
 
-    const [segments, setSegments] = useState<ISegment[]>(strategySegments);
+    const [segments, setSegments] = useState<ISegment[]>(
+        shouldUseDefaultStrategy ? strategySegments : []
+    );
     const { strategyDefinition } = useStrategy(strategyName);
     const errors = useFormErrors();
 
@@ -98,12 +100,12 @@ export const FeatureStrategyCreate = () => {
     }, [feature.name]);
 
     useEffect(() => {
-        if (useDefaultStrategy) {
+        if (shouldUseDefaultStrategy) {
             setStrategy((defaultStrategy as any) || DEFAULT_STRATEGY);
         } else if (strategyDefinition) {
             setStrategy(createFeatureStrategy(featureId, strategyDefinition));
         }
-    }, [featureId, strategyDefinition, useDefaultStrategy]);
+    }, [featureId, strategyDefinition, shouldUseDefaultStrategy]);
 
     const onAddStrategy = async (payload: IFeatureStrategyPayload) => {
         await addStrategyToFeature(