Browse Source

UI: Add default layout type to old grid settings.

pull/11606/head
Igor Kulikov 2 years ago
parent
commit
c196389849
  1. 12
      ui-ngx/src/app/core/services/dashboard-utils.service.ts
  2. 1
      ui-ngx/src/app/shared/models/dashboard.models.ts

12
ui-ngx/src/app/core/services/dashboard-utils.service.ts

@ -31,7 +31,7 @@ import {
DashboardLayoutsInfo, DashboardLayoutsInfo,
DashboardState, DashboardState,
DashboardStateLayouts, DashboardStateLayouts,
GridSettings, GridSettings, LayoutType,
WidgetLayout WidgetLayout
} from '@shared/models/dashboard.models'; } from '@shared/models/dashboard.models';
import { deepClone, isDefined, isDefinedAndNotNull, isNotEmptyStr, isString, isUndefined } from '@core/utils'; import { deepClone, isDefined, isDefinedAndNotNull, isNotEmptyStr, isString, isUndefined } from '@core/utils';
@ -406,6 +406,7 @@ export class DashboardUtilsService {
private createDefaultGridSettings(): GridSettings { private createDefaultGridSettings(): GridSettings {
return { return {
layoutType: LayoutType.default,
backgroundColor: '#eeeeee', backgroundColor: '#eeeeee',
columns: 24, columns: 24,
margin: 10, margin: 10,
@ -491,12 +492,15 @@ export class DashboardUtilsService {
if (!layout.gridSettings) { if (!layout.gridSettings) {
layout.gridSettings = this.createDefaultGridSettings(); layout.gridSettings = this.createDefaultGridSettings();
} }
if (layout.gridSettings.margins && layout.gridSettings.margins.length === 2) { if ((layout.gridSettings as any).margins && (layout.gridSettings as any).margins.length === 2) {
layout.gridSettings.margin = layout.gridSettings.margins[0]; layout.gridSettings.margin = (layout.gridSettings as any).margins[0];
delete layout.gridSettings.margins; delete (layout.gridSettings as any).margins;
} }
layout.gridSettings.outerMargin = isDefined(layout.gridSettings.outerMargin) ? layout.gridSettings.outerMargin : true; layout.gridSettings.outerMargin = isDefined(layout.gridSettings.outerMargin) ? layout.gridSettings.outerMargin : true;
layout.gridSettings.margin = isDefined(layout.gridSettings.margin) ? layout.gridSettings.margin : 10; layout.gridSettings.margin = isDefined(layout.gridSettings.margin) ? layout.gridSettings.margin : 10;
if (!layout.gridSettings.layoutType) {
layout.gridSettings.layoutType = LayoutType.default;
}
} }
public setLayouts(dashboard: Dashboard, targetState: string, newLayouts: DashboardStateLayouts) { public setLayouts(dashboard: Dashboard, targetState: string, newLayouts: DashboardStateLayouts) {

1
ui-ngx/src/app/shared/models/dashboard.models.ts

@ -97,7 +97,6 @@ export interface GridSettings {
mobileRowHeight?: number; mobileRowHeight?: number;
mobileDisplayLayoutFirst?: boolean; mobileDisplayLayoutFirst?: boolean;
layoutDimension?: LayoutDimension; layoutDimension?: LayoutDimension;
[key: string]: any;
} }
export interface DashboardLayout { export interface DashboardLayout {

Loading…
Cancel
Save