From bbddab0294ab53a763b28ce4aa6e6ef0878f0bc2 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Thu, 17 Feb 2022 08:12:38 -0800 Subject: [PATCH] Chore: refactor core transformer folder structure (#45497) --- .github/CODEOWNERS | 2 +- public/app/app.ts | 2 +- public/app/core/utils/standardTransformers.ts | 52 ------------------- .../TransformationsEditor.test.tsx | 2 +- public/app/features/geo/format/utils.ts | 2 +- .../features/geo/gazetteer/gazetteer.test.ts | 2 +- .../FilterByValueFilterEditor.tsx | 0 .../FilterByValueTransformerEditor.tsx | 0 .../ValueMatchers/BasicMatcherEditor.tsx | 0 .../ValueMatchers/NoopMatcherEditor.tsx | 0 .../ValueMatchers/RangeMatcherEditor.tsx | 0 .../ValueMatchers/types.ts | 0 .../ValueMatchers/utils.ts | 0 .../ValueMatchers/valueMatchersUI.ts | 0 .../HeatmapTransformerEditor.tsx | 0 .../calculateHeatmap/editor/AxisEditor.tsx | 0 .../calculateHeatmap/editor/helper.ts | 0 .../calculateHeatmap/heatmap.test.ts | 0 .../transformers}/calculateHeatmap/heatmap.ts | 0 .../calculateHeatmap/models.gen.ts | 0 .../transformers}/calculateHeatmap/utils.ts | 0 .../ConfigFromQueryTransformerEditor.test.tsx | 0 .../ConfigFromQueryTransformerEditor.tsx | 0 .../configFromQuery/configFromQuery.test.ts | 0 .../configFromQuery/configFromQuery.ts | 0 .../CalculateFieldTransformerEditor.tsx | 0 .../editors}/ConcatenateTransformerEditor.tsx | 0 .../ConvertFieldTypeTransformerEditor.tsx | 0 .../FilterByNameTransformerEditor.tsx | 0 .../FilterByRefIdTransformerEditor.tsx | 0 .../editors}/GroupByTransformerEditor.tsx | 2 +- .../editors}/HistogramTransformerEditor.tsx | 0 .../LabelsToFieldsTransformerEditor.tsx | 0 .../editors}/MergeTransformerEditor.tsx | 0 .../OrganizeFieldsTransformerEditor.tsx | 2 +- .../editors}/ReduceTransformerEditor.tsx | 0 .../editors}/RenameByRegexTransformer.tsx | 0 .../SeriesToFieldsTransformerEditor.tsx | 2 +- .../SeriesToRowsTransformerEditor.tsx | 0 .../editors}/SortByTransformerEditor.tsx | 2 +- .../ExtractFieldsTransformerEditor.tsx | 0 .../extractFields/extractFields.test.ts | 0 .../extractFields/extractFields.ts | 0 .../extractFields/fieldExtractor.test.ts | 0 .../extractFields/fieldExtractors.ts | 0 .../FieldToConfigMappingEditor.test.tsx | 0 .../FieldToConfigMappingEditor.tsx | 0 .../fieldToConfigMapping.ts | 0 .../FieldLookupTransformerEditor.tsx | 0 .../lookupGazetteer/fieldLookup.test.ts | 0 .../lookupGazetteer/fieldLookup.ts | 0 .../PrepareTimeSeriesEditor.tsx | 0 .../prepareTimeSeries.test.ts | 0 .../prepareTimeSeries/prepareTimeSeries.ts | 0 .../RowsToFieldsTransformerEditor.test.tsx | 0 .../RowsToFieldsTransformerEditor.tsx | 0 .../rowsToFields/rowsToFields.test.ts | 0 .../rowsToFields/rowsToFields.ts | 0 .../spatial/SpatialTransformerEditor.tsx | 0 .../transformers}/spatial/models.gen.ts | 0 .../transformers}/spatial/optionsHelper.tsx | 0 .../spatial/spatialTransformer.test.ts | 0 .../spatial/spatialTransformer.ts | 0 .../transformers}/spatial/utils.ts | 0 .../transformers/standardTransformers.ts | 52 +++++++++++++++++++ .../transformers}/utils.ts | 0 .../app/plugins/panel/heatmap-new/fields.ts | 2 +- .../plugins/panel/heatmap-new/migrations.ts | 2 +- .../plugins/panel/heatmap-new/models.gen.ts | 2 +- .../app/plugins/panel/heatmap-new/module.tsx | 2 +- 70 files changed, 65 insertions(+), 65 deletions(-) delete mode 100644 public/app/core/utils/standardTransformers.ts rename public/app/{core/components/TransformersUI => features/transformers}/FilterByValueTransformer/FilterByValueFilterEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers}/FilterByValueTransformer/FilterByValueTransformerEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers}/FilterByValueTransformer/ValueMatchers/BasicMatcherEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers}/FilterByValueTransformer/ValueMatchers/NoopMatcherEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers}/FilterByValueTransformer/ValueMatchers/RangeMatcherEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers}/FilterByValueTransformer/ValueMatchers/types.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/FilterByValueTransformer/ValueMatchers/utils.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/FilterByValueTransformer/ValueMatchers/valueMatchersUI.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/calculateHeatmap/HeatmapTransformerEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers}/calculateHeatmap/editor/AxisEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers}/calculateHeatmap/editor/helper.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/calculateHeatmap/heatmap.test.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/calculateHeatmap/heatmap.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/calculateHeatmap/models.gen.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/calculateHeatmap/utils.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/configFromQuery/ConfigFromQueryTransformerEditor.test.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers}/configFromQuery/ConfigFromQueryTransformerEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers}/configFromQuery/configFromQuery.test.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/configFromQuery/configFromQuery.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers/editors}/CalculateFieldTransformerEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers/editors}/ConcatenateTransformerEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers/editors}/ConvertFieldTypeTransformerEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers/editors}/FilterByNameTransformerEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers/editors}/FilterByRefIdTransformerEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers/editors}/GroupByTransformerEditor.tsx (98%) rename public/app/{core/components/TransformersUI => features/transformers/editors}/HistogramTransformerEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers/editors}/LabelsToFieldsTransformerEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers/editors}/MergeTransformerEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers/editors}/OrganizeFieldsTransformerEditor.tsx (99%) rename public/app/{core/components/TransformersUI => features/transformers/editors}/ReduceTransformerEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers/editors}/RenameByRegexTransformer.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers/editors}/SeriesToFieldsTransformerEditor.tsx (96%) rename public/app/{core/components/TransformersUI => features/transformers/editors}/SeriesToRowsTransformerEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers/editors}/SortByTransformerEditor.tsx (97%) rename public/app/{core/components/TransformersUI => features/transformers}/extractFields/ExtractFieldsTransformerEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers}/extractFields/extractFields.test.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/extractFields/extractFields.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/extractFields/fieldExtractor.test.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/extractFields/fieldExtractors.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/fieldToConfigMapping/FieldToConfigMappingEditor.test.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers}/fieldToConfigMapping/FieldToConfigMappingEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers}/fieldToConfigMapping/fieldToConfigMapping.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/lookupGazetteer/FieldLookupTransformerEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers}/lookupGazetteer/fieldLookup.test.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/lookupGazetteer/fieldLookup.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/prepareTimeSeries/PrepareTimeSeriesEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers}/prepareTimeSeries/prepareTimeSeries.test.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/prepareTimeSeries/prepareTimeSeries.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/rowsToFields/RowsToFieldsTransformerEditor.test.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers}/rowsToFields/RowsToFieldsTransformerEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers}/rowsToFields/rowsToFields.test.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/rowsToFields/rowsToFields.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/spatial/SpatialTransformerEditor.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers}/spatial/models.gen.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/spatial/optionsHelper.tsx (100%) rename public/app/{core/components/TransformersUI => features/transformers}/spatial/spatialTransformer.test.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/spatial/spatialTransformer.ts (100%) rename public/app/{core/components/TransformersUI => features/transformers}/spatial/utils.ts (100%) create mode 100644 public/app/features/transformers/standardTransformers.ts rename public/app/{core/components/TransformersUI => features/transformers}/utils.ts (100%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 88f575d5b9d..495abdd9d94 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -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 diff --git a/public/app/app.ts b/public/app/app.ts index 48167320b11..1ca8c0435d7 100644 --- a/public/app/app.ts +++ b/public/app/app.ts @@ -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'; diff --git a/public/app/core/utils/standardTransformers.ts b/public/app/core/utils/standardTransformers.ts deleted file mode 100644 index 41f29b975d0..00000000000 --- a/public/app/core/utils/standardTransformers.ts +++ /dev/null @@ -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> => { - return [ - reduceTransformRegistryItem, - filterFieldsByNameTransformRegistryItem, - renameByRegexTransformRegistryItem, - filterFramesByRefIdTransformRegistryItem, - filterByValueTransformRegistryItem, - organizeFieldsTransformRegistryItem, - seriesToFieldsTransformerRegistryItem, - seriesToRowsTransformerRegistryItem, - concatenateTransformRegistryItem, - calculateFieldTransformRegistryItem, - labelsToFieldsTransformerRegistryItem, - groupByTransformRegistryItem, - sortByTransformRegistryItem, - mergeTransformerRegistryItem, - histogramTransformRegistryItem, - rowsToFieldsTransformRegistryItem, - configFromQueryTransformRegistryItem, - prepareTimeseriesTransformerRegistryItem, - convertFieldTypeTransformRegistryItem, - spatialTransformRegistryItem, - fieldLookupTransformRegistryItem, - extractFieldsTransformRegistryItem, - heatmapTransformRegistryItem, - ]; -}; diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.test.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.test.tsx index 5269a9a6d37..da6ff1462fd 100644 --- a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.test.tsx +++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.test.tsx @@ -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[] = []) => { diff --git a/public/app/features/geo/format/utils.ts b/public/app/features/geo/format/utils.ts index 8dd793dae6b..37ea8097d29 100644 --- a/public/app/features/geo/format/utils.ts +++ b/public/app/features/geo/format/utils.ts @@ -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'; diff --git a/public/app/features/geo/gazetteer/gazetteer.test.ts b/public/app/features/geo/gazetteer/gazetteer.test.ts index 4c9f455817e..7bff83cfb1c 100644 --- a/public/app/features/geo/gazetteer/gazetteer.test.ts +++ b/public/app/features/geo/gazetteer/gazetteer.test.ts @@ -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' }; diff --git a/public/app/core/components/TransformersUI/FilterByValueTransformer/FilterByValueFilterEditor.tsx b/public/app/features/transformers/FilterByValueTransformer/FilterByValueFilterEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/FilterByValueTransformer/FilterByValueFilterEditor.tsx rename to public/app/features/transformers/FilterByValueTransformer/FilterByValueFilterEditor.tsx diff --git a/public/app/core/components/TransformersUI/FilterByValueTransformer/FilterByValueTransformerEditor.tsx b/public/app/features/transformers/FilterByValueTransformer/FilterByValueTransformerEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/FilterByValueTransformer/FilterByValueTransformerEditor.tsx rename to public/app/features/transformers/FilterByValueTransformer/FilterByValueTransformerEditor.tsx diff --git a/public/app/core/components/TransformersUI/FilterByValueTransformer/ValueMatchers/BasicMatcherEditor.tsx b/public/app/features/transformers/FilterByValueTransformer/ValueMatchers/BasicMatcherEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/FilterByValueTransformer/ValueMatchers/BasicMatcherEditor.tsx rename to public/app/features/transformers/FilterByValueTransformer/ValueMatchers/BasicMatcherEditor.tsx diff --git a/public/app/core/components/TransformersUI/FilterByValueTransformer/ValueMatchers/NoopMatcherEditor.tsx b/public/app/features/transformers/FilterByValueTransformer/ValueMatchers/NoopMatcherEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/FilterByValueTransformer/ValueMatchers/NoopMatcherEditor.tsx rename to public/app/features/transformers/FilterByValueTransformer/ValueMatchers/NoopMatcherEditor.tsx diff --git a/public/app/core/components/TransformersUI/FilterByValueTransformer/ValueMatchers/RangeMatcherEditor.tsx b/public/app/features/transformers/FilterByValueTransformer/ValueMatchers/RangeMatcherEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/FilterByValueTransformer/ValueMatchers/RangeMatcherEditor.tsx rename to public/app/features/transformers/FilterByValueTransformer/ValueMatchers/RangeMatcherEditor.tsx diff --git a/public/app/core/components/TransformersUI/FilterByValueTransformer/ValueMatchers/types.ts b/public/app/features/transformers/FilterByValueTransformer/ValueMatchers/types.ts similarity index 100% rename from public/app/core/components/TransformersUI/FilterByValueTransformer/ValueMatchers/types.ts rename to public/app/features/transformers/FilterByValueTransformer/ValueMatchers/types.ts diff --git a/public/app/core/components/TransformersUI/FilterByValueTransformer/ValueMatchers/utils.ts b/public/app/features/transformers/FilterByValueTransformer/ValueMatchers/utils.ts similarity index 100% rename from public/app/core/components/TransformersUI/FilterByValueTransformer/ValueMatchers/utils.ts rename to public/app/features/transformers/FilterByValueTransformer/ValueMatchers/utils.ts diff --git a/public/app/core/components/TransformersUI/FilterByValueTransformer/ValueMatchers/valueMatchersUI.ts b/public/app/features/transformers/FilterByValueTransformer/ValueMatchers/valueMatchersUI.ts similarity index 100% rename from public/app/core/components/TransformersUI/FilterByValueTransformer/ValueMatchers/valueMatchersUI.ts rename to public/app/features/transformers/FilterByValueTransformer/ValueMatchers/valueMatchersUI.ts diff --git a/public/app/core/components/TransformersUI/calculateHeatmap/HeatmapTransformerEditor.tsx b/public/app/features/transformers/calculateHeatmap/HeatmapTransformerEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/calculateHeatmap/HeatmapTransformerEditor.tsx rename to public/app/features/transformers/calculateHeatmap/HeatmapTransformerEditor.tsx diff --git a/public/app/core/components/TransformersUI/calculateHeatmap/editor/AxisEditor.tsx b/public/app/features/transformers/calculateHeatmap/editor/AxisEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/calculateHeatmap/editor/AxisEditor.tsx rename to public/app/features/transformers/calculateHeatmap/editor/AxisEditor.tsx diff --git a/public/app/core/components/TransformersUI/calculateHeatmap/editor/helper.ts b/public/app/features/transformers/calculateHeatmap/editor/helper.ts similarity index 100% rename from public/app/core/components/TransformersUI/calculateHeatmap/editor/helper.ts rename to public/app/features/transformers/calculateHeatmap/editor/helper.ts diff --git a/public/app/core/components/TransformersUI/calculateHeatmap/heatmap.test.ts b/public/app/features/transformers/calculateHeatmap/heatmap.test.ts similarity index 100% rename from public/app/core/components/TransformersUI/calculateHeatmap/heatmap.test.ts rename to public/app/features/transformers/calculateHeatmap/heatmap.test.ts diff --git a/public/app/core/components/TransformersUI/calculateHeatmap/heatmap.ts b/public/app/features/transformers/calculateHeatmap/heatmap.ts similarity index 100% rename from public/app/core/components/TransformersUI/calculateHeatmap/heatmap.ts rename to public/app/features/transformers/calculateHeatmap/heatmap.ts diff --git a/public/app/core/components/TransformersUI/calculateHeatmap/models.gen.ts b/public/app/features/transformers/calculateHeatmap/models.gen.ts similarity index 100% rename from public/app/core/components/TransformersUI/calculateHeatmap/models.gen.ts rename to public/app/features/transformers/calculateHeatmap/models.gen.ts diff --git a/public/app/core/components/TransformersUI/calculateHeatmap/utils.ts b/public/app/features/transformers/calculateHeatmap/utils.ts similarity index 100% rename from public/app/core/components/TransformersUI/calculateHeatmap/utils.ts rename to public/app/features/transformers/calculateHeatmap/utils.ts diff --git a/public/app/core/components/TransformersUI/configFromQuery/ConfigFromQueryTransformerEditor.test.tsx b/public/app/features/transformers/configFromQuery/ConfigFromQueryTransformerEditor.test.tsx similarity index 100% rename from public/app/core/components/TransformersUI/configFromQuery/ConfigFromQueryTransformerEditor.test.tsx rename to public/app/features/transformers/configFromQuery/ConfigFromQueryTransformerEditor.test.tsx diff --git a/public/app/core/components/TransformersUI/configFromQuery/ConfigFromQueryTransformerEditor.tsx b/public/app/features/transformers/configFromQuery/ConfigFromQueryTransformerEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/configFromQuery/ConfigFromQueryTransformerEditor.tsx rename to public/app/features/transformers/configFromQuery/ConfigFromQueryTransformerEditor.tsx diff --git a/public/app/core/components/TransformersUI/configFromQuery/configFromQuery.test.ts b/public/app/features/transformers/configFromQuery/configFromQuery.test.ts similarity index 100% rename from public/app/core/components/TransformersUI/configFromQuery/configFromQuery.test.ts rename to public/app/features/transformers/configFromQuery/configFromQuery.test.ts diff --git a/public/app/core/components/TransformersUI/configFromQuery/configFromQuery.ts b/public/app/features/transformers/configFromQuery/configFromQuery.ts similarity index 100% rename from public/app/core/components/TransformersUI/configFromQuery/configFromQuery.ts rename to public/app/features/transformers/configFromQuery/configFromQuery.ts diff --git a/public/app/core/components/TransformersUI/CalculateFieldTransformerEditor.tsx b/public/app/features/transformers/editors/CalculateFieldTransformerEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/CalculateFieldTransformerEditor.tsx rename to public/app/features/transformers/editors/CalculateFieldTransformerEditor.tsx diff --git a/public/app/core/components/TransformersUI/ConcatenateTransformerEditor.tsx b/public/app/features/transformers/editors/ConcatenateTransformerEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/ConcatenateTransformerEditor.tsx rename to public/app/features/transformers/editors/ConcatenateTransformerEditor.tsx diff --git a/public/app/core/components/TransformersUI/ConvertFieldTypeTransformerEditor.tsx b/public/app/features/transformers/editors/ConvertFieldTypeTransformerEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/ConvertFieldTypeTransformerEditor.tsx rename to public/app/features/transformers/editors/ConvertFieldTypeTransformerEditor.tsx diff --git a/public/app/core/components/TransformersUI/FilterByNameTransformerEditor.tsx b/public/app/features/transformers/editors/FilterByNameTransformerEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/FilterByNameTransformerEditor.tsx rename to public/app/features/transformers/editors/FilterByNameTransformerEditor.tsx diff --git a/public/app/core/components/TransformersUI/FilterByRefIdTransformerEditor.tsx b/public/app/features/transformers/editors/FilterByRefIdTransformerEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/FilterByRefIdTransformerEditor.tsx rename to public/app/features/transformers/editors/FilterByRefIdTransformerEditor.tsx diff --git a/public/app/core/components/TransformersUI/GroupByTransformerEditor.tsx b/public/app/features/transformers/editors/GroupByTransformerEditor.tsx similarity index 98% rename from public/app/core/components/TransformersUI/GroupByTransformerEditor.tsx rename to public/app/features/transformers/editors/GroupByTransformerEditor.tsx index a85cc42e5fb..d6e6c372817 100644 --- a/public/app/core/components/TransformersUI/GroupByTransformerEditor.tsx +++ b/public/app/features/transformers/editors/GroupByTransformerEditor.tsx @@ -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; diff --git a/public/app/core/components/TransformersUI/HistogramTransformerEditor.tsx b/public/app/features/transformers/editors/HistogramTransformerEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/HistogramTransformerEditor.tsx rename to public/app/features/transformers/editors/HistogramTransformerEditor.tsx diff --git a/public/app/core/components/TransformersUI/LabelsToFieldsTransformerEditor.tsx b/public/app/features/transformers/editors/LabelsToFieldsTransformerEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/LabelsToFieldsTransformerEditor.tsx rename to public/app/features/transformers/editors/LabelsToFieldsTransformerEditor.tsx diff --git a/public/app/core/components/TransformersUI/MergeTransformerEditor.tsx b/public/app/features/transformers/editors/MergeTransformerEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/MergeTransformerEditor.tsx rename to public/app/features/transformers/editors/MergeTransformerEditor.tsx diff --git a/public/app/core/components/TransformersUI/OrganizeFieldsTransformerEditor.tsx b/public/app/features/transformers/editors/OrganizeFieldsTransformerEditor.tsx similarity index 99% rename from public/app/core/components/TransformersUI/OrganizeFieldsTransformerEditor.tsx rename to public/app/features/transformers/editors/OrganizeFieldsTransformerEditor.tsx index a178567d995..2f7c9a2e023 100644 --- a/public/app/core/components/TransformersUI/OrganizeFieldsTransformerEditor.tsx +++ b/public/app/features/transformers/editors/OrganizeFieldsTransformerEditor.tsx @@ -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 {} diff --git a/public/app/core/components/TransformersUI/ReduceTransformerEditor.tsx b/public/app/features/transformers/editors/ReduceTransformerEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/ReduceTransformerEditor.tsx rename to public/app/features/transformers/editors/ReduceTransformerEditor.tsx diff --git a/public/app/core/components/TransformersUI/RenameByRegexTransformer.tsx b/public/app/features/transformers/editors/RenameByRegexTransformer.tsx similarity index 100% rename from public/app/core/components/TransformersUI/RenameByRegexTransformer.tsx rename to public/app/features/transformers/editors/RenameByRegexTransformer.tsx diff --git a/public/app/core/components/TransformersUI/SeriesToFieldsTransformerEditor.tsx b/public/app/features/transformers/editors/SeriesToFieldsTransformerEditor.tsx similarity index 96% rename from public/app/core/components/TransformersUI/SeriesToFieldsTransformerEditor.tsx rename to public/app/features/transformers/editors/SeriesToFieldsTransformerEditor.tsx index 4146cfb24d1..028c9c55d1a 100644 --- a/public/app/core/components/TransformersUI/SeriesToFieldsTransformerEditor.tsx +++ b/public/app/features/transformers/editors/SeriesToFieldsTransformerEditor.tsx @@ -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> = ({ input, diff --git a/public/app/core/components/TransformersUI/SeriesToRowsTransformerEditor.tsx b/public/app/features/transformers/editors/SeriesToRowsTransformerEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/SeriesToRowsTransformerEditor.tsx rename to public/app/features/transformers/editors/SeriesToRowsTransformerEditor.tsx diff --git a/public/app/core/components/TransformersUI/SortByTransformerEditor.tsx b/public/app/features/transformers/editors/SortByTransformerEditor.tsx similarity index 97% rename from public/app/core/components/TransformersUI/SortByTransformerEditor.tsx rename to public/app/features/transformers/editors/SortByTransformerEditor.tsx index d23978972d2..51c931fc1b0 100644 --- a/public/app/core/components/TransformersUI/SortByTransformerEditor.tsx +++ b/public/app/features/transformers/editors/SortByTransformerEditor.tsx @@ -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> = ({ input, diff --git a/public/app/core/components/TransformersUI/extractFields/ExtractFieldsTransformerEditor.tsx b/public/app/features/transformers/extractFields/ExtractFieldsTransformerEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/extractFields/ExtractFieldsTransformerEditor.tsx rename to public/app/features/transformers/extractFields/ExtractFieldsTransformerEditor.tsx diff --git a/public/app/core/components/TransformersUI/extractFields/extractFields.test.ts b/public/app/features/transformers/extractFields/extractFields.test.ts similarity index 100% rename from public/app/core/components/TransformersUI/extractFields/extractFields.test.ts rename to public/app/features/transformers/extractFields/extractFields.test.ts diff --git a/public/app/core/components/TransformersUI/extractFields/extractFields.ts b/public/app/features/transformers/extractFields/extractFields.ts similarity index 100% rename from public/app/core/components/TransformersUI/extractFields/extractFields.ts rename to public/app/features/transformers/extractFields/extractFields.ts diff --git a/public/app/core/components/TransformersUI/extractFields/fieldExtractor.test.ts b/public/app/features/transformers/extractFields/fieldExtractor.test.ts similarity index 100% rename from public/app/core/components/TransformersUI/extractFields/fieldExtractor.test.ts rename to public/app/features/transformers/extractFields/fieldExtractor.test.ts diff --git a/public/app/core/components/TransformersUI/extractFields/fieldExtractors.ts b/public/app/features/transformers/extractFields/fieldExtractors.ts similarity index 100% rename from public/app/core/components/TransformersUI/extractFields/fieldExtractors.ts rename to public/app/features/transformers/extractFields/fieldExtractors.ts diff --git a/public/app/core/components/TransformersUI/fieldToConfigMapping/FieldToConfigMappingEditor.test.tsx b/public/app/features/transformers/fieldToConfigMapping/FieldToConfigMappingEditor.test.tsx similarity index 100% rename from public/app/core/components/TransformersUI/fieldToConfigMapping/FieldToConfigMappingEditor.test.tsx rename to public/app/features/transformers/fieldToConfigMapping/FieldToConfigMappingEditor.test.tsx diff --git a/public/app/core/components/TransformersUI/fieldToConfigMapping/FieldToConfigMappingEditor.tsx b/public/app/features/transformers/fieldToConfigMapping/FieldToConfigMappingEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/fieldToConfigMapping/FieldToConfigMappingEditor.tsx rename to public/app/features/transformers/fieldToConfigMapping/FieldToConfigMappingEditor.tsx diff --git a/public/app/core/components/TransformersUI/fieldToConfigMapping/fieldToConfigMapping.ts b/public/app/features/transformers/fieldToConfigMapping/fieldToConfigMapping.ts similarity index 100% rename from public/app/core/components/TransformersUI/fieldToConfigMapping/fieldToConfigMapping.ts rename to public/app/features/transformers/fieldToConfigMapping/fieldToConfigMapping.ts diff --git a/public/app/core/components/TransformersUI/lookupGazetteer/FieldLookupTransformerEditor.tsx b/public/app/features/transformers/lookupGazetteer/FieldLookupTransformerEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/lookupGazetteer/FieldLookupTransformerEditor.tsx rename to public/app/features/transformers/lookupGazetteer/FieldLookupTransformerEditor.tsx diff --git a/public/app/core/components/TransformersUI/lookupGazetteer/fieldLookup.test.ts b/public/app/features/transformers/lookupGazetteer/fieldLookup.test.ts similarity index 100% rename from public/app/core/components/TransformersUI/lookupGazetteer/fieldLookup.test.ts rename to public/app/features/transformers/lookupGazetteer/fieldLookup.test.ts diff --git a/public/app/core/components/TransformersUI/lookupGazetteer/fieldLookup.ts b/public/app/features/transformers/lookupGazetteer/fieldLookup.ts similarity index 100% rename from public/app/core/components/TransformersUI/lookupGazetteer/fieldLookup.ts rename to public/app/features/transformers/lookupGazetteer/fieldLookup.ts diff --git a/public/app/core/components/TransformersUI/prepareTimeSeries/PrepareTimeSeriesEditor.tsx b/public/app/features/transformers/prepareTimeSeries/PrepareTimeSeriesEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/prepareTimeSeries/PrepareTimeSeriesEditor.tsx rename to public/app/features/transformers/prepareTimeSeries/PrepareTimeSeriesEditor.tsx diff --git a/public/app/core/components/TransformersUI/prepareTimeSeries/prepareTimeSeries.test.ts b/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts similarity index 100% rename from public/app/core/components/TransformersUI/prepareTimeSeries/prepareTimeSeries.test.ts rename to public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.test.ts diff --git a/public/app/core/components/TransformersUI/prepareTimeSeries/prepareTimeSeries.ts b/public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.ts similarity index 100% rename from public/app/core/components/TransformersUI/prepareTimeSeries/prepareTimeSeries.ts rename to public/app/features/transformers/prepareTimeSeries/prepareTimeSeries.ts diff --git a/public/app/core/components/TransformersUI/rowsToFields/RowsToFieldsTransformerEditor.test.tsx b/public/app/features/transformers/rowsToFields/RowsToFieldsTransformerEditor.test.tsx similarity index 100% rename from public/app/core/components/TransformersUI/rowsToFields/RowsToFieldsTransformerEditor.test.tsx rename to public/app/features/transformers/rowsToFields/RowsToFieldsTransformerEditor.test.tsx diff --git a/public/app/core/components/TransformersUI/rowsToFields/RowsToFieldsTransformerEditor.tsx b/public/app/features/transformers/rowsToFields/RowsToFieldsTransformerEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/rowsToFields/RowsToFieldsTransformerEditor.tsx rename to public/app/features/transformers/rowsToFields/RowsToFieldsTransformerEditor.tsx diff --git a/public/app/core/components/TransformersUI/rowsToFields/rowsToFields.test.ts b/public/app/features/transformers/rowsToFields/rowsToFields.test.ts similarity index 100% rename from public/app/core/components/TransformersUI/rowsToFields/rowsToFields.test.ts rename to public/app/features/transformers/rowsToFields/rowsToFields.test.ts diff --git a/public/app/core/components/TransformersUI/rowsToFields/rowsToFields.ts b/public/app/features/transformers/rowsToFields/rowsToFields.ts similarity index 100% rename from public/app/core/components/TransformersUI/rowsToFields/rowsToFields.ts rename to public/app/features/transformers/rowsToFields/rowsToFields.ts diff --git a/public/app/core/components/TransformersUI/spatial/SpatialTransformerEditor.tsx b/public/app/features/transformers/spatial/SpatialTransformerEditor.tsx similarity index 100% rename from public/app/core/components/TransformersUI/spatial/SpatialTransformerEditor.tsx rename to public/app/features/transformers/spatial/SpatialTransformerEditor.tsx diff --git a/public/app/core/components/TransformersUI/spatial/models.gen.ts b/public/app/features/transformers/spatial/models.gen.ts similarity index 100% rename from public/app/core/components/TransformersUI/spatial/models.gen.ts rename to public/app/features/transformers/spatial/models.gen.ts diff --git a/public/app/core/components/TransformersUI/spatial/optionsHelper.tsx b/public/app/features/transformers/spatial/optionsHelper.tsx similarity index 100% rename from public/app/core/components/TransformersUI/spatial/optionsHelper.tsx rename to public/app/features/transformers/spatial/optionsHelper.tsx diff --git a/public/app/core/components/TransformersUI/spatial/spatialTransformer.test.ts b/public/app/features/transformers/spatial/spatialTransformer.test.ts similarity index 100% rename from public/app/core/components/TransformersUI/spatial/spatialTransformer.test.ts rename to public/app/features/transformers/spatial/spatialTransformer.test.ts diff --git a/public/app/core/components/TransformersUI/spatial/spatialTransformer.ts b/public/app/features/transformers/spatial/spatialTransformer.ts similarity index 100% rename from public/app/core/components/TransformersUI/spatial/spatialTransformer.ts rename to public/app/features/transformers/spatial/spatialTransformer.ts diff --git a/public/app/core/components/TransformersUI/spatial/utils.ts b/public/app/features/transformers/spatial/utils.ts similarity index 100% rename from public/app/core/components/TransformersUI/spatial/utils.ts rename to public/app/features/transformers/spatial/utils.ts diff --git a/public/app/features/transformers/standardTransformers.ts b/public/app/features/transformers/standardTransformers.ts new file mode 100644 index 00000000000..1d9792eb307 --- /dev/null +++ b/public/app/features/transformers/standardTransformers.ts @@ -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> => { + return [ + reduceTransformRegistryItem, + filterFieldsByNameTransformRegistryItem, + renameByRegexTransformRegistryItem, + filterFramesByRefIdTransformRegistryItem, + filterByValueTransformRegistryItem, + organizeFieldsTransformRegistryItem, + seriesToFieldsTransformerRegistryItem, + seriesToRowsTransformerRegistryItem, + concatenateTransformRegistryItem, + calculateFieldTransformRegistryItem, + labelsToFieldsTransformerRegistryItem, + groupByTransformRegistryItem, + sortByTransformRegistryItem, + mergeTransformerRegistryItem, + histogramTransformRegistryItem, + rowsToFieldsTransformRegistryItem, + configFromQueryTransformRegistryItem, + prepareTimeseriesTransformerRegistryItem, + convertFieldTypeTransformRegistryItem, + spatialTransformRegistryItem, + fieldLookupTransformRegistryItem, + extractFieldsTransformRegistryItem, + heatmapTransformRegistryItem, + ]; +}; diff --git a/public/app/core/components/TransformersUI/utils.ts b/public/app/features/transformers/utils.ts similarity index 100% rename from public/app/core/components/TransformersUI/utils.ts rename to public/app/features/transformers/utils.ts diff --git a/public/app/plugins/panel/heatmap-new/fields.ts b/public/app/plugins/panel/heatmap-new/fields.ts index 3a2e0418451..7b7f02b8af4 100644 --- a/public/app/plugins/panel/heatmap-new/fields.ts +++ b/public/app/plugins/panel/heatmap-new/fields.ts @@ -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 { diff --git a/public/app/plugins/panel/heatmap-new/migrations.ts b/public/app/plugins/panel/heatmap-new/migrations.ts index aee97869fb5..a5c00a66abc 100644 --- a/public/app/plugins/panel/heatmap-new/migrations.ts +++ b/public/app/plugins/panel/heatmap-new/migrations.ts @@ -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'; /** diff --git a/public/app/plugins/panel/heatmap-new/models.gen.ts b/public/app/plugins/panel/heatmap-new/models.gen.ts index 5124a5c73c9..71ddfb346de 100644 --- a/public/app/plugins/panel/heatmap-new/models.gen.ts +++ b/public/app/plugins/panel/heatmap-new/models.gen.ts @@ -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]); diff --git a/public/app/plugins/panel/heatmap-new/module.tsx b/public/app/plugins/panel/heatmap-new/module.tsx index 6ab1eef3663..d9f4d345540 100644 --- a/public/app/plugins/panel/heatmap-new/module.tsx +++ b/public/app/plugins/panel/heatmap-new/module.tsx @@ -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(HeatmapPanel)