diff --git a/frontend/src/component/menu/Header/Header.tsx b/frontend/src/component/menu/Header/Header.tsx index ae860c6a1e..adbd900789 100644 --- a/frontend/src/component/menu/Header/Header.tsx +++ b/frontend/src/component/menu/Header/Header.tsx @@ -166,7 +166,7 @@ const Header: VFC = () => { const increaseUnleashWidth = useUiFlag('increaseUnleashWidth'); const celebatoryUnleash = useUiFlag('celebrateUnleash'); - const insightsDashboard = useUiFlag('executiveDashboard'); + const insightsDashboard = useUiFlag('executiveDashboardUI'); const routes = getRoutes(); const adminRoutes = useAdminRoutes(); diff --git a/frontend/src/component/menu/__tests__/__snapshots__/routes.test.tsx.snap b/frontend/src/component/menu/__tests__/__snapshots__/routes.test.tsx.snap index d474d0202d..7913e62e58 100644 --- a/frontend/src/component/menu/__tests__/__snapshots__/routes.test.tsx.snap +++ b/frontend/src/component/menu/__tests__/__snapshots__/routes.test.tsx.snap @@ -13,9 +13,8 @@ exports[`returns all baseRoutes 1`] = ` { "component": [Function], "enterprise": false, - "flag": "executiveDashboard", + "flag": "executiveDashboardUI", "menu": { - "advanced": true, "mobile": true, }, "path": "/insights", diff --git a/frontend/src/component/menu/routes.ts b/frontend/src/component/menu/routes.ts index d0d7aaaa0c..c356184d0f 100644 --- a/frontend/src/component/menu/routes.ts +++ b/frontend/src/component/menu/routes.ts @@ -66,8 +66,8 @@ export const routes: IRoute[] = [ title: 'Insights', component: ExecutiveDashboard, type: 'protected', - menu: { mobile: true, advanced: true }, - flag: 'executiveDashboard', + menu: { mobile: true }, + flag: 'executiveDashboardUI', enterprise: false, }, diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index 34c8f6bdd0..6323c7aa67 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -72,7 +72,7 @@ export type UiFlags = { newStrategyConfigurationFeedback?: boolean; extendedUsageMetricsUI?: boolean; adminTokenKillSwitch?: boolean; - executiveDashboard?: boolean; + executiveDashboardUI?: boolean; feedbackComments?: Variant; displayUpgradeEdgeBanner?: boolean; showInactiveUsers?: boolean; diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap index 03fdd0a538..442cab507e 100644 --- a/src/lib/__snapshots__/create-config.test.ts.snap +++ b/src/lib/__snapshots__/create-config.test.ts.snap @@ -94,6 +94,7 @@ exports[`should create default config 1`] = ` "enableLicenseChecker": false, "encryptEmails": false, "executiveDashboard": false, + "executiveDashboardUI": false, "extendedUsageMetrics": false, "extendedUsageMetricsUI": false, "featureSearchFeedback": { diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index 1c46175c7c..b65bb21433 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -40,6 +40,7 @@ export type IFlagKey = | 'extendedUsageMetricsUI' | 'adminTokenKillSwitch' | 'executiveDashboard' + | 'executiveDashboardUI' | 'feedbackComments' | 'createdByUserIdDataMigration' | 'showInactiveUsers' @@ -197,6 +198,10 @@ const flags: IFlags = { process.env.UNLEASH_EXPERIMENTAL_EXECUTIVE_DASHBOARD, false, ), + executiveDashboardUI: parseEnvVarBoolean( + process.env.UNLEASH_EXPERIMENTAL_EXECUTIVE_DASHBOARD_UI, + false, + ), sdkReporting: parseEnvVarBoolean( process.env.UNLEASH_EXPERIMENTAL_SDK_REPORTING, false, diff --git a/src/server-dev.ts b/src/server-dev.ts index addfab74fa..b2fc7735e6 100644 --- a/src/server-dev.ts +++ b/src/server-dev.ts @@ -48,6 +48,7 @@ process.nextTick(async () => { featureSearchFeedbackPosting: true, extendedUsageMetricsUI: true, executiveDashboard: true, + executiveDashboardUI: true, userAccessUIEnabled: true, sdkReporting: true, },