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

ref(metrics): Rename and move equation input (#72390)

ArthurKnaus 9 месяцев назад
Родитель
Сommit
3ff60f65cb

+ 9 - 3
static/app/views/metrics/formulaInput.tsx → static/app/components/metrics/equationInput/index.tsx

@@ -3,12 +3,18 @@ import styled from '@emotion/styled';
 import debounce from 'lodash/debounce';
 
 import Input, {inputStyles} from 'sentry/components/input';
+import {EquationFormatter} from 'sentry/components/metrics/equationInput/syntax/formatter';
+import {
+  joinTokens,
+  parseFormula,
+} from 'sentry/components/metrics/equationInput/syntax/parser';
+import {
+  type TokenList,
+  TokenType,
+} from 'sentry/components/metrics/equationInput/syntax/types';
 import {DEFAULT_DEBOUNCE_DURATION} from 'sentry/constants';
 import {t} from 'sentry/locale';
 import {unescapeMetricsFormula} from 'sentry/utils/metrics';
-import {EquationFormatter} from 'sentry/views/metrics/formulaParser/formatter';
-import {joinTokens, parseFormula} from 'sentry/views/metrics/formulaParser/parser';
-import {type TokenList, TokenType} from 'sentry/views/metrics/formulaParser/types';
 
 interface EquationInputProps
   extends Omit<React.ComponentProps<typeof Input>, 'onChange' | 'value'> {

+ 0 - 0
static/app/views/metrics/formulaParser/formula.pegjs → static/app/components/metrics/equationInput/syntax/equation.pegjs


+ 0 - 0
static/app/views/metrics/formulaParser/formulaFormatting.pegjs → static/app/components/metrics/equationInput/syntax/equationFormatting.pegjs


+ 2 - 2
static/app/views/metrics/formulaParser/formatter.tsx → static/app/components/metrics/equationInput/syntax/formatter.tsx

@@ -2,10 +2,10 @@ import {Fragment, useMemo} from 'react';
 import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
 
+import {TokenType} from 'sentry/components/metrics/equationInput/syntax/types';
 import {Tooltip} from 'sentry/components/tooltip';
-import {TokenType} from 'sentry/views/metrics/formulaParser/types';
 
-import grammar from './formulaFormatting.pegjs';
+import grammar from './equationFormatting.pegjs';
 
 const operatorTokens = new Set([
   TokenType.PLUS,

+ 5 - 2
static/app/views/metrics/formulaParser/parser.spec.ts → static/app/components/metrics/equationInput/syntax/parser.spec.ts

@@ -1,5 +1,8 @@
-import {joinTokens, parseFormula} from 'sentry/views/metrics/formulaParser/parser';
-import {TokenType} from 'sentry/views/metrics/formulaParser/types';
+import {
+  joinTokens,
+  parseFormula,
+} from 'sentry/components/metrics/equationInput/syntax/parser';
+import {TokenType} from 'sentry/components/metrics/equationInput/syntax/types';
 
 const complexFormula = '2 / ((foo + 3) * c - (3 / 5))';
 const complexTokenList = [

+ 5 - 2
static/app/views/metrics/formulaParser/parser.ts → static/app/components/metrics/equationInput/syntax/parser.ts

@@ -1,6 +1,9 @@
-import type {Token, TokenList} from 'sentry/views/metrics/formulaParser/types';
+import type {
+  Token,
+  TokenList,
+} from 'sentry/components/metrics/equationInput/syntax/types';
 
-import grammar from './formula.pegjs';
+import grammar from './equation.pegjs';
 
 type TokenTree = Array<Token | TokenTree>;
 

+ 0 - 0
static/app/views/metrics/formulaParser/types.ts → static/app/components/metrics/equationInput/syntax/types.ts


+ 1 - 1
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 {EquationInput} from 'sentry/components/metrics/equationInput';
 import {EquationSymbol} from 'sentry/components/metrics/equationSymbol';
 import {QueryBuilder} from 'sentry/components/metrics/queryBuilder';
 import {getQuerySymbol, QuerySymbol} from 'sentry/components/metrics/querySymbol';
@@ -38,7 +39,6 @@ import type {
 } from 'sentry/views/dashboards/metrics/types';
 import {getMetricQueryName} from 'sentry/views/dashboards/metrics/utils';
 import {DisplayType} from 'sentry/views/dashboards/types';
-import {EquationInput} from 'sentry/views/metrics/formulaInput';
 import {getCreateAlert} from 'sentry/views/metrics/metricQueryContextMenu';
 
 interface Props {

+ 1 - 1
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 {EquationInput} from 'sentry/components/metrics/equationInput';
 import {EquationSymbol} from 'sentry/components/metrics/equationSymbol';
 import {QueryBuilder} from 'sentry/components/metrics/queryBuilder';
 import {getQuerySymbol, QuerySymbol} from 'sentry/components/metrics/querySymbol';
@@ -25,7 +26,6 @@ import useOrganization from 'sentry/utils/useOrganization';
 import usePageFilters from 'sentry/utils/usePageFilters';
 import {METRIC_CHART_GROUP} from 'sentry/views/metrics/constants';
 import {useMetricsContext} from 'sentry/views/metrics/context';
-import {EquationInput} from 'sentry/views/metrics/formulaInput';
 import {MetricFormulaContextMenu} from 'sentry/views/metrics/metricFormulaContextMenu';
 import {MetricQueryContextMenu} from 'sentry/views/metrics/metricQueryContextMenu';
 import {useFormulaDependencies} from 'sentry/views/metrics/utils/useFormulaDependencies';

+ 5 - 2
static/app/views/metrics/utils/useFormulaDependencies.tsx

@@ -1,5 +1,10 @@
 import {useCallback, useMemo} from 'react';
 
+import {parseFormula} from 'sentry/components/metrics/equationInput/syntax/parser';
+import {
+  type TokenList,
+  TokenType,
+} from 'sentry/components/metrics/equationInput/syntax/types';
 import {getQuerySymbol} from 'sentry/components/metrics/querySymbol';
 import {unescapeMetricsFormula} from 'sentry/utils/metrics';
 import {
@@ -8,8 +13,6 @@ import {
   type MetricsQueryWidget,
 } from 'sentry/utils/metrics/types';
 import {useMetricsContext} from 'sentry/views/metrics/context';
-import {parseFormula} from 'sentry/views/metrics/formulaParser/parser';
-import {type TokenList, TokenType} from 'sentry/views/metrics/formulaParser/types';
 
 interface FormulaDependencies {
   dependencies: MetricsQueryWidget[];

Некоторые файлы не были показаны из-за большого количества измененных файлов