From 8a8cd1bf27c732587b4ae93d922b0a4527bdd573 Mon Sep 17 00:00:00 2001 From: sjaanus Date: Mon, 2 Jan 2023 15:41:43 +0200 Subject: [PATCH] UI Flags cleanup (#2778) --- .../feature/CreateFeatureButton/useCreateFeaturePath.ts | 2 +- .../FeatureView/FeatureNotFound/FeatureNotFound.tsx | 8 +++----- .../ProjectFeatureToggles/ProjectFeatureToggles.tsx | 7 +------ .../src/hooks/api/getters/useUiConfig/defaultValue.ts | 2 -- frontend/src/interfaces/uiConfig.ts | 4 ---- frontend/src/utils/routePathHelpers.ts | 1 - src/lib/__snapshots__/create-config.test.ts.snap | 2 -- src/lib/types/experimental.ts | 4 ---- src/server-dev.ts | 1 - src/test/config/test-config.ts | 1 - 10 files changed, 5 insertions(+), 27 deletions(-) diff --git a/frontend/src/component/feature/CreateFeatureButton/useCreateFeaturePath.ts b/frontend/src/component/feature/CreateFeatureButton/useCreateFeaturePath.ts index d94ee5f546c..4b4f13a9e01 100644 --- a/frontend/src/component/feature/CreateFeatureButton/useCreateFeaturePath.ts +++ b/frontend/src/component/feature/CreateFeatureButton/useCreateFeaturePath.ts @@ -24,7 +24,7 @@ export const useCreateFeaturePath = ( } return { - path: getCreateTogglePath(projectId, uiConfig.flags.E), + path: getCreateTogglePath(projectId), projectId, }; }; diff --git a/frontend/src/component/feature/FeatureView/FeatureNotFound/FeatureNotFound.tsx b/frontend/src/component/feature/FeatureView/FeatureNotFound/FeatureNotFound.tsx index 2aef95d6231..24ab95458d4 100644 --- a/frontend/src/component/feature/FeatureView/FeatureNotFound/FeatureNotFound.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureNotFound/FeatureNotFound.tsx @@ -13,11 +13,9 @@ export const FeatureNotFound = () => { const { classes: styles } = useStyles(); const { uiConfig } = useUiConfig(); - const createFeatureTogglePath = getCreateTogglePath( - projectId, - uiConfig.flags.E, - { name: featureId } - ); + const createFeatureTogglePath = getCreateTogglePath(projectId, { + name: featureId, + }); if (!archivedFeatures) { return null; diff --git a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx index c5dcac15b30..863f7cec90c 100644 --- a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx +++ b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx @@ -517,12 +517,7 @@ export const ProjectFeatureToggles = ({ - navigate( - getCreateTogglePath( - projectId, - uiConfig.flags.E - ) - ) + navigate(getCreateTogglePath(projectId)) } maxWidth="960px" Icon={Add} diff --git a/frontend/src/hooks/api/getters/useUiConfig/defaultValue.ts b/frontend/src/hooks/api/getters/useUiConfig/defaultValue.ts index d7d03519c4d..cb1b1dfac82 100644 --- a/frontend/src/hooks/api/getters/useUiConfig/defaultValue.ts +++ b/frontend/src/hooks/api/getters/useUiConfig/defaultValue.ts @@ -7,11 +7,9 @@ export const defaultValue: IUiConfig = { slogan: 'The enterprise ready feature toggle service.', flags: { P: false, - C: false, E: false, RE: false, EEA: false, - CO: false, SE: false, T: false, UNLEASH_CLOUD: false, diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index ebc915cda18..2892a592a5f 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -29,20 +29,16 @@ export interface IProclamationToast { } export interface IFlags { - C: boolean; P: boolean; E: boolean; RE: boolean; EEA?: boolean; - OIDC?: boolean; - CO?: boolean; SE?: boolean; T?: boolean; UNLEASH_CLOUD?: boolean; UG?: boolean; ENABLE_DARK_MODE_SUPPORT?: boolean; embedProxyFrontend?: boolean; - changeRequests?: boolean; variantsPerEnvironment?: boolean; networkView?: boolean; maintenance?: boolean; diff --git a/frontend/src/utils/routePathHelpers.ts b/frontend/src/utils/routePathHelpers.ts index 9c56dc141f8..cbbd6170d8e 100644 --- a/frontend/src/utils/routePathHelpers.ts +++ b/frontend/src/utils/routePathHelpers.ts @@ -4,7 +4,6 @@ export const getTogglePath = (projectId: string, featureToggleName: string) => { export const getCreateTogglePath = ( projectId: string, - newPath: boolean = false, query?: Record ) => { const path = `/projects/${projectId}/create-toggle`; diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap index 14685cbbad2..a9adfcc6466 100644 --- a/src/lib/__snapshots__/create-config.test.ts.snap +++ b/src/lib/__snapshots__/create-config.test.ts.snap @@ -71,7 +71,6 @@ exports[`should create default config 1`] = ` "ENABLE_DARK_MODE_SUPPORT": false, "anonymiseEventLog": false, "batchMetrics": false, - "changeRequests": false, "embedProxy": true, "embedProxyFrontend": true, "maintenance": false, @@ -90,7 +89,6 @@ exports[`should create default config 1`] = ` "ENABLE_DARK_MODE_SUPPORT": false, "anonymiseEventLog": false, "batchMetrics": false, - "changeRequests": false, "embedProxy": true, "embedProxyFrontend": true, "maintenance": false, diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index daad9737460..f645255a512 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -11,10 +11,6 @@ const flags = { process.env.UNLEASH_EXPERIMENTAL_EMBED_PROXY, true, ), - changeRequests: parseEnvVarBoolean( - process.env.UNLEASH_EXPERIMENTAL_CHANGE_REQUESTS, - false, - ), embedProxyFrontend: parseEnvVarBoolean( process.env.UNLEASH_EXPERIMENTAL_EMBED_PROXY_FRONTEND, true, diff --git a/src/server-dev.ts b/src/server-dev.ts index f43af98678a..231d897965b 100644 --- a/src/server-dev.ts +++ b/src/server-dev.ts @@ -39,7 +39,6 @@ process.nextTick(async () => { batchMetrics: true, anonymiseEventLog: false, responseTimeWithAppName: true, - changeRequests: true, variantsPerEnvironment: true, maintenance: false, serviceAccounts: true, diff --git a/src/test/config/test-config.ts b/src/test/config/test-config.ts index c3591840c33..2884ed63bb0 100644 --- a/src/test/config/test-config.ts +++ b/src/test/config/test-config.ts @@ -27,7 +27,6 @@ export function createTestConfig(config?: IUnleashOptions): IUnleashConfig { embedProxy: true, embedProxyFrontend: true, batchMetrics: true, - changeRequests: true, variantsPerEnvironment: true, }, },