@dative-gpi/foundation-shared-domain 1.0.128-fix-mobile → 1.0.128-mountain-alpha

package/models/applications/applicationDetails.ts

@@ -1,5 +1,7 @@
-import { LanguageInfos, type LanguageInfosDTO } from "../languages/languageInfos";
-import { ApplicationInfos, type ApplicationInfosDTO } from "./applicationInfos";
+import type { LanguageInfosDTO } from "../languages/languageInfos";
+import { LanguageInfos } from "../languages/languageInfos";
+import type { ApplicationInfosDTO } from "./applicationInfos";
+import { ApplicationInfos } from "./applicationInfos";
 
 export class ApplicationDetails extends ApplicationInfos {
     languages: LanguageInfos[];

package/models/authTokens/authTokenInfos.ts

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

package/models/images/imageDetails.ts

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

package/models/languages/languageDetails.ts

@@ -1,4 +1,5 @@
-import { LanguageInfos, type LanguageInfosDTO } from "./languageInfos";
+import type { LanguageInfosDTO } from "./languageInfos";
+import { LanguageInfos } from "./languageInfos";
 
 export class LanguageDetails extends LanguageInfos {
     constructor(params: LanguageDetailsDTO) {

package/models/notifications/notificationInfos.ts

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

package/models/organisationTypes/organisationTypeDetails.ts

@@ -1,5 +1,6 @@
-import { OrganisationTypeInfos, type OrganisationTypeInfosDTO } from "./organisationTypeInfos";
-import { type DashboardType } from "../../enums/dashboards";
+import type { OrganisationTypeInfosDTO } from "./organisationTypeInfos";
+import { OrganisationTypeInfos } from "./organisationTypeInfos";
+import type { DashboardType } from "../../enums/dashboards";
 
 export class OrganisationTypeDetails extends OrganisationTypeInfos {
     description: string;

package/models/organisations/organisationDetails.ts

@@ -1,6 +1,8 @@
-import { PermissionInfos, type PermissionInfosDTO } from "../permissions/permissionInfos";
-import { OrganisationInfos, type OrganisationInfosDTO } from "./organisationInfos";
-import { type DashboardType } from "../../enums/dashboards";
+import type { PermissionInfosDTO } from "../permissions/permissionInfos";
+import { PermissionInfos } from "../permissions/permissionInfos";
+import type { OrganisationInfosDTO } from "./organisationInfos";
+import { OrganisationInfos } from "./organisationInfos";
+import type { DashboardType } from "../../enums/dashboards";
 
 export class OrganisationDetails extends OrganisationInfos {
     code: string;

package/models/permissions/permissionDetails.ts

@@ -1,4 +1,5 @@
-import { PermissionInfos, type PermissionInfosDTO } from "./permissionInfos";
+import type { PermissionInfosDTO } from "./permissionInfos";
+import { PermissionInfos } from "./permissionInfos";
 
 export class PermissionDetails extends PermissionInfos {
     constructor(params: PermissionDetailsDTO) {

package/models/terminals/terminalInfos.ts

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

package/models/timeZones/timeZoneDetails.ts

@@ -1,4 +1,5 @@
-import { TimeZoneInfos, type TimeZoneInfosDTO } from "./timeZoneInfos";
+import type { TimeZoneInfosDTO } from "./timeZoneInfos";
+import { TimeZoneInfos } from "./timeZoneInfos";
 
 export class TimeZoneDetails extends TimeZoneInfos {
     constructor(params: TimeZoneDetailsDTO) {

package/models/translations/translationDetails.ts

@@ -1,4 +1,5 @@
-import { TranslationInfos, type TranslationInfosDTO } from "./translationInfos";
+import type { TranslationInfosDTO } from "./translationInfos";
+import { TranslationInfos } from "./translationInfos";
 
 export class TranslationDetails extends TranslationInfos {
     constructor(params: TranslationDetailsDTO) {

package/models/users/userDetails.ts

@@ -1,4 +1,5 @@
-import { UserInfos, type UserInfosDTO } from "./userInfos";
+import type { UserInfosDTO } from "./userInfos";
+import { UserInfos } from "./userInfos";
 
 export class UserDetails extends UserInfos {
     adminAccess: boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-domain",
   "sideEffects": false,
-  "version": "1.0.128-fix-mobile",
+  "version": "1.0.128-mountain-alpha",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -12,5 +12,5 @@
   "peerDependencies": {
     "date-fns": "^3.6.0"
   },
-  "gitHead": "099789bb7c9a4134f9ee0aba08d805b673cbb977"
+  "gitHead": "37cef6036141cc79839c97f8ffc124c024e5486a"
 }

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/deviceExplorerElements.ts

@@ -0,0 +1,34 @@
+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/index.ts

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

package/tools/notificationsTools.ts

@@ -0,0 +1,39 @@
+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);