From 8167edc6e5f4ee3b9f976095f2c6cdeb1d16ec6a Mon Sep 17 00:00:00 2001 From: Oscar Kilhed Date: Thu, 10 Apr 2025 09:47:33 +0200 Subject: [PATCH] Dynamic dashboards: rename ResponsiveGrid files to AutoGrid (#103762) * rename responsive-grid files to auto-grid * fix import orders --- .../conditional-rendering/ConditionalRenderingData.tsx | 2 +- .../dashboard-scene/conditional-rendering/utils.ts | 2 +- .../dashboard-scene/edit-pane/VizPanelEditableElement.tsx | 2 +- .../dashboard-scene/saving/DashboardSceneChangeTracker.ts | 4 ++-- .../app/features/dashboard-scene/scene/DashboardScene.tsx | 4 ++-- .../AutoGridItem.tsx} | 8 ++++---- .../AutoGridItemEditor.tsx} | 2 +- .../AutoGridItemRenderer.tsx} | 2 +- .../AutoGridLayout.tsx} | 4 ++-- .../AutoGridLayoutManager.test.ts} | 6 +++--- .../AutoGridLayoutManager.tsx} | 8 ++++---- .../AutoGridLayoutManagerEditor.tsx} | 2 +- .../AutoGridLayoutRenderer.tsx} | 4 ++-- .../{layout-responsive-grid => layout-auto-grid}/const.ts | 0 .../dashboard-scene/scene/layout-rows/RowItem.tsx | 2 +- .../dashboard-scene/scene/layout-tabs/TabItem.tsx | 2 +- .../scene/layouts-shared/layoutRegistry.ts | 2 +- .../dashboard-scene/scene/layouts-shared/paste.ts | 4 ++-- ...ridLayoutSerializer.ts => AutoGridLayoutSerializer.ts} | 6 +++--- .../layoutSerializers/RowsLayoutSerializer.test.ts | 4 ++-- .../layoutSerializers/TabsLayoutSerializer.test.ts | 2 +- .../layoutSerializers/layoutSerializerRegistry.ts | 2 +- .../serialization/layoutSerializers/utils.ts | 2 +- .../transformSaveModelSchemaV2ToScene.test.ts | 4 ++-- .../transformSceneToSaveModelSchemaV2.test.ts | 6 +++--- 25 files changed, 43 insertions(+), 43 deletions(-) rename public/app/features/dashboard-scene/scene/{layout-responsive-grid/ResponsiveGridItem.tsx => layout-auto-grid/AutoGridItem.tsx} (95%) rename public/app/features/dashboard-scene/scene/{layout-responsive-grid/ResponsiveGridItemEditor.tsx => layout-auto-grid/AutoGridItemEditor.tsx} (97%) rename public/app/features/dashboard-scene/scene/{layout-responsive-grid/ResponsiveGridItemRenderer.tsx => layout-auto-grid/AutoGridItemRenderer.tsx} (97%) rename public/app/features/dashboard-scene/scene/{layout-responsive-grid/ResponsiveGridLayout.tsx => layout-auto-grid/AutoGridLayout.tsx} (98%) rename public/app/features/dashboard-scene/scene/{layout-responsive-grid/ResponsiveGridLayoutManager.test.ts => layout-auto-grid/AutoGridLayoutManager.test.ts} (89%) rename public/app/features/dashboard-scene/scene/{layout-responsive-grid/ResponsiveGridLayoutManager.tsx => layout-auto-grid/AutoGridLayoutManager.tsx} (97%) rename public/app/features/dashboard-scene/scene/{layout-responsive-grid/ResponsiveGridLayoutManagerEditor.tsx => layout-auto-grid/AutoGridLayoutManagerEditor.tsx} (99%) rename public/app/features/dashboard-scene/scene/{layout-responsive-grid/ResponsiveGridLayoutRenderer.tsx => layout-auto-grid/AutoGridLayoutRenderer.tsx} (95%) rename public/app/features/dashboard-scene/scene/{layout-responsive-grid => layout-auto-grid}/const.ts (100%) rename public/app/features/dashboard-scene/serialization/layoutSerializers/{ResponsiveGridLayoutSerializer.ts => AutoGridLayoutSerializer.ts} (94%) diff --git a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingData.tsx b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingData.tsx index b31ab780401..0e905988108 100644 --- a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingData.tsx +++ b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingData.tsx @@ -6,7 +6,7 @@ import { ConditionalRenderingDataKind } from '@grafana/schema/dist/esm/schema/da import { Combobox, ComboboxOption } from '@grafana/ui'; import { t } from 'app/core/internationalization'; -import { AutoGridItem } from '../scene/layout-responsive-grid/ResponsiveGridItem'; +import { AutoGridItem } from '../scene/layout-auto-grid/AutoGridItem'; import { ConditionalRenderingBase, ConditionalRenderingBaseState } from './ConditionalRenderingBase'; import { ConditionalRenderingSerializerRegistryItem, DataConditionValue, ItemsWithConditionalRendering } from './types'; diff --git a/public/app/features/dashboard-scene/conditional-rendering/utils.ts b/public/app/features/dashboard-scene/conditional-rendering/utils.ts index 9ef497e7230..87c71e723b9 100644 --- a/public/app/features/dashboard-scene/conditional-rendering/utils.ts +++ b/public/app/features/dashboard-scene/conditional-rendering/utils.ts @@ -1,6 +1,6 @@ import { SceneObject } from '@grafana/scenes'; -import { AutoGridItem } from '../scene/layout-responsive-grid/ResponsiveGridItem'; +import { AutoGridItem } from '../scene/layout-auto-grid/AutoGridItem'; import { RowItem } from '../scene/layout-rows/RowItem'; import { TabItem } from '../scene/layout-tabs/TabItem'; diff --git a/public/app/features/dashboard-scene/edit-pane/VizPanelEditableElement.tsx b/public/app/features/dashboard-scene/edit-pane/VizPanelEditableElement.tsx index a488e832da2..640b494a7b6 100644 --- a/public/app/features/dashboard-scene/edit-pane/VizPanelEditableElement.tsx +++ b/public/app/features/dashboard-scene/edit-pane/VizPanelEditableElement.tsx @@ -14,8 +14,8 @@ import { PanelDescriptionTextArea, PanelFrameTitleInput, } from '../panel-edit/getPanelFrameOptions'; +import { AutoGridItem } from '../scene/layout-auto-grid/AutoGridItem'; import { DashboardGridItem } from '../scene/layout-default/DashboardGridItem'; -import { AutoGridItem } from '../scene/layout-responsive-grid/ResponsiveGridItem'; import { BulkActionElement } from '../scene/types/BulkActionElement'; import { isDashboardLayoutItem } from '../scene/types/DashboardLayoutItem'; import { EditableDashboardElement, EditableDashboardElementInfo } from '../scene/types/EditableDashboardElement'; diff --git a/public/app/features/dashboard-scene/saving/DashboardSceneChangeTracker.ts b/public/app/features/dashboard-scene/saving/DashboardSceneChangeTracker.ts index 89313c4e164..6fc70618106 100644 --- a/public/app/features/dashboard-scene/saving/DashboardSceneChangeTracker.ts +++ b/public/app/features/dashboard-scene/saving/DashboardSceneChangeTracker.ts @@ -25,9 +25,9 @@ import { DashboardScene, PERSISTED_PROPS } from '../scene/DashboardScene'; import { LibraryPanelBehavior } from '../scene/LibraryPanelBehavior'; import { VizPanelLinks } from '../scene/PanelLinks'; import { PanelTimeRange } from '../scene/PanelTimeRange'; +import { AutoGridItem } from '../scene/layout-auto-grid/AutoGridItem'; +import { AutoGridLayoutManager } from '../scene/layout-auto-grid/AutoGridLayoutManager'; import { DashboardGridItem } from '../scene/layout-default/DashboardGridItem'; -import { AutoGridItem } from '../scene/layout-responsive-grid/ResponsiveGridItem'; -import { AutoGridLayoutManager } from '../scene/layout-responsive-grid/ResponsiveGridLayoutManager'; import { RowItem } from '../scene/layout-rows/RowItem'; import { RowsLayoutManager } from '../scene/layout-rows/RowsLayoutManager'; import { TabItem } from '../scene/layout-tabs/TabItem'; diff --git a/public/app/features/dashboard-scene/scene/DashboardScene.tsx b/public/app/features/dashboard-scene/scene/DashboardScene.tsx index 4249beea712..4c476384f8e 100644 --- a/public/app/features/dashboard-scene/scene/DashboardScene.tsx +++ b/public/app/features/dashboard-scene/scene/DashboardScene.tsx @@ -40,8 +40,8 @@ import { DashboardSceneChangeTracker } from '../saving/DashboardSceneChangeTrack import { SaveDashboardDrawer } from '../saving/SaveDashboardDrawer'; import { DashboardChangeInfo } from '../saving/shared'; import { DashboardSceneSerializerLike, getDashboardSceneSerializer } from '../serialization/DashboardSceneSerializer'; +import { serializeAutoGridItem } from '../serialization/layoutSerializers/AutoGridLayoutSerializer'; import { gridItemToGridLayoutItemKind } from '../serialization/layoutSerializers/DefaultGridLayoutSerializer'; -import { serializeAutoGridItem } from '../serialization/layoutSerializers/ResponsiveGridLayoutSerializer'; import { getElement } from '../serialization/layoutSerializers/utils'; import { buildGridItemForPanel, transformSaveModelToScene } from '../serialization/transformSaveModelToScene'; import { gridItemToPanel } from '../serialization/transformSceneToSaveModel'; @@ -71,9 +71,9 @@ import { DashboardSceneUrlSync } from './DashboardSceneUrlSync'; import { LibraryPanelBehavior } from './LibraryPanelBehavior'; import { ViewPanelScene } from './ViewPanelScene'; import { setupKeyboardShortcuts } from './keyboardShortcuts'; +import { AutoGridItem } from './layout-auto-grid/AutoGridItem'; import { DashboardGridItem } from './layout-default/DashboardGridItem'; import { DefaultGridLayoutManager } from './layout-default/DefaultGridLayoutManager'; -import { AutoGridItem } from './layout-responsive-grid/ResponsiveGridItem'; import { LayoutRestorer } from './layouts-shared/LayoutRestorer'; import { addNewRowTo, addNewTabTo } from './layouts-shared/addNew'; import { clearClipboard } from './layouts-shared/paste'; diff --git a/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridItem.tsx b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItem.tsx similarity index 95% rename from public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridItem.tsx rename to public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItem.tsx index 1479d4b3ca7..e1ea75952c7 100644 --- a/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridItem.tsx +++ b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItem.tsx @@ -23,9 +23,9 @@ import { scrollCanvasElementIntoView } from '../layouts-shared/scrollCanvasEleme import { DashboardLayoutItem } from '../types/DashboardLayoutItem'; import { DashboardRepeatsProcessedEvent } from '../types/DashboardRepeatsProcessedEvent'; -import { getOptions } from './ResponsiveGridItemEditor'; -import { AutoGridItemRenderer } from './ResponsiveGridItemRenderer'; -import { AutoGridLayout } from './ResponsiveGridLayout'; +import { getOptions } from './AutoGridItemEditor'; +import { AutoGridItemRenderer } from './AutoGridItemRenderer'; +import { AutoGridLayout } from './AutoGridLayout'; export interface AutoGridItemState extends SceneObjectState { body: VizPanel; @@ -151,7 +151,7 @@ export class AutoGridItem extends SceneObjectBase implements public getParentGrid(): AutoGridLayout { if (!(this.parent instanceof AutoGridLayout)) { - throw new Error('Parent is not a ResponsiveGridLayout'); + throw new Error('Parent is not a AutoGridLayout'); } return this.parent; diff --git a/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridItemEditor.tsx b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemEditor.tsx similarity index 97% rename from public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridItemEditor.tsx rename to public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemEditor.tsx index 33664587892..18dbaf03c18 100644 --- a/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridItemEditor.tsx +++ b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemEditor.tsx @@ -5,7 +5,7 @@ import { RepeatRowSelect2 } from 'app/features/dashboard/components/RepeatRowSel import { useConditionalRenderingEditor } from '../../conditional-rendering/ConditionalRenderingEditor'; -import { AutoGridItem } from './ResponsiveGridItem'; +import { AutoGridItem } from './AutoGridItem'; export function getOptions(model: AutoGridItem): OptionsPaneCategoryDescriptor[] { const repeatCategory = new OptionsPaneCategoryDescriptor({ diff --git a/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridItemRenderer.tsx b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemRenderer.tsx similarity index 97% rename from public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridItemRenderer.tsx rename to public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemRenderer.tsx index dd6c6a7916a..aefaf3fabb8 100644 --- a/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridItemRenderer.tsx +++ b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridItemRenderer.tsx @@ -7,7 +7,7 @@ import { useStyles2 } from '@grafana/ui'; import { useIsConditionallyHidden } from '../../conditional-rendering/useIsConditionallyHidden'; import { useDashboardState } from '../../utils/utils'; -import { AutoGridItem } from './ResponsiveGridItem'; +import { AutoGridItem } from './AutoGridItem'; import { DRAGGED_ITEM_HEIGHT, DRAGGED_ITEM_LEFT, DRAGGED_ITEM_TOP, DRAGGED_ITEM_WIDTH } from './const'; export function AutoGridItemRenderer({ model }: SceneComponentProps) { diff --git a/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayout.tsx b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayout.tsx similarity index 98% rename from public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayout.tsx rename to public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayout.tsx index 72fd8a488d6..be19f886d83 100644 --- a/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayout.tsx +++ b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayout.tsx @@ -4,8 +4,8 @@ import { SceneLayout, SceneObjectBase, SceneObjectState, VizPanel } from '@grafa import { getLayoutOrchestratorFor } from '../../utils/utils'; -import { AutoGridItem } from './ResponsiveGridItem'; -import { AutoGridLayoutRenderer } from './ResponsiveGridLayoutRenderer'; +import { AutoGridItem } from './AutoGridItem'; +import { AutoGridLayoutRenderer } from './AutoGridLayoutRenderer'; import { DRAGGED_ITEM_HEIGHT, DRAGGED_ITEM_LEFT, DRAGGED_ITEM_TOP, DRAGGED_ITEM_WIDTH } from './const'; export interface AutoGridLayoutState extends SceneObjectState, AutoGridLayoutOptions { diff --git a/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayoutManager.test.ts b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutManager.test.ts similarity index 89% rename from public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayoutManager.test.ts rename to public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutManager.test.ts index 67bc0dc34da..76dbfdbf291 100644 --- a/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayoutManager.test.ts +++ b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutManager.test.ts @@ -3,9 +3,9 @@ import { SceneQueryRunner, VizPanel } from '@grafana/scenes'; import { findVizPanelByKey } from '../../utils/utils'; import { DashboardScene } from '../DashboardScene'; -import { AutoGridItem } from './ResponsiveGridItem'; -import { AutoGridLayout } from './ResponsiveGridLayout'; -import { AutoGridLayoutManager } from './ResponsiveGridLayoutManager'; +import { AutoGridItem } from './AutoGridItem'; +import { AutoGridLayout } from './AutoGridLayout'; +import { AutoGridLayoutManager } from './AutoGridLayoutManager'; describe('AutoGridLayoutManager', () => { it('Should clone the layout', () => { diff --git a/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayoutManager.tsx b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutManager.tsx similarity index 97% rename from public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayoutManager.tsx rename to public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutManager.tsx index bcebddc5ac2..ad7440182c4 100644 --- a/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayoutManager.tsx +++ b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutManager.tsx @@ -5,7 +5,7 @@ import { t } from 'app/core/internationalization'; import { OptionsPaneItemDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneItemDescriptor'; import { NewObjectAddedToCanvasEvent, ObjectRemovedFromCanvasEvent } from '../../edit-pane/shared'; -import { serializeAutoGridLayout } from '../../serialization/layoutSerializers/ResponsiveGridLayoutSerializer'; +import { serializeAutoGridLayout } from '../../serialization/layoutSerializers/AutoGridLayoutSerializer'; import { joinCloneKeys } from '../../utils/clone'; import { dashboardSceneGraph } from '../../utils/dashboardSceneGraph'; import { @@ -19,9 +19,9 @@ import { clearClipboard, getAutoGridItemFromClipboard } from '../layouts-shared/ import { DashboardLayoutManager } from '../types/DashboardLayoutManager'; import { LayoutRegistryItem } from '../types/LayoutRegistryItem'; -import { AutoGridItem } from './ResponsiveGridItem'; -import { AutoGridLayout } from './ResponsiveGridLayout'; -import { getEditOptions } from './ResponsiveGridLayoutManagerEditor'; +import { AutoGridItem } from './AutoGridItem'; +import { AutoGridLayout } from './AutoGridLayout'; +import { getEditOptions } from './AutoGridLayoutManagerEditor'; interface AutoGridLayoutManagerState extends SceneObjectState { layout: AutoGridLayout; diff --git a/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayoutManagerEditor.tsx b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutManagerEditor.tsx similarity index 99% rename from public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayoutManagerEditor.tsx rename to public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutManagerEditor.tsx index 4cf04f51071..2579c743186 100644 --- a/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayoutManagerEditor.tsx +++ b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutManagerEditor.tsx @@ -7,7 +7,7 @@ import { Button, Combobox, ComboboxOption, Field, InlineSwitch, Input, Stack, us import { t } from 'app/core/internationalization'; import { OptionsPaneItemDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneItemDescriptor'; -import { AutoGridColumnWidth, AutoGridRowHeight, AutoGridLayoutManager } from './ResponsiveGridLayoutManager'; +import { AutoGridColumnWidth, AutoGridRowHeight, AutoGridLayoutManager } from './AutoGridLayoutManager'; export function getEditOptions(layoutManager: AutoGridLayoutManager): OptionsPaneItemDescriptor[] { const options: OptionsPaneItemDescriptor[] = []; diff --git a/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayoutRenderer.tsx b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutRenderer.tsx similarity index 95% rename from public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayoutRenderer.tsx rename to public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutRenderer.tsx index 5bbfe18296d..062d8f6b609 100644 --- a/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayoutRenderer.tsx +++ b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutRenderer.tsx @@ -8,8 +8,8 @@ import { useHasClonedParents } from '../../utils/clone'; import { useDashboardState } from '../../utils/utils'; import { CanvasGridAddActions } from '../layouts-shared/CanvasGridAddActions'; -import { AutoGridLayout, AutoGridLayoutState } from './ResponsiveGridLayout'; -import { AutoGridLayoutManager } from './ResponsiveGridLayoutManager'; +import { AutoGridLayout, AutoGridLayoutState } from './AutoGridLayout'; +import { AutoGridLayoutManager } from './AutoGridLayoutManager'; export function AutoGridLayoutRenderer({ model }: SceneComponentProps) { const { children, isHidden, isLazy } = model.useState(); diff --git a/public/app/features/dashboard-scene/scene/layout-responsive-grid/const.ts b/public/app/features/dashboard-scene/scene/layout-auto-grid/const.ts similarity index 100% rename from public/app/features/dashboard-scene/scene/layout-responsive-grid/const.ts rename to public/app/features/dashboard-scene/scene/layout-auto-grid/const.ts diff --git a/public/app/features/dashboard-scene/scene/layout-rows/RowItem.tsx b/public/app/features/dashboard-scene/scene/layout-rows/RowItem.tsx index 9ca3eb2061b..90ff71c594e 100644 --- a/public/app/features/dashboard-scene/scene/layout-rows/RowItem.tsx +++ b/public/app/features/dashboard-scene/scene/layout-rows/RowItem.tsx @@ -21,7 +21,7 @@ import { ConditionalRendering } from '../../conditional-rendering/ConditionalRen import { serializeRow } from '../../serialization/layoutSerializers/RowsLayoutSerializer'; import { getElements } from '../../serialization/layoutSerializers/utils'; import { getDashboardSceneFor, getDefaultVizPanel } from '../../utils/utils'; -import { AutoGridLayoutManager } from '../layout-responsive-grid/ResponsiveGridLayoutManager'; +import { AutoGridLayoutManager } from '../layout-auto-grid/AutoGridLayoutManager'; import { LayoutRestorer } from '../layouts-shared/LayoutRestorer'; import { clearClipboard } from '../layouts-shared/paste'; import { scrollCanvasElementIntoView } from '../layouts-shared/scrollCanvasElementIntoView'; diff --git a/public/app/features/dashboard-scene/scene/layout-tabs/TabItem.tsx b/public/app/features/dashboard-scene/scene/layout-tabs/TabItem.tsx index f9eb4b5dddd..b42705614e6 100644 --- a/public/app/features/dashboard-scene/scene/layout-tabs/TabItem.tsx +++ b/public/app/features/dashboard-scene/scene/layout-tabs/TabItem.tsx @@ -21,7 +21,7 @@ import { ConditionalRendering } from '../../conditional-rendering/ConditionalRen import { serializeTab } from '../../serialization/layoutSerializers/TabsLayoutSerializer'; import { getElements } from '../../serialization/layoutSerializers/utils'; import { getDashboardSceneFor, getDefaultVizPanel } from '../../utils/utils'; -import { AutoGridLayoutManager } from '../layout-responsive-grid/ResponsiveGridLayoutManager'; +import { AutoGridLayoutManager } from '../layout-auto-grid/AutoGridLayoutManager'; import { LayoutRestorer } from '../layouts-shared/LayoutRestorer'; import { clearClipboard } from '../layouts-shared/paste'; import { scrollCanvasElementIntoView } from '../layouts-shared/scrollCanvasElementIntoView'; diff --git a/public/app/features/dashboard-scene/scene/layouts-shared/layoutRegistry.ts b/public/app/features/dashboard-scene/scene/layouts-shared/layoutRegistry.ts index 6864644e6b1..f66a6115987 100644 --- a/public/app/features/dashboard-scene/scene/layouts-shared/layoutRegistry.ts +++ b/public/app/features/dashboard-scene/scene/layouts-shared/layoutRegistry.ts @@ -1,7 +1,7 @@ import { Registry } from '@grafana/data'; +import { AutoGridLayoutManager } from '../layout-auto-grid/AutoGridLayoutManager'; import { DefaultGridLayoutManager } from '../layout-default/DefaultGridLayoutManager'; -import { AutoGridLayoutManager } from '../layout-responsive-grid/ResponsiveGridLayoutManager'; import { RowsLayoutManager } from '../layout-rows/RowsLayoutManager'; import { TabsLayoutManager } from '../layout-tabs/TabsLayoutManager'; import { LayoutRegistryItem } from '../types/LayoutRegistryItem'; diff --git a/public/app/features/dashboard-scene/scene/layouts-shared/paste.ts b/public/app/features/dashboard-scene/scene/layouts-shared/paste.ts index 57bfdb83e8c..9b6300db217 100644 --- a/public/app/features/dashboard-scene/scene/layouts-shared/paste.ts +++ b/public/app/features/dashboard-scene/scene/layouts-shared/paste.ts @@ -8,15 +8,15 @@ import { import { LS_PANEL_COPY_KEY, LS_ROW_COPY_KEY, LS_TAB_COPY_KEY } from 'app/core/constants'; import store from 'app/core/store'; +import { deserializeAutoGridItem } from '../../serialization/layoutSerializers/AutoGridLayoutSerializer'; import { deserializeGridItem } from '../../serialization/layoutSerializers/DefaultGridLayoutSerializer'; -import { deserializeAutoGridItem } from '../../serialization/layoutSerializers/ResponsiveGridLayoutSerializer'; import { deserializeRow } from '../../serialization/layoutSerializers/RowsLayoutSerializer'; import { deserializeTab } from '../../serialization/layoutSerializers/TabsLayoutSerializer'; import { dashboardSceneGraph } from '../../utils/dashboardSceneGraph'; import { DashboardScene } from '../DashboardScene'; +import { AutoGridItem } from '../layout-auto-grid/AutoGridItem'; import { DashboardGridItem } from '../layout-default/DashboardGridItem'; import { GridCell } from '../layout-default/findSpaceForNewPanel'; -import { AutoGridItem } from '../layout-responsive-grid/ResponsiveGridItem'; import { RowItem } from '../layout-rows/RowItem'; import { TabItem } from '../layout-tabs/TabItem'; diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/ResponsiveGridLayoutSerializer.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/AutoGridLayoutSerializer.ts similarity index 94% rename from public/app/features/dashboard-scene/serialization/layoutSerializers/ResponsiveGridLayoutSerializer.ts rename to public/app/features/dashboard-scene/serialization/layoutSerializers/AutoGridLayoutSerializer.ts index cacb0554ead..543cff7dfad 100644 --- a/public/app/features/dashboard-scene/serialization/layoutSerializers/ResponsiveGridLayoutSerializer.ts +++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/AutoGridLayoutSerializer.ts @@ -4,8 +4,8 @@ import { AutoGridLayoutItemKind, } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; -import { AutoGridItem } from '../../scene/layout-responsive-grid/ResponsiveGridItem'; -import { AutoGridLayout } from '../../scene/layout-responsive-grid/ResponsiveGridLayout'; +import { AutoGridItem } from '../../scene/layout-auto-grid/AutoGridItem'; +import { AutoGridLayout } from '../../scene/layout-auto-grid/AutoGridLayout'; import { AUTO_GRID_DEFAULT_COLUMN_WIDTH, AUTO_GRID_DEFAULT_ROW_HEIGHT, @@ -14,7 +14,7 @@ import { getAutoRowsTemplate, getTemplateColumnsTemplate, AutoGridLayoutManager, -} from '../../scene/layout-responsive-grid/ResponsiveGridLayoutManager'; +} from '../../scene/layout-auto-grid/AutoGridLayoutManager'; import { dashboardSceneGraph } from '../../utils/dashboardSceneGraph'; import { getGridItemKeyForPanelId } from '../../utils/utils'; diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.test.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.test.ts index c51b4200361..4c46fb706bb 100644 --- a/public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.test.ts +++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.test.ts @@ -1,9 +1,9 @@ import { SceneGridLayout } from '@grafana/scenes'; import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; +import { AutoGridLayout } from '../../scene/layout-auto-grid/AutoGridLayout'; +import { AutoGridLayoutManager } from '../../scene/layout-auto-grid/AutoGridLayoutManager'; import { DefaultGridLayoutManager } from '../../scene/layout-default/DefaultGridLayoutManager'; -import { AutoGridLayout } from '../../scene/layout-responsive-grid/ResponsiveGridLayout'; -import { AutoGridLayoutManager } from '../../scene/layout-responsive-grid/ResponsiveGridLayoutManager'; import { RowItem } from '../../scene/layout-rows/RowItem'; import { RowItemRepeaterBehavior } from '../../scene/layout-rows/RowItemRepeaterBehavior'; import { RowsLayoutManager } from '../../scene/layout-rows/RowsLayoutManager'; diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.test.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.test.ts index 87ab1e5bbc7..7132e4dc118 100644 --- a/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.test.ts +++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.test.ts @@ -1,7 +1,7 @@ import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; +import { AutoGridLayoutManager } from '../../scene/layout-auto-grid/AutoGridLayoutManager'; import { DefaultGridLayoutManager } from '../../scene/layout-default/DefaultGridLayoutManager'; -import { AutoGridLayoutManager } from '../../scene/layout-responsive-grid/ResponsiveGridLayoutManager'; import { RowsLayoutManager } from '../../scene/layout-rows/RowsLayoutManager'; import { TabsLayoutManager } from '../../scene/layout-tabs/TabsLayoutManager'; diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/layoutSerializerRegistry.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/layoutSerializerRegistry.ts index fff6a58e81d..dfb8555e44f 100644 --- a/public/app/features/dashboard-scene/serialization/layoutSerializers/layoutSerializerRegistry.ts +++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/layoutSerializerRegistry.ts @@ -3,8 +3,8 @@ import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboa import { DashboardLayoutManager } from '../../scene/types/DashboardLayoutManager'; +import { deserializeAutoGridLayout } from './AutoGridLayoutSerializer'; import { deserializeDefaultGridLayout } from './DefaultGridLayoutSerializer'; -import { deserializeAutoGridLayout } from './ResponsiveGridLayoutSerializer'; import { deserializeRowsLayout } from './RowsLayoutSerializer'; import { deserializeTabsLayout } from './TabsLayoutSerializer'; diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/utils.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/utils.ts index 0b7f33a4989..81c3985f238 100644 --- a/public/app/features/dashboard-scene/serialization/layoutSerializers/utils.ts +++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/utils.ts @@ -32,8 +32,8 @@ import { VizPanelLinks, VizPanelLinksMenu } from '../../scene/PanelLinks'; import { panelLinksBehavior, panelMenuBehavior } from '../../scene/PanelMenuBehavior'; import { PanelNotices } from '../../scene/PanelNotices'; import { PanelTimeRange } from '../../scene/PanelTimeRange'; +import { AutoGridItem } from '../../scene/layout-auto-grid/AutoGridItem'; import { DashboardGridItem } from '../../scene/layout-default/DashboardGridItem'; -import { AutoGridItem } from '../../scene/layout-responsive-grid/ResponsiveGridItem'; import { setDashboardPanelContext } from '../../scene/setDashboardPanelContext'; import { DashboardLayoutManager } from '../../scene/types/DashboardLayoutManager'; import { getVizPanelKeyForPanelId } from '../../utils/utils'; diff --git a/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.test.ts b/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.test.ts index 11126acec81..4a6116c044c 100644 --- a/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.test.ts +++ b/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.test.ts @@ -35,9 +35,9 @@ import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSou import { DashboardAnnotationsDataLayer } from '../scene/DashboardAnnotationsDataLayer'; import { DashboardDataLayerSet } from '../scene/DashboardDataLayerSet'; +import { AutoGridItem } from '../scene/layout-auto-grid/AutoGridItem'; +import { AutoGridLayoutManager } from '../scene/layout-auto-grid/AutoGridLayoutManager'; import { DefaultGridLayoutManager } from '../scene/layout-default/DefaultGridLayoutManager'; -import { AutoGridItem } from '../scene/layout-responsive-grid/ResponsiveGridItem'; -import { AutoGridLayoutManager } from '../scene/layout-responsive-grid/ResponsiveGridLayoutManager'; import { RowsLayoutManager } from '../scene/layout-rows/RowsLayoutManager'; import { TabsLayoutManager } from '../scene/layout-tabs/TabsLayoutManager'; import { DashboardLayoutManager } from '../scene/types/DashboardLayoutManager'; diff --git a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.test.ts b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.test.ts index 26e2b395e7b..7417d108d63 100644 --- a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.test.ts +++ b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.test.ts @@ -39,12 +39,12 @@ import { DashboardControls } from '../scene/DashboardControls'; import { DashboardDataLayerSet } from '../scene/DashboardDataLayerSet'; import { DashboardScene, DashboardSceneState } from '../scene/DashboardScene'; import { VizPanelLinks, VizPanelLinksMenu } from '../scene/PanelLinks'; +import { AutoGridItem } from '../scene/layout-auto-grid/AutoGridItem'; +import { AutoGridLayout } from '../scene/layout-auto-grid/AutoGridLayout'; +import { AutoGridLayoutManager } from '../scene/layout-auto-grid/AutoGridLayoutManager'; import { DashboardGridItem } from '../scene/layout-default/DashboardGridItem'; import { DefaultGridLayoutManager } from '../scene/layout-default/DefaultGridLayoutManager'; import { RowRepeaterBehavior } from '../scene/layout-default/RowRepeaterBehavior'; -import { AutoGridItem } from '../scene/layout-responsive-grid/ResponsiveGridItem'; -import { AutoGridLayout } from '../scene/layout-responsive-grid/ResponsiveGridLayout'; -import { AutoGridLayoutManager } from '../scene/layout-responsive-grid/ResponsiveGridLayoutManager'; import { RowItem } from '../scene/layout-rows/RowItem'; import { RowsLayoutManager } from '../scene/layout-rows/RowsLayoutManager'; import { TabItem } from '../scene/layout-tabs/TabItem';