From 71aba5288d73b5a14571b83da0d2729dcd1dc67d Mon Sep 17 00:00:00 2001 From: Arthur Knaus Date: Thu, 6 Jun 2024 08:19:20 +0200 Subject: [PATCH] ref(metrics): Move QueryBuilder to components --- static/app/{views => components}/metrics/metricSearchBar.tsx | 0 static/app/{views => components}/metrics/mriSelect.spec.tsx | 2 +- static/app/{views => components}/metrics/mriSelect.tsx | 0 static/app/{views => components}/metrics/queryBuilder.tsx | 4 ++-- .../app/components/modals/metricWidgetViewerModal/queries.tsx | 2 +- static/app/views/alerts/rules/metric/ruleConditionsForm.tsx | 2 +- static/app/views/metrics/queries.tsx | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename static/app/{views => components}/metrics/metricSearchBar.tsx (100%) rename static/app/{views => components}/metrics/mriSelect.spec.tsx (95%) rename static/app/{views => components}/metrics/mriSelect.tsx (100%) rename static/app/{views => components}/metrics/queryBuilder.tsx (98%) diff --git a/static/app/views/metrics/metricSearchBar.tsx b/static/app/components/metrics/metricSearchBar.tsx similarity index 100% rename from static/app/views/metrics/metricSearchBar.tsx rename to static/app/components/metrics/metricSearchBar.tsx diff --git a/static/app/views/metrics/mriSelect.spec.tsx b/static/app/components/metrics/mriSelect.spec.tsx similarity index 95% rename from static/app/views/metrics/mriSelect.spec.tsx rename to static/app/components/metrics/mriSelect.spec.tsx index 034b83437740f3..d5f7a01a7706e1 100644 --- a/static/app/views/metrics/mriSelect.spec.tsx +++ b/static/app/components/metrics/mriSelect.spec.tsx @@ -1,5 +1,5 @@ +import {getMetricsWithDuplicateNames} from 'sentry/components/metrics/mriSelect'; import type {MetricMeta} from 'sentry/types/metrics'; -import {getMetricsWithDuplicateNames} from 'sentry/views/metrics/mriSelect'; function createMetricMeta(name: string, unit: string): MetricMeta { return { diff --git a/static/app/views/metrics/mriSelect.tsx b/static/app/components/metrics/mriSelect.tsx similarity index 100% rename from static/app/views/metrics/mriSelect.tsx rename to static/app/components/metrics/mriSelect.tsx diff --git a/static/app/views/metrics/queryBuilder.tsx b/static/app/components/metrics/queryBuilder.tsx similarity index 98% rename from static/app/views/metrics/queryBuilder.tsx rename to static/app/components/metrics/queryBuilder.tsx index 9d5f5e729a1166..dd4070de5855d5 100644 --- a/static/app/views/metrics/queryBuilder.tsx +++ b/static/app/components/metrics/queryBuilder.tsx @@ -5,6 +5,8 @@ import uniqBy from 'lodash/uniqBy'; import GuideAnchor from 'sentry/components/assistant/guideAnchor'; import type {SelectOption} from 'sentry/components/compactSelect'; import {CompactSelect} from 'sentry/components/compactSelect'; +import {MetricSearchBar} from 'sentry/components/metrics/metricSearchBar'; +import {MRISelect} from 'sentry/components/metrics/mriSelect'; import {Tooltip} from 'sentry/components/tooltip'; import {IconWarning} from 'sentry/icons'; import {t} from 'sentry/locale'; @@ -19,8 +21,6 @@ import {useMetricsMeta} from 'sentry/utils/metrics/useMetricsMeta'; import {useMetricsTags} from 'sentry/utils/metrics/useMetricsTags'; import useOrganization from 'sentry/utils/useOrganization'; import usePageFilters from 'sentry/utils/usePageFilters'; -import {MetricSearchBar} from 'sentry/views/metrics/metricSearchBar'; -import {MRISelect} from 'sentry/views/metrics/mriSelect'; type QueryBuilderProps = { index: number; diff --git a/static/app/components/modals/metricWidgetViewerModal/queries.tsx b/static/app/components/modals/metricWidgetViewerModal/queries.tsx index 9181d6c5bcef4a..459da23f8f070c 100644 --- a/static/app/components/modals/metricWidgetViewerModal/queries.tsx +++ b/static/app/components/modals/metricWidgetViewerModal/queries.tsx @@ -8,6 +8,7 @@ import type {MenuItemProps} from 'sentry/components/dropdownMenu'; import {DropdownMenu} from 'sentry/components/dropdownMenu'; import Input, {type InputProps} from 'sentry/components/input'; import {CreateMetricAlertFeature} from 'sentry/components/metrics/createMetricAlertFeature'; +import {QueryBuilder} from 'sentry/components/metrics/queryBuilder'; import {Tooltip} from 'sentry/components/tooltip'; import {DEFAULT_DEBOUNCE_DURATION, SLOW_TOOLTIP_DELAY} from 'sentry/constants'; import { @@ -38,7 +39,6 @@ import {DisplayType} from 'sentry/views/dashboards/types'; import {EquationSymbol} from 'sentry/views/metrics/equationSymbol'; import {EquationInput} from 'sentry/views/metrics/formulaInput'; import {getCreateAlert} from 'sentry/views/metrics/metricQueryContextMenu'; -import {QueryBuilder} from 'sentry/views/metrics/queryBuilder'; import {getQuerySymbol, QuerySymbol} from 'sentry/views/metrics/querySymbol'; interface Props { diff --git a/static/app/views/alerts/rules/metric/ruleConditionsForm.tsx b/static/app/views/alerts/rules/metric/ruleConditionsForm.tsx index 50fd4f113d56da..9ff3d2e234d820 100644 --- a/static/app/views/alerts/rules/metric/ruleConditionsForm.tsx +++ b/static/app/views/alerts/rules/metric/ruleConditionsForm.tsx @@ -17,6 +17,7 @@ import SelectField from 'sentry/components/forms/fields/selectField'; import FormField from 'sentry/components/forms/formField'; import IdBadge from 'sentry/components/idBadge'; import ListItem from 'sentry/components/list/listItem'; +import {MetricSearchBar} from 'sentry/components/metrics/metricSearchBar'; import Panel from 'sentry/components/panels/panel'; import PanelBody from 'sentry/components/panels/panelBody'; import {InvalidReason} from 'sentry/components/searchSyntax/parser'; @@ -40,7 +41,6 @@ import { } from 'sentry/views/alerts/utils'; import type {AlertType} from 'sentry/views/alerts/wizard/options'; import {getSupportedAndOmittedTags} from 'sentry/views/alerts/wizard/options'; -import {MetricSearchBar} from 'sentry/views/metrics/metricSearchBar'; import {getProjectOptions} from '../utils'; diff --git a/static/app/views/metrics/queries.tsx b/static/app/views/metrics/queries.tsx index f0942beb946da3..209042305cbd33 100644 --- a/static/app/views/metrics/queries.tsx +++ b/static/app/views/metrics/queries.tsx @@ -4,6 +4,7 @@ import * as echarts from 'echarts/core'; import GuideAnchor from 'sentry/components/assistant/guideAnchor'; import {Button} from 'sentry/components/button'; +import {QueryBuilder} from 'sentry/components/metrics/queryBuilder'; import SwitchButton from 'sentry/components/switchButton'; import {Tooltip} from 'sentry/components/tooltip'; import {IconAdd} from 'sentry/icons'; @@ -26,7 +27,6 @@ import {EquationSymbol} from 'sentry/views/metrics/equationSymbol'; import {EquationInput} from 'sentry/views/metrics/formulaInput'; import {MetricFormulaContextMenu} from 'sentry/views/metrics/metricFormulaContextMenu'; import {MetricQueryContextMenu} from 'sentry/views/metrics/metricQueryContextMenu'; -import {QueryBuilder} from 'sentry/views/metrics/queryBuilder'; import {getQuerySymbol, QuerySymbol} from 'sentry/views/metrics/querySymbol'; import {useFormulaDependencies} from 'sentry/views/metrics/utils/useFormulaDependencies';