Dashboard: Fixes layout selector (#103066)
* Dashboard: Fixes layout selector * remove unused import * update * Fix
This commit is contained in:
+1
-1
@@ -61,7 +61,7 @@ export class DefaultGridLayoutManager
|
|||||||
get description() {
|
get description() {
|
||||||
return t('dashboard.default-layout.description', 'Position and size each panel individually');
|
return t('dashboard.default-layout.description', 'Position and size each panel individually');
|
||||||
},
|
},
|
||||||
id: 'default-grid',
|
id: 'GridLayout',
|
||||||
createFromLayout: DefaultGridLayoutManager.createFromLayout,
|
createFromLayout: DefaultGridLayoutManager.createFromLayout,
|
||||||
isGridLayout: true,
|
isGridLayout: true,
|
||||||
};
|
};
|
||||||
|
|||||||
+1
-1
@@ -52,7 +52,7 @@ export class AutoGridLayoutManager
|
|||||||
get description() {
|
get description() {
|
||||||
return t('dashboard.auto-grid.description', 'Panels resize to fit and form uniform grids');
|
return t('dashboard.auto-grid.description', 'Panels resize to fit and form uniform grids');
|
||||||
},
|
},
|
||||||
id: 'auto-grid',
|
id: 'AutoGridLayout',
|
||||||
createFromLayout: AutoGridLayoutManager.createFromLayout,
|
createFromLayout: AutoGridLayoutManager.createFromLayout,
|
||||||
isGridLayout: true,
|
isGridLayout: true,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ export class RowsLayoutManager extends SceneObjectBase<RowsLayoutManagerState> i
|
|||||||
get description() {
|
get description() {
|
||||||
return t('dashboard.rows-layout.description', 'Collapsable panel groups with headings');
|
return t('dashboard.rows-layout.description', 'Collapsable panel groups with headings');
|
||||||
},
|
},
|
||||||
id: 'rows-layout',
|
id: 'RowsLayout',
|
||||||
createFromLayout: RowsLayoutManager.createFromLayout,
|
createFromLayout: RowsLayoutManager.createFromLayout,
|
||||||
isGridLayout: false,
|
isGridLayout: false,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ export class TabsLayoutManager extends SceneObjectBase<TabsLayoutManagerState> i
|
|||||||
get description() {
|
get description() {
|
||||||
return t('dashboard.tabs-layout.description', 'Organize panels into horizontal tabs');
|
return t('dashboard.tabs-layout.description', 'Organize panels into horizontal tabs');
|
||||||
},
|
},
|
||||||
id: 'tabs-layout',
|
id: 'TabsLayout',
|
||||||
createFromLayout: TabsLayoutManager.createFromLayout,
|
createFromLayout: TabsLayoutManager.createFromLayout,
|
||||||
isGridLayout: false,
|
isGridLayout: false,
|
||||||
};
|
};
|
||||||
|
|||||||
+4
-4
@@ -37,7 +37,7 @@ export function DashboardLayoutSelector({ layoutManager }: Props) {
|
|||||||
<div role="radiogroup" className={styles.radioGroup}>
|
<div role="radiogroup" className={styles.radioGroup}>
|
||||||
{options.map((opt) => {
|
{options.map((opt) => {
|
||||||
switch (opt.id) {
|
switch (opt.id) {
|
||||||
case 'rows-layout':
|
case 'RowsLayout':
|
||||||
return (
|
return (
|
||||||
<LayoutRadioButton
|
<LayoutRadioButton
|
||||||
item={opt}
|
item={opt}
|
||||||
@@ -59,7 +59,7 @@ export function DashboardLayoutSelector({ layoutManager }: Props) {
|
|||||||
</div>
|
</div>
|
||||||
</LayoutRadioButton>
|
</LayoutRadioButton>
|
||||||
);
|
);
|
||||||
case 'tabs-layout':
|
case 'TabsLayout':
|
||||||
return (
|
return (
|
||||||
<LayoutRadioButton
|
<LayoutRadioButton
|
||||||
item={opt}
|
item={opt}
|
||||||
@@ -83,7 +83,7 @@ export function DashboardLayoutSelector({ layoutManager }: Props) {
|
|||||||
</Stack>
|
</Stack>
|
||||||
</LayoutRadioButton>
|
</LayoutRadioButton>
|
||||||
);
|
);
|
||||||
case 'responsive-grid':
|
case 'AutoGridLayout':
|
||||||
return (
|
return (
|
||||||
<LayoutRadioButton
|
<LayoutRadioButton
|
||||||
item={opt}
|
item={opt}
|
||||||
@@ -99,7 +99,7 @@ export function DashboardLayoutSelector({ layoutManager }: Props) {
|
|||||||
</div>
|
</div>
|
||||||
</LayoutRadioButton>
|
</LayoutRadioButton>
|
||||||
);
|
);
|
||||||
case 'custom-grid':
|
case 'GridLayout':
|
||||||
default:
|
default:
|
||||||
return (
|
return (
|
||||||
<LayoutRadioButton
|
<LayoutRadioButton
|
||||||
|
|||||||
+5
-5
@@ -527,7 +527,7 @@ describe('transformSaveModelSchemaV2ToScene', () => {
|
|||||||
};
|
};
|
||||||
const scene = transformSaveModelSchemaV2ToScene(dashboard);
|
const scene = transformSaveModelSchemaV2ToScene(dashboard);
|
||||||
const layoutManager = scene.state.body as AutoGridLayoutManager;
|
const layoutManager = scene.state.body as AutoGridLayoutManager;
|
||||||
expect(layoutManager.descriptor.id).toBe('auto-grid');
|
expect(layoutManager.descriptor.id).toBe('AutoGridLayout');
|
||||||
expect(layoutManager.state.maxColumnCount).toBe(4);
|
expect(layoutManager.state.maxColumnCount).toBe(4);
|
||||||
expect(layoutManager.state.columnWidth).toBe(100);
|
expect(layoutManager.state.columnWidth).toBe(100);
|
||||||
expect(layoutManager.state.rowHeight).toBe('standard');
|
expect(layoutManager.state.rowHeight).toBe('standard');
|
||||||
@@ -572,7 +572,7 @@ describe('transformSaveModelSchemaV2ToScene', () => {
|
|||||||
};
|
};
|
||||||
const scene = transformSaveModelSchemaV2ToScene(dashboard);
|
const scene = transformSaveModelSchemaV2ToScene(dashboard);
|
||||||
const layoutManager = scene.state.body as TabsLayoutManager;
|
const layoutManager = scene.state.body as TabsLayoutManager;
|
||||||
expect(layoutManager.descriptor.id).toBe('tabs-layout');
|
expect(layoutManager.descriptor.id).toBe('TabsLayout');
|
||||||
expect(layoutManager.state.tabs.length).toBe(1);
|
expect(layoutManager.state.tabs.length).toBe(1);
|
||||||
expect(layoutManager.state.tabs[0].state.title).toBe('tab1');
|
expect(layoutManager.state.tabs[0].state.title).toBe('tab1');
|
||||||
const gridLayoutManager = layoutManager.state.tabs[0].state.layout as AutoGridLayoutManager;
|
const gridLayoutManager = layoutManager.state.tabs[0].state.layout as AutoGridLayoutManager;
|
||||||
@@ -648,10 +648,10 @@ describe('transformSaveModelSchemaV2ToScene', () => {
|
|||||||
};
|
};
|
||||||
const scene = transformSaveModelSchemaV2ToScene(dashboard);
|
const scene = transformSaveModelSchemaV2ToScene(dashboard);
|
||||||
const layoutManager = scene.state.body as RowsLayoutManager;
|
const layoutManager = scene.state.body as RowsLayoutManager;
|
||||||
expect(layoutManager.descriptor.id).toBe('rows-layout');
|
expect(layoutManager.descriptor.id).toBe('RowsLayout');
|
||||||
expect(layoutManager.state.rows.length).toBe(2);
|
expect(layoutManager.state.rows.length).toBe(2);
|
||||||
const row1Manager = layoutManager.state.rows[0].state.layout as AutoGridLayoutManager;
|
const row1Manager = layoutManager.state.rows[0].state.layout as AutoGridLayoutManager;
|
||||||
expect(row1Manager.descriptor.id).toBe('auto-grid');
|
expect(row1Manager.descriptor.id).toBe('AutoGridLayout');
|
||||||
expect(row1Manager.state.maxColumnCount).toBe(4);
|
expect(row1Manager.state.maxColumnCount).toBe(4);
|
||||||
expect(row1Manager.state.columnWidth).toBe('standard');
|
expect(row1Manager.state.columnWidth).toBe('standard');
|
||||||
expect(row1Manager.state.rowHeight).toBe('standard');
|
expect(row1Manager.state.rowHeight).toBe('standard');
|
||||||
@@ -659,7 +659,7 @@ describe('transformSaveModelSchemaV2ToScene', () => {
|
|||||||
expect(row1GridItem.state.body.state.key).toBe('panel-1');
|
expect(row1GridItem.state.body.state.key).toBe('panel-1');
|
||||||
|
|
||||||
const row2Manager = layoutManager.state.rows[1].state.layout as DefaultGridLayoutManager;
|
const row2Manager = layoutManager.state.rows[1].state.layout as DefaultGridLayoutManager;
|
||||||
expect(row2Manager.descriptor.id).toBe('default-grid');
|
expect(row2Manager.descriptor.id).toBe('GridLayout');
|
||||||
const row2GridItem = row2Manager.state.grid.state.children[0] as SceneGridItem;
|
const row2GridItem = row2Manager.state.grid.state.children[0] as SceneGridItem;
|
||||||
expect(row2GridItem.state.body!.state.key).toBe('panel-2');
|
expect(row2GridItem.state.body!.state.key).toBe('panel-2');
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user