@dative-gpi/foundation-shared-domain 1.0.66 → 1.0.67-map-edit

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

@@ -9,7 +9,8 @@ export enum DashboardVariableType {
   None     = 0,
   Number   = 1,
   String   = 2,
-  TimeStep = 3
+  TimeStep = 3,
+  PlotPer  = 4
 }
 
 export enum AutoRefresh {

package/enums/dates.ts

@@ -42,6 +42,12 @@ export enum Days {
   AllDays   = 7
 }
 
+export enum DateType {
+  None  = 0,
+  Local = 1,
+  UTC   = 2
+}
+
 export enum Months {
   None      = 0,
   January   = 1,

package/enums/deviceExplorerElements.ts

@@ -0,0 +1,5 @@
+export enum DeviceExplorerElementType {
+  None               = 0,
+  Group              = 1,
+  DeviceOrganisation = 2
+}

package/enums/index.ts

@@ -8,10 +8,14 @@ export * from "./customProperties";
 export * from "./dashboards";
 export * from "./datas";
 export * from "./dates";
+export * from "./deviceExplorerElements";
 export * from "./filters";
 export * from "./index";
 export * from "./lists";
 export * from "./messages";
+export * from "./playlists";
 export * from "./roles";
 export * from "./times";
 export * from "./users";
+export * from "./widgetTemplates";
+export * from "./reports";

package/enums/playlists.ts

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

package/enums/reports.ts

@@ -0,0 +1,5 @@
+export enum JobState {
+  None = 0,
+  Succeeded = 1,
+  Failed = 2,
+}

package/enums/widgetTemplates.ts

@@ -0,0 +1,5 @@
+export enum WidgetTemplateType {
+  None = 0,
+  Foundation = 1,
+  Extension = 2
+}

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

@@ -1,13 +1,15 @@
 export * from "./applications";
 export * from "./authTokens";
 export * from "./images";
-export * from "./languages";          // No service
+export * from "./languages";             // No service
+export * from "./legalInformations";
 export * from "./locations";
 export * from "./notifications";
 export * from "./organisations";
-export * from "./organisationTypes";  // No service
+export * from "./organisationTypes";     // No service
 export * from "./permissions";
 export * from "./terminals";
 export * from "./timeZones";
 export * from "./translations";
+export * from "./userLegalInformations";
 export * from "./users";

package/models/legalInformations/index.ts

@@ -0,0 +1,2 @@
+export * from "./legalInformationDetails";
+export * from "./legalInformationInfos";

package/models/legalInformations/legalInformationDetails.ts

@@ -0,0 +1,10 @@
+import { LegalInformationInfos, type LegalInformationInfosDTO } from "./legalInformationInfos";
+
+export class LegalInformationDetails extends LegalInformationInfos {
+  constructor(params: LegalInformationDetailsDTO) {
+    super(params);
+  }
+}
+
+export interface LegalInformationDetailsDTO extends LegalInformationInfosDTO {
+}

package/models/legalInformations/legalInformationInfos.ts

@@ -0,0 +1,17 @@
+export class LegalInformationInfos {
+  id: string;
+  privacyPolicyId: string;
+  generalConditionsId: string;
+
+  constructor(params: LegalInformationInfosDTO) {
+    this.id = params.id;
+    this.privacyPolicyId = params.privacyPolicyId;
+    this.generalConditionsId = params.generalConditionsId;
+  }
+}
+
+export interface LegalInformationInfosDTO {
+  id: string;
+  privacyPolicyId: string;
+  generalConditionsId: string;
+}

package/models/locations/index.ts

@@ -1,3 +1,2 @@
 export * from "./address";
-export * from "./area";
 export * from "./coordinates";

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,25 @@
+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;
+}
+
+export interface NotificationAudienceFilters {
+  targetScope?: Scope | null;
+  targetId?: string | null;
+}

package/models/notifications/notificationInfos.ts

@@ -1,17 +1,19 @@
-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 type { Criticity } from "../../enums/alerts";
+import { NotificationAudience, type NotificationAudienceFilters } from "./notificationAudience";
 
 export class NotificationInfos {
   id: string;
   title: string;
   body: string;
   pageUrl: string;
-  audienceId: string;
-  audienceScope: Scope;
-  organisationId?: string;
-  entityId?: string;
+  audiences: NotificationAudience[];
   type: MessageType;
   criticity: Criticity;
+  imageId: string | null;
+  icon: string;
+  color: string;
   timestamp: number;
   acknowledged: boolean | null;
   acknowledgingTimestamp: number | null;
@@ -21,10 +23,10 @@ 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.organisationId = params.organisationId;
-    this.entityId = params.entityId;
+    this.imageId = params.imageId;
+    this.icon = params.icon;
+    this.color = params.color;
+    this.audiences = params.audiences.map((a: NotificationAudience) => new NotificationAudience(a));
     this.type = params.type as MessageType;
     this.criticity = params.criticity as Criticity;
     this.timestamp = isoToEpoch(params.timestamp);
@@ -39,10 +41,10 @@ export interface NotificationInfosDTO {
   title: string;
   body: string;
   pageUrl: string;
-  audienceId: string;
-  audienceScope: number;
-  organisationId?: string;
-  entityId?: string;
+  audiences: NotificationAudience[];
+  imageId: string | null;
+  icon: string;
+  color: string;
   type: number;
   criticity: number;
   timestamp: string;
@@ -53,4 +55,5 @@ export interface NotificationInfosDTO {
 export interface NotificationFilters {
   type?: MessageType | null;
   criticity?: Criticity | null;
+  audiences?: NotificationAudienceFilters[] | null;
 }

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,30 +1,36 @@
 export class OrganisationInfos {
-    id: string;
-    imageId: string | null;
-    label: string;
-    userOrganisationsCount: number;
-    adminId: string | null;
-    adminName: string | null;
+  id: string;
+  organisationTypeId: string;
+  imageId: string | null;
+  label: string;
+  userOrganisationsCount: number;
+  adminId: string | null;
+  adminName: string | null;
+  currentUserOrganisationId: string | null;
 
-    constructor(params: OrganisationInfosDTO) {
-        this.id = params.id;
-        this.imageId = params.imageId;
-        this.label = params.label;
-        this.userOrganisationsCount = params.userOrganisationsCount;
-        this.adminId = params.adminId;
-        this.adminName = params.adminName;
-    }
+  constructor(params: OrganisationInfosDTO) {
+    this.id = params.id;
+    this.organisationTypeId = params.organisationTypeId;
+    this.imageId = params.imageId;
+    this.label = params.label;
+    this.userOrganisationsCount = params.userOrganisationsCount;
+    this.adminId = params.adminId;
+    this.adminName = params.adminName;
+    this.currentUserOrganisationId = params.currentUserOrganisationId;
+  }
 }
 
 export interface OrganisationInfosDTO {
-    id: string;
-    imageId: string | null;
-    label: string;
-    userOrganisationsCount: number;
-    adminId: string | null;
-    adminName: string | null;
+  id: string;
+  organisationTypeId: string;
+  imageId: string | null;
+  label: string;
+  userOrganisationsCount: number;
+  adminId: string | null;
+  adminName: string | null;
+  currentUserOrganisationId: string | null;
 }
 
 export interface OrganisationFilters {
-    search?: string | null;
+  search?: string | null;
 }

package/models/terminals/terminalInfos.ts

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

package/models/userLegalInformations/index.ts

@@ -0,0 +1,2 @@
+export * from "./userLegalInformationDetails";
+export * from "./userLegalInformationInfos";

package/models/userLegalInformations/userLegalInformationDetails.ts

@@ -0,0 +1,14 @@
+import { UserLegalInformationInfos, type UserLegalInformationInfosDTO } from "./userLegalInformationInfos";
+
+export class UserLegalInformationDetails extends UserLegalInformationInfos {
+  constructor(params: UserLegalInformationDetailsDTO) {
+    super(params);
+  }
+}
+
+export interface UserLegalInformationDetailsDTO extends UserLegalInformationInfosDTO {
+}
+
+export interface CreateUserLegalInformationDTO {
+  legalInformationId: string;
+}

package/models/userLegalInformations/userLegalInformationInfos.ts

@@ -0,0 +1,17 @@
+export class UserLegalInformationInfos {
+    id: string;
+    userId: string;
+    legalInformationId: string;
+
+    constructor(params: UserLegalInformationInfosDTO) {
+        this.id = params.id;
+        this.userId = params.userId;
+        this.legalInformationId = params.legalInformationId;
+    }
+}
+
+export interface UserLegalInformationInfosDTO {
+    id: string;
+    userId: string;
+    legalInformationId: string;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-domain",
   "sideEffects": false,
-  "version": "1.0.66",
+  "version": "1.0.67-map-edit",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -12,5 +12,5 @@
   "peerDependencies": {
     "date-fns": "^3.6.0"
   },
-  "gitHead": "84d2d567d51959856200d302f7972b04bc56675a"
+  "gitHead": "725635256ebf2bb6450c38e5a3077fb907ea550c"
 }

package/tools/aggregationTools.ts

@@ -0,0 +1,45 @@
+import { AggregationType } from '@dative-gpi/foundation-shared-domain/enums';
+
+type ReducerFn = (prev: number, curr: number, index: number, array: number[]) => number;
+
+const reducers: Partial<Record<AggregationType, ReducerFn>> = {
+  [AggregationType.Sum]: (a, b) => a + b,
+  [AggregationType.First]: (a) => a,
+  [AggregationType.Last]: (_, b) => b,
+  [AggregationType.Difference]: (a, b) => b - a,
+  [AggregationType.Maximum]: (a, b) => Math.max(a, b),
+  [AggregationType.Minimum]: (a, b) => Math.min(a, b),
+};
+
+const aggregationFactory = (type: AggregationType): ReducerFn => {
+  const reducer = reducers[type];
+  if (!reducer) {
+    throw new Error(`Aggregation "${type}" must be handled explicitly.`);
+  }
+  return reducer;
+}
+
+export const computeAggregation = (type: AggregationType, values: number[]): number => {
+  if (!values.length) {
+    throw new Error('Cannot aggregate empty array.');
+  }
+
+  switch (type) {
+    case AggregationType.Mean:
+      const sum = values.reduce((a, b) => a + b, 0);
+      return sum / values.length;
+
+    case AggregationType.Median:
+      const sorted = [...values].sort((a, b) => a - b);
+      const mid = Math.floor(sorted.length / 2);
+      return sorted.length % 2 === 0
+        ? (sorted[mid - 1] + sorted[mid]) / 2
+        : sorted[mid];
+
+    case AggregationType.Cardinal:
+      return values.length;
+
+    default:
+      return values.reduce(aggregationFactory(type));
+  }
+}

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

@@ -0,0 +1,5 @@
+export const getEnumEntries = (e: any) => {
+  return Object.keys(e)
+    .filter(key => isNaN(Number(key)))
+    .map(key => ({ key: key, value: e[key] }));
+};

package/tools/index.ts

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

package/models/locations/area.ts

@@ -1,7 +0,0 @@
-import { type Coordinates } from "./coordinates";
-
-export interface FSArea {
-  id: string;
-  color: string;
-  coordinates: Coordinates[];
-}

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);