@dative-gpi/foundation-core-domain 1.0.136-override-widgets → 1.0.137-editable-components

package/models/dashboardShallows/dashboardShallowDetails.ts

@@ -1,32 +1,42 @@
-import { type CreateDashboardShallowEntityPresetDTO, DashboardShallowEntityPresetInfos, type DashboardShallowEntityPresetInfosDTO } from "../dashboardShallowEntityPresets";
-import { type CreateDashboardShallowDatePresetDTO, DashboardShallowDatePresetInfos, type DashboardShallowDatePresetInfosDTO } from "../dashboardShallowDatePresets";
-import { type CreateDashboardShallowVariableDTO, DashboardShallowVariableInfos, type DashboardShallowVariableInfosDTO } from "../dashboardShallowVariables";
-import { type CreateDashboardShallowWidgetDTO, DashboardShallowWidgetInfos, type DashboardShallowWidgetInfosDTO } from "../dashboardShallowWidgets";
-import { DashboardEntityPresetInfos, type DashboardEntityPresetInfosDTO } from "../dashboardEntityPresets";
-import { DashboardDatePresetInfos, type DashboardDatePresetInfosDTO } from "../dashboardDatePresets";
-import { DashboardVariableInfos, type DashboardVariableInfosDTO } from "../dashboardVariables";
-import { DashboardShallowInfos, type DashboardShallowInfosDTO } from "./dashboardShallowInfos";
-import { DashboardTranslation, type DashboardTranslationDTO } from "../dashboards";
-import { WidgetInfos, type WidgetInfosDTO } from "../widgets/widgetInfos";
-import { PathCrumb, type PathCrumbDTO } from "../shared/pathCrumb";
+import type { CreateDashboardShallowEntityPresetDTO, DashboardShallowEntityPresetInfosDTO } from "../dashboardShallowEntityPresets";
+import { DashboardShallowEntityPresetInfos } from "../dashboardShallowEntityPresets";
+import type { CreateDashboardShallowDatePresetDTO, DashboardShallowDatePresetInfosDTO } from "../dashboardShallowDatePresets";
+import { DashboardShallowDatePresetInfos } from "../dashboardShallowDatePresets";
+import type { CreateDashboardShallowVariableDTO, DashboardShallowVariableInfosDTO } from "../dashboardShallowVariables";
+import { DashboardShallowVariableInfos } from "../dashboardShallowVariables";
+import type { DashboardEntityPresetInfosDTO } from "../dashboardEntityPresets";
+import { DashboardEntityPresetInfos } from "../dashboardEntityPresets";
+import type { DashboardDatePresetInfosDTO } from "../dashboardDatePresets";
+import { DashboardDatePresetInfos } from "../dashboardDatePresets";
+import type { DashboardVariableInfosDTO } from "../dashboardVariables";
+import { DashboardVariableInfos } from "../dashboardVariables";
+import type { DashboardShallowInfosDTO } from "./dashboardShallowInfos";
+import { DashboardShallowInfos } from "./dashboardShallowInfos";
+import type { DashboardTranslationDTO } from "../dashboards";
+import { DashboardTranslation } from "../dashboards";
+import type { WidgetInfosDTO } from "../widgets/widgetInfos";
+import { WidgetInfos } from "../widgets/widgetInfos";
+import type { PathCrumbDTO } from "../shared/pathCrumb";
+import { PathCrumb } from "../shared/pathCrumb";
+
 
 export class DashboardShallowDetails extends DashboardShallowInfos {
   labelDefault: string;
   translations: DashboardTranslation[];
   path: PathCrumb[];
   
+  widgets: WidgetInfos[];
+  
   entityPresetCode: string | null;
   datePresetCode: string | null;
   variableCode: string | null;
   defaultDatePresets: DashboardDatePresetInfos[];
   defaultEntityPresets: DashboardEntityPresetInfos[];
   defaultVariables: DashboardVariableInfos[];
-  defaultWidgets: WidgetInfos[];
   
   overrideDatePresets: DashboardShallowDatePresetInfos[];
   overrideEntityPresets: DashboardShallowEntityPresetInfos[];
   overrideVariables: DashboardShallowVariableInfos[];
-  overrideWidgets: DashboardShallowWidgetInfos[];
 
   get datePresets() : DashboardDatePresetInfos[] {
     return this.defaultDatePresets.map(d => {
@@ -49,24 +59,17 @@ export class DashboardShallowDetails extends DashboardShallowInfos {
     });
   }
 
-  get widgets() {
-    return this.defaultWidgets.map(d => {
-      const override = this.overrideWidgets.find(od => od.widgetId === d.id);
-      return override ? new WidgetInfos({ ...d, ...override }) : d;
-    });
-  }
-
   constructor(params: DashboardShallowDetailsDTO) {
     super(params);
     
     this.labelDefault = params.labelDefault;
     this.path = params.path.map(dto => new PathCrumb(dto)).sort((a, b) => b.index - a.index);
     this.translations = params.translations.map(t => new DashboardTranslation(t));
+    this.widgets = params.widgets.map(dto => new WidgetInfos(dto));
     
     this.overrideDatePresets = params.overrideDatePresets.map(dto => new DashboardShallowDatePresetInfos(dto));
     this.overrideEntityPresets = params.overrideEntityPresets.map(dto => new DashboardShallowEntityPresetInfos(dto));
     this.overrideVariables = params.overrideVariables.map(dto => new DashboardShallowVariableInfos(dto));
-    this.overrideWidgets = params.overrideWidgets.map(dto => new DashboardShallowWidgetInfos(dto));
 
     this.entityPresetCode = params.entityPresetCode;
     this.datePresetCode = params.datePresetCode;
@@ -74,7 +77,6 @@ export class DashboardShallowDetails extends DashboardShallowInfos {
     this.defaultDatePresets = params.defaultDatePresets.map(dto => new DashboardDatePresetInfos(dto));
     this.defaultEntityPresets = params.defaultEntityPresets.map(dto => new DashboardEntityPresetInfos(dto));
     this.defaultVariables = params.defaultVariables.map(dto => new DashboardVariableInfos(dto));
-    this.defaultWidgets = params.defaultWidgets.map(dto => new WidgetInfos(dto));
   }
 }
 
@@ -84,7 +86,6 @@ export interface DashboardShallowDetailsDTO extends DashboardShallowInfosDTO {
   overrideDatePresets: DashboardShallowDatePresetInfosDTO[];
   overrideEntityPresets: DashboardShallowEntityPresetInfosDTO[];
   overrideVariables: DashboardShallowVariableInfosDTO[];
-  overrideWidgets: DashboardShallowWidgetInfosDTO[];
   translations: DashboardTranslationDTO[];
   dashboardId: string;
   scope: number;
@@ -94,7 +95,7 @@ export interface DashboardShallowDetailsDTO extends DashboardShallowInfosDTO {
   defaultDatePresets: DashboardDatePresetInfosDTO[];
   defaultEntityPresets: DashboardEntityPresetInfosDTO[];
   defaultVariables: DashboardVariableInfosDTO[];
-  defaultWidgets: WidgetInfosDTO[];
+  widgets: WidgetInfosDTO[];
 }
 
 export interface CreateDashboardShallowDTO {
@@ -113,7 +114,6 @@ export interface UpdateDashboardShallowDTO {
   overrideDatePresets: CreateDashboardShallowDatePresetDTO[];
   overrideEntityPresets: CreateDashboardShallowEntityPresetDTO[];
   overrideVariables: CreateDashboardShallowVariableDTO[];
-  overrideWidgets: CreateDashboardShallowWidgetDTO[];
   translations: DashboardTranslationDTO[];
 }
 

package/models/index.ts

@@ -19,7 +19,6 @@ export * from "./dashboardShallowDatePresets";          // No service
 export * from "./dashboardShallowEntityPresets";        // No service
 export * from "./dashboardShallows";
 export * from "./dashboardShallowVariables";            // No service
-export * from "./dashboardShallowWidgets";              // No service
 export * from "./dashboardVariables";                   // No service
 export * from "./dashboardVariableValues";              // No service
 export * from "./dataCategories";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-domain",
   "sideEffects": false,
-  "version": "1.0.136-override-widgets",
+  "version": "1.0.137-editable-components",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.136-override-widgets",
-    "@dative-gpi/foundation-shared-services": "1.0.136-override-widgets"
+    "@dative-gpi/foundation-shared-domain": "1.0.137-editable-components",
+    "@dative-gpi/foundation-shared-services": "1.0.137-editable-components"
   },
-  "gitHead": "c2765a250ad2c493b88f3801f13ddd71405e898a"
+  "gitHead": "7aa074aa1903f6d293e4606d198321e9832f030d"
 }

package/models/dashboardShallowWidgets/dashboardShallowWidgetDetails.ts

@@ -1,4 +0,0 @@
-export interface CreateDashboardShallowWidgetDTO {
-  widgetId: string;
-  meta: { [key: string]: string };
-}

package/models/dashboardShallowWidgets/dashboardShallowWidgetInfos.ts

@@ -1,30 +0,0 @@
-import _ from "lodash";
-
-const clean = <T>(meta: T): T => {
-  const newMeta = _.cloneDeepWith(meta, (value) => {
-    if (typeof value === "string") {
-      try {
-        return JSON.parse(value as string);
-      }
-      catch {
-        return value
-      }
-    }
-  });
-  return newMeta;
-}
-
-export class DashboardShallowWidgetInfos {
-  widgetId: string;
-  meta: { [key: string]: string };
-
-  constructor(params: DashboardShallowWidgetInfosDTO) {
-    this.widgetId = params.widgetId;
-    this.meta = clean(params.meta);
-  }
-}
-  
-export interface DashboardShallowWidgetInfosDTO {
-  widgetId: string;
-  meta: { [key: string]: string };
-}

package/models/dashboardShallowWidgets/index.ts

@@ -1,2 +0,0 @@
-export * from "./dashboardShallowWidgetDetails";
-export * from "./dashboardShallowWidgetInfos";