@dative-gpi/foundation-core-domain 0.0.149 → 0.0.151

package/models/dashboardDatePresets/dashboardDatePresetDetails.ts

@@ -1,6 +1,7 @@
 import { DashboardDatePresetTranslationDTO } from "./dashboardDatePresetTranslation";
 
 export interface CreateDashboardDatePresetDTO {
+  code: string;
   labelDefault: string;
   globalStartDate: string;
   globalEndDate: string;

package/models/dashboardDatePresets/dashboardDatePresetInfos.ts

@@ -1,6 +1,7 @@
 import { DashboardDatePresetTranslation, DashboardDatePresetTranslationDTO } from "./dashboardDatePresetTranslation";
 
 export class DashboardDatePresetInfos {
+  code: string;
   label: string;
   labelDefault: string;
   globalStartDate: string;
@@ -8,6 +9,7 @@ export class DashboardDatePresetInfos {
   translations: DashboardDatePresetTranslation[];
 
   constructor(params: DashboardDatePresetInfosDTO) {
+    this.code = params.code;
     this.label = params.label;
     this.labelDefault = params.labelDefault;
     this.globalStartDate = params.globalStartDate;
@@ -17,6 +19,7 @@ export class DashboardDatePresetInfos {
 }
 
 export interface DashboardDatePresetInfosDTO {
+  code: string;
   label: string;
   labelDefault: string;
   globalStartDate: string;

package/models/dashboardEntityPresets/dashboardEntityPresetDetails.ts

@@ -2,6 +2,7 @@ import { DashboardEntityPresetTranslationDTO } from "./dashboardEntityPresetTran
 import { SelectedEntities } from "../enums/sharedEnums";
 
 export interface CreateDashboardEntityPresetDTO {
+  code: string;
   labelDefault: string;
   globalSelectedEntities: SelectedEntities;
   globalEntitiesFilters: string;

package/models/dashboardEntityPresets/dashboardEntityPresetInfos.ts

@@ -2,6 +2,7 @@ import { DashboardEntityPresetTranslation, DashboardEntityPresetTranslationDTO }
 import { SelectedEntities } from "../enums/sharedEnums";
 
 export class DashboardEntityPresetInfos {
+  code: string;
   label: string;
   labelDefault: string;
   globalSelectedEntities: SelectedEntities;
@@ -10,6 +11,7 @@ export class DashboardEntityPresetInfos {
   translations: DashboardEntityPresetTranslation[];
 
   constructor(params: DashboardEntityPresetInfosDTO) {
+    this.code = params.code;
     this.label = params.label;
     this.labelDefault = params.labelDefault;
     this.globalSelectedEntities = params.globalSelectedEntities;
@@ -20,6 +22,7 @@ export class DashboardEntityPresetInfos {
 }
 
 export interface DashboardEntityPresetInfosDTO {
+  code: string;
   label: string;
   labelDefault: string;
   globalSelectedEntities: SelectedEntities;

package/models/dashboardOrganisationTypes/dashboardOrganisationTypeDetails.ts

@@ -7,19 +7,15 @@ import { DashboardOrganisationTypeInfos, DashboardOrganisationTypeInfosDTO } fro
 import { DashboardTranslation, DashboardTranslationDTO } from "../dashboards";
 import { WidgetInfos, WidgetInfosDTO } from "../widgets/widgetInfos";
 import { CreateWidgetDTO } from "../widgets/widgetDetails";
-import { SelectedEntities } from "../enums/sharedEnums";
 
 export class DashboardOrganisationTypeDetails extends DashboardOrganisationTypeInfos {
   labelDefault: string;
   translations: DashboardTranslation[];
   singleEntity: boolean;
   dynamicEntities: boolean;
-  globalSelectedEntities: SelectedEntities;
-  globalEntitiesFilters: string;
-  globalEntitiesIds: string[];
+  entityPresetCode: string;
   dynamicDates: boolean;
-  globalStartDate: string;
-  globalEndDate: string;
+  datePresetCode: string;
   useAutoRefresh: boolean;
   autoRefresh: AutoRefresh;
   datePresets: DashboardDatePresetInfos[];
@@ -34,11 +30,9 @@ export class DashboardOrganisationTypeDetails extends DashboardOrganisationTypeI
     this.translations = params.translations.map(t => new DashboardTranslation(t));
     this.singleEntity = params.singleEntity;
     this.dynamicEntities = params.dynamicEntities;
-    this.globalSelectedEntities = params.globalSelectedEntities as SelectedEntities;
-    this.globalEntitiesIds = params.globalEntitiesIds.slice();
+    this.entityPresetCode = params.entityPresetCode;
     this.dynamicDates = params.dynamicDates;
-    this.globalStartDate = params.globalStartDate;
-    this.globalEndDate = params.globalEndDate;
+    this.datePresetCode = params.datePresetCode;
     this.useAutoRefresh = params.useAutoRefresh;
     this.autoRefresh = params.autoRefresh;
     this.variables = params.variables.map(dto => new DashboardVariableInfos(dto));
@@ -51,12 +45,9 @@ export interface DashboardOrganisationTypeDetailsDTO extends DashboardOrganisati
   translations: DashboardTranslationDTO[];
   singleEntity: boolean;
   dynamicEntities: boolean;
-  globalSelectedEntities: number;
-  globalEntitiesFilters: string;
-  globalEntitiesIds: string[];
+  entityPresetCode: string;
   dynamicDates: boolean;
-  globalStartDate: string;
-  globalEndDate: string;
+  datePresetCode: string;
   useAutoRefresh: boolean;
   autoRefresh: AutoRefresh;
   datePresets: DashboardDatePresetInfosDTO[];
@@ -80,12 +71,9 @@ export interface UpdateDashboardOrganisationTypeDTO {
   translations: DashboardTranslationDTO[];
   singleEntity: boolean;
   dynamicEntities: boolean;
-  globalSelectedEntities: number;
-  globalEntitiesFilters: string;
-  globalEntitiesIds: string[];
+  entityPresetCode: string;
   dynamicDates: boolean;
-  globalStartDate: string;
-  globalEndDate: string;
+  datePresetCode: string;
   useAutoRefresh: boolean;
   autoRefresh: number;
   datePresets: CreateDashboardDatePresetDTO[];

package/models/dashboardOrganisations/dashboardOrganisationDetails.ts

@@ -8,7 +8,6 @@ import { DashboardTranslation, DashboardTranslationDTO } from "../dashboards";
 import { WidgetInfos, WidgetInfosDTO } from "../widgets/widgetInfos";
 import { PathCrumb, PathCrumbDTO } from "../shared/pathCrumb";
 import { CreateWidgetDTO } from "../widgets/widgetDetails";
-import { SelectedEntities } from "../enums/sharedEnums";
 
 export class DashboardOrganisationDetails extends DashboardOrganisationInfos {
   labelDefault: string;
@@ -16,12 +15,9 @@ export class DashboardOrganisationDetails extends DashboardOrganisationInfos {
   translations: DashboardTranslation[];
   singleEntity: boolean;
   dynamicEntities: boolean;
-  globalSelectedEntities: SelectedEntities;
-  globalEntitiesFilters: string;
-  globalEntitiesIds: string[];
+  entityPresetCode: string;
   dynamicDates: boolean;
-  globalStartDate: string;
-  globalEndDate: string;
+  datePresetCode: string;
   useAutoRefresh: boolean;
   autoRefresh: AutoRefresh;
   datePresets: DashboardDatePresetInfos[];
@@ -37,12 +33,9 @@ export class DashboardOrganisationDetails extends DashboardOrganisationInfos {
     this.translations = params.translations.map(t => new DashboardTranslation(t));
     this.singleEntity = params.singleEntity;
     this.dynamicEntities = params.dynamicEntities;
-    this.globalSelectedEntities = params.globalSelectedEntities as SelectedEntities;
-    this.globalEntitiesFilters = params.globalEntitiesFilters;
-    this.globalEntitiesIds = params.globalEntitiesIds.slice();
+    this.entityPresetCode = params.entityPresetCode;
     this.dynamicDates = params.dynamicDates;
-    this.globalStartDate = params.globalStartDate;
-    this.globalEndDate = params.globalEndDate;
+    this.datePresetCode = params.datePresetCode;
     this.useAutoRefresh = params.useAutoRefresh;
     this.autoRefresh = params.autoRefresh;
     this.datePresets = params.datePresets.map(dto => new DashboardDatePresetInfos(dto));
@@ -58,12 +51,9 @@ export interface DashboardOrganisationDetailsDTO extends DashboardOrganisationIn
   translations: DashboardTranslationDTO[];
   singleEntity: boolean;
   dynamicEntities: boolean;
-  globalSelectedEntities: number;
-  globalEntitiesFilters: string;
-  globalEntitiesIds: string[];
+  entityPresetCode: string;
   dynamicDates: boolean;
-  globalStartDate: string;
-  globalEndDate: string;
+  datePresetCode: string;
   useAutoRefresh: boolean;
   autoRefresh: AutoRefresh;
   datePresets: DashboardDatePresetInfosDTO[];
@@ -93,12 +83,9 @@ export interface UpdateDashboardOrganisationDTO {
   translations: DashboardTranslationDTO[];
   singleEntity: boolean;
   dynamicEntities: boolean;
-  globalSelectedEntities: number;
-  globalEntitiesFilters: string;
-  globalEntitiesIds: string[];
+  entityPresetCode: string;
   dynamicDates: boolean;
-  globalStartDate: string;
-  globalEndDate: string;
+  datePresetCode: string;
   useAutoRefresh: boolean;
   autoRefresh: number;
   datePresets: CreateDashboardDatePresetDTO[];

package/models/dashboardShallowDatePresets/dashboardShallowDatePresetDetails.ts

@@ -0,0 +1,5 @@
+export interface CreateDashboardShallowDatePresetDTO {
+  code: string;
+  globalStartDate: string;
+  globalEndDate: string;
+}

package/models/dashboardShallowDatePresets/dashboardShallowDatePresetInfos.ts

@@ -0,0 +1,18 @@
+
+export class DashboardShallowDatePresetInfos {
+  code: string;
+  globalStartDate: string;
+  globalEndDate: string;
+
+  constructor(params: DashboardShallowDatePresetInfosDTO) {
+    this.code = params.code;
+    this.globalStartDate = params.globalStartDate;
+    this.globalEndDate = params.globalEndDate;
+  }
+}
+
+export interface DashboardShallowDatePresetInfosDTO {
+  code: string;
+  globalStartDate: string;
+  globalEndDate: string;
+}

package/models/dashboardShallowDatePresets/index.ts

@@ -0,0 +1,2 @@
+export * from "./dashboardShallowDatePresetDetails";
+export * from "./dashboardShallowDatePresetInfos";

package/models/dashboardShallowEntityPresets/dashboardShallowEntityPresetDetails.ts

@@ -0,0 +1,8 @@
+import { SelectedEntities } from "../enums/sharedEnums";
+
+export interface CreateDashboardShallowEntityPresetDTO {
+  code: string;
+  globalSelectedEntities: SelectedEntities;
+  globalEntitiesFilters: string;
+  globalEntitiesIds: string[];
+}

package/models/dashboardShallowEntityPresets/dashboardShallowEntityPresetInfos.ts

@@ -0,0 +1,22 @@
+import { SelectedEntities } from "../enums/sharedEnums";
+
+export class DashboardShallowEntityPresetInfos {
+  code: string;
+  globalSelectedEntities: SelectedEntities;
+  globalEntitiesFilters: string;
+  globalEntitiesIds: string[];
+
+  constructor(params: DashboardShallowEntityPresetInfosDTO) {
+    this.code = params.code;
+    this.globalSelectedEntities = params.globalSelectedEntities;
+    this.globalEntitiesFilters = params.globalEntitiesFilters;
+    this.globalEntitiesIds = params.globalEntitiesIds.slice();
+  }
+}
+
+export interface DashboardShallowEntityPresetInfosDTO {
+  code: string;
+  globalSelectedEntities: SelectedEntities;
+  globalEntitiesFilters: string;
+  globalEntitiesIds: string[];
+}

package/models/dashboardShallowEntityPresets/index.ts

@@ -0,0 +1,2 @@
+export * from "./dashboardShallowEntityPresetDetails";
+export * from "./dashboardShallowEntityPresetInfos";

package/models/dashboardShallowVariables/dashboardShallowVariableDetails.ts

@@ -0,0 +1,8 @@
+import { DashboardVariableValueTranslationDTO } from "../dashboardVariables/dashboardVariableValueTranslation";
+
+export interface CreateDashboardShallowVariableDTO {
+  code: string;
+  defaultValue: string;
+  useOnlyAllowedValues: boolean;
+  allowedValues: { [key: string]: DashboardVariableValueTranslationDTO[] };
+}

package/models/dashboardShallowVariables/dashboardShallowVariableInfos.ts

@@ -0,0 +1,28 @@
+import { DashboardVariableValueTranslation, DashboardVariableValueTranslationDTO } from "../dashboardVariables/dashboardVariableValueTranslation";
+
+export class DashboardShallowVariableInfos {
+  id: string;
+  dashboardShallowId: string;
+  code: string;
+  defaultValue: string;
+  useOnlyAllowedValues: boolean;
+  allowedValues: { [key: string]: DashboardVariableValueTranslation[] };
+
+  constructor(params: DashboardShallowVariableInfosDTO) {
+    this.id = params.id;
+    this.dashboardShallowId = params.dashboardShallowId;
+    this.code = params.code;
+    this.defaultValue = params.defaultValue;
+    this.useOnlyAllowedValues = params.useOnlyAllowedValues;
+    this.allowedValues = { ...params.allowedValues };
+  }
+}
+  
+export interface DashboardShallowVariableInfosDTO {
+  id: string;
+  dashboardShallowId: string;
+  code: string;
+  defaultValue: string;
+  useOnlyAllowedValues: boolean;
+  allowedValues: { [key: string]: DashboardVariableValueTranslationDTO[] };
+}

package/models/dashboardShallowVariables/index.ts

@@ -0,0 +1,2 @@
+export * from "./dashboardShallowVariableDetails";
+export * from "./dashboardShallowVariableInfos";

package/models/dashboardShallows/dashboardShallowDetails.ts

@@ -1,5 +1,8 @@
 import { AutoRefresh } from "@dative-gpi/foundation-shared-domain/models";
 
+import { CreateDashboardShallowEntityPresetDTO, DashboardShallowEntityPresetInfos, DashboardShallowEntityPresetInfosDTO } from "../dashboardShallowEntityPresets";
+import { CreateDashboardShallowDatePresetDTO, DashboardShallowDatePresetInfos, DashboardShallowDatePresetInfosDTO } from "../dashboardShallowDatePresets";
+import { CreateDashboardShallowVariableDTO, DashboardShallowVariableInfos, DashboardShallowVariableInfosDTO } from "../dashboardShallowVariables";
 import { DashboardEntityPresetInfos, DashboardEntityPresetInfosDTO } from "../dashboardEntityPresets";
 import { DashboardDatePresetInfos, DashboardDatePresetInfosDTO } from "../dashboardDatePresets";
 import { DashboardVariableInfos, DashboardVariableInfosDTO } from "../dashboardVariables";
@@ -7,30 +10,26 @@ import { DashboardShallowInfos, DashboardShallowInfosDTO } from "./dashboardShal
 import { DashboardTranslation, DashboardTranslationDTO } from "../dashboards";
 import { WidgetInfos, WidgetInfosDTO } from "../widgets/widgetInfos";
 import { PathCrumb, PathCrumbDTO } from "../shared/pathCrumb";
-import { SelectedEntities } from "../enums/sharedEnums";
 
 export class DashboardShallowDetails extends DashboardShallowInfos {
   labelDefault: string;
   path: PathCrumb[];
   overrideSingleEntity: boolean | null;
   overrideDynamicEntities: boolean | null;
-  overrideGlobalSelectedEntities: SelectedEntities | null;
-  overrideGlobalEntitiesFilters: string | null;
-  overrideGlobalEntitiesIds: string[] | null;
+  overrideEntityPresetCode: string | null;
   overrideDynamicDates: boolean | null;
-  overrideGlobalStartDate: string | null;
-  overrideGlobalEndDate: string | null;
+  overrideDatePresetCode: string | null;
   overrideUseAutoRefresh: boolean | null;
   overrideAutoRefresh: AutoRefresh | null;
+  overrideDatePresets: DashboardShallowDatePresetInfos[] | null;
+  overrideEntityPresets: DashboardShallowEntityPresetInfos[] | null;
+  overrideVariables: DashboardShallowVariableInfos[] | null;
   translations: DashboardTranslation[];
   singleEntity: boolean;
   dynamicEntities: boolean;
-  globalSelectedEntities: SelectedEntities;
-  globalEntitiesFilters: string;
-  globalEntitiesIds: string[];
+  entityPresetCode: string;
   dynamicDates: boolean;
-  globalStartDate: string;
-  globalEndDate: string;
+  datePresetCode: string;
   useAutoRefresh: boolean;
   autoRefresh: AutoRefresh;
   datePresets: DashboardDatePresetInfos[];
@@ -45,24 +44,20 @@ export class DashboardShallowDetails extends DashboardShallowInfos {
     this.path = params.path.map(dto => new PathCrumb(dto)).sort((a, b) => b.index - a.index);
     this.overrideSingleEntity = params.overrideSingleEntity;
     this.overrideDynamicEntities = params.overrideDynamicEntities;
-    this.overrideGlobalSelectedEntities = params.overrideGlobalSelectedEntities;
-    this.overrideGlobalEntitiesFilters = params.overrideGlobalEntitiesFilters;
-    this.overrideGlobalEntitiesIds = params.overrideGlobalEntitiesIds ?
-      params.overrideGlobalEntitiesIds.slice() : null;
+    this.overrideEntityPresetCode = params.overrideEntityPresetCode;
     this.overrideDynamicDates = params.overrideDynamicDates;
-    this.overrideGlobalStartDate = params.overrideGlobalStartDate;
-    this.overrideGlobalEndDate = params.overrideGlobalEndDate;
+    this.overrideDatePresetCode = params.overrideDatePresetCode;
     this.overrideUseAutoRefresh = params.overrideUseAutoRefresh;
     this.overrideAutoRefresh = params.overrideAutoRefresh;
+    this.overrideDatePresets = params.overrideDatePresets?.map(dto => new DashboardShallowDatePresetInfos(dto)) ?? null;
+    this.overrideEntityPresets = params.overrideEntityPresets?.map(dto => new DashboardShallowEntityPresetInfos(dto)) ?? null;
+    this.overrideVariables = params.overrideVariables?.map(dto => new DashboardShallowVariableInfos(dto)) ?? null;
     this.translations = params.translations.map(t => new DashboardTranslation(t));
     this.singleEntity = params.singleEntity;
     this.dynamicEntities = params.dynamicEntities;
-    this.globalSelectedEntities = params.globalSelectedEntities;
-    this.globalEntitiesFilters = params.globalEntitiesFilters;
-    this.globalEntitiesIds = params.globalEntitiesIds.slice();
+    this.entityPresetCode = params.entityPresetCode;
     this.dynamicDates = params.dynamicDates;
-    this.globalStartDate = params.globalStartDate;
-    this.globalEndDate = params.globalEndDate;
+    this.datePresetCode = params.datePresetCode;
     this.useAutoRefresh = params.useAutoRefresh;
     this.autoRefresh = params.autoRefresh;
     this.datePresets = params.datePresets.map(dto => new DashboardDatePresetInfos(dto));
@@ -77,25 +72,22 @@ export interface DashboardShallowDetailsDTO extends DashboardShallowInfosDTO {
   path: PathCrumbDTO[];
   overrideSingleEntity: boolean | null;
   overrideDynamicEntities: boolean | null;
-  overrideGlobalSelectedEntities: SelectedEntities | null;
-  overrideGlobalEntitiesFilters: string | null;
-  overrideGlobalEntitiesIds: string[] | null;
+  overrideEntityPresetCode: string | null;
   overrideDynamicDates: boolean | null;
-  overrideGlobalStartDate: string | null;
-  overrideGlobalEndDate: string | null;
+  overrideDatePresetCode: string | null;
   overrideUseAutoRefresh: boolean | null;
   overrideAutoRefresh: number | null;
+  overrideDatePresets: DashboardShallowDatePresetInfosDTO[] | null;
+  overrideEntityPresets: DashboardShallowEntityPresetInfosDTO[] | null;
+  overrideVariables: DashboardShallowVariableInfosDTO[] | null;
   translations: DashboardTranslationDTO[];
   dashboardId: string;
   scope: number;
   singleEntity: boolean;
   dynamicEntities: boolean;
-  globalSelectedEntities: number;
-  globalEntitiesFilters: string;
-  globalEntitiesIds: string[];
+  entityPresetCode: string;
   dynamicDates: boolean;
-  globalStartDate: string;
-  globalEndDate: string;
+  datePresetCode: string;
   useAutoRefresh: boolean;
   autoRefresh: AutoRefresh;
   datePresets: DashboardDatePresetInfosDTO[];
@@ -118,14 +110,14 @@ export interface UpdateDashboardShallowDTO {
   tags: string[];
   overrideSingleEntity: boolean | null;
   overrideDynamicEntities: boolean | null;
-  overrideGlobalSelectedEntities: SelectedEntities | null;
-  overrideGlobalEntitiesFilters: string | null;
-  overrideGlobalEntitiesIds: string[] | null;
+  overrideEntityPresetCode: string | null;
   overrideDynamicDates: boolean | null;
-  overrideGlobalStartDate: string | null;
-  overrideGlobalEndDate: string | null;
+  overrideDatePresetCode: string | null;
   overrideUseAutoRefresh: boolean | null;
   overrideAutoRefresh: number | null;
+  overrideDatePresets: CreateDashboardShallowDatePresetDTO[] | null;
+  overrideEntityPresets: CreateDashboardShallowEntityPresetDTO[] | null;
+  overrideVariables: CreateDashboardShallowVariableDTO[] | null;
   translations: DashboardTranslationDTO[];
 }
 

package/models/dashboardVariables/dashboardVariableDetails.ts

@@ -1,18 +1,8 @@
 import { DashboardVariableType } from "@dative-gpi/foundation-shared-domain/models";
 
-import { DashboardVariableInfos, DashboardVariableInfosDTO } from "./dashboardVariableInfos";
 import { DashboardVariableValueTranslationDTO } from "./dashboardVariableValueTranslation";
 import { DashboardVariableTranslationDTO } from "./dashboardVariableTranslation";
 
-export class DashboardVariableDetails extends DashboardVariableInfos {
-  constructor(params: DashboardVariableDetailsDTO) {
-    super(params);
-  }
-}
-
-export interface DashboardVariableDetailsDTO extends DashboardVariableInfosDTO {
-}
-
 export interface CreateDashboardVariableDTO {
   variableType: DashboardVariableType;
   labelDefault: string;

package/models/dashboards/dashboardDetails.ts

@@ -5,17 +5,13 @@ import { DashboardDatePresetInfos, DashboardDatePresetInfosDTO } from "../dashbo
 import { DashboardVariableInfos, DashboardVariableInfosDTO } from "../dashboardVariables";
 import { DashboardInfos, DashboardInfosDTO } from "./dashboardInfos";
 import { WidgetInfos, WidgetInfosDTO } from "../widgets/widgetInfos";
-import { SelectedEntities } from "../enums/sharedEnums";
 
 export class DashboardDetails extends DashboardInfos {
   singleEntity: boolean;
   dynamicEntities: boolean;
-  globalSelectedEntities: SelectedEntities;
-  globalEntitiesFilters: string;
-  globalEntitiesIds: string[];
+  entityPresetCode: string;
   dynamicDates: boolean;
-  globalStartDate: string;
-  globalEndDate: string;
+  datePresetCode: string;
   useAutoRefresh: boolean;
   autoRefresh: AutoRefresh;
   datePresets: DashboardDatePresetInfos[];
@@ -28,12 +24,9 @@ export class DashboardDetails extends DashboardInfos {
 
     this.singleEntity = params.singleEntity;
     this.dynamicEntities = params.dynamicEntities;
-    this.globalSelectedEntities = params.globalSelectedEntities as SelectedEntities;
-    this.globalEntitiesFilters = params.globalEntitiesFilters;
-    this.globalEntitiesIds = params.globalEntitiesIds.slice();
+    this.entityPresetCode = params.entityPresetCode;
     this.dynamicDates = params.dynamicDates;
-    this.globalStartDate = params.globalStartDate;
-    this.globalEndDate = params.globalEndDate;
+    this.datePresetCode = params.datePresetCode;
     this.useAutoRefresh = params.useAutoRefresh;
     this.autoRefresh = params.autoRefresh;
     this.datePresets = params.datePresets.map(dto => new DashboardDatePresetInfos(dto));
@@ -46,12 +39,9 @@ export class DashboardDetails extends DashboardInfos {
 export interface DashboardDetailsDTO extends DashboardInfosDTO {
   singleEntity: boolean;
   dynamicEntities: boolean;
-  globalSelectedEntities: number;
-  globalEntitiesFilters: string;
-  globalEntitiesIds: string[];
+  entityPresetCode: string;
   dynamicDates: boolean;
-  globalStartDate: string;
-  globalEndDate: string;
+  datePresetCode: string;
   useAutoRefresh: boolean;
   autoRefresh: number;
   datePresets: DashboardDatePresetInfosDTO[];

package/models/groups/groupDetails.ts

@@ -13,29 +13,29 @@ export class GroupDetails extends GroupInfos {
 }
 
 export interface GroupDetailsDTO extends GroupInfosDTO {
-    parentIcon: string | null;
-    parentLabel: string | null;
+  parentIcon: string | null;
+  parentLabel: string | null;
 }
 
 export interface CreateGroupDTO {
-    parentId: string | null;
-    image: string | null;
-    icon: string;
-    code: string;
-    label: string;
-    tags: string[];
+  parentId: string | null;
+  image: string | null;
+  icon: string;
+  code: string;
+  label: string;
+  tags: string[];
 }
 
 export interface UpdateGroupDTO {
-    parentId: string | null;
-    imageId: string | null;
-    image: string | null;
-    icon: string;
-    code: string;
-    label: string;
-    tags: string[];
+  parentId: string | null;
+  imageId: string | null;
+  image: string | null;
+  icon: string;
+  code: string;
+  label: string;
+  tags: string[];
 }
 
 export interface ChangeGroupParentDTO {
-    parentId: string | null;
+  parentId: string | null;
 }

package/models/index.ts

@@ -1,7 +1,7 @@
 export * from "./actions";
 export * from "./alerts";
 export * from "./articles";
-export * from "./authTokens";
+export * from "./serviceAccountAuthTokens";
 export * from "./chartCategories";
 export * from "./chartOrganisationTypes";
 export * from "./chartOrganisations";
@@ -10,27 +10,30 @@ export * from "./comments";
 export * from "./connectivityAlerts";
 export * from "./customProperties";
 export * from "./customPropertyValues";
-export * from "./dashboardDatePresets";         // No service
-export * from "./dashboardEntityPresets";       // No service
+export * from "./dashboardDatePresets";             // No service
+export * from "./dashboardEntityPresets";           // No service
 export * from "./dashboardOrganisations";
 export * from "./dashboardOrganisationTypes";
 export * from "./dashboards";
+export * from "./dashboardShallowDatePresets";      // No service
+export * from "./dashboardShallowEntityPresets";    // No service
 export * from "./dashboardShallows";
-export * from "./dashboardVariables";           // No service
+export * from "./dashboardShallowVariables";        // No service
+export * from "./dashboardVariables";               // No service
 export * from "./dataCategories";
 export * from "./dataDefinitions";
-export * from "./dataDefinitionMappings";       // No service
+export * from "./dataDefinitionMappings";           // No service
 export * from "./deviceConnectivities";
 export * from "./deviceOrganisations";
 export * from "./deviceStatuses";
-export * from "./enums";                        // No service
+export * from "./enums";                            // No service
 export * from "./extensionApplications";
 export * from "./folders";
 export * from "./groups";
 export * from "./locations";
 export * from "./manufacturers";
 export * from "./models";
-export * from "./modelStatuses";                // No service
+export * from "./modelStatuses";                    // No service
 export * from "./organisations";
 export * from "./permissionCategories";
 export * from "./roleOrganisations";
@@ -40,11 +43,11 @@ export * from "./scenarioDeviceOrganisations";
 export * from "./scenarioDiffusions";
 export * from "./scenarioOrganisations";
 export * from "./scenarioOrganisationTypes";
-export * from "./scenarios";                    // No service
-export * from "./shared";                       // No service
+export * from "./scenarios";                        // No service
+export * from "./shared";                           // No service
 export * from "./serviceAccounts";
-export * from "./userOrganisationColumns";      // No service
+export * from "./userOrganisationColumns";          // No service
 export * from "./userOrganisations";
 export * from "./userOrganisationTables";
-export * from "./widgets";                      // No service
+export * from "./widgets";                          // No service
 export * from "./widgetTemplates";

package/models/scenarioDeviceOrganisations/scenarioDeviceOrganisationDetails.ts

@@ -1,36 +1,19 @@
-import { ScenarioDeviceOrganisationInfos, ScenarioDeviceOrganisationInfosDTO } from "./scenarioDeviceOrganisationInfos";
 import { CreateTimeRangeDTO } from "../shared/timeRange";
-import { SelectedEntities } from "../enums/sharedEnums";
-
-export class ScenarioDeviceOrganisationDetails extends ScenarioDeviceOrganisationInfos {
-    constructor(params: ScenarioDeviceOrganisationDetailsDTO) {
-        super(params);
-    }
-}
-
-export interface ScenarioDeviceOrganisationDetailsDTO extends ScenarioDeviceOrganisationInfosDTO {
-}
 
 export interface CreateScenarioDeviceOrganisationDTO {
-    scenarioId: string;
-    deviceOrganisationId: string;
-    overrideConditions: boolean;
-    triggerCondition: string | null;
-    autoResolveCondition: string | null;
-    overrideTimeRanges: boolean;
-    timeRanges: CreateTimeRangeDTO[] | null;
-    overrideEntities: boolean;
-    selectedEntities: SelectedEntities;
-    entitiesIds: string[];
+  scenarioId: string;
+  deviceOrganisationId: string;
+  overrideConditions: boolean;
+  triggerCondition: string | null;
+  autoResolveCondition: string | null;
+  overrideTimeRanges: boolean;
+  timeRanges: CreateTimeRangeDTO[] | null;
 }
 
 export interface UpdateScenarioDeviceOrganisationDTO {
-    overrideConditions: boolean;
-    triggerCondition: string | null;
-    autoResolveCondition: string | null;
-    overrideTimeRanges: boolean;
-    timeRanges: CreateTimeRangeDTO[] | null;
-    overrideEntities: boolean;
-    selectedEntities: SelectedEntities;
-    entitiesIds: string[];
+  overrideConditions: boolean;
+  triggerCondition: string | null;
+  autoResolveCondition: string | null;
+  overrideTimeRanges: boolean;
+  timeRanges: CreateTimeRangeDTO[] | null;
 }

package/models/scenarioDeviceOrganisations/scenarioDeviceOrganisationInfos.ts

@@ -1,62 +1,52 @@
 import { TimeRange, TimeRangeDTO } from "../shared/timeRange";
-import { SelectedEntities } from "../enums/sharedEnums";
 
 export class ScenarioDeviceOrganisationInfos {
-    id: string;
-    scenarioId: string;
-    scenarioLabel: string;
-    deviceOrganisationId: string;
-    deviceOrganisationImageId: string | null;
-    deviceOrganisationCode: string;
-    deviceOrganisationLabel: string;
-    overrideConditions: boolean;
-    triggerCondition: string | null;
-    autoResolveCondition: string | null;
-    overrideTimeRanges: boolean;
-    timeRanges: TimeRange[] | null;
-    overrideEntities: boolean;
-    selectedEntities: SelectedEntities;
-    entitiesIds: string[];
+  id: string;
+  scenarioId: string;
+  scenarioLabel: string;
+  deviceOrganisationId: string;
+  deviceOrganisationImageId: string | null;
+  deviceOrganisationCode: string;
+  deviceOrganisationLabel: string;
+  overrideConditions: boolean;
+  triggerCondition: string | null;
+  autoResolveCondition: string | null;
+  overrideTimeRanges: boolean;
+  timeRanges: TimeRange[] | null;
 
-    constructor(params: ScenarioDeviceOrganisationInfosDTO) {
-        this.id = params.id;
-        this.scenarioId = params.scenarioId;
-        this.scenarioLabel = params.scenarioLabel;
-        this.deviceOrganisationId = params.deviceOrganisationId;
-        this.deviceOrganisationImageId = params.deviceOrganisationImageId;
-        this.deviceOrganisationCode = params.deviceOrganisationCode;
-        this.deviceOrganisationLabel = params.deviceOrganisationLabel;
-        this.overrideConditions = params.overrideConditions;
-        this.triggerCondition = params.triggerCondition;
-        this.autoResolveCondition = params.autoResolveCondition;
-        this.overrideTimeRanges = params.overrideTimeRanges;
-        this.timeRanges = params.timeRanges ? 
-            params.timeRanges.map(dto => new TimeRange(dto)) : null;
-        this.overrideEntities = params.overrideEntities;
-        this.selectedEntities = params.selectedEntities as SelectedEntities;
-        this.entitiesIds = params.entitiesIds.slice();
-    }
+  constructor(params: ScenarioDeviceOrganisationInfosDTO) {
+    this.id = params.id;
+    this.scenarioId = params.scenarioId;
+    this.scenarioLabel = params.scenarioLabel;
+    this.deviceOrganisationId = params.deviceOrganisationId;
+    this.deviceOrganisationImageId = params.deviceOrganisationImageId;
+    this.deviceOrganisationCode = params.deviceOrganisationCode;
+    this.deviceOrganisationLabel = params.deviceOrganisationLabel;
+    this.overrideConditions = params.overrideConditions;
+    this.triggerCondition = params.triggerCondition;
+    this.autoResolveCondition = params.autoResolveCondition;
+    this.overrideTimeRanges = params.overrideTimeRanges;
+    this.timeRanges = params.timeRanges ? 
+      params.timeRanges.map(dto => new TimeRange(dto)) : null;
+  }
 }
 
 export interface ScenarioDeviceOrganisationInfosDTO {
-    id: string;
-    scenarioId: string;
-    scenarioLabel: string;
-    deviceOrganisationId: string;
-    deviceOrganisationImageId: string | null;
-    deviceOrganisationCode: string;
-    deviceOrganisationLabel: string;
-    overrideConditions: boolean;
-    triggerCondition: string | null;
-    autoResolveCondition: string | null;
-    overrideTimeRanges: boolean;
-    timeRanges: TimeRangeDTO[] | null;
-    overrideEntities: boolean;
-    selectedEntities: number;
-    entitiesIds: string[];
+  id: string;
+  scenarioId: string;
+  scenarioLabel: string;
+  deviceOrganisationId: string;
+  deviceOrganisationImageId: string | null;
+  deviceOrganisationCode: string;
+  deviceOrganisationLabel: string;
+  overrideConditions: boolean;
+  triggerCondition: string | null;
+  autoResolveCondition: string | null;
+  overrideTimeRanges: boolean;
+  timeRanges: TimeRangeDTO[] | null;
 }
 
 export interface ScenarioDeviceOrganisationFilters {
-    scenarioId?: string | null;
-    deviceOrganisationId?: string | null;
+  scenarioId?: string | null;
+  deviceOrganisationId?: string | null;
 }

package/models/scenarioOrganisationTypes/scenarioOrganisationTypeDetails.ts

@@ -1,11 +1,8 @@
-import { AutoRefresh, ResolveOn, TriggerOn } from "@dative-gpi/foundation-shared-domain/models";
+import { ResolveOn, TriggerOn } from "@dative-gpi/foundation-shared-domain/models";
 
 import { ScenarioOrganisationTypeInfos, ScenarioOrganisationTypeInfosDTO } from "./scenarioOrganisationTypeInfos";
 import { CreateTimeRangeDTO, TimeRange, TimeRangeDTO } from "../shared/timeRange";
 import { ScenarioTranslation, ScenarioTranslationDTO } from "../scenarios";
-import { WidgetInfos, WidgetInfosDTO } from "../widgets/widgetInfos";
-import { CreateWidgetDTO } from "../widgets/widgetDetails";
-import { SelectedEntities } from "../enums/sharedEnums";
 
 export class ScenarioOrganisationTypeDetails extends ScenarioOrganisationTypeInfos {
   groupByIds: string[];
@@ -31,16 +28,6 @@ export class ScenarioOrganisationTypeDetails extends ScenarioOrganisationTypeInf
   lock: number | null;
   waitResolved: boolean;
   translations: ScenarioTranslation[];
-  singleEntity: boolean;
-  dynamicEntities: boolean;
-  globalSelectedEntities: SelectedEntities;
-  globalEntitiesIds: string[];
-  dynamicDates: boolean;
-  globalStartDate: string;
-  globalEndDate: string;
-  useAutoRefresh: boolean;
-  autoRefresh: AutoRefresh;
-  widgets: WidgetInfos[];
 
   constructor(params: ScenarioOrganisationTypeDetailsDTO) {
     super(params);
@@ -69,16 +56,6 @@ export class ScenarioOrganisationTypeDetails extends ScenarioOrganisationTypeInf
     this.lock = params.lock;
     this.waitResolved = params.waitResolved;
     this.translations = params.translations.map(t => new ScenarioTranslation(t));
-    this.singleEntity = params.singleEntity;
-    this.dynamicEntities = params.dynamicEntities;
-    this.globalSelectedEntities = params.globalSelectedEntities as SelectedEntities;
-    this.globalEntitiesIds = params.globalEntitiesIds.slice();
-    this.dynamicDates = params.dynamicDates;
-    this.globalStartDate = params.globalStartDate;
-    this.globalEndDate = params.globalEndDate;
-    this.useAutoRefresh = params.useAutoRefresh;
-    this.autoRefresh = params.autoRefresh as AutoRefresh;
-    this.widgets = params.widgets.map(dto => new WidgetInfos(dto));
   }
 }
 
@@ -106,16 +83,6 @@ export interface ScenarioOrganisationTypeDetailsDTO extends ScenarioOrganisation
   lock: number | null;
   waitResolved: boolean;
   translations: ScenarioTranslationDTO[];
-  singleEntity: boolean;
-  dynamicEntities: boolean;
-  globalSelectedEntities: number;
-  globalEntitiesIds: string[];
-  dynamicDates: boolean;
-  globalStartDate: string;
-  globalEndDate: string;
-  useAutoRefresh: boolean;
-  autoRefresh: number;
-  widgets: WidgetInfosDTO[];
 }
 
 export interface CreateScenarioOrganisationTypeDTO {
@@ -151,14 +118,4 @@ export interface UpdateScenarioOrganisationTypeDTO {
   lock: number | null;
   waitResolved: boolean;
   translations: ScenarioTranslationDTO[];
-  singleEntity: boolean;
-  dynamicEntities: boolean;
-  globalSelectedEntities: number;
-  globalEntitiesIds: string[];
-  dynamicDates: boolean;
-  globalStartDate: string;
-  globalEndDate: string;
-  useAutoRefresh: boolean;
-  autoRefresh: number;
-  widgets: CreateWidgetDTO[];
 }

package/models/scenarioOrganisations/scenarioOrganisationDetails.ts

@@ -1,11 +1,8 @@
-import { AutoRefresh, ResolveOn, TriggerOn } from "@dative-gpi/foundation-shared-domain/models";
+import { ResolveOn, TriggerOn } from "@dative-gpi/foundation-shared-domain/models";
 
 import { ScenarioOrganisationInfos, ScenarioOrganisationInfosDTO } from "./scenarioOrganisationInfos";
 import { CreateTimeRangeDTO, TimeRange, TimeRangeDTO } from "../shared/timeRange";
 import { ScenarioTranslation, ScenarioTranslationDTO } from "../scenarios";
-import { WidgetInfos, WidgetInfosDTO } from "../widgets/widgetInfos";
-import { CreateWidgetDTO } from "../widgets/widgetDetails";
-import { SelectedEntities } from "../enums/sharedEnums";
 
 export class ScenarioOrganisationDetails extends ScenarioOrganisationInfos {
   groupByIds: string[];
@@ -31,16 +28,6 @@ export class ScenarioOrganisationDetails extends ScenarioOrganisationInfos {
   lock: number | null;
   waitResolved: boolean;
   translations: ScenarioTranslation[];
-  singleEntity: boolean;
-  dynamicEntities: boolean;
-  globalSelectedEntities: SelectedEntities;
-  globalEntitiesIds: string[];
-  dynamicDates: boolean;
-  globalStartDate: string;
-  globalEndDate: string;
-  useAutoRefresh: boolean;
-  autoRefresh: AutoRefresh;
-  widgets: WidgetInfos[];
 
   constructor(params: ScenarioOrganisationDetailsDTO) {
     super(params);
@@ -68,16 +55,6 @@ export class ScenarioOrganisationDetails extends ScenarioOrganisationInfos {
     this.lock = params.lock;
     this.waitResolved = params.waitResolved;
     this.translations = params.translations.map(t => new ScenarioTranslation(t));
-    this.singleEntity = params.singleEntity;
-    this.dynamicEntities = params.dynamicEntities;
-    this.globalSelectedEntities = params.globalSelectedEntities as SelectedEntities;
-    this.globalEntitiesIds = params.globalEntitiesIds.slice();
-    this.dynamicDates = params.dynamicDates;
-    this.globalStartDate = params.globalStartDate;
-    this.globalEndDate = params.globalEndDate;
-    this.useAutoRefresh = params.useAutoRefresh;
-    this.autoRefresh = params.autoRefresh as AutoRefresh;
-    this.widgets = params.widgets.map(dto => new WidgetInfos(dto));
   }
 }
 
@@ -105,16 +82,6 @@ export interface ScenarioOrganisationDetailsDTO extends ScenarioOrganisationInfo
   lock: number | null;
   waitResolved: boolean;
   translations: ScenarioTranslationDTO[];
-  singleEntity: boolean;
-  dynamicEntities: boolean;
-  globalSelectedEntities: number;
-  globalEntitiesIds: string[];
-  dynamicDates: boolean;
-  globalStartDate: string;
-  globalEndDate: string;
-  useAutoRefresh: boolean;
-  autoRefresh: number;
-  widgets: WidgetInfosDTO[];
 }
 
 export interface CreateScenarioOrganisationDTO {
@@ -145,16 +112,6 @@ export interface CreateScenarioOrganisationDTO {
   lock: number | null;
   waitResolved: boolean;
   translations: ScenarioTranslationDTO[];
-  singleEntity: boolean;
-  dynamicEntities: boolean;
-  globalSelectedEntities: number;
-  globalEntitiesIds: string[];
-  dynamicDates: boolean;
-  globalStartDate: string;
-  globalEndDate: string;
-  useAutoRefresh: boolean;
-  autoRefresh: number;
-  widgets: CreateWidgetDTO[];
 }
 
 export interface UpdateScenarioOrganisationDTO {
@@ -185,14 +142,4 @@ export interface UpdateScenarioOrganisationDTO {
   lock: number | null;
   waitResolved: boolean;
   translations: ScenarioTranslationDTO[];
-  singleEntity: boolean;
-  dynamicEntities: boolean;
-  globalSelectedEntities: number;
-  globalEntitiesIds: string[];
-  dynamicDates: boolean;
-  globalStartDate: string;
-  globalEndDate: string;
-  useAutoRefresh: boolean;
-  autoRefresh: number;
-  widgets: CreateWidgetDTO[];
 }

package/models/serviceAccountAuthTokens/index.ts

@@ -0,0 +1,2 @@
+export * from "./serviceAccountAuthTokenDetails";
+export * from "./serviceAccountIdAuthTokenInfos";

package/models/serviceAccountAuthTokens/serviceAccountAuthTokenDetails.ts

@@ -0,0 +1,20 @@
+import { ServiceAccountAuthTokenInfos, ServiceAccountAuthTokenInfosDTO } from "./serviceAccountIdAuthTokenInfos";
+
+export class ServiceAccountAuthTokenDetails extends ServiceAccountAuthTokenInfos {
+    token: string;
+
+    constructor(params: ServiceAccountAuthTokenDetailsDTO) {
+        super(params);
+        this.token = params.token;
+    }
+}
+
+export interface ServiceAccountAuthTokenDetailsDTO extends ServiceAccountAuthTokenInfosDTO {
+    token: string;
+}
+
+export interface CreateServiceAccountAuthTokenDTO {
+    serviceAccountId?: string;
+    label?: string;
+    lifetime?: number;
+}

package/models/{authTokens/authTokenInfos.ts → serviceAccountAuthTokens/serviceAccountIdAuthTokenInfos.ts}

@@ -1,29 +1,28 @@
 import { utcToEpoch } from "@dative-gpi/foundation-shared-domain/tools";
 
-export class AuthTokenInfos {
+export class ServiceAccountAuthTokenInfos {
     id: string;
-    userId: string | null;
+    serviceAccountId: string | null;
     label: string;
     creationDate: number;
     dateMax: number;
 
-    constructor(params: AuthTokenInfosDTO) {
+    constructor(params: ServiceAccountAuthTokenInfosDTO) {
         this.id = params.id;
-        this.userId = params.userId;
+        this.serviceAccountId = params.serviceAccountId;
         this.label = params.label;
         this.creationDate = utcToEpoch(params.creationDate);
         this.dateMax = utcToEpoch(params.dateMax);
     }
 }
 
-export interface AuthTokenInfosDTO {
+export interface ServiceAccountAuthTokenInfosDTO {
     id: string;
-    userId: string | null;
+    serviceAccountId: string | null;
     label: string;
     creationDate: string;
     dateMax: string;
 }
 
-export interface AuthTokenFilters {
-    userId?: string | null;
+export interface ServiceAccountAuthTokenFilters {
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-domain",
   "sideEffects": false,
-  "version": "0.0.149",
+  "version": "0.0.151",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -9,5 +9,5 @@
   "main": "index.ts",
   "author": "",
   "license": "ISC",
-  "gitHead": "530e113f98626a38763ac4afcc4d828d69bcfc2d"
+  "gitHead": "c90845bbbf6584636e0ccd69c59f209ec17fc00e"
 }

package/models/authTokens/authTokenDetails.ts

@@ -1,20 +0,0 @@
-import { AuthTokenInfos, AuthTokenInfosDTO } from "./authTokenInfos";
-
-export class AuthTokenDetails extends AuthTokenInfos {
-    token: string;
-
-    constructor(params: AuthTokenDetailsDTO) {
-        super(params);
-        this.token = params.token;
-    }
-}
-
-export interface AuthTokenDetailsDTO extends AuthTokenInfosDTO {
-    token: string;
-}
-
-export interface CreateAuthTokenDTO {
-    userId: string;
-    label: string;
-    lifetime: number;
-}

package/models/authTokens/index.ts

@@ -1,2 +0,0 @@
-export * from "./authTokenDetails";
-export * from "./authTokenInfos";