@dative-gpi/foundation-core-domain 1.0.26 → 1.0.28-remove-deprecated2

package/models/serviceAccountOrganisations/serviceAccountOrganisationInfos.ts

@@ -1,11 +1,9 @@
-import type { UserType, UserValidityState } from "../enums/userEnums";
-import type { RoleType } from "../enums/roleEnums";
+import { type UserType, type UserValidityState } from "@dative-gpi/foundation-shared-domain/enums";
 
 export class ServiceAccountOrganisationInfos {
   id: string;
   userId: string;
   organisationId: string;
-  roleType: RoleType;
   roleId: string | null;
   roleLabel: string;
   roleIcon: string;
@@ -20,7 +18,6 @@ export class ServiceAccountOrganisationInfos {
     this.id = params.id;
     this.userId = params.userId;
     this.organisationId = params.organisationId;
-    this.roleType = params.roleType;
     this.roleId = params.roleId;
     this.roleLabel = params.roleLabel;
     this.roleIcon = params.roleIcon;
@@ -37,7 +34,6 @@ export interface ServiceAccountOrganisationInfosDTO {
   id: string;
   userId: string;
   organisationId: string;
-  roleType: RoleType;
   roleId: string | null;
   roleLabel: string;
   roleIcon: string;

package/models/serviceAccountRoleOrganisations/index.ts

@@ -0,0 +1,2 @@
+export * from "./serviceAccountRoleOrganisationDetails";
+export * from "./serviceAccountRoleOrganisationInfos";

package/models/serviceAccountRoleOrganisations/serviceAccountRoleOrganisationDetails.ts

@@ -0,0 +1,33 @@
+import { ServiceAccountRoleOrganisationInfos, type ServiceAccountRoleOrganisationInfosDTO } from "./serviceAccountRoleOrganisationInfos";
+
+export class ServiceAccountRoleOrganisationDetails extends ServiceAccountRoleOrganisationInfos {
+  description: string;
+
+  constructor(params: ServiceAccountRoleOrganisationDetailsDTO) {
+    super(params);
+
+    this.description = params.description;
+  }
+}
+
+export interface ServiceAccountRoleOrganisationDetailsDTO extends ServiceAccountRoleOrganisationInfosDTO {
+  description: string;
+}
+
+export interface CreateServiceAccountRoleOrganisationDTO {
+  roleTemplateId: string | null;
+  icon: string;
+  code: string;
+  label: string;
+  description: string;
+  tags: string[];
+}
+
+export interface UpdateServiceAccountRoleOrganisationDTO {
+  icon: string;
+  code: string;
+  label: string;
+  description: string;
+  tags: string[];
+  permissionsIds: string[];
+}

package/models/serviceAccountRoleOrganisations/serviceAccountRoleOrganisationInfos.ts

@@ -0,0 +1,42 @@
+import { PermissionInfos, type PermissionInfosDTO } from "@dative-gpi/foundation-shared-domain/models";
+import { type UserType } from "@dative-gpi/foundation-shared-domain/enums";
+
+export class ServiceAccountRoleOrganisationInfos {
+  id: string;
+  roleId: string;
+  organisationId: string;
+  userType: UserType
+  icon: string;
+  code: string;
+  label: string;
+  tags: string[];
+  permissions: PermissionInfos[];
+
+  constructor(params: ServiceAccountRoleOrganisationInfosDTO) {
+    this.id = params.id;
+    this.roleId = params.roleId;
+    this.organisationId = params.organisationId;
+    this.userType = params.userType;
+    this.icon = params.icon;
+    this.code = params.code;
+    this.label = params.label;
+    this.tags = params.tags.slice();
+    this.permissions = params.permissions.map(dto => new PermissionInfos(dto));
+  }
+}
+
+export interface ServiceAccountRoleOrganisationInfosDTO {
+  id: string;
+  roleId: string;
+  organisationId: string;
+  userType: UserType
+  icon: string;
+  code: string;
+  label: string;
+  tags: string[];
+  permissions: PermissionInfosDTO[];
+}
+
+export interface ServiceAccountRoleOrganisationFilters {
+  search?: string | null;
+}

package/models/shared/timeRange.ts

@@ -1,4 +1,4 @@
-import type { Days } from "@dative-gpi/foundation-shared-domain/models";
+import type { Days, DateType } from "@dative-gpi/foundation-shared-domain/enums";
 
 export class TimeRange {
   startDay: Days;
@@ -7,6 +7,7 @@ export class TimeRange {
   endDay: Days;
   endHour: number;
   endMinute: number;
+  variant: DateType;
 
   constructor(params: TimeRangeDTO) {
     this.startDay = params.startDay;
@@ -15,6 +16,7 @@ export class TimeRange {
     this.endDay = params.endDay;
     this.endHour = params.endHour;
     this.endMinute = params.endMinute;
+    this.variant = params.variant;
   }
 }
 
@@ -25,6 +27,7 @@ export interface TimeRangeDTO {
   endDay: Days;
   endHour: number;
   endMinute: number;
+  variant: DateType;
 }
 
 export interface CreateTimeRangeDTO {
@@ -34,4 +37,5 @@ export interface CreateTimeRangeDTO {
   endDay: Days;
   endHour: number;
   endMinute: number;
+  variant: DateType;
 }

package/models/userOrganisationTables/userOrganisationTableInfos.ts

@@ -7,7 +7,7 @@ export class UserOrganisationTableInfos {
     columns: UserOrganisationColumnInfos[];
 
     // Depends on [OrganisationType, UserOrganisation]
-    mode: "table" | "iterator";
+    mode: "table" | "iterator" | null;
     rowsPerPage: -1 | 10 | 30;
     sortByKey: string | null;
     sortByOrder: "asc" | "desc" | null;
@@ -26,7 +26,7 @@ export class UserOrganisationTableInfos {
 export interface UserOrganisationTableInfosDTO {
     id: string;
     code: string;
-    mode: "table" | "iterator";
+    mode: "table" | "iterator" | null;
     rowsPerPage: -1 | 10 | 30;
     sortByKey: string | null;
     sortByOrder: "asc" | "desc" | null;

package/models/userOrganisations/userOrganisationDetails.ts

@@ -1,9 +1,9 @@
-import type { DashboardType, PermissionInfosDTO } from "@dative-gpi/foundation-shared-domain/models";
+import type { DashboardType, RoleType } from "@dative-gpi/foundation-shared-domain/enums";
+import type { PermissionInfosDTO } from "@dative-gpi/foundation-shared-domain/models";
 import { PermissionInfos } from "@dative-gpi/foundation-shared-domain/models";
 
 import type { UserOrganisationInfosDTO } from "./userOrganisationInfos";
 import { UserOrganisationInfos } from "./userOrganisationInfos";
-import type { RoleType } from "../enums/roleEnums";
 
 export class UserOrganisationDetails extends UserOrganisationInfos {
     mainDashboardType: DashboardType;

package/models/userOrganisations/userOrganisationInfos.ts

@@ -1,5 +1,5 @@
-import type { UserType, UserValidityState } from "../enums/userEnums";
-import type { RoleType } from "../enums/roleEnums";
+import type { UserType, UserValidityState } from "@dative-gpi/foundation-shared-domain/enums";
+import type { RoleType } from "@dative-gpi/foundation-shared-domain/enums";
 
 export class UserOrganisationInfos {
   id: string;
@@ -72,5 +72,6 @@ export interface UserOrganisationInfosDTO {
 
 export interface UserOrganisationFilters {
   userId?: string | null;
+  userOrganisationsIds?: string[] | null;
   search?: string | null;
 }

package/models/widgetTemplates/widgetTemplateInfos.ts

@@ -1,4 +1,18 @@
-import type { WidgetCategory } from "@dative-gpi/foundation-shared-domain/models";
+import _ from "lodash";
+import type { WidgetCategory } from "@dative-gpi/foundation-shared-domain/enums";
+
+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 WidgetTemplateInfos {
     id: string;
@@ -20,7 +34,7 @@ export class WidgetTemplateInfos {
         this.category = params.category;
         this.defaultWidth = params.defaultWidth;
         this.defaultHeight = params.defaultHeight;
-        this.defaultMeta = params.defaultMeta;
+        this.defaultMeta = clean(params.defaultMeta);
     }
 }
   

package/models/widgets/widgetInfos.ts

@@ -1,7 +1,21 @@
+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 WidgetInfos {
     id: string;
     templateId: string;
-    code: string;
     hideBorders: boolean;
     width: number;
     height: number;
@@ -13,21 +27,19 @@ export class WidgetInfos {
     constructor(params: WidgetInfosDTO) {
         this.id = params.id;
         this.templateId = params.templateId;
-        this.code = params.code;
         this.hideBorders = params.hideBorders;
         this.width = params.width;
         this.height = params.height;
         this.x = params.x;
         this.y = params.y;
         this.targetScreenSize = params.targetScreenSize;
-        this.meta = { ...params.meta };
+        this.meta = clean(params.meta);
     }
 }
   
 export interface WidgetInfosDTO {
     id: string;
     templateId: string;
-    code: string;
     hideBorders: boolean;
     width: number;
     height: number;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-domain",
   "sideEffects": false,
-  "version": "1.0.26",
+  "version": "1.0.28-remove-deprecated2",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.26",
-    "@dative-gpi/foundation-shared-services": "1.0.26"
+    "@dative-gpi/foundation-shared-domain": "1.0.28-remove-deprecated2",
+    "@dative-gpi/foundation-shared-services": "1.0.28-remove-deprecated2"
   },
-  "gitHead": "55c73ec6624ef58f78303ce68256236984c83ca9"
+  "gitHead": "65c182fd697939a07ad87c683a2f4c2fb765a7c7"
 }

package/models/enums/actionEnums.ts

@@ -1,6 +0,0 @@
-export enum ActionType {
-    None       = 0,
-    OpenDrawer = 1,
-    OpenTabs   = 2,
-    NavigateTo = 3
-}

package/models/enums/applicationEnums.ts

@@ -1,8 +0,0 @@
-export enum ApplicationScope {
-  None             = 0,
-  OrganisationType = 1,
-  Organisation     = 2,
-  Group            = 11,
-  Scenario         = 12,
-  Report           = 13
-}

package/models/enums/chartEnums.ts

@@ -1,109 +0,0 @@
-export enum ChartOrigin {
-  None             = 0,
-  Organisation     = 1,
-  OrganisationType = 2
-}
-
-export enum ChartType {
-  None      = 0,
-  XY        = 1,
-  Pie       = 2,
-  Heatmap   = 3,
-  Slider    = 4,
-  Gauge     = 5,
-  ScoreCard = 6,
-  Table     = 7
-}
-
-export enum ColorSets {
-  Default              = 0,
-  Grafana              = 1,
-  Kelly                = 2,
-  Armytage             = 3,
-  ZeileisHornikMurrell = 4,
-  Hash                 = 5
-}
-
-export enum AxisType {
-  None     = 0,
-  Date     = 1,
-  Value    = 2,
-  Category = 3
-}
-
-export enum SerieType {
-  None        = 0,
-  Lines       = 1,
-  Area        = 2,
-  Range       = 3,
-  Histogram   = 4,
-  Operation   = 5,
-  Planning    = 6,
-  ScatterPlot = 7,
-  Top         = 8,
-  Bars        = 9,
-  StackedBars = 10,
-  Pie         = 11,
-  Heatmap     = 12,
-  Slider      = 13,
-  Gauge       = 14,
-  ScoreCard   = 15,
-  Table       = 16
-}
-
-export enum PlotPer {
-  None       = 0,
-  SinglePlot = 1,
-  Model      = 2,
-  Group      = 3,
-  Location   = 4,
-  Device     = 5
-}
-
-export enum AggregationType {
-  None       = 0,
-  Sum        = 1,
-  Cardinal   = 2,
-  Mean       = 3,
-  Median     = 4,
-  First      = 5,
-  Last       = 6,
-  Difference = 7,
-  Minimum    = 8,
-  Maximum    = 9,
-  Range      = 10
-}
-
-export enum PlanningType {
-  None        = 0,
-  UntilNext   = 1,
-  ElapsedTime = 2,
-  SinglePoint = 3
-}
-
-export enum DisplayAs {
-  None   = 0,
-  Bars   = 1,
-  Lines  = 2,
-  Points = 3
-}
-
-export enum OperationOn {
-  None               = 0,
-  SameGroup          = 1,
-  SameEntity         = 2,
-  SameGroupAndEntity = 3
-}
-
-export enum HeatmapRule {
-  None     = 0,
-  Gradient = 1,
-  Ranges   = 2,
-  Fixed    = 3
-}
-
-export enum PieBreakdown {
-  Entity = 0,
-  Serie  = 1,
-  Group  = 2
-}

package/models/enums/customPropertyEnums.ts

@@ -1,12 +0,0 @@
-export enum PropertyEntity {
-    Device             = 0,
-    DeviceOrganisation = 1
-  }
-  
-  export enum PropertyDataType {
-    Number   = 0,
-    Boolean  = 1,
-    String   = 2,
-    DateTime = 3,
-    Icon     = 4
-  }

package/models/enums/index.ts

@@ -1,8 +0,0 @@
-export * from "./actionEnums";
-export * from "./applicationEnums";
-export * from "./chartEnums";
-export * from "./customPropertyEnums";
-export * from "./notificationEnums";
-export * from "./roleEnums";
-export * from "./sharedEnums";
-export * from "./userEnums";

package/models/enums/notificationEnums.ts

@@ -1,6 +0,0 @@
-export enum NotificationType {
-  None = 0,
-  CreateAlert = 1,
-  CreateConnectivityAlert = 2,
-  ResolveConnectivityAlert = 3
-}

package/models/enums/roleEnums.ts

@@ -1,5 +0,0 @@
-export enum RoleType {
-    None = 0,
-    Organisation = 1,
-    OrganisationType = 2
-  }

package/models/enums/sharedEnums.ts

@@ -1,27 +0,0 @@
-export enum SelectedEntities {
-  None = 0,
-  Models = 1,
-  Groups = 2,
-  Locations = 3,
-  Devices = 5
-}
-
-export enum FilterType {
-  None        = 0,
-  Equal       = 1,
-  More        = 2,
-  Less        = 3,
-  MoreOrEqual = 4,
-  LessOrEqual = 5,
-  Different   = 6,
-  Contains    = 7,
-  StartsWith  = 8,
-  EndsWith    = 9
-}
-
-export enum DataTable {
-  None     = 0,
-  Number   = 1,
-  String   = 2,
-  DateTime = 3
-}

package/models/enums/userEnums.ts

@@ -1,12 +0,0 @@
-export enum UserType {
-  User = 0,
-  ServiceAccount = 1,
-  Extension = 2
-}
-
-export enum UserValidityState {
-  InvitationNotSent = 0x000,
-  InvitationSent = 0x001,
-  AccountCreated = 0x011,
-  AccountValidated = 0x111
-}

package/models/notifications/index.ts

@@ -1,2 +0,0 @@
-export * from "./notificationDetails";
-export * from "./notificationInfos";

package/models/notifications/notificationDetails.ts

@@ -1,10 +0,0 @@
-import { NotificationInfos, type NotificationInfosDTO } from "./notificationInfos";
-
-export class NotificationDetails extends NotificationInfos {
-  constructor(params: NotificationDetailsDTO) {
-    super(params);
-  }
-}
-
-export interface NotificationDetailsDTO extends NotificationInfosDTO {
-}

package/models/notifications/notificationInfos.ts

@@ -1,43 +0,0 @@
-import { type Criticity } from "@dative-gpi/foundation-shared-domain/models";
-import { utcToEpoch } from "@dative-gpi/foundation-shared-domain/tools";
-
-import { type NotificationType } from "../enums/notificationEnums";
-
-export class NotificationInfos {
-  id: string;
-  title: string;
-  body: string;
-  pageUrl: string;
-  timestamp: number;
-  criticity: Criticity;
-  acknowledged: boolean | null;
-  acknowledgingTimestamp: number | null;
-
-  constructor(params: NotificationInfosDTO) {
-    this.id = params.id;
-    this.title = params.title;
-    this.body = params.body;
-    this.pageUrl = params.pageUrl;
-    this.timestamp = utcToEpoch(params.timestamp);
-    this.criticity = params.criticity as Criticity;
-    this.acknowledged = params.acknowledged;
-    this.acknowledgingTimestamp = params.acknowledgingTimestamp ?
-      utcToEpoch(params.acknowledgingTimestamp) : null;
-  }
-}
-
-export interface NotificationInfosDTO {
-  id: string;
-  title: string;
-  body: string;
-  pageUrl: string;
-  timestamp: string;
-  criticity: number;
-  acknowledged: boolean | null;
-  acknowledgingTimestamp: string | null;
-}
-
-export interface NotificationFilters {
-  type?: NotificationType | null;
-  acknowledged?: boolean | null;
-}

package/models/scenarioDiffusions/index.ts

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

package/models/scenarioDiffusions/scenarioDiffusion.ts

@@ -1,25 +0,0 @@
-export class ScenarioDiffusion {
-    id: string;
-    scenarioId: string;
-    warnDeviceManager: boolean;
-    userOrganisationsIds: string[];
-  
-    constructor(params: ScenarioDiffusionDTO) {
-        this.id = params.id;
-        this.scenarioId = params.scenarioId;
-        this.warnDeviceManager = params.warnDeviceManager;
-        this.userOrganisationsIds = params.userOrganisationsIds.slice();
-    }
-}
-  
-export interface ScenarioDiffusionDTO {
-    id: string;
-    scenarioId: string;
-    warnDeviceManager: boolean;
-    userOrganisationsIds: string[];
-}
-  
-export interface UpdateScenarioDiffusionDTO {
-    warnDeviceManager: boolean;
-    userOrganisationsIds: string[];
-}