diff --git a/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsHours/FeatureMetricsHours.tsx b/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsHours/FeatureMetricsHours.tsx index 8a1027b83c0..29d509c0830 100644 --- a/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsHours/FeatureMetricsHours.tsx +++ b/frontend/src/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 deleted file mode 100644 index 50b7f0c15eb..00000000000 --- a/frontend/src/component/feature/FeatureView/FeatureMetrics/useExtendedFeatureMetrics.ts +++ /dev/null @@ -1,10 +0,0 @@ -import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; -import { useUiFlag } from 'hooks/useUiFlag'; - -export const useExtendedFeatureMetrics = () => { - const { isEnterprise } = useUiConfig(); - const extendedUsageMetrics = useUiFlag('extendedUsageMetricsUI'); - const extendedOptions = isEnterprise() && extendedUsageMetrics; - - return extendedOptions; -}; diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index 55d500d8150..d28b31c1c70 100644 --- 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 index 29342e86509..54d2e18120a 100644 --- 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 index e76256d5909..a81f6ade693 100644 --- 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 index abbc9bfd137..732f5df3909 100644 --- 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,