diff --git a/frontend/cypress/integration/projects/settings.spec.ts b/frontend/cypress/integration/projects/settings.spec.ts index 03512897c9e..bdff8ab9412 100644 --- a/frontend/cypress/integration/projects/settings.spec.ts +++ b/frontend/cypress/integration/projects/settings.spec.ts @@ -66,7 +66,6 @@ describe('project settings', () => { ); cy.get("[data-testid='ADD_VARIANT_BUTTON']").first().click(); - cy.wait(300); //then cy.get("[id='stickiness-select']") .first() diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx index 0047c065188..93be11a0bf8 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx @@ -74,7 +74,7 @@ export const FeatureStrategyCreate = () => { forceRefreshCache(feature); ref.current = feature; } - }, [feature]); + }, [feature.name]); useEffect(() => { if (strategyDefinition) { diff --git a/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureEnvironmentVariants/EnvironmentVariantsModal/EnvironmentVariantsModal.tsx b/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureEnvironmentVariants/EnvironmentVariantsModal/EnvironmentVariantsModal.tsx index 9289bb5aab7..83058c7c43a 100644 --- a/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureEnvironmentVariants/EnvironmentVariantsModal/EnvironmentVariantsModal.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureEnvironmentVariants/EnvironmentVariantsModal/EnvironmentVariantsModal.tsx @@ -273,7 +273,13 @@ export const EnvironmentVariantsModal = ({ isChangeRequestConfigured(environment?.name || '') && uiConfig.flags.crOnVariants; - const stickiness = variants[0]?.stickiness || defaultStickiness; + const stickiness = useMemo(() => { + if (!loading) { + return variants[0]?.stickiness || defaultStickiness; + } + return ''; + }, [loading, defaultStickiness, JSON.stringify(variants[0] ?? {})]); + const stickinessOptions = useMemo( () => [ 'default', @@ -296,7 +302,7 @@ export const EnvironmentVariantsModal = ({ }; const onStickinessChange = (value: string) => { - updateStickiness(value).catch(console.warn); + updateStickiness(value); }; const [error, setError] = useState(); @@ -308,14 +314,13 @@ export const EnvironmentVariantsModal = ({ }, [apiPayload.error]); const handleClose = () => { - updateStickiness(defaultStickiness).catch(console.warn); + updateStickiness(defaultStickiness); setOpen(false); }; if (loading || stickiness === '') { return ; } - return ( { - const projectId = useOptionalPathParam('projectId'); + const projectId = useRequiredPathParam('projectId'); const { defaultStickiness, loading } = useDefaultProjectSettings(projectId); const onUpdate = (field: string) => (newValue: string) => { diff --git a/frontend/src/component/feature/StrategyTypes/FlexibleStrategy/StickinessSelect/StickinessSelect.tsx b/frontend/src/component/feature/StrategyTypes/FlexibleStrategy/StickinessSelect/StickinessSelect.tsx index a857bacca52..8565e13fe71 100644 --- a/frontend/src/component/feature/StrategyTypes/FlexibleStrategy/StickinessSelect/StickinessSelect.tsx +++ b/frontend/src/component/feature/StrategyTypes/FlexibleStrategy/StickinessSelect/StickinessSelect.tsx @@ -41,7 +41,6 @@ export const StickinessSelect = ({ ); const stickinessOptions = resolveStickinessOptions(); - return (