@dative-gpi/foundation-core-domain 1.0.139 → 1.0.140-selectable

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

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

package/models/dashboardShallowWidgets/dashboardShallowWidgetInfos.ts

@@ -15,16 +15,16 @@ const clean = <T>(meta: T): T => {
 }
 
 export class DashboardShallowWidgetInfos {
-  widgetId: string;
+  hiddenCode: string;
   meta: { [key: string]: string };
 
   constructor(params: DashboardShallowWidgetInfosDTO) {
-    this.widgetId = params.widgetId;
+    this.hiddenCode = params.hiddenCode;
     this.meta = clean(params.meta);
   }
 }
   
 export interface DashboardShallowWidgetInfosDTO {
-  widgetId: string;
+  hiddenCode: string;
   meta: { [key: string]: string };
 }

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

@@ -35,8 +35,6 @@ export interface CreateDeviceOrganisationDTO {
     manufacturerId: string;
     managerId: string | null;
     locationId: string | null;
-    latitude: number | null;
-    longitude: number | null;
     groupId: string | null;
     code: string;
     label: string;

package/models/index.ts

@@ -38,7 +38,6 @@ export * from "./models";
 export * from "./modelStatuses";                        // No service
 export * from "./organisations";
 export * from "./permissionCategories";
-export * from "./reports";
 export * from "./roleOrganisations";
 export * from "./roleOrganisationTypes";
 export * from "./routes";

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

@@ -1,5 +1,6 @@
 import _ from "lodash";
 import type { WidgetCategory } from "@dative-gpi/foundation-shared-domain/enums";
+import type { WidgetTemplateType } from '@dative-gpi/foundation-shared-domain/enums/widgetTemplates';
 
 const clean = <T>(meta: T): T => {
   const newMeta = _.cloneDeepWith(meta, (value) => {
@@ -16,6 +17,9 @@ const clean = <T>(meta: T): T => {
 
 export class WidgetTemplateInfos {
     id: string;
+    type: WidgetTemplateType;
+    extensionId: string | null;
+    extensionHost: string | null;
     label: string;
     code: string;
     icon: string;
@@ -27,6 +31,9 @@ export class WidgetTemplateInfos {
   
     constructor(params: WidgetTemplateInfosDTO) {
         this.id = params.id;
+        this.type = params.type;
+        this.extensionId = params.extensionId ?? null;
+        this.extensionHost = params.extensionHost ?? null;
         this.label = params.label;
         this.code = params.code;
         this.icon = params.icon;
@@ -40,6 +47,9 @@ export class WidgetTemplateInfos {
   
 export interface WidgetTemplateInfosDTO {
     id: string;
+    type: WidgetTemplateType;
+    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/widgetDetails.ts

@@ -1,3 +1,4 @@
+import type { WidgetTemplateType } from '@dative-gpi/foundation-shared-domain/enums/widgetTemplates';
 import type { WidgetInfosDTO } from "./widgetInfos";
 import { WidgetInfos } from "./widgetInfos";
 
@@ -11,6 +12,8 @@ export interface WidgetDetailsDTO extends WidgetInfosDTO {
 }
 
 export interface CreateWidgetDTO {
+    hiddenCode: string;
+    templateType: WidgetTemplateType;
     templateId: string;
     hideBorders: boolean;
     width: number;

package/models/widgets/widgetInfos.ts

@@ -1,3 +1,4 @@
+import type { WidgetTemplateType } from '@dative-gpi/foundation-shared-domain/enums/widgetTemplates';
 import _ from "lodash";
 
 const clean = <T>(meta: T): T => {
@@ -15,6 +16,8 @@ const clean = <T>(meta: T): T => {
 
 export class WidgetInfos {
     id: string;
+    hiddenCode: string;
+    templateType: WidgetTemplateType;
     templateId: string;
     hideBorders: boolean;
     width: number;
@@ -26,6 +29,8 @@ export class WidgetInfos {
 
     constructor(params: WidgetInfosDTO) {
         this.id = params.id;
+        this.hiddenCode = params.hiddenCode;
+        this.templateType = params.templateType;
         this.templateId = params.templateId;
         this.hideBorders = params.hideBorders;
         this.width = params.width;
@@ -39,6 +44,8 @@ export class WidgetInfos {
   
 export interface WidgetInfosDTO {
     id: string;
+    hiddenCode: string;
+    templateType: WidgetTemplateType;
     templateId: string;
     hideBorders: boolean;
     width: number;

package/models/widgets/widgetInterface.ts

@@ -0,0 +1,15 @@
+import type { WidgetTemplateType } from '@dative-gpi/foundation-shared-domain/enums/widgetTemplates';
+
+export interface Widget {
+  id: string;
+  hiddenCode: string;
+  templateType: WidgetTemplateType;
+  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.139",
+  "version": "1.0.140-selectable",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.139",
-    "@dative-gpi/foundation-shared-services": "1.0.139"
+    "@dative-gpi/foundation-shared-domain": "1.0.140-selectable",
+    "@dative-gpi/foundation-shared-services": "1.0.140-selectable"
   },
-  "gitHead": "e87dd93aeba0c018e180ab8d5764fe997011cea5"
+  "gitHead": "6faaffa554359a3319265c4f25e44a5da901fe20"
 }

package/models/reports/index.ts

@@ -1,4 +0,0 @@
-export * from "./reportDetails";
-export * from "./reportInfos";
-export * from "./reportExecutions";
-export * from "./translationReport";

package/models/reports/reportDetails.ts

@@ -1,39 +0,0 @@
-import type { DashboardType } from "@dative-gpi/foundation-shared-domain/enums";
-import { ReportInfos, type ReportInfosDTO } from "./reportInfos";
-import type { TranslationReportDTO } from "./translationReport";
-
-export class ReportDetails extends ReportInfos {
-
-  constructor(params: ReportDetailsDTO) {
-    super(params);
-  }
-}
-
-export interface ReportDetailsDTO extends ReportInfosDTO {
-}
-
-export interface CreateReportDTO {
-  labelDefault: string;
-  bodyDefault: string;
-  dashboardId: string;
-  startDate: string;
-  endDate: string;
-  dashboardScope: DashboardType;
-  icon: string;
-  cron: string;
-  userIds: string[];
-  translations: TranslationReportDTO[];
-}
-
-export interface UpdateReportDTO {
-  labelDefault: string;
-  bodyDefault: string;
-  dashboardId: string;
-  startDate: string;
-  endDate: string;
-  dashboardScope: DashboardType;
-  icon: string;
-  cron: string;
-  userIds: string[];
-  translations: TranslationReportDTO[];
-}

package/models/reports/reportExecutions.ts

@@ -1,79 +0,0 @@
-import type { DashboardType, JobState } from "@dative-gpi/foundation-shared-domain/enums";
-import { isoToEpoch } from "@dative-gpi/foundation-shared-domain/tools";
-
-import { useDateFormat } from "@dative-gpi/foundation-shared-services/composables";
-
-const { epochToLongDateFormat } = useDateFormat();
-
-export class ReportExecution {
-  id: string | null;
-  reportId: string;
-  jobId: string;
-  fileId: string | null;
-  fileLabel: string | null;
-  reportLabel: string | null;
-  mailBody: string | null;
-  state: JobState;
-  startDate: string;
-  endDate: string;
-  users: string[];
-  dashboardLabel: string;
-  dashboardId: string;
-  dashboardScope: DashboardType;
-  executedAt: number;
-  error: string;
-  cron: string;
-
-  get executedAtGroup(): string {
-    return epochToLongDateFormat(this.executedAt);
-  }
-
-
-  constructor(params: ReportExecutionDTO) {
-    this.id = params.id;
-    this.reportId = params.reportId;
-    this.jobId = params.jobId;
-    this.fileId = params.fileId;
-    this.fileLabel = params.fileLabel;
-    this.reportLabel = params.reportLabel;
-    this.mailBody = params.mailBody
-    this.state = params.state;
-    this.startDate = params.startDate;
-    this.endDate = params.endDate;
-    this.users = params.users;
-    this.dashboardLabel = params.dashboardLabel;
-    this.dashboardId = params.dashboardId;
-    this.dashboardScope = params.dashboardScope;
-    this.executedAt = isoToEpoch(params.executedAt);
-    this.error = params.error;
-    this.cron = params.cron;
-  }
-}
-
-
-export interface ReportExecutionDTO {
-  id: string | null;
-  reportId: string;
-  jobId: string;
-  fileId: string | null;
-  fileLabel: string | null;
-  reportLabel: string | null;
-  mailBody: string | null;
-  state: JobState;
-  success: boolean;
-  startDate: string;
-  endDate: string;
-  users: string[];
-  dashboardLabel: string;
-  dashboardId: string;
-  dashboardScope: DashboardType;
-  executedAt: string;
-  error: string;
-  cron: string;
-}
-
-export interface ReportExecutionFilters {
-  reportId?: string | null;
-  startDate?: string | null;
-  endDate?: string | null;
-}

package/models/reports/reportInfos.ts

@@ -1,71 +0,0 @@
-import type { DashboardType } from "@dative-gpi/foundation-shared-domain/enums";
-import { isoToEpoch } from "@dative-gpi/foundation-shared-domain/tools";
-import { TranslationReport } from "./translationReport";
-
-export class ReportInfos {
-
-  id: string;
-  labelDefault: string;
-  bodyDefault: string;
-  label: string;
-  body: string;
-  cron: string;
-  icon: string;
-  userIds: string[];
-  dashboardId: string;
-  dashboardScope: DashboardType;
-  dashboardLabel: string;
-  startDate: string;
-  endDate: string;
-  createdAt: number | null;
-  nextExecution: number | null;
-  lastExecution: number | null;
-  translations: TranslationReport[];
-
-  constructor(params: ReportInfosDTO) {
-    this.id = params.id;
-    this.labelDefault = params.labelDefault;
-    this.bodyDefault = params.bodyDefault;
-    this.label = params.label;
-    this.body = params.body;
-    this.cron = params.cron;
-    this.icon = params.icon;
-    this.dashboardId = params.dashboardId;
-    this.dashboardScope = params.dashboardScope;
-    this.dashboardLabel = params.dashboardLabel;
-    this.startDate = params.startDate;
-    this.endDate = params.endDate;
-    this.userIds = params.userIds;
-    this.createdAt = params.createdAt ? isoToEpoch(params.createdAt) : null;
-    this.nextExecution = params.nextExecution ? isoToEpoch(params.nextExecution) : null;
-    this.lastExecution = params.lastExecution ? isoToEpoch(params.lastExecution) : null;
-    this.translations = params.translations.map((translation) => new TranslationReport(translation));
-  }
-}
-
-
-export interface ReportInfosDTO {
-  id: string;
-  labelDefault: string;
-  bodyDefault: string;
-  label: string;
-  body: string;
-  cron: string;
-  icon: string;
-  dashboardId: string;
-  dashboardScope: DashboardType;
-  dashboardLabel: string;
-  startDate: string;
-  endDate: string;
-  userIds: string[];
-  createdAt: string | null;
-  nextExecution: string | null;
-  lastExecution: string | null;
-  translations: TranslationReport[];
-}
-
-export interface ReportFilters {
-  search?: string | null;
-  startDate?: string | null;
-  endDate?: string | null;
-}

package/models/reports/translationReport.ts

@@ -1,17 +0,0 @@
-export class TranslationReport {
-  languageCode: string;
-  label: string;
-  body: string;
-
-  constructor(params: TranslationReportDTO) {
-    this.languageCode = params.languageCode;
-    this.label = params.label;
-    this.body = params.body;
-  }
-}
-
-export interface TranslationReportDTO {
-  languageCode: string;
-  label: string;
-  body: string;
-}