@dative-gpi/foundation-core-domain 1.1.12 → 1.1.14

package/models/chartOrganisationTypes/chartOrganisationTypeInfos.ts

@@ -1,5 +1,5 @@
-import type { ChartModelLabelDTO } from "../charts/chartModelLabel";
-import { ChartModelLabel } from "../charts/chartModelLabel";
+import type { ModelInfosDTO } from "../models/modelInfos";
+import { ModelInfos } from "../models/modelInfos";
 import type { ApplicationScope } from "@dative-gpi/foundation-shared-domain/enums";
 import type { ChartType, PlotPer } from "@dative-gpi/foundation-shared-domain/enums";
 
@@ -21,7 +21,7 @@ export class ChartOrganisationTypeInfos {
   tags: string[];
   multiple: boolean;
   chartType: ChartType;
-  modelsLabels: ChartModelLabel[];
+  models: ModelInfos[];
 
   constructor(params: ChartOrganisationTypeInfosDTO) {
     this.id = params.id;
@@ -41,7 +41,7 @@ export class ChartOrganisationTypeInfos {
     this.tags = params.tags.slice();
     this.multiple = params.multiple;
     this.chartType = params.chartType;
-    this.modelsLabels = params.modelsLabels.map((modelLabel) => new ChartModelLabel(modelLabel));
+    this.models = params.models?.map((m) => new ModelInfos(m)) ?? [];
   }
 }
 
@@ -63,7 +63,7 @@ export interface ChartOrganisationTypeInfosDTO {
   tags: string[];
   multiple: boolean;
   chartType: ChartType;
-  modelsLabels: ChartModelLabelDTO[];
+  models?: ModelInfosDTO[];
 }
 
 export interface ChartOrganisationTypeFilters {

package/models/chartOrganisations/chartOrganisationInfos.ts

@@ -1,5 +1,5 @@
-import type { ChartModelLabelDTO } from "../charts/chartModelLabel";
-import { ChartModelLabel } from "../charts/chartModelLabel";
+import type { ModelInfosDTO } from "../models/modelInfos";
+import { ModelInfos } from "../models/modelInfos";
 import type { ApplicationScope } from "@dative-gpi/foundation-shared-domain/enums";
 import type { ChartType, PlotPer } from "@dative-gpi/foundation-shared-domain/enums";
 
@@ -20,7 +20,7 @@ export class ChartOrganisationInfos {
   tags: string[];
   multiple: boolean;
   chartType: ChartType;
-  modelsLabels: ChartModelLabel[];
+  models: ModelInfos[];
 
   constructor(params: ChartOrganisationInfosDTO) {
     this.id = params.id;
@@ -39,7 +39,7 @@ export class ChartOrganisationInfos {
     this.tags = params.tags.slice();
     this.multiple = params.multiple;
     this.chartType = params.chartType;
-    this.modelsLabels = params.modelsLabels.map((modelLabel) => new ChartModelLabel(modelLabel));
+    this.models = params.models?.map((m) => new ModelInfos(m)) ?? [];
   }
 }
 
@@ -60,7 +60,7 @@ export interface ChartOrganisationInfosDTO {
   tags: string[];
   multiple: boolean;
   chartType: ChartType;
-  modelsLabels: ChartModelLabelDTO[];
+  models?: ModelInfosDTO[];
 }
 
 export interface ChartOrganisationFilters {

package/models/charts/chartInfos.ts

@@ -1,5 +1,3 @@
-import type { ChartModelLabelDTO } from "./chartModelLabel";
-import { ChartModelLabel } from "./chartModelLabel";
 import type { ApplicationScope } from "@dative-gpi/foundation-shared-domain/enums";
 import type { ChartType } from "@dative-gpi/foundation-shared-domain/enums";
 
@@ -18,7 +16,6 @@ export class ChartInfos {
   tags: string[];
   multiple: boolean;
   chartType: ChartType;
-  modelsLabels: ChartModelLabel[];
 
   constructor(params: ChartInfosDTO) {
     this.id = params.id;
@@ -35,7 +32,6 @@ export class ChartInfos {
     this.tags = params.tags.slice();
     this.multiple = params.multiple;
     this.chartType = params.chartType;
-    this.modelsLabels = params.modelsLabels.map((modelLabel) => new ChartModelLabel(modelLabel));
   }
 }
 
@@ -54,5 +50,4 @@ export interface ChartInfosDTO {
   tags: string[];
   multiple: boolean;
   chartType: ChartType;
-  modelsLabels: ChartModelLabelDTO[];
 }

package/models/charts/chartOperand.ts

@@ -7,8 +7,6 @@ export class ChartOperand {
   chartSerieHiddenCode: string;
   name: string;
   aggregation?: AggregationType;
-  modelId: string;
-  modelLabel: string;
   dataCategoryId: string;
   dataDefinitionId?: string;
   xAxisModifierHiddenCode?: string;
@@ -22,10 +20,8 @@ export class ChartOperand {
     this.chartId = params.chartId;
     this.hiddenCode = params.hiddenCode;
     this.chartSerieHiddenCode = params.chartSerieHiddenCode;
-    this.name = params.name
+    this.name = params.name;
     this.aggregation = (params.aggregation as AggregationType) ?? undefined;
-    this.modelId = params.modelId;
-    this.modelLabel = params.modelLabel;
     this.dataCategoryId = params.dataCategoryId;
     this.dataDefinitionId = params.dataDefinitionId;
     this.xAxisModifierHiddenCode = params.xAxisModifierHiddenCode;
@@ -43,8 +39,6 @@ export interface ChartOperandDTO {
   chartSerieHiddenCode: string;
   name: string;
   aggregation?: number;
-  modelId: string;
-  modelLabel: string;
   dataCategoryId: string;
   dataDefinitionId?: string;
   xAxisModifierHiddenCode?: string;
@@ -59,7 +53,6 @@ export interface CreateChartOperandDTO {
   chartSerieHiddenCode: string;
   name: string;
   aggregation?: number;
-  modelId: string;
   dataCategoryId: string;
   dataDefinitionId?: string;
   xAxisModifierHiddenCode?: string;

package/models/charts/index.ts

@@ -6,7 +6,6 @@ export * from "./chartFilter";
 export * from "./chartFilterTranslation";
 export * from "./chartFilterValue";
 export * from "./chartInfos";
-export * from "./chartModelLabel";
 export * from "./chartModifier";
 export * from "./chartOperand";
 export * from "./chartPlot";

package/models/dashboardExplorerElements/dashboardExplorerElementDetails.ts

@@ -0,0 +1,50 @@
+import { DashboardExplorerElementInfos, type DashboardExplorerElementInfosDTO } from "./dashboardExplorerElementInfos";
+
+export class DashboardExplorerElementDetails extends DashboardExplorerElementInfos {  
+    // DashboardOrganisation & DashboardShallow
+    folderId: string | null;
+    folderLabel: string | null;
+    folderIcon: string | null;
+  
+    // DashboardShallow
+    dashboardOrganisationTypeId: string | null;
+    dashboardOrganisationTypeLabel: string | null;
+  
+    // DashboardOrganisationType
+    organisationTypeId: string | null;
+    organisationTypeLabel: string | null;
+
+    // Dashboard
+    dashboardId: string | null;
+  
+
+  constructor(params: DashboardExplorerElementDetailsDTO) {
+    super(params);
+    this.folderId = params.folderId ?? null;
+    this.folderLabel = params.folderLabel ?? null;
+    this.folderIcon = params.folderIcon ?? null;
+    this.dashboardOrganisationTypeId = params.dashboardOrganisationTypeId ?? null;
+    this.dashboardOrganisationTypeLabel = params.dashboardOrganisationTypeLabel ?? null;
+    this.organisationTypeId = params.organisationTypeId ?? null;
+    this.organisationTypeLabel = params.organisationTypeLabel ?? null;
+    this.dashboardId = params.dashboardId ?? null;
+  }
+}
+
+export interface DashboardExplorerElementDetailsDTO extends DashboardExplorerElementInfosDTO {  
+    // DashboardOrganisation & DashboardShallow
+    folderId?: string;
+    folderLabel?: string | null;
+    folderIcon?: string | null;
+  
+    // DashboardShallow
+    dashboardOrganisationTypeId?: string | null;
+    dashboardOrganisationTypeLabel?: string | null;
+  
+    // DashboardOrganisationType
+    organisationTypeId?: string | null;
+    organisationTypeLabel?: string | null;
+    
+    // Dashboard
+    dashboardId?: string | null;  
+}

package/models/dashboardExplorerElements/dashboardExplorerElementInfos.ts

@@ -0,0 +1,110 @@
+import type { ApplicationScope, DashboardExplorerElementType } from "@dative-gpi/foundation-shared-domain/enums";
+import { DashboardExplorerElementType as DashboardExplorerElementTypeEnum } from "@dative-gpi/foundation-shared-domain/enums";
+
+import { PathCrumb, type PathCrumbDTO } from "../shared/pathCrumb";
+import type { DashboardOrganisationInfos } from "../dashboardOrganisations/dashboardOrganisationInfos";
+import type { DashboardShallowInfos } from "../dashboardShallows/dashboardShallowInfos";
+import type { DashboardOrganisationTypeInfos } from "../dashboardOrganisationTypes/dashboardOrganisationTypeInfos";
+import type { FolderInfos } from "../folders/folderInfos";
+
+export class DashboardExplorerElementInfos {
+  id: string;
+  imageId: string | null;
+  label: string;
+  code: string;
+  icon: string;
+  tags: string[];
+  colors: string[];
+  type: DashboardExplorerElementType;
+
+  // Folder
+  parentId: string | null;
+  parentLabel: string | null;
+  parentIcon: string | null;
+  recursiveFoldersIds: string[] | null;
+  recursiveDashboardOrganisationsIds: string[] | null;
+  recursiveDashboardShallowsIds: string[] | null;
+  path: PathCrumb[];
+  // Dashboard
+  scope: ApplicationScope | null;
+  locked: boolean | null;
+
+  constructor(params: DashboardExplorerElementInfosDTO) {
+    this.id = params.id;
+    this.imageId = params.imageId;
+    this.label = params.label;
+    this.code = params.code;
+    this.icon = params.icon;
+    this.tags = params.tags?.slice() ?? [];
+    this.colors = params.colors?.slice() ?? [];
+    this.type = params.type;
+
+    this.parentId = params.parentId ?? null;
+    this.parentLabel = params.parentLabel ?? null;
+    this.parentIcon = params.parentIcon ?? null;
+    this.recursiveFoldersIds = params.recursiveFoldersIds?.slice() ?? null;
+    this.recursiveDashboardOrganisationsIds = params.recursiveDashboardOrganisationsIds?.slice() ?? null;
+    this.recursiveDashboardShallowsIds = params.recursiveDashboardShallowsIds?.slice() ?? null;
+    this.path = params.path?.map(dto => new PathCrumb({ ...dto })).sort((a, b) => b.index - a.index) ?? [];
+
+    this.scope = params.scope ?? null;
+    this.locked = params.locked ?? null;
+  }
+
+  static fromDashboardOrganisation = (d: DashboardOrganisationInfos): DashboardExplorerElementInfos => new DashboardExplorerElementInfos({
+    ...d,
+    type: DashboardExplorerElementTypeEnum.DashboardOrganisation,
+    parentId: d.folderId,
+    parentLabel: d.folderLabel,
+    parentIcon: d.folderIcon
+  });
+
+  static fromDashboardShallow = (d: DashboardShallowInfos): DashboardExplorerElementInfos => new DashboardExplorerElementInfos({
+    ...d,
+    type: DashboardExplorerElementTypeEnum.DashboardShallow,
+    parentId: d.folderId,
+    parentLabel: d.folderLabel,
+    parentIcon: d.folderIcon
+  });
+
+  static fromDashboardOrganisationType = (d: DashboardOrganisationTypeInfos): DashboardExplorerElementInfos => new DashboardExplorerElementInfos({
+    ...d,
+    type: DashboardExplorerElementTypeEnum.DashboardOrganisationType
+  });
+
+  static fromFolder = (f: FolderInfos): DashboardExplorerElementInfos => new DashboardExplorerElementInfos({
+    ...f,
+    type: DashboardExplorerElementTypeEnum.Folder
+  });
+}
+
+export interface DashboardExplorerElementInfosDTO {
+  id: string;
+  imageId: string | null;
+  label: string;
+  code: string;
+  icon: string;
+  tags: string[];
+  colors: string[];
+  type: DashboardExplorerElementType;
+
+  parentId?: string | null;
+  parentLabel?: string | null;
+  parentIcon?: string | null;
+  recursiveFoldersIds?: string[] | null;
+  recursiveDashboardOrganisationsIds?: string[] | null;
+  recursiveDashboardShallowsIds?: string[] | null;
+  path?: PathCrumbDTO[];
+
+  scope?: ApplicationScope | null;
+  locked?: boolean | null;
+}
+
+export interface DashboardExplorerElementFilters {
+  dashboardExplorerElementsIds?: string[] | null;
+  ancestorId?: string | null;
+  parentId?: string | null;
+  root?: boolean | null;
+  search?: string | null;
+  types?: DashboardExplorerElementType[] | null;
+}

package/models/dashboardExplorerElements/index.ts

@@ -0,0 +1,2 @@
+export * from "./dashboardExplorerElementDetails";
+export * from "./dashboardExplorerElementInfos";

package/models/dataCategories/dataCategoryInfos.ts

@@ -1,29 +1,35 @@
+import type { ModelInfosDTO } from "../models/modelInfos";
+import { ModelInfos } from "../models/modelInfos";
+
 export class DataCategoryInfos {
   id: string;
-  modelId: string;
+  applicationId: string;
   code: string;
   label: string;
   correlated: boolean;
+  models: ModelInfos[];
 
   constructor(params: DataCategoryInfosDTO) {
     this.id = params.id;
-    this.modelId = params.modelId;
+    this.applicationId = params.applicationId;
     this.code = params.code;
     this.label = params.label;
     this.correlated = params.correlated;
+    this.models = params.models?.map((m) => new ModelInfos(m)) ?? [];
   }
 }
 
 export interface DataCategoryInfosDTO {
   id: string;
-  modelId: string;
+  applicationId: string;
   code: string;
   label: string;
   correlated: boolean;
+  models?: ModelInfosDTO[];
 }
 
 export interface DataCategoryFilters {
-  modelId?: string | null;
+  modelsIds?: string[] | null;
   correlated?: boolean | null;
   search?: string | null;
 }

package/models/dataDefinitions/dataDefinitionInfos.ts

@@ -4,7 +4,6 @@ import type { DataTable } from "@dative-gpi/foundation-shared-domain/enums";
 
 export class DataDefinitionInfos {
   id: string;
-  modelId: string;
   dataCategoryId: string;
   dataCategoryCode: string;
   dataCategoryLabel: string;
@@ -19,7 +18,6 @@ export class DataDefinitionInfos {
 
   constructor(params: DataDefinitionInfosDTO) {
     this.id = params.id;
-    this.modelId = params.modelId;
     this.dataCategoryId = params.dataCategoryId;
     this.dataCategoryCode = params.dataCategoryCode;
     this.dataCategoryLabel = params.dataCategoryLabel;
@@ -36,7 +34,6 @@ export class DataDefinitionInfos {
   
 export interface DataDefinitionInfosDTO {
   id: string;
-  modelId: string;
   dataCategoryId: string;
   dataCategoryCode: string;
   dataCategoryLabel: string;

package/models/deviceExplorerElements/deviceExplorerElementInfos.ts

@@ -75,36 +75,20 @@ export class DeviceExplorerElementInfos {
     this.worstAlert = params.worstAlert ? new DeviceOrganisationAlert(params.worstAlert) : null;
   }
 
-  static fromDeviceOrganisation = (deviceOrganisation: DeviceOrganisationInfos): DeviceExplorerElementInfos => ({
+  static fromDeviceOrganisation = (deviceOrganisation: DeviceOrganisationInfos): DeviceExplorerElementInfos => new DeviceExplorerElementInfos({
     ...deviceOrganisation,
     type: DeviceExplorerElementType.DeviceOrganisation,
     parentId: deviceOrganisation.groupId,
-    icon: null,
-    groupsIds: null,
-    deviceOrganisationsIds: null,
-    modelsIds: null,
-    recursiveGroupsIds: null,
-    recursiveDeviceOrganisationsIds: null,
-    recursiveModelsIds: null
-  });
-
-  static fromGroup = (group: GroupInfos): DeviceExplorerElementInfos => ({
-    ...group,
-    type: DeviceExplorerElementType.Group,
-    manufacturerLabel: null,
-    articleLabel:  null,
-    modelLabel: null,
-    ownerLabel: null,
-    managerName: null,
-    unrestricted: null,
-    online: null,
-    meta: null,
-    modelStatuses: null,
     status: null,
     connectivity: null,
     alerts: null,
     worstAlert: null
   });
+
+  static fromGroup = (group: GroupInfos): DeviceExplorerElementInfos => new DeviceExplorerElementInfos({
+    ...group,
+    type: DeviceExplorerElementType.Group
+  });
 }
 
 export interface DeviceExplorerElementInfosDTO {

package/models/index.ts

@@ -13,6 +13,7 @@ export * from "./customProperties";
 export * from "./customPropertyValues";
 export * from "./dashboardDatePresets";                 // No service
 export * from "./dashboardEntityPresets";               // No service
+export * from "./dashboardExplorerElements";
 export * from "./dashboardOrganisations";
 export * from "./dashboardOrganisationTypes";
 export * from "./dashboards";

package/package.json

@@ -4,7 +4,7 @@
     "url": "https://github.com/Dative-GPI/foundation-shared-ui.git"
   },
   "sideEffects": false,
-  "version": "1.1.12",
+  "version": "1.1.14",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -13,8 +13,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.1.12",
-    "@dative-gpi/foundation-shared-services": "1.1.12"
+    "@dative-gpi/foundation-shared-domain": "1.1.14",
+    "@dative-gpi/foundation-shared-services": "1.1.14"
   },
-  "gitHead": "9ad6a2732e79fef8289b5c606efaf027ea0cd5ba"
+  "gitHead": "efb541c500519dde8bc68c2c5719595986701947"
 }

package/models/charts/chartModelLabel.ts

@@ -1,14 +0,0 @@
-export class ChartModelLabel {
-  id: string;
-  label: string;
-
-  constructor(params: ChartModelLabelDTO) {
-    this.id = params.id;
-    this.label = params.label;
-  }
-}
-
-export interface ChartModelLabelDTO {
-  id: string;
-  label: string;
-}