Browse Source

ref(metrics): Remove types barrel file usage in metrics (#72589)

Relates to https://github.com/getsentry/sentry/pull/69075
ArthurKnaus 9 months ago
parent
commit
4add971cdb

+ 2 - 1
static/app/utils/metrics/useBlockMetric.tsx

@@ -1,6 +1,7 @@
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import {t} from 'sentry/locale';
-import type {MetricMeta, MRI, Project} from 'sentry/types';
+import type {MetricMeta, MRI} from 'sentry/types/metrics';
+import type {Project} from 'sentry/types/project';
 import {useMutation, useQueryClient} from 'sentry/utils/queryClient';
 import useApi from 'sentry/utils/useApi';
 import useOrganization from 'sentry/utils/useOrganization';

+ 1 - 1
static/app/utils/metrics/useMetricsCardinality.tsx

@@ -1,4 +1,4 @@
-import type {MRI} from 'sentry/types';
+import type {MRI} from 'sentry/types/metrics';
 import type {Project} from 'sentry/types/project';
 import {useMetricsQuery} from 'sentry/utils/metrics/useMetricsQuery';
 

+ 7 - 7
static/app/utils/metrics/useMetricsQuery.spec.tsx

@@ -1,4 +1,4 @@
-import type {MRI, PageFilters} from 'sentry/types';
+import type {PageFilters} from 'sentry/types/core';
 import {
   createMqlQuery,
   getMetricsQueryApiRequestPayload,
@@ -45,7 +45,7 @@ describe('getMetricsQueryApiRequestPayload', () => {
     const metric = {
       query: 'error',
       groupBy: ['project'],
-      mri: 'c:custom/sessions@none' as MRI,
+      mri: 'c:custom/sessions@none' as const,
       op: 'avg',
       name: 'query_1',
     };
@@ -79,7 +79,7 @@ describe('getMetricsQueryApiRequestPayload', () => {
 
   it('should return the correct query object with default values (period)', () => {
     const metric = {
-      mri: 'c:custom/sessions@none' as MRI,
+      mri: 'c:custom/sessions@none' as const,
       op: 'avg',
       query: 'error',
       groupBy: ['project'],
@@ -114,7 +114,7 @@ describe('getMetricsQueryApiRequestPayload', () => {
 
   it('should return the correct query object with overridden values', () => {
     const metric = {
-      mri: 'c:custom/sessions@none' as MRI,
+      mri: 'c:custom/sessions@none' as const,
       op: 'avg',
       query: 'error',
       groupBy: ['project'],
@@ -153,7 +153,7 @@ describe('getMetricsQueryApiRequestPayload', () => {
 
   it('should not add a default orderBy if one is already present', () => {
     const metric = {
-      mri: 'c:custom/sessions@none' as MRI,
+      mri: 'c:custom/sessions@none' as const,
       op: 'avg',
       query: 'error',
       groupBy: ['project'],
@@ -190,7 +190,7 @@ describe('getMetricsQueryApiRequestPayload', () => {
 
   it('should not add a default orderBy if there are no groups', () => {
     const metric = {
-      mri: 'c:custom/sessions@none' as MRI,
+      mri: 'c:custom/sessions@none' as const,
       op: 'avg',
       query: 'error',
       groupBy: [],
@@ -226,7 +226,7 @@ describe('getMetricsQueryApiRequestPayload', () => {
 
   it('should not add intervalLadder override into the request', () => {
     const metric = {
-      mri: 'c:custom/test@seconds' as MRI,
+      mri: 'c:custom/test@seconds' as const,
       op: 'sum',
       query: 'error',
       groupBy: [],

+ 2 - 1
static/app/utils/metrics/useMetricsSamples.tsx

@@ -1,5 +1,6 @@
 import {normalizeDateTimeParams} from 'sentry/components/organizations/pageFilters/parse';
-import type {DateString, MRI, PageFilters} from 'sentry/types';
+import type {DateString, PageFilters} from 'sentry/types/core';
+import type {MRI} from 'sentry/types/metrics';
 import {useApiQuery} from 'sentry/utils/queryClient';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';

+ 2 - 1
static/app/utils/metrics/useMetricsTagValues.tsx

@@ -1,4 +1,5 @@
-import type {MRI, PageFilters} from 'sentry/types';
+import type {PageFilters} from 'sentry/types/core';
+import type {MRI} from 'sentry/types/metrics';
 import {getUseCaseFromMRI} from 'sentry/utils/metrics/mri';
 import type {MetricTag} from 'sentry/utils/metrics/types';
 import {useApiQuery} from 'sentry/utils/queryClient';

+ 3 - 1
static/app/utils/metrics/useMetricsTags.tsx

@@ -1,4 +1,6 @@
-import type {MRI, Organization, PageFilters} from 'sentry/types';
+import type {PageFilters} from 'sentry/types/core';
+import type {MRI} from 'sentry/types/metrics';
+import type {Organization} from 'sentry/types/organization';
 import {getUseCaseFromMRI} from 'sentry/utils/metrics/mri';
 import type {MetricTag} from 'sentry/utils/metrics/types';
 import {useMetricsMeta} from 'sentry/utils/metrics/useMetricsMeta';

+ 2 - 1
static/app/views/metrics/codeLocations.tsx

@@ -12,7 +12,8 @@ import type {SelectionRange} from 'sentry/components/metrics/chart/types';
 import {IconChevron, IconSearch} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import type {Frame, MRI} from 'sentry/types';
+import type {Frame} from 'sentry/types/event';
+import type {MRI} from 'sentry/types/metrics';
 import type {MetricCodeLocationFrame} from 'sentry/utils/metrics/types';
 import {useMetricCodeLocations} from 'sentry/utils/metrics/useMetricsCodeLocations';
 

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

@@ -11,7 +11,7 @@ import isEqual from 'lodash/isEqual';
 
 import type {FocusAreaSelection} from 'sentry/components/metrics/chart/types';
 import type {Field} from 'sentry/components/metrics/metricSamplesTable';
-import type {MRI} from 'sentry/types';
+import type {MRI} from 'sentry/types/metrics';
 import {useInstantRef, useUpdateQuery} from 'sentry/utils/metrics';
 import {
   emptyMetricsFormulaWidget,

+ 2 - 1
static/app/views/metrics/createAlertModal.tsx

@@ -17,7 +17,8 @@ import PanelBody from 'sentry/components/panels/panelBody';
 import {Tooltip} from 'sentry/components/tooltip';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import type {PageFilters, Project} from 'sentry/types';
+import type {PageFilters} from 'sentry/types/core';
+import type {Project} from 'sentry/types/project';
 import {parsePeriodToHours} from 'sentry/utils/duration/parsePeriodToHours';
 import {statsPeriodToDays} from 'sentry/utils/duration/statsPeriodToDays';
 import {

+ 2 - 1
static/app/views/metrics/widget.tsx

@@ -27,7 +27,8 @@ import {Tooltip} from 'sentry/components/tooltip';
 import {IconSearch} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import type {MetricsQueryApiResponse, PageFilters} from 'sentry/types';
+import type {PageFilters} from 'sentry/types/core';
+import type {MetricsQueryApiResponse} from 'sentry/types/metrics';
 import {defined} from 'sentry/utils';
 import {
   areResultsLimited,