@dative-gpi/foundation-shared-domain 1.0.128 → 1.0.130-maps2

package/models/authTokens/authTokenInfos.ts

@@ -1,4 +1,4 @@
-import { isoToEpoch } from "../../tools";
+import { isoToEpoch } from "../../tools/datesTools";
 
 export class AuthTokenInfos {
   id: string;

package/models/images/imageDetails.ts

@@ -1,7 +1,6 @@
 import { ImageInfos, type ImageInfosDTO } from "./imageInfos";
 
 export class ImageDetails extends ImageInfos {
-
     constructor(params: ImageDetailsDTO) {
         super(params);
     }

package/models/notifications/notificationInfos.ts

@@ -1,5 +1,7 @@
-import { type Criticity, type MessageType, type Scope } from "@dative-gpi/foundation-shared-domain/enums";
-import { isoToEpoch } from "@dative-gpi/foundation-shared-domain/tools";
+import { type MessageType } from "../../enums/messages";
+import { isoToEpoch } from "../../tools/datesTools";
+import { Scope } from "../../enums/applications";
+import { Criticity } from "../../enums/alerts";
 
 export class NotificationInfos {
   id: string;
@@ -32,6 +34,43 @@ 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 {

package/models/terminals/terminalInfos.ts

@@ -1,4 +1,4 @@
-import { isoToEpoch } from "../../tools";
+import { isoToEpoch } from "../../tools/datesTools";
 
 export class TerminalInfos {
   id: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-domain",
   "sideEffects": false,
-  "version": "1.0.128",
+  "version": "1.0.130-maps2",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -12,5 +12,5 @@
   "peerDependencies": {
     "date-fns": "^3.6.0"
   },
-  "gitHead": "ca2de0b5abd0fb4f1fdfaafbc4267182ab609336"
+  "gitHead": "a0739b48282166f721cf6c2376a430e4690d92ef"
 }

package/tools/datesTools.ts

@@ -7,6 +7,10 @@ export const OPTIONS: { [key: string]: Intl.DateTimeFormatOptions } = {
     day: "2-digit",
     month: "long"
   },
+  dayMonthShortOnly: {
+    day: "2-digit",
+    month: "2-digit"
+  },
   shortDate: {
     day: "2-digit",
     month: "2-digit",
@@ -18,6 +22,12 @@ export const OPTIONS: { [key: string]: Intl.DateTimeFormatOptions } = {
     month: "long",
     year: "numeric"
   },
+  monthShortTime: {
+    day: "2-digit",
+    month: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit"
+  },
   shortTime: {
     day: "2-digit",
     month: "2-digit",

package/tools/index.ts

@@ -1,6 +1,4 @@
 export * from "./autoRefresh";
 export * from "./datesTools";
-export * from "./deviceExplorerElements";
 export * from "./enumTools";
-export * from "./notificationsTools";
 export * from "./single";

package/tools/deviceExplorerElements.ts

@@ -1,34 +0,0 @@
-import { type DeviceExplorerElementInfos, type DeviceOrganisationInfos, type GroupInfos } from "@dative-gpi/foundation-core-domain/models";
-
-import { DeviceExplorerElementType } from "../enums";
-
-export const fromDeviceOrganisation = (deviceOrganisation: DeviceOrganisationInfos): DeviceExplorerElementInfos => ({
-  ...deviceOrganisation,
-  type: DeviceExplorerElementType.DeviceOrganisation,
-  parentId: deviceOrganisation.groupId,
-  icon: null,
-  groupsIds: null,
-  deviceOrganisationsIds: null,
-  modelsIds: null,
-  recursiveGroupsIds: null,
-  recursiveDeviceOrganisationsIds: null,
-  recursiveModelsIds: null
-});
-
-export const fromGroup = (group: GroupInfos): DeviceExplorerElementInfos => ({
-  ...group,
-  type: DeviceExplorerElementType.Group,
-  manufacturerLabel: null,
-  articleLabel:  null,
-  modelLabel: null,
-  ownerLabel: null,
-  managerName: null,
-  unrestricted: null,
-  online: null,
-  meta: null,
-  modelStatuses: null,
-  status: null,
-  connectivity: null,
-  alerts: null,
-  worstAlert: null
-});

package/tools/notificationsTools.ts

@@ -1,39 +0,0 @@
-import { type NotificationInfos } from "../models";
-import { Criticity, Scope } from "../enums";
-
-export const 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;
-});
-
-export const getForDrawer = (
-  notifications: NotificationInfos[],
-  organisationId: string,
-  userId: string,
-  criticity: Criticity = Criticity.None
-): NotificationInfos[] => getFromAudience(notifications, true, criticity, organisationId, userId);
-
-export const getForCard = (
-  notifications: NotificationInfos[],
-  organisationId: string,
-  criticity: Criticity = Criticity.None
-): NotificationInfos[] => getFromAudience(notifications, false, criticity, organisationId, null);