Chore: refactor core transformer folder structure (#45497)

pull/45548/head
Ryan McKinley 3 years ago committed by GitHub
parent d3ae8939af
commit bbddab0294
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .github/CODEOWNERS
  2. 2
      public/app/app.ts
  3. 52
      public/app/core/utils/standardTransformers.ts
  4. 2
      public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.test.tsx
  5. 2
      public/app/features/geo/format/utils.ts
  6. 2
      public/app/features/geo/gazetteer/gazetteer.test.ts
  7. 0
      public/app/features/transformers/FilterByValueTransformer/FilterByValueFilterEditor.tsx
  8. 0
      public/app/features/transformers/FilterByValueTransformer/FilterByValueTransformerEditor.tsx
  9. 0
      public/app/features/transformers/FilterByValueTransformer/ValueMatchers/BasicMatcherEditor.tsx
  10. 0
      public/app/features/transformers/FilterByValueTransformer/ValueMatchers/NoopMatcherEditor.tsx
  11. 0
      public/app/features/transformers/FilterByValueTransformer/ValueMatchers/RangeMatcherEditor.tsx
  12. 0
      public/app/features/transformers/FilterByValueTransformer/ValueMatchers/types.ts
  13. 0
      public/app/features/transformers/FilterByValueTransformer/ValueMatchers/utils.ts
  14. 0
      public/app/features/transformers/FilterByValueTransformer/ValueMatchers/valueMatchersUI.ts
  15. 0
      public/app/features/transformers/calculateHeatmap/HeatmapTransformerEditor.tsx
  16. 0
      public/app/features/transformers/calculateHeatmap/editor/AxisEditor.tsx
  17. 0
      public/app/features/transformers/calculateHeatmap/editor/helper.ts
  18. 0
      public/app/features/transformers/calculateHeatmap/heatmap.test.ts
  19. 0
      public/app/features/transformers/calculateHeatmap/heatmap.ts
  20. 0
      public/app/features/transformers/calculateHeatmap/models.gen.ts
  21. 0
      public/app/features/transformers/calculateHeatmap/utils.ts
  22. 0
      public/app/features/transformers/configFromQuery/ConfigFromQueryTransformerEditor.test.tsx
  23. 0
      public/app/features/transformers/configFromQuery/ConfigFromQueryTransformerEditor.tsx
  24. 0
      public/app/features/transformers/configFromQuery/configFromQuery.test.ts
  25. 0
      public/app/features/transformers/configFromQuery/configFromQuery.ts
  26. 0
      public/app/features/transformers/editors/CalculateFieldTransformerEditor.tsx
  27. 0
      public/app/features/transformers/editors/ConcatenateTransformerEditor.tsx
  28. 0
      public/app/features/transformers/editors/ConvertFieldTypeTransformerEditor.tsx
  29. 0
      public/app/features/transformers/editors/FilterByNameTransformerEditor.tsx
  30. 0
      public/app/features/transformers/editors/FilterByRefIdTransformerEditor.tsx
  31. 2
      public/app/features/transformers/editors/GroupByTransformerEditor.tsx
  32. 0
      public/app/features/transformers/editors/HistogramTransformerEditor.tsx
  33. 0
      public/app/features/transformers/editors/LabelsToFieldsTransformerEditor.tsx
  34. 0
      public/app/features/transformers/editors/MergeTransformerEditor.tsx
  35. 2
      public/app/features/transformers/editors/OrganizeFieldsTransformerEditor.tsx
  36. 0
      public/app/features/transformers/editors/ReduceTransformerEditor.tsx
  37. 0
      public/app/features/transformers/editors/RenameByRegexTransformer.tsx
  38. 2
      public/app/features/transformers/editors/SeriesToFieldsTransformerEditor.tsx
  39. 0
      public/app/features/transformers/editors/SeriesToRowsTransformerEditor.tsx
  40. 2
      public/app/features/transformers/editors/SortByTransformerEditor.tsx
  41. 0
      public/app/features/transformers/extractFields/ExtractFieldsTransformerEditor.tsx
  42. 0
      public/app/features/transformers/extractFields/extractFields.test.ts
  43. 0
      public/app/features/transformers/extractFields/extractFields.ts
  44. 0
      public/app/features/transformers/extractFields/fieldExtractor.test.ts
  45. 0
      public/app/features/transformers/extractFields/fieldExtractors.ts
  46. 0
      public/app/features/transformers/fieldToConfigMapping/FieldToConfigMappingEditor.test.tsx
  47. 0
      public/app/features/transformers/fieldToConfigMapping/FieldToConfigMappingEditor.tsx
  48. 0
      public/app/features/transformers/fieldToConfigMapping/fieldToConfigMapping.ts
  49. 0
      public/app/features/transformers/lookupGazetteer/FieldLookupTransformerEditor.tsx
  50. 0
      public/app/features/transformers/lookupGazetteer/fieldLookup.test.ts
  51. 0
      public/app/features/transformers/lookupGazetteer/fieldLookup.ts
  52. 0
      public/app/features/transformers/prepareTimeSeries/PrepareTimeSeriesEditor.tsx
  53. 0
      public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts
  54. 0
      public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.ts
  55. 0
      public/app/features/transformers/rowsToFields/RowsToFieldsTransformerEditor.test.tsx
  56. 0
      public/app/features/transformers/rowsToFields/RowsToFieldsTransformerEditor.tsx
  57. 0
      public/app/features/transformers/rowsToFields/rowsToFields.test.ts
  58. 0
      public/app/features/transformers/rowsToFields/rowsToFields.ts
  59. 0
      public/app/features/transformers/spatial/SpatialTransformerEditor.tsx
  60. 0
      public/app/features/transformers/spatial/models.gen.ts
  61. 0
      public/app/features/transformers/spatial/optionsHelper.tsx
  62. 0
      public/app/features/transformers/spatial/spatialTransformer.test.ts
  63. 0
      public/app/features/transformers/spatial/spatialTransformer.ts
  64. 0
      public/app/features/transformers/spatial/utils.ts
  65. 52
      public/app/features/transformers/standardTransformers.ts
  66. 0
      public/app/features/transformers/utils.ts
  67. 2
      public/app/plugins/panel/heatmap-new/fields.ts
  68. 2
      public/app/plugins/panel/heatmap-new/migrations.ts
  69. 2
      public/app/plugins/panel/heatmap-new/models.gen.ts
  70. 2
      public/app/plugins/panel/heatmap-new/module.tsx

@ -104,7 +104,7 @@ go.sum @grafana/backend-platform
/public/app/features/live/ @grafana/grafana-edge-squad
/public/app/features/explore/ @grafana/observability-experience-squad
/public/app/features/plugins @grafana/plugins-platform-frontend
/public/app/core/components/TransformersUI/spatial @grafana/grafana-edge-squad
/public/app/features/transformers/spatial @grafana/grafana-edge-squad
/public/app/plugins/panel/alertlist @grafana/alerting-squad
/public/app/plugins/panel/barchart @grafana/grafana-bi-squad
/public/app/plugins/panel/heatmap @grafana/grafana-bi-squad

@ -41,7 +41,7 @@ import 'app/features/all';
import { getScrollbarWidth } from '@grafana/ui';
import { variableAdapters } from './features/variables/adapters';
import { initDevFeatures } from './dev';
import { getStandardTransformers } from 'app/core/utils/standardTransformers';
import { getStandardTransformers } from 'app/features/transformers/standardTransformers';
import { SentryEchoBackend } from './core/services/echo/backends/sentry/SentryBackend';
import { setVariableQueryRunner, VariableQueryRunner } from './features/variables/query/VariableQueryRunner';
import { configureStore } from './store/configureStore';

@ -1,52 +0,0 @@
import { TransformerRegistryItem } from '@grafana/data';
import { reduceTransformRegistryItem } from '../components/TransformersUI/ReduceTransformerEditor';
import { filterFieldsByNameTransformRegistryItem } from '../components/TransformersUI/FilterByNameTransformerEditor';
import { filterFramesByRefIdTransformRegistryItem } from '../components/TransformersUI/FilterByRefIdTransformerEditor';
import { filterByValueTransformRegistryItem } from '../components/TransformersUI/FilterByValueTransformer/FilterByValueTransformerEditor';
import { organizeFieldsTransformRegistryItem } from '../components/TransformersUI/OrganizeFieldsTransformerEditor';
import { seriesToFieldsTransformerRegistryItem } from '../components/TransformersUI/SeriesToFieldsTransformerEditor';
import { calculateFieldTransformRegistryItem } from '../components/TransformersUI/CalculateFieldTransformerEditor';
import { labelsToFieldsTransformerRegistryItem } from '../components/TransformersUI/LabelsToFieldsTransformerEditor';
import { groupByTransformRegistryItem } from '../components/TransformersUI/GroupByTransformerEditor';
import { sortByTransformRegistryItem } from '../components/TransformersUI/SortByTransformerEditor';
import { mergeTransformerRegistryItem } from '../components/TransformersUI/MergeTransformerEditor';
import { seriesToRowsTransformerRegistryItem } from '../components/TransformersUI/SeriesToRowsTransformerEditor';
import { concatenateTransformRegistryItem } from '../components/TransformersUI/ConcatenateTransformerEditor';
import { renameByRegexTransformRegistryItem } from '../components/TransformersUI/RenameByRegexTransformer';
import { histogramTransformRegistryItem } from '../components/TransformersUI/HistogramTransformerEditor';
import { rowsToFieldsTransformRegistryItem } from '../components/TransformersUI/rowsToFields/RowsToFieldsTransformerEditor';
import { configFromQueryTransformRegistryItem } from '../components/TransformersUI/configFromQuery/ConfigFromQueryTransformerEditor';
import { prepareTimeseriesTransformerRegistryItem } from '../components/TransformersUI/prepareTimeSeries/PrepareTimeSeriesEditor';
import { convertFieldTypeTransformRegistryItem } from '../components/TransformersUI/ConvertFieldTypeTransformerEditor';
import { fieldLookupTransformRegistryItem } from '../components/TransformersUI/lookupGazetteer/FieldLookupTransformerEditor';
import { extractFieldsTransformRegistryItem } from '../components/TransformersUI/extractFields/ExtractFieldsTransformerEditor';
import { heatmapTransformRegistryItem } from '../components/TransformersUI/calculateHeatmap/HeatmapTransformerEditor';
import { spatialTransformRegistryItem } from '../components/TransformersUI/spatial/SpatialTransformerEditor';
export const getStandardTransformers = (): Array<TransformerRegistryItem<any>> => {
return [
reduceTransformRegistryItem,
filterFieldsByNameTransformRegistryItem,
renameByRegexTransformRegistryItem,
filterFramesByRefIdTransformRegistryItem,
filterByValueTransformRegistryItem,
organizeFieldsTransformRegistryItem,
seriesToFieldsTransformerRegistryItem,
seriesToRowsTransformerRegistryItem,
concatenateTransformRegistryItem,
calculateFieldTransformRegistryItem,
labelsToFieldsTransformerRegistryItem,
groupByTransformRegistryItem,
sortByTransformRegistryItem,
mergeTransformerRegistryItem,
histogramTransformRegistryItem,
rowsToFieldsTransformRegistryItem,
configFromQueryTransformRegistryItem,
prepareTimeseriesTransformerRegistryItem,
convertFieldTypeTransformRegistryItem,
spatialTransformRegistryItem,
fieldLookupTransformRegistryItem,
extractFieldsTransformRegistryItem,
heatmapTransformRegistryItem,
];
};

@ -4,7 +4,7 @@ import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { TransformationsEditor } from './TransformationsEditor';
import { PanelModel } from '../../state';
import { getStandardTransformers } from 'app/core/utils/standardTransformers';
import { getStandardTransformers } from 'app/features/transformers/standardTransformers';
import { selectors } from '@grafana/e2e-selectors';
const setup = (transformations: DataTransformerConfig[] = []) => {

@ -1,5 +1,5 @@
import { ArrayVector, Field, FieldConfig, FieldType } from '@grafana/data';
import { getCenterPoint } from 'app/core/components/TransformersUI/spatial/utils';
import { getCenterPoint } from 'app/features/transformers/spatial/utils';
import { Geometry, LineString, Point } from 'ol/geom';
import { fromLonLat } from 'ol/proj';
import { Gazetteer } from '../gazetteer/gazetteer';

@ -1,4 +1,4 @@
import { getCenterPointWGS84 } from 'app/core/components/TransformersUI/spatial/utils';
import { getCenterPointWGS84 } from 'app/features/transformers/spatial/utils';
import { getGazetteer } from './gazetteer';
let backendResults: any = { hello: 'world' };

@ -15,7 +15,7 @@ import {
GroupByOperationID,
GroupByTransformerOptions,
} from '@grafana/data/src/transformations/transformers/groupBy';
import { useAllFieldNamesFromDataFrames } from './utils';
import { useAllFieldNamesFromDataFrames } from '../utils';
interface FieldProps {
fieldName: string;

@ -12,7 +12,7 @@ import { stylesFactory, useTheme, Input, IconButton, Icon, FieldValidationMessag
import { OrganizeFieldsTransformerOptions } from '@grafana/data/src/transformations/transformers/organize';
import { createOrderFieldsComparer } from '@grafana/data/src/transformations/transformers/order';
import { useAllFieldNamesFromDataFrames } from './utils';
import { useAllFieldNamesFromDataFrames } from '../utils';
interface OrganizeFieldsTransformerEditorProps extends TransformerUIProps<OrganizeFieldsTransformerOptions> {}

@ -9,7 +9,7 @@ import {
import { Select } from '@grafana/ui';
import { SeriesToColumnsOptions } from '@grafana/data/src/transformations/transformers/seriesToColumns';
import { useAllFieldNamesFromDataFrames } from './utils';
import { useAllFieldNamesFromDataFrames } from '../utils';
export const SeriesToFieldsTransformerEditor: React.FC<TransformerUIProps<SeriesToColumnsOptions>> = ({
input,

@ -2,7 +2,7 @@ import React, { useCallback } from 'react';
import { DataTransformerID, standardTransformers, TransformerRegistryItem, TransformerUIProps } from '@grafana/data';
import { InlineField, InlineSwitch, InlineFieldRow, Select } from '@grafana/ui';
import { SortByField, SortByTransformerOptions } from '@grafana/data/src/transformations/transformers/sortBy';
import { useAllFieldNamesFromDataFrames } from './utils';
import { useAllFieldNamesFromDataFrames } from '../utils';
export const SortByTransformerEditor: React.FC<TransformerUIProps<SortByTransformerOptions>> = ({
input,

@ -0,0 +1,52 @@
import { TransformerRegistryItem } from '@grafana/data';
import { reduceTransformRegistryItem } from './editors/ReduceTransformerEditor';
import { filterFieldsByNameTransformRegistryItem } from './editors/FilterByNameTransformerEditor';
import { filterFramesByRefIdTransformRegistryItem } from './editors/FilterByRefIdTransformerEditor';
import { filterByValueTransformRegistryItem } from './FilterByValueTransformer/FilterByValueTransformerEditor';
import { organizeFieldsTransformRegistryItem } from './editors/OrganizeFieldsTransformerEditor';
import { seriesToFieldsTransformerRegistryItem } from './editors/SeriesToFieldsTransformerEditor';
import { calculateFieldTransformRegistryItem } from './editors/CalculateFieldTransformerEditor';
import { labelsToFieldsTransformerRegistryItem } from './editors/LabelsToFieldsTransformerEditor';
import { groupByTransformRegistryItem } from './editors/GroupByTransformerEditor';
import { sortByTransformRegistryItem } from './editors/SortByTransformerEditor';
import { mergeTransformerRegistryItem } from './editors/MergeTransformerEditor';
import { seriesToRowsTransformerRegistryItem } from './editors/SeriesToRowsTransformerEditor';
import { concatenateTransformRegistryItem } from './editors/ConcatenateTransformerEditor';
import { renameByRegexTransformRegistryItem } from './editors/RenameByRegexTransformer';
import { histogramTransformRegistryItem } from './editors/HistogramTransformerEditor';
import { rowsToFieldsTransformRegistryItem } from './rowsToFields/RowsToFieldsTransformerEditor';
import { configFromQueryTransformRegistryItem } from './configFromQuery/ConfigFromQueryTransformerEditor';
import { prepareTimeseriesTransformerRegistryItem } from './prepareTimeSeries/PrepareTimeSeriesEditor';
import { convertFieldTypeTransformRegistryItem } from './editors/ConvertFieldTypeTransformerEditor';
import { fieldLookupTransformRegistryItem } from './lookupGazetteer/FieldLookupTransformerEditor';
import { extractFieldsTransformRegistryItem } from './extractFields/ExtractFieldsTransformerEditor';
import { heatmapTransformRegistryItem } from './calculateHeatmap/HeatmapTransformerEditor';
import { spatialTransformRegistryItem } from './spatial/SpatialTransformerEditor';
export const getStandardTransformers = (): Array<TransformerRegistryItem<any>> => {
return [
reduceTransformRegistryItem,
filterFieldsByNameTransformRegistryItem,
renameByRegexTransformRegistryItem,
filterFramesByRefIdTransformRegistryItem,
filterByValueTransformRegistryItem,
organizeFieldsTransformRegistryItem,
seriesToFieldsTransformerRegistryItem,
seriesToRowsTransformerRegistryItem,
concatenateTransformRegistryItem,
calculateFieldTransformRegistryItem,
labelsToFieldsTransformerRegistryItem,
groupByTransformRegistryItem,
sortByTransformRegistryItem,
mergeTransformerRegistryItem,
histogramTransformRegistryItem,
rowsToFieldsTransformRegistryItem,
configFromQueryTransformRegistryItem,
prepareTimeseriesTransformerRegistryItem,
convertFieldTypeTransformRegistryItem,
spatialTransformRegistryItem,
fieldLookupTransformRegistryItem,
extractFieldsTransformRegistryItem,
heatmapTransformRegistryItem,
];
};

@ -3,7 +3,7 @@ import {
calculateHeatmapFromData,
createHeatmapFromBuckets,
sortAscStrInf,
} from 'app/core/components/TransformersUI/calculateHeatmap/heatmap';
} from 'app/features/transformers/calculateHeatmap/heatmap';
import { HeatmapSourceMode, PanelOptions } from './models.gen';
export const enum BucketLayout {

@ -3,7 +3,7 @@ import { LegendDisplayMode, VisibilityMode } from '@grafana/schema';
import {
HeatmapCalculationMode,
HeatmapCalculationOptions,
} from 'app/core/components/TransformersUI/calculateHeatmap/models.gen';
} from 'app/features/transformers/calculateHeatmap/models.gen';
import { HeatmapSourceMode, PanelOptions, defaultPanelOptions } from './models.gen';
/**

@ -4,7 +4,7 @@
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
import { HideableFieldConfig, LegendDisplayMode, OptionsWithLegend, VisibilityMode } from '@grafana/schema';
import { HeatmapCalculationOptions } from 'app/core/components/TransformersUI/calculateHeatmap/models.gen';
import { HeatmapCalculationOptions } from 'app/features/transformers/calculateHeatmap/models.gen';
export const modelVersion = Object.freeze([1, 0]);

@ -11,7 +11,7 @@ import {
} from './models.gen';
import { HeatmapSuggestionsSupplier } from './suggestions';
import { heatmapChangedHandler } from './migrations';
import { addHeatmapCalculationOptions } from 'app/core/components/TransformersUI/calculateHeatmap/editor/helper';
import { addHeatmapCalculationOptions } from 'app/features/transformers/calculateHeatmap/editor/helper';
import { colorSchemes } from './palettes';
export const plugin = new PanelPlugin<PanelOptions, GraphFieldConfig>(HeatmapPanel)

Loading…
Cancel
Save