@dative-gpi/foundation-core-domain 1.0.137 → 1.0.139-auth-token

package/models/alerts/alertInfos.ts

@@ -16,6 +16,8 @@ export class AlertInfos {
   deviceOrganisationImageId: string | null;
   deviceOrganisationCode: string;
   deviceOrganisationLabel: string;
+  deviceOrganisationLocationLabel: string | null;
+  deviceOrganisationOwnerLabel: string | null;
   icon: string;
   code: string;
   label: string;
@@ -48,6 +50,8 @@ export class AlertInfos {
     this.deviceOrganisationImageId = params.deviceOrganisationImageId;
     this.deviceOrganisationCode = params.deviceOrganisationCode;
     this.deviceOrganisationLabel = params.deviceOrganisationLabel;
+    this.deviceOrganisationLocationLabel = params.deviceOrganisationLocationLabel;
+    this.deviceOrganisationOwnerLabel = params.deviceOrganisationOwnerLabel;
     this.icon = params.icon;
     this.code = params.code;
     this.label = params.label;
@@ -89,6 +93,8 @@ export interface AlertInfosDTO {
   deviceOrganisationImageId: string | null;
   deviceOrganisationCode: string;
   deviceOrganisationLabel: string;
+  deviceOrganisationLocationLabel: string | null;
+  deviceOrganisationOwnerLabel: string | null;
   icon: string;
   code: string;
   label: string;

package/models/dashboardShallowWidgets/dashboardShallowWidgetDetails.ts

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

package/models/dashboardShallowWidgets/dashboardShallowWidgetInfos.ts

@@ -0,0 +1,30 @@
+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

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

package/models/dashboardShallows/dashboardShallowDetails.ts

@@ -1,42 +1,32 @@
-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";
-
+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";
 
 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 => {
@@ -59,17 +49,24 @@ 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;
@@ -77,6 +74,7 @@ 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));
   }
 }
 
@@ -86,6 +84,7 @@ export interface DashboardShallowDetailsDTO extends DashboardShallowInfosDTO {
   overrideDatePresets: DashboardShallowDatePresetInfosDTO[];
   overrideEntityPresets: DashboardShallowEntityPresetInfosDTO[];
   overrideVariables: DashboardShallowVariableInfosDTO[];
+  overrideWidgets: DashboardShallowWidgetInfosDTO[];
   translations: DashboardTranslationDTO[];
   dashboardId: string;
   scope: number;
@@ -95,7 +94,7 @@ export interface DashboardShallowDetailsDTO extends DashboardShallowInfosDTO {
   defaultDatePresets: DashboardDatePresetInfosDTO[];
   defaultEntityPresets: DashboardEntityPresetInfosDTO[];
   defaultVariables: DashboardVariableInfosDTO[];
-  widgets: WidgetInfosDTO[];
+  defaultWidgets: WidgetInfosDTO[];
 }
 
 export interface CreateDashboardShallowDTO {
@@ -114,6 +113,7 @@ export interface UpdateDashboardShallowDTO {
   overrideDatePresets: CreateDashboardShallowDatePresetDTO[];
   overrideEntityPresets: CreateDashboardShallowEntityPresetDTO[];
   overrideVariables: CreateDashboardShallowVariableDTO[];
+  overrideWidgets: CreateDashboardShallowWidgetDTO[];
   translations: DashboardTranslationDTO[];
 }
 

package/models/dashboards/dashboardSettings.ts

@@ -0,0 +1,22 @@
+import type { ApplicationScope } from "@dative-gpi/foundation-shared-domain/enums";
+import type { CreateDashboardDatePresetDTO, CreateDashboardEntityPresetDTO, CreateDashboardVariableDTO, DashboardTranslationDTO } from "@dative-gpi/foundation-core-domain/models";
+
+export interface DashboardSettings {
+  folderId: string | null;
+  imageId: string | null;
+  image: string | null;
+  labelDefault: string;
+  locked: boolean;
+  code: string;
+  colors: string[];
+  icon: string;
+  tags: string[];
+  translations: DashboardTranslationDTO[];
+  entityPresetCode: string | null;
+  datePresetCode: string | null;
+  variableCode: string | null;
+  datePresets: CreateDashboardDatePresetDTO[];
+  entityPresets: CreateDashboardEntityPresetDTO[];
+  variables: CreateDashboardVariableDTO[];
+  scope: ApplicationScope;
+}

package/models/dashboards/index.ts

@@ -1,3 +1,4 @@
 export * from "./dashboardDetails";
 export * from "./dashboardInfos";
+export * from "./dashboardSettings";
 export * from "./dashboardTranslation";

package/models/deviceOrganisations/deviceOrganisationDetails.ts

@@ -46,6 +46,8 @@ export interface CreateDeviceOrganisationDTO {
 export interface UpdateDeviceOrganisationDTO {
     managerId: string | null;
     locationId: string | null;
+    latitude: number | null;
+    longitude: number | 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 { type EntityType } from '@dative-gpi/foundation-shared-domain/enums';
 import { PathCrumb, type PathCrumbDTO } from "../shared/pathCrumb";
 
 export class DeviceOrganisationInfos {
@@ -9,6 +10,8 @@ export class DeviceOrganisationInfos {
   deviceId: string;
   manufacturerId: string;
   manufacturerLabel: string;
+  latitude: number | null;
+  longitude: number | null;
   articleId: string;
   articleLabel: string;
   modelId: string;
@@ -44,6 +47,8 @@ export class DeviceOrganisationInfos {
     this.deviceId = params.deviceId;
     this.manufacturerId = params.manufacturerId;
     this.manufacturerLabel = params.manufacturerLabel;
+    this.latitude = params.latitude;
+    this.longitude = params.longitude;
     this.articleId = params.articleId;
     this.articleLabel = params.articleLabel;
     this.modelId = params.modelId;
@@ -82,6 +87,8 @@ export interface DeviceOrganisationInfosDTO {
   deviceId: string;
   manufacturerId: string;
   manufacturerLabel: string;
+  latitude: number | null;
+  longitude: number | null;
   articleId: string;
   articleLabel: string;
   modelId: string;
@@ -124,4 +131,6 @@ export interface DeviceOrganisationFilters {
   deviceOrganisationsIds?: string[] | null;
   otherDeviceOrganisationsIds?: string[] | null;
   search?: string | null;
+  entityType?: EntityType | null;
+  entitiesIds?: string[] | null;
 }

package/models/index.ts

@@ -19,6 +19,7 @@ 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/models/locations/locationInfos.ts

@@ -1,3 +1,4 @@
+import type { EntityType } from '@dative-gpi/foundation-shared-domain/enums';
 import { Address, type AddressDTO } from "@dative-gpi/foundation-shared-domain/models";
 
 export class LocationInfos {
@@ -46,4 +47,6 @@ export interface LocationFilters {
   locationsIds?: string[] | null;
   modelsIds?: string[] | null;
   search?: string | null;
+  entityType?: EntityType | null;
+  entitiesIds?: string[] | null;
 }

package/models/serviceAccountOrganisations/serviceAccountOrganisationDetails.ts

@@ -3,22 +3,15 @@ import { PermissionInfos, type PermissionInfosDTO } from "@dative-gpi/foundation
 import { ServiceAccountOrganisationInfos, type ServiceAccountOrganisationInfosDTO } from "./serviceAccountOrganisationInfos";
 
 export class ServiceAccountOrganisationDetails extends ServiceAccountOrganisationInfos {
-  languageCode: string;
-  timeZoneId: string;
   permissions: PermissionInfos[];
 
   constructor(params: ServiceAccountOrganisationDetailsDTO) {
     super(params);
-    
-    this.languageCode = params.languageCode;
-    this.timeZoneId = params.timeZoneId;
     this.permissions = params.permissions.map(dto => new PermissionInfos(dto));
   }
 }
 
 export interface ServiceAccountOrganisationDetailsDTO extends ServiceAccountOrganisationInfosDTO {
-  languageCode: string;
-  timeZoneId: string;
   permissions: PermissionInfosDTO[];
 }
 

package/models/serviceAccountOrganisations/serviceAccountOrganisationInfos.ts

@@ -4,6 +4,8 @@ export class ServiceAccountOrganisationInfos {
   id: string;
   userId: string;
   organisationId: string;
+  languageCode: string;
+  timeZoneId: string;
   roleId: string | null;
   roleLabel: string;
   roleIcon: string;
@@ -18,6 +20,8 @@ export class ServiceAccountOrganisationInfos {
     this.id = params.id;
     this.userId = params.userId;
     this.organisationId = params.organisationId;
+    this.languageCode = params.languageCode;
+    this.timeZoneId = params.timeZoneId;
     this.roleId = params.roleId;
     this.roleLabel = params.roleLabel;
     this.roleIcon = params.roleIcon;
@@ -34,6 +38,8 @@ export interface ServiceAccountOrganisationInfosDTO {
   id: string;
   userId: string;
   organisationId: string;
+  languageCode: string;
+  timeZoneId: string;
   roleId: string | null;
   roleLabel: string;
   roleIcon: string;

package/models/widgetTemplates/widgetTemplateInfos.ts

@@ -16,6 +16,8 @@ const clean = <T>(meta: T): T => {
 
 export class WidgetTemplateInfos {
     id: string;
+    extensionId: string | null;
+    extensionHost: string | null;
     label: string;
     code: string;
     icon: string;
@@ -27,6 +29,8 @@ export class WidgetTemplateInfos {
   
     constructor(params: WidgetTemplateInfosDTO) {
         this.id = params.id;
+        this.extensionId = params.extensionId ?? null;
+        this.extensionHost = params.extensionHost ?? null;
         this.label = params.label;
         this.code = params.code;
         this.icon = params.icon;
@@ -40,6 +44,8 @@ export class WidgetTemplateInfos {
   
 export interface WidgetTemplateInfosDTO {
     id: string;
+    extensionId?: string;
+    extensionHost?: string;
     label: string;
     code: string;
     icon: string;

package/models/widgets/index.ts

@@ -1,2 +1,3 @@
 export * from "./widgetDetails";
-export * from "./widgetInfos";
+export * from "./widgetInfos";
+export * from "./widgetInterface";

package/models/widgets/widgetInterface.ts

@@ -0,0 +1,11 @@
+export interface Widget {
+  id: string;
+  templateId: string;
+  hideBorders: boolean;
+  width: number;
+  height: number;
+  x: number;
+  y: number;
+  targetScreenSize: "s" | "m" | "l" | "xl";
+  meta: { [key: string]: string };
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-domain",
   "sideEffects": false,
-  "version": "1.0.137",
+  "version": "1.0.139-auth-token",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.137",
-    "@dative-gpi/foundation-shared-services": "1.0.137"
+    "@dative-gpi/foundation-shared-domain": "1.0.139-auth-token",
+    "@dative-gpi/foundation-shared-services": "1.0.139-auth-token"
   },
-  "gitHead": "676162c4362dd556d5ef714f7b17a047ad7f2bad"
+  "gitHead": "af9d894b3fa209b796f8466b8545bb1ecc46a399"
 }