Просмотр исходного кода

chore(metrics): remove usages of ddm-ui flag (#69748)

Ogi 10 месяцев назад
Родитель
Сommit
7bc9188135

+ 1 - 5
static/app/components/sidebar/index.tsx

@@ -474,11 +474,7 @@ function Sidebar() {
 
 
   const metricsPath = `/organizations/${organization?.slug}/metrics/`;
   const metricsPath = `/organizations/${organization?.slug}/metrics/`;
   const metrics = hasOrganization && hasMetricsSidebarItem(organization) && (
   const metrics = hasOrganization && hasMetricsSidebarItem(organization) && (
-    <Feature
-      features={['ddm-ui', 'custom-metrics']}
-      organization={organization}
-      requireAll
-    >
+    <Feature features={['custom-metrics']} organization={organization}>
       <SidebarItem
       <SidebarItem
         {...sidebarItemProps}
         {...sidebarItemProps}
         icon={<IconGraph />}
         icon={<IconGraph />}

+ 4 - 5
static/app/utils/metrics/features.tsx

@@ -5,10 +5,6 @@ export function hasMetricsExperimentalFeature(organization: Organization) {
   return organization.features.includes('ddm-experimental');
   return organization.features.includes('ddm-experimental');
 }
 }
 
 
-export function hasMetricsUI(organization: Organization) {
-  return organization.features.includes('ddm-ui');
-}
-
 export function hasDashboardImportFeature(organization: Organization) {
 export function hasDashboardImportFeature(organization: Organization) {
   return organization.features.includes('ddm-dashboard-import');
   return organization.features.includes('ddm-dashboard-import');
 }
 }
@@ -18,7 +14,10 @@ export function hasMetricsSidebarItem(organization: Organization) {
 }
 }
 
 
 export function hasCustomMetrics(organization: Organization) {
 export function hasCustomMetrics(organization: Organization) {
-  return hasMetricsUI(organization) && hasMetricsSidebarItem(organization);
+  return (
+    organization.features.includes('custom-metrics') &&
+    hasMetricsSidebarItem(organization)
+  );
 }
 }
 
 
 export function hasMetricStats(organization: Organization) {
 export function hasMetricStats(organization: Organization) {

+ 1 - 1
static/app/views/metrics/customMetricsEventData.spec.tsx

@@ -10,7 +10,7 @@ import type {
 } from 'sentry/types/metrics';
 } from 'sentry/types/metrics';
 import {CustomMetricsEventData} from 'sentry/views/metrics/customMetricsEventData';
 import {CustomMetricsEventData} from 'sentry/views/metrics/customMetricsEventData';
 
 
-const organization = OrganizationFixture({features: ['ddm-ui']});
+const organization = OrganizationFixture({features: ['custom-metrics']});
 
 
 describe('CustomMetricsEventData', () => {
 describe('CustomMetricsEventData', () => {
   beforeEach(() => {
   beforeEach(() => {

+ 1 - 1
static/app/views/metrics/index.tsx

@@ -14,7 +14,7 @@ function MetricsContainer({children}: Props) {
 
 
   return (
   return (
     <Feature
     <Feature
-      features={['ddm-ui', 'custom-metrics']}
+      features={['custom-metrics']}
       requireAll
       requireAll
       organization={organization}
       organization={organization}
       renderDisabled={() => (
       renderDisabled={() => (

+ 1 - 5
static/app/views/settings/project/navigationConfiguration.tsx

@@ -113,11 +113,7 @@ export default function getConfiguration({
         {
         {
           path: `${pathPrefix}/metrics/`,
           path: `${pathPrefix}/metrics/`,
           title: t('Metrics'),
           title: t('Metrics'),
-          show: () =>
-            !!(
-              organization?.features?.includes('custom-metrics') &&
-              organization?.features?.includes('ddm-ui')
-            ),
+          show: () => !!organization?.features?.includes('custom-metrics'),
         },
         },
         {
         {
           path: `${pathPrefix}/replays/`,
           path: `${pathPrefix}/replays/`,

+ 1 - 1
static/app/views/settings/projectMetrics/index.tsx

@@ -13,7 +13,7 @@ type Props = RouteComponentProps<{projectId: string}, {}> & {
 
 
 function ProjectMetricsContainer(props: Props) {
 function ProjectMetricsContainer(props: Props) {
   return (
   return (
-    <Feature features={['ddm-ui', 'custom-metrics']}>
+    <Feature features={['custom-metrics']}>
       <ProjectMetrics {...props} />
       <ProjectMetrics {...props} />
     </Feature>
     </Feature>
   );
   );