diff --git a/frontend/src/component/project/Project/ProjectForm/ProjectForm.tsx b/frontend/src/component/project/Project/ProjectForm/ProjectForm.tsx index e2ace7b571f..e9a1f764ac8 100644 --- a/frontend/src/component/project/Project/ProjectForm/ProjectForm.tsx +++ b/frontend/src/component/project/Project/ProjectForm/ProjectForm.tsx @@ -9,7 +9,6 @@ import { StyledInput, StyledTextField, } from './ProjectForm.styles'; -import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; import { StickinessSelect } from 'component/feature/StrategyTypes/FlexibleStrategy/StickinessSelect/StickinessSelect'; import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; import Select from 'component/common/select'; @@ -60,9 +59,6 @@ const ProjectForm: React.FC = ({ validateProjectId, clearErrors, }) => { - const { uiConfig } = useUiConfig(); - const { projectScopedStickiness } = uiConfig.flags; - return ( @@ -109,10 +105,7 @@ const ProjectForm: React.FC = ({ /> diff --git a/frontend/src/hooks/useDefaultProjectSettings.ts b/frontend/src/hooks/useDefaultProjectSettings.ts index 7f0adfa4603..553fe6a510e 100644 --- a/frontend/src/hooks/useDefaultProjectSettings.ts +++ b/frontend/src/hooks/useDefaultProjectSettings.ts @@ -1,15 +1,10 @@ -import useUiConfig from './api/getters/useUiConfig/useUiConfig'; import useProject from './api/getters/useProject/useProject'; const DEFAULT_STICKINESS = 'default'; export const useDefaultProjectSettings = (projectId: string) => { - const { uiConfig } = useUiConfig(); - - const { projectScopedStickiness } = uiConfig.flags; - const { project, loading, error } = useProject(projectId); return { - defaultStickiness: Boolean(projectScopedStickiness) + defaultStickiness: Boolean(project.defaultStickiness) ? project.defaultStickiness : DEFAULT_STICKINESS, mode: project.mode, diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index e4c534557db..8a6a7652297 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -46,7 +46,6 @@ export interface IFlags { proPlanAutoCharge?: boolean; notifications?: boolean; bulkOperations?: boolean; - projectScopedStickiness?: boolean; personalAccessTokensKillSwitch?: boolean; demo?: boolean; strategyTitle?: boolean; diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap index 050279a6bf2..374f6f5dc26 100644 --- a/src/lib/__snapshots__/create-config.test.ts.snap +++ b/src/lib/__snapshots__/create-config.test.ts.snap @@ -85,7 +85,6 @@ exports[`should create default config 1`] = ` "optimal304Differ": false, "personalAccessTokensKillSwitch": false, "proPlanAutoCharge": false, - "projectScopedStickiness": false, "responseTimeWithAppNameKillSwitch": false, "strategyDisable": false, "strategyTitle": false, @@ -113,7 +112,6 @@ exports[`should create default config 1`] = ` "optimal304Differ": false, "personalAccessTokensKillSwitch": false, "proPlanAutoCharge": false, - "projectScopedStickiness": false, "responseTimeWithAppNameKillSwitch": false, "strategyDisable": false, "strategyTitle": false, diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index 509712cf146..b0d40a79443 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -53,10 +53,6 @@ const flags = { process.env.UNLEASH_BULK_OPERATIONS, false, ), - projectScopedStickiness: parseEnvVarBoolean( - process.env.PROJECT_SCOPED_STICKINESS, - false, - ), personalAccessTokensKillSwitch: parseEnvVarBoolean( process.env.UNLEASH_PAT_KILL_SWITCH, false, diff --git a/src/server-dev.ts b/src/server-dev.ts index 35ab7503732..4b782ba9404 100644 --- a/src/server-dev.ts +++ b/src/server-dev.ts @@ -40,7 +40,6 @@ process.nextTick(async () => { responseTimeWithAppNameKillSwitch: false, newProjectOverview: true, bulkOperations: true, - projectScopedStickiness: true, optimal304: true, optimal304Differ: false, },