@dative-gpi/foundation-shared-domain 1.0.159 → 1.0.161-alert-tile

package/enums/applications.ts

@@ -2,6 +2,7 @@ export enum Scope {
   None = 0,
   Public = 0b1111,
   Application = 0b1000,
+  OrganisationType = 0b10000,
   Organisation = 0b0100,
   User = 0b0010,
   UserOrganisation = 0b0001

package/enums/index.ts

@@ -13,6 +13,7 @@ export * from "./filters";
 export * from "./index";
 export * from "./lists";
 export * from "./messages";
+export * from "./playlists";
 export * from "./roles";
 export * from "./times";
 export * from "./users";

package/enums/playlists.ts

@@ -0,0 +1,5 @@
+export enum VisualisationMode {
+  None = 0,
+  Simple = 1,
+  Presentation = 2
+}

package/models/notifications/index.ts

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

package/models/notifications/notificationAudience.ts

@@ -0,0 +1,20 @@
+import type { Scope } from "../../enums";
+
+export class NotificationAudience {
+  id: string;
+  targetId: string;
+  targetScope: Scope;
+
+
+  constructor(params: NotificationAudienceDTO) {
+    this.id = params.id;
+    this.targetId = params.targetId;
+    this.targetScope = params.targetScope as Scope;
+  }
+}
+
+export interface NotificationAudienceDTO {
+  id: string;
+  targetId: string;
+  targetScope: number;
+}

package/models/notifications/notificationInfos.ts

@@ -1,17 +1,15 @@
 import { type MessageType } from "../../enums/messages";
 import { isoToEpoch } from "../../tools/datesTools";
-import { Scope } from "../../enums/applications";
-import { Criticity } from "../../enums/alerts";
+import type { Criticity } from "../../enums/alerts";
+import { NotificationAudience } from "./notificationAudience";
 
 export class NotificationInfos {
   id: string;
   title: string;
   body: string;
   pageUrl: string;
-  audienceId: string;
-  audienceScope: Scope;
+  audiences: NotificationAudience[];
   organisationId?: string;
-  entityId?: string;
   type: MessageType;
   criticity: Criticity;
   timestamp: number;
@@ -23,10 +21,8 @@ export class NotificationInfos {
     this.title = params.title;
     this.body = params.body;
     this.pageUrl = params.pageUrl;
-    this.audienceId = params.audienceId;
-    this.audienceScope = params.audienceScope as Scope;
+    this.audiences = params.audiences.map((a: NotificationAudience) => new NotificationAudience(a));
     this.organisationId = params.organisationId;
-    this.entityId = params.entityId;
     this.type = params.type as MessageType;
     this.criticity = params.criticity as Criticity;
     this.timestamp = isoToEpoch(params.timestamp);
@@ -34,43 +30,6 @@ export class NotificationInfos {
     this.acknowledgingTimestamp = params.acknowledgingTimestamp ?
       isoToEpoch(params.acknowledgingTimestamp) : null;
   }
-
-  static getFromAudience = (
-    notifications: NotificationInfos[],
-    application: boolean,
-    criticity: Criticity,
-    organisationId?: string | null,
-    userId?: string | null,
-  ): NotificationInfos[] => notifications.filter((n: NotificationInfos) => {
-    if (n.acknowledged) {
-      return false;
-    }
-    if (![Criticity.None, n.criticity].includes(criticity)) {
-      return false;
-    }
-    switch (n.audienceScope) {
-      case Scope.Organisation    :
-      case Scope.UserOrganisation: return organisationId && n.organisationId && n.organisationId === organisationId;
-      case Scope.User            : return userId && n.audienceId === userId;
-      case Scope.Application     :
-      case Scope.Public          : return application;
-  
-    }
-    return false;
-  });
-
-  static getForDrawer = (
-    notifications: NotificationInfos[],
-    organisationId: string,
-    userId: string,
-    criticity: Criticity = Criticity.None
-  ): NotificationInfos[] => NotificationInfos.getFromAudience(notifications, true, criticity, organisationId, userId);
-
-  static getForCard = (
-    notifications: NotificationInfos[],
-    organisationId: string,
-    criticity: Criticity = Criticity.None
-  ): NotificationInfos[] => NotificationInfos.getFromAudience(notifications, false, criticity, organisationId, null);
 }
 
 export interface NotificationInfosDTO {
@@ -78,10 +37,8 @@ export interface NotificationInfosDTO {
   title: string;
   body: string;
   pageUrl: string;
-  audienceId: string;
-  audienceScope: number;
+  audiences: NotificationAudience[];
   organisationId?: string;
-  entityId?: string;
   type: number;
   criticity: number;
   timestamp: string;

package/models/organisations/organisationDetails.ts

@@ -6,21 +6,19 @@ import type { DashboardType } from "../../enums/dashboards";
 
 export class OrganisationDetails extends OrganisationInfos {
     code: string;
-    organisationTypeId: string;
     mainDashboardId: string | null;
     mainDashboardType: DashboardType;
     description: string;
     locationsCount: number;
     groupsCount: number;
     deviceOrganisationsCount: number;
-    alertsCount : number;
+    alertsCount: number;
     permissions: PermissionInfos[];
 
     constructor(params: OrganisationDetailsDTO) {
         super(params);
 
         this.code = params.code;
-        this.organisationTypeId = params.organisationTypeId;
         this.mainDashboardType = params.mainDashboardType;
         this.mainDashboardId = params.mainDashboardId;
         this.description = params.description;
@@ -34,14 +32,13 @@ export class OrganisationDetails extends OrganisationInfos {
 
 export interface OrganisationDetailsDTO extends OrganisationInfosDTO {
     code: string;
-    organisationTypeId: string;
     mainDashboardId: string | null;
     mainDashboardType: DashboardType;
     description: string;
     locationsCount: number;
     groupsCount: number;
     deviceOrganisationsCount: number;
-    alertsCount : number;
+    alertsCount: number;
     permissions: PermissionInfosDTO[];
 }
 

package/models/organisations/organisationInfos.ts

@@ -1,5 +1,6 @@
 export class OrganisationInfos {
     id: string;
+    organisationTypeId: string;
     imageId: string | null;
     label: string;
     userOrganisationsCount: number;
@@ -8,6 +9,7 @@ export class OrganisationInfos {
 
     constructor(params: OrganisationInfosDTO) {
         this.id = params.id;
+        this.organisationTypeId = params.organisationTypeId;
         this.imageId = params.imageId;
         this.label = params.label;
         this.userOrganisationsCount = params.userOrganisationsCount;
@@ -18,6 +20,7 @@ export class OrganisationInfos {
 
 export interface OrganisationInfosDTO {
     id: string;
+    organisationTypeId: string;
     imageId: string | null;
     label: string;
     userOrganisationsCount: number;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-domain",
   "sideEffects": false,
-  "version": "1.0.159",
+  "version": "1.0.161-alert-tile",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -12,5 +12,5 @@
   "peerDependencies": {
     "date-fns": "^3.6.0"
   },
-  "gitHead": "6dc1450ba15bca7f6d032595ee08eb51eedca25b"
+  "gitHead": "21e74ffda11147c0413a3424fe0df561560bcab3"
 }