Browse Source

feat(ddm): Move tray and code locations to ddm-ui (#61751)

ArthurKnaus 1 year ago
parent
commit
71ab451737

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

@@ -19,8 +19,7 @@ export function getForceMetricsLayerQueryExtras(
   organization: Organization,
   alertDataset: Dataset
 ): {forceMetricsLayer: 'true'} | Record<string, never> {
-  return hasDDMExperimentalFeature(organization) &&
-    alertDataset === Dataset.GENERIC_METRICS
+  return hasDDMFeature(organization) && alertDataset === Dataset.GENERIC_METRICS
     ? {forceMetricsLayer: 'true'}
     : {};
 }

+ 0 - 7
static/app/views/ddm/codeLocations.tsx

@@ -12,19 +12,12 @@ import {IconChevron, IconSearch} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {Frame} from 'sentry/types';
-import {hasDDMExperimentalFeature} from 'sentry/utils/metrics/features';
 import {useMetricsCodeLocations} from 'sentry/utils/metrics/useMetricsCodeLocations';
-import useOrganization from 'sentry/utils/useOrganization';
 
 import {MetricCodeLocationFrame, MetricMetaCodeLocation} from '../../utils/metrics/index';
 
 export function CodeLocations({mri}: {mri: string}) {
   const {data, isLoading, isError, refetch} = useMetricsCodeLocations(mri);
-  const organization = useOrganization();
-
-  if (!hasDDMExperimentalFeature(organization)) {
-    return null;
-  }
 
   if (isLoading) {
     return <LoadingIndicator />;

+ 1 - 16
static/app/views/ddm/layout.tsx

@@ -16,17 +16,14 @@ import SplitPanel, {BaseSplitDivider, DividerProps} from 'sentry/components/spli
 import {IconGrabbable} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
-import {hasDDMExperimentalFeature} from 'sentry/utils/metrics/features';
 import {useDimensions} from 'sentry/utils/useDimensions';
-import useOrganization from 'sentry/utils/useOrganization';
 import {MetricScratchpad} from 'sentry/views/ddm/scratchpad';
 import {ScratchpadSelector} from 'sentry/views/ddm/scratchpadSelector';
-import {TraceTable} from 'sentry/views/ddm/traceTable';
 import {TrayContent} from 'sentry/views/ddm/trayContent';
 
 const SIZE_LOCAL_STORAGE_KEY = 'ddm-split-size';
 
-function MainContent({showTraceTable}: {showTraceTable?: boolean}) {
+function MainContent() {
   return (
     <Fragment>
       <Layout.Header>
@@ -63,28 +60,16 @@ function MainContent({showTraceTable}: {showTraceTable?: boolean}) {
           </PaddedContainer>
           <MetricScratchpad />
         </Layout.Main>
-        {showTraceTable && <TraceTable />}
       </Layout.Body>
     </Fragment>
   );
 }
 
 export const DDMLayout = memo(() => {
-  const organization = useOrganization();
-  const hasNewLayout = hasDDMExperimentalFeature(organization);
-
   const measureRef = useRef<HTMLDivElement>(null);
   const {height} = useDimensions({elementRef: measureRef});
   const hasSize = height > 0;
 
-  if (!hasNewLayout) {
-    return (
-      <Layout.Page>
-        <MainContent showTraceTable />
-      </Layout.Page>
-    );
-  }
-
   return (
     <FullViewport ref={measureRef}>
       {

+ 1 - 4
static/app/views/ddm/scratchpad.tsx

@@ -8,7 +8,6 @@ import {IconAdd} from 'sentry/icons';
 import {space} from 'sentry/styles/space';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import {MetricWidgetQueryParams} from 'sentry/utils/metrics';
-import {hasDDMExperimentalFeature} from 'sentry/utils/metrics/features';
 import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import {DDM_CHART_GROUP, MIN_WIDGET_WIDTH} from 'sentry/views/ddm/constants';
@@ -41,9 +40,7 @@ export function MetricScratchpad() {
           key={index}
           index={index}
           onSelect={setSelectedWidgetIndex}
-          isSelected={
-            hasDDMExperimentalFeature(organization) && selectedWidgetIndex === index
-          }
+          isSelected={selectedWidgetIndex === index}
           onChange={handleChange}
           widget={widget}
           datetime={selection.datetime}