@dative-gpi/foundation-core-domain 1.0.126 → 1.0.128-dvh

package/models/alerts/alertDetails.ts

@@ -1,24 +1,17 @@
-import type { ApplicationScope } from "@/shared/foundation-shared-domain/enums";
 import { AlertInfos, type AlertInfosDTO } from "./alertInfos";
 
 export class AlertDetails extends AlertInfos {
   description: string;
   comments: string;
-  scenarioId: string;
-  scenarioScope: ApplicationScope;
 
   constructor(params: AlertDetailsDTO) {
     super(params);
     this.comments = params.comments;
     this.description = params.description;
-    this.scenarioId = params.scenarioId;
-    this.scenarioScope = params.scenarioScope;
   }
 }
 
 export interface AlertDetailsDTO extends AlertInfosDTO {
   description: string;
   comments: string;
-  scenarioId: string;
-  scenarioScope: ApplicationScope;
 }

package/models/alerts/alertInfos.ts

@@ -1,4 +1,4 @@
-import { type AlertStatus, type Criticity } from "@dative-gpi/foundation-shared-domain/enums";
+import { type ApplicationScope, type AlertStatus, type Criticity } from "@dative-gpi/foundation-shared-domain/enums";
 import { isoToEpoch } from "@dative-gpi/foundation-shared-domain/tools";
 
 import { AlertDataDefinition, type AlertDataDefinitionDTO } from "./alertDataDefinition";
@@ -8,7 +8,8 @@ import { type DateVariable } from "../shared/dateVariable";
 
 export class AlertInfos {
   id: string;
-  deprecatedScenarioId: string;
+  scenarioId: string;
+  scenarioScope: ApplicationScope;
   scenarioLabel: string;
   organisationId: string;
   deviceOrganisationId: string;
@@ -39,7 +40,8 @@ export class AlertInfos {
 
   constructor(params: AlertInfosDTO) {
     this.id = params.id;
-    this.deprecatedScenarioId = params.deprecatedScenarioId;
+    this.scenarioId = params.scenarioId;
+    this.scenarioScope = params.scenarioScope;
     this.scenarioLabel = params.scenarioLabel;
     this.organisationId = params.organisationId;
     this.deviceOrganisationId = params.deviceOrganisationId;
@@ -79,7 +81,8 @@ export class AlertInfos {
 
 export interface AlertInfosDTO {
   id: string;
-  deprecatedScenarioId: string;
+  scenarioId: string;
+  scenarioScope: ApplicationScope;
   scenarioLabel: string;
   organisationId: string;
   deviceOrganisationId: string;
@@ -110,7 +113,8 @@ export interface AlertInfosDTO {
 }
 
 export interface AlertFilters {
-  deprecatedScenarioId?: string | null;
+  scenarioId?: string | null;
+  scenarioScope?: ApplicationScope | null;
   deviceOrganisationId?: string | null;
   statuses?: AlertStatus[] | null;
   acknowledged?: boolean | null;

package/models/deviceExplorerElements/deviceExplorerElementInfos.ts

@@ -1,10 +1,12 @@
-import { type DeviceExplorerElementType } from "@dative-gpi/foundation-shared-domain/enums";
+import { DeviceExplorerElementType } from "@dative-gpi/foundation-shared-domain/enums";
 
 import { DeviceConnectivityDetails, type DeviceConnectivityDetailsDTO } from "../deviceConnectivities/deviceConnectivityDetails";
 import { DeviceOrganisationAlert, type DeviceOrganisationAlertDTO } from "../deviceOrganisations/deviceOrganisationAlert";
 import { DeviceStatusDetails, type DeviceStatusDetailsDTO } from "../deviceStatuses/deviceStatusDetails";
 import { ModelStatusInfos, type ModelStatusInfosDTO } from "../modelStatuses/modelStatusInfos";
+import { type DeviceOrganisationInfos } from "../deviceOrganisations/deviceOrganisationInfos";
 import { PathCrumb, type PathCrumbDTO } from "../shared/pathCrumb";
+import { type GroupInfos } from "../groups/groupInfos";
 
 export class DeviceExplorerElementInfos {
   id: string;
@@ -72,6 +74,37 @@ export class DeviceExplorerElementInfos {
     this.alerts = params.alerts?.map(dto => new DeviceOrganisationAlert(dto)) ?? null;
     this.worstAlert = params.worstAlert ? new DeviceOrganisationAlert(params.worstAlert) : null;
   }
+
+  static fromDeviceOrganisation = (deviceOrganisation: DeviceOrganisationInfos): 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
+  });
 }
 
 export interface DeviceExplorerElementInfosDTO {

package/models/index.ts

@@ -28,7 +28,6 @@ export * from "./deviceConnectivities";
 export * from "./deviceExplorerElements";
 export * from "./deviceOrganisations";
 export * from "./deviceStatuses";
-export * from "./extensionApplications";
 export * from "./folders";
 export * from "./groups";
 export * from "./locations";

package/models/scenarioDeviceOrganisations/scenarioDeviceOrganisationDetails.ts

@@ -2,6 +2,7 @@ import type { CreateTimeRangeDTO } from "../shared/timeRange";
 import type { ScenarioDeviceOrganisationInfosDTO } from "./scenarioDeviceOrganisationInfos";
 import { ScenarioDeviceOrganisationInfos } from "./scenarioDeviceOrganisationInfos";
 import type { CreateScenarioParameterOverrideDTO } from "../scenarios/scenarioParameterOverride";
+import type { ApplicationScope } from "@dative-gpi/foundation-shared-domain/enums";
 
 
 export class ScenarioDeviceOrganisationDetails extends ScenarioDeviceOrganisationInfos {
@@ -16,7 +17,8 @@ export interface ScenarioDeviceOrganisationDetailsDTO extends ScenarioDeviceOrga
 }
 
 export interface CreateScenarioDeviceOrganisationDTO {
-  deprecatedScenarioId: string;
+  scenarioId: string;
+  scenarioScope: ApplicationScope;
   deviceOrganisationId: string;
   overrideTimeRanges: boolean;
   timeRanges: CreateTimeRangeDTO[] | null;
@@ -27,7 +29,8 @@ export interface CreateScenarioDeviceOrganisationDTO {
 }
 
 export interface CreateManyScenarioDeviceOrganisationDTO {
-  deprecatedScenarioId: string;
+  scenarioId: string;
+  scenarioScope: ApplicationScope;
   deviceOrganisationsIds: string[];
   overrideTimeRanges: boolean;
   timeRanges: CreateTimeRangeDTO[] | null;

package/models/scenarioDeviceOrganisations/scenarioDeviceOrganisationInfos.ts

@@ -8,7 +8,6 @@ import type { ApplicationScope } from "@/shared/foundation-shared-domain/enums";
 
 export class ScenarioDeviceOrganisationInfos {
   id: string;
-  deprecatedScenarioId: string;
   scenarioLabel: string;
   deviceOrganisationId: string;
   deviceOrganisationImageId: string | null;
@@ -28,7 +27,6 @@ export class ScenarioDeviceOrganisationInfos {
 
   constructor(params: ScenarioDeviceOrganisationInfosDTO) {
     this.id = params.id;
-    this.deprecatedScenarioId = params.deprecatedScenarioId;
     this.scenarioLabel = params.scenarioLabel;
     this.deviceOrganisationId = params.deviceOrganisationId;
     this.deviceOrganisationImageId = params.deviceOrganisationImageId;
@@ -51,7 +49,6 @@ export class ScenarioDeviceOrganisationInfos {
 
 export interface ScenarioDeviceOrganisationInfosDTO {
   id: string;
-  deprecatedScenarioId: string;
   scenarioLabel: string;
   deviceOrganisationId: string;
   deviceOrganisationImageId: string | null;
@@ -71,7 +68,8 @@ export interface ScenarioDeviceOrganisationInfosDTO {
 }
 
 export interface ScenarioDeviceOrganisationFilters {
-  deprecatedScenarioId?: string | null;
+  scenarioId?: string | null;
+  scenarioScope?: ApplicationScope | null;
   deviceOrganisationId?: string | null;
   deviceOrganisationsIds?: string[] | null;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-domain",
   "sideEffects": false,
-  "version": "1.0.126",
+  "version": "1.0.128-dvh",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.126",
-    "@dative-gpi/foundation-shared-services": "1.0.126"
+    "@dative-gpi/foundation-shared-domain": "1.0.128-dvh",
+    "@dative-gpi/foundation-shared-services": "1.0.128-dvh"
   },
-  "gitHead": "fa74ceb5e1e68ec7e0cf75fd43bdaf014f0ab552"
+  "gitHead": "02186299b1e99ef0040b5f09892143f046fe119d"
 }

package/models/extensionApplications/extensionApplicationDetails.ts

@@ -1,18 +0,0 @@
-import type { ExtensionApplicationInfosDTO } from "./extensionApplicationInfos";
-import { ExtensionApplicationInfos } from "./extensionApplicationInfos";
-
-export class ExtensionApplicationDetails extends ExtensionApplicationInfos {
-    host: string;
-    extensionId: string;
-
-    constructor(params: ExtensionApplicationDetailsDTO) {
-        super(params);
-        this.extensionId = params.extensionId;
-        this.host = params.host
-    }
-}
-
-export interface ExtensionApplicationDetailsDTO extends ExtensionApplicationInfosDTO {
-    extensionId: string;
-    host: string;
-}

package/models/extensionApplications/extensionApplicationInfos.ts

@@ -1,18 +0,0 @@
-export class ExtensionApplicationInfos {
-    id: string;
-    label: string;
-    description: string;
-  
-    constructor(params: ExtensionApplicationInfosDTO) {
-        this.id = params.id;
-        this.label = params.label;
-        this.description = params.description;
-    }
-}
-  
-export interface ExtensionApplicationInfosDTO {
-    id: string;
-    label: string;
-    description: string;
-}
-  

package/models/extensionApplications/index.ts

@@ -1,2 +0,0 @@
-export * from "./extensionApplicationDetails";
-export * from "./extensionApplicationInfos";