@dative-gpi/foundation-core-domain 1.0.129 → 1.0.130-maps2

package/models/chartOrganisationTypes/chartOrganisationTypeInfos.ts

@@ -70,4 +70,5 @@ export interface ChartOrganisationTypeFilters {
   draft?: boolean | null;
   deprecatedChartId?: string | null;
   deviceOrganisationsIds?: string[] | null
+  dataDefinitionsIds?: string[] | null;
 }

package/models/chartOrganisations/chartOrganisationInfos.ts

@@ -66,5 +66,6 @@ export interface ChartOrganisationFilters {
   search?: string | null;
   draft?: boolean | null;
   deprecatedChartId?: string | null;
-  deviceOrganisationsIds?: string[] | null
+  deviceOrganisationsIds?: string[] | null;
+  dataDefinitionsIds?: string[] | null;
 }

package/models/dashboardDatePresets/dashboardDatePresetDetails.ts

@@ -5,6 +5,7 @@ import type { DashboardDatePresetTranslationDTO } from "./dashboardDatePresetTra
 export interface CreateDashboardDatePresetDTO {
   hiddenCode: string;
   labelDefault: string;
+  showInOptions: boolean;
   startDate: string;
   endDate: string;
   useAutoRefresh: boolean;

package/models/dashboardDatePresets/dashboardDatePresetInfos.ts

@@ -7,6 +7,7 @@ import { DashboardDatePresetTranslation } from "./dashboardDatePresetTranslation
 export class DashboardDatePresetInfos {
   hiddenCode: string;
   labelDefault: string;
+  showInOptions: boolean;
   startDate: string;
   endDate: string;
   useAutoRefresh: boolean;
@@ -20,6 +21,7 @@ export class DashboardDatePresetInfos {
   constructor(params: DashboardDatePresetInfosDTO) {
     this.hiddenCode = params.hiddenCode;
     this.labelDefault = params.labelDefault;
+    this.showInOptions = params.showInOptions;
     this.startDate = params.startDate;
     this.endDate = params.endDate;
     this.useAutoRefresh = params.useAutoRefresh;
@@ -31,6 +33,7 @@ export class DashboardDatePresetInfos {
 export interface DashboardDatePresetInfosDTO {
   hiddenCode: string;
   labelDefault: string;
+  showInOptions: boolean;
   startDate: string;
   endDate: string;
   useAutoRefresh: boolean;

package/models/dashboardEntityPresets/dashboardEntityPresetDetails.ts

@@ -4,6 +4,7 @@ import type { EntityType } from "@dative-gpi/foundation-shared-domain/enums";
 export interface CreateDashboardEntityPresetDTO {
   hiddenCode: string;
   labelDefault: string;
+  showInOptions: boolean;
   singleEntity: boolean;
   entityType: EntityType;
   entitiesFilters: string;

package/models/dashboardEntityPresets/dashboardEntityPresetInfos.ts

@@ -7,6 +7,7 @@ import type { EntityType } from "@dative-gpi/foundation-shared-domain/enums";
 export class DashboardEntityPresetInfos {
   hiddenCode: string;
   labelDefault: string;
+  showInOptions: boolean;
   singleEntity: boolean;
   entityType: EntityType;
   entitiesFilters: string;
@@ -20,6 +21,7 @@ export class DashboardEntityPresetInfos {
   constructor(params: DashboardEntityPresetInfosDTO) {
     this.hiddenCode = params.hiddenCode;
     this.labelDefault = params.labelDefault;
+    this.showInOptions = params.showInOptions;
     this.singleEntity = params.singleEntity;
     this.entityType = params.entityType;
     this.entitiesFilters = params.entitiesFilters;
@@ -31,6 +33,7 @@ export class DashboardEntityPresetInfos {
 export interface DashboardEntityPresetInfosDTO {
   hiddenCode: string;
   labelDefault: string;
+  showInOptions: boolean;
   singleEntity: boolean;
   entityType: EntityType;
   entitiesFilters: string;

package/models/dashboardShallows/dashboardShallowDetails.ts

@@ -27,51 +27,36 @@ export class DashboardShallowDetails extends DashboardShallowInfos {
   
   widgets: WidgetInfos[];
   
-  defaultEntityPresetCode: string | null;
-  defaultDatePresetCode: string | null;
-  defaultVariableCode: string | null;
+  entityPresetCode: string | null;
+  datePresetCode: string | null;
+  variableCode: string | null;
   defaultDatePresets: DashboardDatePresetInfos[];
   defaultEntityPresets: DashboardEntityPresetInfos[];
   defaultVariables: DashboardVariableInfos[];
   
-  overrideEntityPresetCode: string | null;
-  overrideDatePresetCode: string | null;
-  overrideVariableCode: string | null;
   overrideDatePresets: DashboardShallowDatePresetInfos[];
   overrideEntityPresets: DashboardShallowEntityPresetInfos[];
   overrideVariables: DashboardShallowVariableInfos[];
-  
-  get entityPresetCode() {
-    return this.overrideEntityPresetCode ?? this.defaultEntityPresetCode;
-  }
-
-  get datePresetCode() {
-    return this.overrideDatePresetCode ?? this.defaultDatePresetCode;
-  }
-
-  get variableCode() {
-    return this.overrideVariableCode ?? this.defaultVariableCode;
-  }
 
   get datePresets() : DashboardDatePresetInfos[] {
     return this.defaultDatePresets.map(d => {
       const override = this.overrideDatePresets.find(od => od.hiddenCode === d.hiddenCode);
       return override ? new DashboardDatePresetInfos({ ...d, ...override }) : d;
-    })
+    });
   }
 
   get entityPresets() {
     return this.defaultEntityPresets.map(d => {
       const override = this.overrideEntityPresets.find(od => od.hiddenCode === d.hiddenCode);
       return override ? new DashboardEntityPresetInfos({ ...d, ...override }) : d;
-    })
+    });
   }
 
   get variables() {
     return this.defaultVariables.map(d => {
       const override = this.overrideVariables.find(od => od.hiddenCode === d.hiddenCode);
       return override ? new DashboardVariableInfos({ ...d, ...override }) : d;
-    })
+    });
   }
 
   constructor(params: DashboardShallowDetailsDTO) {
@@ -82,16 +67,13 @@ export class DashboardShallowDetails extends DashboardShallowInfos {
     this.translations = params.translations.map(t => new DashboardTranslation(t));
     this.widgets = params.widgets.map(dto => new WidgetInfos(dto));
     
-    this.overrideEntityPresetCode = params.overrideEntityPresetCode;
-    this.overrideDatePresetCode = params.overrideDatePresetCode;
-    this.overrideVariableCode = params.overrideVariableCode;
     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.defaultEntityPresetCode = params.defaultEntityPresetCode;
-    this.defaultDatePresetCode = params.defaultDatePresetCode;
-    this.defaultVariableCode = params.defaultVariableCode;
+    this.entityPresetCode = params.entityPresetCode;
+    this.datePresetCode = params.datePresetCode;
+    this.variableCode = params.variableCode;
     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));
@@ -101,18 +83,15 @@ export class DashboardShallowDetails extends DashboardShallowInfos {
 export interface DashboardShallowDetailsDTO extends DashboardShallowInfosDTO {
   labelDefault: string;
   path: PathCrumbDTO[];
-  overrideEntityPresetCode: string | null;
-  overrideDatePresetCode: string | null;
-  overrideVariableCode: string | null;
   overrideDatePresets: DashboardShallowDatePresetInfosDTO[];
   overrideEntityPresets: DashboardShallowEntityPresetInfosDTO[];
   overrideVariables: DashboardShallowVariableInfosDTO[];
   translations: DashboardTranslationDTO[];
   dashboardId: string;
   scope: number;
-  defaultEntityPresetCode: string | null;
-  defaultDatePresetCode: string | null;
-  defaultVariableCode: string | null;
+  entityPresetCode: string | null;
+  datePresetCode: string | null;
+  variableCode: string | null;
   defaultDatePresets: DashboardDatePresetInfosDTO[];
   defaultEntityPresets: DashboardEntityPresetInfosDTO[];
   defaultVariables: DashboardVariableInfosDTO[];
@@ -132,9 +111,6 @@ export interface UpdateDashboardShallowDTO {
   colors: string[];
   icon: string;
   tags: string[];
-  overrideEntityPresetCode: string | null;
-  overrideDatePresetCode: string | null;
-  overrideVariableCode: string | null;
   overrideDatePresets: CreateDashboardShallowDatePresetDTO[];
   overrideEntityPresets: CreateDashboardShallowEntityPresetDTO[];
   overrideVariables: CreateDashboardShallowVariableDTO[];

package/models/dashboardVariables/dashboardVariableDetails.ts

@@ -7,6 +7,7 @@ export interface CreateDashboardVariableDTO {
   hiddenCode: string;
   variableType: DashboardVariableType;
   labelDefault: string;
+  showInOptions: boolean;
   code: string;
   value: string;
   useOnlyAllowedValues: boolean;

package/models/dashboardVariables/dashboardVariableInfos.ts

@@ -9,6 +9,7 @@ export class DashboardVariableInfos {
   hiddenCode: string;
   variableType: DashboardVariableType;
   labelDefault: string;
+  showInOptions: boolean;
   code: string;
   value: string;
   useOnlyAllowedValues: boolean;
@@ -23,6 +24,7 @@ export class DashboardVariableInfos {
     this.hiddenCode = params.hiddenCode;
     this.variableType = params.variableType;
     this.labelDefault = params.labelDefault;
+    this.showInOptions = params.showInOptions;
     this.code = params.code;
     this.value = params.value;
     this.useOnlyAllowedValues = params.useOnlyAllowedValues;
@@ -35,6 +37,7 @@ export interface DashboardVariableInfosDTO {
   hiddenCode: string;
   variableType: DashboardVariableType;
   labelDefault: string;
+  showInOptions: boolean;
   code: string;
   value: string;
   useOnlyAllowedValues: boolean;

package/models/deviceDataDefinitions/deviceDataDefinitionInfos.ts

@@ -0,0 +1,39 @@
+import { isoToEpoch } from "@dative-gpi/foundation-shared-domain/tools";
+
+export class DeviceDataDefinitionInfos {
+  id: string;
+  deviceId: string;
+  dataDefinitionId: string;
+  dataDefinitionCode: string;
+  dataDefinitionLabel: string;
+  dataCategoryCode: string;
+  dataCategoryLabel: string;
+  timestamp: number;
+
+  constructor(params: DeviceDataDefinitionInfosDTO) {
+    this.id = params.id;
+    this.deviceId = params.deviceId;
+    this.dataDefinitionId = params.dataDefinitionId;
+    this.dataDefinitionCode = params.dataDefinitionCode;
+    this.dataDefinitionLabel = params.dataDefinitionLabel;
+    this.dataCategoryCode = params.dataCategoryCode;
+    this.dataCategoryLabel = params.dataCategoryLabel;
+    this.timestamp = isoToEpoch(params.timestamp);
+  }
+}
+
+export interface DeviceDataDefinitionInfosDTO {
+  id: string;
+  deviceId: string;
+  dataDefinitionId: string;
+  dataDefinitionCode: string;
+  dataDefinitionLabel: string;
+  dataCategoryCode: string;
+  dataCategoryLabel: string;
+  timestamp: string;
+}
+
+export interface DeviceDataDefinitionFilters {
+  devicesIds?: string[];
+  deviceId?: string;
+}

package/models/deviceDataDefinitions/index.ts

@@ -0,0 +1 @@
+export * from "./deviceDataDefinitionInfos";

package/models/deviceOrganisations/deviceOrganisationDetails.ts

@@ -1,3 +1,4 @@
+import type { AddressDTO } from "@dative-gpi/foundation-shared-domain/models";
 import type { DeviceOrganisationOptionDTO } from "./deviceOrganisationOption";
 import { DeviceOrganisationOption } from "./deviceOrganisationOption";
 import type { DeviceOrganisationInfosDTO } from "./deviceOrganisationInfos";
@@ -35,6 +36,7 @@ export interface CreateDeviceOrganisationDTO {
     manufacturerId: string;
     managerId: string | null;
     locationId: string | null;
+    address: AddressDTO | null;
     groupId: string | null;
     code: string;
     label: string;
@@ -46,6 +48,7 @@ export interface CreateDeviceOrganisationDTO {
 export interface UpdateDeviceOrganisationDTO {
     managerId: string | null;
     locationId: string | null;
+    address: AddressDTO | null;
     groupId: string | null;
     imageId: string | null;
     image: string | null;

package/models/deviceOrganisations/deviceOrganisationInfos.ts

@@ -2,6 +2,7 @@ import { DeviceConnectivityDetails, type DeviceConnectivityDetailsDTO } from "..
 import { DeviceStatusDetails, type DeviceStatusDetailsDTO } from "../deviceStatuses/deviceStatusDetails";
 import { DeviceOrganisationAlert, type DeviceOrganisationAlertDTO } from "./deviceOrganisationAlert";
 import { ModelStatusInfos, type ModelStatusInfosDTO } from "../modelStatuses/modelStatusInfos";
+import { Address, type AddressDTO } from "@dative-gpi/foundation-shared-domain/models";
 import { PathCrumb, type PathCrumbDTO } from "../shared/pathCrumb";
 
 export class DeviceOrganisationInfos {
@@ -9,6 +10,7 @@ export class DeviceOrganisationInfos {
   deviceId: string;
   manufacturerId: string;
   manufacturerLabel: string;
+  address: Address;
   articleId: string;
   articleLabel: string;
   modelId: string;
@@ -44,6 +46,7 @@ export class DeviceOrganisationInfos {
     this.deviceId = params.deviceId;
     this.manufacturerId = params.manufacturerId;
     this.manufacturerLabel = params.manufacturerLabel;
+    this.address = new Address(params.address);
     this.articleId = params.articleId;
     this.articleLabel = params.articleLabel;
     this.modelId = params.modelId;
@@ -82,6 +85,7 @@ export interface DeviceOrganisationInfosDTO {
   deviceId: string;
   manufacturerId: string;
   manufacturerLabel: string;
+  address: AddressDTO;
   articleId: string;
   articleLabel: string;
   modelId: string;

package/models/index.ts

@@ -25,10 +25,10 @@ export * from "./dataCategories";
 export * from "./dataDefinitions";
 export * from "./dataDefinitionMappings";               // No service
 export * from "./deviceConnectivities";
+export * from "./deviceDataDefinitions";
 export * from "./deviceExplorerElements";
 export * from "./deviceOrganisations";
 export * from "./deviceStatuses";
-export * from "./extensionApplications";
 export * from "./folders";
 export * from "./groups";
 export * from "./locations";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-domain",
   "sideEffects": false,
-  "version": "1.0.129",
+  "version": "1.0.130-maps2",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.129",
-    "@dative-gpi/foundation-shared-services": "1.0.129"
+    "@dative-gpi/foundation-shared-domain": "1.0.130-maps2",
+    "@dative-gpi/foundation-shared-services": "1.0.130-maps2"
   },
-  "gitHead": "73ebbdb8cfd158e2748933ec57315bc1b5fc4835"
+  "gitHead": "a0739b48282166f721cf6c2376a430e4690d92ef"
 }

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";