@northern.tech/store 0.1.3 → 0.2.1

package/dist/storehooks.js

@@ -1,40 +1,10 @@
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __restKey = (key) => typeof key === "symbol" ? key : key + "";
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
@@ -59,33 +29,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 
 // ../../node_modules/pluralize/pluralize.js
 var require_pluralize = __commonJS({
-  "../../node_modules/pluralize/pluralize.js"(exports2, module2) {
+  "../../node_modules/pluralize/pluralize.js"(exports, module2) {
     "use strict";
     (function(root, pluralize2) {
-      if (typeof require === "function" && typeof exports2 === "object" && typeof module2 === "object") {
+      if (typeof require === "function" && typeof exports === "object" && typeof module2 === "object") {
         module2.exports = pluralize2();
       } else if (typeof define === "function" && define.amd) {
         define(function() {
@@ -94,7 +44,7 @@ var require_pluralize = __commonJS({
       } else {
         root.pluralize = pluralize2();
       }
-    })(exports2, function() {
+    })(exports, function() {
       var pluralRules = [];
       var singularRules = [];
       var uncountables = {};
@@ -467,7 +417,7 @@ var chartTypes = {
 };
 var emptyChartSelection = { software: "", group: "", chartType: chartTypes.bar.key, attribute: "artifact_name" };
 var defaultReportType = "distribution";
-var defaultReports = [__spreadProps(__spreadValues({}, emptyChartSelection), { group: null, attribute: "artifact_name", type: defaultReportType })];
+var defaultReports = [{ ...emptyChartSelection, group: null, attribute: "artifact_name", type: defaultReportType }];
 var locations = {};
 var PLANS = {
   os: {
@@ -793,13 +743,14 @@ var emptyUiPermissions = Object.freeze({
   deployments: [],
   groups: Object.freeze({}),
   releases: Object.freeze({}),
+  tenantManagement: [],
   userManagement: []
 });
 var emptyRole = Object.freeze({
   name: void 0,
   description: "",
   permissions: [],
-  uiPermissions: Object.freeze(__spreadValues({}, emptyUiPermissions))
+  uiPermissions: Object.freeze({ ...emptyUiPermissions })
 });
 
 // src/deploymentsSlice/constants.ts
@@ -828,11 +779,12 @@ var deploymentStatesToSubstates = {
   pending: [deploymentSubstates.pending],
   successes: [deploymentSubstates.success, deploymentSubstates.alreadyInstalled, deploymentSubstates.noartifact]
 };
-var deploymentStatesToSubstatesWithSkipped = __spreadProps(__spreadValues({}, deploymentStatesToSubstates), {
+var deploymentStatesToSubstatesWithSkipped = {
+  ...deploymentStatesToSubstates,
   failures: [deploymentSubstates.failure],
   skipped: [deploymentSubstates.aborted, deploymentSubstates.noartifact, deploymentSubstates.alreadyInstalled, deploymentSubstates.decommissioned],
   successes: [deploymentSubstates.success]
-});
+};
 var installationSubstatesMap = {
   download: {
     title: "download",
@@ -877,8 +829,8 @@ var DEPLOYMENT_STATES = {
 var listDefaultsByState = {
   [DEPLOYMENT_STATES.inprogress]: { page: 1, perPage: 10 },
   [DEPLOYMENT_STATES.pending]: { page: 1, perPage: 10 },
-  [DEPLOYMENT_STATES.scheduled]: __spreadValues({}, DEVICE_LIST_DEFAULTS),
-  [DEPLOYMENT_STATES.finished]: __spreadValues({}, DEVICE_LIST_DEFAULTS),
+  [DEPLOYMENT_STATES.scheduled]: { ...DEVICE_LIST_DEFAULTS },
+  [DEPLOYMENT_STATES.finished]: { ...DEVICE_LIST_DEFAULTS },
   sort: { direction: SORTING_OPTIONS.desc }
 };
 var DEFAULT_PENDING_INPROGRESS_COUNT = 10;
@@ -1040,6 +992,13 @@ var SSO_TYPES = {
     configDetails: [{ key: "startURL", label: "Start Url", getValue: getOidcStartUrl }]
   }
 };
+var AUDIT_LOGS_TYPES = [
+  { title: "Artifact", queryParameter: "object_type", value: "artifact" },
+  { title: "Deployment", queryParameter: "object_deployment_name", value: "deployment" },
+  { title: "Device", queryParameter: "object_id", value: "device" },
+  { title: "User", queryParameter: "object_id", value: "user" }
+];
+var SP_AUDIT_LOGS_TYPES = [AUDIT_LOGS_TYPES[3], { title: "Tenant", queryParameter: "object_id", value: "tenant" }];
 var emptyWebhook = {
   description: "",
   enabled: true,
@@ -1088,10 +1047,12 @@ var permissionSetIds = {
   DeployToDevices: "DeployToDevices",
   ManageDevices: "ManageDevices",
   ManageReleases: "ManageReleases",
+  ManageTenants: "ManageTenants",
   ManageUsers: "ManageUsers",
   ReadAuditLogs: "ReadAuditLogs",
   ReadDevices: "ReadDevices",
   ReadReleases: "ReadReleases",
+  ReadTenants: "ReadTenants",
   ReadUsers: "ReadUsers",
   SuperUser: "SuperUser",
   UploadArtifacts: "UploadArtifacts"
@@ -1130,6 +1091,7 @@ var uiPermissionsById = {
     permissionSets: {
       groups: permissionSetIds.ManageDevices,
       releases: permissionSetIds.ManageReleases,
+      tenantManagement: permissionSetIds.ManageTenants,
       userManagement: permissionSetIds.ManageUsers
     },
     title: "Manage",
@@ -1143,6 +1105,7 @@ var uiPermissionsById = {
       auditlog: permissionSetIds.ReadAuditLogs,
       groups: permissionSetIds.ReadDevices,
       releases: permissionSetIds.ReadReleases,
+      tenantManagement: permissionSetIds.ReadTenants,
       userManagement: permissionSetIds.ReadUsers
     },
     title: "Read",
@@ -1167,6 +1130,7 @@ var uiPermissionsByArea = {
   auditlog: {
     endpoints: [{ path: /\/(auditlog)/i, types: [PermissionTypes.Get], uiPermissions: [uiPermissionsById.read] }],
     explanation: "Granting access to the audit log will allow tracing changes to devices, releases and user accounts, as well as providing information about deployments.",
+    key: "auditlog",
     uiPermissions: [uiPermissionsById.read],
     title: "System audit log"
   },
@@ -1177,6 +1141,7 @@ var uiPermissionsByArea = {
       { path: /\/(deployments\/config)/i, types: [PermissionTypes.Get, PermissionTypes.Put], uiPermissions: [uiPermissionsById.manage] }
     ],
     explanation: "Providing deploy permissions will allow deployments to be created using the releases and devices a user has access to.",
+    key: "deployments",
     uiPermissions: [uiPermissionsById.read, uiPermissionsById.deploy],
     title: "Deployments"
   },
@@ -1192,6 +1157,7 @@ var uiPermissionsByArea = {
       { path: /\/(deviceconnect\/devices)/i, types: [PermissionTypes.Get, PermissionTypes.Post], uiPermissions: [uiPermissionsById.connect] }
     ],
     explanation: "Device group management permissions control the degree to which devices in a group can be accessed and moved to other groups.",
+    key: "groups",
     scope: scopedPermissionAreas.groups.scopeType,
     uiPermissions: [uiPermissionsById.read, uiPermissionsById.manage, uiPermissionsById.deploy, uiPermissionsById.configure, uiPermissionsById.connect],
     title: "Group Management"
@@ -1211,22 +1177,35 @@ var uiPermissionsByArea = {
       }
     ],
     explanation: "Release permissions can be granted to allow artifact & release modifications, as well as the creation of new releases.",
+    key: "releases",
     scope: "ReleaseTags",
     uiPermissions: [uiPermissionsById.read, uiPermissionsById.manage, uiPermissionsById.upload],
     title: "Release Management"
   },
+  tenantManagement: {
+    endpoints: [
+      { path: /\/(tenantadm\/tenants)/i, types: [PermissionTypes.Get], uiPermissions: [uiPermissionsById.read] },
+      { path: /\/(tenantadm\/tenants)/i, types: [PermissionTypes.Post, PermissionTypes.Put], uiPermissions: [uiPermissionsById.manage] },
+      { path: /\/(users\/exists)/i, types: [PermissionTypes.Get], uiPermissions: [uiPermissionsById.manage] }
+    ],
+    explanation: "Tenant management permissions allow listing, creating and modifying child tenants",
+    key: "tenantManagement",
+    uiPermissions: [uiPermissionsById.read, uiPermissionsById.manage],
+    title: "Tenant Management"
+  },
   userManagement: {
     endpoints: [
       { path: /\/(useradm)/i, types: [PermissionTypes.Get], uiPermissions: [uiPermissionsById.read] },
       { path: /\/(useradm)/i, types: [PermissionTypes.Post], uiPermissions: [uiPermissionsById.manage] }
     ],
     explanation: "User management permissions should be granted carefully, as these allow privilege increases for any users managed by a user with user management permissions",
+    key: "userManagement",
     uiPermissions: [uiPermissionsById.read, uiPermissionsById.manage],
     title: "User Management"
   }
 };
 var permissionMapper = (permission) => permission.value;
-var itemUiPermissionsReducer = (accu, { item, uiPermissions }) => item ? __spreadProps(__spreadValues({}, accu), { [item]: uiPermissions }) : accu;
+var itemUiPermissionsReducer = (accu, { item, uiPermissions }) => item ? { ...accu, [item]: uiPermissions } : accu;
 var rolesById = Object.freeze({
   [staticRolesByName.admin]: {
     name: "Admin",
@@ -1234,56 +1213,87 @@ var rolesById = Object.freeze({
     description: "Full access",
     permissions: [],
     // permissions refers to the values returned from the backend
-    uiPermissions: __spreadProps(__spreadValues({}, emptyUiPermissions), {
+    uiPermissions: {
+      ...emptyUiPermissions,
       auditlog: uiPermissionsByArea.auditlog.uiPermissions.map(permissionMapper),
       deployments: uiPermissionsByArea.deployments.uiPermissions.map(permissionMapper),
       groups: { [ALL_DEVICES]: uiPermissionsByArea.groups.uiPermissions.map(permissionMapper) },
       releases: { [ALL_RELEASES]: uiPermissionsByArea.releases.uiPermissions.map(permissionMapper) },
       userManagement: uiPermissionsByArea.userManagement.uiPermissions.map(permissionMapper)
-    })
+    }
   },
   [staticRolesByName.readOnly]: {
     name: "Read Access",
     value: staticRolesByName.readOnly,
     description: "",
     permissions: [],
-    uiPermissions: __spreadProps(__spreadValues({}, emptyUiPermissions), {
+    uiPermissions: {
+      ...emptyUiPermissions,
       deployments: [uiPermissionsById.read.value],
       groups: { [ALL_DEVICES]: [uiPermissionsById.read.value] },
       releases: { [ALL_RELEASES]: [uiPermissionsById.read.value] },
       userManagement: [uiPermissionsById.read.value]
-    })
+    }
   },
   [staticRolesByName.ci]: {
     name: "Releases Manager",
     value: staticRolesByName.ci,
     description: "",
     permissions: [],
-    uiPermissions: __spreadProps(__spreadValues({}, emptyUiPermissions), {
+    uiPermissions: {
+      ...emptyUiPermissions,
       releases: { [ALL_RELEASES]: uiPermissionsByArea.releases.uiPermissions.map(permissionMapper) }
-    })
+    }
   },
   [staticRolesByName.deploymentsManager]: {
     name: "Deployments Manager",
     value: staticRolesByName.deploymentsManager,
     description: "",
     permissions: [],
-    uiPermissions: __spreadProps(__spreadValues({}, emptyUiPermissions), {
+    uiPermissions: {
+      ...emptyUiPermissions,
       deployments: uiPermissionsByArea.deployments.uiPermissions.map(permissionMapper),
       groups: { [ALL_DEVICES]: [uiPermissionsById.deploy.value, uiPermissionsById.read.value] },
       releases: { [ALL_RELEASES]: [uiPermissionsById.read.value] }
-    })
+    }
   },
   [staticRolesByName.terminalAccess]: {
     name: "Troubleshooting",
     value: staticRolesByName.terminalAccess,
     description: "Access to the troubleshooting features: Remote Terminal, File Transfer, Port Forwarding",
     permissions: [],
-    uiPermissions: __spreadProps(__spreadValues({}, emptyUiPermissions), {
+    uiPermissions: {
+      ...emptyUiPermissions,
       groups: { [ALL_DEVICES]: [uiPermissionsById.connect.value] }
-    })
+    }
   }
 });
+var serviceProviderRolesById = {
+  admin: {
+    name: "Admin",
+    value: staticRolesByName.admin,
+    description: "Full access",
+    permissions: [],
+    uiPermissions: {
+      ...emptyUiPermissions,
+      auditlog: uiPermissionsByArea.auditlog.uiPermissions.map(permissionMapper),
+      userManagement: uiPermissionsByArea.userManagement.uiPermissions.map(permissionMapper),
+      tenantManagement: uiPermissionsByArea.tenantManagement.uiPermissions.map(permissionMapper)
+    }
+  },
+  readOnly: {
+    name: "Read access",
+    value: staticRolesByName.admin,
+    description: "This role can see all linked organizations but cannot make any changes",
+    permissions: [],
+    uiPermissions: {
+      ...emptyUiPermissions,
+      auditlog: [uiPermissionsById.read.value],
+      userManagement: [uiPermissionsById.read.value],
+      tenantManagement: [uiPermissionsById.read.value]
+    }
+  }
+};
 var defaultPermissionSets = {
   [permissionSetIds.Basic]: {
     name: permissionSetIds.Basic,
@@ -1294,7 +1304,9 @@ var defaultPermissionSets = {
   },
   [permissionSetIds.SuperUser]: {
     name: permissionSetIds.SuperUser,
-    result: __spreadValues({}, rolesById[staticRolesByName.admin].uiPermissions)
+    result: {
+      ...rolesById[staticRolesByName.admin].uiPermissions
+    }
   },
   [permissionSetIds.ManageUsers]: {
     name: permissionSetIds.ManageUsers,
@@ -1314,6 +1326,18 @@ var defaultPermissionSets = {
       releases: { [ALL_RELEASES]: [uiPermissionsById.read.value] }
     }
   },
+  [permissionSetIds.ReadTenants]: {
+    name: permissionSetIds.ReadTenants,
+    result: {
+      tenantManagement: [uiPermissionsById.read.value]
+    }
+  },
+  [permissionSetIds.ManageTenants]: {
+    name: permissionSetIds.ManageTenants,
+    result: {
+      tenantManagement: [uiPermissionsById.manage.value]
+    }
+  },
   [permissionSetIds.ReadUsers]: {
     name: permissionSetIds.ReadUsers,
     result: {
@@ -1367,11 +1391,12 @@ var defaultPermissionSets = {
 };
 var USER_LOGOUT = "USER_LOGOUT";
 var OWN_USER_ID = "me";
-var rolesByName = __spreadProps(__spreadValues({}, staticRolesByName), {
+var rolesByName = {
+  ...staticRolesByName,
   deploymentCreation: { action: "CREATE_DEPLOYMENT", object: { type: "DEVICE_GROUP", value: void 0 } },
   groupAccess: { action: "VIEW_DEVICE", object: { type: "DEVICE_GROUP", value: void 0 } },
   userManagement: { action: "http", object: { type: "any", value: `${useradmApiUrlv1}/.*` } }
-});
+};
 var twoFAStates = {
   enabled: "enabled",
   disabled: "disabled",
@@ -1459,7 +1484,10 @@ var appSlice = (0, import_toolkit.createSlice)({
   initialState,
   reducers: {
     setFeatures: (state, action) => {
-      state.features = __spreadValues(__spreadValues({}, state.features), action.payload);
+      state.features = {
+        ...state.features,
+        ...action.payload
+      };
     },
     setSnackbar: (state, { payload }) => {
       let { message, autoHideDuration, action, children, onClick, onClose } = payload;
@@ -1484,7 +1512,10 @@ var appSlice = (0, import_toolkit.createSlice)({
       state.hostedAnnouncement = action.payload;
     },
     setSearchState: (state, action) => {
-      state.searchState = __spreadValues(__spreadValues({}, state.searchState), action.payload);
+      state.searchState = {
+        ...state.searchState,
+        ...action.payload
+      };
     },
     setOfflineThreshold: (state, action) => {
       state.offlineThreshold = action.payload;
@@ -1495,20 +1526,23 @@ var appSlice = (0, import_toolkit.createSlice)({
     },
     uploadProgress: (state, action) => {
       const { id, progress: progress2 } = action.payload;
-      state.uploadsById[id] = __spreadProps(__spreadValues({}, state.uploadsById[id]), {
+      state.uploadsById[id] = {
+        ...state.uploadsById[id],
         progress: progress2
-      });
+      };
     },
     cleanUpUpload: (state, action) => {
-      var _a;
-      const _b2 = state.uploadsById, { [_a = action.payload]: current } = _b2, remainder = __objRest(_b2, [__restKey(_a)]);
+      const { [action.payload]: current, ...remainder } = state.uploadsById;
       state.uploadsById = remainder;
     },
     setVersionInformation: (state, action) => {
-      state.versionInformation = __spreadValues(__spreadValues({}, state.versionInformation), action.payload);
+      state.versionInformation = {
+        ...state.versionInformation,
+        ...action.payload
+      };
     },
     setEnvironmentData: (state, action) => {
-      return __spreadValues(__spreadValues({}, state), action.payload);
+      return { ...state, ...action.payload };
     }
   }
 });
@@ -1540,7 +1574,7 @@ var initialState2 = {
       sourceWindow: -1
     },
     binaryDeltaLimits: {
-      timeout: __spreadProps(__spreadValues({}, limitDefault), { default: 60, max: 3600, min: 60 }),
+      timeout: { ...limitDefault, default: 60, max: 3600, min: 60 },
       sourceWindow: limitDefault,
       inputWindow: limitDefault,
       duplicatesWindow: limitDefault,
@@ -1550,10 +1584,10 @@ var initialState2 = {
   deploymentDeviceLimit: 5e3,
   selectedDeviceIds: [],
   selectionState: {
-    finished: __spreadProps(__spreadValues({}, DEVICE_LIST_DEFAULTS), { endDate: void 0, search: "", selection: [], startDate: void 0, total: 0, type: "" }),
-    inprogress: __spreadProps(__spreadValues({}, DEVICE_LIST_DEFAULTS), { perPage: DEFAULT_PENDING_INPROGRESS_COUNT, selection: [] }),
-    pending: __spreadProps(__spreadValues({}, DEVICE_LIST_DEFAULTS), { perPage: DEFAULT_PENDING_INPROGRESS_COUNT, selection: [] }),
-    scheduled: __spreadProps(__spreadValues({}, DEVICE_LIST_DEFAULTS), { selection: [] }),
+    finished: { ...DEVICE_LIST_DEFAULTS, endDate: void 0, search: "", selection: [], startDate: void 0, total: 0, type: "" },
+    inprogress: { ...DEVICE_LIST_DEFAULTS, perPage: DEFAULT_PENDING_INPROGRESS_COUNT, selection: [] },
+    pending: { ...DEVICE_LIST_DEFAULTS, perPage: DEFAULT_PENDING_INPROGRESS_COUNT, selection: [] },
+    scheduled: { ...DEVICE_LIST_DEFAULTS, selection: [] },
     general: {
       state: DEPLOYMENT_ROUTES.active.key,
       showCreationDialog: false,
@@ -1569,40 +1603,55 @@ var deploymentsSlice = (0, import_toolkit2.createSlice)({
   initialState: initialState2,
   reducers: {
     createdDeployment: (state, action) => {
-      state.byId[action.payload.id] = __spreadValues(__spreadValues({}, deploymentPrototype), action.payload);
+      state.byId[action.payload.id] = {
+        ...deploymentPrototype,
+        ...action.payload
+      };
       state.byStatus[DEPLOYMENT_STATES.pending].total = state.byStatus[DEPLOYMENT_STATES.pending].total + 1;
       state.byStatus[DEPLOYMENT_STATES.pending].deploymentIds = [...state.byStatus.pending.deploymentIds, action.payload.id];
       state.selectionState[DEPLOYMENT_STATES.pending].selection = [action.payload.id, ...state.selectionState[DEPLOYMENT_STATES.pending].selection], state.selectionState[DEPLOYMENT_STATES.pending].total = state.selectionState[DEPLOYMENT_STATES.pending].total + 1;
     },
     removedDeployment: (state, action) => {
-      var _a;
-      const _b2 = state.byId, { [_a = action.payload]: removedDeployment } = _b2, remainder = __objRest(_b2, [__restKey(_a)]);
+      const { [action.payload]: removedDeployment, ...remainder } = state.byId;
       state.byId = remainder;
     },
     receivedDeployment: (state, action) => {
-      state.byId[action.payload.id] = __spreadValues(__spreadValues({}, state.byId[action.payload.id] || {}), action.payload);
+      state.byId[action.payload.id] = {
+        ...state.byId[action.payload.id] || {},
+        ...action.payload
+      };
     },
     receivedDeploymentDeviceLog: (state, action) => {
       const { id, deviceId, log } = action.payload;
-      const deployment = __spreadValues(__spreadValues({}, deploymentPrototype), state.byId[id]);
-      state.byId[id] = __spreadProps(__spreadValues({}, deployment), {
-        devices: __spreadProps(__spreadValues({}, deployment.devices), {
-          [deviceId]: __spreadProps(__spreadValues({}, deployment.devices[deviceId]), {
+      const deployment = {
+        ...deploymentPrototype,
+        ...state.byId[id]
+      };
+      state.byId[id] = {
+        ...deployment,
+        devices: {
+          ...deployment.devices,
+          [deviceId]: {
+            ...deployment.devices[deviceId],
             log
-          })
-        })
-      });
+          }
+        }
+      };
     },
     receivedDeploymentDevices: (state, action) => {
       const { id, devices, selectedDeviceIds, totalDeviceCount } = action.payload;
-      state.byId[id] = __spreadProps(__spreadValues({}, state.byId[id]), {
+      state.byId[id] = {
+        ...state.byId[id],
         devices,
         totalDeviceCount
-      });
+      };
       state.selectedDeviceIds = selectedDeviceIds;
     },
     receivedDeployments: (state, action) => {
-      state.byId = __spreadValues(__spreadValues({}, state.byId), action.payload);
+      state.byId = {
+        ...state.byId,
+        ...action.payload
+      };
     },
     receivedDeploymentsForStatus: (state, action) => {
       const { status, deploymentIds, total } = action.payload;
@@ -1644,9 +1693,9 @@ var initialState3 = {
     [DEVICE_STATES.preauth]: { deviceIds: [], total: 0 },
     [DEVICE_STATES.rejected]: { deviceIds: [], total: 0 }
   },
-  deviceList: __spreadProps(__spreadValues({
-    deviceIds: []
-  }, DEVICE_LIST_DEFAULTS), {
+  deviceList: {
+    deviceIds: [],
+    ...DEVICE_LIST_DEFAULTS,
     selectedAttributes: [],
     selectedIssues: [],
     selection: [],
@@ -1657,7 +1706,7 @@ var initialState3 = {
     },
     state: DEVICE_STATES.accepted,
     total: 0
-  }),
+  },
   filters: [
     // { key: 'device_type', value: 'raspberry', operator: '$eq', scope: 'inventory' }
   ],
@@ -1692,49 +1741,59 @@ var devicesSlice = (0, import_toolkit3.createSlice)({
     },
     addToGroup: (state, action) => {
       const { group, deviceIds } = action.payload;
-      const maybeExistingGroup = __spreadValues({
+      const maybeExistingGroup = {
         filters: [],
-        deviceIds: []
-      }, state.groups.byId[group]);
-      state.groups.byId[group] = __spreadProps(__spreadValues({}, maybeExistingGroup), {
+        deviceIds: [],
+        ...state.groups.byId[group]
+      };
+      state.groups.byId[group] = {
+        ...maybeExistingGroup,
         deviceIds: [...maybeExistingGroup.deviceIds, ...deviceIds].filter(import_helpers.duplicateFilter),
         total: (maybeExistingGroup.total || 0) + 1
-      });
+      };
     },
     removeFromGroup: (state, action) => {
       const { group, deviceIds: removedIds } = action.payload;
-      const _a = state.groups.byId[group] || {}, { deviceIds = [], total = 0 } = _a, maybeExistingGroup = __objRest(_a, ["deviceIds", "total"]);
-      const changedGroup = __spreadProps(__spreadValues({}, maybeExistingGroup), {
+      const { deviceIds = [], total = 0, ...maybeExistingGroup } = state.groups.byId[group] || {};
+      const changedGroup = {
+        ...maybeExistingGroup,
         deviceIds: deviceIds.filter((id) => !removedIds.includes(id)),
         total: Math.max(total - removedIds.length, 0)
-      });
+      };
       if (changedGroup.total || changedGroup.deviceIds.length) {
         state.groups.byId[group] = changedGroup;
         return;
       } else if (state.groups.selectedGroup === group) {
         state.groups.selectedGroup = void 0;
       }
-      const _b2 = state.groups.byId, { [group]: removal } = _b2, remainingById = __objRest(_b2, [__restKey(group)]);
+      const { [group]: removal, ...remainingById } = state.groups.byId;
       state.groups.byId = remainingById;
     },
     addGroup: (state, action) => {
       const { groupName, group } = action.payload;
-      state.groups.byId[groupName] = __spreadValues(__spreadValues({}, state.groups.byId[groupName]), group);
+      state.groups.byId[groupName] = {
+        ...state.groups.byId[groupName],
+        ...group
+      };
     },
     selectGroup: (state, { payload: group }) => {
       state.deviceList.deviceIds = state.groups.byId[group] && state.groups.byId[group].deviceIds.length > 0 ? state.groups.byId[group].deviceIds : [];
       state.groups.selectedGroup = group;
     },
     removeGroup: (state, action) => {
-      var _a;
-      const _b2 = state.groups.byId, { [_a = action.payload]: removal } = _b2, remainingById = __objRest(_b2, [__restKey(_a)]);
+      const { [action.payload]: removal, ...remainingById } = state.groups.byId;
       state.groups.byId = remainingById;
       state.groups.selectedGroup = state.groups.selectedGroup === action.payload ? void 0 : state.groups.selectedGroup;
     },
     setDeviceListState: (state, action) => {
-      state.deviceList = __spreadProps(__spreadValues(__spreadValues({}, state.deviceList), action.payload), {
-        sort: __spreadValues(__spreadValues({}, state.deviceList.sort), action.payload.sort)
-      });
+      state.deviceList = {
+        ...state.deviceList,
+        ...action.payload,
+        sort: {
+          ...state.deviceList.sort,
+          ...action.payload.sort
+        }
+      };
     },
     setFilterAttributes: (state, action) => {
       state.filteringAttributes = action.payload;
@@ -1743,7 +1802,10 @@ var devicesSlice = (0, import_toolkit3.createSlice)({
       state.filteringAttributesConfig = action.payload;
     },
     receivedDevices: (state, action) => {
-      state.byId = __spreadValues(__spreadValues({}, state.byId), action.payload);
+      state.byId = {
+        ...state.byId,
+        ...action.payload
+      };
     },
     setDeviceFilters: (state, action) => {
       if ((0, import_helpers.deepCompare)(action.payload, state.filters)) {
@@ -1774,7 +1836,10 @@ var devicesSlice = (0, import_toolkit3.createSlice)({
       state.limit = action.payload;
     },
     receivedDevice: (state, action) => {
-      state.byId[action.payload.id] = __spreadValues(__spreadValues({}, state.byId[action.payload.id]), action.payload);
+      state.byId[action.payload.id] = {
+        ...state.byId[action.payload.id],
+        ...action.payload
+      };
     },
     maybeUpdateDevicesByStatus: (state, action) => {
       const { deviceId, authId } = action.payload;
@@ -1795,15 +1860,17 @@ var import_toolkit4 = require("@reduxjs/toolkit");
 var sliceName4 = "monitor";
 var initialState4 = {
   alerts: {
-    alertList: __spreadProps(__spreadValues({}, DEVICE_LIST_DEFAULTS), { total: 0 }),
+    alertList: { ...DEVICE_LIST_DEFAULTS, total: 0 },
     byDeviceId: {}
   },
   issueCounts: {
-    byType: Object.values(DEVICE_ISSUE_OPTIONS).reduce((accu, { key }) => __spreadProps(__spreadValues({}, accu), { [key]: { filtered: 0, total: 0 } }), {})
+    byType: Object.values(DEVICE_ISSUE_OPTIONS).reduce((accu, { key }) => ({ ...accu, [key]: { filtered: 0, total: 0 } }), {})
   },
   settings: {
     global: {
-      channels: __spreadValues({}, Object.keys(alertChannels).reduce((accu, item) => __spreadProps(__spreadValues({}, accu), { [item]: { enabled: true } }), {}))
+      channels: {
+        ...Object.keys(alertChannels).reduce((accu, item) => ({ ...accu, [item]: { enabled: true } }), {})
+      }
     }
   }
 };
@@ -1821,14 +1888,14 @@ var monitorSlice = (0, import_toolkit4.createSlice)({
     },
     receiveLatestDeviceAlerts: (state, action) => {
       const { deviceId, alerts } = action.payload;
-      state.alerts.byDeviceId[deviceId] = __spreadProps(__spreadValues({}, state.alerts.byDeviceId[deviceId]), { latest: alerts });
+      state.alerts.byDeviceId[deviceId] = { ...state.alerts.byDeviceId[deviceId], latest: alerts };
     },
     receiveDeviceIssueCounts: (state, action) => {
       const { issueType, counts } = action.payload;
       state.issueCounts.byType[issueType] = counts;
     },
     setAlertListState: (state, action) => {
-      state.alerts.alertList = __spreadValues(__spreadValues({}, state.alerts.alertList), action.payload);
+      state.alerts.alertList = { ...state.alerts.alertList, ...action.payload };
     }
   }
 });
@@ -1852,7 +1919,7 @@ var onboardingSlice = (0, import_toolkit5.createSlice)({
   initialState: initialState5,
   reducers: {
     setOnboardingState: (state, action) => {
-      return __spreadValues(__spreadValues({}, state), action.payload);
+      return { ...state, ...action.payload };
     },
     setDemoArtifactPort: (state, action) => {
       state.demoArtifactPort = action.payload;
@@ -1890,21 +1957,23 @@ var initialState6 = {
     brand: ""
   },
   intentId: null,
+  tenantList: {
+    ...TENANT_LIST_DEFAULT,
+    total: 0,
+    tenants: [],
+    selectedTenant: null,
+    sort: {
+      direction: SORTING_OPTIONS.desc,
+      key: "name"
+    }
+  },
   organization: {
-    tenantList: __spreadProps(__spreadValues({}, TENANT_LIST_DEFAULT), {
-      total: 0,
-      tenants: [],
-      selectedTenant: null,
-      sort: {
-        direction: SORTING_OPTIONS.desc,
-        key: "name"
-      }
-    })
     // id, name, status, tenant_token, plan
   },
   auditlog: {
     events: [],
-    selectionState: __spreadProps(__spreadValues({}, DEVICE_LIST_DEFAULTS), {
+    selectionState: {
+      ...DEVICE_LIST_DEFAULTS,
       detail: void 0,
       endDate: void 0,
       selectedIssue: void 0,
@@ -1913,7 +1982,7 @@ var initialState6 = {
       total: 0,
       type: void 0,
       user: void 0
-    })
+    }
   },
   externalDeviceIntegrations: [
     // { <connection_string|x509|...>, id, provider }
@@ -1936,7 +2005,10 @@ var organizationSlice = (0, import_toolkit6.createSlice)({
       state.auditlog.selectionState.total = total;
     },
     setAuditLogState: (state, action) => {
-      state.auditlog.selectionState = __spreadValues(__spreadValues({}, state.auditlog.selectionState), action.payload);
+      state.auditlog.selectionState = {
+        ...state.auditlog.selectionState,
+        ...action.payload
+      };
     },
     receiveCurrentCard: (state, action) => {
       state.card = action.payload;
@@ -1945,12 +2017,10 @@ var organizationSlice = (0, import_toolkit6.createSlice)({
       state.intentId = action.payload;
     },
     setOrganization: (state, action) => {
-      state.organization = __spreadProps(__spreadValues(__spreadValues({}, state.organization), action.payload), {
-        tenantList: __spreadValues(__spreadValues({}, state.organization.tenantList), action.payload.tenantList)
-      });
+      state.organization = { ...state.organization, ...action.payload };
     },
     setTenantListState: (state, action) => {
-      state.organization.tenantList = action.payload;
+      state.tenantList = action.payload;
     },
     receiveExternalDeviceIntegrations: (state, action) => {
       state.externalDeviceIntegrations = action.payload;
@@ -2010,7 +2080,8 @@ var initialState7 = {
     }
     */
   },
-  releasesList: __spreadProps(__spreadValues({}, DEVICE_LIST_DEFAULTS), {
+  releasesList: {
+    ...DEVICE_LIST_DEFAULTS,
     searchedIds: [],
     releaseIds: [],
     selection: [],
@@ -2024,7 +2095,7 @@ var initialState7 = {
     selectedTags: [],
     total: 0,
     type: ""
-  }),
+  },
   tags: [],
   updateTypes: [],
   /*
@@ -2050,8 +2121,7 @@ var releaseSlice = (0, import_toolkit7.createSlice)({
       state.updateTypes = action.payload;
     },
     removeRelease: (state, action) => {
-      var _a;
-      const _b2 = state.byId, { [_a = action.payload]: toBeRemoved } = _b2, byId = __objRest(_b2, [__restKey(_a)]);
+      const { [action.payload]: toBeRemoved, ...byId } = state.byId;
       state.byId = byId;
       state.selectedRelease = action.payload === state.selectedRelease ? null : state.selectedRelease;
     },
@@ -2084,8 +2154,12 @@ var initialState8 = {
     previousPhases: [],
     retries: 0
   },
-  permissionSetsById: __spreadValues({}, defaultPermissionSets),
-  rolesById: __spreadValues({}, rolesById),
+  permissionSetsById: {
+    ...defaultPermissionSets
+  },
+  rolesById: {
+    ...rolesById
+  },
   settingsInitialized: false,
   showConnectDeviceDialog: false,
   showFeedbackDialog: false,
@@ -2125,13 +2199,15 @@ var usersSlice = (0, import_toolkit8.createSlice)({
       state.byId[0] = action.payload;
     },
     removedUser: (state, action) => {
-      var _a;
-      const _b2 = state.byId, { [_a = action.payload]: removedUser } = _b2, byId = __objRest(_b2, [__restKey(_a)]);
+      const { [action.payload]: removedUser, ...byId } = state.byId;
       state.byId = byId;
       state.currentUser = state.currentUser === action.payload ? null : state.currentUser;
     },
     updatedUser: (state, action) => {
-      state.byId[action.payload.id] = __spreadValues(__spreadValues({}, state.byId[action.payload.id]), action.payload);
+      state.byId[action.payload.id] = {
+        ...state.byId[action.payload.id],
+        ...action.payload
+      };
     },
     receivedPermissionSets: (state, action) => {
       state.permissionSetsById = action.payload;
@@ -2140,11 +2216,13 @@ var usersSlice = (0, import_toolkit8.createSlice)({
       state.rolesById = action.payload;
     },
     createdRole: (state, action) => {
-      state.rolesById[action.payload.name] = __spreadValues(__spreadValues({}, state.rolesById[action.payload.name]), action.payload);
+      state.rolesById[action.payload.name] = {
+        ...state.rolesById[action.payload.name],
+        ...action.payload
+      };
     },
     removedRole: (state, action) => {
-      var _a;
-      const _b2 = state.rolesById, { [_a = action.payload]: toBeRemoved } = _b2, rolesById2 = __objRest(_b2, [__restKey(_a)]);
+      const { [action.payload]: toBeRemoved, ...rolesById2 } = state.rolesById;
       state.rolesById = rolesById2;
     },
     setCustomColumns: (state, action) => {
@@ -2152,18 +2230,27 @@ var usersSlice = (0, import_toolkit8.createSlice)({
     },
     setGlobalSettings: (state, action) => {
       state.settingsInitialized = true;
-      state.globalSettings = __spreadValues(__spreadValues({}, state.globalSettings), action.payload);
+      state.globalSettings = {
+        ...state.globalSettings,
+        ...action.payload
+      };
     },
     setUserSettings: (state, action) => {
       state.userSettingsInitialized = true;
-      state.userSettings = __spreadValues(__spreadValues({}, state.userSettings), action.payload);
+      state.userSettings = {
+        ...state.userSettings,
+        ...action.payload
+      };
     },
     setTooltipState: (state, action) => {
       const { id, readState = READ_STATES.read } = action.payload;
       state.tooltips.byId[id].readState = readState;
     },
     setTooltipsState: (state, action) => {
-      state.tooltips.byId = __spreadValues(__spreadValues({}, state.tooltips.byId), action.payload);
+      state.tooltips.byId = {
+        ...state.tooltips.byId,
+        ...action.payload
+      };
     },
     setShowFeedbackDialog: (state, action) => {
       state.showFeedbackDialog = action.payload;
@@ -2180,7 +2267,16 @@ var actions8 = usersSlice.actions;
 var usersSlice_default = usersSlice.reducer;
 
 // src/actions.ts
-var actions_default = __spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({}, actions), actions2), actions3), actions4), actions5), actions6), actions7), actions8);
+var actions_default = {
+  ...actions,
+  ...actions2,
+  ...actions3,
+  ...actions4,
+  ...actions5,
+  ...actions6,
+  ...actions7,
+  ...actions8
+};
 
 // src/auth.ts
 var import_universal_cookie = __toESM(require("universal-cookie"));
@@ -2188,18 +2284,17 @@ var cookies = new import_universal_cookie.default();
 var emptySession = Object.freeze({ token: "", exiresAt: void 0 });
 var tokenCache = "";
 var getSessionInfo = () => {
-  var _a, _b2;
-  let sessionInfo = __spreadValues({}, emptySession);
+  let sessionInfo = { ...emptySession };
   try {
-    sessionInfo = JSON.parse((_a = window.localStorage.getItem("JWT")) != null ? _a : "");
-  } catch (e) {
+    sessionInfo = JSON.parse(window.localStorage.getItem("JWT") ?? "");
+  } catch {
   }
   if (sessionInfo.expiresAt && new Date(sessionInfo.expiresAt) < /* @__PURE__ */ new Date()) {
     cleanUp();
-    return __spreadValues({}, emptySession);
+    return { ...emptySession };
   }
   if (!sessionInfo.token) {
-    let jwtTokenFromCookie = (_b2 = cookies.get("JWT", { doNotParse: true })) != null ? _b2 : "";
+    let jwtTokenFromCookie = cookies.get("JWT", { doNotParse: true }) ?? "";
     if (jwtTokenFromCookie) {
       setSessionInfo({ token: jwtTokenFromCookie, undefined: void 0 });
       sessionInfo.token = jwtTokenFromCookie;
@@ -2239,10 +2334,7 @@ var getSearchState = (state) => state.app.searchState;
 var getSearchedDevices = (0, import_toolkit9.createSelector)([getSearchState], ({ deviceIds }) => deviceIds);
 var getVersionInformation = (0, import_toolkit9.createSelector)(
   [getFullVersionInformation, getFeatures],
-  (_a, { isHosted }) => {
-    var _b2 = _a, { Integration } = _b2, remainder = __objRest(_b2, ["Integration"]);
-    return isHosted && Integration !== "next" ? remainder : __spreadProps(__spreadValues({}, remainder), { Integration });
-  }
+  ({ Integration, ...remainder }, { isHosted }) => isHosted && Integration !== "next" ? remainder : { ...remainder, Integration }
 );
 var getIsPreview = (0, import_toolkit9.createSelector)([getFullVersionInformation], ({ Integration }) => (0, import_helpers2.versionCompare)(Integration, "next") > -1);
 
@@ -2259,8 +2351,7 @@ var getDeploymentsSelectionState = (state) => state.deployments.selectionState;
 var getMappedDeploymentSelection = (0, import_toolkit10.createSelector)(
   [getDeploymentsSelectionState, (_, deploymentsState) => deploymentsState, getDeploymentsById],
   (selectionState, deploymentsState, deploymentsById) => {
-    var _a;
-    const { selection = [] } = (_a = selectionState[deploymentsState]) != null ? _a : {};
+    const { selection = [] } = selectionState[deploymentsState] ?? {};
     return selection.reduce((accu, id) => {
       if (deploymentsById[id]) {
         accu.push(deploymentsById[id]);
@@ -2304,7 +2395,8 @@ var getListedDevices = (state) => state.devices.deviceList.deviceIds;
 var getFilteringAttributes = (state) => state.devices.filteringAttributes;
 var getDeviceFilters = (state) => state.devices.filters || [];
 var getFilteringAttributesFromConfig = (state) => state.devices.filteringAttributesConfig.attributes;
-var getSortedFilteringAttributes = (0, import_toolkit11.createSelector)([getFilteringAttributes], (filteringAttributes) => __spreadProps(__spreadValues({}, filteringAttributes), {
+var getSortedFilteringAttributes = (0, import_toolkit11.createSelector)([getFilteringAttributes], (filteringAttributes) => ({
+  ...filteringAttributes,
   identityAttributes: [...filteringAttributes.identityAttributes, "id"]
 }));
 var getDeviceLimit = (state) => state.devices.limit;
@@ -2332,10 +2424,7 @@ var getDeviceCountsByStatus = (0, import_toolkit11.createSelector)(
     return accu;
   }, {})
 );
-var getDeviceById = (0, import_toolkit11.createSelector)([getDevicesById, (_, deviceId) => deviceId], (devicesById, deviceId = "") => {
-  var _a;
-  return (_a = devicesById[deviceId]) != null ? _a : {};
-});
+var getDeviceById = (0, import_toolkit11.createSelector)([getDevicesById, (_, deviceId) => deviceId], (devicesById, deviceId = "") => devicesById[deviceId] ?? {});
 var getSelectedGroupInfo = (0, import_toolkit11.createSelector)(
   [getAcceptedDevices, getGroupsById, getSelectedGroup],
   ({ total: acceptedDeviceTotal }, groupsById, selectedGroup) => {
@@ -2352,17 +2441,13 @@ var getLimitMaxed = (0, import_toolkit11.createSelector)(
   [getAcceptedDevices, getDeviceLimit],
   ({ total: acceptedDevices = 0 }, deviceLimit) => Boolean(deviceLimit && deviceLimit <= acceptedDevices)
 );
-var _b;
-var getGroupsByIdWithoutUngrouped = (0, import_toolkit11.createSelector)([getGroupsById], (_a) => {
-  var _c = _a, { [_b = UNGROUPED_GROUP.id]: ungrouped } = _c, groups = __objRest(_c, [__restKey(_b)]);
-  return groups;
-});
+var getGroupsByIdWithoutUngrouped = (0, import_toolkit11.createSelector)([getGroupsById], ({ [UNGROUPED_GROUP.id]: ungrouped, ...groups }) => groups);
 var getGroups = (0, import_toolkit11.createSelector)([getGroupsById], (groupsById) => {
   const groupNames = Object.keys(groupsById).sort();
   const groupedGroups = Object.entries(groupsById).sort((a, b) => a[0].localeCompare(b[0])).reduce(
     (accu, [groupname, group]) => {
       const name = groupname === UNGROUPED_GROUP.id ? UNGROUPED_GROUP.name : groupname;
-      const groupItem = __spreadProps(__spreadValues({}, group), { groupId: name, name: groupname });
+      const groupItem = { ...group, groupId: name, name: groupname };
       if (group.filters.length > 0) {
         if (groupname !== UNGROUPED_GROUP.id) {
           accu.dynamic.push(groupItem);
@@ -2376,7 +2461,7 @@ var getGroups = (0, import_toolkit11.createSelector)([getGroupsById], (groupsByI
     },
     { dynamic: [], static: [], ungrouped: [] }
   );
-  return __spreadValues({ groupNames }, groupedGroups);
+  return { groupNames, ...groupedGroups };
 });
 var getAttributesList = (0, import_toolkit11.createSelector)(
   [getFilteringAttributes, getFilteringAttributesFromConfig],
@@ -2411,15 +2496,12 @@ var getExternalIntegrations = (state) => state.organization.externalDeviceIntegr
 var getAuditlogState = (state) => state.organization.auditlog.selectionState;
 var getAuditLog = (state) => state.organization.auditlog.events;
 var getAuditLogSelectionState = (state) => state.organization.auditlog.selectionState;
-var getTenantsList = (state) => state.organization.organization.tenantList;
+var getTenantsList = (state) => state.organization.tenantList;
 var getWebhookEvents = (state) => state.organization.webhooks.events;
 var getWebhookEventTotal = (state) => state.organization.webhooks.eventTotal;
 var getDeviceTwinIntegrations = (0, import_toolkit12.createSelector)(
   [getExternalIntegrations],
-  (integrations) => integrations.filter((integration) => {
-    var _a;
-    return integration.id && ((_a = EXTERNAL_PROVIDER[integration.provider]) == null ? void 0 : _a.deviceTwin);
-  })
+  (integrations) => integrations.filter((integration) => integration.id && EXTERNAL_PROVIDER[integration.provider]?.deviceTwin)
 );
 var getIsServiceProvider = (state) => state.organization.organization.service_provider;
 var getWebhooks = (0, import_toolkit12.createSelector)(
@@ -2453,15 +2535,12 @@ var filterProcessors = {
 var filterAliases = {
   $nexists: { alias: DEVICE_FILTERING_OPTIONS.$exists.key, value: false }
 };
-var mapFiltersToTerms = (filters) => filters.map((filter) => {
-  var _a;
-  return {
-    scope: filter.scope,
-    attribute: filter.key,
-    type: ((_a = filterAliases[filter.operator]) == null ? void 0 : _a.alias) || filter.operator,
-    value: filterProcessors.hasOwnProperty(filter.operator) ? filterProcessors[filter.operator](filter.value) : filter.value
-  };
-});
+var mapFiltersToTerms = (filters) => filters.map((filter) => ({
+  scope: filter.scope,
+  attribute: filter.key,
+  type: filterAliases[filter.operator]?.alias || filter.operator,
+  value: filterProcessors.hasOwnProperty(filter.operator) ? filterProcessors[filter.operator](filter.value) : filter.value
+}));
 var mapTermsToFilters = (terms) => terms.map((term) => {
   const aliasedFilter = Object.entries(filterAliases).find(
     (aliasDefinition) => aliasDefinition[1].alias === term.type && aliasDefinition[1].value === term.value
@@ -2471,14 +2550,13 @@ var mapTermsToFilters = (terms) => terms.map((term) => {
 });
 var convertIssueOptionsToFilters = (issuesSelection, filtersState = {}) => issuesSelection.map((item) => {
   if (typeof DEVICE_ISSUE_OPTIONS[item].filterRule.value === "function") {
-    return __spreadProps(__spreadValues({}, DEVICE_ISSUE_OPTIONS[item].filterRule), { value: DEVICE_ISSUE_OPTIONS[item].filterRule.value(filtersState) });
+    return { ...DEVICE_ISSUE_OPTIONS[item].filterRule, value: DEVICE_ISSUE_OPTIONS[item].filterRule.value(filtersState) };
   }
   return DEVICE_ISSUE_OPTIONS[item].filterRule;
 });
 var convertDeviceListStateToFilters = ({ filters = [], group, groups = { byId: {} }, offlineThreshold, selectedIssues = [], status }) => {
-  var _a;
   let applicableFilters = [...filters];
-  if (typeof group === "string" && !(((_a = groups.byId[group]) == null ? void 0 : _a.filters) || applicableFilters).length) {
+  if (typeof group === "string" && !(groups.byId[group]?.filters || applicableFilters).length) {
     applicableFilters.push({ key: "group", value: group, operator: DEVICE_FILTERING_OPTIONS.$eq.key, scope: "system" });
   }
   const nonMonitorFilters = applicableFilters.filter(
@@ -2499,12 +2577,12 @@ var filtersFilter = (item, index, array) => {
 var listItemMapper = (byId, ids, { defaultObject = {}, cutOffSize = DEVICE_LIST_MAXIMUM_LENGTH }) => {
   return ids.slice(0, cutOffSize).reduce((accu, id) => {
     if (id && byId[id]) {
-      accu.push(__spreadValues(__spreadValues({}, defaultObject), byId[id]));
+      accu.push({ ...defaultObject, ...byId[id] });
     }
     return accu;
   }, []);
 };
-var mergePermissions = (existingPermissions = __spreadValues({}, emptyUiPermissions), addedPermissions) => Object.entries(existingPermissions).reduce(
+var mergePermissions = (existingPermissions = { ...emptyUiPermissions }, addedPermissions) => Object.entries(existingPermissions).reduce(
   (accu, [key, value]) => {
     let values;
     if (!accu[key]) {
@@ -2514,12 +2592,12 @@ var mergePermissions = (existingPermissions = __spreadValues({}, emptyUiPermissi
     if (Array.isArray(value)) {
       values = [...value, ...accu[key]].filter(import_helpers4.duplicateFilter);
     } else {
-      values = mergePermissions(accu[key], __spreadValues({}, value));
+      values = mergePermissions(accu[key], { ...value });
     }
     accu[key] = values;
     return accu;
   },
-  __spreadValues({}, addedPermissions)
+  { ...addedPermissions }
 );
 var mapUserRolesToUiPermissions = (userRoles, roles) => userRoles.reduce(
   (accu, roleId) => {
@@ -2528,20 +2606,17 @@ var mapUserRolesToUiPermissions = (userRoles, roles) => userRoles.reduce(
     }
     return mergePermissions(accu, roles[roleId].uiPermissions);
   },
-  __spreadValues({}, emptyUiPermissions)
+  { ...emptyUiPermissions }
 );
 var progress = ({ loaded, total }) => {
   let uploadProgress4 = loaded / total * 100;
   return uploadProgress4 = uploadProgress4 < 50 ? Math.ceil(uploadProgress4) : Math.round(uploadProgress4);
 };
-var extractErrorMessage = (err, fallback = "") => {
-  var _a, _b2, _c, _d, _e;
-  return ((_c = (_b2 = (_a = err.response) == null ? void 0 : _a.data) == null ? void 0 : _b2.error) == null ? void 0 : _c.message) || ((_e = (_d = err.response) == null ? void 0 : _d.data) == null ? void 0 : _e.error) || err.error || err.message || fallback;
-};
+var extractErrorMessage = (err, fallback = "") => err.response?.data?.error?.message || err.response?.data?.error || err.error || err.message || fallback;
 var preformatWithRequestID = (res, failMsg) => {
   if (failMsg.length > 100) failMsg = `${failMsg.substring(0, 220)}...`;
   try {
-    if ((res == null ? void 0 : res.data) && Object.keys(res.data).includes("request_id")) {
+    if (res?.data && Object.keys(res.data).includes("request_id")) {
       let shortRequestUUID = res.data["request_id"].substring(0, 8);
       return `${failMsg} [Request ID: ${shortRequestUUID}]`;
     }
@@ -2575,9 +2650,10 @@ var mapDeviceAttributes = (attributes = []) => attributes.reduce(
     if (!(attribute.value && attribute.name) && attribute.scope === ATTRIBUTE_SCOPES.inventory) {
       return accu;
     }
-    accu[attribute.scope || ATTRIBUTE_SCOPES.inventory] = __spreadProps(__spreadValues({}, accu[attribute.scope || ATTRIBUTE_SCOPES.inventory]), {
+    accu[attribute.scope || ATTRIBUTE_SCOPES.inventory] = {
+      ...accu[attribute.scope || ATTRIBUTE_SCOPES.inventory],
       [attribute.name]: attribute.value
-    });
+    };
     if (attribute.name === "device_type" && attribute.scope === ATTRIBUTE_SCOPES.inventory) {
       accu.inventory.device_type = [].concat(attribute.value);
     }
@@ -2596,15 +2672,12 @@ var getReleaseListState = (state) => state.releases.releasesList;
 var getListedReleases = (state) => state.releases.releasesList.releaseIds;
 var getReleaseMappingDefaults = () => ({});
 var getReleasesList = (0, import_toolkit13.createSelector)([getReleasesById, getListedReleases, getReleaseMappingDefaults], listItemMapper);
-var getReleaseTagsById = (0, import_toolkit13.createSelector)([getReleaseTags], (releaseTags) => releaseTags.reduce((accu, key) => __spreadProps(__spreadValues({}, accu), { [key]: key }), {}));
+var getReleaseTagsById = (0, import_toolkit13.createSelector)([getReleaseTags], (releaseTags) => releaseTags.reduce((accu, key) => ({ ...accu, [key]: key }), {}));
 var getHasReleases = (0, import_toolkit13.createSelector)(
   [getReleaseListState, getReleasesById],
   ({ searchTotal, total }, byId) => !!(Object.keys(byId).length || total || searchTotal)
 );
-var getSelectedRelease = (0, import_toolkit13.createSelector)([getReleasesById, getSelectedReleaseId], (byId, id) => {
-  var _a;
-  return (_a = byId[id]) != null ? _a : {};
-});
+var getSelectedRelease = (0, import_toolkit13.createSelector)([getReleasesById, getSelectedReleaseId], (byId, id) => byId[id] ?? {});
 
 // src/usersSlice/selectors.ts
 var import_toolkit14 = require("@reduxjs/toolkit");
@@ -2613,10 +2686,7 @@ var getTooltipsById = (state) => state.users.tooltips.byId;
 var getGlobalSettings = (state) => state.users.globalSettings;
 var getCurrentUserId = (state) => state.users.currentUser;
 var getUsersById = (state) => state.users.byId;
-var getCurrentUser = (0, import_toolkit14.createSelector)([getUsersById, getCurrentUserId], (usersById, userId) => {
-  var _a;
-  return (_a = usersById[userId]) != null ? _a : {};
-});
+var getCurrentUser = (0, import_toolkit14.createSelector)([getUsersById, getCurrentUserId], (usersById, userId) => usersById[userId] ?? {});
 var getUserSettings = (state) => state.users.userSettings;
 var getIsDarkMode = (0, import_toolkit14.createSelector)([getUserSettings], ({ mode }) => isDarkMode(mode));
 var getShowHelptips = (0, import_toolkit14.createSelector)(
@@ -2627,22 +2697,22 @@ var getTooltipsState = (0, import_toolkit14.createSelector)(
   [getTooltipsById, getUserSettings],
   (byId, { tooltips = {} }) => Object.entries(byId).reduce(
     (accu, [id, value]) => {
-      accu[id] = __spreadValues(__spreadValues({}, accu[id]), value);
+      accu[id] = { ...accu[id], ...value };
       return accu;
     },
-    __spreadValues({}, tooltips)
+    { ...tooltips }
   )
 );
 var getHas2FA = (0, import_toolkit14.createSelector)(
   [getCurrentUser],
   (currentUser) => currentUser.hasOwnProperty("tfa_status") && currentUser.tfa_status === twoFAStates.enabled
 );
-var getIdAttribute = (0, import_toolkit14.createSelector)([getGlobalSettings], ({ id_attribute = __spreadValues({}, defaultIdAttribute) }) => id_attribute);
+var getIdAttribute = (0, import_toolkit14.createSelector)([getGlobalSettings], ({ id_attribute = { ...defaultIdAttribute } }) => id_attribute);
 var getOfflineThresholdSettings = (0, import_toolkit14.createSelector)([getGlobalSettings], ({ offlineThreshold }) => ({
-  interval: (offlineThreshold == null ? void 0 : offlineThreshold.interval) || DEVICE_ONLINE_CUTOFF.interval,
-  intervalUnit: (offlineThreshold == null ? void 0 : offlineThreshold.intervalUnit) || DEVICE_ONLINE_CUTOFF.intervalName
+  interval: offlineThreshold?.interval || DEVICE_ONLINE_CUTOFF.interval,
+  intervalUnit: offlineThreshold?.intervalUnit || DEVICE_ONLINE_CUTOFF.intervalName
 }));
-var getRolesList = (0, import_toolkit14.createSelector)([getRolesById], (rolesById2) => Object.entries(rolesById2).map(([id, role]) => __spreadValues({ id }, role)));
+var getRolesList = (0, import_toolkit14.createSelector)([getRolesById], (rolesById2) => Object.entries(rolesById2).map(([id, role]) => ({ id, ...role })));
 var getCurrentSession = (state) => state.users.currentSession;
 
 // src/commonSelectors.ts
@@ -2661,8 +2731,7 @@ var getSearchEndpoint = (0, import_toolkit15.createSelector)(
 var getUserRoles = (0, import_toolkit15.createSelector)(
   [getCurrentUser, getRolesById, getIsEnterprise, getFeatures, getOrganization],
   (currentUser, rolesById2, isEnterprise, { isHosted, hasMultitenancy }, { plan = PLANS.os.id }) => {
-    var _a;
-    const isAdmin = ((_a = currentUser.roles) == null ? void 0 : _a.length) ? currentUser.roles.some((role) => role === rolesByName.admin) : !(hasMultitenancy || isEnterprise || isHosted && plan !== PLANS.os.id);
+    const isAdmin = currentUser.roles?.length ? currentUser.roles.some((role) => role === rolesByName.admin) : !(hasMultitenancy || isEnterprise || isHosted && plan !== PLANS.os.id);
     const uiPermissions = isAdmin ? mapUserRolesToUiPermissions([rolesByName.admin], rolesById2) : mapUserRolesToUiPermissions(currentUser.roles || [], rolesById2);
     return { isAdmin, uiPermissions };
   }
@@ -2731,10 +2800,11 @@ var getFilterAttributes = (0, import_toolkit15.createSelector)(
     const deviceNameAttribute = { key: "name", value: "Name", scope: ATTRIBUTE_SCOPES.tags, category: ATTRIBUTE_SCOPES.tags, priority: 1 };
     const deviceIdAttribute = { key: "id", value: "Device ID", scope: ATTRIBUTE_SCOPES.identity, category: ATTRIBUTE_SCOPES.identity, priority: 1 };
     const checkInAttribute = { key: "check_in_time", value: "Latest activity", scope: ATTRIBUTE_SCOPES.system, category: ATTRIBUTE_SCOPES.system, priority: 4 };
-    const updateAttribute = __spreadProps(__spreadValues({}, checkInAttribute), { key: "updated_ts", value: "Last inventory update" });
+    const updateAttribute = { ...checkInAttribute, key: "updated_ts", value: "Last inventory update" };
     const firstRequestAttribute = { key: "created_ts", value: "First request", scope: ATTRIBUTE_SCOPES.system, category: ATTRIBUTE_SCOPES.system, priority: 4 };
     const attributes = [
-      ...previousFilters.map((item) => __spreadProps(__spreadValues({}, item), {
+      ...previousFilters.map((item) => ({
+        ...item,
         value: deviceIdAttribute.key === item.key ? deviceIdAttribute.value : item.key,
         category: "recently used",
         priority: 0
@@ -2752,14 +2822,13 @@ var getFilterAttributes = (0, import_toolkit15.createSelector)(
     return (0, import_helpers5.attributeDuplicateFilter)(attributes, "key");
   }
 );
-var getOnboardingState = (0, import_toolkit15.createSelector)([getOnboarding, getUserSettings], (_a, { onboarding = {} }) => {
-  var _b2 = _a, { complete, progress: progress2, showTips } = _b2, remainder = __objRest(_b2, ["complete", "progress", "showTips"]);
-  return __spreadProps(__spreadValues(__spreadValues({}, remainder), onboarding), {
-    complete: onboarding.complete || complete,
-    progress: Object.keys(onboardingSteps).findIndex((step) => step === progress2) > Object.keys(onboardingSteps).findIndex((step) => step === onboarding.progress) ? progress2 : onboarding.progress,
-    showTips: !onboarding.showTips ? onboarding.showTips : showTips
-  });
-});
+var getOnboardingState = (0, import_toolkit15.createSelector)([getOnboarding, getUserSettings], ({ complete, progress: progress2, showTips, ...remainder }, { onboarding = {} }) => ({
+  ...remainder,
+  ...onboarding,
+  complete: onboarding.complete || complete,
+  progress: Object.keys(onboardingSteps).findIndex((step) => step === progress2) > Object.keys(onboardingSteps).findIndex((step) => step === onboarding.progress) ? progress2 : onboarding.progress,
+  showTips: !onboarding.showTips ? onboarding.showTips : showTips
+}));
 var getDemoDeviceAddress = (0, import_toolkit15.createSelector)([getDevicesById, getOnboarding], (devicesById, { approach, demoArtifactPort }) => {
   const demoDeviceAddress = `http://${(0, import_helpers5.getDemoDeviceAddress)(Object.values(devicesById), approach)}`;
   return demoArtifactPort ? `${demoDeviceAddress}:${demoArtifactPort}` : demoDeviceAddress;
@@ -2780,12 +2849,11 @@ var getDeploymentRelease = (0, import_toolkit15.createSelector)(
 var getSelectedDeploymentData = (0, import_toolkit15.createSelector)(
   [getDeploymentsById, getDeploymentsSelectionState, getDevicesById, getSelectedDeploymentDeviceIds],
   (deploymentsById, { selectedId }, devicesById, selectedDeviceIds) => {
-    var _a;
-    const deployment = (_a = deploymentsById[selectedId]) != null ? _a : {};
+    const deployment = deploymentsById[selectedId] ?? {};
     const { devices = {} } = deployment;
     return {
       deployment,
-      selectedDevices: selectedDeviceIds.map((deviceId) => __spreadValues(__spreadValues({}, devicesById[deviceId]), devices[deviceId]))
+      selectedDevices: selectedDeviceIds.map((deviceId) => ({ ...devicesById[deviceId], ...devices[deviceId] }))
     };
   }
 );
@@ -2800,8 +2868,7 @@ var getAvailableIssueOptionsByType = (0, import_toolkit15.createSelector)(
   }, {})
 );
 var getGroupNames = (0, import_toolkit15.createSelector)([getGroupsById, getUserRoles, (_, options = {}) => options], (groupsById, { uiPermissions }, { staticOnly }) => {
-  var _a;
-  const _b2 = groupsById, { [_a = UNGROUPED_GROUP.id]: ungrouped } = _b2, groups = __objRest(_b2, [__restKey(_a)]);
+  const { [UNGROUPED_GROUP.id]: ungrouped, ...groups } = groupsById;
   if (staticOnly) {
     return Object.keys(uiPermissions.groups).sort();
   }
@@ -2835,16 +2902,31 @@ var getAuditlogDevice = (0, import_toolkit15.createSelector)([getAuditLogEntry,
   if (auditlogEvent) {
     const { object = {} } = auditlogEvent;
     const { device = {}, id, type } = object;
-    auditlogDevice = type === "device" ? __spreadValues({ id }, device) : auditlogDevice;
+    auditlogDevice = type === "device" ? { id, ...device } : auditlogDevice;
+  }
+  return { ...auditlogDevice, ...devicesById[auditlogDevice.id] };
+});
+var getRelevantRoles = (0, import_toolkit15.createSelector)([getOrganization, getRolesList], ({ service_provider }, roles) => {
+  if (service_provider) {
+    return roles.reduce((accu, role) => {
+      if (rolesById[role.id]) {
+        return accu;
+      }
+      accu.push(role);
+      return accu;
+    }, Object.values(serviceProviderRolesById));
   }
-  return __spreadValues(__spreadValues({}, auditlogDevice), devicesById[auditlogDevice.id]);
+  return Object.keys(rolesById).reverse().reduce((accu, key) => {
+    const index = accu.findIndex(({ id }) => id === key);
+    accu = [accu[index], ...accu.filter((item, itemIndex) => index !== itemIndex)];
+    return accu;
+  }, roles);
 });
 
 // src/api/general-api.ts
 var import_axios = __toESM(require("axios"));
 var unauthorizedRedirect = (error) => {
-  var _a;
-  if (!(0, import_axios.isCancel)(error) && ((_a = error.response) == null ? void 0 : _a.status) === 401 && getToken()) {
+  if (!(0, import_axios.isCancel)(error) && error.response?.status === 401 && getToken()) {
     cleanUp();
     window.location.replace("/ui/");
   }
@@ -2854,7 +2936,7 @@ var commonRequestConfig = { timeout: TIMEOUTS.refreshDefault, headers: { "Conten
 var authenticatedRequest = import_axios.default.create(commonRequestConfig);
 authenticatedRequest.interceptors.response.use((res) => res, unauthorizedRedirect);
 authenticatedRequest.interceptors.request.use(
-  (config) => __spreadProps(__spreadValues({}, config), { headers: __spreadProps(__spreadValues({}, config.headers), { Authorization: `Bearer ${getToken()}` }) }),
+  (config) => ({ ...config, headers: { ...config.headers, Authorization: `Bearer ${getToken()}` } }),
   (error) => Promise.reject(error)
 );
 var Api = {
@@ -2862,7 +2944,7 @@ var Api = {
   delete: (url, data) => authenticatedRequest.request({ method: "delete", url, data }),
   patch: authenticatedRequest.patch,
   post: authenticatedRequest.post,
-  postUnauthorized: (url, data, config = {}) => import_axios.default.post(url, data, __spreadValues(__spreadValues({}, commonRequestConfig), config)),
+  postUnauthorized: (url, data, config = {}) => import_axios.default.post(url, data, { ...commonRequestConfig, ...config }),
   put: authenticatedRequest.put,
   upload: (url, formData, progress2, cancelSignal) => authenticatedRequest.post(url, formData, {
     headers: { "Content-Type": "multipart/form-data" },
@@ -2893,17 +2975,16 @@ var dateFunctionMap = {
   setDays: "setDate"
 };
 var setOfflineThreshold = (0, import_toolkit16.createAsyncThunk)(`${sliceName}/setOfflineThreshold`, (_, { dispatch, getState }) => {
-  var _a, _b2;
   const { interval, intervalUnit } = getOfflineThresholdSettings(getState());
   const today = /* @__PURE__ */ new Date();
   const intervalName = `${intervalUnit.charAt(0).toUpperCase()}${intervalUnit.substring(1)}`;
-  const setter = (_a = dateFunctionMap[`set${intervalName}`]) != null ? _a : `set${intervalName}`;
-  const getter = (_b2 = dateFunctionMap[`get${intervalName}`]) != null ? _b2 : `get${intervalName}`;
+  const setter = dateFunctionMap[`set${intervalName}`] ?? `set${intervalName}`;
+  const getter = dateFunctionMap[`get${intervalName}`] ?? `get${intervalName}`;
   today[setter](today[getter]() - interval);
   let value;
   try {
     value = today.toISOString();
-  } catch (e) {
+  } catch {
     return Promise.resolve(dispatch(actions.setSnackbar("There was an error saving the offline threshold, please check your settings.")));
   }
   return Promise.resolve(dispatch(actions.setOfflineThreshold(value)));
@@ -2944,37 +3025,43 @@ var getLatestReleaseInfo = (0, import_toolkit16.createAsyncThunk)(`${sliceName}/
         accu.latestRepos[item.name] = getComparisonCompatibleVersion(item.version);
         return accu;
       },
-      { latestVersions: __spreadValues({}, getState().app.versionInformation), latestRepos: {} }
+      { latestVersions: { ...getState().app.versionInformation }, latestRepos: {} }
     );
     const info = deductSaasState(latestRelease, guiTags, saas);
     return Promise.resolve(
       dispatch(
-        actions.setVersionInformation(__spreadProps(__spreadValues({}, latestVersions), {
+        actions.setVersionInformation({
+          ...latestVersions,
           backend: info,
           GUI: info,
           latestRelease: {
             releaseDate: latestRelease.release_date,
             repos: latestRepos
           }
-        }))
+        })
       )
     );
   });
 });
 var setSearchState = (0, import_toolkit16.createAsyncThunk)(`${sliceName}/setSearchState`, (searchState, { dispatch, getState }) => {
   const currentState = getSearchState(getState());
-  let nextState = __spreadProps(__spreadValues(__spreadValues({}, currentState), searchState), {
-    sort: __spreadValues(__spreadValues({}, currentState.sort), searchState.sort)
-  });
+  let nextState = {
+    ...currentState,
+    ...searchState,
+    sort: {
+      ...currentState.sort,
+      ...searchState.sort
+    }
+  };
   let tasks = [];
-  const _a = currentState, { isSearching: currentSearching, deviceIds: currentDevices, searchTotal: currentTotal } = _a, currentRequestState = __objRest(_a, ["isSearching", "deviceIds", "searchTotal"]);
-  const _b2 = nextState, { isSearching: nextSearching, deviceIds: nextDevices, searchTotal: nextTotal } = _b2, nextRequestState = __objRest(_b2, ["isSearching", "deviceIds", "searchTotal"]);
+  const { isSearching: currentSearching, deviceIds: currentDevices, searchTotal: currentTotal, ...currentRequestState } = currentState;
+  const { isSearching: nextSearching, deviceIds: nextDevices, searchTotal: nextTotal, ...nextRequestState } = nextState;
   if (nextRequestState.searchTerm && !(0, import_helpers6.deepCompare)(currentRequestState, nextRequestState)) {
     nextState.isSearching = true;
     tasks.push(
       dispatch(searchDevices(nextState)).unwrap().then((results) => {
         const searchResult = results[results.length - 1];
-        return dispatch(actions.setSearchState(__spreadProps(__spreadValues({}, searchResult), { isSearching: false })));
+        return dispatch(actions.setSearchState({ ...searchResult, isSearching: false }));
       }).catch(() => dispatch(actions.setSearchState({ isSearching: false, searchTotal: 0 })))
     );
   }
@@ -3015,8 +3102,9 @@ var sessionReducer = (state, action) => {
   return rootReducer(state, action);
 };
 var getConfiguredStore = (options = {}) => {
-  const _a = options, { preloadedState = {} } = _a, config = __objRest(_a, ["preloadedState"]);
-  return (0, import_toolkit17.configureStore)(__spreadProps(__spreadValues({}, config), {
+  const { preloadedState = {}, ...config } = options;
+  return (0, import_toolkit17.configureStore)({
+    ...config,
     preloadedState,
     reducer: sessionReducer,
     middleware: (getDefaultMiddleware) => getDefaultMiddleware({
@@ -3029,7 +3117,7 @@ var getConfiguredStore = (options = {}) => {
         ignoredPaths: ["app.uploadsById", "app.snackbar", "organization.externalDeviceIntegrations"]
       }
     })
-  }));
+  });
 };
 var store = getConfiguredStore({
   preloadedState: {}
@@ -3044,13 +3132,15 @@ var { page: defaultPage, perPage: defaultPerPage } = DEVICE_LIST_DEFAULTS;
 var deriveDeploymentGroup = ({ filter = {}, group, groups = [], name }) => group || groups.length === 1 && !(0, import_isUUID.default)(name) ? groups[0] : filter.name;
 var transformDeployments = (deployments, deploymentsById) => deployments.sort(import_helpers7.startTimeSort).reduce(
   (accu, item) => {
-    var _a, _b2;
-    const filter = (_a = item.filter) != null ? _a : {};
-    let deployment = __spreadProps(__spreadValues(__spreadValues(__spreadValues({}, deploymentPrototype), deploymentsById[item.id]), item), {
-      filter: item.filter ? __spreadProps(__spreadValues({}, filter), { name: (_b2 = filter.name) != null ? _b2 : filter.id, filters: mapTermsToFilters(filter.terms) }) : void 0,
+    const filter = item.filter ?? {};
+    let deployment = {
+      ...deploymentPrototype,
+      ...deploymentsById[item.id],
+      ...item,
+      filter: item.filter ? { ...filter, name: filter.name ?? filter.id, filters: mapTermsToFilters(filter.terms) } : void 0,
       name: decodeURIComponent(item.name)
-    });
-    deployment = __spreadProps(__spreadValues({}, deployment), { group: deriveDeploymentGroup(deployment) });
+    };
+    deployment = { ...deployment, group: deriveDeploymentGroup(deployment) };
     accu.deployments[item.id] = deployment;
     accu.deploymentIds.push(item.id);
     return accu;
@@ -3104,11 +3194,12 @@ var createDeployment = (0, import_toolkit18.createAsyncThunk)(`${sliceName2}/cre
   return request.catch((err) => commonErrorHandler(err, "Error creating deployment.", dispatch)).then((data) => {
     const lastslashindex = data.headers.location.lastIndexOf("/");
     const deploymentId = data.headers.location.substring(lastslashindex + 1);
-    const deployment = __spreadProps(__spreadValues({}, newDeployment), {
+    const deployment = {
+      ...newDeployment,
       id: deploymentId,
       devices: newDeployment.devices ? newDeployment.devices.map((id) => ({ id, status: "pending" })) : [],
       statistics: { status: {} }
-    });
+    };
     let tasks = [
       dispatch(actions2.createdDeployment(deployment)),
       dispatch(getSingleDeployment(deploymentId)),
@@ -3251,14 +3342,23 @@ var updateDeploymentControlMap = (0, import_toolkit18.createAsyncThunk)(
   ({ deploymentId, updateControlMap }, { dispatch }) => general_api_default.patch(`${deploymentsApiUrl}/deployments/${deploymentId}`, { update_control_map: updateControlMap }).catch((err) => commonErrorHandler(err, "There was an error while updating the deployment status:", dispatch)).then(() => Promise.resolve(dispatch(getSingleDeployment(deploymentId))))
 );
 var setDeploymentsState = (0, import_toolkit18.createAsyncThunk)(`${sliceName2}/setDeploymentsState`, (selection, { dispatch, getState }) => {
-  const _a = selection, { page, perPage } = _a, selectionState = __objRest(_a, ["page", "perPage"]);
+  const { page, perPage, ...selectionState } = selection;
   const currentState = getState().deployments.selectionState;
-  let nextState = __spreadProps(__spreadValues(__spreadValues(__spreadValues({}, currentState), selectionState), Object.keys(DEPLOYMENT_STATES).reduce((accu, item) => {
-    accu[item] = __spreadValues(__spreadValues({}, currentState[item]), selectionState[item]);
-    return accu;
-  }, {})), {
-    general: __spreadValues(__spreadValues({}, currentState.general), selectionState.general)
-  });
+  let nextState = {
+    ...currentState,
+    ...selectionState,
+    ...Object.keys(DEPLOYMENT_STATES).reduce((accu, item) => {
+      accu[item] = {
+        ...currentState[item],
+        ...selectionState[item]
+      };
+      return accu;
+    }, {}),
+    general: {
+      ...currentState.general,
+      ...selectionState.general
+    }
+  };
   let tasks = [dispatch(actions2.setDeploymentsState(nextState))];
   if (nextState.selectedId && currentState.selectedId !== nextState.selectedId) {
     tasks.push(dispatch(getSingleDeployment(nextState.selectedId)));
@@ -3288,15 +3388,20 @@ var getDeploymentsConfig = (0, import_toolkit18.createAsyncThunk)(
     const { binary_delta = {}, binary_delta_limits = {} } = delta;
     const { xdelta_args = {}, timeout: timeoutConfig = oldConfig.binaryDelta.timeout } = binary_delta;
     const { xdelta_args_limits = {}, timeout: timeoutLimit = oldConfig.binaryDeltaLimits.timeout } = binary_delta_limits;
-    const config = __spreadProps(__spreadValues({}, oldConfig), {
+    const config = {
+      ...oldConfig,
       hasDelta: Boolean(delta.enabled),
-      binaryDelta: __spreadValues(__spreadProps(__spreadValues({}, oldConfig.binaryDelta), {
-        timeout: timeoutConfig
-      }), mapExternalDeltaConfig(xdelta_args)),
-      binaryDeltaLimits: __spreadValues(__spreadProps(__spreadValues({}, oldConfig.binaryDeltaLimits), {
-        timeout: timeoutLimit
-      }), mapExternalDeltaConfig(xdelta_args_limits))
-    });
+      binaryDelta: {
+        ...oldConfig.binaryDelta,
+        timeout: timeoutConfig,
+        ...mapExternalDeltaConfig(xdelta_args)
+      },
+      binaryDeltaLimits: {
+        ...oldConfig.binaryDeltaLimits,
+        timeout: timeoutLimit,
+        ...mapExternalDeltaConfig(xdelta_args_limits)
+      }
+    };
     return Promise.resolve(dispatch(actions2.setDeploymentsConfig(config)));
   })
 );
@@ -3306,7 +3411,7 @@ var deepClean = (source) => Object.entries(source).reduce((accu, [key, value]) =
     if (cleanedValue === void 0 || typeof cleanedValue === "object" && (0, import_helpers7.isEmpty)(cleanedValue)) {
       return accu;
     }
-    accu = __spreadProps(__spreadValues({}, accu != null ? accu : {}), { [key]: cleanedValue });
+    accu = { ...accu ?? {}, [key]: cleanedValue };
   }
   return accu;
 }, void 0);
@@ -3326,9 +3431,13 @@ var saveDeltaDeploymentsConfig = (0, import_toolkit18.createAsyncThunk)(`${slice
   }
   return general_api_default.put(`${deploymentsApiUrl}/config/binary_delta`, result).catch((err) => commonErrorHandler(err, "There was a problem storing your delta artifact generation configuration.", dispatch)).then(() => {
     const oldConfig = getState().deployments.config;
-    const newConfig = __spreadProps(__spreadValues({}, oldConfig), {
-      binaryDelta: __spreadValues(__spreadValues({}, oldConfig.binaryDelta), config)
-    });
+    const newConfig = {
+      ...oldConfig,
+      binaryDelta: {
+        ...oldConfig.binaryDelta,
+        ...config
+      }
+    };
     return Promise.all([dispatch(actions2.setDeploymentsConfig(newConfig)), dispatch(setSnackbar2("Settings saved successfully"))]);
   });
 });
@@ -3341,19 +3450,20 @@ var import_toolkit19 = require("@reduxjs/toolkit");
 var import_axios2 = require("axios");
 var import_pluralize = __toESM(require_pluralize());
 
-// ../../node_modules/uuid/dist/esm-node/rng.js
-var import_crypto = __toESM(require("crypto"));
-var rnds8Pool = new Uint8Array(256);
-var poolPtr = rnds8Pool.length;
+// ../../node_modules/uuid/dist/esm-browser/rng.js
+var getRandomValues;
+var rnds8 = new Uint8Array(16);
 function rng() {
-  if (poolPtr > rnds8Pool.length - 16) {
-    import_crypto.default.randomFillSync(rnds8Pool);
-    poolPtr = 0;
+  if (!getRandomValues) {
+    getRandomValues = typeof crypto !== "undefined" && crypto.getRandomValues && crypto.getRandomValues.bind(crypto);
+    if (!getRandomValues) {
+      throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");
+    }
   }
-  return rnds8Pool.slice(poolPtr, poolPtr += 16);
+  return getRandomValues(rnds8);
 }
 
-// ../../node_modules/uuid/dist/esm-node/stringify.js
+// ../../node_modules/uuid/dist/esm-browser/stringify.js
 var byteToHex = [];
 for (let i = 0; i < 256; ++i) {
   byteToHex.push((i + 256).toString(16).slice(1));
@@ -3362,13 +3472,13 @@ function unsafeStringify(arr, offset = 0) {
   return byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + "-" + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + "-" + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + "-" + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + "-" + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]];
 }
 
-// ../../node_modules/uuid/dist/esm-node/native.js
-var import_crypto2 = __toESM(require("crypto"));
+// ../../node_modules/uuid/dist/esm-browser/native.js
+var randomUUID = typeof crypto !== "undefined" && crypto.randomUUID && crypto.randomUUID.bind(crypto);
 var native_default = {
-  randomUUID: import_crypto2.default.randomUUID
+  randomUUID
 };
 
-// ../../node_modules/uuid/dist/esm-node/v4.js
+// ../../node_modules/uuid/dist/esm-browser/v4.js
 function v4(options, buf, offset) {
   if (native_default.randomUUID && !buf && !options) {
     return native_default.randomUUID();
@@ -3410,14 +3520,13 @@ var getGroups2 = (0, import_toolkit19.createAsyncThunk)(
   (_, { dispatch, getState }) => general_api_default.get(`${inventoryApiUrl}/groups`).then((res) => {
     const state = getGroupsById(getState());
     const dynamicGroups = Object.entries(state).reduce((accu, [id, group]) => {
-      var _a;
-      if (group.id || ((_a = group.filters) == null ? void 0 : _a.length) && id !== UNGROUPED_GROUP.id) {
+      if (group.id || group.filters?.length && id !== UNGROUPED_GROUP.id) {
         accu[id] = group;
       }
       return accu;
     }, {});
     const groups = res.data.reduce((accu, group) => {
-      accu[group] = __spreadValues({ deviceIds: [], filters: [], total: 0 }, state[group]);
+      accu[group] = { deviceIds: [], filters: [], total: 0, ...state[group] };
       return accu;
     }, dynamicGroups);
     const filters = [{ key: "group", value: res.data, operator: DEVICE_FILTERING_OPTIONS.$nin.key, scope: "system" }];
@@ -3475,7 +3584,7 @@ var addStaticGroup = (0, import_toolkit19.createAsyncThunk)(
     () => Promise.resolve(
       dispatch(
         actions3.addGroup({
-          group: __spreadValues({ deviceIds: [], total: 0, filters: [] }, getState().devices.groups.byId[group]),
+          group: { deviceIds: [], total: 0, filters: [], ...getState().devices.groups.byId[group] },
           groupName: group
         })
       )
@@ -3503,20 +3612,19 @@ var getDynamicGroups = (0, import_toolkit19.createAsyncThunk)(
   (_, { dispatch, getState }) => general_api_default.get(`${inventoryApiUrlV2}/filters?per_page=${MAX_PAGE_SIZE}`).then(({ data: filters }) => {
     const state = getGroupsById(getState());
     const staticGroups = Object.entries(state).reduce((accu, [id, group]) => {
-      var _a;
-      if (!(group.id || ((_a = group.filters) == null ? void 0 : _a.length))) {
+      if (!(group.id || group.filters?.length)) {
         accu[id] = group;
       }
       return accu;
     }, {});
     const groups = (filters || []).reduce((accu, filter) => {
-      accu[filter.name] = __spreadProps(__spreadValues({
+      accu[filter.name] = {
         deviceIds: [],
-        total: 0
-      }, state[filter.name]), {
+        total: 0,
+        ...state[filter.name],
         id: filter.id,
         filters: mapTermsToFilters(filter.terms)
-      });
+      };
       return accu;
     }, staticGroups);
     return Promise.resolve(dispatch(actions3.receivedGroups(groups)));
@@ -3556,10 +3664,9 @@ var removeDynamicGroup = (0, import_toolkit19.createAsyncThunk)(`${sliceName3}/r
   );
 });
 var getGroupFilters = (group, groupsState, filters = []) => {
-  var _a;
   const groupName = group === UNGROUPED_GROUP.id || group === UNGROUPED_GROUP.name ? UNGROUPED_GROUP.id : group;
   const selectedGroup = groupsState.byId[groupName];
-  const groupFilterLength = ((_a = selectedGroup == null ? void 0 : selectedGroup.filters) == null ? void 0 : _a.length) || 0;
+  const groupFilterLength = selectedGroup?.filters?.length || 0;
   const cleanedFilters = groupFilterLength ? [...filters, ...selectedGroup.filters].filter(filtersFilter) : filters;
   return { cleanedFilters, groupName, selectedGroup, groupFilterLength };
 };
@@ -3582,7 +3689,6 @@ var selectGroup = (0, import_toolkit19.createAsyncThunk)(`${sliceName3}/selectGr
 var getEarliestTs = (dateA = "", dateB = "") => !dateA || !dateB ? dateA || dateB : dateA < dateB ? dateA : dateB;
 var reduceReceivedDevices = (devices, ids, state, status) => devices.reduce(
   (accu, device) => {
-    var _a, _b2, _c;
     const stateDevice = getDeviceById(state, device.id);
     const {
       attributes: storedAttributes = {},
@@ -3592,29 +3698,29 @@ var reduceReceivedDevices = (devices, ids, state, status) => devices.reduce(
       group: storedGroup
     } = stateDevice;
     const { identity, inventory, monitor, system = {}, tags } = mapDeviceAttributes(device.attributes);
-    device.tags = __spreadValues(__spreadValues({}, storedTags), tags);
-    device.group = (_a = system.group) != null ? _a : storedGroup;
-    device.monitor = __spreadValues(__spreadValues({}, storedMonitor), monitor);
-    device.identity_data = __spreadValues(__spreadValues(__spreadValues({}, storedIdentity), identity), device.identity_data ? device.identity_data : {});
+    device.tags = { ...storedTags, ...tags };
+    device.group = system.group ?? storedGroup;
+    device.monitor = { ...storedMonitor, ...monitor };
+    device.identity_data = { ...storedIdentity, ...identity, ...device.identity_data ? device.identity_data : {} };
     device.status = status ? status : device.status || identity.status;
-    device.check_in_time_rounded = (_b2 = system.check_in_time) != null ? _b2 : stateDevice.check_in_time_rounded;
-    device.check_in_time_exact = (_c = device.check_in_time) != null ? _c : stateDevice.check_in_time_exact;
+    device.check_in_time_rounded = system.check_in_time ?? stateDevice.check_in_time_rounded;
+    device.check_in_time_exact = device.check_in_time ?? stateDevice.check_in_time_exact;
     device.created_ts = getEarliestTs(getEarliestTs(system.created_ts, device.created_ts), stateDevice.created_ts);
     device.updated_ts = device.attributes ? device.updated_ts : stateDevice.updated_ts;
     device.isNew = new Date(device.created_ts) > new Date(state.app.newThreshold);
     device.isOffline = new Date(device.check_in_time_rounded) < new Date(state.app.offlineThreshold) || device.check_in_time_rounded === void 0;
-    device.attributes = device.attributes ? __spreadValues(__spreadValues({}, storedAttributes), inventory) : storedAttributes;
-    accu.devicesById[device.id] = __spreadValues(__spreadValues({}, stateDevice), device);
+    device.attributes = device.attributes ? { ...storedAttributes, ...inventory } : storedAttributes;
+    accu.devicesById[device.id] = { ...stateDevice, ...device };
     accu.ids.push(device.id);
     return accu;
   },
   { ids, devicesById: {} }
 );
 var getGroupDevices = (0, import_toolkit19.createAsyncThunk)(`${sliceName3}/getGroupDevices`, (options, { dispatch, getState }) => {
-  const _a = options, { group, shouldIncludeAllStates } = _a, remainder = __objRest(_a, ["group", "shouldIncludeAllStates"]);
+  const { group, shouldIncludeAllStates, ...remainder } = options;
   const { cleanedFilters: filterSelection } = getGroupFilters(group, getState().devices.groups);
   return Promise.resolve(
-    dispatch(getDevicesByStatus2(__spreadProps(__spreadValues({}, remainder), { filterSelection, group, status: shouldIncludeAllStates ? void 0 : DEVICE_STATES.accepted })))
+    dispatch(getDevicesByStatus2({ ...remainder, filterSelection, group, status: shouldIncludeAllStates ? void 0 : DEVICE_STATES.accepted }))
   ).unwrap().then((results) => {
     if (!group) {
       return Promise.resolve();
@@ -3628,7 +3734,7 @@ var getGroupDevices = (0, import_toolkit19.createAsyncThunk)(`${sliceName3}/getG
       dispatch(
         actions3.addGroup({
           group: {
-            deviceIds: deviceAccu.ids.length === total || deviceAccu.ids.length > (stateGroup == null ? void 0 : stateGroup.deviceIds) ? deviceAccu.ids : stateGroup.deviceIds,
+            deviceIds: deviceAccu.ids.length === total || deviceAccu.ids.length > stateGroup?.deviceIds ? deviceAccu.ids : stateGroup.deviceIds,
             total
           },
           groupName: group
@@ -3777,27 +3883,26 @@ var getDeviceLimit2 = (0, import_toolkit19.createAsyncThunk)(
 );
 var setDeviceListState = (0, import_toolkit19.createAsyncThunk)(
   `${sliceName3}/setDeviceListState`,
-  (_a, { dispatch, getState }) => {
-    var _b2 = _a, { shouldSelectDevices = true, forceRefresh, fetchAuth = true } = _b2, selectionState = __objRest(_b2, ["shouldSelectDevices", "forceRefresh", "fetchAuth"]);
-    var _c;
+  ({ shouldSelectDevices = true, forceRefresh, fetchAuth = true, ...selectionState }, { dispatch, getState }) => {
     const currentState = getDeviceListState(getState());
     const refreshTrigger = forceRefresh ? !currentState.refreshTrigger : selectionState.refreshTrigger;
-    let nextState = __spreadProps(__spreadValues(__spreadProps(__spreadValues({}, currentState), {
+    let nextState = {
+      ...currentState,
       setOnly: false,
-      refreshTrigger
-    }), selectionState), {
-      sort: __spreadValues(__spreadValues({}, currentState.sort), selectionState.sort)
-    });
+      refreshTrigger,
+      ...selectionState,
+      sort: { ...currentState.sort, ...selectionState.sort }
+    };
     let tasks = [];
-    const _a2 = currentState, { isLoading: currentLoading, deviceIds: currentDevices, selection: currentSelection } = _a2, currentRequestState = __objRest(_a2, ["isLoading", "deviceIds", "selection"]);
-    const _b3 = nextState, { isLoading: nextLoading, deviceIds: nextDevices, selection: nextSelection } = _b3, nextRequestState = __objRest(_b3, ["isLoading", "deviceIds", "selection"]);
+    const { isLoading: currentLoading, deviceIds: currentDevices, selection: currentSelection, ...currentRequestState } = currentState;
+    const { isLoading: nextLoading, deviceIds: nextDevices, selection: nextSelection, ...nextRequestState } = nextState;
     if (!nextState.setOnly && !(0, import_helpers8.deepCompare)(currentRequestState, nextRequestState)) {
-      const { direction: sortDown = SORTING_OPTIONS.desc, key: sortCol, scope: sortScope } = (_c = nextState.sort) != null ? _c : {};
+      const { direction: sortDown = SORTING_OPTIONS.desc, key: sortCol, scope: sortScope } = nextState.sort ?? {};
       const sortBy = sortCol ? [{ attribute: sortCol, order: sortDown, scope: sortScope }] : void 0;
       const applicableSelectedState = nextState.state === ALL_DEVICE_STATES ? void 0 : nextState.state;
       nextState.isLoading = true;
       tasks.push(
-        dispatch(getDevicesByStatus2(__spreadProps(__spreadValues({}, nextState), { status: applicableSelectedState, sortOptions: sortBy, fetchAuth }))).unwrap().then((results) => {
+        dispatch(getDevicesByStatus2({ ...nextState, status: applicableSelectedState, sortOptions: sortBy, fetchAuth })).unwrap().then((results) => {
           const { deviceAccu, total } = results[results.length - 1];
           const devicesState = shouldSelectDevices ? { deviceIds: deviceAccu.ids, total, isLoading: false } : { isLoading: false };
           return Promise.resolve(dispatch(actions3.setDeviceListState(devicesState)));
@@ -3822,8 +3927,8 @@ var getDevicesByStatus2 = (0, import_toolkit19.createAsyncThunk)(`${sliceName3}/
   } = options;
   const state = getState();
   const { applicableFilters, filterTerms } = convertDeviceListStateToFilters({
-    filters: filterSelection != null ? filterSelection : getDeviceFilters(state),
-    group: group != null ? group : getSelectedGroup(state),
+    filters: filterSelection ?? getDeviceFilters(state),
+    group: group ?? getSelectedGroup(state),
     groups: state.devices.groups,
     offlineThreshold: state.app.offlineThreshold,
     selectedIssues,
@@ -3884,7 +3989,7 @@ var getAllDevicesByStatus = (0, import_toolkit19.createAsyncThunk)(`${sliceName3
 });
 var searchDevices = (0, import_toolkit19.createAsyncThunk)(`${sliceName3}/searchDevices`, (passedOptions = {}, { dispatch, getState }) => {
   const state = getState();
-  let options = __spreadValues(__spreadValues({}, state.app.searchState), passedOptions);
+  let options = { ...state.app.searchState, ...passedOptions };
   const { page = defaultPage2, searchTerm, sortOptions = [] } = options;
   const { columnSelection = [] } = getUserSettings(state);
   const selectedAttributes = columnSelection.map((column) => ({ attribute: column.key, scope: column.scope }));
@@ -4019,8 +4124,7 @@ var getSessionDetails = (0, import_toolkit19.createAsyncThunk)(`${sliceName3}/ge
     ({ data: auditLogEntries }) => {
       const { start, end } = auditLogEntries.reduce(
         (accu, item) => {
-          var _a, _b2;
-          if ((_b2 = (_a = item.meta) == null ? void 0 : _a.session_id) == null ? void 0 : _b2.includes(sessionId)) {
+          if (item.meta?.session_id?.includes(sessionId)) {
             accu.start = new Date(item.action.startsWith("open") ? item.time : accu.start);
             accu.end = new Date(item.action.startsWith("close") ? item.time : accu.end);
           }
@@ -4127,8 +4231,7 @@ var decommissionDevice = (0, import_toolkit19.createAsyncThunk)(
 var getDeviceConfig = (0, import_toolkit19.createAsyncThunk)(
   `${sliceName3}/getDeviceConfig`,
   (deviceId, { dispatch }) => general_api_default.get(`${deviceConfig}/${deviceId}`).then(({ data }) => Promise.all([dispatch(actions3.receivedDevice({ id: deviceId, config: data })), Promise.resolve(data)])).catch((err) => {
-    var _a, _b2;
-    if (((_b2 = (_a = err.response) == null ? void 0 : _a.data) == null ? void 0 : _b2.error.status_code) !== 404) {
+    if (err.response?.data?.error.status_code !== 404) {
       return commonErrorHandler(err, `There was an error retrieving the configuration for device ${deviceId}.`, dispatch, commonErrorFallback);
     }
   })
@@ -4140,15 +4243,14 @@ var setDeviceConfig = (0, import_toolkit19.createAsyncThunk)(
 var applyDeviceConfig = (0, import_toolkit19.createAsyncThunk)(
   `${sliceName3}/applyDeviceConfig`,
   ({ deviceId, configDeploymentConfiguration, isDefault, config }, { dispatch, getState }) => general_api_default.post(`${deviceConfig}/${deviceId}/deploy`, configDeploymentConfiguration).catch((err) => commonErrorHandler(err, `There was an error deploying the configuration to device ${deviceId}.`, dispatch, commonErrorFallback)).then(({ data }) => {
-    var _a;
     const device = getDeviceById(getState(), deviceId);
     const { canManageUsers } = getUserCapabilities(getState());
     let tasks = [
-      dispatch(actions3.receivedDevice(__spreadProps(__spreadValues({}, device), { config: __spreadProps(__spreadValues({}, device.config), { deployment_id: data.deployment_id }) }))),
+      dispatch(actions3.receivedDevice({ ...device, config: { ...device.config, deployment_id: data.deployment_id } })),
       new Promise((resolve) => setTimeout(() => resolve(dispatch(getSingleDeployment(data.deployment_id))), TIMEOUTS.oneSecond))
     ];
     if (isDefault && canManageUsers) {
-      const { previous } = (_a = getGlobalSettings(getState()).defaultDeviceConfig) != null ? _a : {};
+      const { previous } = getGlobalSettings(getState()).defaultDeviceConfig ?? {};
       tasks.push(dispatch(saveGlobalSettings({ defaultDeviceConfig: { current: config, previous } })));
     }
     return Promise.all(tasks);
@@ -4164,21 +4266,21 @@ var setDeviceTags = (0, import_toolkit19.createAsyncThunk)(
         `${inventoryApiUrl}/devices/${deviceId}/tags`,
         Object.entries(tags).map(([name, value]) => ({ name, value })),
         { headers }
-      ).catch((err) => commonErrorHandler(err, `There was an error setting tags for device ${deviceId}.`, dispatch, "Please check your connection.")).then(() => Promise.all([dispatch(actions3.receivedDevice(__spreadProps(__spreadValues({}, device), { id: deviceId, tags }))), dispatch(setSnackbar3("Device name changed"))]));
+      ).catch((err) => commonErrorHandler(err, `There was an error setting tags for device ${deviceId}.`, dispatch, "Please check your connection.")).then(() => Promise.all([dispatch(actions3.receivedDevice({ ...device, id: deviceId, tags })), dispatch(setSnackbar3("Device name changed"))]));
     })
   )
 );
 var getDeviceTwin = (0, import_toolkit19.createAsyncThunk)(`${sliceName3}/getDeviceTwin`, ({ deviceId, integration }, { dispatch, getState }) => {
   let providerResult = {};
   return general_api_default.get(`${iotManagerBaseURL}/devices/${deviceId}/state`).then(({ data }) => {
-    providerResult = __spreadProps(__spreadValues({}, data), { twinError: "" });
+    providerResult = { ...data, twinError: "" };
   }).catch((err) => {
     providerResult = {
       twinError: `There was an error getting the ${EXTERNAL_PROVIDER[integration.provider].twinTitle.toLowerCase()} for device ${deviceId}. ${err}`
     };
   }).finally(() => {
     const device = getDeviceById(getState(), deviceId);
-    Promise.resolve(dispatch(actions3.receivedDevice(__spreadProps(__spreadValues({}, device), { twinsByIntegration: __spreadValues(__spreadValues({}, device.twinsByIntegration), providerResult) }))));
+    Promise.resolve(dispatch(actions3.receivedDevice({ ...device, twinsByIntegration: { ...device.twinsByIntegration, ...providerResult } })));
   });
 });
 var setDeviceTwin = (0, import_toolkit19.createAsyncThunk)(
@@ -4194,7 +4296,7 @@ var setDeviceTwin = (0, import_toolkit19.createAsyncThunk)(
     const { twinsByIntegration = {} } = device;
     const { [integration.id]: currentState = {} } = twinsByIntegration;
     return Promise.resolve(
-      dispatch(actions3.receivedDevice(__spreadProps(__spreadValues({}, device), { twinsByIntegration: __spreadProps(__spreadValues({}, twinsByIntegration), { [integration.id]: __spreadProps(__spreadValues({}, currentState), { desired: settings }) }) })))
+      dispatch(actions3.receivedDevice({ ...device, twinsByIntegration: { ...twinsByIntegration, [integration.id]: { ...currentState, desired: settings } } }))
     );
   })
 );
@@ -4215,8 +4317,8 @@ var getSystemDevices = (0, import_toolkit19.createAsyncThunk)(`${sliceName3}/get
   const { attributes: deviceAttributes = {} } = getDeviceById(state, id);
   const { mender_gateway_system_id = "" } = deviceAttributes;
   const filters = [
-    __spreadProps(__spreadValues({}, emptyFilter), { key: "mender_is_gateway", operator: DEVICE_FILTERING_OPTIONS.$ne.key, value: "true", scope: "inventory" }),
-    __spreadProps(__spreadValues({}, emptyFilter), { key: "mender_gateway_system_id", value: mender_gateway_system_id, scope: "inventory" })
+    { ...emptyFilter, key: "mender_is_gateway", operator: DEVICE_FILTERING_OPTIONS.$ne.key, value: "true", scope: "inventory" },
+    { ...emptyFilter, key: "mender_gateway_system_id", value: mender_gateway_system_id, scope: "inventory" }
   ];
   const { attributes, filterTerms } = prepareSearchArguments({ filters, state });
   return general_api_default.post(getSearchEndpoint(getState()), {
@@ -4228,11 +4330,12 @@ var getSystemDevices = (0, import_toolkit19.createAsyncThunk)(`${sliceName3}/get
   }).catch((err) => commonErrorHandler(err, `There was an error getting system devices device ${id}.`, dispatch, "Please check your connection.")).then(({ data, headers }) => {
     const state2 = getState();
     const { devicesById, ids } = reduceReceivedDevices(data, [], state2);
-    const device = __spreadProps(__spreadValues({}, getDeviceById(state2, id)), {
+    const device = {
+      ...getDeviceById(state2, id),
       systemDeviceIds: ids,
       systemDeviceTotal: Number(headers[headerNames.total])
-    });
-    return Promise.resolve(dispatch(actions3.receivedDevices(__spreadProps(__spreadValues({}, devicesById), { [id]: device }))));
+    };
+    return Promise.resolve(dispatch(actions3.receivedDevices({ ...devicesById, [id]: device })));
   });
 });
 var getGatewayDevices = (0, import_toolkit19.createAsyncThunk)(`${sliceName3}/getGatewayDevices`, (deviceId, { dispatch, getState }) => {
@@ -4240,9 +4343,9 @@ var getGatewayDevices = (0, import_toolkit19.createAsyncThunk)(`${sliceName3}/ge
   const { attributes = {} } = getDeviceById(state, deviceId);
   const { mender_gateway_system_id = "" } = attributes;
   const filters = [
-    __spreadProps(__spreadValues({}, emptyFilter), { key: "id", operator: DEVICE_FILTERING_OPTIONS.$ne.key, value: deviceId, scope: "identity" }),
-    __spreadProps(__spreadValues({}, emptyFilter), { key: "mender_is_gateway", value: "true", scope: "inventory" }),
-    __spreadProps(__spreadValues({}, emptyFilter), { key: "mender_gateway_system_id", value: mender_gateway_system_id, scope: "inventory" })
+    { ...emptyFilter, key: "id", operator: DEVICE_FILTERING_OPTIONS.$ne.key, value: deviceId, scope: "identity" },
+    { ...emptyFilter, key: "mender_is_gateway", value: "true", scope: "inventory" },
+    { ...emptyFilter, key: "mender_gateway_system_id", value: mender_gateway_system_id, scope: "inventory" }
   ];
   const { attributes: attributeSelection, filterTerms } = prepareSearchArguments({ filters, state });
   return general_api_default.post(getSearchEndpoint(getState()), {
@@ -4289,7 +4392,7 @@ var { page: defaultPage3, perPage: defaultPerPage3 } = DEVICE_LIST_DEFAULTS;
 var cutoffLength = 75;
 var ellipsis = "...";
 var longTextTrimmer = (text) => text.length >= cutoffLength + ellipsis.length ? `${text.substring(0, cutoffLength + ellipsis.length)}${ellipsis}` : text;
-var sanitizeDeviceAlerts = (alerts) => alerts.map((alert) => __spreadProps(__spreadValues({}, alert), { fullName: alert.name, name: longTextTrimmer(alert.name) }));
+var sanitizeDeviceAlerts = (alerts) => alerts.map((alert) => ({ ...alert, fullName: alert.name, name: longTextTrimmer(alert.name) }));
 var getDeviceAlerts = (0, import_toolkit20.createAsyncThunk)(`${sliceName4}/getDeviceAlerts`, ({ id, config = {} }, { dispatch }) => {
   const { page = defaultPage3, perPage = defaultPerPage3, issuedBefore, issuedAfter, sortAscending = false } = config;
   const issued_after = issuedAfter ? `&issued_after=${issuedAfter}` : "";
@@ -4307,14 +4410,15 @@ var getLatestDeviceAlerts = (0, import_toolkit20.createAsyncThunk)(`${sliceName4
 });
 var getIssueCountsByType2 = (0, import_toolkit20.createAsyncThunk)(`${sliceName4}/getIssueCountsByType`, ({ type, options = {} }, { dispatch, getState }) => {
   const state = getState();
-  const _a = options, { filters = getDeviceFilters(state), group, status } = _a, remainder = __objRest(_a, ["filters", "group", "status"]);
-  const { applicableFilters: nonMonitorFilters, filterTerms } = convertDeviceListStateToFilters(__spreadProps(__spreadValues({}, remainder), {
+  const { filters = getDeviceFilters(state), group, status, ...remainder } = options;
+  const { applicableFilters: nonMonitorFilters, filterTerms } = convertDeviceListStateToFilters({
+    ...remainder,
     filters,
     group,
     offlineThreshold: state.app.offlineThreshold,
     selectedIssues: [type],
     status
-  }));
+  });
   return general_api_default.post(getSearchEndpoint(getState()), {
     page: 1,
     per_page: 1,
@@ -4366,21 +4470,21 @@ var determineProgress = (acceptedDevices, pendingDevices, releases, pastDeployme
   return steps[progress2];
 };
 var deductOnboardingState = ({ devicesById, devicesByStatus, onboardingState, pastDeployments, releases, userCapabilities, userId }) => {
-  var _a;
   const { canDeploy, canManageDevices, canReadDeployments, canReadDevices, canReadReleases, canUploadReleases } = userCapabilities;
   const userCookie = cookies3.get(`${userId}-onboarded`);
   const acceptedDevices = devicesByStatus[DEVICE_STATES.accepted].deviceIds;
   const pendingDevices = devicesByStatus[DEVICE_STATES.pending].deviceIds;
-  let deviceType = (_a = onboardingState.deviceType) != null ? _a : [];
+  let deviceType = onboardingState.deviceType ?? [];
   deviceType = !deviceType.length && acceptedDevices.length && devicesById[acceptedDevices[0]].hasOwnProperty("attributes") ? devicesById[acceptedDevices[0]].attributes.device_type : deviceType;
   const progress2 = applyOnboardingFallbacks(onboardingState.progress || determineProgress(acceptedDevices, pendingDevices, releases, pastDeployments));
-  return __spreadProps(__spreadValues({}, onboardingState), {
+  return {
+    ...onboardingState,
     complete: !!(Boolean(userCookie) || onboardingState.complete || acceptedDevices.length > 1 && pendingDevices.length > 0 && releases.length > 1 && pastDeployments.length > 1 || acceptedDevices.length >= 1 && releases.length >= 2 && pastDeployments.length > 2 || acceptedDevices.length >= 1 && pendingDevices.length > 0 && releases.length >= 2 && pastDeployments.length >= 2 || orderedOnboardingSteps.findIndex((step) => step === progress2) >= orderedOnboardingSteps.length - 1 || onboardingState.disable || ![canDeploy, canManageDevices, canReadDeployments, canReadDevices, canReadReleases, canUploadReleases].every((i) => i)),
     showTips: onboardingState.showTips != null ? onboardingState.showTips : true,
     deviceType,
     approach: onboardingState.approach || (deviceType.some((type) => type.startsWith("qemu")) ? "virtual" : "physical"),
     progress: progress2
-  });
+  };
 };
 var getOnboardingState2 = (0, import_toolkit21.createAsyncThunk)(`${sliceName5}/getOnboardingState`, (_, { dispatch, getState }) => {
   const state = getState();
@@ -4438,7 +4542,7 @@ var advanceOnboarding = (0, import_toolkit21.createAsyncThunk)(`${sliceName5}/ad
     return;
   }
   const madeProgress = steps[stepIndex + 1];
-  const state = __spreadProps(__spreadValues({}, getOnboardingState(getState())), { progress: madeProgress });
+  const state = { ...getOnboardingState(getState()), progress: madeProgress };
   state.complete = stepIndex + 1 >= steps.findIndex((step) => step === onboardingSteps.DEPLOYMENTS_PAST_COMPLETED_FAILURE) ? true : state.complete;
   return Promise.all([dispatch(actions5.setOnboardingProgress(madeProgress)), dispatch(saveUserSettings({ onboarding: state }))]);
 });
@@ -4521,8 +4625,8 @@ var completeUpgrade = (0, import_toolkit22.createAsyncThunk)(
   ({ tenantId, plan }, { dispatch }) => general_api_default.post(`${tenantadmApiUrlv2}/tenants/${tenantId}/upgrade/complete`, { plan }).catch((err) => commonErrorHandler(err, `There was an error upgrading your account:`, dispatch)).then(() => Promise.resolve(dispatch(getUserOrganization())))
 );
 var prepareAuditlogQuery = ({ startDate, endDate, user: userFilter, type, detail: detailFilter, sort = {} }) => {
-  const userId = (userFilter == null ? void 0 : userFilter.id) || userFilter;
-  const detail = (detailFilter == null ? void 0 : detailFilter.id) || detailFilter;
+  const userId = userFilter?.id || userFilter;
+  const detail = detailFilter?.id || detailFilter;
   const createdAfter = startDate ? `&created_after=${Math.round(Date.parse(startDate) / 1e3)}` : "";
   const createdBefore = endDate ? `&created_before=${Math.round(Date.parse(endDate) / 1e3)}` : "";
   const typeSearch = type ? `&object_type=${type.value}`.toLowerCase() : "";
@@ -4549,12 +4653,14 @@ var getAuditLogsCsvLink = (0, import_toolkit22.createAsyncThunk)(
 );
 var setAuditlogsState = (0, import_toolkit22.createAsyncThunk)(`${sliceName6}/setAuditlogsState`, (selectionState, { dispatch, getState }) => {
   const currentState = getAuditlogState(getState());
-  let nextState = __spreadProps(__spreadValues(__spreadValues({}, currentState), selectionState), {
-    sort: __spreadValues(__spreadValues({}, currentState.sort), selectionState.sort)
-  });
+  let nextState = {
+    ...currentState,
+    ...selectionState,
+    sort: { ...currentState.sort, ...selectionState.sort }
+  };
   let tasks = [];
-  const _a = currentState, { isLoading: currentLoading, selectedIssue: currentIssue } = _a, currentRequestState = __objRest(_a, ["isLoading", "selectedIssue"]);
-  const _b2 = nextState, { isLoading: selectionLoading, selectedIssue: selectionIssue } = _b2, selectionRequestState = __objRest(_b2, ["isLoading", "selectedIssue"]);
+  const { isLoading: currentLoading, selectedIssue: currentIssue, ...currentRequestState } = currentState;
+  const { isLoading: selectionLoading, selectedIssue: selectionIssue, ...selectionRequestState } = nextState;
   if (!(0, import_helpers10.deepCompare)(currentRequestState, selectionRequestState)) {
     nextState.isLoading = true;
     tasks.push(dispatch(getAuditLogs(nextState)).finally(() => dispatch(actions6.setAuditLogState({ isLoading: false }))));
@@ -4566,27 +4672,30 @@ var tenantDataDivergedMessage = "The system detected there is a change in your p
 var addTenant = (0, import_toolkit22.createAsyncThunk)(`${sliceName6}/createTenant`, (selectionState, { dispatch }) => {
   return general_api_default.post(`${tenantadmApiUrlv2}/tenants`, selectionState).then(() => Promise.all([dispatch(getTenants()), dispatch(setSnackbar4("Tenant was created successfully."))])).catch((err) => commonErrorHandler(err, "There was an error creating tenant", dispatch, commonErrorFallback));
 });
-var tenantListRetrieval = (config) => __async(void 0, null, function* () {
+var tenantListRetrieval = async (config) => {
   const { page, perPage } = config;
   const params = new URLSearchParams({ page, per_page: perPage }).toString();
-  const tenantList = yield general_api_default.get(`${tenantadmApiUrlv2}/tenants?${params}`);
+  const tenantList = await general_api_default.get(`${tenantadmApiUrlv2}/tenants?${params}`);
   const totalCount = tenantList.headers[headerNames.total] || TENANT_LIST_DEFAULT.perPage;
-  return [tenantList.data, totalCount];
-});
-var getTenants = (0, import_toolkit22.createAsyncThunk)(`${sliceName6}/getTenants`, (_0, _1) => __async(void 0, [_0, _1], function* (_, { dispatch, getState }) {
+  return [tenantList.data, Number(totalCount)];
+};
+var getTenants = (0, import_toolkit22.createAsyncThunk)(`${sliceName6}/getTenants`, async (_, { dispatch, getState }) => {
   const currentState = getTenantsList(getState());
-  const [tenants, pageCount] = yield tenantListRetrieval(currentState);
-  dispatch(actions6.setTenantListState(__spreadProps(__spreadValues({}, currentState), { total: pageCount, tenants })));
-}));
-var setTenantsListState = (0, import_toolkit22.createAsyncThunk)(`${sliceName6}/setTenantsListState`, (_0, _1) => __async(void 0, [_0, _1], function* (selectionState, { dispatch, getState }) {
+  const [tenants, pageCount] = await tenantListRetrieval(currentState);
+  dispatch(actions6.setTenantListState({ ...currentState, total: pageCount, tenants }));
+});
+var setTenantsListState = (0, import_toolkit22.createAsyncThunk)(`${sliceName6}/setTenantsListState`, async (selectionState, { dispatch, getState }) => {
   const currentState = getTenantsList(getState());
-  const nextState = __spreadValues(__spreadValues({}, currentState), selectionState);
+  const nextState = {
+    ...currentState,
+    ...selectionState
+  };
   if (!(0, import_helpers10.deepCompare)(currentState, selectionState)) {
-    const [tenants, pageCount] = yield tenantListRetrieval(nextState);
-    return dispatch(actions6.setTenantListState(__spreadProps(__spreadValues({}, nextState), { tenants, total: pageCount })));
+    const [tenants, pageCount] = await tenantListRetrieval(nextState);
+    return dispatch(actions6.setTenantListState({ ...nextState, tenants, total: pageCount }));
   }
-  return dispatch(actions6.setTenantListState(__spreadValues({}, nextState)));
-}));
+  return dispatch(actions6.setTenantListState({ ...nextState }));
+});
 var editTenantDeviceLimit = (0, import_toolkit22.createAsyncThunk)(`${sliceName6}/editDeviceLimit`, ({ newLimit, id, name }, { dispatch }) => {
   return general_api_default.put(`${tenantadmApiUrlv2}/tenants/${id}/child`, { device_limit: newLimit, name }).catch((err) => commonErrorHandler(err, `Device Limit cannot be changed`, dispatch)).then(() => {
     const tasks = [Promise.resolve(dispatch(setSnackbar4("Device Limit was changed successfully")))];
@@ -4629,10 +4738,7 @@ var downloadLicenseReport = (0, import_toolkit22.createAsyncThunk)(
 );
 var createIntegration = (0, import_toolkit22.createAsyncThunk)(
   `${sliceName6}/createIntegration`,
-  (_a, { dispatch }) => {
-    var _b2 = _a, { id } = _b2, integration = __objRest(_b2, ["id"]);
-    return general_api_default.post(`${iotManagerBaseURL}/integrations`, integration).catch((err) => commonErrorHandler(err, "There was an error creating the integration", dispatch, commonErrorFallback)).then(() => Promise.all([dispatch(setSnackbar4("The integration was set up successfully")), dispatch(getIntegrations())]));
-  }
+  ({ id, ...integration }, { dispatch }) => general_api_default.post(`${iotManagerBaseURL}/integrations`, integration).catch((err) => commonErrorHandler(err, "There was an error creating the integration", dispatch, commonErrorFallback)).then(() => Promise.all([dispatch(setSnackbar4("The integration was set up successfully")), dispatch(getIntegrations())]))
 );
 var changeIntegration = (0, import_toolkit22.createAsyncThunk)(
   `${sliceName6}/changeIntegration`,
@@ -4653,9 +4759,8 @@ var getIntegrations = (0, import_toolkit22.createAsyncThunk)(
   (_, { dispatch, getState }) => general_api_default.get(`${iotManagerBaseURL}/integrations`).catch((err) => commonErrorHandler(err, "There was an error retrieving the integration", dispatch, commonErrorFallback)).then(({ data }) => {
     const existingIntegrations = getState().organization.externalDeviceIntegrations;
     const integrations = data.reduce((accu, item) => {
-      var _a;
-      const existingIntegration = (_a = existingIntegrations.find((integration2) => item.id === integration2.id)) != null ? _a : {};
-      const integration = __spreadValues(__spreadValues({}, existingIntegration), item);
+      const existingIntegration = existingIntegrations.find((integration2) => item.id === integration2.id) ?? {};
+      const integration = { ...existingIntegration, ...item };
       accu.push(integration);
       return accu;
     }, []);
@@ -4707,7 +4812,7 @@ var getSsoConfigById = (0, import_toolkit22.createAsyncThunk)(
   `${sliceName6}/getSsoConfigById`,
   (config, { dispatch }) => general_api_default.get(`${ssoIdpApiUrlv1}/${config.id}`).catch((err) => dispatch(ssoConfigActionErrorHandler(err, "read"))).then(({ data, headers }) => {
     const sso = Object.values(SSO_TYPES).find(({ contentType }) => contentType === headers["content-type"]);
-    return sso ? Promise.resolve(__spreadProps(__spreadValues({}, config), { config: data, type: sso.id })) : Promise.reject("Unsupported SSO config content type.");
+    return sso ? Promise.resolve({ ...config, config: data, type: sso.id }) : Promise.reject("Unsupported SSO config content type.");
   })
 );
 var getSsoConfigs = (0, import_toolkit22.createAsyncThunk)(
@@ -4726,20 +4831,21 @@ var { setSnackbar: setSnackbar5, initUpload: initUpload2, uploadProgress: upload
 var { page: defaultPage5, perPage: defaultPerPage5 } = DEVICE_LIST_DEFAULTS;
 var sortingDefaults = { direction: SORTING_OPTIONS.desc, key: "modified" };
 var flattenRelease = (release, stateRelease) => {
-  var _a;
-  const updatedArtifacts = ((_a = release.artifacts) == null ? void 0 : _a.sort((0, import_helpers11.customSort)(1, "modified"))) || [];
+  const updatedArtifacts = release.artifacts?.sort((0, import_helpers11.customSort)(1, "modified")) || [];
   const { artifacts, deviceTypes, modified } = updatedArtifacts.reduce(
     (accu, item) => {
-      var _a2;
       accu.deviceTypes.push(...item.device_types_compatible);
-      const stateArtifact = ((_a2 = stateRelease.artifacts) == null ? void 0 : _a2.find((releaseArtifact) => releaseArtifact.id === item.id)) || {};
+      const stateArtifact = stateRelease.artifacts?.find((releaseArtifact) => releaseArtifact.id === item.id) || {};
       accu.modified = accu.modified ? accu.modified : item.modified;
-      accu.artifacts.push(__spreadValues(__spreadValues({}, stateArtifact), item));
+      accu.artifacts.push({
+        ...stateArtifact,
+        ...item
+      });
       return accu;
     },
     { artifacts: [], deviceTypes: [], modified: void 0 }
   );
-  return __spreadProps(__spreadValues(__spreadValues({}, stateRelease), release), { artifacts, device_types_compatible: deviceTypes.filter(import_helpers11.duplicateFilter), modified });
+  return { ...stateRelease, ...release, artifacts, device_types_compatible: deviceTypes.filter(import_helpers11.duplicateFilter), modified };
 };
 var reduceReceivedReleases = (releases, stateReleasesById) => releases.reduce((accu, release) => {
   const stateRelease = stateReleasesById[release.name] || {};
@@ -4757,17 +4863,16 @@ var findArtifactIndexInRelease = (releases, id) => Object.values(releases).reduc
   { release: null, index: -1 }
 );
 var getArtifactInstallCount = (0, import_toolkit23.createAsyncThunk)(`${sliceName7}/getArtifactInstallCount`, (id, { dispatch, getState }) => {
-  var _a;
   let { release, index } = findArtifactIndexInRelease(getReleasesById(getState()), id);
   if (!release || index === -1) {
     return;
   }
   const releaseArtifacts = [...release.artifacts];
   const artifact = releaseArtifacts[index];
-  const { key, name, version } = (_a = (0, import_helpers11.extractSoftwareItem)(artifact.artifact_provides)) != null ? _a : {};
+  const { key, name, version } = (0, import_helpers11.extractSoftwareItem)(artifact.artifact_provides) ?? {};
   const attribute = `${key}${name ? `.${name}` : ""}.version`;
   const { filterTerms } = convertDeviceListStateToFilters({
-    filters: [__spreadProps(__spreadValues({}, emptyFilter), { key: attribute, value: version, scope: "inventory" })]
+    filters: [{ ...emptyFilter, key: attribute, value: version, scope: "inventory" }]
   });
   return general_api_default.post(getSearchEndpoint(getState()), {
     page: 1,
@@ -4781,10 +4886,11 @@ var getArtifactInstallCount = (0, import_toolkit23.createAsyncThunk)(`${sliceNam
     }
     const installCount = Number(headers[headerNames.total]);
     const releaseArtifacts2 = [...release2.artifacts];
-    releaseArtifacts2[index2] = __spreadProps(__spreadValues({}, releaseArtifacts2[index2]), { installCount });
-    release2 = __spreadProps(__spreadValues({}, release2), {
+    releaseArtifacts2[index2] = { ...releaseArtifacts2[index2], installCount };
+    release2 = {
+      ...release2,
       artifacts: releaseArtifacts2
-    });
+    };
     return dispatch(actions7.receiveRelease(release2));
   });
 });
@@ -4796,12 +4902,14 @@ var getArtifactUrl = (0, import_toolkit23.createAsyncThunk)(
       return dispatch(getReleases());
     }
     const releaseArtifacts = [...release.artifacts];
-    releaseArtifacts[index] = __spreadProps(__spreadValues({}, releaseArtifacts[index]), {
+    releaseArtifacts[index] = {
+      ...releaseArtifacts[index],
       url: response.data.uri
-    });
-    release = __spreadProps(__spreadValues({}, release), {
+    };
+    release = {
+      ...release,
       artifacts: releaseArtifacts
-    });
+    };
     return dispatch(actions7.receiveRelease(release));
   })
 );
@@ -4926,12 +5034,14 @@ var selectRelease = (0, import_toolkit23.createAsyncThunk)(`${sliceName7}/select
 });
 var setReleasesListState = (0, import_toolkit23.createAsyncThunk)(`${sliceName7}/setReleasesListState`, (selectionState, { dispatch, getState }) => {
   const currentState = getState().releases.releasesList;
-  let nextState = __spreadProps(__spreadValues(__spreadValues({}, currentState), selectionState), {
-    sort: __spreadValues(__spreadValues({}, currentState.sort), selectionState.sort)
-  });
+  let nextState = {
+    ...currentState,
+    ...selectionState,
+    sort: { ...currentState.sort, ...selectionState.sort }
+  };
   let tasks = [];
-  const _a = currentState, { isLoading: currentLoading } = _a, currentRequestState = __objRest(_a, ["isLoading"]);
-  const _b2 = nextState, { isLoading: selectionLoading } = _b2, selectionRequestState = __objRest(_b2, ["isLoading"]);
+  const { isLoading: currentLoading, ...currentRequestState } = currentState;
+  const { isLoading: selectionLoading, ...selectionRequestState } = nextState;
   if (!(0, import_helpers11.deepCompare)(currentRequestState, selectionRequestState)) {
     nextState.isLoading = true;
     tasks.push(dispatch(getReleases(nextState)).finally(() => dispatch(setReleasesListState({ isLoading: false }))));
@@ -4950,29 +5060,30 @@ var releaseListRetrieval = (config) => {
   );
 };
 var deductSearchState = (receivedReleases, config, total, state) => {
-  let releaseListState = __spreadValues({}, state.releasesList);
+  let releaseListState = { ...state.releasesList };
   const { searchTerm, searchOnly, sort = {}, selectedTags = [], type } = config;
   const flattenedReleases = Object.values(receivedReleases).sort((0, import_helpers11.customSort)(sort.direction === SORTING_OPTIONS.desc, sort.key));
   const releaseIds = flattenedReleases.map((item) => item.name);
   const isFiltering = !!(selectedTags.length || type || searchTerm);
   if (searchOnly) {
-    releaseListState = __spreadProps(__spreadValues({}, releaseListState), { searchedIds: releaseIds });
+    releaseListState = { ...releaseListState, searchedIds: releaseIds };
   } else {
-    releaseListState = __spreadProps(__spreadValues({}, releaseListState), {
+    releaseListState = {
+      ...releaseListState,
       releaseIds,
       searchTotal: isFiltering ? total : state.releasesList.searchTotal,
       total: !isFiltering ? total : state.releasesList.total
-    });
+    };
   }
   return releaseListState;
 };
 var getReleases = (0, import_toolkit23.createAsyncThunk)(`${sliceName7}/getReleases`, (passedConfig = {}, { dispatch, getState }) => {
-  const config = __spreadValues(__spreadValues({}, getState().releases.releasesList), passedConfig);
+  const config = { ...getState().releases.releasesList, ...passedConfig };
   return releaseListRetrieval(config).then(({ data: receivedReleases = [], headers = {} }) => {
     const total = headers[headerNames.total] ? Number(headers[headerNames.total]) : 0;
     const state = getState().releases;
     const flatReleases = reduceReceivedReleases(receivedReleases, state.byId);
-    const combinedReleases = __spreadValues(__spreadValues({}, state.byId), flatReleases);
+    const combinedReleases = { ...state.byId, ...flatReleases };
     let tasks = [dispatch(actions7.receiveReleases(combinedReleases))];
     const releaseListState = deductSearchState(receivedReleases, config, total, state);
     tasks.push(dispatch(actions7.setReleaseListState(releaseListState)));
@@ -4993,7 +5104,7 @@ var updateReleaseInfo = (0, import_toolkit23.createAsyncThunk)(
   `${sliceName7}/updateReleaseInfo`,
   ({ name, info }, { dispatch, getState }) => general_api_default.patch(`${deploymentsApiUrlV2}/deployments/releases/${name}`, info).catch((err) => commonErrorHandler(err, `Release details couldn't be updated.`, dispatch)).then(() => {
     return Promise.all([
-      dispatch(actions7.receiveRelease(__spreadProps(__spreadValues(__spreadValues({}, getReleasesById(getState())[name]), info), { name }))),
+      dispatch(actions7.receiveRelease({ ...getReleasesById(getState())[name], ...info, name })),
       dispatch(setSnackbar5("Release details were updated successfully.", TIMEOUTS.fiveSeconds, ""))
     ]);
   })
@@ -5002,7 +5113,7 @@ var setReleaseTags = (0, import_toolkit23.createAsyncThunk)(
   `${sliceName7}/setReleaseTags`,
   ({ name, tags = [] }, { dispatch, getState }) => general_api_default.put(`${deploymentsApiUrlV2}/deployments/releases/${name}/tags`, tags).catch((err) => commonErrorHandler(err, `Release tags couldn't be set.`, dispatch)).then(() => {
     return Promise.all([
-      dispatch(actions7.receiveRelease(__spreadProps(__spreadValues({}, getReleasesById(getState())[name]), { name, tags }))),
+      dispatch(actions7.receiveRelease({ ...getReleasesById(getState())[name], name, tags })),
       dispatch(setSnackbar5("Release tags were set successfully.", TIMEOUTS.fiveSeconds, ""))
     ]);
   })
@@ -5019,19 +5130,13 @@ var getUpdateTypes = (0, import_toolkit23.createAsyncThunk)(
 // src/api/users-api.ts
 var import_axios4 = __toESM(require("axios"));
 var Api2 = {
-  postLogin: (url, _a) => {
-    var _b2 = _a, { email: username, password } = _b2, body = __objRest(_b2, ["email", "password"]);
-    return import_axios4.default.post(url, body, __spreadProps(__spreadValues({}, commonRequestConfig), { auth: { username, password } })).then((res) => {
-      var _a2;
-      return { text: res.data, code: res.status, contentType: (_a2 = res.headers) == null ? void 0 : _a2["content-type"] };
-    });
-  },
+  postLogin: (url, { email: username, password, ...body }) => import_axios4.default.post(url, body, { ...commonRequestConfig, auth: { username, password } }).then((res) => ({ text: res.data, code: res.status, contentType: res.headers?.["content-type"] })),
   putVerifyTFA: (url, userData) => {
     let body = {};
     if (userData.hasOwnProperty("token2fa")) {
       body = { token2fa: userData.token2fa };
     }
-    return import_axios4.default.put(url, body, __spreadProps(__spreadValues({}, commonRequestConfig), { headers: __spreadProps(__spreadValues({}, commonRequestConfig.headers), { Authorization: `Bearer ${getToken()}` }) }));
+    return import_axios4.default.put(url, body, { ...commonRequestConfig, headers: { ...commonRequestConfig.headers, Authorization: `Bearer ${getToken()}` } });
   }
 };
 var users_api_default = Api2;
@@ -5059,43 +5164,40 @@ var handleLoginError = (err, { token2fa: has2FA, password }, rejectWithValue) =>
 };
 var loginUser = (0, import_toolkit24.createAsyncThunk)(
   `${sliceName8}/loginUser`,
-  (_a, { dispatch, rejectWithValue }) => {
-    var _b2 = _a, { stayLoggedIn } = _b2, userData = __objRest(_b2, ["stayLoggedIn"]);
-    return users_api_default.postLogin(`${useradmApiUrlv1}/auth/login`, __spreadProps(__spreadValues({}, userData), { no_expiry: stayLoggedIn })).catch((err) => {
-      cleanUp();
-      return Promise.reject(dispatch(handleLoginError(err, userData, rejectWithValue)));
-    }).then(({ text: response, contentType }) => {
-      if (contentType.includes(APPLICATION_JSON_CONTENT_TYPE)) {
-        const { id, kind } = response;
-        const type = kind.split("/")[1];
-        const ssoLoginUrl = SSO_TYPES[type].getStartUrl(id);
-        window.location.replace(ssoLoginUrl);
-        return;
-      }
-      const token = response;
-      if (contentType !== APPLICATION_JWT_CONTENT_TYPE || !token) {
-        return;
-      }
-      let now = /* @__PURE__ */ new Date();
-      now.setSeconds(now.getSeconds() + maxSessionAge);
-      const expiresAt = stayLoggedIn ? void 0 : now.toISOString();
-      setSessionInfo({ token, expiresAt });
-      cookies5.remove("JWT", { path: "/" });
-      return (
-        // @ts-ignore
-        Promise.resolve(dispatch(getUser(OWN_USER_ID))).unwrap().catch((e) => {
-          cleanUp();
-          return Promise.reject(dispatch(setSnackbar6(extractErrorMessage(e))));
-        }).then(() => {
-          window.sessionStorage.removeItem("pendings-redirect");
-          if (window.location.pathname !== "/ui/") {
-            window.location.replace("/ui/");
-          }
-          return Promise.resolve(dispatch(actions8.successfullyLoggedIn({ expiresAt, token })));
-        })
-      );
-    });
-  }
+  ({ stayLoggedIn, ...userData }, { dispatch, rejectWithValue }) => users_api_default.postLogin(`${useradmApiUrlv1}/auth/login`, { ...userData, no_expiry: stayLoggedIn }).catch((err) => {
+    cleanUp();
+    return Promise.reject(dispatch(handleLoginError(err, userData, rejectWithValue)));
+  }).then(({ text: response, contentType }) => {
+    if (contentType.includes(APPLICATION_JSON_CONTENT_TYPE)) {
+      const { id, kind } = response;
+      const type = kind.split("/")[1];
+      const ssoLoginUrl = SSO_TYPES[type].getStartUrl(id);
+      window.location.replace(ssoLoginUrl);
+      return;
+    }
+    const token = response;
+    if (contentType !== APPLICATION_JWT_CONTENT_TYPE || !token) {
+      return;
+    }
+    let now = /* @__PURE__ */ new Date();
+    now.setSeconds(now.getSeconds() + maxSessionAge);
+    const expiresAt = stayLoggedIn ? void 0 : now.toISOString();
+    setSessionInfo({ token, expiresAt });
+    cookies5.remove("JWT", { path: "/" });
+    return (
+      // @ts-ignore
+      Promise.resolve(dispatch(getUser(OWN_USER_ID))).unwrap().catch((e) => {
+        cleanUp();
+        return Promise.reject(dispatch(setSnackbar6(extractErrorMessage(e))));
+      }).then(() => {
+        window.sessionStorage.removeItem("pendings-redirect");
+        if (window.location.pathname !== "/ui/") {
+          window.location.replace("/ui/");
+        }
+        return Promise.resolve(dispatch(actions8.successfullyLoggedIn({ expiresAt, token })));
+      })
+    );
+  })
 );
 var logoutUser = (0, import_toolkit24.createAsyncThunk)(`${sliceName8}/logoutUser`, (_, { dispatch, getState }) => {
   if (Object.keys(getState().app.uploadsById).length) {
@@ -5112,7 +5214,7 @@ var switchUserOrganization = (0, import_toolkit24.createAsyncThunk)(`${sliceName
     return Promise.reject();
   }
   return general_api_default.get(`${useradmApiUrlv1}/users/tenants/${tenantId}/token`).then(({ data: token }) => {
-    setSessionInfo(__spreadProps(__spreadValues({}, getSessionInfo()), { token }));
+    setSessionInfo({ ...getSessionInfo(), token });
     window.location.reload();
   });
 });
@@ -5175,13 +5277,13 @@ var getUser = (0, import_toolkit24.createAsyncThunk)(
 );
 var initializeSelf = (0, import_toolkit24.createAsyncThunk)(`${sliceName8}/initializeSelf`, (_, { dispatch }) => dispatch(getUser(OWN_USER_ID)));
 var updateUserColumnSettings = (0, import_toolkit24.createAsyncThunk)(`${sliceName8}/updateUserColumnSettings`, ({ columns, currentUserId }, { dispatch, getState }) => {
-  const userId = currentUserId != null ? currentUserId : getCurrentUser(getState()).id;
+  const userId = currentUserId ?? getCurrentUser(getState()).id;
   const storageKey = `${userId}-column-widths`;
   let customColumns = [];
   if (!columns) {
     try {
       customColumns = JSON.parse(window.localStorage.getItem(storageKey)) || customColumns;
-    } catch (e) {
+    } catch {
     }
   } else {
     customColumns = columns;
@@ -5210,10 +5312,7 @@ var userActions = {
 var userActionErrorHandler = (err, type, dispatch) => commonErrorHandler(err, `There was an error ${userActions[type].errorMessage} the user.`, dispatch);
 var createUser = (0, import_toolkit24.createAsyncThunk)(
   `${sliceName8}/createUser`,
-  (_a, { dispatch }) => {
-    var _b2 = _a, { shouldResetPassword } = _b2, userData = __objRest(_b2, ["shouldResetPassword"]);
-    return general_api_default.post(`${useradmApiUrlv1}/users`, __spreadProps(__spreadValues({}, userData), { send_reset_password: shouldResetPassword })).then(() => Promise.all([dispatch(actions8.createdUser(userData)), dispatch(getUserList()), dispatch(setSnackbar6(userActions.create.successMessage))])).catch((err) => userActionErrorHandler(err, "create", dispatch));
-  }
+  ({ shouldResetPassword, ...userData }, { dispatch }) => general_api_default.post(`${useradmApiUrlv1}/users`, { ...userData, send_reset_password: shouldResetPassword }).then(() => Promise.all([dispatch(actions8.createdUser(userData)), dispatch(getUserList()), dispatch(setSnackbar6(userActions.create.successMessage))])).catch((err) => userActionErrorHandler(err, "create", dispatch))
 );
 var removeUser = (0, import_toolkit24.createAsyncThunk)(
   `${sliceName8}/removeUser`,
@@ -5224,15 +5323,12 @@ var removeUser = (0, import_toolkit24.createAsyncThunk)(
 );
 var editUser = (0, import_toolkit24.createAsyncThunk)(
   `${sliceName8}/editUser`,
-  (_a, { dispatch, getState }) => {
-    var _b2 = _a, { id } = _b2, userData = __objRest(_b2, ["id"]);
-    return general_api_default.put(`${useradmApiUrlv1}/users/${id}`, userData).then(
-      () => Promise.all([
-        dispatch(actions8.updatedUser(__spreadProps(__spreadValues({}, userData), { id: id === OWN_USER_ID ? getCurrentUser(getState()).id : id }))),
-        dispatch(setSnackbar6(userActions.edit.successMessage))
-      ])
-    );
-  }
+  ({ id, ...userData }, { dispatch, getState }) => general_api_default.put(`${useradmApiUrlv1}/users/${id}`, userData).then(
+    () => Promise.all([
+      dispatch(actions8.updatedUser({ ...userData, id: id === OWN_USER_ID ? getCurrentUser(getState()).id : id })),
+      dispatch(setSnackbar6(userActions.edit.successMessage))
+    ])
+  )
 );
 var addUserToCurrentTenant = (0, import_toolkit24.createAsyncThunk)(`${sliceName8}/addUserToTenant`, (userId, { dispatch, getState }) => {
   const { id } = getOrganization(getState());
@@ -5267,7 +5363,7 @@ var mapHttpPermission = (permission) => Object.entries(uiPermissionsByArea).redu
     }
     return accu;
   },
-  __spreadValues({}, emptyUiPermissions)
+  { ...emptyUiPermissions }
 );
 var permissionActionTypes = {
   any: mapHttpPermission,
@@ -5290,20 +5386,21 @@ var combinePermissions = (existingPermissions, additionalPermissions = {}) => Ob
 }, existingPermissions);
 var tryParseCustomPermission = (permission) => {
   const uiPermissions = permissionActionTypes[permission.action](permission.object);
-  const result = mergePermissions(__spreadValues({}, emptyUiPermissions), uiPermissions);
+  const result = mergePermissions({ ...emptyUiPermissions }, uiPermissions);
   return { isCustom: true, permission, result };
 };
 var customPermissionHandler = (accu, permission) => {
   let processor = tryParseCustomPermission(permission);
-  return __spreadProps(__spreadValues({}, accu), {
+  return {
+    ...accu,
     isCustom: accu.isCustom || processor.isCustom,
     uiPermissions: mergePermissions(accu.uiPermissions, processor.result)
-  });
+  };
 };
 var mapPermissionSet = (permissionSetName, names, scope, existingGroupsPermissions = {}) => {
   const permission = Object.values(uiPermissionsById).find((permission2) => permission2.permissionSets[scope] === permissionSetName).value;
   const scopedPermissions = names.reduce((accu, name) => combinePermissions(accu, { [name]: [permission] }), existingGroupsPermissions);
-  return Object.entries(scopedPermissions).reduce((accu, [key, permissions]) => __spreadProps(__spreadValues({}, accu), { [key]: deriveImpliedAreaPermissions(scope, permissions) }), {});
+  return Object.entries(scopedPermissions).reduce((accu, [key, permissions]) => ({ ...accu, [key]: deriveImpliedAreaPermissions(scope, permissions) }), {});
 };
 var isEmptyPermissionSet = (permissionSet) => !Object.values(permissionSet).reduce((accu, permissions) => {
   if (Array.isArray(permissions)) {
@@ -5318,60 +5415,59 @@ var parseRolePermissions = ({ permission_sets_with_scope = [], permissions = []
       if (!processor) {
         return accu;
       }
-      const scope = Object.keys(scopedPermissionAreas).find((scope2) => {
-        var _a;
-        return uiPermissionsByArea[scope2].scope === ((_a = permissionSet.scope) == null ? void 0 : _a.type);
-      });
+      const scope = Object.keys(scopedPermissionAreas).find((scope2) => uiPermissionsByArea[scope2].scope === permissionSet.scope?.type);
       if (scope) {
         const result = mapPermissionSet(permissionSet.name, permissionSet.scope.value, scope, accu.uiPermissions[scope]);
-        return __spreadProps(__spreadValues({}, accu), { uiPermissions: __spreadProps(__spreadValues({}, accu.uiPermissions), { [scope]: result }) });
+        return { ...accu, uiPermissions: { ...accu.uiPermissions, [scope]: result } };
       } else if (isEmptyPermissionSet(processor.result)) {
         return processor.permissions.reduce(customPermissionHandler, accu);
       }
-      return __spreadProps(__spreadValues({}, accu), {
+      return {
+        ...accu,
         isCustom: accu.isCustom || processor.isCustom,
         uiPermissions: mergePermissions(accu.uiPermissions, processor.result)
-      });
+      };
     },
-    { isCustom: false, uiPermissions: __spreadProps(__spreadValues({}, emptyUiPermissions), { groups: {}, releases: {} }) }
+    { isCustom: false, uiPermissions: { ...emptyUiPermissions, groups: {}, releases: {} } }
   );
   return permissions.reduce(customPermissionHandler, preliminaryResult);
 };
 var normalizeRbacRoles = (roles, rolesById2, permissionSets) => roles.reduce(
   (accu, role) => {
-    var _a;
     let normalizedPermissions;
     let isCustom = false;
     if (rolesById2[role.name]) {
-      normalizedPermissions = __spreadProps(__spreadValues({}, rolesById2[role.name].uiPermissions), {
-        groups: __spreadValues({}, rolesById2[role.name].uiPermissions.groups),
-        releases: __spreadValues({}, rolesById2[role.name].uiPermissions.releases)
-      });
+      normalizedPermissions = {
+        ...rolesById2[role.name].uiPermissions,
+        groups: { ...rolesById2[role.name].uiPermissions.groups },
+        releases: { ...rolesById2[role.name].uiPermissions.releases }
+      };
     } else {
       const result = parseRolePermissions(role, permissionSets);
       normalizedPermissions = result.uiPermissions;
       isCustom = result.isCustom;
     }
-    const roleState = (_a = accu[role.name]) != null ? _a : __spreadValues({}, emptyRole);
-    accu[role.name] = __spreadProps(__spreadValues(__spreadValues({}, roleState), role), {
+    const roleState = accu[role.name] ?? { ...emptyRole };
+    accu[role.name] = {
+      ...roleState,
+      ...role,
       description: roleState.description ? roleState.description : role.description,
       editable: !rolesById[role.name] && !isCustom && (typeof roleState.editable !== "undefined" ? roleState.editable : true),
       isCustom,
       name: roleState.name ? roleState.name : role.name,
       uiPermissions: normalizedPermissions
-    });
+    };
     return accu;
   },
-  __spreadValues({}, rolesById2)
+  { ...rolesById2 }
 );
 var getPermissionSets = (0, import_toolkit24.createAsyncThunk)(
   `${sliceName8}/getPermissionSets`,
   (_, { dispatch, getState }) => general_api_default.get(`${useradmApiUrlv2}/permission_sets?per_page=500`).then(({ data }) => {
     const permissionSets = data.reduce(
       (accu, permissionSet) => {
-        var _a, _b2;
-        const permissionSetState = (_a = accu[permissionSet.name]) != null ? _a : {};
-        let permissionSetObject = __spreadValues(__spreadValues({}, permissionSetState), permissionSet);
+        const permissionSetState = accu[permissionSet.name] ?? {};
+        let permissionSetObject = { ...permissionSetState, ...permissionSet };
         permissionSetObject.result = Object.values(uiPermissionsById).reduce(
           (accu2, item) => Object.entries(item.permissionSets).reduce((collector, [area, permissionSet2]) => {
             if (scopedPermissionAreas[area]) {
@@ -5382,11 +5478,10 @@ var getPermissionSets = (0, import_toolkit24.createAsyncThunk)(
             }
             return collector;
           }, accu2),
-          __spreadValues(__spreadValues({}, emptyUiPermissions), (_b2 = permissionSetObject.result) != null ? _b2 : {})
+          { ...emptyUiPermissions, ...permissionSetObject.result ?? {} }
         );
         const scopes = Object.values(scopedPermissionAreas).reduce((accu2, { key, scopeType }) => {
-          var _a2, _b3;
-          if (((_a2 = permissionSetObject.supported_scope_types) == null ? void 0 : _a2.includes(key)) || ((_b3 = permissionSetObject.supported_scope_types) == null ? void 0 : _b3.includes(scopeType))) {
+          if (permissionSetObject.supported_scope_types?.includes(key) || permissionSetObject.supported_scope_types?.includes(scopeType)) {
             accu2.push(key);
           }
           return accu2;
@@ -5399,7 +5494,7 @@ var getPermissionSets = (0, import_toolkit24.createAsyncThunk)(
         return accu;
       },
       // @ts-ignore
-      __spreadValues({}, getState().users.permissionSetsById)
+      { ...getState().users.permissionSetsById }
     );
     return Promise.all([dispatch(actions8.receivedPermissionSets(permissionSets)), permissionSets]);
   }).catch(() => console.log("Permission set retrieval failed - likely accessing a non-RBAC backend"))
@@ -5432,28 +5527,27 @@ var transformAreaRoleDataToScopedPermissionsSets = (area, areaPermissions, exces
     const skipPermissions = scopedPermissionAreas.releases.key === area && item !== ALL_RELEASES ? [uiPermissionsById.upload.value] : [];
     const impliedPermissions = deriveImpliedAreaPermissions(area, uiPermissions, skipPermissions);
     accu = impliedPermissions.reduce((itemPermissionAccu, impliedPermission) => {
-      var _a;
-      const permissionSetState = (_a = itemPermissionAccu[uiPermissionsById[impliedPermission].permissionSets[area]]) != null ? _a : {
+      const permissionSetState = itemPermissionAccu[uiPermissionsById[impliedPermission].permissionSets[area]] ?? {
         type: uiPermissionsByArea[area].scope,
         value: []
       };
-      itemPermissionAccu[uiPermissionsById[impliedPermission].permissionSets[area]] = __spreadProps(__spreadValues({}, permissionSetState), {
+      itemPermissionAccu[uiPermissionsById[impliedPermission].permissionSets[area]] = {
+        ...permissionSetState,
         value: [...permissionSetState.value, item]
-      });
+      };
       return itemPermissionAccu;
     }, accu);
     return accu;
   }, {});
-  return Object.entries(permissionSetObject).map((_a) => {
-    var [name, _b2] = _a, _c = _b2, { value } = _c, scope = __objRest(_c, ["value"]);
+  return Object.entries(permissionSetObject).map(([name, { value, ...scope }]) => {
     if (value.includes(excessiveAccessSelector)) {
       return { name };
     }
-    return { name, scope: __spreadProps(__spreadValues({}, scope), { value: value.filter(import_helpers12.duplicateFilter) }) };
+    return { name, scope: { ...scope, value: value.filter(import_helpers12.duplicateFilter) } };
   });
 };
 var transformRoleDataToRole = (roleData, roleState = {}) => {
-  const role = __spreadValues(__spreadValues({}, roleState), roleData);
+  const role = { ...roleState, ...roleData };
   const { description = "", name, uiPermissions = emptyUiPermissions } = role;
   const { maybeUiPermissions, remainderKeys } = Object.entries(emptyUiPermissions).reduce(
     (accu, [key, emptyPermissions]) => {
@@ -5489,12 +5583,17 @@ var transformRoleDataToRole = (roleData, roleState = {}) => {
   }, []);
   return {
     permissionSetsWithScope: [...permissionSetsWithScope, ...scopedPermissionSets],
-    role: __spreadProps(__spreadValues({}, emptyRole), {
+    role: {
+      ...emptyRole,
       name,
       // @ts-ignore
       description: description ? description : roleState.description,
-      uiPermissions: __spreadValues(__spreadValues(__spreadValues({}, emptyUiPermissions), roleUiPermissions), maybeUiPermissions)
-    })
+      uiPermissions: {
+        ...emptyUiPermissions,
+        ...roleUiPermissions,
+        ...maybeUiPermissions
+      }
+    }
   };
 };
 var roleActions = {
@@ -5545,13 +5644,12 @@ var getGlobalSettings2 = (0, import_toolkit24.createAsyncThunk)(
 var saveGlobalSettings = (0, import_toolkit24.createAsyncThunk)(
   `${sliceName8}/saveGlobalSettings`,
   // @ts-ignore
-  (_a, { dispatch, getState }) => {
-    var _b2 = _a, { beOptimistic = false, notify = false } = _b2, settings = __objRest(_b2, ["beOptimistic", "notify"]);
+  ({ beOptimistic = false, notify = false, ...settings }, { dispatch, getState }) => {
     if (!window.sessionStorage.getItem(settingsKeys.initialized) && !beOptimistic) {
       return;
     }
     return dispatch(getGlobalSettings2()).unwrap().then((result) => {
-      let updatedSettings = __spreadValues(__spreadValues({}, getState().users.globalSettings), settings);
+      let updatedSettings = { ...getState().users.globalSettings, ...settings };
       if (getCurrentUser(getState()).verified) {
         updatedSettings["2fa"] = twoFAStates.enabled;
       } else {
@@ -5589,10 +5687,17 @@ var saveUserSettings = (0, import_toolkit24.createAsyncThunk)(`${sliceName8}/sav
     const userSettings = getUserSettings(getState());
     const onboardingState = getOnboardingState(getState());
     const tooltipState = getTooltipsState(getState());
-    const updatedSettings = __spreadProps(__spreadValues(__spreadValues({}, userSettings), settings), {
-      onboarding: __spreadValues(__spreadValues({}, onboardingState), settings.onboarding),
+    const updatedSettings = {
+      ...userSettings,
+      // @ts-ignore
+      ...settings,
+      onboarding: {
+        ...onboardingState,
+        // @ts-ignore
+        ...settings.onboarding
+      },
       tooltips: tooltipState
-    });
+    };
     const headers = result[result.length - 1] ? { "If-Match": result[result.length - 1] } : {};
     return Promise.all([
       Promise.resolve(dispatch(actions8.setUserSettings(updatedSettings))),
@@ -5618,9 +5723,10 @@ var getTokens = (0, import_toolkit24.createAsyncThunk)(
   `${sliceName8}/getTokens`,
   (_, { dispatch, getState }) => general_api_default.get(`${useradmApiUrlv1}/settings/tokens`).then(({ data: tokens }) => {
     const user = getCurrentUser(getState());
-    const updatedUser = __spreadProps(__spreadValues({}, user), {
+    const updatedUser = {
+      ...user,
       tokens
-    });
+    };
     return Promise.resolve(dispatch(actions8.updatedUser(updatedUser)));
   })
 );
@@ -5636,8 +5742,7 @@ var revokeToken = (0, import_toolkit24.createAsyncThunk)(
     general_api_default.delete(`${useradmApiUrlv1}/settings/tokens/${token.id}`).then(() => Promise.resolve(dispatch(getTokens())))
   )
 );
-var setTooltipReadState = (0, import_toolkit24.createAsyncThunk)(`${sliceName8}/setTooltipReadState`, (_a, { dispatch }) => {
-  var _b2 = _a, { persist } = _b2, remainder = __objRest(_b2, ["persist"]);
+var setTooltipReadState = (0, import_toolkit24.createAsyncThunk)(`${sliceName8}/setTooltipReadState`, ({ persist, ...remainder }, { dispatch }) => {
   let tasks = [dispatch(actions8.setTooltipState(remainder))];
   if (persist) {
     tasks.push(dispatch(saveUserSettings()));
@@ -5645,14 +5750,13 @@ var setTooltipReadState = (0, import_toolkit24.createAsyncThunk)(`${sliceName8}/
   return Promise.all(tasks);
 });
 var setAllTooltipsReadState = (0, import_toolkit24.createAsyncThunk)(`${sliceName8}/toggleHelptips`, ({ readState = READ_STATES.read, tooltips }, { dispatch }) => {
-  const updatedTips = tooltips.reduce((accu, id) => __spreadProps(__spreadValues({}, accu), { [id]: { readState } }), {});
+  const updatedTips = tooltips.reduce((accu, id) => ({ ...accu, [id]: { readState } }), {});
   return Promise.resolve(dispatch(actions8.setTooltipsState(updatedTips))).then(() => dispatch(saveUserSettings()));
 });
 var submitFeedback = (0, import_toolkit24.createAsyncThunk)(
   `${sliceName8}/submitFeedback`,
   // @ts-ignore
-  (_a, { dispatch }) => {
-    var _b2 = _a, { satisfaction, feedback } = _b2, meta = __objRest(_b2, ["satisfaction", "feedback"]);
+  ({ satisfaction, feedback, ...meta }, { dispatch }) => {
     return general_api_default.post(`${tenantadmApiUrlv2}/contact/support`, {
       subject: "feedback submission",
       body: JSON.stringify({ feedback, satisfaction, meta })
@@ -5681,9 +5785,8 @@ var featureFlags = [
 ];
 var environmentDatas = ["feedbackProbability", "hostAddress", "hostedAnnouncement", "recaptchaSiteKey", "stripeAPIKey", "trackerCode"];
 var parseEnvironmentInfo = () => (dispatch, getState) => {
-  var _a;
   const state = getState();
-  let onboardingComplete = state.onboarding.complete || !!JSON.parse((_a = window.localStorage.getItem("onboardingComplete")) != null ? _a : "false");
+  let onboardingComplete = state.onboarding.complete || !!JSON.parse(window.localStorage.getItem("onboardingComplete") ?? "false");
   let demoArtifactPort = 85;
   let environmentData = {};
   let environmentFeatures = {};
@@ -5702,11 +5805,12 @@ var parseEnvironmentInfo = () => (dispatch, getState) => {
     } = mender_environment;
     onboardingComplete = stringToBoolean(features.isEnterprise) || stringToBoolean(disableOnboarding) || onboardingComplete;
     demoArtifactPort = port || demoArtifactPort;
-    environmentData = environmentDatas.reduce((accu, flag) => __spreadProps(__spreadValues({}, accu), { [flag]: mender_environment[flag] || state.app[flag] }), {});
-    environmentFeatures = __spreadProps(__spreadValues({}, featureFlags.reduce((accu, flag) => __spreadProps(__spreadValues({}, accu), { [flag]: stringToBoolean(features[flag]) }), {})), {
+    environmentData = environmentDatas.reduce((accu, flag) => ({ ...accu, [flag]: mender_environment[flag] || state.app[flag] }), {});
+    environmentFeatures = {
+      ...featureFlags.reduce((accu, flag) => ({ ...accu, [flag]: stringToBoolean(features[flag]) }), {}),
       isHosted: features.isHosted || window.location.hostname.includes("hosted.mender.io"),
       isDemoMode: stringToBoolean(isDemoMode || features.isDemoMode)
-    });
+    };
     versionInfo = {
       docs: isNaN(integrationVersion.charAt(0)) ? "" : integrationVersion.split(".").slice(0, 2).join("."),
       remainder: {
@@ -5742,6 +5846,7 @@ var maybeAddOnboardingTasks = ({ devicesByStatus, dispatch, onboardingState, tas
 };
 var useAppInit = (userId) => {
   const dispatch = (0, import_react_redux.useDispatch)();
+  const [coreInitDone, setCoreInitDone] = (0, import_react3.useState)(false);
   const isEnterprise = (0, import_react_redux.useSelector)(getIsEnterprise);
   const { hasMultitenancy, isHosted } = (0, import_react_redux.useSelector)(getFeatures);
   const devicesByStatus = (0, import_react_redux.useSelector)(getDevicesByStatus);
@@ -5751,12 +5856,27 @@ var useAppInit = (userId) => {
   const { interval, intervalUnit } = (0, import_react_redux.useSelector)(getOfflineThresholdSettings);
   const { id_attribute } = (0, import_react_redux.useSelector)(getGlobalSettings);
   const { identityAttributes } = (0, import_react_redux.useSelector)(getSortedFilteringAttributes);
-  const initRunning = (0, import_react3.useRef)(false);
-  const retrieveAppData = (0, import_react3.useCallback)(() => {
+  const isServiceProvider = (0, import_react_redux.useSelector)(getIsServiceProvider);
+  const coreInitRunning = (0, import_react3.useRef)(false);
+  const fullInitRunning = (0, import_react3.useRef)(false);
+  const retrieveCoreData = (0, import_react3.useCallback)(() => {
     let tasks = [
       dispatch(parseEnvironmentInfo()),
       dispatch(getUserSettings2()),
       dispatch(getGlobalSettings2()),
+      dispatch(setFirstLoginAfterSignup2(stringToBoolean(cookies6.get("firstLoginAfterSignup"))))
+    ];
+    const multitenancy = hasMultitenancy || isHosted || isEnterprise;
+    if (multitenancy) {
+      tasks.push(dispatch(getUserOrganization()));
+    }
+    return Promise.all(tasks);
+  }, [dispatch, hasMultitenancy, isHosted, isEnterprise]);
+  const retrieveAppData = (0, import_react3.useCallback)(() => {
+    if (isServiceProvider) {
+      return Promise.resolve(dispatch(getRoles()));
+    }
+    return Promise.all([
       dispatch(getDeviceAttributes()),
       dispatch(getDeploymentsByStatus2({ status: DEPLOYMENT_STATES.finished, shouldSelect: false })),
       dispatch(getDeploymentsByStatus2({ status: DEPLOYMENT_STATES.inprogress })),
@@ -5769,15 +5889,9 @@ var useAppInit = (userId) => {
       dispatch(getIntegrations()),
       dispatch(getReleases()),
       dispatch(getDeviceLimit2()),
-      dispatch(getRoles()),
-      dispatch(setFirstLoginAfterSignup2(stringToBoolean(cookies6.get("firstLoginAfterSignup"))))
-    ];
-    const multitenancy = hasMultitenancy || isHosted || isEnterprise;
-    if (multitenancy) {
-      tasks.push(dispatch(getUserOrganization()));
-    }
-    return Promise.all(tasks);
-  }, [dispatch, hasMultitenancy, isHosted, isEnterprise]);
+      dispatch(getRoles())
+    ]);
+  }, [dispatch, isServiceProvider]);
   const interpretAppData = (0, import_react3.useCallback)(() => {
     let settings = {};
     if (cookies6.get("_ga") && typeof hasTrackingEnabled === "undefined") {
@@ -5829,16 +5943,19 @@ var useAppInit = (userId) => {
     [dispatch, retrieveAppData, interpretAppData]
   );
   (0, import_react3.useEffect)(() => {
-    if (!userId || initRunning.current) {
+    if (!userId || coreInitRunning.current) {
       return;
     }
-    initRunning.current = true;
+    coreInitRunning.current = true;
+    retrieveCoreData().then(() => setCoreInitDone(true));
+  }, [userId, retrieveCoreData]);
+  (0, import_react3.useEffect)(() => {
+    if (fullInitRunning.current || !coreInitDone) {
+      return;
+    }
+    fullInitRunning.current = true;
     initializeAppData();
-  }, [userId, initializeAppData]);
+  }, [initializeAppData, coreInitDone]);
+  return { coreInitDone };
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  parseEnvironmentInfo,
-  useAppInit
-});
 //# sourceMappingURL=storehooks.js.map