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

package/models/deviceExplorerElements/deviceExplorerElementInfos.ts

@@ -0,0 +1,149 @@
+import { DeviceExplorerElementType } from "@dative-gpi/foundation-shared-domain/enums";
+
+import { DeviceConnectivityDetails, type DeviceConnectivityDetailsDTO } from "../deviceConnectivities/deviceConnectivityDetails";
+import { DeviceOrganisationAlert, type DeviceOrganisationAlertDTO } from "../deviceOrganisations/deviceOrganisationAlert";
+import { DeviceStatusDetails, type DeviceStatusDetailsDTO } from "../deviceStatuses/deviceStatusDetails";
+import { ModelStatusInfos, type ModelStatusInfosDTO } from "../modelStatuses/modelStatusInfos";
+import { type DeviceOrganisationInfos } from "../deviceOrganisations/deviceOrganisationInfos";
+import { PathCrumb, type PathCrumbDTO } from "../shared/pathCrumb";
+import { type GroupInfos } from "../groups/groupInfos";
+
+export class DeviceExplorerElementInfos {
+  id: string;
+  organisationId: string | null;
+  parentId: string | null;
+  imageId: string | null;
+  code: string;
+  label: string;
+  tags: string[];
+  path: PathCrumb[];
+  type: DeviceExplorerElementType;
+
+  icon: string | null;
+  groupsIds: string[] | null;
+  deviceOrganisationsIds: string[] | null;
+  modelsIds: string[] | null;
+  recursiveGroupsIds: string[] | null;
+  recursiveDeviceOrganisationsIds: string[] | null;
+  recursiveModelsIds: string[] | null;
+
+  manufacturerLabel: string | null;
+  articleLabel: string | null;
+  modelLabel: string | null;
+  ownerLabel: string | null;
+  managerName: string | null;
+  unrestricted: boolean | null;
+  online: number | null;
+  meta: { [key: string]: string } | null;
+  modelStatuses: ModelStatusInfos[] | null;
+  status: DeviceStatusDetails | null;
+  connectivity: DeviceConnectivityDetails | null;
+  alerts: DeviceOrganisationAlert[] | null;
+  worstAlert: DeviceOrganisationAlert | null;
+
+  constructor(params: DeviceExplorerElementInfosDTO) {
+    this.id = params.id;
+    this.organisationId = params.organisationId;
+    this.parentId = params.parentId;
+    this.imageId = params.imageId;
+    this.code = params.code;
+    this.label = params.label;
+    this.tags = params.tags;
+    this.path = params.path.map(dto => new PathCrumb({ ...dto })).sort((a, b) => b.index - a.index);
+    this.type = params.type;
+
+    this.icon = params.icon ?? null;
+    this.groupsIds = params.groupsIds?.slice() ?? null;
+    this.deviceOrganisationsIds = params.deviceOrganisationsIds?.slice() ?? null;
+    this.modelsIds = params.modelsIds?.slice() ?? null;
+    this.recursiveGroupsIds = params.recursiveGroupsIds?.slice() ?? null;
+    this.recursiveDeviceOrganisationsIds = params.recursiveDeviceOrganisationsIds?.slice() ?? null;
+    this.recursiveModelsIds = params.recursiveModelsIds?.slice() ?? null;
+
+    this.manufacturerLabel = params.manufacturerLabel ?? null;
+    this.articleLabel = params.articleLabel ?? null;
+    this.modelLabel = params.modelLabel ?? null;
+    this.ownerLabel = params.ownerLabel ?? null;
+    this.managerName = params.managerName ?? null;
+    this.unrestricted = params.unrestricted ?? null;
+    this.online = params.online ?? null;
+    this.meta = params.meta ? { ...params.meta } : null;
+    this.modelStatuses = params.modelStatuses?.map(dto => new ModelStatusInfos(dto)) ?? null;
+    this.status = params.status ? new DeviceStatusDetails(params.status) : null;
+    this.connectivity = params.connectivity ? new DeviceConnectivityDetails(params.connectivity) : null;
+    this.alerts = params.alerts?.map(dto => new DeviceOrganisationAlert(dto)) ?? null;
+    this.worstAlert = params.worstAlert ? new DeviceOrganisationAlert(params.worstAlert) : null;
+  }
+
+  static 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
+  });
+
+  static 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
+  });
+}
+
+export interface DeviceExplorerElementInfosDTO {
+  id: string;
+  organisationId: string | null;
+  parentId: string | null;
+  imageId: string | null;
+  code: string;
+  label: string;
+  tags: string[];
+  path: PathCrumbDTO[];
+  type: number;
+
+  icon?: string | null;
+  groupsIds?: string[] | null;
+  deviceOrganisationsIds?: string[] | null;
+  modelsIds?: string[] | null;
+  recursiveGroupsIds?: string[] | null;
+  recursiveDeviceOrganisationsIds?: string[] | null;
+  recursiveModelsIds?: string[] | null;
+
+  manufacturerLabel?: string | null;
+  articleLabel?: string | null;
+  modelLabel?: string | null;
+  ownerLabel?: string | null;
+  managerName?: string | null;
+  unrestricted?: boolean | null;
+  online?: number | null;
+  meta?: { [key: string]: string } | null;
+  modelStatuses?: ModelStatusInfosDTO[] | null;
+  status?: DeviceStatusDetailsDTO | null;
+  connectivity?: DeviceConnectivityDetailsDTO | null;
+  alerts?: DeviceOrganisationAlertDTO[] | null;
+  worstAlert?: DeviceOrganisationAlertDTO | null;
+}
+
+export interface DeviceExplorerElementFilters {
+  ancestorId?: string | null;
+  parentId?: string | null;
+  root?: boolean | null;
+  search?: string | null;
+}

package/models/deviceExplorerElements/index.ts

@@ -0,0 +1,2 @@
+export * from "./deviceExplorerElementDetails";
+export * from "./deviceExplorerElementInfos";

package/models/deviceOrganisations/deviceOrganisationAlert.ts

@@ -8,6 +8,7 @@ export class DeviceOrganisationAlert {
     criticity: Criticity;
     sourceTimestamp?: number;
     enqueuedTimestamp?: number;
+    actualTimestamp: number;
 
   constructor(params: DeviceOrganisationAlertDTO) {
     this.id = params.id;
@@ -16,6 +17,7 @@ export class DeviceOrganisationAlert {
     this.criticity = params.criticity;
     this.sourceTimestamp = params.sourceTimestamp ? isoToEpoch(params.sourceTimestamp) : undefined;
     this.enqueuedTimestamp = params.enqueuedTimestamp ? isoToEpoch(params.enqueuedTimestamp) : undefined;
+    this.actualTimestamp =  isoToEpoch(params.actualTimestamp);
   }
 }
 
@@ -26,4 +28,5 @@ export interface DeviceOrganisationAlertDTO {
   criticity: Criticity;
   sourceTimestamp?: string;
   enqueuedTimestamp?: string;
+  actualTimestamp: string;
 }

package/models/deviceOrganisations/deviceOrganisationDetails.ts

@@ -9,7 +9,6 @@ export class DeviceOrganisationDetails extends DeviceOrganisationInfos {
     articleCode: string;
     familyId: string;
     familyLabel: string;
-    description: string;
     options: DeviceOrganisationOption[];
     path: PathCrumb[];
 
@@ -19,7 +18,6 @@ export class DeviceOrganisationDetails extends DeviceOrganisationInfos {
         this.articleCode = params.articleCode;
         this.familyId = params.familyId;
         this.familyLabel = params.familyLabel;
-        this.description = params.description;
         this.options = params.options.map(dto => new DeviceOrganisationOption({ ...dto }));
         this.path = params.path.map(dto => new PathCrumb({ ...dto })).sort((a, b) => b.index - a.index);
     }
@@ -29,7 +27,6 @@ export interface DeviceOrganisationDetailsDTO extends DeviceOrganisationInfosDTO
     articleCode: string;
     familyId: string;
     familyLabel: string;
-    description: string;
     options: DeviceOrganisationOptionDTO[];
     path: PathCrumbDTO[];
 }
@@ -49,6 +46,8 @@ export interface CreateDeviceOrganisationDTO {
 export interface UpdateDeviceOrganisationDTO {
     managerId: string | null;
     locationId: string | null;
+    latitude: number | null;
+    longitude: number | null;
     groupId: string | null;
     imageId: string | null;
     image: string | null;

package/models/deviceOrganisations/deviceOrganisationInfos.ts

@@ -1,17 +1,17 @@
-import type { DeviceConnectivityDetailsDTO } from "../deviceConnectivities/deviceConnectivityDetails";
-import { DeviceConnectivityDetails } from "../deviceConnectivities/deviceConnectivityDetails";
-import type { DeviceStatusDetailsDTO } from "../deviceStatuses/deviceStatusDetails";
-import { DeviceStatusDetails } from "../deviceStatuses/deviceStatusDetails";
-import type { DeviceOrganisationAlertDTO } from "./deviceOrganisationAlert";
-import { DeviceOrganisationAlert } from "./deviceOrganisationAlert";
-import type { ModelStatusInfosDTO } from "../modelStatuses/modelStatusInfos";
-import { ModelStatusInfos } from "../modelStatuses/modelStatusInfos";
+import { DeviceConnectivityDetails, type DeviceConnectivityDetailsDTO } from "../deviceConnectivities/deviceConnectivityDetails";
+import { DeviceStatusDetails, type DeviceStatusDetailsDTO } from "../deviceStatuses/deviceStatusDetails";
+import { DeviceOrganisationAlert, type DeviceOrganisationAlertDTO } from "./deviceOrganisationAlert";
+import { ModelStatusInfos, type ModelStatusInfosDTO } from "../modelStatuses/modelStatusInfos";
+import { type EntityType } from '@dative-gpi/foundation-shared-domain/enums';
+import { PathCrumb, type PathCrumbDTO } from "../shared/pathCrumb";
 
 export class DeviceOrganisationInfos {
   id: string;
   deviceId: string;
   manufacturerId: string;
   manufacturerLabel: string;
+  latitude: number | null;
+  longitude: number | null;
   articleId: string;
   articleLabel: string;
   modelId: string;
@@ -24,15 +24,19 @@ export class DeviceOrganisationInfos {
   locationId: string | null;
   locationLabel: string | null;
   locationAddress: string | null;
+  locationLatitude: number | null;
+  locationLongitude: number | null;
   groupId: string | null;
   groupLabel: string | null;
   groupIcon: string | null;
   label: string;
   code: string;
+  description: string;
   imageId: string | null;
   tags: string[];
   unrestricted: boolean;
   online: number;
+  path: PathCrumb[];
   meta: { [key: string]: string };
   modelStatuses: ModelStatusInfos[];
   status: DeviceStatusDetails;
@@ -40,15 +44,13 @@ export class DeviceOrganisationInfos {
   alerts: DeviceOrganisationAlert[];
   worstAlert: DeviceOrganisationAlert | null;
 
-  get connectable(): DeviceConnectivityDetails | undefined {
-    return this.connectivity;
-  }
-
   constructor(params: DeviceOrganisationInfosDTO) {
     this.id = params.id;
     this.deviceId = params.deviceId;
     this.manufacturerId = params.manufacturerId;
     this.manufacturerLabel = params.manufacturerLabel;
+    this.latitude = params.latitude;
+    this.longitude = params.longitude;
     this.articleId = params.articleId;
     this.articleLabel = params.articleLabel;
     this.modelId = params.modelId;
@@ -61,15 +63,19 @@ export class DeviceOrganisationInfos {
     this.locationId = params.locationId;
     this.locationLabel = params.locationLabel;
     this.locationAddress = params.locationAddress;
+    this.locationLatitude = params.locationLatitude;
+    this.locationLongitude = params.locationLongitude;
     this.groupId = params.groupId;
     this.groupLabel = params.groupLabel;
     this.groupIcon = params.groupIcon;
     this.label = params.label;
     this.code = params.code;
+    this.description = params.description;
     this.imageId = params.imageId;
     this.tags = params.tags.slice();
     this.unrestricted = params.unrestricted;
     this.online = params.online;
+    this.path = params.path.map(dto => new PathCrumb({ ...dto })).sort((a, b) => b.index - a.index);
     this.meta = { ...params.meta };
     this.modelStatuses = params.modelStatuses.map(dto => new ModelStatusInfos(dto));
     this.status = new DeviceStatusDetails(params.status);
@@ -85,6 +91,8 @@ export interface DeviceOrganisationInfosDTO {
   deviceId: string;
   manufacturerId: string;
   manufacturerLabel: string;
+  latitude: number | null;
+  longitude: number | null;
   articleId: string;
   articleLabel: string;
   modelId: string;
@@ -97,15 +105,19 @@ export interface DeviceOrganisationInfosDTO {
   locationId: string | null;
   locationLabel: string | null;
   locationAddress: string | null;
+  locationLatitude: number | null;
+  locationLongitude: number | null;
   groupId: string | null;
   groupLabel: string | null;
   groupIcon: string | null;
   label: string;
   code: string;
+  description: string;
   imageId: string | null;
   tags: string[];
   unrestricted: boolean;
   online: number;
+  path: PathCrumbDTO[];
   meta: { [key: string]: string };
   modelStatuses: ModelStatusInfosDTO[];
   status: DeviceStatusDetailsDTO;
@@ -125,4 +137,6 @@ export interface DeviceOrganisationFilters {
   deviceOrganisationsIds?: string[] | null;
   otherDeviceOrganisationsIds?: string[] | null;
   search?: string | null;
+  entityType?: EntityType | null;
+  entitiesIds?: string[] | null;
 }

package/models/folders/folderInfos.ts

@@ -14,6 +14,8 @@ export class FolderInfos {
   colors: string[];
   imageId: string | null;
   path: PathCrumb[];
+  recursiveFoldersIds: string[];
+  recursiveDashboardsIds: string[];
 
   constructor(params: FolderInfosDTO) {
     this.id = params.id;
@@ -28,6 +30,8 @@ export class FolderInfos {
     this.colors = params.colors.slice();
     this.imageId = params.imageId;
     this.path = params.path.map(dto => new PathCrumb(dto)).sort((a, b) => b.index - a.index);
+    this.recursiveFoldersIds = params.recursiveFoldersIds ? params.recursiveFoldersIds.slice() : [];
+    this.recursiveDashboardsIds = params.recursiveDashboardsIds ? params.recursiveDashboardsIds.slice() : [];
   }
 }
 
@@ -44,6 +48,8 @@ export interface FolderInfosDTO {
   colors: string[];
   imageId: string | null;
   path: PathCrumbDTO[];
+  recursiveFoldersIds?: string[];
+  recursiveDashboardsIds?: string[];
 }
 
 export interface FolderFilters {

package/models/groups/groupInfos.ts

@@ -1,5 +1,4 @@
-import type { PathCrumbDTO } from "../shared/pathCrumb";
-import { PathCrumb } from "../shared/pathCrumb";
+import { PathCrumb, type PathCrumbDTO } from "../shared/pathCrumb";
 
 export class GroupInfos {
     id: string;

package/models/index.ts

@@ -19,15 +19,17 @@ export * from "./dashboardShallowDatePresets";          // No service
 export * from "./dashboardShallowEntityPresets";        // No service
 export * from "./dashboardShallows";
 export * from "./dashboardShallowVariables";            // No service
+export * from "./dashboardShallowWidgets";              // No service
 export * from "./dashboardVariables";                   // No service
 export * from "./dashboardVariableValues";              // No service
 export * from "./dataCategories";
 export * from "./dataDefinitions";
 export * from "./dataDefinitionMappings";               // No service
 export * from "./deviceConnectivities";
+export * from "./deviceDataDefinitions";
+export * from "./deviceExplorerElements";
 export * from "./deviceOrganisations";
 export * from "./deviceStatuses";
-export * from "./extensionApplications";
 export * from "./folders";
 export * from "./groups";
 export * from "./locations";
@@ -36,8 +38,10 @@ export * from "./models";
 export * from "./modelStatuses";                        // No service
 export * from "./organisations";
 export * from "./permissionCategories";
+export * from "./playlists";
 export * from "./roleOrganisations";
 export * from "./roleOrganisationTypes";
+export * from "./roles";
 export * from "./routes";
 export * from "./scenarioDeviceOrganisations";
 export * from "./scenarioOrganisations";

package/models/locations/locationInfos.ts

@@ -1,3 +1,4 @@
+import type { EntityType } from '@dative-gpi/foundation-shared-domain/enums';
 import { Address, type AddressDTO } from "@dative-gpi/foundation-shared-domain/models";
 
 export class LocationInfos {
@@ -46,4 +47,6 @@ export interface LocationFilters {
   locationsIds?: string[] | null;
   modelsIds?: string[] | null;
   search?: string | null;
+  entityType?: EntityType | null;
+  entitiesIds?: string[] | null;
 }

package/models/playlists/index.ts

@@ -0,0 +1,3 @@
+export * from './playlistInfos';
+export * from './playlistDashboard';
+export * from './playlistDetails';

package/models/playlists/playlistDashboard.ts

@@ -0,0 +1,31 @@
+import type { DashboardType } from '@dative-gpi/foundation-shared-domain/enums';
+
+export class PlaylistDashboard
+{
+  id: string;
+  dashboardScopedId: string;
+  dashboardType: DashboardType;
+  index: number;
+
+  constructor(params: PlaylistDashboardDTO)
+  {
+      this.id = params.id;
+      this.dashboardScopedId = params.dashboardScopedId;
+      this.dashboardType = params.dashboardType as DashboardType;
+      this.index = params.index;
+  }
+}
+
+export interface PlaylistDashboardDTO
+{
+    id: string;
+    dashboardScopedId: string;
+    dashboardType: number;
+    index: number;
+}
+
+export interface CreatePlaylistDashboardDTO {
+    dashboardScopedId: string;
+    dashboardType: number;
+    index: number;
+}

package/models/playlists/playlistDetails.ts

@@ -0,0 +1,32 @@
+import { PlaylistInfos, type PlaylistInfosDTO } from "./playlistInfos";
+import type { CreatePlaylistDashboardDTO } from "./playlistDashboard";
+
+export class PlaylistDetails extends PlaylistInfos {
+
+  constructor(params: PlaylistDetailsDTO) {
+    super(params);
+  }
+}
+
+export interface PlaylistDetailsDTO extends PlaylistInfosDTO {
+}
+
+export interface CreatePlaylistDTO {
+  label: string;
+  description: string;
+  icon: string;
+  code: string;
+  looped: boolean;
+  delay: number;
+  dashboards: CreatePlaylistDashboardDTO[];
+}
+
+export interface UpdatePlaylistDTO {
+  label: string;
+  description: string;
+  icon: string;
+  code: string;
+  looped: boolean;
+  delay: number;
+  dashboards: CreatePlaylistDashboardDTO[];
+}

package/models/playlists/playlistInfos.ts

@@ -0,0 +1,39 @@
+import { PlaylistDashboard, type PlaylistDashboardDTO } from './playlistDashboard';
+
+export class PlaylistInfos {
+  id: string;
+  label: string;
+  description: string;
+  icon: string;
+  code: string;
+  looped: boolean;
+  delay: number;
+  dashboards: PlaylistDashboard[];
+
+  constructor(params: PlaylistInfosDTO) {
+    this.id = params.id;
+    this.label = params.label;
+    this.description = params.description;
+    this.icon = params.icon;
+    this.code = params.code;
+    this.looped = params.looped;
+    this.delay = params.delay;
+    this.dashboards = params.dashboards.map((d: PlaylistDashboardDTO) => new PlaylistDashboard(d));
+  }
+}
+
+export interface PlaylistInfosDTO {
+  id: string;
+  label: string;
+  description: string;
+  icon: string;
+  code: string;
+  looped: boolean;
+  delay: number;
+  dashboards: PlaylistDashboardDTO[];
+}
+
+export interface PlaylistFilters {
+  playlistsIds?: string[] | null;
+  search?: string | null;
+}

package/models/roleOrganisations/roleOrganisationDetails.ts

@@ -1,18 +1,28 @@
+import { RoleTranslation, type RoleTranslationDTO } from '@dative-gpi/foundation-core-domain/models';
 import { RoleOrganisationInfos, type RoleOrganisationInfosDTO } from "./roleOrganisationInfos";
 import { type RoleType } from "@dative-gpi/foundation-shared-domain/enums";
 
 export class RoleOrganisationDetails extends RoleOrganisationInfos {
+  labelDefault: string;
   description: string;
+  descriptionDefault: string;
+  translations: RoleTranslation[];
 
   constructor(params: RoleOrganisationDetailsDTO) {
     super(params);
 
+    this.labelDefault = params.labelDefault;
     this.description = params.description;
+    this.descriptionDefault = params.descriptionDefault;
+    this.translations = params.translations.map(t => new RoleTranslation(t));
   }
 }
 
 export interface RoleOrganisationDetailsDTO extends RoleOrganisationInfosDTO {
+  labelDefault: string;
   description: string;
+  descriptionDefault: string;
+  translations: RoleTranslationDTO[];
 }
 
 export interface CreateRoleOrganisationDTO {
@@ -23,6 +33,7 @@ export interface CreateRoleOrganisationDTO {
   label: string;
   description: string;
   tags: string[];
+  translations: RoleTranslationDTO[];
 }
 
 export interface UpdateRoleOrganisationDTO {
@@ -32,4 +43,5 @@ export interface UpdateRoleOrganisationDTO {
   description: string;
   tags: string[];
   permissionsIds: string[];
+  translations: RoleTranslationDTO[];
 }

package/models/roles/index.ts

@@ -0,0 +1 @@
+export * from "./roleTranslation";

package/models/roles/roleTranslation.ts

@@ -0,0 +1,17 @@
+export class RoleTranslation {
+  languageCode: string;
+  label: string;
+  description: string;
+
+  constructor(params: RoleTranslationDTO) {
+    this.languageCode = params.languageCode;
+    this.label = params.label;
+    this.description = params.description;
+  }
+}
+
+export interface RoleTranslationDTO {
+  languageCode: string;
+  label: string;
+  description: string;
+}

package/models/scenarioDeviceOrganisations/scenarioDeviceOrganisationDetails.ts

@@ -2,6 +2,7 @@ import type { CreateTimeRangeDTO } from "../shared/timeRange";
 import type { ScenarioDeviceOrganisationInfosDTO } from "./scenarioDeviceOrganisationInfos";
 import { ScenarioDeviceOrganisationInfos } from "./scenarioDeviceOrganisationInfos";
 import type { CreateScenarioParameterOverrideDTO } from "../scenarios/scenarioParameterOverride";
+import type { ApplicationScope } from "@dative-gpi/foundation-shared-domain/enums";
 
 
 export class ScenarioDeviceOrganisationDetails extends ScenarioDeviceOrganisationInfos {
@@ -16,32 +17,40 @@ export interface ScenarioDeviceOrganisationDetailsDTO extends ScenarioDeviceOrga
 }
 
 export interface CreateScenarioDeviceOrganisationDTO {
-  deprecatedScenarioId: string;
+  scenarioId: string;
+  scenarioScope: ApplicationScope;
   deviceOrganisationId: string;
   overrideTimeRanges: boolean;
-  timeRanges: CreateTimeRangeDTO[] | null;
+  timeRanges: CreateTimeRangeDTO[];
+  overrideDelay: boolean;
   delay: number | null;
   warnDeviceManager: boolean;
   userOrganisationsIds: string[];
-  overrideParameters: CreateScenarioParameterOverrideDTO[];
+  overrideParameters: boolean;
+  parameters: CreateScenarioParameterOverrideDTO[];
 }
 
-export interface CreateManyScenarioDeviceOrganisationDTO {
-  deprecatedScenarioId: string;
+export interface UpsertScenarioDeviceOrganisationDTO {
+  scenarioId: string;
+  scenarioScope: ApplicationScope;
   deviceOrganisationsIds: string[];
   overrideTimeRanges: boolean;
-  timeRanges: CreateTimeRangeDTO[] | null;
+  timeRanges: CreateTimeRangeDTO[];
+  overrideDelay: boolean;
   delay: number | null;
   warnDeviceManager: boolean;
   userOrganisationsIds: string[];
-  overrideParameters: CreateScenarioParameterOverrideDTO[];
+  overrideParameters: boolean;
+  parameters: CreateScenarioParameterOverrideDTO[];
 }
 
 export interface UpdateScenarioDeviceOrganisationDTO {
   overrideTimeRanges: boolean;
-  timeRanges: CreateTimeRangeDTO[] | null;
+  timeRanges: CreateTimeRangeDTO[];
   warnDeviceManager: boolean;
+  overrideDelay: boolean;
   delay: number | null;
   userOrganisationsIds: string[];
-  overrideParameters: CreateScenarioParameterOverrideDTO[];
+  overrideParameters: boolean;
+  parameters: CreateScenarioParameterOverrideDTO[];
 }