@northern.tech/store 0.3.4 → 0.4.0

package/dist/{chunk-EQLHIPPR.js → chunk-ZN5TB2NJ.js}

@@ -1,61 +1,58 @@
 import {
   getDeviceMonitorConfig,
   getLatestDeviceAlerts
-} from "./chunk-4RWZR3BN.js";
+} from "./chunk-JUGE7L3K.js";
+import {
+  commonErrorFallback,
+  commonErrorHandler,
+  createAppAsyncThunk
+} from "./chunk-CW5T6OGF.js";
 import {
   users_api_default
-} from "./chunk-NCSKCF2S.js";
+} from "./chunk-QHK7GGV4.js";
 import {
   general_api_default
-} from "./chunk-AUBJUUP3.js";
-import {
-  commonErrorFallback,
-  commonErrorHandler
-} from "./chunk-PAIB5V27.js";
+} from "./chunk-RS37Y2PQ.js";
 import {
   actions_default
-} from "./chunk-ZZMFXRQK.js";
-import {
-  actions as actions2,
-  sliceName as sliceName2
-} from "./chunk-DGQKXSRI.js";
+} from "./chunk-URNS6A5T.js";
 import {
   actions as actions6,
   sliceName as sliceName6
-} from "./chunk-7YZCUAXZ.js";
+} from "./chunk-UGSLGUS6.js";
 import {
   actions as actions5,
   sliceName as sliceName5
-} from "./chunk-FRSA2YB5.js";
+} from "./chunk-MZNANSS2.js";
 import {
   actions as actions4,
   sliceName as sliceName4
-} from "./chunk-RX32WLVJ.js";
+} from "./chunk-VANBSJS5.js";
 import {
-  actions as actions3,
-  sliceName as sliceName3
-} from "./chunk-X3GZILYD.js";
+  actions as actions2,
+  sliceName as sliceName2
+} from "./chunk-VUFRP6P3.js";
 import {
   actions,
   sliceName
-} from "./chunk-AFICTIVU.js";
+} from "./chunk-6KGTHJKC.js";
+import {
+  actions as actions3,
+  sliceName as sliceName3
+} from "./chunk-ABJLRDCO.js";
 import {
   cleanUp,
   getSessionInfo,
-  maxSessionAge,
   setSessionInfo
-} from "./chunk-GAI4VYRZ.js";
+} from "./chunk-ZJW3QIPM.js";
 import {
   getAttrsEndpoint,
+  getDeviceReportsForUser,
   getOnboardingState,
   getSearchEndpoint,
   getTenantCapabilities,
   getUserCapabilities
-} from "./chunk-FVCYB5OP.js";
-import {
-  getDeploymentsById,
-  getDeploymentsByStatus
-} from "./chunk-ZWOAFHAR.js";
+} from "./chunk-IQG5I7AM.js";
 import {
   getCurrentSession,
   getCurrentUser,
@@ -67,49 +64,66 @@ import {
   getTooltipsState,
   getUserSettings,
   getUsersById
-} from "./chunk-FQDSV3NK.js";
+} from "./chunk-ZRSYBSSY.js";
 import {
   getAuditlogState,
   getDeviceTwinIntegrations,
   getOrganization,
   getTenantsList
-} from "./chunk-JO33IORF.js";
+} from "./chunk-4TUJPE6G.js";
 import {
-  getFeatures,
-  getSearchState
-} from "./chunk-LIJIIRON.js";
+  getDeploymentsById,
+  getDeploymentsByStatus
+} from "./chunk-JXQUFKID.js";
 import {
+  getAcceptedDevices,
   getDeviceById,
   getDeviceFilters,
   getDeviceListState,
+  getDeviceReports,
   getDevicesById,
-  getGroups,
   getGroupsById,
   getSelectedGroup
-} from "./chunk-L3SY3J5M.js";
+} from "./chunk-KJNNEDRV.js";
+import {
+  getFeatures,
+  getSearchState
+} from "./chunk-MBKAZVE3.js";
 import {
   convertDeviceListStateToFilters,
+  extractErrorMessage,
   filtersFilter,
   getComparisonCompatibleVersion,
   mapDeviceAttributes,
   mapFiltersToTerms,
   mapTermsToFilters,
   mergePermissions,
+  parseSubscriptionPreview,
   progress
-} from "./chunk-GWJIY56H.js";
+} from "./chunk-XWYJACQC.js";
 import {
   ALL_DEVICE_STATES,
+  ALL_RELEASES,
+  APPLICATION_JSON_CONTENT_TYPE,
+  APPLICATION_JWT_CONTENT_TYPE,
   DEPLOYMENT_ROUTES,
   DEPLOYMENT_STATES,
   DEPLOYMENT_TYPES,
+  DEVICE_FILTERING_OPTIONS,
+  DEVICE_LIST_DEFAULTS,
   DEVICE_STATES,
+  EXTERNAL_PROVIDER,
+  MAX_PAGE_SIZE,
   OWN_USER_ID,
   PermissionTypes,
   READ_STATES,
-  REPORT_CHART_SIZE_LIMIT,
+  SORTING_OPTIONS,
   SSO_TYPES,
   TENANT_LIST_DEFAULT,
+  TIMEOUTS,
+  UNGROUPED_GROUP,
   USER_LOGOUT,
+  apiRoot,
   auditLogsApiUrl,
   defaultPermissionSets,
   deploymentPrototype,
@@ -119,12 +133,14 @@ import {
   deviceConfig,
   deviceConnect,
   emptyFilter,
-  geoAttributes,
+  emptyRole,
+  emptyUiPermissions,
+  headerNames,
   inventoryApiUrl,
   inventoryApiUrlV2,
   iotManagerBaseURL,
   itemUiPermissionsReducer,
-  reportingApiUrl,
+  maxSessionAge,
   rolesById,
   scopedPermissionAreas,
   settingsKeys,
@@ -134,54 +150,40 @@ import {
   twoFAStates,
   uiPermissionsByArea,
   uiPermissionsById,
-  useradmApiUrlv1,
+  useradmApiUrl,
   useradmApiUrlv2
-} from "./chunk-OEP2D6QL.js";
+} from "./chunk-7C4SQBEE.js";
 import {
   rootfsImageVersion
-} from "./chunk-CK6YE6AN.js";
+} from "./chunk-2DYA3X77.js";
 import {
   onboardingSteps,
   orderedOnboardingSteps
-} from "./chunk-MRCFLG45.js";
+} from "./chunk-FAJ3I2UQ.js";
 import {
-  APPLICATION_JSON_CONTENT_TYPE,
-  APPLICATION_JWT_CONTENT_TYPE,
-  apiRoot,
-  defaultReports,
-  headerNames,
+  PLANS,
   locations
-} from "./chunk-Y575RZHR.js";
-import {
-  ALL_DEVICES,
-  ALL_RELEASES,
-  DEVICE_FILTERING_OPTIONS,
-  DEVICE_LIST_DEFAULTS,
-  EXTERNAL_PROVIDER,
-  MAX_PAGE_SIZE,
-  SORTING_OPTIONS,
-  TIMEOUTS,
-  UNGROUPED_GROUP,
-  emptyRole,
-  emptyUiPermissions
-} from "./chunk-BSN2TOQC.js";
+} from "./chunk-OHF3YUXX.js";
+
+// src/appSlice/thunks.ts
+import { deepCompare as deepCompare4, extractErrorMessage as extractErrorMessage3 } from "@northern.tech/utils/helpers";
+import Cookies4 from "universal-cookie";
 
 // src/deploymentsSlice/thunks.ts
 import { customSort, deepCompare, isEmpty, standardizePhases } from "@northern.tech/utils/helpers";
 import Tracking from "@northern.tech/utils/tracking";
-import { createAsyncThunk } from "@reduxjs/toolkit";
-import { isUUID } from "validator";
+import isUUID from "validator/lib/isUUID";
 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 deriveDeploymentGroup = ({ filter, group, groups = [], name }) => group || groups.length === 1 && !isUUID(name) ? groups[0] : filter?.name;
 var transformDeployments = (deployments, deploymentsById) => deployments.sort(customSort(true, "created")).reduce(
   (accu, item) => {
-    const filter = item.filter ?? {};
+    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,
+      filter: filter ? { ...filter, name: filter.name ?? filter.id, filters: mapTermsToFilters(filter.terms) } : void 0,
       name: decodeURIComponent(item.name)
     };
     deployment = { ...deployment, group: deriveDeploymentGroup(deployment) };
@@ -191,40 +193,43 @@ var transformDeployments = (deployments, deploymentsById) => deployments.sort(cu
   },
   { deployments: {}, deploymentIds: [] }
 );
-var getDeploymentsByStatus2 = createAsyncThunk(`${sliceName2}/getDeploymentsByStatus`, (options = {}, { dispatch, getState }) => {
-  const { status, page = defaultPage, per_page = defaultPerPage, startDate, endDate, group, type, shouldSelect = true, sort = SORTING_OPTIONS.desc } = options;
-  const created_after = startDate ? `&created_after=${startDate}` : "";
-  const created_before = endDate ? `&created_before=${endDate}` : "";
-  const search = group ? `&search=${group}` : "";
-  const typeFilter = type ? `&type=${type}` : "";
-  return general_api_default.get(
-    `${deploymentsApiUrl}/deployments?status=${status}&per_page=${per_page}&page=${page}${created_after}${created_before}${search}${typeFilter}&sort=${sort}`
-  ).then((res) => {
-    const { deployments, deploymentIds } = transformDeployments(res.data, getState().deployments.byId);
-    const total = Number(res.headers[headerNames.total]);
-    let tasks = [
-      dispatch(actions2.receivedDeployments(deployments)),
-      dispatch(
-        actions2.receivedDeploymentsForStatus({
-          deploymentIds,
-          status,
-          total: !(startDate || endDate || group || type) ? total : getState().deployments.byStatus[status].total
-        })
-      )
-    ];
-    tasks = deploymentIds.reduce((accu, deploymentId) => {
-      if (deployments[deploymentId].type === DEPLOYMENT_TYPES.configuration) {
-        accu.push(dispatch(getSingleDeployment(deploymentId)));
+var getDeploymentsByStatus2 = createAppAsyncThunk(
+  `${sliceName2}/getDeploymentsByStatus`,
+  (options, { dispatch, getState }) => {
+    const { status, page = defaultPage, perPage = defaultPerPage, startDate, endDate, group, type, shouldSelect = true, sort = SORTING_OPTIONS.desc } = options;
+    const created_after = startDate ? `&created_after=${startDate}` : "";
+    const created_before = endDate ? `&created_before=${endDate}` : "";
+    const search = group ? `&search=${group}` : "";
+    const typeFilter = type ? `&type=${type}` : "";
+    return general_api_default.get(
+      `${deploymentsApiUrl}/deployments?status=${status}&per_page=${perPage}&page=${page}${created_after}${created_before}${search}${typeFilter}&sort=${sort}`
+    ).then((res) => {
+      const { deployments, deploymentIds } = transformDeployments(res.data, getState().deployments.byId);
+      const total = Number(res.headers[headerNames.total]);
+      let tasks = [
+        dispatch(actions2.receivedDeployments(deployments)),
+        dispatch(
+          actions2.receivedDeploymentsForStatus({
+            deploymentIds,
+            status,
+            total: !(startDate || endDate || group || type) ? total : getState().deployments.byStatus[status].total
+          })
+        )
+      ];
+      tasks = deploymentIds.reduce((accu, deploymentId) => {
+        if (deployments[deploymentId].type === DEPLOYMENT_TYPES.configuration) {
+          accu.push(dispatch(getSingleDeployment(deploymentId)));
+        }
+        return accu;
+      }, tasks);
+      if (shouldSelect) {
+        tasks.push(dispatch(actions2.selectDeploymentsForStatus({ deploymentIds, status, total })));
       }
-      return accu;
-    }, tasks);
-    if (shouldSelect) {
-      tasks.push(dispatch(actions2.selectDeploymentsForStatus({ deploymentIds, status, total })));
-    }
-    tasks.push({ deploymentIds, total });
-    return Promise.all(tasks);
-  });
-});
+      tasks.push({ deploymentIds, total });
+      return Promise.all(tasks);
+    });
+  }
+);
 var isWithinFirstMonth = (expirationDate) => {
   if (!expirationDate) {
     return false;
@@ -246,86 +251,98 @@ var trackDeploymentCreation = (totalDeploymentCount, hasDeployments, trial_expir
   }
 };
 var MAX_PREVIOUS_PHASES_COUNT = 5;
-var createDeployment = createAsyncThunk(`${sliceName2}/createDeployment`, ({ newDeployment, hasNewRetryDefault = false }, { dispatch, getState }) => {
-  let request;
-  if (newDeployment.filter_id) {
-    request = general_api_default.post(`${deploymentsApiUrlV2}/deployments`, newDeployment);
-  } else if (newDeployment.group) {
-    request = general_api_default.post(`${deploymentsApiUrl}/deployments/group/${newDeployment.group}`, newDeployment);
-  } else {
-    request = general_api_default.post(`${deploymentsApiUrl}/deployments`, newDeployment);
-  }
-  const totalDeploymentCount = Object.values(getDeploymentsByStatus(getState())).reduce((accu, item) => accu + item.total, 0);
-  const { hasDeployments } = getGlobalSettings(getState());
-  const { trial_expiration } = getOrganization(getState());
-  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 = {
-      ...newDeployment,
-      id: deploymentId,
-      devices: newDeployment.devices ? newDeployment.devices.map((id) => ({ id, status: "pending" })) : [],
-      statistics: { status: {} }
-    };
-    let tasks = [
-      dispatch(actions2.createdDeployment(deployment)),
-      dispatch(getSingleDeployment(deploymentId)),
-      dispatch(setSnackbar("Deployment created successfully", TIMEOUTS.fiveSeconds))
-    ];
-    trackDeploymentCreation(totalDeploymentCount, hasDeployments, trial_expiration);
-    const { canManageUsers } = getUserCapabilities(getState());
-    if (canManageUsers) {
-      const { phases, retries } = newDeployment;
-      const { previousPhases = [], retries: previousRetries = 0 } = getGlobalSettings(getState());
-      let newSettings = { retries: hasNewRetryDefault ? retries : previousRetries, hasDeployments: true };
-      if (phases) {
-        const standardPhases = standardizePhases(phases);
-        let prevPhases = previousPhases.map(standardizePhases);
-        if (!prevPhases.find((previousPhaseList) => previousPhaseList.every((oldPhase) => standardPhases.find((phase) => deepCompare(phase, oldPhase))))) {
-          prevPhases.push(standardPhases);
-        }
-        newSettings.previousPhases = prevPhases.slice(-1 * MAX_PREVIOUS_PHASES_COUNT);
-      }
-      tasks.push(dispatch(saveGlobalSettings(newSettings)));
+var createDeployment = createAppAsyncThunk(
+  `${sliceName2}/createDeployment`,
+  ({
+    newDeployment,
+    hasNewRetryDefault = false
+  }, { dispatch, getState }) => {
+    let request;
+    if ("filter_id" in newDeployment && newDeployment.filter_id) {
+      request = general_api_default.post(`${deploymentsApiUrlV2}/deployments`, newDeployment);
+    } else if ("group" in newDeployment && newDeployment.group) {
+      request = general_api_default.post(`${deploymentsApiUrl}/deployments/group/${newDeployment.group}`, newDeployment);
+    } else {
+      request = general_api_default.post(`${deploymentsApiUrl}/deployments`, newDeployment);
     }
-    return Promise.all(tasks);
-  });
-});
-var getDeploymentDevices = createAsyncThunk(`${sliceName2}/getDeploymentDevices`, (options, { dispatch, getState }) => {
-  const { id, page = defaultPage, perPage = defaultPerPage } = options;
-  return general_api_default.get(`${deploymentsApiUrl}/deployments/${id}/devices/list?&page=${page}&per_page=${perPage}`).then((response) => {
-    const { devices: deploymentDevices = {} } = getState().deployments.byId[id] || {};
-    const devices = response.data.reduce((accu, item) => {
-      accu[item.id] = item;
-      const log = (deploymentDevices[item.id] || {}).log;
-      if (log) {
-        accu[item.id].log = log;
-      }
-      return accu;
-    }, {});
-    const selectedDeviceIds = Object.keys(devices);
-    let tasks = [
-      dispatch(
-        actions2.receivedDeploymentDevices({
-          id,
-          devices,
-          selectedDeviceIds,
-          totalDeviceCount: Number(response.headers[headerNames.total])
-        })
-      )
-    ];
-    const devicesById = getDevicesById(getState());
-    const lackingData = selectedDeviceIds.reduce((accu, deviceId) => {
-      const device = devicesById[deviceId];
-      if (!device || !device.identity_data || !device.attributes || Object.keys(device.attributes).length === 0) {
-        accu.push(deviceId);
+    const totalDeploymentCount = Object.values(getDeploymentsByStatus(getState())).reduce(
+      (accu, item) => accu + item.total,
+      0
+    );
+    const { hasDeployments } = getGlobalSettings(getState());
+    const { trial_expiration } = getOrganization(getState());
+    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 = {
+        ...newDeployment,
+        id: deploymentId,
+        devices: "devices" in newDeployment && newDeployment.devices ? newDeployment.devices.map((id) => ({ id, status: "pending" })) : [],
+        statistics: { status: {} }
+      };
+      const tasks = [
+        dispatch(actions2.createdDeployment(deployment)),
+        dispatch(getSingleDeployment(deploymentId)),
+        dispatch(setSnackbar({ message: "Deployment created successfully", autoHideDuration: TIMEOUTS.fiveSeconds }))
+      ];
+      trackDeploymentCreation(totalDeploymentCount, hasDeployments, trial_expiration);
+      const { canManageUsers } = getUserCapabilities(getState());
+      if (canManageUsers) {
+        const { phases, retries } = newDeployment;
+        const { previousPhases = [], retries: previousRetries = 0 } = getGlobalSettings(getState());
+        const newSettings = { retries: hasNewRetryDefault ? retries : previousRetries, hasDeployments: true };
+        if (phases) {
+          const standardPhases = standardizePhases(phases);
+          const prevPhases = previousPhases.map(standardizePhases);
+          if (!prevPhases.find((previousPhaseList) => previousPhaseList.every((oldPhase) => standardPhases.find((phase) => deepCompare(phase, oldPhase))))) {
+            prevPhases.push(standardPhases);
+          }
+          newSettings.previousPhases = prevPhases.slice(-1 * MAX_PREVIOUS_PHASES_COUNT);
+        }
+        tasks.push(dispatch(saveGlobalSettings(newSettings)));
       }
-      return accu;
-    }, []);
-    tasks = lackingData.reduce((accu, deviceId) => [...accu, dispatch(getDeviceById2(deviceId)), dispatch(getDeviceAuth(deviceId))], tasks);
-    return Promise.all(tasks);
-  });
-});
+      return Promise.all(tasks);
+    });
+  }
+);
+var getDeploymentDevices = createAppAsyncThunk(
+  `${sliceName2}/getDeploymentDevices`,
+  (options, { dispatch, getState }) => {
+    const { id, page = defaultPage, perPage = defaultPerPage } = options;
+    return general_api_default.get(`${deploymentsApiUrl}/deployments/${id}/devices/list?&page=${page}&per_page=${perPage}`).then((response) => {
+      const { devices: deploymentDevices = {} } = getState().deployments.byId[id] || {};
+      const devices = response.data.reduce((accu, item) => {
+        accu[item.id] = item;
+        const log = (deploymentDevices[item.id] || {}).log;
+        if (log) {
+          accu[item.id].log = log;
+        }
+        return accu;
+      }, {});
+      const selectedDeviceIds = Object.keys(devices);
+      let tasks = [
+        dispatch(
+          actions2.receivedDeploymentDevices({
+            id,
+            devices,
+            selectedDeviceIds,
+            totalDeviceCount: Number(response.headers[headerNames.total])
+          })
+        )
+      ];
+      const devicesById = getDevicesById(getState());
+      const lackingData = selectedDeviceIds.reduce((accu, deviceId) => {
+        const device = devicesById[deviceId];
+        if (!device || !device.identity_data || !device.attributes || Object.keys(device.attributes).length === 0) {
+          accu.push(deviceId);
+        }
+        return accu;
+      }, []);
+      tasks = lackingData.reduce((accu, deviceId) => [...accu, dispatch(getDeviceById2(deviceId)), dispatch(getDeviceAuth(deviceId))], tasks);
+      return Promise.all(tasks);
+    });
+  }
+);
 var parseDeviceDeployment = ({
   deployment: { id, artifact_name: release, status: deploymentStatus },
   device: { created, deleted, id: deviceId, finished, status, log }
@@ -345,7 +362,7 @@ var parseDeviceDeployment = ({
     return accu;
   }, "")
 });
-var getDeviceDeployments = createAsyncThunk(`${sliceName2}/getDeviceDeployments`, (options, { dispatch }) => {
+var getDeviceDeployments = createAppAsyncThunk(`${sliceName2}/getDeviceDeployments`, (options, { dispatch }) => {
   const { deviceId, filterSelection = [], page = defaultPage, perPage = defaultPerPage } = options;
   const filters = filterSelection.map((item) => `&status=${item}`).join("");
   return general_api_default.get(`${deploymentsApiUrl}/deployments/devices/${deviceId}?page=${page}&per_page=${perPage}${filters}`).then(
@@ -360,18 +377,18 @@ var getDeviceDeployments = createAsyncThunk(`${sliceName2}/getDeviceDeployments`
     )
   ).catch((err) => commonErrorHandler(err, "There was an error retrieving the device deployment history:", dispatch));
 });
-var resetDeviceDeployments = createAsyncThunk(
+var resetDeviceDeployments = createAppAsyncThunk(
   `${sliceName2}/resetDeviceDeployments`,
   (deviceId, { dispatch }) => general_api_default.delete(`${deploymentsApiUrl}/deployments/devices/${deviceId}/history`).then(() => Promise.resolve(dispatch(getDeviceDeployments({ deviceId })))).catch((err) => commonErrorHandler(err, "There was an error resetting the device deployment history:", dispatch))
 );
-var getSingleDeployment = createAsyncThunk(
+var getSingleDeployment = createAppAsyncThunk(
   `${sliceName2}/getSingleDeployment`,
   (id, { dispatch, getState }) => general_api_default.get(`${deploymentsApiUrl}/deployments/${id}`).then(({ data }) => {
     const { deployments } = transformDeployments([data], getState().deployments.byId);
     return Promise.resolve(dispatch(actions2.receivedDeployment(deployments[id])));
   })
 );
-var getDeviceLog = createAsyncThunk(
+var getDeviceLog = createAppAsyncThunk(
   `${sliceName2}/getDeviceLog`,
   ({ deploymentId, deviceId }, { dispatch }) => general_api_default.get(`${deploymentsApiUrl}/deployments/${deploymentId}/devices/${deviceId}/log`).catch((e) => {
     console.log("no log here", e);
@@ -380,7 +397,7 @@ var getDeviceLog = createAsyncThunk(
     ({ data: log }) => Promise.all([Promise.resolve(dispatch(actions2.receivedDeploymentDeviceLog({ id: deploymentId, deviceId, log }))), Promise.resolve(log)])
   )
 );
-var abortDeployment = createAsyncThunk(
+var abortDeployment = createAppAsyncThunk(
   `${sliceName2}/abortDeployment`,
   (deploymentId, { dispatch, getState }) => general_api_default.put(`${deploymentsApiUrl}/deployments/${deploymentId}/status`, { status: "aborted" }).then(() => {
     const deploymentsByStatus = getDeploymentsByStatus(getState());
@@ -405,14 +422,14 @@ var abortDeployment = createAsyncThunk(
     ]);
   }).catch((err) => commonErrorHandler(err, "There was an error while aborting the deployment:", dispatch))
 );
-var updateDeploymentControlMap = createAsyncThunk(
+var updateDeploymentControlMap = createAppAsyncThunk(
   `${sliceName2}/updateDeploymentControlMap`,
   ({ 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 }) => {
+var setDeploymentsState = createAppAsyncThunk(`${sliceName2}/setDeploymentsState`, (selection, { dispatch, getState }) => {
   const { page, perPage, ...selectionState } = selection;
   const currentState = getState().deployments.selectionState;
-  let nextState = {
+  const nextState = {
     ...currentState,
     ...selectionState,
     ...Object.keys(DEPLOYMENT_STATES).reduce((accu, item) => {
@@ -427,7 +444,7 @@ var setDeploymentsState = createAsyncThunk(`${sliceName2}/setDeploymentsState`,
       ...selectionState.general
     }
   };
-  let tasks = [dispatch(actions2.setDeploymentsState(nextState))];
+  const tasks = [dispatch(actions2.setDeploymentsState(nextState))];
   if (nextState.selectedId && currentState.selectedId !== nextState.selectedId) {
     tasks.push(dispatch(getSingleDeployment(nextState.selectedId)));
   }
@@ -448,25 +465,23 @@ var mapExternalDeltaConfig = (config = {}) => deltaAttributeMappings.reduce((acc
   }
   return accu;
 }, {});
-var getDeploymentsConfig = createAsyncThunk(
+var getDeploymentsConfig = createAppAsyncThunk(
   `${sliceName2}/getDeploymentsConfig`,
   (_, { dispatch, getState }) => general_api_default.get(`${deploymentsApiUrl}/config`).then(({ data }) => {
     const oldConfig = getState().deployments.config;
     const { delta = {} } = data;
     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 { xdelta_args = {} } = binary_delta;
+    const { xdelta_args_limits = {} } = binary_delta_limits;
     const config = {
       ...oldConfig,
       hasDelta: Boolean(delta.enabled),
       binaryDelta: {
         ...oldConfig.binaryDelta,
-        timeout: timeoutConfig,
         ...mapExternalDeltaConfig(xdelta_args)
       },
       binaryDeltaLimits: {
         ...oldConfig.binaryDeltaLimits,
-        timeout: timeoutLimit,
         ...mapExternalDeltaConfig(xdelta_args_limits)
       }
     };
@@ -475,7 +490,7 @@ var getDeploymentsConfig = createAsyncThunk(
 );
 var deepClean = (source) => Object.entries(source).reduce((accu, [key, value]) => {
   if (value !== void 0) {
-    let cleanedValue = typeof value === "object" ? deepClean(value) : value;
+    const cleanedValue = typeof value === "object" ? deepClean(value) : value;
     if (cleanedValue === void 0 || typeof cleanedValue === "object" && isEmpty(cleanedValue)) {
       return accu;
     }
@@ -483,37 +498,38 @@ var deepClean = (source) => Object.entries(source).reduce((accu, [key, value]) =
   }
   return accu;
 }, void 0);
-var saveDeltaDeploymentsConfig = createAsyncThunk(`${sliceName2}/saveDeltaDeploymentsConfig`, (config, { dispatch, getState }) => {
-  const configChange = {
-    timeout: config.timeout,
-    xdelta_args: deltaAttributeMappings.reduce((accu, { here, there }) => {
-      if (config[here] !== void 0) {
-        accu[there] = config[here];
-      }
-      return accu;
-    }, {})
-  };
-  const result = deepClean(configChange);
-  if (!result) {
-    return Promise.resolve();
-  }
-  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 = {
-      ...oldConfig,
-      binaryDelta: {
-        ...oldConfig.binaryDelta,
-        ...config
-      }
+var saveDeltaDeploymentsConfig = createAppAsyncThunk(
+  `${sliceName2}/saveDeltaDeploymentsConfig`,
+  (config, { dispatch, getState }) => {
+    const configChange = {
+      xdelta_args: deltaAttributeMappings.reduce((accu, { here, there }) => {
+        if (config[here] !== void 0) {
+          accu[there] = config[here];
+        }
+        return accu;
+      }, {})
     };
-    return Promise.all([dispatch(actions2.setDeploymentsConfig(newConfig)), dispatch(setSnackbar("Settings saved successfully"))]);
-  });
-});
+    const result = deepClean(configChange);
+    if (!result) {
+      return Promise.resolve();
+    }
+    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 = {
+        ...oldConfig,
+        binaryDelta: {
+          ...oldConfig.binaryDelta,
+          ...config
+        }
+      };
+      return Promise.all([dispatch(actions2.setDeploymentsConfig(newConfig)), dispatch(setSnackbar("Settings saved successfully"))]);
+    });
+  }
+);
 
 // src/devicesSlice/thunks.tsx
 import { Link } from "react-router-dom";
-import { attributeDuplicateFilter, dateRangeToUnix, deepCompare as deepCompare2, extractErrorMessage, getSnackbarMessage } from "@northern.tech/utils/helpers";
-import { createAsyncThunk as createAsyncThunk2 } from "@reduxjs/toolkit";
+import { attributeDuplicateFilter, dateRangeToUnix, deepCompare as deepCompare2, getSnackbarMessage } from "@northern.tech/utils/helpers";
 import { isCancel } from "axios";
 import pluralize from "pluralize";
 import { v4 as uuid } from "uuid";
@@ -534,7 +550,7 @@ var defaultAttributes = [
   { scope: "system", attribute: "group" },
   { scope: "tags", attribute: "name" }
 ];
-var getGroups2 = createAsyncThunk2(
+var getGroups = createAppAsyncThunk(
   `${sliceName3}/getGroups`,
   (_, { dispatch, getState }) => general_api_default.get(`${inventoryApiUrl}/groups`).then((res) => {
     const state = getGroupsById(getState());
@@ -551,7 +567,7 @@ var getGroups2 = createAsyncThunk2(
     const filters = [{ key: "group", value: res.data, operator: DEVICE_FILTERING_OPTIONS.$nin.key, scope: "system" }];
     return Promise.all([
       dispatch(actions3.receivedGroups(groups)),
-      dispatch(getDevicesByStatus({ filterSelection: filters, group: 0, page: 1, perPage: 1, status: void 0 }))
+      dispatch(getDevicesByStatus({ filterSelection: filters, group: "", page: 1, perPage: 1, status: void 0 }))
     ]).then((promises) => {
       const devicesRetrieval = promises[promises.length - 1] || [];
       const { payload } = devicesRetrieval || {};
@@ -570,39 +586,42 @@ var getGroups2 = createAsyncThunk2(
     });
   })
 );
-var addDevicesToGroup = createAsyncThunk2(
+var addDevicesToGroup = createAppAsyncThunk(
   `${sliceName3}/addDevicesToGroup`,
-  ({ group, deviceIds, isCreation }, { dispatch }) => general_api_default.patch(`${inventoryApiUrl}/groups/${group}/devices`, deviceIds).then(() => dispatch(actions3.addToGroup({ group, deviceIds }))).finally(() => isCreation ? Promise.resolve(dispatch(getGroups2())) : {})
+  ({ group, deviceIds, isCreation }, { dispatch }) => general_api_default.patch(`${inventoryApiUrl}/groups/${group}/devices`, deviceIds).then(() => dispatch(actions3.addToGroup({ group, deviceIds }))).finally(() => isCreation ? Promise.resolve(dispatch(getGroups())) : {})
 );
-var removeDevicesFromGroup = createAsyncThunk2(
+var removeDevicesFromGroup = createAppAsyncThunk(
   `${sliceName3}/removeDevicesFromGroup`,
   ({ group, deviceIds }, { dispatch }) => general_api_default.delete(`${inventoryApiUrl}/groups/${group}/devices`, deviceIds).then(
     () => Promise.all([
       dispatch(actions3.removeFromGroup({ group, deviceIds })),
-      dispatch(setSnackbar2(`The ${pluralize("devices", deviceIds.length)} ${pluralize("were", deviceIds.length)} removed from the group`, TIMEOUTS.fiveSeconds))
+      dispatch(
+        setSnackbar2({
+          message: `The ${pluralize("devices", deviceIds.length)} ${pluralize("were", deviceIds.length)} removed from the group`,
+          autoHideDuration: TIMEOUTS.fiveSeconds
+        })
+      )
     ])
   )
 );
 var getGroupNotification = (newGroup, selectedGroup) => {
-  const successMessage = "The group was updated successfully";
+  const successMessage2 = "The group was updated successfully";
   if (newGroup === selectedGroup) {
-    return [successMessage, TIMEOUTS.fiveSeconds];
+    return { message: successMessage2, autoHideDuration: TIMEOUTS.fiveSeconds };
   }
-  return [
-    /* @__PURE__ */ jsxs(Fragment, { children: [
-      successMessage,
+  return {
+    action: "",
+    autoHideDuration: TIMEOUTS.fiveSeconds,
+    message: /* @__PURE__ */ jsxs(Fragment, { children: [
+      successMessage2,
       " - ",
       /* @__PURE__ */ jsx(Link, { to: `/devices?inventory=group:eq:${newGroup}`, children: "click here" }),
       " to see it."
     ] }),
-    5e3,
-    void 0,
-    void 0,
-    () => {
-    }
-  ];
+    preventClickToCopy: true
+  };
 };
-var addStaticGroup = createAsyncThunk2(
+var addStaticGroup = createAppAsyncThunk(
   `${sliceName3}/addStaticGroup`,
   ({ group, devices }, { dispatch, getState }) => Promise.resolve(dispatch(addDevicesToGroup({ group, deviceIds: devices.map(({ id }) => id), isCreation: true }))).then(
     () => Promise.resolve(
@@ -615,23 +634,23 @@ var addStaticGroup = createAsyncThunk2(
     ).then(
       () => Promise.all([
         dispatch(setDeviceListState({ setOnly: true })),
-        dispatch(getGroups2()),
-        dispatch(setSnackbar2(...getGroupNotification(group, getState().devices.groups.selectedGroup)))
+        dispatch(getGroups()),
+        dispatch(setSnackbar2(getGroupNotification(group, getState().devices.groups.selectedGroup)))
       ])
     )
   ).catch((err) => commonErrorHandler(err, `Group could not be updated:`, dispatch))
 );
-var removeStaticGroup = createAsyncThunk2(
+var removeStaticGroup = createAppAsyncThunk(
   `${sliceName3}/removeStaticGroup`,
   (groupName, { dispatch }) => general_api_default.delete(`${inventoryApiUrl}/groups/${groupName}`).then(
     () => Promise.all([
       dispatch(actions3.removeGroup(groupName)),
-      dispatch(getGroups2()),
-      dispatch(setSnackbar2("Group was removed successfully", TIMEOUTS.fiveSeconds))
+      dispatch(getGroups()),
+      dispatch(setSnackbar2({ message: "Group was removed successfully", autoHideDuration: TIMEOUTS.fiveSeconds }))
     ])
   )
 );
-var getDynamicGroups = createAsyncThunk2(
+var getDynamicGroups = createAppAsyncThunk(
   `${sliceName3}/getDynamicGroups`,
   (_, { dispatch, getState }) => general_api_default.get(`${inventoryApiUrlV2}/filters?per_page=${MAX_PAGE_SIZE}`).then(({ data: filters }) => {
     const state = getGroupsById(getState());
@@ -654,7 +673,7 @@ var getDynamicGroups = createAsyncThunk2(
     return Promise.resolve(dispatch(actions3.receivedGroups(groups)));
   }).catch(() => console.log("Dynamic group retrieval failed - likely accessing a non-enterprise backend"))
 );
-var addDynamicGroup = createAsyncThunk2(
+var addDynamicGroup = createAppAsyncThunk(
   `${sliceName3}/addDynamicGroup`,
   ({ groupName, filterPredicates }, { dispatch, getState }) => general_api_default.post(`${inventoryApiUrlV2}/filters`, { name: groupName, terms: mapFiltersToTerms(filterPredicates) }).then(
     (res) => Promise.resolve(
@@ -671,45 +690,56 @@ var addDynamicGroup = createAsyncThunk2(
       const { cleanedFilters } = getGroupFilters(groupName, getState().devices.groups);
       return Promise.all([
         dispatch(actions3.setDeviceFilters(cleanedFilters)),
-        dispatch(setSnackbar2(...getGroupNotification(groupName, getState().devices.groups.selectedGroup))),
+        dispatch(setSnackbar2(getGroupNotification(groupName, getState().devices.groups.selectedGroup))),
         dispatch(getDynamicGroups())
       ]);
     })
   ).catch((err) => commonErrorHandler(err, `Group could not be updated:`, dispatch))
 );
-var updateDynamicGroup = createAsyncThunk2(`${sliceName3}/updateDynamicGroup`, ({ groupName, filterPredicates }, { dispatch, getState }) => {
-  const filterId = getState().devices.groups.byId[groupName].id;
-  return general_api_default.delete(`${inventoryApiUrlV2}/filters/${filterId}`).then(() => Promise.resolve(dispatch(addDynamicGroup({ groupName, filterPredicates }))));
-});
-var removeDynamicGroup = createAsyncThunk2(`${sliceName3}/removeDynamicGroup`, (groupName, { dispatch, getState }) => {
+var updateDynamicGroup = createAppAsyncThunk(
+  `${sliceName3}/updateDynamicGroup`,
+  ({ groupName, filterPredicates }, { dispatch, getState }) => {
+    const filterId = getState().devices.groups.byId[groupName].id;
+    return general_api_default.delete(`${inventoryApiUrlV2}/filters/${filterId}`).then(
+      () => Promise.resolve(dispatch(addDynamicGroup({ groupName, filterPredicates })))
+    );
+  }
+);
+var removeDynamicGroup = createAppAsyncThunk(`${sliceName3}/removeDynamicGroup`, (groupName, { dispatch, getState }) => {
   const filterId = getState().devices.groups.byId[groupName].id;
   return general_api_default.delete(`${inventoryApiUrlV2}/filters/${filterId}`).then(
-    () => Promise.all([dispatch(actions3.removeGroup(groupName)), dispatch(setSnackbar2("Group was removed successfully", TIMEOUTS.fiveSeconds))])
+    () => Promise.all([
+      dispatch(actions3.removeGroup(groupName)),
+      dispatch(setSnackbar2({ message: "Group was removed successfully", autoHideDuration: TIMEOUTS.fiveSeconds }))
+    ])
   );
 });
 var getGroupFilters = (group, groupsState, filters = []) => {
   const groupName = group === UNGROUPED_GROUP.id || group === UNGROUPED_GROUP.name ? UNGROUPED_GROUP.id : group;
   const selectedGroup = groupsState.byId[groupName];
   const groupFilterLength = selectedGroup?.filters?.length || 0;
-  const cleanedFilters = groupFilterLength ? [...filters, ...selectedGroup.filters].filter(filtersFilter) : filters;
+  const cleanedFilters = groupFilterLength ? [...filters, ...selectedGroup.filters || []].filter(filtersFilter) : filters;
   return { cleanedFilters, groupName, selectedGroup, groupFilterLength };
 };
-var selectGroup = createAsyncThunk2(`${sliceName3}/selectGroup`, ({ group, filters = [] }, { dispatch, getState }) => {
-  const { cleanedFilters, groupName, selectedGroup, groupFilterLength } = getGroupFilters(group, getState().devices.groups, filters);
-  if (getSelectedGroup(getState()) === groupName && (filters.length === 0 && !groupFilterLength || filters.length === cleanedFilters.length)) {
-    return Promise.resolve();
-  }
-  let tasks = [];
-  if (groupFilterLength) {
-    tasks.push(dispatch(actions3.setDeviceFilters(cleanedFilters)));
-  } else {
-    tasks.push(dispatch(actions3.setDeviceFilters(filters)));
-    tasks.push(dispatch(getGroupDevices({ group: groupName, perPage: 1, shouldIncludeAllStates: true })));
+var selectGroup = createAppAsyncThunk(
+  `${sliceName3}/selectGroup`,
+  ({ group, filters = [] }, { dispatch, getState }) => {
+    const { cleanedFilters, groupName, selectedGroup, groupFilterLength } = getGroupFilters(group, getState().devices.groups, filters);
+    if (getSelectedGroup(getState()) === groupName && (filters.length === 0 && !groupFilterLength || filters.length === cleanedFilters.length)) {
+      return Promise.resolve();
+    }
+    const tasks = [];
+    if (groupFilterLength) {
+      tasks.push(dispatch(actions3.setDeviceFilters(cleanedFilters)));
+    } else {
+      tasks.push(dispatch(actions3.setDeviceFilters(filters)));
+      tasks.push(dispatch(getGroupDevices({ group: groupName, perPage: 1, shouldIncludeAllStates: true })));
+    }
+    const selectedGroupName = selectedGroup || !Object.keys(getGroupsById(getState())).length ? groupName : void 0;
+    tasks.push(dispatch(actions3.selectGroup(selectedGroupName)));
+    return Promise.all(tasks);
   }
-  const selectedGroupName = selectedGroup || !Object.keys(getGroupsById(getState())).length ? groupName : void 0;
-  tasks.push(dispatch(actions3.selectGroup(selectedGroupName)));
-  return Promise.all(tasks);
-});
+);
 var getEarliestTs = (dateA = "", dateB = "") => !dateA || !dateB ? dateA || dateB : dateA < dateB ? dateA : dateB;
 var reduceReceivedDevices = (devices, ids, state, status) => devices.reduce(
   (accu, device) => {
@@ -740,11 +770,16 @@ var reduceReceivedDevices = (devices, ids, state, status) => devices.reduce(
   },
   { ids, devicesById: {} }
 );
-var getGroupDevices = createAsyncThunk2(`${sliceName3}/getGroupDevices`, (options, { dispatch, getState }) => {
+var getGroupDevices = createAppAsyncThunk(`${sliceName3}/getGroupDevices`, (options, { dispatch, getState }) => {
   const { group, shouldIncludeAllStates, ...remainder } = options;
   const { cleanedFilters: filterSelection } = getGroupFilters(group, getState().devices.groups);
-  return Promise.resolve(
-    dispatch(getDevicesByStatus({ ...remainder, filterSelection, group, status: shouldIncludeAllStates ? void 0 : DEVICE_STATES.accepted }))
+  return dispatch(
+    getDevicesByStatus({
+      ...remainder,
+      filterSelection,
+      group,
+      status: shouldIncludeAllStates ? void 0 : DEVICE_STATES.accepted
+    })
   ).unwrap().then((results) => {
     if (!group) {
       return Promise.resolve();
@@ -758,7 +793,7 @@ var getGroupDevices = createAsyncThunk2(`${sliceName3}/getGroupDevices`, (option
       dispatch(
         actions3.addGroup({
           group: {
-            deviceIds: deviceAccu.ids.length === total || deviceAccu.ids.length > stateGroup?.deviceIds ? deviceAccu.ids : stateGroup.deviceIds,
+            deviceIds: deviceAccu.ids.length === total || stateGroup && stateGroup.deviceIds && deviceAccu.ids.length > stateGroup.deviceIds ? deviceAccu.ids : stateGroup.deviceIds,
             total
           },
           groupName: group
@@ -767,55 +802,63 @@ var getGroupDevices = createAsyncThunk2(`${sliceName3}/getGroupDevices`, (option
     );
   });
 });
-var getAllGroupDevices = createAsyncThunk2(`${sliceName3}/getAllGroupDevices`, (group, { dispatch, getState }) => {
-  if (!group || !!group && (!getGroupsById(getState())[group] || getGroupsById(getState())[group].filters.length)) {
-    return Promise.resolve();
-  }
-  const { attributes, filterTerms } = prepareSearchArguments({
-    filters: [],
-    group,
-    state: getState(),
-    status: DEVICE_STATES.accepted
-  });
-  const getAllDevices = (perPage = MAX_PAGE_SIZE, page = defaultPage2, devices = []) => general_api_default.post(getSearchEndpoint(getState()), {
-    page,
-    per_page: perPage,
-    filters: filterTerms,
-    attributes
-  }).then((res) => {
-    const state = getState();
-    const deviceAccu = reduceReceivedDevices(res.data, devices, state);
-    dispatch(actions3.receivedDevices(deviceAccu.devicesById));
-    const total = Number(res.headers[headerNames.total]);
-    if (total > perPage * page) {
-      return getAllDevices(perPage, page + 1, deviceAccu.ids);
+var getAllGroupDevices = createAppAsyncThunk(
+  `${sliceName3}/getAllGroupDevices`,
+  ({ group, attribute }, { dispatch, getState }) => {
+    if (!group || !!group && (!getGroupsById(getState())[group] || getGroupsById(getState())[group].filters.length)) {
+      return Promise.resolve();
     }
-    return Promise.resolve(dispatch(actions3.addGroup({ group: { deviceIds: deviceAccu.ids, total: deviceAccu.ids.length }, groupName: group })));
-  });
-  return getAllDevices();
-});
-var getAllDynamicGroupDevices = createAsyncThunk2(`${sliceName3}/getAllDynamicGroupDevices`, (group, { dispatch, getState }) => {
-  if (!!group && (!getGroupsById(getState())[group] || !getGroupsById(getState())[group].filters.length)) {
-    return Promise.resolve();
+    const { attributes, filterTerms } = prepareSearchArguments({
+      filters: [],
+      group,
+      state: getState(),
+      status: DEVICE_STATES.accepted
+    });
+    const getAllDevices = (perPage = MAX_PAGE_SIZE, page = defaultPage2, devices = []) => general_api_default.post(getSearchEndpoint(getState()), {
+      page,
+      per_page: perPage,
+      filters: filterTerms,
+      attributes: [...attributes, { scope: "inventory", attribute }]
+    }).then((res) => {
+      const state = getState();
+      const deviceAccu = reduceReceivedDevices(res.data, devices, state);
+      dispatch(actions3.receivedDevices(deviceAccu.devicesById));
+      const total = Number(res.headers[headerNames.total]);
+      if (total > perPage * page) {
+        return getAllDevices(perPage, page + 1, deviceAccu.ids);
+      }
+      return Promise.resolve(dispatch(actions3.addGroup({ group: { deviceIds: deviceAccu.ids, total: deviceAccu.ids.length }, groupName: group })));
+    });
+    return getAllDevices();
   }
-  const { attributes, filterTerms: filters } = prepareSearchArguments({
-    filters: getState().devices.groups.byId[group].filters,
-    state: getState(),
-    status: DEVICE_STATES.accepted
-  });
-  const getAllDevices = (perPage = MAX_PAGE_SIZE, page = defaultPage2, devices = []) => general_api_default.post(getSearchEndpoint(getState()), { page, per_page: perPage, filters, attributes }).then((res) => {
-    const state = getState();
-    const deviceAccu = reduceReceivedDevices(res.data, devices, state);
-    dispatch(actions3.receivedDevices(deviceAccu.devicesById));
-    const total = Number(res.headers[headerNames.total]);
-    if (total > deviceAccu.ids.length) {
-      return getAllDevices(perPage, page + 1, deviceAccu.ids);
+);
+var getAllDynamicGroupDevices = createAppAsyncThunk(
+  `${sliceName3}/getAllDynamicGroupDevices`,
+  ({ group, attribute }, { dispatch, getState }) => {
+    if (!!group && (!getGroupsById(getState())[group] || !getGroupsById(getState())[group].filters.length)) {
+      return Promise.resolve();
     }
-    return Promise.resolve(dispatch(actions3.addGroup({ group: { deviceIds: deviceAccu.ids, total }, groupName: group })));
-  });
-  return getAllDevices();
-});
-var getDeviceById2 = createAsyncThunk2(
+    const { attributes, filterTerms: filters } = prepareSearchArguments({
+      filters: getState().devices.groups.byId[group].filters,
+      state: getState(),
+      status: DEVICE_STATES.accepted
+    });
+    const getAllDevices = (perPage = MAX_PAGE_SIZE, page = defaultPage2, devices = []) => general_api_default.post(getSearchEndpoint(getState()), { page, per_page: perPage, filters, attributes: [...attributes, { scope: "inventory", attribute }] }).then(
+      (res) => {
+        const state = getState();
+        const deviceAccu = reduceReceivedDevices(res.data, devices, state);
+        dispatch(actions3.receivedDevices(deviceAccu.devicesById));
+        const total = Number(res.headers[headerNames.total]);
+        if (total > deviceAccu.ids.length) {
+          return getAllDevices(perPage, page + 1, deviceAccu.ids);
+        }
+        return Promise.resolve(dispatch(actions3.addGroup({ group: { deviceIds: deviceAccu.ids, total }, groupName: group })));
+      }
+    );
+    return getAllDevices();
+  }
+);
+var getDeviceById2 = createAppAsyncThunk(
   `${sliceName3}/getDeviceById`,
   (id, { dispatch, getState }) => general_api_default.get(`${inventoryApiUrl}/devices/${id}`).then((res) => {
     const device = reduceReceivedDevices([res.data], [], getState()).devicesById[id];
@@ -833,7 +876,8 @@ var getDeviceById2 = createAsyncThunk2(
             attributes: [
               { name: "status", value: "decomissioned", scope: "identity" },
               { name: "decomissioned", value: "true", scope: "inventory" }
-            ]
+            ],
+            log: false
           }
         ],
         [],
@@ -843,17 +887,20 @@ var getDeviceById2 = createAsyncThunk2(
     }
   })
 );
-var getDeviceInfo = createAsyncThunk2(`${sliceName3}/getDeviceInfo`, (deviceId, { dispatch, getState }) => {
+var getDeviceInfo = createAppAsyncThunk(`${sliceName3}/getDeviceInfo`, (deviceId, { dispatch, getState }) => {
   const device = getDeviceById(getState(), deviceId);
   const { hasDeviceConfig, hasDeviceConnect, hasMonitor } = getTenantCapabilities(getState());
   const { canConfigure } = getUserCapabilities(getState());
   const integrations = getDeviceTwinIntegrations(getState());
-  let tasks = [dispatch(getDeviceAuth(deviceId)), ...integrations.map((integration) => dispatch(getDeviceTwin({ deviceId, integration })))];
-  if (hasDeviceConfig && canConfigure && [DEVICE_STATES.accepted, DEVICE_STATES.preauth].includes(device.status)) {
+  const tasks = [
+    dispatch(getDeviceAuth(deviceId)),
+    dispatch(getDeviceById2(deviceId)),
+    ...integrations.map((integration) => dispatch(getDeviceTwin({ deviceId, integration })))
+  ];
+  if (hasDeviceConfig && canConfigure && (device.status === DEVICE_STATES.accepted || device.status === DEVICE_STATES.preauth)) {
     tasks.push(dispatch(getDeviceConfig(deviceId)));
   }
   if (device.status === DEVICE_STATES.accepted) {
-    tasks.push(dispatch(getDeviceById2(deviceId)));
     if (hasDeviceConnect) {
       tasks.push(dispatch(getDeviceConnect(deviceId)));
     }
@@ -864,25 +911,7 @@ var getDeviceInfo = createAsyncThunk2(`${sliceName3}/getDeviceInfo`, (deviceId,
   }
   return Promise.all(tasks);
 });
-var deriveInactiveDevices = createAsyncThunk2(`${sliceName3}/deriveInactiveDevices`, (deviceIds, { dispatch, getState }) => {
-  const yesterday = /* @__PURE__ */ new Date();
-  yesterday.setDate(yesterday.getDate() - 1);
-  const yesterdaysIsoString = yesterday.toISOString();
-  const devices = deviceIds.reduce(
-    (accu, id) => {
-      const device = getDeviceById(getState(), id);
-      if (device && device.updated_ts > yesterdaysIsoString) {
-        accu.active.push(id);
-      } else {
-        accu.inactive.push(id);
-      }
-      return accu;
-    },
-    { active: [], inactive: [] }
-  );
-  return dispatch(actions3.setInactiveDevices({ activeDeviceTotal: devices.active.length, inactiveDeviceTotal: devices.inactive.length }));
-});
-var getDeviceCount = createAsyncThunk2(
+var getDeviceCount = createAppAsyncThunk(
   `${sliceName3}/getDeviceCount`,
   (status, { dispatch, getState }) => general_api_default.post(getSearchEndpoint(getState()), {
     page: 1,
@@ -891,37 +920,34 @@ var getDeviceCount = createAsyncThunk2(
     attributes: defaultAttributes
   }).then((response) => {
     const count = Number(response.headers[headerNames.total]);
-    if (status) {
-      return dispatch(actions3.setDevicesCountByStatus({ count, status }));
-    }
-    return dispatch(actions3.setTotalDevices(count));
+    return dispatch(actions3.setDevicesCountByStatus({ count, status }));
   })
 );
-var getAllDeviceCounts = createAsyncThunk2(
+var getAllDeviceCounts = createAppAsyncThunk(
   `${sliceName3}/getAllDeviceCounts`,
   (_, { dispatch }) => Promise.all([DEVICE_STATES.accepted, DEVICE_STATES.pending].map((status) => dispatch(getDeviceCount(status))))
 );
-var getDeviceLimit = createAsyncThunk2(
+var getDeviceLimit = createAppAsyncThunk(
   `${sliceName3}/getDeviceLimit`,
   (_, { dispatch }) => general_api_default.get(`${deviceAuthV2}/limits/max_devices`).then((res) => dispatch(actions3.setDeviceLimit(res.data.limit)))
 );
-var setDeviceListState = createAsyncThunk2(
+var setDeviceListState = createAppAsyncThunk(
   `${sliceName3}/setDeviceListState`,
   ({ shouldSelectDevices = true, forceRefresh, fetchAuth = true, ...selectionState }, { dispatch, getState }) => {
     const currentState = getDeviceListState(getState());
     const refreshTrigger = forceRefresh ? !currentState.refreshTrigger : selectionState.refreshTrigger;
-    let nextState = {
+    const nextState = {
       ...currentState,
       setOnly: false,
       refreshTrigger,
       ...selectionState,
       sort: { ...currentState.sort, ...selectionState.sort }
     };
-    let tasks = [];
+    const tasks = [];
     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 } = nextState.sort ?? {};
+      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;
@@ -937,83 +963,84 @@ var setDeviceListState = createAsyncThunk2(
     return Promise.all(tasks);
   }
 );
-var getDevicesByStatus = createAsyncThunk2(`${sliceName3}/getDevicesByStatus`, (options, { dispatch, getState }) => {
-  const {
-    status,
-    fetchAuth = true,
-    filterSelection,
-    group,
-    selectedIssues = [],
-    page = defaultPage2,
-    perPage = defaultPerPage2,
-    sortOptions = [],
-    selectedAttributes = getSelectedDeviceAttribute(getState())
-  } = options;
-  const state = getState();
-  const { applicableFilters, filterTerms } = convertDeviceListStateToFilters({
-    filters: filterSelection ?? getDeviceFilters(state),
-    group: group ?? getSelectedGroup(state),
-    groups: state.devices.groups,
-    offlineThreshold: state.app.offlineThreshold,
-    selectedIssues,
-    status
-  });
-  const attributes = [...defaultAttributes, getIdAttribute(getState()), ...selectedAttributes];
-  return general_api_default.post(getSearchEndpoint(getState()), {
-    page,
-    per_page: perPage,
-    filters: filterTerms,
-    sort: sortOptions,
-    attributes
-  }).then((response) => {
-    const state2 = getState();
-    const deviceAccu = reduceReceivedDevices(response.data, [], state2, status);
-    let total = !applicableFilters.length ? Number(response.headers[headerNames.total]) : null;
-    if (status && state2.devices.byStatus[status].total === deviceAccu.ids.length) {
-      total = deviceAccu.ids.length;
-    }
-    let tasks = [dispatch(actions3.receivedDevices(deviceAccu.devicesById))];
-    if (status) {
-      tasks.push(dispatch(actions3.setDevicesByStatus({ deviceIds: deviceAccu.ids, status, total })));
-    }
-    const receivedDevices = Object.values(deviceAccu.devicesById);
-    if (receivedDevices.length && fetchAuth) {
-      tasks.push(dispatch(getDevicesWithAuth(receivedDevices)));
-    }
-    tasks.push(Promise.resolve({ deviceAccu, total: Number(response.headers[headerNames.total]) }));
-    return Promise.all(tasks);
-  }).catch((err) => commonErrorHandler(err, `${status} devices couldn't be loaded.`, dispatch, commonErrorFallback));
-});
-var getAllDevicesByStatus = createAsyncThunk2(`${sliceName3}/getAllDevicesByStatus`, (status, { dispatch, getState }) => {
-  const attributes = [...defaultAttributes, getIdAttribute(getState())];
-  const getAllDevices = (perPage = MAX_PAGE_SIZE, page = 1, devices = []) => general_api_default.post(getSearchEndpoint(getState()), {
-    page,
-    per_page: perPage,
-    filters: mapFiltersToTerms([{ key: "status", value: status, operator: DEVICE_FILTERING_OPTIONS.$eq.key, scope: "identity" }]),
-    attributes
-  }).then((res) => {
+var getDevicesByStatus = createAppAsyncThunk(
+  `${sliceName3}/getDevicesByStatus`,
+  (options, { dispatch, getState }) => {
+    const {
+      status,
+      fetchAuth = true,
+      filterSelection,
+      group,
+      selectedIssues = [],
+      page = defaultPage2,
+      perPage = defaultPerPage2,
+      sortOptions = [],
+      selectedAttributes = getSelectedDeviceAttribute(getState())
+    } = options;
     const state = getState();
-    const deviceAccu = reduceReceivedDevices(res.data, devices, state, status);
-    dispatch(actions3.receivedDevices(deviceAccu.devicesById));
-    const total = Number(res.headers[headerNames.total]);
-    if (total > state.deployments.deploymentDeviceLimit) {
+    const { applicableFilters, filterTerms } = convertDeviceListStateToFilters({
+      filters: filterSelection ?? getDeviceFilters(state),
+      group: group ?? getSelectedGroup(state),
+      groups: state.devices.groups,
+      offlineThreshold: state.app.offlineThreshold,
+      selectedIssues,
+      status
+    });
+    const attributes = [...defaultAttributes, getIdAttribute(getState()), ...selectedAttributes];
+    return general_api_default.post(getSearchEndpoint(getState()), {
+      page,
+      per_page: perPage,
+      filters: filterTerms,
+      sort: sortOptions,
+      attributes
+    }).then((response) => {
+      const state2 = getState();
+      const deviceAccu = reduceReceivedDevices(response.data, [], state2, status);
+      let total = !applicableFilters.length ? Number(response.headers[headerNames.total]) : 0;
+      if (status && state2.devices.byStatus[status].total === deviceAccu.ids.length) {
+        total = deviceAccu.ids.length;
+      }
+      const tasks = [dispatch(actions3.receivedDevices(deviceAccu.devicesById))];
+      if (status) {
+        tasks.push(dispatch(actions3.setDevicesByStatus({ deviceIds: deviceAccu.ids, status, total })));
+      }
+      const receivedDevices = Object.values(deviceAccu.devicesById);
+      if (receivedDevices.length && fetchAuth) {
+        tasks.push(dispatch(getDevicesWithAuth(receivedDevices)));
+      }
+      tasks.push(Promise.resolve({ deviceAccu, total: Number(response.headers[headerNames.total]) }));
+      return Promise.all(tasks);
+    }).catch((err) => commonErrorHandler(err, `${status} devices couldn't be loaded.`, dispatch, commonErrorFallback));
+  }
+);
+var getAllDevicesByStatus = createAppAsyncThunk(
+  `${sliceName3}/getAllDevicesByStatus`,
+  ({ status, attribute }, { dispatch, getState }) => {
+    const attributes = [...defaultAttributes, getIdAttribute(getState())];
+    const getAllDevices = (perPage = MAX_PAGE_SIZE, page = 1, devices = []) => general_api_default.post(getSearchEndpoint(getState()), {
+      page,
+      per_page: perPage,
+      filters: mapFiltersToTerms([{ key: "status", value: status, operator: DEVICE_FILTERING_OPTIONS.$eq.key, scope: "identity" }]),
+      attributes: [...attributes, { scope: "inventory", attribute }]
+    }).then((res) => {
+      const state = getState();
+      const deviceAccu = reduceReceivedDevices(res.data, devices, state, status);
+      dispatch(actions3.receivedDevices(deviceAccu.devicesById));
+      const total = Number(res.headers[headerNames.total]);
+      if (total > state.deployments.deploymentDeviceLimit) {
+        return Promise.resolve();
+      }
+      if (total > perPage * page) {
+        return getAllDevices(perPage, page + 1, deviceAccu.ids);
+      }
       return Promise.resolve();
-    }
-    if (total > perPage * page) {
-      return getAllDevices(perPage, page + 1, deviceAccu.ids);
-    }
-    let tasks = [dispatch(actions3.setDevicesByStatus({ deviceIds: deviceAccu.ids, forceUpdate: true, status, total: deviceAccu.ids.length }))];
-    if (status === DEVICE_STATES.accepted && deviceAccu.ids.length === total) {
-      tasks.push(dispatch(deriveInactiveDevices(deviceAccu.ids)));
-      tasks.push(dispatch(deriveReportsData()));
-    }
-    return Promise.all(tasks);
-  });
-  return getAllDevices();
-});
-var searchDevices = createAsyncThunk2(`${sliceName3}/searchDevices`, (passedOptions = {}, { dispatch, getState }) => {
+    });
+    return getAllDevices();
+  }
+);
+var searchDevices = createAppAsyncThunk(`${sliceName3}/searchDevices`, (passedOptions = {}, { dispatch, getState }) => {
   const state = getState();
-  let options = { ...state.app.searchState, ...passedOptions };
+  const 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 }));
@@ -1044,64 +1071,25 @@ var attributeReducer = (attributes = []) => attributes.slice(0, ATTRIBUTE_LIST_C
   },
   { identity: [], inventory: [], system: [], tags: [] }
 );
-var getDeviceAttributes = createAsyncThunk2(
+var getDeviceAttributes = createAppAsyncThunk(
   `${sliceName3}/getDeviceAttributes`,
   (_, { dispatch, getState }) => general_api_default.get(getAttrsEndpoint(getState())).then(({ data }) => {
     const { identity: identityAttributes, inventory: inventoryAttributes, system: systemAttributes, tags: tagAttributes } = attributeReducer(data || []);
     return dispatch(actions3.setFilterAttributes({ identityAttributes, inventoryAttributes, systemAttributes, tagAttributes }));
   })
 );
-var getReportingLimits = createAsyncThunk2(
-  `${sliceName3}/getReportingLimits`,
-  (_, { dispatch }) => general_api_default.get(`${reportingApiUrl}/devices/attributes`).catch((err) => commonErrorHandler(err, `filterable attributes limit & usage could not be retrieved.`, dispatch, commonErrorFallback)).then(({ data }) => {
-    const { attributes, count, limit } = data;
-    const groupedAttributes = attributeReducer(attributes);
-    return Promise.resolve(dispatch(actions3.setFilterablesConfig({ count, limit, attributes: groupedAttributes })));
-  })
-);
-var ensureVersionString = (software, fallback) => software.length && software !== "artifact_name" ? software.endsWith(".version") ? software : `${software}.version` : fallback;
-var getSingleReportData = (reportConfig, groups) => {
-  const { attribute, group, software = "" } = reportConfig;
-  const filters = [{ key: "status", scope: "identity", operator: DEVICE_FILTERING_OPTIONS.$eq.key, value: "accepted" }];
-  if (group) {
-    const staticGroupFilter = { key: "group", scope: "system", operator: DEVICE_FILTERING_OPTIONS.$eq.key, value: group };
-    const { cleanedFilters: groupFilters } = getGroupFilters(group, groups);
-    filters.push(...groupFilters.length ? groupFilters : [staticGroupFilter]);
-  }
-  const aggregationAttribute = ensureVersionString(software, attribute);
-  return general_api_default.post(`${reportingApiUrl}/devices/aggregate`, {
-    aggregations: [{ attribute: aggregationAttribute, name: "*", scope: "inventory", size: REPORT_CHART_SIZE_LIMIT }],
-    filters: mapFiltersToTerms(filters)
-  }).then(({ data }) => ({ data, reportConfig }));
-};
-var getReportsData = createAsyncThunk2(`${sliceName3}/getReportsData`, (_, { dispatch, getState }) => {
-  const state = getState();
-  const currentUserId = getCurrentUser(state).id;
-  const reports = getUserSettings(state).reports || getGlobalSettings(state)[`${currentUserId}-reports`] || (Object.keys(getDevicesById(state)).length ? defaultReports : []);
-  return Promise.all(reports.map((report) => getSingleReportData(report, getState().devices.groups))).then((results) => {
-    const devicesState = getState().devices;
-    const totalDeviceCount = devicesState.byStatus.accepted.total;
-    const newReports = results.map(({ data, reportConfig }) => {
-      let { items, other_count } = data[0];
-      const { attribute, group, software = "" } = reportConfig;
-      const dataCount = items.reduce((accu, item) => accu + item.count, 0);
-      const otherCount = !group && (software === rootfsImageVersion || attribute === "artifact_name") ? totalDeviceCount - dataCount : other_count;
-      return { items, otherCount, total: otherCount + dataCount };
-    });
-    return Promise.resolve(dispatch(actions3.setDeviceReports(newReports)));
-  });
-});
 var initializeDistributionData = (report, groups, devices, totalDeviceCount) => {
   const { attribute, group = "", software = "" } = report;
   const effectiveAttribute = software ? software : attribute;
   const { deviceIds, total = 0 } = groups[group] || {};
-  const relevantDevices = groups[group] ? deviceIds.map((id) => devices[id]) : Object.values(devices);
+  const relevantDevices = deviceIds ? deviceIds.map((id) => devices[id]) : Object.values(devices);
   const distributionByAttribute = relevantDevices.reduce((accu, item) => {
     if (!item.attributes || item.status !== DEVICE_STATES.accepted) return accu;
-    if (!accu[item.attributes[effectiveAttribute]]) {
-      accu[item.attributes[effectiveAttribute]] = 0;
+    const attributeValue = item.attributes[effectiveAttribute];
+    if (!accu[attributeValue]) {
+      accu[attributeValue] = 0;
     }
-    accu[item.attributes[effectiveAttribute]] = accu[item.attributes[effectiveAttribute]] + 1;
+    accu[attributeValue] = accu[attributeValue] + 1;
     return accu;
   }, {});
   const distributionByAttributeSorted = Object.entries(distributionByAttribute).sort((pairA, pairB) => pairB[1] - pairA[1]);
@@ -1110,90 +1098,111 @@ var initializeDistributionData = (report, groups, devices, totalDeviceCount) =>
   const otherCount = (groups[group] ? total : totalDeviceCount) - dataCount;
   return { items, otherCount, total: otherCount + dataCount };
 };
-var deriveReportsData = createAsyncThunk2(`${sliceName3}/deriveReportsData`, (_, { dispatch, getState }) => {
-  const state = getState();
-  const {
-    groups: { byId: groupsById },
-    byId,
-    byStatus: {
-      accepted: { total }
-    }
-  } = state.devices;
-  const reports = getUserSettings(state).reports || state.users.globalSettings[`${state.users.currentUser}-reports`] || (Object.keys(byId).length ? defaultReports : []);
-  const newReports = reports.map((report) => initializeDistributionData(report, groupsById, byId, total));
+var updateReportData = createAppAsyncThunk(`${sliceName3}/updateReportData`, (reportIndex, { dispatch, getState }) => {
+  const reports = getDeviceReportsForUser(getState());
+  const report = reports[reportIndex];
+  const { group = "" } = report;
+  const devicesById = getDevicesById(getState());
+  const groups = getGroupsById(getState());
+  const acceptedDevices = getAcceptedDevices(getState());
+  const totalDeviceCount = groups[group] ? groups[group].total : acceptedDevices.total;
+  const reportsData = getDeviceReports(getState());
+  const newReports = [...reportsData];
+  newReports[reportIndex] = initializeDistributionData(report, groups, devicesById, totalDeviceCount);
   return Promise.resolve(dispatch(actions3.setDeviceReports(newReports)));
 });
-var getReportsDataWithoutBackendSupport = createAsyncThunk2(
-  `${sliceName3}/getReportsDataWithoutBackendSupport`,
-  (_, { dispatch, getState }) => Promise.all([dispatch(getAllDevicesByStatus(DEVICE_STATES.accepted)), dispatch(getGroups2()), dispatch(getDynamicGroups())]).then(() => {
-    const { dynamic: dynamicGroups, static: staticGroups } = getGroups(getState());
-    return Promise.all([
-      ...staticGroups.map(({ groupId }) => dispatch(getAllGroupDevices(groupId))),
-      ...dynamicGroups.map(({ groupId }) => dispatch(getAllDynamicGroupDevices(groupId)))
-    ]).then(() => dispatch(deriveReportsData()));
-  })
+var getReportDataWithoutBackendSupport = createAppAsyncThunk(
+  `${sliceName3}/getReportDataWithoutBackendSupport`,
+  (reportIndex, { dispatch, getState }) => {
+    const reports = getDeviceReportsForUser(getState());
+    const report = reports[reportIndex];
+    if (!report) {
+      return;
+    }
+    const { attribute, group = "", software = "" } = report;
+    const effectiveAttribute = software ? software : attribute;
+    const devicesById = getDevicesById(getState());
+    const acceptedDevices = getAcceptedDevices(getState());
+    const groups = getGroupsById(getState());
+    const { deviceIds = [], filters = [], total = 0 } = groups[group] || {};
+    let groupDevicesRequest = Promise.resolve({
+      payload: { groupName: "", group: { deviceIds: Object.keys(devicesById), total: Object.keys(devicesById).length } }
+    });
+    if (group && (!(deviceIds.length && total) || deviceIds.length !== total || !deviceIds.every((id) => !!devicesById[id]))) {
+      groupDevicesRequest = filters.length ? dispatch(getAllDynamicGroupDevices({ group, attribute: effectiveAttribute })).unwrap() : dispatch(getAllGroupDevices({ group, attribute: effectiveAttribute })).unwrap();
+    } else if (!group && (acceptedDevices.deviceIds.length !== acceptedDevices.total || !acceptedDevices.deviceIds.every((id) => !!devicesById[id]))) {
+      groupDevicesRequest = dispatch(getAllDevicesByStatus({ status: DEVICE_STATES.accepted, attribute: effectiveAttribute })).unwrap();
+    }
+    return groupDevicesRequest.then(() => dispatch(updateReportData(reportIndex)));
+  }
 );
-var getDeviceConnect = createAsyncThunk2(
+var getDeviceConnect = createAppAsyncThunk(
   `${sliceName3}/getDeviceConnect`,
   (id, { dispatch }) => general_api_default.get(`${deviceConnect}/devices/${id}`).then(
     ({ data }) => Promise.all([dispatch(actions3.receivedDevice({ connect_status: data.status, connect_updated_ts: data.updated_ts, id })), Promise.resolve(data)])
   )
 );
 var updateTypeMap = { deploymentUpdate: "check-update", inventoryUpdate: "send-inventory" };
-var triggerDeviceUpdate = createAsyncThunk2(
+var triggerDeviceUpdate = createAppAsyncThunk(
   `${sliceName3}/triggerDeviceUpdate`,
   ({ id, type }, { dispatch }) => general_api_default.post(`${deviceConnect}/devices/${id}/${updateTypeMap[type] ?? updateTypeMap.deploymentUpdate}`).then(
     () => new Promise((resolve) => setTimeout(() => resolve(dispatch(getDeviceById2(id))), TIMEOUTS.threeSeconds))
   )
 );
-var getSessionDetails = createAsyncThunk2(`${sliceName3}/getSessionDetails`, ({ sessionId, deviceId, userId, startDate, endDate }) => {
-  const { start: startUnix, end: endUnix } = dateRangeToUnix(startDate, endDate);
-  const createdAfter = startDate ? `&created_after=${startUnix}` : "";
-  const createdBefore = endDate ? `&created_before=${endUnix}` : "";
-  const objectSearch = `&object_id=${deviceId}`;
-  return general_api_default.get(`${auditLogsApiUrl}/logs?per_page=500${createdAfter}${createdBefore}&actor_id=${userId}${objectSearch}`).then(
-    ({ data: auditLogEntries }) => {
-      const { start, end } = auditLogEntries.reduce(
-        (accu, item) => {
-          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);
-          }
-          return accu;
-        },
-        { start: startDate || endDate, end: endDate || startDate }
-      );
-      return Promise.resolve({ start, end });
-    }
-  );
-});
-var getDeviceFileDownloadLink = createAsyncThunk2(
+var getSessionDetails = createAppAsyncThunk(
+  `${sliceName3}/getSessionDetails`,
+  ({ sessionId, deviceId, userId, startDate, endDate }) => {
+    const { start: startUnix, end: endUnix } = dateRangeToUnix(startDate, endDate);
+    const createdAfter = startDate ? `&created_after=${startUnix}` : "";
+    const createdBefore = endDate ? `&created_before=${endUnix}` : "";
+    const objectSearch = `&object_id=${deviceId}`;
+    return general_api_default.get(`${auditLogsApiUrl}/logs?per_page=500${createdAfter}${createdBefore}&actor_id=${userId}${objectSearch}`).then(
+      ({ data: auditLogEntries }) => {
+        const { start, end } = auditLogEntries.reduce(
+          (accu, item) => {
+            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);
+            }
+            return accu;
+          },
+          { start: startDate || endDate, end: endDate || startDate }
+        );
+        return Promise.resolve({ start, end });
+      }
+    );
+  }
+);
+var getDeviceFileDownloadLink = createAppAsyncThunk(
   `${sliceName3}/getDeviceFileDownloadLink`,
   ({ deviceId, path }) => Promise.resolve(`${window.location.origin}${deviceConnect}/devices/${deviceId}/download?path=${encodeURIComponent(path)}`)
 );
-var deviceFileUpload = createAsyncThunk2(`${sliceName3}/deviceFileUpload`, ({ deviceId, path, file }, { dispatch }) => {
-  let formData = new FormData();
-  formData.append("path", path);
-  formData.append("file", file);
-  const uploadId = uuid();
-  const cancelSource = new AbortController();
-  return Promise.all([
-    dispatch(setSnackbar2("Uploading file")),
-    dispatch(initUpload({ id: uploadId, upload: { inprogress: true, uploadProgress: 0, cancelSource } })),
-    general_api_default.uploadPut(
-      `${deviceConnect}/devices/${deviceId}/upload`,
-      formData,
-      (e) => dispatch(uploadProgress({ id: uploadId, progress: progress(e) })),
-      cancelSource.signal
-    )
-  ]).then(() => Promise.resolve(dispatch(setSnackbar2("Upload successful", TIMEOUTS.fiveSeconds)))).catch((err) => {
-    if (isCancel(err)) {
-      return dispatch(setSnackbar2("The upload has been cancelled", TIMEOUTS.fiveSeconds));
-    }
-    return commonErrorHandler(err, `Error uploading file to device.`, dispatch);
-  }).finally(() => dispatch(cleanUpUpload(uploadId)));
-});
-var getDeviceAuth = createAsyncThunk2(
+var deviceFileUpload = createAppAsyncThunk(
+  `${sliceName3}/deviceFileUpload`,
+  ({ deviceId, path, file }, { dispatch }) => {
+    const formData = new FormData();
+    formData.append("path", path);
+    formData.append("file", file);
+    const uploadId = uuid();
+    const cancelSource = new AbortController();
+    return Promise.all([
+      dispatch(setSnackbar2("Uploading file")),
+      dispatch(initUpload({ id: uploadId, upload: { progress: 0, cancelSource } })),
+      general_api_default.uploadPut(
+        `${deviceConnect}/devices/${deviceId}/upload`,
+        formData,
+        (e) => dispatch(uploadProgress({ id: uploadId, progress: progress(e) })),
+        cancelSource.signal
+      )
+    ]).then(() => Promise.resolve(dispatch(setSnackbar2({ message: "Upload successful", autoHideDuration: TIMEOUTS.fiveSeconds })))).catch((err) => {
+      if (isCancel(err)) {
+        return dispatch(setSnackbar2({ message: "The upload has been cancelled", autoHideDuration: TIMEOUTS.fiveSeconds }));
+      }
+      return commonErrorHandler(err, `Error uploading file to device.`, dispatch);
+    }).finally(() => dispatch(cleanUpUpload(uploadId)));
+  }
+);
+var getDeviceAuth = createAppAsyncThunk(
   `${sliceName3}/getDeviceAuth`,
   (id, { dispatch }) => dispatch(getDevicesWithAuth([{ id }])).unwrap().then((results) => {
     if (results[results.length - 1]) {
@@ -1202,64 +1211,69 @@ var getDeviceAuth = createAsyncThunk2(
     return Promise.resolve();
   })
 );
-var getDevicesWithAuth = createAsyncThunk2(
+var getDevicesWithAuth = createAppAsyncThunk(
   `${sliceName3}/getDevicesWithAuth`,
   (devices, { dispatch, getState }) => devices.length ? general_api_default.get(`${deviceAuthV2}/devices?id=${devices.map((device) => device.id).join("&id=")}`).then(({ data: receivedDevices }) => {
     const { devicesById } = reduceReceivedDevices(receivedDevices, [], getState());
     return Promise.all([dispatch(actions3.receivedDevices(devicesById)), Promise.resolve(receivedDevices)]);
   }).catch((err) => commonErrorHandler(err, `Error: ${err}`, dispatch)) : Promise.resolve([[], []])
 );
-var updateDeviceAuth = createAsyncThunk2(
+var updateDeviceAuth = createAppAsyncThunk(
   `${sliceName3}/updateDeviceAuth`,
   ({ deviceId, authId, status }, { dispatch, getState }) => general_api_default.put(`${deviceAuthV2}/devices/${deviceId}/auth/${authId}/status`, { status }).then(() => Promise.all([dispatch(getDeviceAuth(deviceId)), dispatch(setSnackbar2("Device authorization status was updated successfully"))])).catch((err) => commonErrorHandler(err, "There was a problem updating the device authorization status:", dispatch)).then(() => Promise.resolve(dispatch(actions3.maybeUpdateDevicesByStatus({ deviceId, authId })))).finally(() => dispatch(setDeviceListState({ refreshTrigger: !getDeviceListState(getState()).refreshTrigger })))
 );
-var updateDevicesAuth = createAsyncThunk2(`${sliceName3}/updateDevicesAuth`, ({ deviceIds, status }, { dispatch, getState }) => {
-  let devices = getDevicesById(getState());
-  const deviceIdsWithoutAuth = deviceIds.reduce((accu, id) => devices[id].auth_sets ? accu : [...accu, { id }], []);
-  return dispatch(getDevicesWithAuth(deviceIdsWithoutAuth)).then(() => {
-    devices = getDevicesById(getState());
-    const deviceAuthUpdates = deviceIds.map((id) => {
-      const device = devices[id];
-      if (device.auth_sets.length !== 1) {
-        return Promise.reject();
-      }
-      return dispatch(updateDeviceAuth({ authId: device.auth_sets[0].id, deviceId: device.id, status })).unwrap().catch((err) => commonErrorHandler(err, "The action was stopped as there was a problem updating a device authorization status: ", dispatch, "", false));
-    });
-    return Promise.allSettled(deviceAuthUpdates).then((results) => {
-      const { skipped, count } = results.reduce(
-        (accu, item) => {
-          if (item.status === "rejected") {
-            accu.skipped = accu.skipped + 1;
-          } else {
-            accu.count = accu.count + 1;
-          }
-          return accu;
-        },
-        { skipped: 0, count: 0 }
-      );
-      const message = getSnackbarMessage(skipped, count);
-      return dispatch(setSnackbar2(message));
+var updateDevicesAuth = createAppAsyncThunk(
+  `${sliceName3}/updateDevicesAuth`,
+  ({ deviceIds, status }, { dispatch, getState }) => {
+    let devices = getDevicesById(getState());
+    const deviceIdsWithoutAuth = deviceIds.reduce((accu, id) => devices[id].auth_sets ? accu : [...accu, { id }], []);
+    return dispatch(getDevicesWithAuth(deviceIdsWithoutAuth)).then(() => {
+      devices = getDevicesById(getState());
+      const deviceAuthUpdates = deviceIds.map((id) => {
+        const device = devices[id];
+        if (device.auth_sets && device.auth_sets.length !== 1) {
+          return Promise.reject();
+        }
+        return dispatch(updateDeviceAuth({ authId: device.auth_sets[0].id, deviceId: device.id, status })).unwrap().catch((err) => commonErrorHandler(err, "The action was stopped as there was a problem updating a device authorization status: ", dispatch, "", false));
+      });
+      return Promise.allSettled(deviceAuthUpdates).then((results) => {
+        const { skipped, count } = results.reduce(
+          (accu, item) => {
+            if (item.status === "rejected") {
+              accu.skipped = accu.skipped + 1;
+            } else {
+              accu.count = accu.count + 1;
+            }
+            return accu;
+          },
+          { skipped: 0, count: 0 }
+        );
+        const message = getSnackbarMessage(skipped, count);
+        return dispatch(setSnackbar2(message));
+      });
     });
-  });
-});
-var deleteAuthset = createAsyncThunk2(
+  }
+);
+var deleteAuthset = createAppAsyncThunk(
   `${sliceName3}/deleteAuthset`,
   ({ deviceId, authId }, { dispatch, getState }) => general_api_default.delete(`${deviceAuthV2}/devices/${deviceId}/auth/${authId}`).then(() => Promise.all([dispatch(setSnackbar2("Device authorization status was updated successfully"))])).catch((err) => commonErrorHandler(err, "There was a problem updating the device authorization status:", dispatch)).then(() => Promise.resolve(dispatch(actions3.maybeUpdateDevicesByStatus({ deviceId, authId })))).finally(() => dispatch(setDeviceListState({ refreshTrigger: !getState().devices.deviceList.refreshTrigger })))
 );
-var preauthDevice = createAsyncThunk2(
+var preauthDevice = createAppAsyncThunk(
   `${sliceName3}/preauthDevice`,
-  (authset, { dispatch, rejectWithValue }) => general_api_default.post(`${deviceAuthV2}/devices`, authset).then(() => Promise.resolve(dispatch(setSnackbar2("Device was successfully added to the preauthorization list", TIMEOUTS.fiveSeconds)))).catch((err) => {
+  (authset, { dispatch, rejectWithValue }) => general_api_default.post(`${deviceAuthV2}/devices`, authset).then(
+    () => Promise.resolve(dispatch(setSnackbar2({ message: "Device was successfully added to the preauthorization list", autoHideDuration: TIMEOUTS.fiveSeconds })))
+  ).catch((err) => {
     if (err.response.status === 409) {
       return rejectWithValue("A device with a matching identity data set already exists");
     }
     return commonErrorHandler(err, "The device could not be added:", dispatch);
   })
 );
-var decommissionDevice = createAsyncThunk2(
+var decommissionDevice = createAppAsyncThunk(
   `${sliceName3}/decommissionDevice`,
   ({ deviceId, authId }, { dispatch, getState }) => general_api_default.delete(`${deviceAuthV2}/devices/${deviceId}`).then(() => Promise.resolve(dispatch(setSnackbar2("Device was decommissioned successfully")))).catch((err) => commonErrorHandler(err, "There was a problem decommissioning the device:", dispatch)).then(() => Promise.resolve(dispatch(actions3.maybeUpdateDevicesByStatus({ deviceId, authId })))).finally(() => dispatch(setDeviceListState({ refreshTrigger: !getState().devices.deviceList.refreshTrigger })))
 );
-var getDeviceConfig = createAsyncThunk2(
+var getDeviceConfig = createAppAsyncThunk(
   `${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) => {
     if (err.response?.data?.error.status_code !== 404) {
@@ -1267,16 +1281,16 @@ var getDeviceConfig = createAsyncThunk2(
     }
   })
 );
-var setDeviceConfig = createAsyncThunk2(
+var setDeviceConfig = createAppAsyncThunk(
   `${sliceName3}/setDeviceConfig`,
   ({ deviceId, config }, { dispatch }) => general_api_default.put(`${deviceConfig}/${deviceId}`, config).catch((err) => commonErrorHandler(err, `There was an error setting the configuration for device ${deviceId}.`, dispatch, commonErrorFallback)).then(() => Promise.resolve(dispatch(getDeviceConfig(deviceId))))
 );
-var applyDeviceConfig = createAsyncThunk2(
+var applyDeviceConfig = createAppAsyncThunk(
   `${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 }) => {
     const device = getDeviceById(getState(), deviceId);
     const { canManageUsers } = getUserCapabilities(getState());
-    let tasks = [
+    const tasks = [
       dispatch(actions3.receivedDevice({ ...device, config: { ...device.config, deployment_id: data.deployment_id } })),
       new Promise((resolve) => setTimeout(() => resolve(dispatch(getSingleDeployment(data.deployment_id))), TIMEOUTS.oneSecond))
     ];
@@ -1287,21 +1301,24 @@ var applyDeviceConfig = createAsyncThunk2(
     return Promise.all(tasks);
   })
 );
-var setDeviceTags = createAsyncThunk2(
+var setDeviceTags = createAppAsyncThunk(
   `${sliceName3}/setDeviceTags`,
   ({ deviceId, tags }, { dispatch }) => (
     // to prevent tag set failures, retrieve the device & use the freshest etag we can get
-    Promise.resolve(dispatch(getDeviceById2(deviceId))).then((device) => {
+    dispatch(getDeviceById2(deviceId)).unwrap().then((device) => {
       const headers = device.etag ? { "If-Match": device.etag } : {};
-      return general_api_default.put(
-        `${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({ ...device, id: deviceId, tags })), dispatch(setSnackbar2("Device name changed"))]));
+      const tagList = Object.entries(tags).map(([name, value]) => ({ name, value }));
+      const isNameChange = tagList.some(({ name }) => name === "name");
+      return general_api_default.put(`${inventoryApiUrl}/devices/${deviceId}/tags`, tagList, { 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({ ...device, id: deviceId, tags })),
+          dispatch(setSnackbar2(`Device ${tagList.length === 1 && isNameChange ? "name" : "tags"} changed`))
+        ])
+      );
     })
   )
 );
-var getDeviceTwin = createAsyncThunk2(`${sliceName3}/getDeviceTwin`, ({ deviceId, integration }, { dispatch, getState }) => {
+var getDeviceTwin = createAppAsyncThunk(`${sliceName3}/getDeviceTwin`, ({ deviceId, integration }, { dispatch, getState }) => {
   let providerResult = {};
   return general_api_default.get(`${iotManagerBaseURL}/devices/${deviceId}/state`).then(({ data }) => {
     providerResult = { ...data, twinError: "" };
@@ -1314,7 +1331,7 @@ var getDeviceTwin = createAsyncThunk2(`${sliceName3}/getDeviceTwin`, ({ deviceId
     Promise.resolve(dispatch(actions3.receivedDevice({ ...device, twinsByIntegration: { ...device.twinsByIntegration, ...providerResult } })));
   });
 });
-var setDeviceTwin = createAsyncThunk2(
+var setDeviceTwin = createAppAsyncThunk(
   `${sliceName3}/setDeviceTwin`,
   ({ deviceId, integration, settings }, { dispatch, getState }) => general_api_default.put(`${iotManagerBaseURL}/devices/${deviceId}/state/${integration.id}`, { desired: settings }).catch(
     (err) => commonErrorHandler(
@@ -1327,7 +1344,9 @@ var setDeviceTwin = createAsyncThunk2(
     const { twinsByIntegration = {} } = device;
     const { [integration.id]: currentState = {} } = twinsByIntegration;
     return Promise.resolve(
-      dispatch(actions3.receivedDevice({ ...device, twinsByIntegration: { ...twinsByIntegration, [integration.id]: { ...currentState, desired: settings } } }))
+      dispatch(
+        actions3.receivedDevice({ ...device, twinsByIntegration: { ...twinsByIntegration, [integration.id]: { ...currentState, desired: settings } } })
+      )
     );
   })
 );
@@ -1338,7 +1357,7 @@ var prepareSearchArguments = ({ filters, group, state, status }) => {
   const attributes = [...defaultAttributes, getIdAttribute(state), ...selectedAttributes];
   return { attributes, filterTerms };
 };
-var getSystemDevices = createAsyncThunk2(`${sliceName3}/getSystemDevices`, (options, { dispatch, getState }) => {
+var getSystemDevices = createAppAsyncThunk(`${sliceName3}/getSystemDevices`, (options, { dispatch, getState }) => {
   const { id, page = defaultPage2, perPage = defaultPerPage2, sortOptions = [] } = options;
   const state = getState();
   const { hasFullFiltering } = getTenantCapabilities(state);
@@ -1369,7 +1388,7 @@ var getSystemDevices = createAsyncThunk2(`${sliceName3}/getSystemDevices`, (opti
     return Promise.resolve(dispatch(actions3.receivedDevices({ ...devicesById, [id]: device })));
   });
 });
-var getGatewayDevices = createAsyncThunk2(`${sliceName3}/getGatewayDevices`, (deviceId, { dispatch, getState }) => {
+var getGatewayDevices = createAppAsyncThunk(`${sliceName3}/getGatewayDevices`, (deviceId, { dispatch, getState }) => {
   const state = getState();
   const { attributes = {} } = getDeviceById(state, deviceId);
   const { mender_gateway_system_id = "" } = attributes;
@@ -1386,41 +1405,15 @@ var getGatewayDevices = createAsyncThunk2(`${sliceName3}/getGatewayDevices`, (de
     attributes: attributeSelection
   }).then(({ data }) => {
     const { ids } = reduceReceivedDevices(data, [], getState());
-    let tasks = ids.map((deviceId2) => dispatch(getDeviceInfo(deviceId2)));
+    const tasks = ids.map((deviceId2) => dispatch(getDeviceInfo(deviceId2)));
     tasks.push(dispatch(actions3.receivedDevice({ id: deviceId, gatewayIds: ids })));
     return Promise.all(tasks);
   });
 });
-var getDevicesInBounds = createAsyncThunk2(`${sliceName3}/getDevicesInBounds`, ({ bounds, group }, { dispatch, getState }) => {
-  const state = getState();
-  const { filterTerms } = convertDeviceListStateToFilters({
-    group: group === ALL_DEVICES ? void 0 : group,
-    groups: state.devices.groups,
-    status: DEVICE_STATES.accepted
-  });
-  return general_api_default.post(getSearchEndpoint(getState()), {
-    page: 1,
-    per_page: MAX_PAGE_SIZE,
-    filters: filterTerms,
-    attributes: geoAttributes,
-    geo_bounding_box_filter: {
-      geo_bounding_box: {
-        location: {
-          top_left: { lat: bounds._northEast.lat, lon: bounds._southWest.lng },
-          bottom_right: { lat: bounds._southWest.lat, lon: bounds._northEast.lng }
-        }
-      }
-    }
-  }).then(({ data }) => {
-    const { devicesById } = reduceReceivedDevices(data, [], getState());
-    return Promise.resolve(dispatch(actions3.receivedDevices(devicesById)));
-  });
-});
 
 // src/onboardingSlice/thunks.ts
 import { getDemoDeviceAddress } from "@northern.tech/utils/helpers";
 import Tracking2 from "@northern.tech/utils/tracking";
-import { createAsyncThunk as createAsyncThunk3 } from "@reduxjs/toolkit";
 import Cookies from "universal-cookie";
 var cookies = new Cookies();
 var applyOnboardingFallbacks = (progress2) => {
@@ -1455,7 +1448,7 @@ var deductOnboardingState = ({ devicesById, devicesByStatus, onboardingState, pa
     progress: progress2
   };
 };
-var getOnboardingState2 = createAsyncThunk3(`${sliceName4}/getOnboardingState`, (_, { dispatch, getState }) => {
+var getOnboardingState2 = createAppAsyncThunk(`${sliceName4}/getOnboardingState`, (_, { dispatch, getState }) => {
   const state = getState();
   let onboardingState = getOnboardingState(state);
   if (!onboardingState.complete) {
@@ -1479,23 +1472,23 @@ var getOnboardingState2 = createAsyncThunk3(`${sliceName4}/getOnboardingState`,
     dispatch(saveUserSettings({ onboarding: onboardingState }))
   ]);
 });
-var setOnboardingDeviceType = createAsyncThunk3(
+var setOnboardingDeviceType = createAppAsyncThunk(
   `${sliceName4}/setOnboardingDeviceType`,
   (value, { dispatch }) => Promise.all([dispatch(actions4.setOnboardingDeviceType(value)), dispatch(saveUserSettings({ onboarding: { deviceType: value } }))])
 );
-var setOnboardingApproach = createAsyncThunk3(
+var setOnboardingApproach = createAppAsyncThunk(
   `${sliceName4}/setOnboardingApproach`,
   (value, { dispatch }) => Promise.all([dispatch(actions4.setOnboardingApproach(value)), dispatch(saveUserSettings({ onboarding: { approach: value } }))])
 );
-var setOnboardingComplete = createAsyncThunk3(`${sliceName4}/setOnboardingComplete`, (value, { dispatch }) => {
-  let tasks = [Promise.resolve(dispatch(actions4.setOnboardingComplete(value)))];
+var setOnboardingComplete = createAppAsyncThunk(`${sliceName4}/setOnboardingComplete`, (value, { dispatch }) => {
+  const tasks = [Promise.resolve(dispatch(actions4.setOnboardingComplete(value)))];
   if (value) {
     tasks.push(Promise.resolve(dispatch(actions4.setShowOnboardingHelp(false))));
     tasks.push(Promise.resolve(dispatch(advanceOnboarding(onboardingSteps.DEPLOYMENTS_PAST_COMPLETED))));
   }
   return Promise.all(tasks);
 });
-var setOnboardingCanceled = createAsyncThunk3(
+var setOnboardingCanceled = createAppAsyncThunk(
   `${sliceName4}/setOnboardingCanceled`,
   (_, { dispatch }) => Promise.all([
     Promise.resolve(dispatch(actions4.setShowOnboardingHelp(false))),
@@ -1503,7 +1496,7 @@ var setOnboardingCanceled = createAsyncThunk3(
     Promise.resolve(dispatch(actions4.setOnboardingComplete(true)))
   ]).then(() => dispatch(advanceOnboarding(onboardingSteps.DEPLOYMENTS_PAST_COMPLETED_FAILURE))).then(() => Tracking2.event({ category: "onboarding", action: onboardingSteps.ONBOARDING_CANCELED }))
 );
-var advanceOnboarding = createAsyncThunk3(`${sliceName4}/advanceOnboarding`, (stepId, { dispatch, getState }) => {
+var advanceOnboarding = createAppAsyncThunk(`${sliceName4}/advanceOnboarding`, (stepId, { dispatch, getState }) => {
   const steps = orderedOnboardingSteps;
   const progress2 = steps.findIndex((step) => step === getState().onboarding.progress);
   const stepIndex = steps.findIndex((step) => step === stepId);
@@ -1518,15 +1511,18 @@ var advanceOnboarding = createAsyncThunk3(`${sliceName4}/advanceOnboarding`, (st
 });
 
 // src/organizationSlice/thunks.ts
+import { PreviewRequest as PreviewRequestEnum } from "@northern.tech/types/MenderTypes";
 import { dateRangeToUnix as dateRangeToUnix2, deepCompare as deepCompare3 } from "@northern.tech/utils/helpers";
-import { createAsyncThunk as createAsyncThunk4 } from "@reduxjs/toolkit";
+import dayjs from "dayjs";
+import utc from "dayjs/plugin/utc";
 import { jwtDecode } from "jwt-decode";
 import hashString from "md5";
 import Cookies2 from "universal-cookie";
 var cookies2 = new Cookies2();
+dayjs.extend(utc);
 var { setAnnouncement, setSnackbar: setSnackbar3 } = actions_default;
 var { page: defaultPage3, perPage: defaultPerPage3 } = DEVICE_LIST_DEFAULTS;
-var cancelRequest = createAsyncThunk4(`${sliceName5}/cancelRequest`, (reason, { dispatch, getState }) => {
+var cancelRequest = createAppAsyncThunk(`${sliceName5}/cancelRequest`, (reason, { dispatch, getState }) => {
   const { id: tenantId } = getOrganization(getState());
   return general_api_default.post(`${tenantadmApiUrlv2}/tenants/${tenantId}/cancel`, { reason }).then(
     () => Promise.resolve(dispatch(setSnackbar3({ message: "Deactivation request was sent successfully", autoHideDuration: TIMEOUTS.fiveSeconds })))
@@ -1545,7 +1541,7 @@ var getTargetLocation = (key) => {
   return `https://${window.location.hostname}`;
 };
 var devLocations = ["localhost", "docker.mender.io"];
-var createOrganizationTrial = createAsyncThunk4(`${sliceName5}/createOrganizationTrial`, (data, { dispatch }) => {
+var createOrganizationTrial = createAppAsyncThunk(`${sliceName5}/createOrganizationTrial`, (data, { dispatch }) => {
   const { key } = locations[data.location];
   const targetLocation = getTargetLocation(key);
   const target = `${targetLocation}${tenantadmApiUrlv2}/tenants/trial`;
@@ -1567,36 +1563,46 @@ var createOrganizationTrial = createAsyncThunk4(`${sliceName5}/createOrganizatio
     );
   });
 });
-var startCardUpdate = createAsyncThunk4(
+var startCardUpdate = createAppAsyncThunk(
   `${sliceName5}/startCardUpdate`,
   (_, { dispatch }) => general_api_default.post(`${tenantadmApiUrlv2}/billing/card`).then(({ data }) => {
     dispatch(actions5.receiveSetupIntent(data.intent_id));
     return Promise.resolve(data.secret);
   }).catch((err) => commonErrorHandler(err, `Updating the card failed:`, dispatch))
 );
-var confirmCardUpdate = createAsyncThunk4(
+var confirmCardUpdate = createAppAsyncThunk(
   `${sliceName5}/confirmCardUpdate`,
   (_, { dispatch, getState }) => general_api_default.post(`${tenantadmApiUrlv2}/billing/card/${getState().organization.intentId}/confirm`).then(() => Promise.all([dispatch(setSnackbar3("Payment card was updated successfully")), dispatch(actions5.receiveSetupIntent(null))])).catch((err) => commonErrorHandler(err, `Updating the card failed:`, dispatch))
 );
-var getCurrentCard = createAsyncThunk4(
+var getCurrentCard = createAppAsyncThunk(
   `${sliceName5}/getCurrentCard`,
   (_, { dispatch }) => general_api_default.get(`${tenantadmApiUrlv2}/billing`).then((res) => {
     const { last4, exp_month, exp_year, brand } = res.data.card || {};
     return Promise.resolve(dispatch(actions5.receiveCurrentCard({ brand, last4, expiration: { month: exp_month, year: exp_year } })));
   })
 );
-var startUpgrade = createAsyncThunk4(
+var startUpgrade = createAppAsyncThunk(
   `${sliceName5}/startUpgrade`,
   (tenantId, { dispatch }) => general_api_default.post(`${tenantadmApiUrlv2}/tenants/${tenantId}/upgrade/start`).then(({ data }) => Promise.resolve(data.secret)).catch((err) => commonErrorHandler(err, `There was an error upgrading your account:`, dispatch))
 );
-var cancelUpgrade = createAsyncThunk4(`${sliceName5}/cancelUpgrade`, (tenantId) => general_api_default.post(`${tenantadmApiUrlv2}/tenants/${tenantId}/upgrade/cancel`));
-var completeUpgrade = createAsyncThunk4(
+var cancelUpgrade = createAppAsyncThunk(
+  `${sliceName5}/cancelUpgrade`,
+  (tenantId) => general_api_default.post(`${tenantadmApiUrlv2}/tenants/${tenantId}/upgrade/cancel`)
+);
+var completeUpgrade = createAppAsyncThunk(
   `${sliceName5}/completeUpgrade`,
   ({ tenantId, plan, billing_profile }, { dispatch }) => general_api_default.post(`${tenantadmApiUrlv2}/tenants/${tenantId}/upgrade/complete`, { plan, billing_profile }).catch((err) => commonErrorHandler(err, `There was an error upgrading your account:`, dispatch)).then(() => Promise.all([dispatch(getDeviceLimit()), dispatch(getUserOrganization())]))
 );
-var prepareAuditlogQuery = ({ startDate, endDate, user: userFilter, type, detail: detailFilter, sort = {} }) => {
-  const userId = userFilter?.id || userFilter;
-  const detail = detailFilter?.id || detailFilter;
+var prepareAuditlogQuery = ({
+  startDate,
+  endDate,
+  user: userFilter,
+  type,
+  detail: detailFilter,
+  sort = { direction: SORTING_OPTIONS.desc }
+}) => {
+  const userId = typeof userFilter === "object" && userFilter ? userFilter.id : userFilter;
+  const detail = typeof detailFilter === "object" && detailFilter ? detailFilter.id : detailFilter;
   const { start: startUnix, end: endUnix } = dateRangeToUnix2(startDate, endDate);
   const createdAfter = startDate ? `&created_after=${startUnix}` : "";
   const createdBefore = endDate ? `&created_before=${endUnix}` : "";
@@ -1606,7 +1612,7 @@ var prepareAuditlogQuery = ({ startDate, endDate, user: userFilter, type, detail
   const { direction = SORTING_OPTIONS.desc } = sort;
   return `${createdAfter}${createdBefore}${userSearch}${typeSearch}${objectSearch}&sort=${direction}`;
 };
-var getAuditLogs = createAsyncThunk4(`${sliceName5}/getAuditLogs`, (selectionState, { dispatch, getState }) => {
+var getAuditLogs = createAppAsyncThunk(`${sliceName5}/getAuditLogs`, (selectionState, { dispatch, getState }) => {
   const { page, perPage } = selectionState;
   const { hasAuditlogs } = getTenantCapabilities(getState());
   if (!hasAuditlogs) {
@@ -1618,29 +1624,32 @@ var getAuditLogs = createAsyncThunk4(`${sliceName5}/getAuditLogs`, (selectionSta
     return Promise.resolve(dispatch(actions5.receiveAuditLogs({ events: data, total })));
   }).catch((err) => commonErrorHandler(err, `There was an error retrieving audit logs:`, dispatch));
 });
-var getAuditLogsCsvLink = createAsyncThunk4(
+var getAuditLogsCsvLink = createAppAsyncThunk(
   `${sliceName5}/getAuditLogsCsvLink`,
   (_, { getState }) => Promise.resolve(`${window.location.origin}${auditLogsApiUrl}/logs/export?limit=20000${prepareAuditlogQuery(getAuditlogState(getState()))}`)
 );
-var setAuditlogsState = createAsyncThunk4(`${sliceName5}/setAuditlogsState`, (selectionState, { dispatch, getState }) => {
-  const currentState = getAuditlogState(getState());
-  let nextState = {
-    ...currentState,
-    ...selectionState,
-    sort: { ...currentState.sort, ...selectionState.sort }
-  };
-  let tasks = [];
-  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 }))));
+var setAuditlogsState = createAppAsyncThunk(
+  `${sliceName5}/setAuditlogsState`,
+  (selectionState, { dispatch, getState }) => {
+    const currentState = getAuditlogState(getState());
+    const nextState = {
+      ...currentState,
+      ...selectionState,
+      sort: { ...currentState.sort, ...selectionState.sort }
+    };
+    const tasks = [];
+    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 }))));
+    }
+    tasks.push(dispatch(actions5.setAuditLogState(nextState)));
+    return Promise.all(tasks);
   }
-  tasks.push(dispatch(actions5.setAuditLogState(nextState)));
-  return Promise.all(tasks);
-});
+);
 var tenantDataDivergedMessage = "The system detected there is a change in your plan or purchased add-ons. Please log out and log in again";
-var addTenant = createAsyncThunk4(
+var addTenant = createAppAsyncThunk(
   `${sliceName5}/createTenant`,
   (selectionState, { dispatch }) => general_api_default.post(`${tenantadmApiUrlv2}/tenants`, selectionState).then(
     () => Promise.all([
@@ -1656,24 +1665,27 @@ var tenantListRetrieval = async (config) => {
   const totalCount = tenantList.headers[headerNames.total] || TENANT_LIST_DEFAULT.perPage;
   return [tenantList.data, Number(totalCount)];
 };
-var getTenants = createAsyncThunk4(`${sliceName5}/getTenants`, async (_, { dispatch, getState }) => {
+var getTenants = createAppAsyncThunk(`${sliceName5}/getTenants`, async (_, { dispatch, getState }) => {
   const currentState = getTenantsList(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 = {
-    ...currentState,
-    ...selectionState
-  };
-  if (!deepCompare3(currentState, selectionState)) {
-    const [tenants, pageCount] = await tenantListRetrieval(nextState);
-    return dispatch(actions5.setTenantListState({ ...nextState, tenants, total: pageCount }));
+var setTenantsListState = createAppAsyncThunk(
+  `${sliceName5}/setTenantsListState`,
+  async (selectionState, { dispatch, getState }) => {
+    const currentState = getTenantsList(getState());
+    const nextState = {
+      ...currentState,
+      ...selectionState
+    };
+    if (!deepCompare3(currentState, selectionState)) {
+      const [tenants, pageCount] = await tenantListRetrieval(nextState);
+      return dispatch(actions5.setTenantListState({ ...nextState, tenants, total: pageCount }));
+    }
+    return dispatch(actions5.setTenantListState({ ...nextState }));
   }
-  return dispatch(actions5.setTenantListState({ ...nextState }));
-});
-var editTenantDeviceLimit = createAsyncThunk4(
+);
+var editTenantDeviceLimit = createAppAsyncThunk(
   `${sliceName5}/editDeviceLimit`,
   ({ newLimit, id, name }, { dispatch }) => general_api_default.put(`${tenantadmApiUrlv2}/tenants/${id}/child`, { device_limit: newLimit, name }).catch((err) => commonErrorHandler(err, `Device Limit cannot be changed`, dispatch)).then(
     () => Promise.all([
@@ -1683,7 +1695,15 @@ var editTenantDeviceLimit = createAsyncThunk4(
     ])
   )
 );
-var removeTenant = createAsyncThunk4(
+var editBillingProfile = createAppAsyncThunk(
+  `${sliceName5}/editBillingProfileEmail`,
+  ({ billingProfile }, { dispatch }) => general_api_default.patch(`${tenantadmApiUrlv2}/billing/profile`, billingProfile).catch((err) => commonErrorHandler(err, `Failed to change billing profile`, dispatch)).then(() => Promise.all([dispatch(setSnackbar3("Billing Profile was changed successfully")), dispatch(getUserBilling())]))
+);
+var createBillingProfile = createAppAsyncThunk(
+  `${sliceName5}/createBillingProfileEmail`,
+  ({ billingProfile }, { dispatch }) => general_api_default.post(`${tenantadmApiUrlv2}/billing/profile`, billingProfile).catch((err) => commonErrorHandler(err, `Failed to create billing profile`, dispatch)).then(() => Promise.all([dispatch(setSnackbar3("Billing Profile was created successfully")), dispatch(getUserBilling())]))
+);
+var removeTenant = createAppAsyncThunk(
   `${sliceName5}/editDeviceLimit`,
   ({ id }, { dispatch }) => general_api_default.post(`${tenantadmApiUrlv2}/tenants/${id}/remove/start`).catch((err) => commonErrorHandler(err, `There was an error removing the tenant`, dispatch)).then(
     () => Promise.all([
@@ -1693,10 +1713,10 @@ var removeTenant = createAsyncThunk4(
     ])
   )
 );
-var getUserOrganization = createAsyncThunk4(
+var getUserOrganization = createAppAsyncThunk(
   `${sliceName5}/getUserOrganization`,
   (_, { dispatch, getState }) => general_api_default.get(`${tenantadmApiUrlv1}/user/tenant`).then((res) => {
-    let tasks = [dispatch(actions5.setOrganization(res.data))];
+    const tasks = [dispatch(actions5.setOrganization(res.data))];
     const { addons, plan, trial } = res.data;
     const { token } = getCurrentSession(getState());
     const jwt = jwtDecode(token);
@@ -1709,30 +1729,59 @@ var getUserOrganization = createAsyncThunk4(
     return Promise.all(tasks);
   })
 );
-var sendSupportMessage = createAsyncThunk4(
+var getUserBilling = createAppAsyncThunk(
+  `${sliceName5}/getUserBilling`,
+  (_, { dispatch }) => general_api_default.get(`${tenantadmApiUrlv2}/billing/profile`).then((res) => dispatch(actions5.setBillingProfile(res.data)))
+);
+var getUserSubscription = createAppAsyncThunk(`${sliceName5}/getUserSubscription`, (_, { dispatch }) => {
+  const tasks = [dispatch(getBillingPreview({ preview_mode: PreviewRequestEnum.preview_mode.NEXT })).unwrap(), dispatch(getCurrentSubscription()).unwrap()];
+  Promise.all(tasks).then(([currentPreview, currentSubscription]) => dispatch(actions5.setSubscription({ ...currentPreview, ...currentSubscription })));
+});
+var getBillingPreview = createAppAsyncThunk(
+  `${sliceName5}/getBillingPreview`,
+  (order) => general_api_default.post(`${tenantadmApiUrlv2}/billing/subscription/invoices/preview`, order).then(
+    ({ data }) => order.preview_mode === "recurring" ? { ...parseSubscriptionPreview(data.lines), total: data.total } : data
+  )
+);
+var getCurrentSubscription = createAppAsyncThunk(
+  `${sliceName5}/getCurrentSubscription`,
+  () => general_api_default.get(`${tenantadmApiUrlv2}/billing/subscription`).then((res) => res.data)
+);
+var successMessage = (planId) => `Thank you! You have successfully subscribed to the ${PLANS[planId].name} plan.  You can view and edit your billing details on the Organization and billing page.`;
+var requestPlanUpgrade = createAppAsyncThunk(
+  `${sliceName5}/requestPlanUpgrade`,
+  (order, { dispatch }) => general_api_default.post(`${tenantadmApiUrlv2}/billing/subscription`, order).catch((err) => commonErrorHandler(err, "There was an error sending your request", dispatch, commonErrorFallback)).then(
+    () => Promise.all([
+      dispatch(setSnackbar3(successMessage(order.plan))),
+      setTimeout(() => dispatch(getDeviceLimit()), TIMEOUTS.threeSeconds),
+      dispatch(getUserOrganization())
+    ])
+  )
+);
+var sendSupportMessage = createAppAsyncThunk(
   `${sliceName5}/sendSupportMessage`,
   (content, { dispatch }) => general_api_default.post(`${tenantadmApiUrlv2}/contact/support`, content).catch((err) => commonErrorHandler(err, "There was an error sending your request", dispatch, commonErrorFallback)).then(() => Promise.resolve(dispatch(setSnackbar3({ message: "Your request was sent successfully", autoHideDuration: TIMEOUTS.fiveSeconds }))))
 );
-var requestPlanChange = createAsyncThunk4(
+var requestPlanChange = createAppAsyncThunk(
   `${sliceName5}/requestPlanChange`,
   ({ content, tenantId }, { dispatch, rejectWithValue }) => general_api_default.post(`${tenantadmApiUrlv2}/tenants/${tenantId}/plan`, content).catch(async (err) => {
     await commonErrorHandler(err, "There was an error sending your request", dispatch, commonErrorFallback);
     rejectWithValue(err);
   }).then(() => Promise.resolve(dispatch(setSnackbar3({ message: "Your request was sent successfully", autoHideDuration: TIMEOUTS.fiveSeconds }))))
 );
-var downloadLicenseReport = createAsyncThunk4(
+var downloadLicenseReport = createAppAsyncThunk(
   `${sliceName5}/downloadLicenseReport`,
   (_, { dispatch }) => general_api_default.get(`${deviceAuthV2}/reports/devices`).catch((err) => commonErrorHandler(err, "There was an error downloading the report", dispatch, commonErrorFallback)).then((res) => res.data)
 );
-var createIntegration = createAsyncThunk4(
+var createIntegration = createAppAsyncThunk(
   `${sliceName5}/createIntegration`,
   ({ 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(
+var changeIntegration = createAppAsyncThunk(
   `${sliceName5}/changeIntegration`,
   ({ id, credentials }, { dispatch }) => general_api_default.put(`${iotManagerBaseURL}/integrations/${id}/credentials`, credentials).catch((err) => commonErrorHandler(err, "There was an error updating the integration", dispatch, commonErrorFallback)).then(() => Promise.all([dispatch(setSnackbar3("The integration was updated successfully")), dispatch(getIntegrations())]))
 );
-var deleteIntegration = createAsyncThunk4(
+var deleteIntegration = createAppAsyncThunk(
   `${sliceName5}/deleteIntegration`,
   ({ id, provider }, { dispatch, getState }) => general_api_default.delete(`${iotManagerBaseURL}/integrations/${id}`, {}).catch((err) => commonErrorHandler(err, "There was an error removing the integration", dispatch, commonErrorFallback)).then(() => {
     const integrations = getState().organization.externalDeviceIntegrations.filter((item) => provider !== item.provider);
@@ -1742,7 +1791,7 @@ var deleteIntegration = createAsyncThunk4(
     ]);
   })
 );
-var getIntegrations = createAsyncThunk4(
+var getIntegrations = createAppAsyncThunk(
   `${sliceName5}/getIntegrations`,
   (_, { 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;
@@ -1755,10 +1804,10 @@ var getIntegrations = createAsyncThunk4(
     return Promise.resolve(dispatch(actions5.receiveExternalDeviceIntegrations(integrations)));
   })
 );
-var getWebhookEvents = createAsyncThunk4(`${sliceName5}/getWebhookEvents`, (config = {}, { dispatch, getState }) => {
+var getWebhookEvents = createAppAsyncThunk(`${sliceName5}/getWebhookEvents`, (config = {}, { dispatch, getState }) => {
   const { isFollowUp, page = defaultPage3, perPage = defaultPerPage3 } = config;
   return general_api_default.get(`${iotManagerBaseURL}/events?page=${page}&per_page=${perPage}`).catch((err) => commonErrorHandler(err, "There was an error retrieving activity for this integration", dispatch, commonErrorFallback)).then(({ data }) => {
-    let tasks = [
+    const tasks = [
       dispatch(
         actions5.receiveWebhookEvents({
           value: isFollowUp ? getState().organization.webhooks.events : data,
@@ -1781,29 +1830,29 @@ var ssoConfigActions = {
 };
 var ssoConfigActionErrorHandler = (err, type) => (dispatch) => commonErrorHandler(err, `There was an error ${ssoConfigActions[type].error} the SSO configuration.`, dispatch, commonErrorFallback);
 var ssoConfigActionSuccessHandler = (type) => (dispatch) => dispatch(setSnackbar3(`The SSO configuration was ${ssoConfigActions[type].success} successfully`));
-var storeSsoConfig = createAsyncThunk4(
+var storeSsoConfig = createAppAsyncThunk(
   `${sliceName5}/storeSsoConfig`,
   ({ config, contentType }, { dispatch }) => general_api_default.post(ssoIdpApiUrlv1, config, { headers: { "Content-Type": contentType, Accept: "application/json" } }).catch((err) => dispatch(ssoConfigActionErrorHandler(err, "create"))).then(() => Promise.all([dispatch(ssoConfigActionSuccessHandler("create")), dispatch(getSsoConfigs())]))
 );
-var changeSsoConfig = createAsyncThunk4(
+var changeSsoConfig = createAppAsyncThunk(
   `${sliceName5}/changeSsoConfig`,
   ({ config, contentType }, { dispatch }) => general_api_default.put(`${ssoIdpApiUrlv1}/${config.id}`, config, { headers: { "Content-Type": contentType, Accept: "application/json" } }).catch((err) => dispatch(ssoConfigActionErrorHandler(err, "edit"))).then(() => Promise.all([dispatch(ssoConfigActionSuccessHandler("edit")), dispatch(getSsoConfigs())]))
 );
-var deleteSsoConfig = createAsyncThunk4(
+var deleteSsoConfig = createAppAsyncThunk(
   `${sliceName5}/deleteSsoConfig`,
   ({ id }, { dispatch, getState }) => general_api_default.delete(`${ssoIdpApiUrlv1}/${id}`).catch((err) => dispatch(ssoConfigActionErrorHandler(err, "remove"))).then(() => {
     const configs = getState().organization.ssoConfigs.filter((item) => id !== item.id);
     return Promise.all([dispatch(ssoConfigActionSuccessHandler("remove")), dispatch(actions5.receiveSsoConfigs(configs))]);
   })
 );
-var getSsoConfigById = createAsyncThunk4(
+var getSsoConfigById = createAppAsyncThunk(
   `${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({ ...config, config: data, type: sso.id }) : Promise.reject("Unsupported SSO config content type.");
   })
 );
-var getSsoConfigs = createAsyncThunk4(
+var getSsoConfigs = createAppAsyncThunk(
   `${sliceName5}/getSsoConfigs`,
   (_, { dispatch }) => general_api_default.get(ssoIdpApiUrlv1).catch((err) => dispatch(ssoConfigActionErrorHandler(err, "readMultiple"))).then(
     ({ data }) => Promise.all(data.map((config) => dispatch(getSsoConfigById(config)).unwrap())).then((configs) => dispatch(actions5.receiveSsoConfigs(configs))).catch((err) => commonErrorHandler(err, err, dispatch, ""))
@@ -1811,15 +1860,13 @@ var getSsoConfigs = createAsyncThunk4(
 );
 
 // src/usersSlice/thunks.ts
-import { HELPTOOLTIPS } from "@northern.tech/common-ui/helptips";
-import { duplicateFilter, extractErrorMessage as extractErrorMessage2, isEmpty as isEmpty2, preformatWithRequestID } from "@northern.tech/utils/helpers";
+import { duplicateFilter, extractErrorMessage as extractErrorMessage2, isEmpty as isEmpty2 } from "@northern.tech/utils/helpers";
 import { clearAllRetryTimers } from "@northern.tech/utils/retrytimer";
-import { createAsyncThunk as createAsyncThunk5 } from "@reduxjs/toolkit";
 import hashString2 from "md5";
 import Cookies3 from "universal-cookie";
 var cookies3 = new Cookies3();
 var { setAnnouncement: setAnnouncement2, setSnackbar: setSnackbar4 } = actions_default;
-var handleLoginError = (err, { token2fa: has2FA, password }, rejectWithValue) => (dispatch) => {
+var handleLoginError = (err, { token2fa: has2FA, password }, rejectWithValue) => () => {
   const errorText = extractErrorMessage2(err);
   const is2FABackend = errorText.includes("2fa");
   if (is2FABackend && !has2FA) {
@@ -1830,26 +1877,25 @@ var handleLoginError = (err, { token2fa: has2FA, password }, rejectWithValue) =>
   }
   const twoFAError = is2FABackend ? " and verification code" : "";
   const errorMessage = `There was a problem logging in. Please check your email${twoFAError ? "," : " and"} password${twoFAError}. If you still have problems, contact an administrator.`;
-  return Promise.reject(dispatch(setSnackbar4({ message: preformatWithRequestID(err.response, errorMessage), action: "Copy to clipboard" })));
+  return rejectWithValue({ error: errorMessage });
 };
-var loginUser = createAsyncThunk5(
+var loginUser = createAppAsyncThunk(
   `${sliceName6}/loginUser`,
-  ({ stayLoggedIn, ...userData }, { dispatch, rejectWithValue }) => users_api_default.postLogin(`${useradmApiUrlv1}/auth/login`, { ...userData, no_expiry: stayLoggedIn }).catch((err) => {
+  ({ stayLoggedIn, ...userData }, { dispatch, rejectWithValue }) => users_api_default.postLogin(`${useradmApiUrl}/auth/login`, { ...userData, no_expiry: stayLoggedIn }).catch((err) => {
     cleanUp();
     return Promise.reject(dispatch(handleLoginError(err, userData, rejectWithValue)));
-  }).then(({ text: response, contentType }) => {
+  }).then(({ text: token, contentType }) => {
     if (contentType.includes(APPLICATION_JSON_CONTENT_TYPE)) {
-      const { id, kind } = response;
+      const { id, kind } = token;
       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();
+    const now = /* @__PURE__ */ new Date();
     now.setSeconds(now.getSeconds() + maxSessionAge);
     const expiresAt = stayLoggedIn ? void 0 : now.toISOString();
     setSessionInfo({ token, expiresAt });
@@ -1866,35 +1912,35 @@ var loginUser = createAsyncThunk5(
     });
   })
 );
-var logoutUser = createAsyncThunk5(`${sliceName6}/logoutUser`, (_, { dispatch, getState }) => {
+var logoutUser = createAppAsyncThunk(`${sliceName6}/logoutUser`, (_, { dispatch, getState }) => {
   if (Object.keys(getState().app.uploadsById).length) {
     return Promise.reject();
   }
-  return general_api_default.post(`${useradmApiUrlv1}/auth/logout`).finally(() => {
+  return general_api_default.post(`${useradmApiUrl}/auth/logout`).finally(() => {
     cleanUp();
     clearAllRetryTimers(setSnackbar4);
     return Promise.resolve(dispatch({ type: USER_LOGOUT }));
   });
 });
-var switchUserOrganization = createAsyncThunk5(`${sliceName6}/switchUserOrganization`, (tenantId, { getState }) => {
+var switchUserOrganization = createAppAsyncThunk(`${sliceName6}/switchUserOrganization`, (tenantId, { getState }) => {
   if (Object.keys(getState().app.uploadsById).length) {
     return Promise.reject();
   }
-  return general_api_default.get(`${useradmApiUrlv1}/users/tenants/${tenantId}/token`).then(({ data: token }) => {
+  return general_api_default.get(`${useradmApiUrl}/users/tenants/${tenantId}/token`).then(({ data: token }) => {
     window.sessionStorage.setItem("tenantChanged", "true");
     setSessionInfo({ ...getSessionInfo(), token });
     window.location.reload();
   });
 });
-var passwordResetStart = createAsyncThunk5(
+var passwordResetStart = createAppAsyncThunk(
   `${sliceName6}/passwordResetStart`,
-  (email, { dispatch }) => general_api_default.post(`${useradmApiUrlv1}/auth/password-reset/start`, { email }).catch(
+  (email, { dispatch }) => general_api_default.post(`${useradmApiUrl}/auth/password-reset/start`, { email }).catch(
     (err) => commonErrorHandler(err, `The password reset request cannot be processed:`, dispatch, void 0, true)
   )
 );
-var passwordResetComplete = createAsyncThunk5(
+var passwordResetComplete = createAppAsyncThunk(
   `${sliceName6}/passwordResetComplete`,
-  ({ secretHash, newPassword }, { dispatch }) => general_api_default.post(`${useradmApiUrlv1}/auth/password-reset/complete`, { secret_hash: secretHash, password: newPassword }).catch((err = {}) => {
+  ({ secretHash, newPassword }, { dispatch }) => general_api_default.post(`${useradmApiUrl}/auth/password-reset/complete`, { secret_hash: secretHash, password: newPassword }).catch((err = {}) => {
     const { error, response = {} } = err;
     let errorMsg = "";
     if (response.status == 400) {
@@ -1906,23 +1952,23 @@ var passwordResetComplete = createAsyncThunk5(
     return Promise.reject(err);
   })
 );
-var verifyEmailStart = createAsyncThunk5(
+var verifyEmailStart = createAppAsyncThunk(
   `${sliceName6}/verifyEmailStart`,
-  (_, { dispatch, getState }) => general_api_default.post(`${useradmApiUrlv1}/auth/verify-email/start`, { email: getCurrentUser(getState()).email }).catch((err) => commonErrorHandler(err, "An error occured starting the email verification process:", dispatch)).finally(() => Promise.resolve(dispatch(getUser(OWN_USER_ID))))
+  (_, { dispatch, getState }) => general_api_default.post(`${useradmApiUrl}/auth/verify-email/start`, { email: getCurrentUser(getState()).email }).catch((err) => commonErrorHandler(err, "An error occured starting the email verification process:", dispatch)).finally(() => Promise.resolve(dispatch(getUser(OWN_USER_ID))))
 );
-var verifyEmailComplete = createAsyncThunk5(
+var verifyEmailComplete = createAppAsyncThunk(
   `${sliceName6}/verifyEmailComplete`,
-  (secret_hash, { dispatch }) => general_api_default.post(`${useradmApiUrlv1}/auth/verify-email/complete`, { secret_hash }).catch((err) => commonErrorHandler(err, "An error occured completing the email verification process:", dispatch)).finally(() => Promise.resolve(dispatch(getUser(OWN_USER_ID))))
+  (secret_hash, { dispatch }) => general_api_default.post(`${useradmApiUrl}/auth/verify-email/complete`, { secret_hash }).catch((err) => commonErrorHandler(err, "An error occured completing the email verification process:", dispatch)).finally(() => Promise.resolve(dispatch(getUser(OWN_USER_ID))))
 );
-var verify2FA = createAsyncThunk5(
+var verify2FA = createAppAsyncThunk(
   `${sliceName6}/verify2FA`,
-  (tfaData, { dispatch }) => users_api_default.putVerifyTFA(`${useradmApiUrlv1}/2faverify`, tfaData).then(() => Promise.resolve(dispatch(getUser(OWN_USER_ID)))).catch(
+  (tfaData, { dispatch }) => users_api_default.putVerifyTFA(`${useradmApiUrl}/2faverify`, tfaData).then(() => Promise.resolve(dispatch(getUser(OWN_USER_ID)))).catch(
     (err) => commonErrorHandler(err, "An error occured validating the verification code: failed to verify token, please try again.", dispatch, void 0, true)
   )
 );
-var getUserList = createAsyncThunk5(
+var getUserList = createAppAsyncThunk(
   `${sliceName6}/getUserList`,
-  (_, { dispatch, getState }) => general_api_default.get(`${useradmApiUrlv1}/users`).then((res) => {
+  (_, { dispatch, getState }) => general_api_default.get(`${useradmApiUrl}/users`).then((res) => {
     const currentUsersById = getUsersById(getState());
     const users = res.data.reduce(
       (accu, item) => {
@@ -1937,9 +1983,9 @@ var getUserList = createAsyncThunk5(
     return dispatch(actions6.receivedUserList(users));
   }).catch((err) => commonErrorHandler(err, `Users couldn't be loaded.`, dispatch, commonErrorFallback))
 );
-var getUser = createAsyncThunk5(
+var getUser = createAppAsyncThunk(
   `${sliceName6}/getUser`,
-  (id, { dispatch, rejectWithValue }) => general_api_default.get(`${useradmApiUrlv1}/users/${id}`).then(
+  (id, { dispatch, rejectWithValue }) => general_api_default.get(`${useradmApiUrl}/users/${id}`).then(
     ({ data: user }) => Promise.all([
       dispatch(actions6.receivedUser(user)),
       dispatch(setHideAnnouncement({ shouldHide: false, userId: user.id })),
@@ -1948,22 +1994,25 @@ var getUser = createAsyncThunk5(
     ])
   ).catch((e) => rejectWithValue(e))
 );
-var initializeSelf = createAsyncThunk5(`${sliceName6}/initializeSelf`, (_, { dispatch }) => dispatch(getUser(OWN_USER_ID)));
-var updateUserColumnSettings = createAsyncThunk5(`${sliceName6}/updateUserColumnSettings`, ({ columns, currentUserId }, { dispatch, getState }) => {
-  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 {
+var initializeSelf = createAppAsyncThunk(`${sliceName6}/initializeSelf`, (_, { dispatch }) => dispatch(getUser(OWN_USER_ID)));
+var updateUserColumnSettings = createAppAsyncThunk(
+  `${sliceName6}/updateUserColumnSettings`,
+  ({ columns, currentUserId }, { dispatch, getState }) => {
+    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 {
+      }
+    } else {
+      customColumns = columns;
     }
-  } else {
-    customColumns = columns;
+    window.localStorage.setItem(storageKey, JSON.stringify(customColumns));
+    return Promise.resolve(dispatch(actions6.setCustomColumns(customColumns)));
   }
-  window.localStorage.setItem(storageKey, JSON.stringify(customColumns));
-  return Promise.resolve(dispatch(actions6.setCustomColumns(customColumns)));
-});
+);
 var userActions = {
   add: {
     successMessage: "The user was added successfully.",
@@ -1983,34 +2032,34 @@ var userActions = {
   }
 };
 var userActionErrorHandler = (err, type, dispatch) => commonErrorHandler(err, `There was an error ${userActions[type].errorMessage} the user.`, dispatch);
-var createUser = createAsyncThunk5(
+var createUser = createAppAsyncThunk(
   `${sliceName6}/createUser`,
-  ({ 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))
+  ({ shouldResetPassword, ...userData }, { dispatch }) => general_api_default.post(`${useradmApiUrl}/users`, { ...userData, send_reset_password: shouldResetPassword }).then(() => Promise.all([dispatch(getUserList()), dispatch(setSnackbar4(userActions.create.successMessage))])).catch((err) => userActionErrorHandler(err, "create", dispatch))
 );
-var removeUser = createAsyncThunk5(
+var removeUser = createAppAsyncThunk(
   `${sliceName6}/removeUser`,
-  (userId, { dispatch }) => general_api_default.delete(`${useradmApiUrlv1}/users/${userId}`).then(() => Promise.all([dispatch(actions6.removedUser(userId)), dispatch(getUserList()), dispatch(setSnackbar4(userActions.remove.successMessage))])).catch((err) => userActionErrorHandler(err, "remove", dispatch))
+  (userId, { dispatch }) => general_api_default.delete(`${useradmApiUrl}/users/${userId}`).then(() => Promise.all([dispatch(actions6.removedUser(userId)), dispatch(getUserList()), dispatch(setSnackbar4(userActions.remove.successMessage))])).catch((err) => userActionErrorHandler(err, "remove", dispatch))
 );
-var editUser = createAsyncThunk5(
+var editUser = createAppAsyncThunk(
   `${sliceName6}/editUser`,
-  ({ id, ...userData }, { dispatch, getState }) => general_api_default.put(`${useradmApiUrlv1}/users/${id}`, userData).then(
+  ({ id, ...userData }, { dispatch, getState }) => general_api_default.put(`${useradmApiUrl}/users/${id}`, userData).then(
     () => Promise.all([
       dispatch(actions6.updatedUser({ ...userData, id: id === OWN_USER_ID ? getCurrentUser(getState()).id : id })),
       dispatch(setSnackbar4(userActions.edit.successMessage))
     ])
-  )
+  ).catch((err) => userActionErrorHandler(err, "edit", dispatch))
 );
-var addUserToCurrentTenant = createAsyncThunk5(`${sliceName6}/addUserToTenant`, (userId, { dispatch, getState }) => {
+var addUserToCurrentTenant = createAppAsyncThunk(`${sliceName6}/addUserToTenant`, (userId, { dispatch, getState }) => {
   const { id } = getOrganization(getState());
-  return general_api_default.post(`${useradmApiUrlv1}/users/${userId}/assign`, { tenant_ids: [id] }).catch((err) => commonErrorHandler(err, `There was an error adding the user to your organization:`, dispatch)).then(() => Promise.all([dispatch(setSnackbar4(userActions.add.successMessage)), dispatch(getUserList())]));
+  return general_api_default.post(`${useradmApiUrl}/users/${userId}/assign`, { tenant_ids: [id] }).catch((err) => commonErrorHandler(err, `There was an error adding the user to your organization:`, dispatch)).then(() => Promise.all([dispatch(setSnackbar4(userActions.add.successMessage)), dispatch(getUserList())]));
 });
-var enableUser2fa = createAsyncThunk5(
+var enableUser2fa = createAppAsyncThunk(
   `${sliceName6}/enableUser2fa`,
-  (userId = OWN_USER_ID, { dispatch }) => general_api_default.post(`${useradmApiUrlv1}/users/${userId}/2fa/enable`).catch((err) => commonErrorHandler(err, `There was an error enabling Two Factor authentication for the user.`, dispatch)).then(() => Promise.resolve(dispatch(getUser(userId))))
+  (userId = OWN_USER_ID, { dispatch }) => general_api_default.post(`${useradmApiUrl}/users/${userId}/2fa/enable`).catch((err) => commonErrorHandler(err, `There was an error enabling Two Factor authentication for the user.`, dispatch)).then(() => Promise.resolve(dispatch(getUser(userId))))
 );
-var disableUser2fa = createAsyncThunk5(
+var disableUser2fa = createAppAsyncThunk(
   `${sliceName6}/disableUser2fa`,
-  (userId = OWN_USER_ID, { dispatch }) => general_api_default.post(`${useradmApiUrlv1}/users/${userId}/2fa/disable`).catch((err) => commonErrorHandler(err, `There was an error disabling Two Factor authentication for the user.`, dispatch)).then(() => Promise.all([dispatch(getUser(userId)), dispatch(actions6.receivedQrCode(null))]))
+  (userId = OWN_USER_ID, { dispatch }) => general_api_default.post(`${useradmApiUrl}/users/${userId}/2fa/disable`).catch((err) => commonErrorHandler(err, `There was an error disabling Two Factor authentication for the user.`, dispatch)).then(() => Promise.all([dispatch(getUser(userId)), dispatch(actions6.receivedQrCode(null))]))
 );
 var mapHttpPermission = (permission) => Object.entries(uiPermissionsByArea).reduce(
   (accu, [area, definition]) => {
@@ -2050,7 +2099,7 @@ var permissionActionTypes = {
   } : {}
 };
 var combinePermissions = (existingPermissions, additionalPermissions = {}) => Object.entries(additionalPermissions).reduce((accu, [name, permissions]) => {
-  let maybeExistingPermissions = accu[name] || [];
+  const maybeExistingPermissions = accu[name] || [];
   accu[name] = [...permissions, ...maybeExistingPermissions].filter(duplicateFilter);
   return accu;
 }, existingPermissions);
@@ -2060,7 +2109,7 @@ var tryParseCustomPermission = (permission) => {
   return { isCustom: true, permission, result };
 };
 var customPermissionHandler = (accu, permission) => {
-  let processor = tryParseCustomPermission(permission);
+  const processor = tryParseCustomPermission(permission);
   return {
     ...accu,
     isCustom: accu.isCustom || processor.isCustom,
@@ -2068,7 +2117,7 @@ var customPermissionHandler = (accu, permission) => {
   };
 };
 var mapPermissionSet = (permissionSetName, names, scope, existingGroupsPermissions = {}) => {
-  const permission = Object.values(uiPermissionsById).find((permission2) => permission2.permissionSets[scope] === permissionSetName).value;
+  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]) => ({ ...accu, [key]: deriveImpliedAreaPermissions(scope, permissions) }), {});
 };
@@ -2081,16 +2130,21 @@ var isEmptyPermissionSet = (permissionSet) => !Object.values(permissionSet).redu
 var parseRolePermissions = ({ permission_sets_with_scope = [], permissions = [] }, permissionSets) => {
   const preliminaryResult = permission_sets_with_scope.reduce(
     (accu, permissionSet) => {
-      let processor = permissionSets[permissionSet.name];
+      const processor = permissionSets[permissionSet.name];
       if (!processor) {
         return accu;
       }
       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]);
+        const result = mapPermissionSet(
+          permissionSet.name,
+          permissionSet.scope.value,
+          scope,
+          accu.uiPermissions[scope]
+        );
         return { ...accu, uiPermissions: { ...accu.uiPermissions, [scope]: result } };
       } else if (isEmptyPermissionSet(processor.result)) {
-        return processor.permissions.reduce(customPermissionHandler, accu);
+        return processor.permissions?.reduce(customPermissionHandler, accu);
       }
       return {
         ...accu,
@@ -2131,7 +2185,7 @@ var normalizeRbacRoles = (roles, rolesById2, permissionSets) => roles.reduce(
   },
   { ...rolesById2 }
 );
-var getPermissionSets = createAsyncThunk5(
+var getPermissionSets = createAppAsyncThunk(
   `${sliceName6}/getPermissionSets`,
   (_, { dispatch, getState }) => general_api_default.get(`${useradmApiUrlv2}/permission_sets?per_page=500`).then(({ data }) => {
     const permissionSets = data.reduce(
@@ -2157,7 +2211,10 @@ var getPermissionSets = createAsyncThunk5(
           return accu2;
         }, []);
         permissionSetObject = scopes.reduce((accu2, scope) => {
-          accu2.result[scope] = mapPermissionSet(permissionSetObject.name, [scopedPermissionAreas[scope].excessiveAccessSelector], scope);
+          accu2.result = {
+            ...accu2.result,
+            [scope]: mapPermissionSet(permissionSetObject.name, [scopedPermissionAreas[scope].excessiveAccessSelector], scope)
+          };
           return accu2;
         }, permissionSetObject);
         accu[permissionSet.name] = permissionSetObject;
@@ -2168,7 +2225,7 @@ var getPermissionSets = createAsyncThunk5(
     return Promise.all([dispatch(actions6.receivedPermissionSets(permissionSets)), permissionSets]);
   }).catch(() => console.log("Permission set retrieval failed - likely accessing a non-RBAC backend"))
 );
-var getRoles = createAsyncThunk5(
+var getRoles = createAppAsyncThunk(
   `${sliceName6}/getRoles`,
   (_, { dispatch, getState }) => Promise.all([general_api_default.get(`${useradmApiUrlv2}/roles?per_page=500`), dispatch(getPermissionSets())]).then((results) => {
     if (!results) {
@@ -2177,7 +2234,7 @@ var getRoles = createAsyncThunk5(
     const [{ data: roles }, { payload: permissionSetTasks }] = results;
     const rolesById2 = normalizeRbacRoles(roles, getRolesById(getState()), permissionSetTasks[permissionSetTasks.length - 1]);
     return Promise.resolve(dispatch(actions6.receivedRoles(rolesById2)));
-  }).catch(() => console.log("Role retrieval failed - likely accessing a non-RBAC backend"))
+  }).catch(() => console.log("Role retrieval failed - likely accessing a non-RBAC backend")).finally(() => Promise.resolve(dispatch(actions6.finishedRoleInitialization(true))))
 );
 var deriveImpliedAreaPermissions = (area, areaPermissions, skipPermissions = []) => {
   const highestAreaPermissionLevelSelected = areaPermissions.reduce(
@@ -2247,7 +2304,13 @@ var transformRoleDataToRole = (roleData, roleState = {}) => {
     if (!uiPermissions[key]) {
       return accu;
     }
-    accu.push(...transformAreaRoleDataToScopedPermissionsSets(key, uiPermissions[key], excessiveAccessSelector));
+    accu.push(
+      ...transformAreaRoleDataToScopedPermissionsSets(
+        key,
+        uiPermissions[key],
+        excessiveAccessSelector
+      )
+    );
     return accu;
   }, []);
   return {
@@ -2255,7 +2318,7 @@ var transformRoleDataToRole = (roleData, roleState = {}) => {
     role: {
       ...emptyRole,
       name,
-      description: description ? description : roleState.description,
+      description: description ? description : roleState.description || "",
       uiPermissions: {
         ...emptyUiPermissions,
         ...roleUiPermissions,
@@ -2278,50 +2341,57 @@ var roleActions = {
     errorMessage: "removing"
   }
 };
-var roleActionErrorHandler = (err, type, dispatch) => commonErrorHandler(err, `There was an error ${roleActions[type].errorMessage} the role.`, dispatch);
-var createRole = createAsyncThunk5(`${sliceName6}/createRole`, (roleData, { dispatch }) => {
+var roleActionErrorHandler = (err, type, dispatch, meta) => {
+  let errorContext = `There was an error ${roleActions[type].errorMessage} the role.`;
+  if (meta) {
+    const { permissionSetsCreated, name } = meta;
+    errorContext += ` Tried to ${type} role ${name} with ${permissionSetsCreated} permission sets.`;
+  }
+  return commonErrorHandler(err, errorContext, dispatch);
+};
+var createRole = createAppAsyncThunk(`${sliceName6}/createRole`, (roleData, { dispatch }) => {
   const { permissionSetsWithScope, role } = transformRoleDataToRole(roleData);
   return general_api_default.post(`${useradmApiUrlv2}/roles`, {
     name: role.name,
     description: role.description,
     permission_sets_with_scope: permissionSetsWithScope
-  }).then(() => Promise.all([dispatch(actions6.createdRole(role)), dispatch(getRoles()), dispatch(setSnackbar4(roleActions.create.successMessage))])).catch((err) => roleActionErrorHandler(err, "create", dispatch));
+  }).then(() => Promise.all([dispatch(actions6.createdRole(role)), dispatch(getRoles()), dispatch(setSnackbar4(roleActions.create.successMessage))])).catch((err) => roleActionErrorHandler(err, "create", dispatch, { permissionSetsCreated: permissionSetsWithScope.length, name: role.name }));
 });
-var editRole = createAsyncThunk5(`${sliceName6}/editRole`, (roleData, { dispatch, getState }) => {
+var editRole = createAppAsyncThunk(`${sliceName6}/editRole`, (roleData, { dispatch, getState }) => {
   const { permissionSetsWithScope, role } = transformRoleDataToRole(roleData, getRolesById(getState())[roleData.name]);
   return general_api_default.put(`${useradmApiUrlv2}/roles/${role.name}`, {
     description: role.description,
     name: role.name,
     permission_sets_with_scope: permissionSetsWithScope
-  }).then(() => Promise.all([dispatch(actions6.createdRole(role)), dispatch(getRoles()), dispatch(setSnackbar4(roleActions.edit.successMessage))])).catch((err) => roleActionErrorHandler(err, "edit", dispatch));
+  }).then(() => Promise.all([dispatch(actions6.createdRole(role)), dispatch(getRoles()), dispatch(setSnackbar4(roleActions.edit.successMessage))])).catch((err) => roleActionErrorHandler(err, "edit", dispatch, { permissionSetsCreated: permissionSetsWithScope.length, name: role.name }));
 });
-var removeRole = createAsyncThunk5(
+var removeRole = createAppAsyncThunk(
   `${sliceName6}/removeRole`,
   (roleId, { dispatch }) => general_api_default.delete(`${useradmApiUrlv2}/roles/${roleId}`).then(() => Promise.all([dispatch(actions6.removedRole(roleId)), dispatch(getRoles()), dispatch(setSnackbar4(roleActions.remove.successMessage))])).catch((err) => roleActionErrorHandler(err, "remove", dispatch))
 );
-var getGlobalSettings2 = createAsyncThunk5(
+var getGlobalSettings2 = createAppAsyncThunk(
   `${sliceName6}/getGlobalSettings`,
-  (_, { dispatch }) => general_api_default.get(`${useradmApiUrlv1}/settings`).then(({ data: settings, headers: { etag } }) => {
-    window.sessionStorage.setItem(settingsKeys.initialized, true);
+  (_, { dispatch }) => general_api_default.get(`${useradmApiUrl}/settings`).then(({ data: settings, headers: { etag } }) => {
+    window.sessionStorage.setItem(settingsKeys.initialized, "true");
     return Promise.all([dispatch(actions6.setGlobalSettings(settings)), dispatch(setOfflineThreshold()), etag]);
   })
 );
-var saveGlobalSettings = createAsyncThunk5(
+var saveGlobalSettings = createAppAsyncThunk(
   `${sliceName6}/saveGlobalSettings`,
   ({ beOptimistic = false, notify = false, ...settings }, { dispatch, getState }) => {
     if (!window.sessionStorage.getItem(settingsKeys.initialized) && !beOptimistic) {
       return;
     }
     return dispatch(getGlobalSettings2()).unwrap().then((result) => {
-      let updatedSettings = { ...getState().users.globalSettings, ...settings };
+      const updatedSettings = { ...getState().users.globalSettings, ...settings };
       if (getCurrentUser(getState()).verified) {
         updatedSettings["2fa"] = twoFAStates.enabled;
       } else {
         delete updatedSettings["2fa"];
       }
-      let tasks = [dispatch(actions6.setGlobalSettings(updatedSettings))];
+      const tasks = [dispatch(actions6.setGlobalSettings(updatedSettings))];
       const headers = result[result.length - 1] ? { "If-Match": result[result.length - 1] } : {};
-      return general_api_default.post(`${useradmApiUrlv1}/settings`, updatedSettings, { headers }).then(() => {
+      return general_api_default.post(`${useradmApiUrl}/settings`, updatedSettings, { headers }).then(() => {
         if (notify) {
           tasks.push(dispatch(setSnackbar4("Settings saved successfully")));
         }
@@ -2336,54 +2406,59 @@ var saveGlobalSettings = createAsyncThunk5(
     });
   }
 );
-var getUserSettings2 = createAsyncThunk5(
+var getUserSettings2 = createAppAsyncThunk(
   `${sliceName6}/getUserSettings`,
-  (_, { dispatch }) => general_api_default.get(`${useradmApiUrlv1}/settings/me`).then(({ data: settings, headers: { etag } }) => {
-    window.sessionStorage.setItem(settingsKeys.initialized, true);
+  (_, { dispatch }) => general_api_default.get(`${useradmApiUrl}/settings/me`).then(({ data: settings, headers: { etag } }) => {
+    window.sessionStorage.setItem(settingsKeys.initialized, "true");
     return Promise.all([dispatch(actions6.setUserSettings(settings)), etag]);
   })
 );
-var saveUserSettings = createAsyncThunk5(`${sliceName6}/saveUserSettings`, (settings = { onboarding: {} }, { dispatch, getState }) => {
-  if (!getCurrentUser(getState()).id) {
-    return Promise.resolve();
+var saveUserSettings = createAppAsyncThunk(
+  `${sliceName6}/saveUserSettings`,
+  (settings = { onboarding: {} }, { dispatch, getState }) => {
+    if (!getCurrentUser(getState()).id) {
+      return Promise.resolve();
+    }
+    return dispatch(getUserSettings2()).unwrap().then((result) => {
+      const userSettings = getUserSettings(getState());
+      const onboardingState = getOnboardingState(getState());
+      const tooltipState = getTooltipsState(getState());
+      const updatedSettings = {
+        ...userSettings,
+        ...settings,
+        onboarding: {
+          ...onboardingState,
+          ...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))),
+        general_api_default.post(`${useradmApiUrl}/settings/me`, updatedSettings, { headers })
+      ]).catch(() => dispatch(actions6.setUserSettings(userSettings)));
+    });
   }
-  return dispatch(getUserSettings2()).unwrap().then((result) => {
-    const userSettings = getUserSettings(getState());
-    const onboardingState = getOnboardingState(getState());
-    const tooltipState = getTooltipsState(getState());
-    const updatedSettings = {
-      ...userSettings,
-      ...settings,
-      onboarding: {
-        ...onboardingState,
-        ...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))),
-      general_api_default.post(`${useradmApiUrlv1}/settings/me`, updatedSettings, { headers })
-    ]).catch(() => dispatch(actions6.setUserSettings(userSettings)));
-  });
-});
-var get2FAQRCode = createAsyncThunk5(
+);
+var get2FAQRCode = createAppAsyncThunk(
   `${sliceName6}/get2FAQRCode`,
-  (_, { dispatch }) => general_api_default.get(`${useradmApiUrlv1}/2faqr`).then((res) => dispatch(actions6.receivedQrCode(res.data.qr)))
-);
-var setHideAnnouncement = createAsyncThunk5(`${sliceName6}/setHideAnnouncement`, ({ shouldHide, userId }, { dispatch, getState }) => {
-  const currentUserId = userId || getCurrentUser(getState()).id;
-  const hash = getState().app.hostedAnnouncement ? hashString2(getState().app.hostedAnnouncement) : "";
-  const announceCookie = cookies3.get(`${currentUserId}${hash}`);
-  if (shouldHide || hash.length && typeof announceCookie !== "undefined") {
-    cookies3.set(`${currentUserId}${hash}`, true, { maxAge: 604800 });
-    return Promise.resolve(dispatch(setAnnouncement2()));
+  (_, { dispatch }) => general_api_default.get(`${useradmApiUrl}/2faqr`).then((res) => dispatch(actions6.receivedQrCode(res.data.qr)))
+);
+var setHideAnnouncement = createAppAsyncThunk(
+  `${sliceName6}/setHideAnnouncement`,
+  ({ shouldHide, userId }, { dispatch, getState }) => {
+    const currentUserId = userId || getCurrentUser(getState()).id;
+    const hash = getState().app.hostedAnnouncement ? hashString2(getState().app.hostedAnnouncement) : "";
+    const announceCookie = cookies3.get(`${currentUserId}${hash}`);
+    if (shouldHide || hash.length && typeof announceCookie !== "undefined") {
+      cookies3.set(`${currentUserId}${hash}`, true, { maxAge: 604800 });
+      dispatch(setAnnouncement2(""));
+    }
   }
-  return Promise.resolve();
-});
-var getTokens = createAsyncThunk5(
+);
+var getTokens = createAppAsyncThunk(
   `${sliceName6}/getTokens`,
-  (_, { dispatch, getState }) => general_api_default.get(`${useradmApiUrlv1}/settings/tokens`).then(({ data: tokens }) => {
+  (_, { dispatch, getState }) => general_api_default.get(`${useradmApiUrl}/settings/tokens`).then(({ data: tokens }) => {
     const user = getCurrentUser(getState());
     const updatedUser = {
       ...user,
@@ -2393,26 +2468,31 @@ var getTokens = createAsyncThunk5(
   })
 );
 var ONE_YEAR = 31536e3;
-var generateToken = createAsyncThunk5(
+var generateToken = createAppAsyncThunk(
   `${sliceName6}/generateToken`,
-  ({ expiresIn = ONE_YEAR, name }, { dispatch }) => general_api_default.post(`${useradmApiUrlv1}/settings/tokens`, { name, expires_in: expiresIn }).then(({ data: token }) => Promise.all([dispatch(getTokens()), token])).catch((err) => commonErrorHandler(err, "There was an error creating the token:", dispatch))
+  ({ expiresIn = ONE_YEAR, name }, { dispatch }) => general_api_default.post(`${useradmApiUrl}/settings/tokens`, { name, expires_in: expiresIn }).then(({ data: token }) => Promise.all([dispatch(getTokens()), token])).catch((err) => commonErrorHandler(err, "There was an error creating the token:", dispatch))
 );
-var revokeToken = createAsyncThunk5(
+var revokeToken = createAppAsyncThunk(
   `${sliceName6}/revokeToken`,
-  (token, { dispatch }) => general_api_default.delete(`${useradmApiUrlv1}/settings/tokens/${token.id}`).then(() => Promise.resolve(dispatch(getTokens())))
+  (token, { dispatch }) => general_api_default.delete(`${useradmApiUrl}/settings/tokens/${token.id}`).then(() => Promise.resolve(dispatch(getTokens())))
+);
+var setTooltipReadState = createAppAsyncThunk(
+  `${sliceName6}/setTooltipReadState`,
+  async ({ persist, ...remainder }, { dispatch }) => {
+    dispatch(actions6.setTooltipState(remainder));
+    if (persist) {
+      await dispatch(saveUserSettings());
+    }
+  }
 );
-var setTooltipReadState = createAsyncThunk5(`${sliceName6}/setTooltipReadState`, ({ persist, ...remainder }, { dispatch }) => {
-  let tasks = [dispatch(actions6.setTooltipState(remainder))];
-  if (persist) {
-    tasks.push(dispatch(saveUserSettings()));
+var setAllTooltipsReadState = createAppAsyncThunk(
+  `${sliceName6}/toggleHelptips`,
+  ({ readState = READ_STATES.read, tooltipIds }, { dispatch }) => {
+    const updatedTips = tooltipIds.reduce((accu, id) => ({ ...accu, [id]: { readState } }), {});
+    return Promise.resolve(dispatch(actions6.setTooltipsState(updatedTips))).then(() => dispatch(saveUserSettings()));
   }
-  return Promise.all(tasks);
-});
-var setAllTooltipsReadState = createAsyncThunk5(`${sliceName6}/toggleHelptips`, (readState = READ_STATES.read, { dispatch }) => {
-  const updatedTips = Object.keys(HELPTOOLTIPS).reduce((accu, id) => ({ ...accu, [id]: { readState } }), {});
-  return Promise.resolve(dispatch(actions6.setTooltipsState(updatedTips))).then(() => dispatch(saveUserSettings()));
-});
-var submitFeedback = createAsyncThunk5(
+);
+var submitFeedback = createAppAsyncThunk(
   `${sliceName6}/submitFeedback`,
   ({ satisfaction, feedback, ...meta }, { dispatch }) => general_api_default.post(`${tenantadmApiUrlv2}/contact/support`, {
     subject: "feedback submission",
@@ -2425,11 +2505,8 @@ var submitFeedback = createAsyncThunk5(
 );
 
 // src/appSlice/thunks.ts
-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();
-var setFirstLoginAfterSignup = createAsyncThunk6(`${sliceName}/setFirstLoginAfterSignup`, (firstLoginAfterSignup, { dispatch }) => {
+var setFirstLoginAfterSignup = createAppAsyncThunk(`${sliceName}/setFirstLoginAfterSignup`, (firstLoginAfterSignup, { dispatch }) => {
   cookies4.set("firstLoginAfterSignup", !!firstLoginAfterSignup, { maxAge: 60, path: "/", domain: ".mender.io", sameSite: false });
   dispatch(actions.setFirstLoginAfterSignup(!!firstLoginAfterSignup));
 });
@@ -2437,7 +2514,7 @@ var dateFunctionMap = {
   getDays: "getDate",
   setDays: "setDate"
 };
-var setOfflineThreshold = createAsyncThunk6(`${sliceName}/setOfflineThreshold`, (_, { dispatch, getState }) => {
+var setOfflineThreshold = createAppAsyncThunk(`${sliceName}/setOfflineThreshold`, (_, { dispatch, getState }) => {
   const { interval, intervalUnit } = getOfflineThresholdSettings(getState());
   const today = /* @__PURE__ */ new Date();
   const intervalName = `${intervalUnit.charAt(0).toUpperCase()}${intervalUnit.substring(1)}`;
@@ -2462,12 +2539,11 @@ var repoKeyMap = {
   mender: "Mender-Client",
   "mender-artifact": "Mender-Artifact"
 };
-var deductSaasState = (latestRelease, guiTags, saasReleases) => {
+var deductSaasState = (latestRelease, guiTags) => {
   const latestGuiTag = guiTags.length ? guiTags[0].name : "";
-  const latestSaasRelease = latestGuiTag.startsWith("saas-v") ? { date: latestGuiTag.split("-v")[1].replaceAll(".", "-"), tag: latestGuiTag } : saasReleases[0];
-  return latestSaasRelease.date > latestRelease.release_date ? latestSaasRelease.tag : latestRelease.release;
+  return latestGuiTag ? latestGuiTag : latestRelease.release;
 };
-var getLatestReleaseInfo = createAsyncThunk6(`${sliceName}/getLatestReleaseInfo`, (_, { dispatch, getState }) => {
+var getLatestReleaseInfo = createAppAsyncThunk(`${sliceName}/getLatestReleaseInfo`, (_, { dispatch, getState }) => {
   if (!getFeatures(getState()).isHosted) {
     return Promise.resolve();
   }
@@ -2478,7 +2554,7 @@ var getLatestReleaseInfo = createAsyncThunk6(`${sliceName}/getLatestReleaseInfo`
     if (!guiTags.length) {
       return Promise.resolve();
     }
-    const { releases, saas } = data;
+    const { releases } = data;
     const latestRelease = getLatestRelease(getLatestRelease(releases));
     const { latestRepos, latestVersions } = latestRelease.repos.reduce(
       (accu, item) => {
@@ -2490,13 +2566,12 @@ var getLatestReleaseInfo = createAsyncThunk6(`${sliceName}/getLatestReleaseInfo`
       },
       { latestVersions: { ...getState().app.versionInformation }, latestRepos: {} }
     );
-    const info = deductSaasState(latestRelease, guiTags, saas);
+    const info = deductSaasState(latestRelease, guiTags);
     return Promise.resolve(
       dispatch(
         actions.setVersionInformation({
           ...latestVersions,
-          backend: info,
-          GUI: info,
+          Server: info,
           latestRelease: {
             releaseDate: latestRelease.release_date,
             repos: latestRepos
@@ -2506,9 +2581,9 @@ var getLatestReleaseInfo = createAsyncThunk6(`${sliceName}/getLatestReleaseInfo`
     );
   });
 });
-var setSearchState = createAsyncThunk6(`${sliceName}/setSearchState`, (searchState, { dispatch, getState }) => {
+var setSearchState = createAppAsyncThunk(`${sliceName}/setSearchState`, (searchState, { dispatch, getState }) => {
   const currentState = getSearchState(getState());
-  let nextState = {
+  const nextState = {
     ...currentState,
     ...searchState,
     sort: {
@@ -2516,7 +2591,7 @@ var setSearchState = createAsyncThunk6(`${sliceName}/setSearchState`, (searchSta
       ...searchState.sort
     }
   };
-  let tasks = [];
+  const tasks = [];
   const { isSearching: currentSearching, deviceIds: currentDevices, searchTotal: currentTotal, ...currentRequestState } = currentState;
   const { isSearching: nextSearching, deviceIds: nextDevices, searchTotal: nextTotal, ...nextRequestState } = nextState;
   if (nextRequestState.searchTerm && !deepCompare4(currentRequestState, nextRequestState)) {
@@ -2550,7 +2625,7 @@ export {
   setDeploymentsState,
   getDeploymentsConfig,
   saveDeltaDeploymentsConfig,
-  getGroups2 as getGroups,
+  getGroups,
   addDevicesToGroup,
   removeDevicesFromGroup,
   addStaticGroup,
@@ -2565,7 +2640,6 @@ export {
   getAllDynamicGroupDevices,
   getDeviceById2 as getDeviceById,
   getDeviceInfo,
-  deriveInactiveDevices,
   getDeviceCount,
   getAllDeviceCounts,
   getDeviceLimit,
@@ -2574,11 +2648,8 @@ export {
   getAllDevicesByStatus,
   searchDevices,
   getDeviceAttributes,
-  getReportingLimits,
-  ensureVersionString,
-  getReportsData,
-  deriveReportsData,
-  getReportsDataWithoutBackendSupport,
+  updateReportData,
+  getReportDataWithoutBackendSupport,
   getDeviceConnect,
   triggerDeviceUpdate,
   getSessionDetails,
@@ -2599,7 +2670,6 @@ export {
   setDeviceTwin,
   getSystemDevices,
   getGatewayDevices,
-  getDevicesInBounds,
   getOnboardingState2 as getOnboardingState,
   setOnboardingDeviceType,
   setOnboardingApproach,
@@ -2623,8 +2693,15 @@ export {
   getTenants,
   setTenantsListState,
   editTenantDeviceLimit,
+  editBillingProfile,
+  createBillingProfile,
   removeTenant,
   getUserOrganization,
+  getUserBilling,
+  getUserSubscription,
+  getBillingPreview,
+  getCurrentSubscription,
+  requestPlanUpgrade,
   sendSupportMessage,
   requestPlanChange,
   downloadLicenseReport,
@@ -2675,4 +2752,4 @@ export {
   setAllTooltipsReadState,
   submitFeedback
 };
-//# sourceMappingURL=chunk-EQLHIPPR.js.map
+//# sourceMappingURL=chunk-ZN5TB2NJ.js.map