IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-07 22:53:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Migrate Panel edit uiState percentage strings to number (#29412)

Browse Source
This commit is contained in:
Peter Holmberg 2020-11-26 13:27:50 +01:00 committed by GitHub
parent bec3fbea47
commit 06e48cb869
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
public/app/core/components/ThreePaneSplit/SplitPaneWrapper.tsx → public/app/core/components/SplitPaneWrapper/SplitPaneWrapper.tsx
View File

2
public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx
View File

@ -18,7 +18,7 @@ import { OptionsPaneContent } from './OptionsPaneContent';
import { DashNavButton } from 'app/features/dashboard/components/DashNav/DashNavButton';
import { SubMenuItems } from 'app/features/dashboard/components/SubMenu/SubMenuItems';
import { BackButton } from 'app/core/components/BackButton/BackButton';
import { SplitPaneWrapper } from 'app/core/components/ThreePaneSplit/SplitPaneWrapper';
import { SplitPaneWrapper } from 'app/core/components/SplitPaneWrapper/SplitPaneWrapper';
import { SaveDashboardModalProxy } from '../SaveDashboard/SaveDashboardModalProxy';
import { DashboardPanel } from '../../dashgrid/DashboardPanel';

10
public/app/features/dashboard/components/PanelEditor/state/reducers.ts
View File

@ -37,6 +37,14 @@ export interface PanelEditorState {
}
export const initialState = (): PanelEditorState => {
const storedUiState = store.getObject(PANEL_EDITOR_UI_STATE_STORAGE_KEY, DEFAULT_PANEL_EDITOR_UI_STATE);
let migratedState = { ...storedUiState };
if (typeof storedUiState.rightPaneSize === 'string') {
migratedState = { ...storedUiState, rightPaneSize: parseFloat(storedUiState.rightPaneSize) / 100 };
}
return {
getPanel: () => new PanelModel({}),
getSourcePanel: () => new PanelModel({}),
@ -50,7 +58,7 @@ export const initialState = (): PanelEditorState => {
isOpen: false,
ui: {
...DEFAULT_PANEL_EDITOR_UI_STATE,
...store.getObject(PANEL_EDITOR_UI_STATE_STORAGE_KEY, DEFAULT_PANEL_EDITOR_UI_STATE),
...migratedState,
},
};
};