@northern.tech/store 0.2.0 → 0.3.0

package/dist/{chunk-UPMSYTWW.mjs → chunk-DQ4ZLUIU.js}

@@ -1,23 +1,20 @@
-import {
-  v4_default
-} from "./chunk-ZLRZO4EY.mjs";
 import {
   getDeviceMonitorConfig,
   getLatestDeviceAlerts
-} from "./chunk-MJW4632R.mjs";
+} from "./chunk-UVQX743T.js";
 import {
   users_api_default
-} from "./chunk-L4HIW3KB.mjs";
+} from "./chunk-JAROCU6M.js";
 import {
   general_api_default
-} from "./chunk-2P4VECEE.mjs";
+} from "./chunk-YT73QWCN.js";
 import {
   getAttrsEndpoint,
   getOnboardingState,
   getSearchEndpoint,
   getTenantCapabilities,
   getUserCapabilities
-} from "./chunk-Y47SYXII.mjs";
+} from "./chunk-DGD6FVWF.js";
 import {
   getCurrentSession,
   getCurrentUser,
@@ -27,17 +24,17 @@ import {
   getRolesById,
   getTooltipsState,
   getUserSettings
-} from "./chunk-4U4X4KAC.mjs";
+} from "./chunk-KAQJH2YL.js";
 import {
   getAuditlogState,
   getDeviceTwinIntegrations,
   getOrganization,
   getTenantsList
-} from "./chunk-2HCZYULZ.mjs";
+} from "./chunk-Q6M5TTDQ.js";
 import {
   getDeploymentsById,
   getDeploymentsByStatus
-} from "./chunk-BWFTQHNM.mjs";
+} from "./chunk-RX55KAKX.js";
 import {
   getDeviceById,
   getDeviceFilters,
@@ -46,60 +43,58 @@ import {
   getGroups,
   getGroupsById,
   getSelectedGroup
-} from "./chunk-QG4PT5WK.mjs";
+} from "./chunk-XXHONFSQ.js";
+import {
+  convertDeviceListStateToFilters,
+  filtersFilter,
+  getComparisonCompatibleVersion,
+  mapDeviceAttributes,
+  mapFiltersToTerms,
+  mapTermsToFilters,
+  mergePermissions,
+  progress
+} from "./chunk-YETZPQFR.js";
 import {
   getFeatures,
   getSearchState
-} from "./chunk-C2YZYTJ6.mjs";
+} from "./chunk-LIJIIRON.js";
 import {
   commonErrorFallback,
   commonErrorHandler
-} from "./chunk-RWYS5MKN.mjs";
+} from "./chunk-GZ5VQMDM.js";
 import {
   actions_default
-} from "./chunk-ENLZPHTQ.mjs";
+} from "./chunk-V4DKKRWS.js";
 import {
   actions as actions6,
   sliceName as sliceName6
-} from "./chunk-EFHEROXZ.mjs";
+} from "./chunk-YGBFDXXA.js";
 import {
   actions as actions5,
   sliceName as sliceName5
-} from "./chunk-WS3YYLTJ.mjs";
+} from "./chunk-XTRPX7JZ.js";
 import {
   actions as actions4,
   sliceName as sliceName4
-} from "./chunk-M4U5R7A4.mjs";
+} from "./chunk-FGKMJS3B.js";
 import {
   actions as actions2,
   sliceName as sliceName2
-} from "./chunk-EM2HUGUY.mjs";
+} from "./chunk-E5LEU5PF.js";
 import {
   actions as actions3,
   sliceName as sliceName3
-} from "./chunk-X65NMDPS.mjs";
+} from "./chunk-YTQUNAZP.js";
 import {
   actions,
   sliceName
-} from "./chunk-OWHFMKTA.mjs";
+} from "./chunk-7PVGDMNM.js";
 import {
   cleanUp,
   getSessionInfo,
   maxSessionAge,
   setSessionInfo
-} from "./chunk-4C6IY46N.mjs";
-import {
-  convertDeviceListStateToFilters,
-  extractErrorMessage,
-  filtersFilter,
-  getComparisonCompatibleVersion,
-  mapDeviceAttributes,
-  mapFiltersToTerms,
-  mapTermsToFilters,
-  mergePermissions,
-  preformatWithRequestID,
-  progress
-} from "./chunk-U6YTBIDT.mjs";
+} from "./chunk-AMGWP7A4.js";
 import {
   ALL_DEVICE_STATES,
   DEPLOYMENT_ROUTES,
@@ -138,14 +133,14 @@ import {
   uiPermissionsById,
   useradmApiUrlv1,
   useradmApiUrlv2
-} from "./chunk-MQIKQKSW.mjs";
+} from "./chunk-A6CT6GTI.js";
 import {
   rootfsImageVersion
-} from "./chunk-G4FGNSV3.mjs";
+} from "./chunk-CK6YE6AN.js";
 import {
   onboardingSteps,
   orderedOnboardingSteps
-} from "./chunk-IU4OXOPA.mjs";
+} from "./chunk-MRCFLG45.js";
 import {
   APPLICATION_JSON_CONTENT_TYPE,
   APPLICATION_JWT_CONTENT_TYPE,
@@ -153,7 +148,7 @@ import {
   defaultReports,
   headerNames,
   locations
-} from "./chunk-BOSBROA3.mjs";
+} from "./chunk-25AKG5HH.js";
 import {
   ALL_DEVICES,
   ALL_RELEASES,
@@ -166,385 +161,26 @@ import {
   UNGROUPED_GROUP,
   emptyRole,
   emptyUiPermissions
-} from "./chunk-OGAMVFPS.mjs";
-import {
-  __async,
-  __commonJS,
-  __objRest,
-  __require,
-  __spreadProps,
-  __spreadValues,
-  __toESM
-} from "./chunk-XWBD7VOK.mjs";
-
-// ../../node_modules/pluralize/pluralize.js
-var require_pluralize = __commonJS({
-  "../../node_modules/pluralize/pluralize.js"(exports, module) {
-    "use strict";
-    (function(root, pluralize2) {
-      if (typeof __require === "function" && typeof exports === "object" && typeof module === "object") {
-        module.exports = pluralize2();
-      } else if (typeof define === "function" && define.amd) {
-        define(function() {
-          return pluralize2();
-        });
-      } else {
-        root.pluralize = pluralize2();
-      }
-    })(exports, function() {
-      var pluralRules = [];
-      var singularRules = [];
-      var uncountables = {};
-      var irregularPlurals = {};
-      var irregularSingles = {};
-      function sanitizeRule(rule) {
-        if (typeof rule === "string") {
-          return new RegExp("^" + rule + "$", "i");
-        }
-        return rule;
-      }
-      function restoreCase(word, token) {
-        if (word === token) return token;
-        if (word === word.toLowerCase()) return token.toLowerCase();
-        if (word === word.toUpperCase()) return token.toUpperCase();
-        if (word[0] === word[0].toUpperCase()) {
-          return token.charAt(0).toUpperCase() + token.substr(1).toLowerCase();
-        }
-        return token.toLowerCase();
-      }
-      function interpolate(str, args) {
-        return str.replace(/\$(\d{1,2})/g, function(match, index) {
-          return args[index] || "";
-        });
-      }
-      function replace(word, rule) {
-        return word.replace(rule[0], function(match, index) {
-          var result = interpolate(rule[1], arguments);
-          if (match === "") {
-            return restoreCase(word[index - 1], result);
-          }
-          return restoreCase(match, result);
-        });
-      }
-      function sanitizeWord(token, word, rules) {
-        if (!token.length || uncountables.hasOwnProperty(token)) {
-          return word;
-        }
-        var len = rules.length;
-        while (len--) {
-          var rule = rules[len];
-          if (rule[0].test(word)) return replace(word, rule);
-        }
-        return word;
-      }
-      function replaceWord(replaceMap, keepMap, rules) {
-        return function(word) {
-          var token = word.toLowerCase();
-          if (keepMap.hasOwnProperty(token)) {
-            return restoreCase(word, token);
-          }
-          if (replaceMap.hasOwnProperty(token)) {
-            return restoreCase(word, replaceMap[token]);
-          }
-          return sanitizeWord(token, word, rules);
-        };
-      }
-      function checkWord(replaceMap, keepMap, rules, bool) {
-        return function(word) {
-          var token = word.toLowerCase();
-          if (keepMap.hasOwnProperty(token)) return true;
-          if (replaceMap.hasOwnProperty(token)) return false;
-          return sanitizeWord(token, token, rules) === token;
-        };
-      }
-      function pluralize2(word, count, inclusive) {
-        var pluralized = count === 1 ? pluralize2.singular(word) : pluralize2.plural(word);
-        return (inclusive ? count + " " : "") + pluralized;
-      }
-      pluralize2.plural = replaceWord(
-        irregularSingles,
-        irregularPlurals,
-        pluralRules
-      );
-      pluralize2.isPlural = checkWord(
-        irregularSingles,
-        irregularPlurals,
-        pluralRules
-      );
-      pluralize2.singular = replaceWord(
-        irregularPlurals,
-        irregularSingles,
-        singularRules
-      );
-      pluralize2.isSingular = checkWord(
-        irregularPlurals,
-        irregularSingles,
-        singularRules
-      );
-      pluralize2.addPluralRule = function(rule, replacement) {
-        pluralRules.push([sanitizeRule(rule), replacement]);
-      };
-      pluralize2.addSingularRule = function(rule, replacement) {
-        singularRules.push([sanitizeRule(rule), replacement]);
-      };
-      pluralize2.addUncountableRule = function(word) {
-        if (typeof word === "string") {
-          uncountables[word.toLowerCase()] = true;
-          return;
-        }
-        pluralize2.addPluralRule(word, "$0");
-        pluralize2.addSingularRule(word, "$0");
-      };
-      pluralize2.addIrregularRule = function(single, plural) {
-        plural = plural.toLowerCase();
-        single = single.toLowerCase();
-        irregularSingles[single] = plural;
-        irregularPlurals[plural] = single;
-      };
-      [
-        // Pronouns.
-        ["I", "we"],
-        ["me", "us"],
-        ["he", "they"],
-        ["she", "they"],
-        ["them", "them"],
-        ["myself", "ourselves"],
-        ["yourself", "yourselves"],
-        ["itself", "themselves"],
-        ["herself", "themselves"],
-        ["himself", "themselves"],
-        ["themself", "themselves"],
-        ["is", "are"],
-        ["was", "were"],
-        ["has", "have"],
-        ["this", "these"],
-        ["that", "those"],
-        // Words ending in with a consonant and `o`.
-        ["echo", "echoes"],
-        ["dingo", "dingoes"],
-        ["volcano", "volcanoes"],
-        ["tornado", "tornadoes"],
-        ["torpedo", "torpedoes"],
-        // Ends with `us`.
-        ["genus", "genera"],
-        ["viscus", "viscera"],
-        // Ends with `ma`.
-        ["stigma", "stigmata"],
-        ["stoma", "stomata"],
-        ["dogma", "dogmata"],
-        ["lemma", "lemmata"],
-        ["schema", "schemata"],
-        ["anathema", "anathemata"],
-        // Other irregular rules.
-        ["ox", "oxen"],
-        ["axe", "axes"],
-        ["die", "dice"],
-        ["yes", "yeses"],
-        ["foot", "feet"],
-        ["eave", "eaves"],
-        ["goose", "geese"],
-        ["tooth", "teeth"],
-        ["quiz", "quizzes"],
-        ["human", "humans"],
-        ["proof", "proofs"],
-        ["carve", "carves"],
-        ["valve", "valves"],
-        ["looey", "looies"],
-        ["thief", "thieves"],
-        ["groove", "grooves"],
-        ["pickaxe", "pickaxes"],
-        ["passerby", "passersby"]
-      ].forEach(function(rule) {
-        return pluralize2.addIrregularRule(rule[0], rule[1]);
-      });
-      [
-        [/s?$/i, "s"],
-        [/[^\u0000-\u007F]$/i, "$0"],
-        [/([^aeiou]ese)$/i, "$1"],
-        [/(ax|test)is$/i, "$1es"],
-        [/(alias|[^aou]us|t[lm]as|gas|ris)$/i, "$1es"],
-        [/(e[mn]u)s?$/i, "$1s"],
-        [/([^l]ias|[aeiou]las|[ejzr]as|[iu]am)$/i, "$1"],
-        [/(alumn|syllab|vir|radi|nucle|fung|cact|stimul|termin|bacill|foc|uter|loc|strat)(?:us|i)$/i, "$1i"],
-        [/(alumn|alg|vertebr)(?:a|ae)$/i, "$1ae"],
-        [/(seraph|cherub)(?:im)?$/i, "$1im"],
-        [/(her|at|gr)o$/i, "$1oes"],
-        [/(agend|addend|millenni|dat|extrem|bacteri|desiderat|strat|candelabr|errat|ov|symposi|curricul|automat|quor)(?:a|um)$/i, "$1a"],
-        [/(apheli|hyperbat|periheli|asyndet|noumen|phenomen|criteri|organ|prolegomen|hedr|automat)(?:a|on)$/i, "$1a"],
-        [/sis$/i, "ses"],
-        [/(?:(kni|wi|li)fe|(ar|l|ea|eo|oa|hoo)f)$/i, "$1$2ves"],
-        [/([^aeiouy]|qu)y$/i, "$1ies"],
-        [/([^ch][ieo][ln])ey$/i, "$1ies"],
-        [/(x|ch|ss|sh|zz)$/i, "$1es"],
-        [/(matr|cod|mur|sil|vert|ind|append)(?:ix|ex)$/i, "$1ices"],
-        [/\b((?:tit)?m|l)(?:ice|ouse)$/i, "$1ice"],
-        [/(pe)(?:rson|ople)$/i, "$1ople"],
-        [/(child)(?:ren)?$/i, "$1ren"],
-        [/eaux$/i, "$0"],
-        [/m[ae]n$/i, "men"],
-        ["thou", "you"]
-      ].forEach(function(rule) {
-        return pluralize2.addPluralRule(rule[0], rule[1]);
-      });
-      [
-        [/s$/i, ""],
-        [/(ss)$/i, "$1"],
-        [/(wi|kni|(?:after|half|high|low|mid|non|night|[^\w]|^)li)ves$/i, "$1fe"],
-        [/(ar|(?:wo|[ae])l|[eo][ao])ves$/i, "$1f"],
-        [/ies$/i, "y"],
-        [/\b([pl]|zomb|(?:neck|cross)?t|coll|faer|food|gen|goon|group|lass|talk|goal|cut)ies$/i, "$1ie"],
-        [/\b(mon|smil)ies$/i, "$1ey"],
-        [/\b((?:tit)?m|l)ice$/i, "$1ouse"],
-        [/(seraph|cherub)im$/i, "$1"],
-        [/(x|ch|ss|sh|zz|tto|go|cho|alias|[^aou]us|t[lm]as|gas|(?:her|at|gr)o|[aeiou]ris)(?:es)?$/i, "$1"],
-        [/(analy|diagno|parenthe|progno|synop|the|empha|cri|ne)(?:sis|ses)$/i, "$1sis"],
-        [/(movie|twelve|abuse|e[mn]u)s$/i, "$1"],
-        [/(test)(?:is|es)$/i, "$1is"],
-        [/(alumn|syllab|vir|radi|nucle|fung|cact|stimul|termin|bacill|foc|uter|loc|strat)(?:us|i)$/i, "$1us"],
-        [/(agend|addend|millenni|dat|extrem|bacteri|desiderat|strat|candelabr|errat|ov|symposi|curricul|quor)a$/i, "$1um"],
-        [/(apheli|hyperbat|periheli|asyndet|noumen|phenomen|criteri|organ|prolegomen|hedr|automat)a$/i, "$1on"],
-        [/(alumn|alg|vertebr)ae$/i, "$1a"],
-        [/(cod|mur|sil|vert|ind)ices$/i, "$1ex"],
-        [/(matr|append)ices$/i, "$1ix"],
-        [/(pe)(rson|ople)$/i, "$1rson"],
-        [/(child)ren$/i, "$1"],
-        [/(eau)x?$/i, "$1"],
-        [/men$/i, "man"]
-      ].forEach(function(rule) {
-        return pluralize2.addSingularRule(rule[0], rule[1]);
-      });
-      [
-        // Singular words with no plurals.
-        "adulthood",
-        "advice",
-        "agenda",
-        "aid",
-        "aircraft",
-        "alcohol",
-        "ammo",
-        "analytics",
-        "anime",
-        "athletics",
-        "audio",
-        "bison",
-        "blood",
-        "bream",
-        "buffalo",
-        "butter",
-        "carp",
-        "cash",
-        "chassis",
-        "chess",
-        "clothing",
-        "cod",
-        "commerce",
-        "cooperation",
-        "corps",
-        "debris",
-        "diabetes",
-        "digestion",
-        "elk",
-        "energy",
-        "equipment",
-        "excretion",
-        "expertise",
-        "firmware",
-        "flounder",
-        "fun",
-        "gallows",
-        "garbage",
-        "graffiti",
-        "hardware",
-        "headquarters",
-        "health",
-        "herpes",
-        "highjinks",
-        "homework",
-        "housework",
-        "information",
-        "jeans",
-        "justice",
-        "kudos",
-        "labour",
-        "literature",
-        "machinery",
-        "mackerel",
-        "mail",
-        "media",
-        "mews",
-        "moose",
-        "music",
-        "mud",
-        "manga",
-        "news",
-        "only",
-        "personnel",
-        "pike",
-        "plankton",
-        "pliers",
-        "police",
-        "pollution",
-        "premises",
-        "rain",
-        "research",
-        "rice",
-        "salmon",
-        "scissors",
-        "series",
-        "sewage",
-        "shambles",
-        "shrimp",
-        "software",
-        "species",
-        "staff",
-        "swine",
-        "tennis",
-        "traffic",
-        "transportation",
-        "trout",
-        "tuna",
-        "wealth",
-        "welfare",
-        "whiting",
-        "wildebeest",
-        "wildlife",
-        "you",
-        /pok[eé]mon$/i,
-        // Regexes.
-        /[^aeiou]ese$/i,
-        // "chinese", "japanese"
-        /deer$/i,
-        // "deer", "reindeer"
-        /fish$/i,
-        // "fish", "blowfish", "angelfish"
-        /measles$/i,
-        /o[iu]s$/i,
-        // "carnivorous"
-        /pox$/i,
-        // "chickpox", "smallpox"
-        /sheep$/i
-      ].forEach(pluralize2.addUncountableRule);
-      return pluralize2;
-    });
-  }
-});
+} from "./chunk-4B3IMP4I.js";
 
 // src/deploymentsSlice/thunks.ts
 import { deepCompare, isEmpty, standardizePhases, startTimeSort } from "@northern.tech/utils/helpers";
 import { createAsyncThunk } from "@reduxjs/toolkit";
-import isUUID from "validator/lib/isUUID";
+import { isUUID } from "validator";
 var { receivedDevice, setSnackbar } = actions_default;
 var { page: defaultPage, perPage: defaultPerPage } = DEVICE_LIST_DEFAULTS;
 var deriveDeploymentGroup = ({ filter = {}, group, groups = [], name }) => group || groups.length === 1 && !isUUID(name) ? groups[0] : filter.name;
 var transformDeployments = (deployments, deploymentsById) => deployments.sort(startTimeSort).reduce(
   (accu, item) => {
-    var _a, _b;
-    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: (_b = filter.name) != null ? _b : 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;
@@ -598,11 +234,12 @@ var createDeployment = createAsyncThunk(`${sliceName2}/createDeployment`, ({ new
   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)),
@@ -745,14 +382,23 @@ var updateDeploymentControlMap = 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 = 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)));
@@ -782,15 +428,20 @@ var getDeploymentsConfig = 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)));
   })
 );
@@ -800,7 +451,7 @@ var deepClean = (source) => Object.entries(source).reduce((accu, [key, value]) =
     if (cleanedValue === void 0 || typeof cleanedValue === "object" && isEmpty(cleanedValue)) {
       return accu;
     }
-    accu = __spreadProps(__spreadValues({}, accu != null ? accu : {}), { [key]: cleanedValue });
+    accu = { ...accu ?? {}, [key]: cleanedValue };
   }
   return accu;
 }, void 0);
@@ -820,20 +471,25 @@ var saveDeltaDeploymentsConfig = createAsyncThunk(`${sliceName2}/saveDeltaDeploy
   }
   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(setSnackbar("Settings saved successfully"))]);
   });
 });
 
 // src/devicesSlice/thunks.tsx
-import React from "react";
 import { Link } from "react-router-dom";
-var import_pluralize = __toESM(require_pluralize());
-import { attributeDuplicateFilter, deepCompare as deepCompare2, getSnackbarMessage } from "@northern.tech/utils/helpers";
+import { attributeDuplicateFilter, deepCompare as deepCompare2, extractErrorMessage, getSnackbarMessage } from "@northern.tech/utils/helpers";
 import { createAsyncThunk as createAsyncThunk2 } from "@reduxjs/toolkit";
 import { isCancel } from "axios";
+import pluralize from "pluralize";
+import { v4 as uuid } from "uuid";
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 var { cleanUpUpload, initUpload, setSnackbar: setSnackbar2, uploadProgress } = actions_default;
 var { page: defaultPage2, perPage: defaultPerPage2 } = DEVICE_LIST_DEFAULTS;
 var defaultAttributes = [
@@ -855,14 +511,13 @@ var getGroups2 = createAsyncThunk2(
   (_, { 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" }];
@@ -896,7 +551,7 @@ var removeDevicesFromGroup = createAsyncThunk2(
   ({ group, deviceIds }, { dispatch }) => general_api_default.delete(`${inventoryApiUrl}/groups/${group}/devices`, deviceIds).then(
     () => Promise.all([
       dispatch(actions3.removeFromGroup({ group, deviceIds })),
-      dispatch(setSnackbar2(`The ${(0, import_pluralize.default)("devices", deviceIds.length)} ${(0, import_pluralize.default)("were", deviceIds.length)} removed from the group`, TIMEOUTS.fiveSeconds))
+      dispatch(setSnackbar2(`The ${pluralize("devices", deviceIds.length)} ${pluralize("were", deviceIds.length)} removed from the group`, TIMEOUTS.fiveSeconds))
     ])
   )
 );
@@ -906,7 +561,12 @@ var getGroupNotification = (newGroup, selectedGroup) => {
     return [successMessage, TIMEOUTS.fiveSeconds];
   }
   return [
-    /* @__PURE__ */ React.createElement(React.Fragment, null, successMessage, " - ", /* @__PURE__ */ React.createElement(Link, { to: `/devices?inventory=group:eq:${newGroup}` }, "click here"), " to see it."),
+    /* @__PURE__ */ jsxs(Fragment, { children: [
+      successMessage,
+      " - ",
+      /* @__PURE__ */ jsx(Link, { to: `/devices?inventory=group:eq:${newGroup}`, children: "click here" }),
+      " to see it."
+    ] }),
     5e3,
     void 0,
     void 0,
@@ -920,7 +580,7 @@ var addStaticGroup = createAsyncThunk2(
     () => 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
         })
       )
@@ -948,20 +608,19 @@ var getDynamicGroups = createAsyncThunk2(
   (_, { 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)));
@@ -1001,10 +660,9 @@ var removeDynamicGroup = createAsyncThunk2(`${sliceName3}/removeDynamicGroup`, (
   );
 });
 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 };
 };
@@ -1027,7 +685,6 @@ var selectGroup = createAsyncThunk2(`${sliceName3}/selectGroup`, ({ group, filte
 var getEarliestTs = (dateA = "", dateB = "") => !dateA || !dateB ? dateA || dateB : dateA < dateB ? dateA : dateB;
 var reduceReceivedDevices = (devices, ids, state, status) => devices.reduce(
   (accu, device) => {
-    var _a, _b, _c;
     const stateDevice = getDeviceById(state, device.id);
     const {
       attributes: storedAttributes = {},
@@ -1037,29 +694,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 = (_b = system.check_in_time) != null ? _b : 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 = createAsyncThunk2(`${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(getDevicesByStatus(__spreadProps(__spreadValues({}, remainder), { filterSelection, group, status: shouldIncludeAllStates ? void 0 : DEVICE_STATES.accepted })))
+    dispatch(getDevicesByStatus({ ...remainder, filterSelection, group, status: shouldIncludeAllStates ? void 0 : DEVICE_STATES.accepted }))
   ).unwrap().then((results) => {
     if (!group) {
       return Promise.resolve();
@@ -1073,7 +730,7 @@ var getGroupDevices = createAsyncThunk2(`${sliceName3}/getGroupDevices`, (option
       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
@@ -1222,27 +879,26 @@ var getDeviceLimit = createAsyncThunk2(
 );
 var setDeviceListState = createAsyncThunk2(
   `${sliceName3}/setDeviceListState`,
-  (_a, { dispatch, getState }) => {
-    var _b = _a, { shouldSelectDevices = true, forceRefresh, fetchAuth = true } = _b, selectionState = __objRest(_b, ["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 _b2 = nextState, { isLoading: nextLoading, deviceIds: nextDevices, selection: nextSelection } = _b2, nextRequestState = __objRest(_b2, ["isLoading", "deviceIds", "selection"]);
+    const { isLoading: currentLoading, deviceIds: currentDevices, selection: currentSelection, ...currentRequestState } = currentState;
+    const { isLoading: nextLoading, deviceIds: nextDevices, selection: nextSelection, ...nextRequestState } = nextState;
     if (!nextState.setOnly && !deepCompare2(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(getDevicesByStatus(__spreadProps(__spreadValues({}, nextState), { status: applicableSelectedState, sortOptions: sortBy, fetchAuth }))).unwrap().then((results) => {
+        dispatch(getDevicesByStatus({ ...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)));
@@ -1267,8 +923,8 @@ var getDevicesByStatus = createAsyncThunk2(`${sliceName3}/getDevicesByStatus`, (
   } = 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,
@@ -1329,7 +985,7 @@ var getAllDevicesByStatus = createAsyncThunk2(`${sliceName3}/getAllDevicesByStat
 });
 var searchDevices = createAsyncThunk2(`${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 }));
@@ -1464,8 +1120,7 @@ var getSessionDetails = createAsyncThunk2(`${sliceName3}/getSessionDetails`, ({
     ({ data: auditLogEntries }) => {
       const { start, end } = auditLogEntries.reduce(
         (accu, item) => {
-          var _a, _b;
-          if ((_b = (_a = item.meta) == null ? void 0 : _a.session_id) == null ? void 0 : _b.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);
           }
@@ -1485,7 +1140,7 @@ var deviceFileUpload = createAsyncThunk2(`${sliceName3}/deviceFileUpload`, ({ de
   let formData = new FormData();
   formData.append("path", path);
   formData.append("file", file);
-  const uploadId = v4_default();
+  const uploadId = uuid();
   const cancelSource = new AbortController();
   return Promise.all([
     dispatch(setSnackbar2("Uploading file")),
@@ -1572,8 +1227,7 @@ var decommissionDevice = createAsyncThunk2(
 var getDeviceConfig = createAsyncThunk2(
   `${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, _b;
-    if (((_b = (_a = err.response) == null ? void 0 : _a.data) == null ? void 0 : _b.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);
     }
   })
@@ -1585,15 +1239,14 @@ var setDeviceConfig = createAsyncThunk2(
 var applyDeviceConfig = createAsyncThunk2(
   `${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);
@@ -1609,21 +1262,21 @@ var setDeviceTags = createAsyncThunk2(
         `${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(setSnackbar2("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(setSnackbar2("Device name changed"))]));
     })
   )
 );
 var getDeviceTwin = createAsyncThunk2(`${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 = createAsyncThunk2(
@@ -1639,7 +1292,7 @@ var setDeviceTwin = createAsyncThunk2(
     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 } } }))
     );
   })
 );
@@ -1660,8 +1313,8 @@ var getSystemDevices = createAsyncThunk2(`${sliceName3}/getSystemDevices`, (opti
   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()), {
@@ -1673,11 +1326,12 @@ var getSystemDevices = createAsyncThunk2(`${sliceName3}/getSystemDevices`, (opti
   }).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 = createAsyncThunk2(`${sliceName3}/getGatewayDevices`, (deviceId, { dispatch, getState }) => {
@@ -1685,9 +1339,9 @@ var getGatewayDevices = createAsyncThunk2(`${sliceName3}/getGatewayDevices`, (de
   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()), {
@@ -1749,21 +1403,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 = cookies.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 = createAsyncThunk3(`${sliceName4}/getOnboardingState`, (_, { dispatch, getState }) => {
   const state = getState();
@@ -1821,7 +1475,7 @@ var advanceOnboarding = createAsyncThunk3(`${sliceName4}/advanceOnboarding`, (st
     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(actions4.setOnboardingProgress(madeProgress)), dispatch(saveUserSettings({ onboarding: state }))]);
 });
@@ -1904,8 +1558,8 @@ var completeUpgrade = createAsyncThunk4(
   ({ 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() : "";
@@ -1932,12 +1586,14 @@ var getAuditLogsCsvLink = createAsyncThunk4(
 );
 var setAuditlogsState = createAsyncThunk4(`${sliceName5}/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 _b = nextState, { isLoading: selectionLoading, selectedIssue: selectionIssue } = _b, selectionRequestState = __objRest(_b, ["isLoading", "selectedIssue"]);
+  const { isLoading: currentLoading, selectedIssue: currentIssue, ...currentRequestState } = currentState;
+  const { isLoading: selectionLoading, selectedIssue: selectionIssue, ...selectionRequestState } = nextState;
   if (!deepCompare3(currentRequestState, selectionRequestState)) {
     nextState.isLoading = true;
     tasks.push(dispatch(getAuditLogs(nextState)).finally(() => dispatch(actions5.setAuditLogState({ isLoading: false }))));
@@ -1949,27 +1605,30 @@ var tenantDataDivergedMessage = "The system detected there is a change in your p
 var addTenant = createAsyncThunk4(`${sliceName5}/createTenant`, (selectionState, { dispatch }) => {
   return general_api_default.post(`${tenantadmApiUrlv2}/tenants`, selectionState).then(() => Promise.all([dispatch(getTenants()), dispatch(setSnackbar3("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, Number(totalCount)];
-});
-var getTenants = createAsyncThunk4(`${sliceName5}/getTenants`, (_0, _1) => __async(void 0, [_0, _1], function* (_, { dispatch, getState }) {
+};
+var getTenants = createAsyncThunk4(`${sliceName5}/getTenants`, async (_, { dispatch, getState }) => {
   const currentState = getTenantsList(getState());
-  const [tenants, pageCount] = yield tenantListRetrieval(currentState);
-  dispatch(actions5.setTenantListState(__spreadProps(__spreadValues({}, currentState), { total: pageCount, tenants })));
-}));
-var setTenantsListState = createAsyncThunk4(`${sliceName5}/setTenantsListState`, (_0, _1) => __async(void 0, [_0, _1], function* (selectionState, { dispatch, getState }) {
+  const [tenants, pageCount] = await tenantListRetrieval(currentState);
+  dispatch(actions5.setTenantListState({ ...currentState, total: pageCount, tenants }));
+});
+var setTenantsListState = createAsyncThunk4(`${sliceName5}/setTenantsListState`, async (selectionState, { dispatch, getState }) => {
   const currentState = getTenantsList(getState());
-  const nextState = __spreadValues(__spreadValues({}, currentState), selectionState);
+  const nextState = {
+    ...currentState,
+    ...selectionState
+  };
   if (!deepCompare3(currentState, selectionState)) {
-    const [tenants, pageCount] = yield tenantListRetrieval(nextState);
-    return dispatch(actions5.setTenantListState(__spreadProps(__spreadValues({}, nextState), { tenants, total: pageCount })));
+    const [tenants, pageCount] = await tenantListRetrieval(nextState);
+    return dispatch(actions5.setTenantListState({ ...nextState, tenants, total: pageCount }));
   }
-  return dispatch(actions5.setTenantListState(__spreadValues({}, nextState)));
-}));
+  return dispatch(actions5.setTenantListState({ ...nextState }));
+});
 var editTenantDeviceLimit = createAsyncThunk4(`${sliceName5}/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(setSnackbar3("Device Limit was changed successfully")))];
@@ -2012,10 +1671,7 @@ var downloadLicenseReport = createAsyncThunk4(
 );
 var createIntegration = createAsyncThunk4(
   `${sliceName5}/createIntegration`,
-  (_a, { dispatch }) => {
-    var _b = _a, { id } = _b, integration = __objRest(_b, ["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(setSnackbar3("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(setSnackbar3("The integration was set up successfully")), dispatch(getIntegrations())]))
 );
 var changeIntegration = createAsyncThunk4(
   `${sliceName5}/changeIntegration`,
@@ -2036,9 +1692,8 @@ var getIntegrations = createAsyncThunk4(
   (_, { 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;
     }, []);
@@ -2090,7 +1745,7 @@ var getSsoConfigById = createAsyncThunk4(
   `${sliceName5}/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 = createAsyncThunk4(
@@ -2101,7 +1756,7 @@ var getSsoConfigs = createAsyncThunk4(
 );
 
 // src/usersSlice/thunks.ts
-import { duplicateFilter, isEmpty as isEmpty2 } from "@northern.tech/utils/helpers";
+import { duplicateFilter, extractErrorMessage as extractErrorMessage2, isEmpty as isEmpty2, preformatWithRequestID } from "@northern.tech/utils/helpers";
 import { clearAllRetryTimers } from "@northern.tech/utils/retrytimer";
 import { createAsyncThunk as createAsyncThunk5 } from "@reduxjs/toolkit";
 import hashString2 from "md5";
@@ -2109,7 +1764,7 @@ import Cookies3 from "universal-cookie";
 var cookies3 = new Cookies3();
 var { setAnnouncement: setAnnouncement2, setSnackbar: setSnackbar4 } = actions_default;
 var handleLoginError = (err, { token2fa: has2FA, password }, rejectWithValue) => (dispatch) => {
-  const errorText = extractErrorMessage(err);
+  const errorText = extractErrorMessage2(err);
   const is2FABackend = errorText.includes("2fa");
   if (is2FABackend && !has2FA) {
     return rejectWithValue({ error: "2fa code missing" });
@@ -2123,43 +1778,40 @@ var handleLoginError = (err, { token2fa: has2FA, password }, rejectWithValue) =>
 };
 var loginUser = createAsyncThunk5(
   `${sliceName6}/loginUser`,
-  (_a, { dispatch, rejectWithValue }) => {
-    var _b = _a, { stayLoggedIn } = _b, userData = __objRest(_b, ["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 });
-      cookies3.remove("JWT", { path: "/" });
-      return (
-        // @ts-ignore
-        Promise.resolve(dispatch(getUser(OWN_USER_ID))).unwrap().catch((e) => {
-          cleanUp();
-          return Promise.reject(dispatch(setSnackbar4(extractErrorMessage(e))));
-        }).then(() => {
-          window.sessionStorage.removeItem("pendings-redirect");
-          if (window.location.pathname !== "/ui/") {
-            window.location.replace("/ui/");
-          }
-          return Promise.resolve(dispatch(actions6.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 });
+    cookies3.remove("JWT", { path: "/" });
+    return (
+      // @ts-ignore
+      Promise.resolve(dispatch(getUser(OWN_USER_ID))).unwrap().catch((e) => {
+        cleanUp();
+        return Promise.reject(dispatch(setSnackbar4(extractErrorMessage2(e))));
+      }).then(() => {
+        window.sessionStorage.removeItem("pendings-redirect");
+        if (window.location.pathname !== "/ui/") {
+          window.location.replace("/ui/");
+        }
+        return Promise.resolve(dispatch(actions6.successfullyLoggedIn({ expiresAt, token })));
+      })
+    );
+  })
 );
 var logoutUser = createAsyncThunk5(`${sliceName6}/logoutUser`, (_, { dispatch, getState }) => {
   if (Object.keys(getState().app.uploadsById).length) {
@@ -2176,7 +1828,7 @@ var switchUserOrganization = createAsyncThunk5(`${sliceName6}/switchUserOrganiza
     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();
   });
 });
@@ -2239,13 +1891,13 @@ var getUser = createAsyncThunk5(
 );
 var initializeSelf = createAsyncThunk5(`${sliceName6}/initializeSelf`, (_, { dispatch }) => dispatch(getUser(OWN_USER_ID)));
 var updateUserColumnSettings = createAsyncThunk5(`${sliceName6}/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;
@@ -2274,10 +1926,7 @@ var userActions = {
 var userActionErrorHandler = (err, type, dispatch) => commonErrorHandler(err, `There was an error ${userActions[type].errorMessage} the user.`, dispatch);
 var createUser = createAsyncThunk5(
   `${sliceName6}/createUser`,
-  (_a, { dispatch }) => {
-    var _b = _a, { shouldResetPassword } = _b, userData = __objRest(_b, ["shouldResetPassword"]);
-    return general_api_default.post(`${useradmApiUrlv1}/users`, __spreadProps(__spreadValues({}, userData), { send_reset_password: shouldResetPassword })).then(() => Promise.all([dispatch(actions6.createdUser(userData)), dispatch(getUserList()), dispatch(setSnackbar4(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(actions6.createdUser(userData)), dispatch(getUserList()), dispatch(setSnackbar4(userActions.create.successMessage))])).catch((err) => userActionErrorHandler(err, "create", dispatch))
 );
 var removeUser = createAsyncThunk5(
   `${sliceName6}/removeUser`,
@@ -2288,15 +1937,12 @@ var removeUser = createAsyncThunk5(
 );
 var editUser = createAsyncThunk5(
   `${sliceName6}/editUser`,
-  (_a, { dispatch, getState }) => {
-    var _b = _a, { id } = _b, userData = __objRest(_b, ["id"]);
-    return general_api_default.put(`${useradmApiUrlv1}/users/${id}`, userData).then(
-      () => Promise.all([
-        dispatch(actions6.updatedUser(__spreadProps(__spreadValues({}, userData), { id: id === OWN_USER_ID ? getCurrentUser(getState()).id : id }))),
-        dispatch(setSnackbar4(userActions.edit.successMessage))
-      ])
-    );
-  }
+  ({ id, ...userData }, { dispatch, getState }) => general_api_default.put(`${useradmApiUrlv1}/users/${id}`, userData).then(
+    () => Promise.all([
+      dispatch(actions6.updatedUser({ ...userData, id: id === OWN_USER_ID ? getCurrentUser(getState()).id : id })),
+      dispatch(setSnackbar4(userActions.edit.successMessage))
+    ])
+  )
 );
 var addUserToCurrentTenant = createAsyncThunk5(`${sliceName6}/addUserToTenant`, (userId, { dispatch, getState }) => {
   const { id } = getOrganization(getState());
@@ -2331,7 +1977,7 @@ var mapHttpPermission = (permission) => Object.entries(uiPermissionsByArea).redu
     }
     return accu;
   },
-  __spreadValues({}, emptyUiPermissions)
+  { ...emptyUiPermissions }
 );
 var permissionActionTypes = {
   any: mapHttpPermission,
@@ -2354,20 +2000,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)) {
@@ -2382,60 +2029,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 = createAsyncThunk5(
   `${sliceName6}/getPermissionSets`,
   (_, { dispatch, getState }) => general_api_default.get(`${useradmApiUrlv2}/permission_sets?per_page=500`).then(({ data }) => {
     const permissionSets = data.reduce(
       (accu, permissionSet) => {
-        var _a, _b;
-        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]) {
@@ -2446,11 +2092,10 @@ var getPermissionSets = createAsyncThunk5(
             }
             return collector;
           }, accu2),
-          __spreadValues(__spreadValues({}, emptyUiPermissions), (_b = permissionSetObject.result) != null ? _b : {})
+          { ...emptyUiPermissions, ...permissionSetObject.result ?? {} }
         );
         const scopes = Object.values(scopedPermissionAreas).reduce((accu2, { key, scopeType }) => {
-          var _a2, _b2;
-          if (((_a2 = permissionSetObject.supported_scope_types) == null ? void 0 : _a2.includes(key)) || ((_b2 = permissionSetObject.supported_scope_types) == null ? void 0 : _b2.includes(scopeType))) {
+          if (permissionSetObject.supported_scope_types?.includes(key) || permissionSetObject.supported_scope_types?.includes(scopeType)) {
             accu2.push(key);
           }
           return accu2;
@@ -2463,7 +2108,7 @@ var getPermissionSets = createAsyncThunk5(
         return accu;
       },
       // @ts-ignore
-      __spreadValues({}, getState().users.permissionSetsById)
+      { ...getState().users.permissionSetsById }
     );
     return Promise.all([dispatch(actions6.receivedPermissionSets(permissionSets)), permissionSets]);
   }).catch(() => console.log("Permission set retrieval failed - likely accessing a non-RBAC backend"))
@@ -2496,28 +2141,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, _b] = _a, _c = _b, { 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(duplicateFilter) }) };
+    return { name, scope: { ...scope, value: value.filter(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]) => {
@@ -2553,12 +2197,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 = {
@@ -2609,13 +2258,12 @@ var getGlobalSettings2 = createAsyncThunk5(
 var saveGlobalSettings = createAsyncThunk5(
   `${sliceName6}/saveGlobalSettings`,
   // @ts-ignore
-  (_a, { dispatch, getState }) => {
-    var _b = _a, { beOptimistic = false, notify = false } = _b, settings = __objRest(_b, ["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 {
@@ -2653,10 +2301,17 @@ var saveUserSettings = createAsyncThunk5(`${sliceName6}/saveUserSettings`, (sett
     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(actions6.setUserSettings(updatedSettings))),
@@ -2682,9 +2337,10 @@ var getTokens = createAsyncThunk5(
   `${sliceName6}/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(actions6.updatedUser(updatedUser)));
   })
 );
@@ -2700,8 +2356,7 @@ var revokeToken = createAsyncThunk5(
     general_api_default.delete(`${useradmApiUrlv1}/settings/tokens/${token.id}`).then(() => Promise.resolve(dispatch(getTokens())))
   )
 );
-var setTooltipReadState = createAsyncThunk5(`${sliceName6}/setTooltipReadState`, (_a, { dispatch }) => {
-  var _b = _a, { persist } = _b, remainder = __objRest(_b, ["persist"]);
+var setTooltipReadState = createAsyncThunk5(`${sliceName6}/setTooltipReadState`, ({ persist, ...remainder }, { dispatch }) => {
   let tasks = [dispatch(actions6.setTooltipState(remainder))];
   if (persist) {
     tasks.push(dispatch(saveUserSettings()));
@@ -2709,14 +2364,13 @@ var setTooltipReadState = createAsyncThunk5(`${sliceName6}/setTooltipReadState`,
   return Promise.all(tasks);
 });
 var setAllTooltipsReadState = createAsyncThunk5(`${sliceName6}/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(actions6.setTooltipsState(updatedTips))).then(() => dispatch(saveUserSettings()));
 });
 var submitFeedback = createAsyncThunk5(
   `${sliceName6}/submitFeedback`,
   // @ts-ignore
-  (_a, { dispatch }) => {
-    var _b = _a, { satisfaction, feedback } = _b, meta = __objRest(_b, ["satisfaction", "feedback"]);
+  ({ satisfaction, feedback, ...meta }, { dispatch }) => {
     return general_api_default.post(`${tenantadmApiUrlv2}/contact/support`, {
       subject: "feedback submission",
       body: JSON.stringify({ feedback, satisfaction, meta })
@@ -2729,7 +2383,7 @@ var submitFeedback = createAsyncThunk5(
 );
 
 // src/appSlice/thunks.ts
-import { deepCompare as deepCompare4 } from "@northern.tech/utils/helpers";
+import { deepCompare as deepCompare4, extractErrorMessage as extractErrorMessage3 } from "@northern.tech/utils/helpers";
 import { createAsyncThunk as createAsyncThunk6 } from "@reduxjs/toolkit";
 import Cookies4 from "universal-cookie";
 var cookies4 = new Cookies4();
@@ -2742,17 +2396,16 @@ var dateFunctionMap = {
   setDays: "setDate"
 };
 var setOfflineThreshold = createAsyncThunk6(`${sliceName}/setOfflineThreshold`, (_, { dispatch, getState }) => {
-  var _a, _b;
   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 = (_b = dateFunctionMap[`get${intervalName}`]) != null ? _b : `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)));
@@ -2777,7 +2430,7 @@ var getLatestReleaseInfo = createAsyncThunk6(`${sliceName}/getLatestReleaseInfo`
     return Promise.resolve();
   }
   return Promise.all([general_api_default.get("/versions.json"), general_api_default.get("/tags.json")]).catch((err) => {
-    console.log("init error:", extractErrorMessage(err));
+    console.log("init error:", extractErrorMessage3(err));
     return Promise.resolve([{ data: {} }, { data: [] }]);
   }).then(([{ data }, { data: guiTags }]) => {
     if (!guiTags.length) {
@@ -2793,37 +2446,43 @@ var getLatestReleaseInfo = createAsyncThunk6(`${sliceName}/getLatestReleaseInfo`
         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 = createAsyncThunk6(`${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 _b = nextState, { isSearching: nextSearching, deviceIds: nextDevices, searchTotal: nextTotal } = _b, nextRequestState = __objRest(_b, ["isSearching", "deviceIds", "searchTotal"]);
+  const { isSearching: currentSearching, deviceIds: currentDevices, searchTotal: currentTotal, ...currentRequestState } = currentState;
+  const { isSearching: nextSearching, deviceIds: nextDevices, searchTotal: nextTotal, ...nextRequestState } = nextState;
   if (nextRequestState.searchTerm && !deepCompare4(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 })))
     );
   }
@@ -2974,4 +2633,4 @@ export {
   setAllTooltipsReadState,
   submitFeedback
 };
-//# sourceMappingURL=chunk-UPMSYTWW.mjs.map
+//# sourceMappingURL=chunk-DQ4ZLUIU.js.map