chore: remove extended usage metrics ui flag (#6701)

Unleash · Mar 26, 2024 · 6762703 · 6762703
1 parent 8e08df5
commit 6762703
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 21 deletions.
diff --git a/.../component/feature/FeatureView/FeatureMetrics/FeatureMetricsHours/FeatureMetricsHours.tsx b/.../component/feature/FeatureView/FeatureMetrics/FeatureMetricsHours/FeatureMetricsHours.tsx
@@ -3,8 +3,8 @@ import GeneralSelect, {
     type IGeneralSelectProps,
 } from 'component/common/GeneralSelect/GeneralSelect';
 import { usePlausibleTracker } from 'hooks/usePlausibleTracker';
-import { useExtendedFeatureMetrics } from '../useExtendedFeatureMetrics';
 import { useEffect } from 'react';
+import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
 
 const StyledTitle = styled('h2')(({ theme }) => ({
     margin: 0,
@@ -36,8 +36,8 @@ export const FeatureMetricsHours = ({
             },
         });
     };
-    const extendedOptions = useExtendedFeatureMetrics();
-    const options = extendedOptions
+    const { isEnterprise } = useUiConfig();
+    const options = isEnterprise()
         ? [...hourOptions, ...daysOptions]
         : hourOptions;
 

diff --git a/frontend/src/component/feature/FeatureView/FeatureMetrics/useExtendedFeatureMetrics.ts b/frontend/src/component/feature/FeatureView/FeatureMetrics/useExtendedFeatureMetrics.ts
diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts
@@ -69,7 +69,6 @@ export type UiFlags = {
     featureSearchFeedback?: Variant;
     enableLicense?: boolean;
     newStrategyConfigurationFeedback?: boolean;
-    extendedUsageMetricsUI?: boolean;
     adminTokenKillSwitch?: boolean;
     executiveDashboardUI?: boolean;
     feedbackComments?: Variant;

diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap
@@ -96,7 +96,6 @@ exports[`should create default config 1`] = `
       "executiveDashboard": false,
       "executiveDashboardUI": false,
       "extendedUsageMetrics": false,
-      "extendedUsageMetricsUI": false,
       "featureSearchFeedback": {
         "enabled": false,
         "name": "withText",

diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts
@@ -36,7 +36,6 @@ export type IFlagKey =
     | 'newStrategyConfigurationFeedback'
     | 'edgeBulkMetrics'
     | 'extendedUsageMetrics'
-    | 'extendedUsageMetricsUI'
     | 'adminTokenKillSwitch'
     | 'executiveDashboard'
     | 'executiveDashboardUI'
@@ -185,10 +184,6 @@ const flags: IFlags = {
         process.env.UNLEASH_EXPERIMENTAL_EXTENDED_USAGE_METRICS,
         false,
     ),
-    extendedUsageMetricsUI: parseEnvVarBoolean(
-        process.env.UNLEASH_EXPERIMENTAL_EXTENDED_USAGE_METRICS_UI,
-        false,
-    ),
     adminTokenKillSwitch: parseEnvVarBoolean(
         process.env.UNLEASH_EXPERIMENTAL_ADMIN_TOKEN_KILL_SWITCH,
         false,

diff --git a/src/server-dev.ts b/src/server-dev.ts
@@ -46,7 +46,6 @@ process.nextTick(async () => {
                         increaseUnleashWidth: true,
                         newStrategyConfigurationFeedback: true,
                         featureSearchFeedbackPosting: true,
-                        extendedUsageMetricsUI: true,
                         executiveDashboard: true,
                         executiveDashboardUI: true,
                         userAccessUIEnabled: true,