@northern.tech/store 0.3.2 → 0.3.4

package/dist/storehooks.cjs

@@ -35,14 +35,22 @@ __export(storehooks_exports, {
 });
 module.exports = __toCommonJS(storehooks_exports);
 var import_react = require("react");
-var import_react_redux = require("react-redux");
-var import_helpers14 = require("@northern.tech/utils/helpers");
+var import_react_redux2 = require("react-redux");
+var import_helpers15 = require("@northern.tech/utils/helpers");
 var import_dayjs = __toESM(require("dayjs"), 1);
-var import_duration = __toESM(require("dayjs/plugin/duration.js"), 1);
+var import_duration = __toESM(require("dayjs/plugin/duration"), 1);
 var import_universal_cookie6 = __toESM(require("universal-cookie"), 1);
 
 // src/appSlice/constants.ts
 var import_icons_material = require("@mui/icons-material");
+
+// ../../assets/img/flag-eu.svg
+var flag_eu_default = "./flag-eu-5477R2P4.svg";
+
+// ../../assets/img/flag-us.svg
+var flag_us_default = "./flag-us-HNQAF66I.svg";
+
+// src/appSlice/constants.ts
 var startingDeviceCount = {
   os: "for first 50 devices",
   professional: "for first 250 devices"
@@ -65,36 +73,36 @@ var emptyChartSelection = { software: "", group: "", chartType: chartTypes.bar.k
 var defaultReportType = "distribution";
 var defaultReports = [{ ...emptyChartSelection, group: null, attribute: "artifact_name", type: defaultReportType }];
 var locations = {
-  eu: { key: "eu", title: "EU", location: "eu.hosted.mender.io" },
-  us: { key: "us", title: "US", location: "hosted.mender.io" }
+  eu: { key: "eu", title: "EU", location: "eu.hosted.mender.io", icon: flag_eu_default },
+  us: { key: "us", title: "US", location: "hosted.mender.io", icon: flag_us_default }
 };
 var PLANS = {
   os: {
     id: "os",
     name: "Basic",
     offer: true,
-    price: "$32/month",
+    price: "$32 / month",
     deviceCount: startingDeviceCount.os,
-    offerprice: "$23/month for first 50 devices",
+    offerprice: "$23 / month for first 50 devices",
     price2: "for first 6 months;\n$29/month thereafter",
-    features: ["Basic OTA features"]
+    features: ["Access to core features of Mender", "Basic support"]
   },
   professional: {
     id: "professional",
     name: "Professional",
     offer: true,
-    price: "$269/month",
+    price: "$269 / month",
     deviceCount: startingDeviceCount.professional,
-    offerprice: "$200/month for first 50 devices",
+    offerprice: "$200 / month for first 50 devices",
     price2: "for first 6 months;\n$249/month thereafter",
-    features: ["+ Advanced OTA features", "+ Standard support"]
+    features: ["Advanced OTA features", "Higher priority support"]
   },
   enterprise: {
     id: "enterprise",
     name: "Enterprise",
     price: "Custom pricing",
-    deviceCount: "unlimited devices",
-    features: ["+ Enterprise-grade OTA features", "+ Premium support"]
+    deviceCount: "Unlimited devices",
+    features: ["All Mender features", "Advanced security features", "SLA-backed support"]
   }
 };
 var ADDONS = {
@@ -565,6 +573,7 @@ var DEVICE_STATES = {
   rejected: "rejected"
 };
 var geoAttributes = ["geo-lat", "geo-lon"].map((attribute) => ({ attribute, scope: "inventory" }));
+var REPORT_CHART_SIZE_LIMIT = 6;
 
 // src/monitorSlice/constants.ts
 var alertChannels = { email: "email" };
@@ -646,13 +655,16 @@ var SSO_TYPES = {
     configDetails: [{ key: "startURL", label: "Start Url", getValue: getOidcStartUrl }]
   }
 };
-var AUDIT_LOGS_TYPES = [
-  { title: "Artifact", queryParameter: "object_type", value: "artifact" },
-  { title: "Deployment", queryParameter: "object_deployment_name", value: "deployment" },
-  { title: "Device", queryParameter: "object_id", value: "device" },
-  { title: "User", queryParameter: "object_id", value: "user" }
-];
-var SP_AUDIT_LOGS_TYPES = [AUDIT_LOGS_TYPES[3], { title: "Tenant", queryParameter: "object_id", value: "tenant" }];
+var auditlogTypes = {
+  artifact: { title: "Artifact", queryParameter: "object_type", value: "artifact" },
+  deployment: { title: "Deployment", queryParameter: "object_deployment_name", value: "deployment" },
+  device: { title: "Device", queryParameter: "object_id", value: "device" },
+  user_access_token: { title: "Personal Access Token", queryParameter: "user_access_token", value: "user_access_token" },
+  user: { title: "User", queryParameter: "object_id", value: "user" },
+  tenant: { title: "Tenant", queryParameter: "object_id", value: "tenant" }
+};
+var AUDIT_LOGS_TYPES = [auditlogTypes.artifact, auditlogTypes.deployment, auditlogTypes.device, auditlogTypes.user_access_token, auditlogTypes.user];
+var SP_AUDIT_LOGS_TYPES = [auditlogTypes.user, auditlogTypes.tenant];
 var emptyWebhook = {
   description: "",
   enabled: true,
@@ -786,7 +798,7 @@ var uiPermissionsByArea = {
     explanation: "Granting access to the audit log will allow tracing changes to devices, releases and user accounts, as well as providing information about deployments.",
     key: "auditlog",
     uiPermissions: [uiPermissionsById.read],
-    title: "System audit log"
+    title: "System Audit Log"
   },
   deployments: {
     endpoints: [
@@ -937,7 +949,7 @@ var serviceProviderRolesById = {
   },
   readOnly: {
     name: "Read access",
-    value: staticRolesByName.admin,
+    value: staticRolesByName.readOnly,
     description: "This role can see all linked organizations but cannot make any changes",
     permissions: [],
     uiPermissions: {
@@ -1195,9 +1207,7 @@ var appSlice = (0, import_toolkit.createSlice)({
         ...action.payload
       };
     },
-    setEnvironmentData: (state, action) => {
-      return { ...state, ...action.payload };
-    }
+    setEnvironmentData: (state, action) => ({ ...state, ...action.payload })
   }
 });
 var actions = appSlice.actions;
@@ -1572,9 +1582,7 @@ var onboardingSlice = (0, import_toolkit5.createSlice)({
   name: sliceName5,
   initialState: initialState5,
   reducers: {
-    setOnboardingState: (state, action) => {
-      return { ...state, ...action.payload };
-    },
+    setOnboardingState: (state, action) => ({ ...state, ...action.payload }),
     setDemoArtifactPort: (state, action) => {
       state.demoArtifactPort = action.payload;
     },
@@ -2102,7 +2110,7 @@ var getGroups = (0, import_toolkit11.createSelector)([getGroupsById], (groupsByI
     (accu, [groupname, group]) => {
       const name = groupname === UNGROUPED_GROUP.id ? UNGROUPED_GROUP.name : groupname;
       const groupItem = { ...group, groupId: name, name: groupname };
-      if (group.filters.length > 0) {
+      if (group.filters?.length > 0) {
         if (groupname !== UNGROUPED_GROUP.id) {
           accu.dynamic.push(groupItem);
         } else {
@@ -2177,14 +2185,15 @@ var getAuditLogEntry = (0, import_toolkit12.createSelector)([getAuditLog, getAud
 // src/utils.ts
 var import_helpers4 = require("@northern.tech/utils/helpers");
 var filterProcessors = {
-  $gt: (val) => Number(val) || val,
-  $gte: (val) => Number(val) || val,
-  $lt: (val) => Number(val) || val,
-  $lte: (val) => Number(val) || val,
-  $in: (val) => ("" + val).split(",").map((i) => i.trim()),
-  $nin: (val) => ("" + val).split(",").map((i) => i.trim()),
-  $exists: import_helpers4.yes,
-  $nexists: () => false
+  [DEVICE_FILTERING_OPTIONS.$gt.key]: (val) => Number(val) || val,
+  [DEVICE_FILTERING_OPTIONS.$gte.key]: (val) => Number(val) || val,
+  [DEVICE_FILTERING_OPTIONS.$lt.key]: (val) => Number(val) || val,
+  [DEVICE_FILTERING_OPTIONS.$lte.key]: (val) => Number(val) || val,
+  [DEVICE_FILTERING_OPTIONS.$ltne.key]: (val) => Number(val) || val,
+  [DEVICE_FILTERING_OPTIONS.$in.key]: (val) => ("" + val).split(",").map((i) => i.trim()),
+  [DEVICE_FILTERING_OPTIONS.$nin.key]: (val) => ("" + val).split(",").map((i) => i.trim()),
+  [DEVICE_FILTERING_OPTIONS.$exists.key]: import_helpers4.yes,
+  [DEVICE_FILTERING_OPTIONS.$nexists.key]: () => false
 };
 var filterAliases = {
   $nexists: { alias: DEVICE_FILTERING_OPTIONS.$exists.key, value: false }
@@ -2228,14 +2237,12 @@ var filtersFilter = (item, index, array) => {
   const firstIndex = array.findIndex((filter) => filterCompare(filter, item));
   return firstIndex === index;
 };
-var listItemMapper = (byId, ids, { defaultObject = {}, cutOffSize = DEVICE_LIST_MAXIMUM_LENGTH }) => {
-  return ids.slice(0, cutOffSize).reduce((accu, id) => {
-    if (id && byId[id]) {
-      accu.push({ ...defaultObject, ...byId[id] });
-    }
-    return accu;
-  }, []);
-};
+var listItemMapper = (byId, ids, { defaultObject = {}, cutOffSize = DEVICE_LIST_MAXIMUM_LENGTH }) => ids.slice(0, cutOffSize).reduce((accu, id) => {
+  if (id && byId[id]) {
+    accu.push({ ...defaultObject, ...byId[id] });
+  }
+  return accu;
+}, []);
 var mergePermissions = (existingPermissions = { ...emptyUiPermissions }, addedPermissions) => Object.entries(existingPermissions).reduce(
   (accu, [key, value]) => {
     let values;
@@ -2327,8 +2334,13 @@ var getTooltipsById = (state) => state.users.tooltips.byId;
 var getGlobalSettings = (state) => state.users.globalSettings;
 var getCurrentUserId = (state) => state.users.currentUser;
 var getUsersById = (state) => state.users.byId;
+var getUsersList = (0, import_toolkit14.createSelector)([getUsersById], (usersById) => Object.values(usersById));
 var getCurrentUser = (0, import_toolkit14.createSelector)([getUsersById, getCurrentUserId], (usersById, userId) => usersById[userId] ?? {});
 var getUserSettings = (state) => state.users.userSettings;
+var getSelectedDeviceAttribute = (0, import_toolkit14.createSelector)(
+  [getUserSettings],
+  ({ columnSelection }) => columnSelection.map((attribute) => ({ attribute: attribute.key, scope: attribute.scope }))
+);
 var getIsDarkMode = (0, import_toolkit14.createSelector)([getUserSettings], ({ mode }) => isDarkMode(mode));
 var getShowHelptips = (0, import_toolkit14.createSelector)(
   [getTooltipsById],
@@ -2353,7 +2365,7 @@ var getOfflineThresholdSettings = (0, import_toolkit14.createSelector)([getGloba
   interval: offlineThreshold?.interval || DEVICE_ONLINE_CUTOFF.interval,
   intervalUnit: offlineThreshold?.intervalUnit || DEVICE_ONLINE_CUTOFF.intervalName
 }));
-var getRolesList = (0, import_toolkit14.createSelector)([getRolesById], (rolesById2) => Object.entries(rolesById2).map(([id, role]) => ({ id, ...role })));
+var getRolesList = (0, import_toolkit14.createSelector)([getRolesById], (rolesById2) => Object.entries(rolesById2).map(([value, role]) => ({ value, ...role })));
 var getCurrentSession = (state) => state.users.currentSession;
 
 // src/commonSelectors.ts
@@ -2415,12 +2427,18 @@ var getUserCapabilities = (0, import_toolkit15.createSelector)([getUserRoles, ge
 });
 var getTenantCapabilities = (0, import_toolkit15.createSelector)(
   [getFeatures, getOrganization, getIsEnterprise],
-  ({ hasAuditlogs: isAuditlogEnabled, hasDeviceConfig: isDeviceConfigEnabled, hasDeviceConnect: isDeviceConnectEnabled, hasMonitor: isMonitorEnabled }, { addons = [], plan = PLANS.os.id }, isEnterprise) => {
+  ({
+    hasAuditlogs: isAuditlogEnabled,
+    hasDeviceConfig: isDeviceConfigEnabled,
+    hasDeviceConnect: isDeviceConnectEnabled,
+    hasMonitor: isMonitorEnabled,
+    isHosted
+  }, { addons = [], plan = PLANS.os.id }, isEnterprise) => {
     const canDelta = isEnterprise || plan === PLANS.professional.id;
     const hasAuditlogs = isAuditlogEnabled && isEnterprise;
-    const hasDeviceConfig = isDeviceConfigEnabled && addons.some((addon) => addon.name === "configure" && Boolean(addon.enabled));
-    const hasDeviceConnect = isDeviceConnectEnabled && (!isEnterprise || addons.some((addon) => addon.name === "troubleshoot" && Boolean(addon.enabled)));
-    const hasMonitor = isMonitorEnabled && addons.some((addon) => addon.name === "monitor" && Boolean(addon.enabled));
+    const hasDeviceConfig = addons.some((addon) => addon.name === ADDONS.configure.id && addon.enabled) || isDeviceConfigEnabled && !isHosted;
+    const hasDeviceConnect = addons.some((addon) => addon.name === ADDONS.troubleshoot.id && addon.enabled) || isDeviceConnectEnabled && !isHosted;
+    const hasMonitor = isMonitorEnabled && addons.some((addon) => addon.name === ADDONS.monitor.id && addon.enabled);
     return {
       canDelta,
       canRetry: canDelta,
@@ -2524,9 +2542,7 @@ var getGroupNames = (0, import_toolkit15.createSelector)([getGroupsById, getUser
 });
 var getDeviceReportsForUser = (0, import_toolkit15.createSelector)(
   [getUserSettings, getCurrentUser, getGlobalSettings, getDevicesById],
-  ({ reports }, { id: currentUserId }, globalSettings, devicesById) => {
-    return reports || globalSettings[`${currentUserId}-reports`] || (Object.keys(devicesById).length ? defaultReports : []);
-  }
+  ({ reports }, { id: currentUserId }, globalSettings, devicesById) => reports || globalSettings[`${currentUserId}-reports`] || (Object.keys(devicesById).length ? defaultReports : [])
 );
 var listTypeDeviceIdMap = {
   deviceList: getListedDevices,
@@ -2550,7 +2566,7 @@ var getAuditlogDevice = (0, import_toolkit15.createSelector)([getAuditLogEntry,
 var getRelevantRoles = (0, import_toolkit15.createSelector)([getOrganization, getRolesList], ({ service_provider }, roles) => {
   if (service_provider) {
     return roles.reduce((accu, role) => {
-      if (rolesById[role.id]) {
+      if (rolesById[role.value]) {
         return accu;
       }
       accu.push(role);
@@ -2558,7 +2574,7 @@ var getRelevantRoles = (0, import_toolkit15.createSelector)([getOrganization, ge
     }, Object.values(serviceProviderRolesById));
   }
   return Object.keys(rolesById).reverse().reduce((accu, key) => {
-    const index = accu.findIndex(({ id }) => id === key);
+    const index = accu.findIndex(({ value }) => value === key);
     accu = [accu[index], ...accu.filter((item, itemIndex) => index !== itemIndex)];
     return accu;
   }, roles);
@@ -2711,13 +2727,12 @@ var setSearchState = (0, import_toolkit16.createAsyncThunk)(`${sliceName}/setSea
 });
 
 // src/store.ts
+var import_react_redux = require("react-redux");
 var import_helpers7 = require("@northern.tech/utils/helpers");
 var import_toolkit17 = require("@reduxjs/toolkit");
 var { setSnackbar, uploadProgress } = actions_default;
 var keys = ["sessionDeploymentChecker", settingsKeys.initialized];
-var resetEnvironment = () => {
-  keys.map((key) => window.sessionStorage.removeItem(key));
-};
+var resetEnvironment = () => keys.forEach((key) => window.sessionStorage.removeItem(key));
 resetEnvironment();
 var commonErrorFallback = "Please check your connection.";
 var commonErrorHandler = (err, errorContext, dispatch, fallback, mightBeAuthRelated = false) => {
@@ -2743,6 +2758,14 @@ var sessionReducer = (state, action) => {
   }
   return rootReducer(state, action);
 };
+var rejectionLoggerMiddleware = () => (next) => (action) => {
+  if (action.type.endsWith("/rejected")) {
+    const { error } = action;
+    console.error("Rejection in action:", action);
+    console.error(error.stack);
+  }
+  return next(action);
+};
 var getConfiguredStore = (options = {}) => {
   const { preloadedState = {}, ...config } = options;
   return (0, import_toolkit17.configureStore)({
@@ -2758,7 +2781,7 @@ var getConfiguredStore = (options = {}) => {
         ignoredActionPaths: ["uploads", "snackbar", /payload\..*$/],
         ignoredPaths: ["app.uploadsById", "app.snackbar", "organization.externalDeviceIntegrations"]
       }
-    })
+    }).concat(rejectionLoggerMiddleware)
   });
 };
 var store = getConfiguredStore({
@@ -2767,12 +2790,13 @@ var store = getConfiguredStore({
 
 // src/deploymentsSlice/thunks.ts
 var import_helpers8 = require("@northern.tech/utils/helpers");
+var import_tracking = __toESM(require("@northern.tech/utils/tracking"), 1);
 var import_toolkit18 = require("@reduxjs/toolkit");
 var import_validator = require("validator");
 var { receivedDevice, setSnackbar: setSnackbar2 } = actions_default;
 var { page: defaultPage, perPage: defaultPerPage } = DEVICE_LIST_DEFAULTS;
 var deriveDeploymentGroup = ({ filter = {}, group, groups = [], name }) => group || groups.length === 1 && !(0, import_validator.isUUID)(name) ? groups[0] : filter.name;
-var transformDeployments = (deployments, deploymentsById) => deployments.sort(import_helpers8.startTimeSort).reduce(
+var transformDeployments = (deployments, deploymentsById) => deployments.sort((0, import_helpers8.customSort)(true, "created")).reduce(
   (accu, item) => {
     const filter = item.filter ?? {};
     let deployment = {
@@ -2823,6 +2847,26 @@ var getDeploymentsByStatus2 = (0, import_toolkit18.createAsyncThunk)(`${sliceNam
     return Promise.all(tasks);
   });
 });
+var isWithinFirstMonth = (expirationDate) => {
+  if (!expirationDate) {
+    return false;
+  }
+  const endOfFirstMonth = new Date(expirationDate);
+  endOfFirstMonth.setMonth(endOfFirstMonth.getMonth() - 11);
+  return endOfFirstMonth > /* @__PURE__ */ new Date();
+};
+var trackDeploymentCreation = (totalDeploymentCount, hasDeployments, trial_expiration) => {
+  import_tracking.default.event({ category: "deployments", action: "create" });
+  if (!totalDeploymentCount) {
+    if (!hasDeployments) {
+      import_tracking.default.event({ category: "deployments", action: "create_initial_deployment" });
+      if (isWithinFirstMonth(trial_expiration)) {
+        import_tracking.default.event({ category: "deployments", action: "create_initial_deployment_first_month" });
+      }
+    }
+    import_tracking.default.event({ category: "deployments", action: "create_initial_deployment_user" });
+  }
+};
 var MAX_PREVIOUS_PHASES_COUNT = 5;
 var createDeployment = (0, import_toolkit18.createAsyncThunk)(`${sliceName2}/createDeployment`, ({ newDeployment, hasNewRetryDefault = false }, { dispatch, getState }) => {
   let request;
@@ -2833,6 +2877,9 @@ var createDeployment = (0, import_toolkit18.createAsyncThunk)(`${sliceName2}/cre
   } 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);
@@ -2847,6 +2894,7 @@ var createDeployment = (0, import_toolkit18.createAsyncThunk)(`${sliceName2}/cre
       dispatch(getSingleDeployment(deploymentId)),
       dispatch(setSnackbar2("Deployment created successfully", TIMEOUTS.fiveSeconds))
     ];
+    trackDeploymentCreation(totalDeploymentCount, hasDeployments, trial_expiration);
     const { canManageUsers } = getUserCapabilities(getState());
     if (canManageUsers) {
       const { phases, retries } = newDeployment;
@@ -3521,7 +3569,7 @@ var getDevicesByStatus2 = (0, import_toolkit19.createAsyncThunk)(`${sliceName3}/
     page = defaultPage2,
     perPage = defaultPerPage2,
     sortOptions = [],
-    selectedAttributes = []
+    selectedAttributes = getSelectedDeviceAttribute(getState())
   } = options;
   const state = getState();
   const { applicableFilters, filterTerms } = convertDeviceListStateToFilters({
@@ -3634,7 +3682,6 @@ var getReportingLimits = (0, import_toolkit19.createAsyncThunk)(
   })
 );
 var ensureVersionString = (software, fallback) => software.length && software !== "artifact_name" ? software.endsWith(".version") ? software : `${software}.version` : fallback;
-var REPORT_CHART_SIZE_LIMIT = 6;
 var getSingleReportData = (reportConfig, groups) => {
   const { attribute, group, software = "" } = reportConfig;
   const filters = [{ key: "status", scope: "identity", operator: DEVICE_FILTERING_OPTIONS.$eq.key, value: "accepted" }];
@@ -3714,6 +3761,13 @@ var getDeviceConnect = (0, import_toolkit19.createAsyncThunk)(
     ({ 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 = (0, import_toolkit19.createAsyncThunk)(
+  `${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 = (0, import_toolkit19.createAsyncThunk)(`${sliceName3}/getSessionDetails`, ({ sessionId, deviceId, userId, startDate, endDate }) => {
   const { start: startUnix, end: endUnix } = (0, import_helpers9.dateRangeToUnix)(startDate, endDate);
   const createdAfter = startDate ? `&created_after=${startUnix}` : "";
@@ -3816,12 +3870,12 @@ var deleteAuthset = (0, import_toolkit19.createAsyncThunk)(
 );
 var preauthDevice = (0, import_toolkit19.createAsyncThunk)(
   `${sliceName3}/preauthDevice`,
-  (authset, { dispatch }) => general_api_default.post(`${deviceAuthV2}/devices`, authset).catch((err) => {
+  (authset, { dispatch, rejectWithValue }) => general_api_default.post(`${deviceAuthV2}/devices`, authset).then(() => Promise.resolve(dispatch(setSnackbar3("Device was successfully added to the preauthorization list", TIMEOUTS.fiveSeconds)))).catch((err) => {
     if (err.response.status === 409) {
-      return Promise.reject("A device with a matching identity data set already exists");
+      return rejectWithValue("A device with a matching identity data set already exists");
     }
     return commonErrorHandler(err, "The device could not be added:", dispatch);
-  }).then(() => Promise.resolve(dispatch(setSnackbar3("Device was successfully added to the preauthorization list", TIMEOUTS.fiveSeconds))))
+  })
 );
 var decommissionDevice = (0, import_toolkit19.createAsyncThunk)(
   `${sliceName3}/decommissionDevice`,
@@ -4038,18 +4092,17 @@ var getDeviceMonitorConfig = (0, import_toolkit20.createAsyncThunk)(
 );
 var changeNotificationSetting = (0, import_toolkit20.createAsyncThunk)(
   `${sliceName4}/changeNotificationSetting`,
-  ({ enabled, channel = alertChannels.email }, { dispatch }) => {
-    return general_api_default.put(`${monitorApiUrlv1}/settings/global/channel/alerts/${channel}/status`, { enabled }).catch((err) => commonErrorHandler(err, `${enabled ? "En" : "Dis"}abling  ${channel} alerts failed:`, dispatch)).then(
-      () => Promise.all([
-        dispatch(actions4.changeAlertChannel({ channel, enabled })),
-        dispatch(actions_default.setSnackbar(`Successfully ${enabled ? "en" : "dis"}abled ${channel} alerts`, TIMEOUTS.fiveSeconds))
-      ])
-    );
-  }
+  ({ enabled, channel = alertChannels.email }, { dispatch }) => general_api_default.put(`${monitorApiUrlv1}/settings/global/channel/alerts/${channel}/status`, { enabled }).catch((err) => commonErrorHandler(err, `${enabled ? "En" : "Dis"}abling  ${channel} alerts failed:`, dispatch)).then(
+    () => Promise.all([
+      dispatch(actions4.changeAlertChannel({ channel, enabled })),
+      dispatch(actions_default.setSnackbar(`Successfully ${enabled ? "en" : "dis"}abled ${channel} alerts`, TIMEOUTS.fiveSeconds))
+    ])
+  )
 );
 
 // src/onboardingSlice/thunks.ts
 var import_helpers10 = require("@northern.tech/utils/helpers");
+var import_tracking2 = __toESM(require("@northern.tech/utils/tracking"), 1);
 var import_toolkit21 = require("@reduxjs/toolkit");
 var import_universal_cookie3 = __toESM(require("universal-cookie"), 1);
 var cookies3 = new import_universal_cookie3.default();
@@ -4131,7 +4184,7 @@ var setOnboardingCanceled = (0, import_toolkit21.createAsyncThunk)(
     Promise.resolve(dispatch(actions5.setShowOnboardingHelp(false))),
     Promise.resolve(dispatch(actions5.setShowDismissOnboardingTipsDialog(false))),
     Promise.resolve(dispatch(actions5.setOnboardingComplete(true)))
-  ]).then(() => dispatch(advanceOnboarding(onboardingSteps.DEPLOYMENTS_PAST_COMPLETED_FAILURE)))
+  ]).then(() => dispatch(advanceOnboarding(onboardingSteps.DEPLOYMENTS_PAST_COMPLETED_FAILURE))).then(() => import_tracking2.default.event({ category: "onboarding", action: onboardingSteps.ONBOARDING_CANCELED }))
 );
 var advanceOnboarding = (0, import_toolkit21.createAsyncThunk)(`${sliceName5}/advanceOnboarding`, (stepId, { dispatch, getState }) => {
   const steps = orderedOnboardingSteps;
@@ -4142,7 +4195,8 @@ var advanceOnboarding = (0, import_toolkit21.createAsyncThunk)(`${sliceName5}/ad
   }
   const madeProgress = steps[stepIndex + 1];
   const state = { ...getOnboardingState(getState()), progress: madeProgress };
-  state.complete = stepIndex + 1 >= steps.findIndex((step) => step === onboardingSteps.DEPLOYMENTS_PAST_COMPLETED_FAILURE) ? true : state.complete;
+  state.complete = stepIndex + 1 >= orderedOnboardingSteps.findIndex((step) => step === onboardingSteps.DEPLOYMENTS_PAST_COMPLETED_FAILURE) ? true : state.complete;
+  import_tracking2.default.event({ category: "onboarding", action: stepId });
   return Promise.all([dispatch(actions5.setOnboardingProgress(madeProgress)), dispatch(saveUserSettings({ onboarding: state }))]);
 });
 
@@ -4221,7 +4275,7 @@ var startUpgrade = (0, import_toolkit22.createAsyncThunk)(
 var cancelUpgrade = (0, import_toolkit22.createAsyncThunk)(`${sliceName6}/cancelUpgrade`, (tenantId) => general_api_default.post(`${tenantadmApiUrlv2}/tenants/${tenantId}/upgrade/cancel`));
 var completeUpgrade = (0, import_toolkit22.createAsyncThunk)(
   `${sliceName6}/completeUpgrade`,
-  ({ tenantId, plan }, { dispatch }) => general_api_default.post(`${tenantadmApiUrlv2}/tenants/${tenantId}/upgrade/complete`, { plan }).catch((err) => commonErrorHandler(err, `There was an error upgrading your account:`, dispatch)).then(() => Promise.resolve(dispatch(getUserOrganization())))
+  ({ 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(getDeviceLimit2()), dispatch(getUserOrganization())]))
 );
 var prepareAuditlogQuery = ({ startDate, endDate, user: userFilter, type, detail: detailFilter, sort = {} }) => {
   const userId = userFilter?.id || userFilter;
@@ -4269,9 +4323,15 @@ var setAuditlogsState = (0, import_toolkit22.createAsyncThunk)(`${sliceName6}/se
   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 = (0, import_toolkit22.createAsyncThunk)(`${sliceName6}/createTenant`, (selectionState, { dispatch }) => {
-  return general_api_default.post(`${tenantadmApiUrlv2}/tenants`, selectionState).then(() => Promise.all([dispatch(getTenants()), dispatch(setSnackbar4("Tenant was created successfully."))])).catch((err) => commonErrorHandler(err, "There was an error creating tenant", dispatch, commonErrorFallback));
-});
+var addTenant = (0, import_toolkit22.createAsyncThunk)(
+  `${sliceName6}/createTenant`,
+  (selectionState, { dispatch }) => general_api_default.post(`${tenantadmApiUrlv2}/tenants`, selectionState).then(
+    () => Promise.all([
+      dispatch(setSnackbar4("Tenant was created successfully.")),
+      new Promise((resolve) => setTimeout(() => resolve(dispatch(getTenants())), TIMEOUTS.oneSecond))
+    ])
+  ).catch((err) => commonErrorHandler(err, "There was an error creating tenant", dispatch, commonErrorFallback))
+);
 var tenantListRetrieval = async (config) => {
   const { page, perPage } = config;
   const params = new URLSearchParams({ page, per_page: perPage }).toString();
@@ -4296,21 +4356,29 @@ var setTenantsListState = (0, import_toolkit22.createAsyncThunk)(`${sliceName6}/
   }
   return dispatch(actions6.setTenantListState({ ...nextState }));
 });
-var editTenantDeviceLimit = (0, import_toolkit22.createAsyncThunk)(`${sliceName6}/editDeviceLimit`, ({ newLimit, id, name }, { dispatch }) => {
-  return general_api_default.put(`${tenantadmApiUrlv2}/tenants/${id}/child`, { device_limit: newLimit, name }).catch((err) => commonErrorHandler(err, `Device Limit cannot be changed`, dispatch)).then(() => {
-    const tasks = [Promise.resolve(dispatch(setSnackbar4("Device Limit was changed successfully")))];
-    tasks.push(dispatch(getTenants()));
-    tasks.push(dispatch(getUserOrganization()));
-    return Promise.all(tasks);
-  });
-});
-var removeTenant = (0, import_toolkit22.createAsyncThunk)(`${sliceName6}/editDeviceLimit`, ({ id }, { dispatch }) => {
-  return general_api_default.post(`${tenantadmApiUrlv2}/tenants/${id}/remove/start`).catch((err) => commonErrorHandler(err, `There was an error removing the tenant`, dispatch)).then(
-    () => Promise.all([Promise.resolve(dispatch(setSnackbar4("Device Limit was changed successfully"))), dispatch(getTenants()), dispatch(getUserOrganization())])
-  );
-});
-var getUserOrganization = (0, import_toolkit22.createAsyncThunk)(`${sliceName6}/getUserOrganization`, (_, { dispatch, getState }) => {
-  return general_api_default.get(`${tenantadmApiUrlv1}/user/tenant`).then((res) => {
+var editTenantDeviceLimit = (0, import_toolkit22.createAsyncThunk)(
+  `${sliceName6}/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([
+      dispatch(setSnackbar4("Device Limit was changed successfully")),
+      dispatch(getUserOrganization()),
+      new Promise((resolve) => setTimeout(() => resolve(dispatch(getTenants())), TIMEOUTS.oneSecond))
+    ])
+  )
+);
+var removeTenant = (0, import_toolkit22.createAsyncThunk)(
+  `${sliceName6}/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([
+      dispatch(setSnackbar4("The tenant was removed successfully")),
+      dispatch(getUserOrganization()),
+      new Promise((resolve) => setTimeout(() => resolve(dispatch(getTenants())), TIMEOUTS.oneSecond))
+    ])
+  )
+);
+var getUserOrganization = (0, import_toolkit22.createAsyncThunk)(
+  `${sliceName6}/getUserOrganization`,
+  (_, { dispatch, getState }) => general_api_default.get(`${tenantadmApiUrlv1}/user/tenant`).then((res) => {
     let tasks = [dispatch(actions6.setOrganization(res.data))];
     const { addons, plan, trial } = res.data;
     const { token } = getCurrentSession(getState());
@@ -4322,15 +4390,18 @@ var getUserOrganization = (0, import_toolkit22.createAsyncThunk)(`${sliceName6}/
       tasks.push(dispatch(setAnnouncement(tenantDataDivergedMessage)));
     }
     return Promise.all(tasks);
-  });
-});
+  })
+);
 var sendSupportMessage = (0, import_toolkit22.createAsyncThunk)(
   `${sliceName6}/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(setSnackbar4({ message: "Your request was sent successfully", autoHideDuration: TIMEOUTS.fiveSeconds }))))
 );
 var requestPlanChange = (0, import_toolkit22.createAsyncThunk)(
   `${sliceName6}/requestPlanChange`,
-  ({ content, tenantId }, { dispatch }) => general_api_default.post(`${tenantadmApiUrlv2}/tenants/${tenantId}/plan`, content).catch((err) => commonErrorHandler(err, "There was an error sending your request", dispatch, commonErrorFallback)).then(() => Promise.resolve(dispatch(setSnackbar4({ message: "Your request was sent successfully", autoHideDuration: TIMEOUTS.fiveSeconds }))))
+  ({ 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(setSnackbar4({ message: "Your request was sent successfully", autoHideDuration: TIMEOUTS.fiveSeconds }))))
 );
 var downloadLicenseReport = (0, import_toolkit22.createAsyncThunk)(
   `${sliceName6}/downloadLicenseReport`,
@@ -4422,9 +4493,22 @@ var getSsoConfigs = (0, import_toolkit22.createAsyncThunk)(
   )
 );
 
-// src/releasesSlice/thunks.ts
+// src/locationutils.ts
 var import_helpers12 = require("@northern.tech/utils/helpers");
-var import_locationutils = require("@northern.tech/utils/locationutils");
+var defaultSelector = (result) => result[0];
+var commonFields = {
+  ...Object.keys(DEVICE_LIST_DEFAULTS).reduce((accu, key) => ({ ...accu, [key]: { parse: Number, select: defaultSelector, target: key } }), {}),
+  id: { parse: String, select: (i) => i, target: "id" },
+  issues: { parse: void 0, select: defaultSelector, target: "selectedIssues" },
+  open: { parse: Boolean, select: defaultSelector, target: "open" }
+};
+var formatReleases = ({ pageState: { searchTerm, selectedTags = [], tab, type } }) => Object.entries({ name: searchTerm, tab, type }).reduce(
+  (accu, [key, value]) => value ? [...accu, `${key}=${value}`] : accu,
+  selectedTags.map((tag) => `tag=${tag}`)
+).join("&");
+
+// src/releasesSlice/thunks.ts
+var import_helpers13 = require("@northern.tech/utils/helpers");
 var import_toolkit23 = require("@reduxjs/toolkit");
 var import_axios3 = require("axios");
 var import_uuid2 = require("uuid");
@@ -4432,7 +4516,7 @@ var { setSnackbar: setSnackbar5, initUpload: initUpload2, uploadProgress: upload
 var { page: defaultPage5, perPage: defaultPerPage5 } = DEVICE_LIST_DEFAULTS;
 var sortingDefaults = { direction: SORTING_OPTIONS.desc, key: "modified" };
 var flattenRelease = (release, stateRelease) => {
-  const updatedArtifacts = release.artifacts?.sort((0, import_helpers12.customSort)(1, "modified")) || [];
+  const updatedArtifacts = release.artifacts?.sort((0, import_helpers13.customSort)(true, "modified")) || [];
   const { artifacts, deviceTypes, modified } = updatedArtifacts.reduce(
     (accu, item) => {
       accu.deviceTypes.push(...item.device_types_compatible);
@@ -4446,7 +4530,7 @@ var flattenRelease = (release, stateRelease) => {
     },
     { artifacts: [], deviceTypes: [], modified: void 0 }
   );
-  return { ...stateRelease, ...release, artifacts, device_types_compatible: deviceTypes.filter(import_helpers12.duplicateFilter), modified };
+  return { ...stateRelease, ...release, artifacts, device_types_compatible: deviceTypes.filter(import_helpers13.duplicateFilter), modified };
 };
 var reduceReceivedReleases = (releases, stateReleasesById) => releases.reduce((accu, release) => {
   const stateRelease = stateReleasesById[release.name] || {};
@@ -4470,7 +4554,7 @@ var getArtifactInstallCount = (0, import_toolkit23.createAsyncThunk)(`${sliceNam
   }
   const releaseArtifacts = [...release.artifacts];
   const artifact = releaseArtifacts[index];
-  const { key, name, version } = (0, import_helpers12.extractSoftwareItem)(artifact.artifact_provides) ?? {};
+  const { key, name, version } = (0, import_helpers13.extractSoftwareItem)(artifact.artifact_provides) ?? {};
   const attribute = `${key}${name ? `.${name}` : ""}.version`;
   const { filterTerms } = convertDeviceListStateToFilters({
     filters: [{ ...emptyFilter, key: attribute, value: version, scope: "inventory" }]
@@ -4588,9 +4672,12 @@ var editArtifact = (0, import_toolkit23.createAsyncThunk)(
     if (!release || index === -1) {
       return dispatch(getReleases());
     }
-    release.artifacts[index].description = body.description;
+    const updatedRelease = {
+      ...release,
+      artifacts: release.artifacts.map((artifact, i) => i === index ? { ...artifact, description: body.description } : artifact)
+    };
     return Promise.all([
-      dispatch(actions7.receiveRelease(release)),
+      dispatch(actions7.receiveRelease(updatedRelease)),
       dispatch(setSnackbar5("Artifact details were updated successfully.", TIMEOUTS.fiveSeconds, "")),
       dispatch(getRelease(release.name)),
       dispatch(selectRelease(release.name))
@@ -4643,7 +4730,7 @@ var setReleasesListState = (0, import_toolkit23.createAsyncThunk)(`${sliceName7}
   let tasks = [];
   const { isLoading: currentLoading, ...currentRequestState } = currentState;
   const { isLoading: selectionLoading, ...selectionRequestState } = nextState;
-  if (!(0, import_helpers12.deepCompare)(currentRequestState, selectionRequestState)) {
+  if (!(0, import_helpers13.deepCompare)(currentRequestState, selectionRequestState)) {
     nextState.isLoading = true;
     tasks.push(dispatch(getReleases(nextState)).finally(() => dispatch(setReleasesListState({ isLoading: false }))));
   }
@@ -4653,7 +4740,7 @@ var setReleasesListState = (0, import_toolkit23.createAsyncThunk)(`${sliceName7}
 var releaseListRetrieval = (config) => {
   const { searchTerm = "", page = defaultPage5, perPage = defaultPerPage5, sort = sortingDefaults, selectedTags = [], type = "" } = config;
   const { key: attribute, direction } = sort;
-  const filterQuery = (0, import_locationutils.formatReleases)({ pageState: { searchTerm, selectedTags } });
+  const filterQuery = formatReleases({ pageState: { searchTerm, selectedTags } });
   const updateType = type ? `update_type=${type}` : "";
   const sorting = attribute ? `sort=${attribute}:${direction}`.toLowerCase() : "";
   return general_api_default.get(
@@ -4663,7 +4750,7 @@ var releaseListRetrieval = (config) => {
 var deductSearchState = (receivedReleases, config, total, state) => {
   let releaseListState = { ...state.releasesList };
   const { searchTerm, searchOnly, sort = {}, selectedTags = [], type } = config;
-  const flattenedReleases = Object.values(receivedReleases).sort((0, import_helpers12.customSort)(sort.direction === SORTING_OPTIONS.desc, sort.key));
+  const flattenedReleases = Object.values(receivedReleases).sort((0, import_helpers13.customSort)(sort.direction === SORTING_OPTIONS.desc, sort.key));
   const releaseIds = flattenedReleases.map((item) => item.name);
   const isFiltering = !!(selectedTags.length || type || searchTerm);
   if (searchOnly) {
@@ -4691,33 +4778,32 @@ var getReleases = (0, import_toolkit23.createAsyncThunk)(`${sliceName7}/getRelea
     return Promise.all(tasks);
   }).catch((err) => commonErrorHandler(err, `Please check your connection`, dispatch));
 });
-var getRelease = (0, import_toolkit23.createAsyncThunk)(
-  `${sliceName7}/getReleases`,
-  (name, { dispatch, getState }) => releaseListRetrieval({ searchTerm: name, page: 1, perPage: 1 }).then(({ data: releases }) => {
-    if (releases.length) {
-      const stateRelease = getReleasesById(getState())[releases[0].name] || {};
-      return Promise.resolve(dispatch(actions7.receiveRelease(flattenRelease(releases[0], stateRelease))));
-    }
-    return Promise.resolve(null);
-  })
-);
+var getRelease = (0, import_toolkit23.createAsyncThunk)(`${sliceName7}/getReleases`, async (name, { dispatch, getState }) => {
+  const releaseResponse = await general_api_default.get(`${deploymentsApiUrlV2}/deployments/releases/${name}`);
+  const { data: release } = releaseResponse;
+  if (release) {
+    const stateRelease = getReleasesById(getState())[release.name] || {};
+    await dispatch(actions7.receiveRelease(flattenRelease(release, stateRelease)));
+  }
+  return Promise.resolve(null);
+});
 var updateReleaseInfo = (0, import_toolkit23.createAsyncThunk)(
   `${sliceName7}/updateReleaseInfo`,
-  ({ name, info }, { dispatch, getState }) => general_api_default.patch(`${deploymentsApiUrlV2}/deployments/releases/${name}`, info).catch((err) => commonErrorHandler(err, `Release details couldn't be updated.`, dispatch)).then(() => {
-    return Promise.all([
+  ({ name, info }, { dispatch, getState }) => general_api_default.patch(`${deploymentsApiUrlV2}/deployments/releases/${name}`, info).catch((err) => commonErrorHandler(err, `Release details couldn't be updated.`, dispatch)).then(
+    () => Promise.all([
       dispatch(actions7.receiveRelease({ ...getReleasesById(getState())[name], ...info, name })),
       dispatch(setSnackbar5("Release details were updated successfully.", TIMEOUTS.fiveSeconds, ""))
-    ]);
-  })
+    ])
+  )
 );
 var setReleaseTags = (0, import_toolkit23.createAsyncThunk)(
   `${sliceName7}/setReleaseTags`,
-  ({ name, tags = [] }, { dispatch, getState }) => general_api_default.put(`${deploymentsApiUrlV2}/deployments/releases/${name}/tags`, tags).catch((err) => commonErrorHandler(err, `Release tags couldn't be set.`, dispatch)).then(() => {
-    return Promise.all([
+  ({ name, tags = [] }, { dispatch, getState }) => general_api_default.put(`${deploymentsApiUrlV2}/deployments/releases/${name}/tags`, tags).catch((err) => commonErrorHandler(err, `Release tags couldn't be set.`, dispatch)).then(
+    () => Promise.all([
       dispatch(actions7.receiveRelease({ ...getReleasesById(getState())[name], name, tags })),
       dispatch(setSnackbar5("Release tags were set successfully.", TIMEOUTS.fiveSeconds, ""))
-    ]);
-  })
+    ])
+  )
 );
 var getExistingReleaseTags = (0, import_toolkit23.createAsyncThunk)(
   `${sliceName7}/getReleaseTags`,
@@ -4728,6 +4814,9 @@ var getUpdateTypes = (0, import_toolkit23.createAsyncThunk)(
   (_, { dispatch }) => general_api_default.get(`${deploymentsApiUrlV2}/releases/all/types`).catch((err) => commonErrorHandler(err, `Existing update types couldn't be retrieved.`, dispatch)).then(({ data: types }) => Promise.resolve(dispatch(actions7.receiveReleaseTypes(types))))
 );
 
+// src/usersSlice/thunks.ts
+var import_helptips = require("@northern.tech/common-ui/helptips");
+
 // src/api/users-api.ts
 var import_axios4 = __toESM(require("axios"), 1);
 var Api2 = {
@@ -4743,7 +4832,7 @@ var Api2 = {
 var users_api_default = Api2;
 
 // src/usersSlice/thunks.ts
-var import_helpers13 = require("@northern.tech/utils/helpers");
+var import_helpers14 = require("@northern.tech/utils/helpers");
 var import_retrytimer = require("@northern.tech/utils/retrytimer");
 var import_toolkit24 = require("@reduxjs/toolkit");
 var import_md52 = __toESM(require("md5"), 1);
@@ -4751,7 +4840,7 @@ var import_universal_cookie5 = __toESM(require("universal-cookie"), 1);
 var cookies5 = new import_universal_cookie5.default();
 var { setAnnouncement: setAnnouncement2, setSnackbar: setSnackbar6 } = actions_default;
 var handleLoginError = (err, { token2fa: has2FA, password }, rejectWithValue) => (dispatch) => {
-  const errorText = (0, import_helpers13.extractErrorMessage)(err);
+  const errorText = (0, import_helpers14.extractErrorMessage)(err);
   const is2FABackend = errorText.includes("2fa");
   if (is2FABackend && !has2FA) {
     return rejectWithValue({ error: "2fa code missing" });
@@ -4761,7 +4850,7 @@ 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(setSnackbar6((0, import_helpers13.preformatWithRequestID)(err.response, errorMessage), null, "Copy to clipboard")));
+  return Promise.reject(dispatch(setSnackbar6({ message: (0, import_helpers14.preformatWithRequestID)(err.response, errorMessage), action: "Copy to clipboard" })));
 };
 var loginUser = (0, import_toolkit24.createAsyncThunk)(
   `${sliceName8}/loginUser`,
@@ -4785,19 +4874,16 @@ var loginUser = (0, import_toolkit24.createAsyncThunk)(
     const expiresAt = stayLoggedIn ? void 0 : now.toISOString();
     setSessionInfo({ token, expiresAt });
     cookies5.remove("JWT", { path: "/" });
-    return (
-      // @ts-ignore
-      Promise.resolve(dispatch(getUser(OWN_USER_ID))).unwrap().catch((e) => {
-        cleanUp();
-        return Promise.reject(dispatch(setSnackbar6((0, import_helpers13.extractErrorMessage)(e))));
-      }).then(() => {
-        window.sessionStorage.removeItem("pendings-redirect");
-        if (window.location.pathname !== "/ui/") {
-          window.location.replace("/ui/");
-        }
-        return Promise.resolve(dispatch(actions8.successfullyLoggedIn({ expiresAt, token })));
-      })
-    );
+    return dispatch(getUser(OWN_USER_ID)).unwrap().catch((e) => {
+      cleanUp();
+      return Promise.reject(dispatch(setSnackbar6((0, import_helpers14.extractErrorMessage)(e))));
+    }).then(() => {
+      window.sessionStorage.removeItem("pendings-redirect");
+      if (window.location.pathname !== "/ui/") {
+        window.location.replace("/ui/");
+      }
+      return Promise.resolve(dispatch(actions8.successfullyLoggedIn({ expiresAt, token })));
+    });
   })
 );
 var logoutUser = (0, import_toolkit24.createAsyncThunk)(`${sliceName8}/logoutUser`, (_, { dispatch, getState }) => {
@@ -4815,6 +4901,7 @@ var switchUserOrganization = (0, import_toolkit24.createAsyncThunk)(`${sliceName
     return Promise.reject();
   }
   return general_api_default.get(`${useradmApiUrlv1}/users/tenants/${tenantId}/token`).then(({ data: token }) => {
+    window.sessionStorage.setItem("tenantChanged", "true");
     setSessionInfo({ ...getSessionInfo(), token });
     window.location.reload();
   });
@@ -4855,11 +4942,18 @@ var verify2FA = (0, import_toolkit24.createAsyncThunk)(
 );
 var getUserList = (0, import_toolkit24.createAsyncThunk)(
   `${sliceName8}/getUserList`,
-  (_, { dispatch }) => general_api_default.get(`${useradmApiUrlv1}/users`).then((res) => {
-    const users = res.data.reduce((accu, item) => {
-      accu[item.id] = item;
-      return accu;
-    }, {});
+  (_, { dispatch, getState }) => general_api_default.get(`${useradmApiUrlv1}/users`).then((res) => {
+    const currentUsersById = getUsersById(getState());
+    const users = res.data.reduce(
+      (accu, item) => {
+        accu[item.id] = {
+          ...accu[item.id],
+          ...item
+        };
+        return accu;
+      },
+      { ...currentUsersById }
+    );
     return dispatch(actions8.receivedUserList(users));
   }).catch((err) => commonErrorHandler(err, `Users couldn't be loaded.`, dispatch, commonErrorFallback))
 );
@@ -4868,9 +4962,7 @@ var getUser = (0, import_toolkit24.createAsyncThunk)(
   (id, { dispatch, rejectWithValue }) => general_api_default.get(`${useradmApiUrlv1}/users/${id}`).then(
     ({ data: user }) => Promise.all([
       dispatch(actions8.receivedUser(user)),
-      // @ts-ignore
       dispatch(setHideAnnouncement({ shouldHide: false, userId: user.id })),
-      // @ts-ignore
       dispatch(updateUserColumnSettings({ currentUserId: user.id })),
       user
     ])
@@ -4917,10 +5009,7 @@ var createUser = (0, import_toolkit24.createAsyncThunk)(
 );
 var removeUser = (0, import_toolkit24.createAsyncThunk)(
   `${sliceName8}/removeUser`,
-  (userId, { dispatch }) => (
-    // @ts-ignore
-    general_api_default.delete(`${useradmApiUrlv1}/users/${userId}`).then(() => Promise.all([dispatch(actions8.removedUser(userId)), dispatch(getUserList()), dispatch(setSnackbar6(userActions.remove.successMessage))])).catch((err) => userActionErrorHandler(err, "remove", dispatch))
-  )
+  (userId, { dispatch }) => general_api_default.delete(`${useradmApiUrlv1}/users/${userId}`).then(() => Promise.all([dispatch(actions8.removedUser(userId)), dispatch(getUserList()), dispatch(setSnackbar6(userActions.remove.successMessage))])).catch((err) => userActionErrorHandler(err, "remove", dispatch))
 );
 var editUser = (0, import_toolkit24.createAsyncThunk)(
   `${sliceName8}/editUser`,
@@ -4941,7 +5030,7 @@ var enableUser2fa = (0, import_toolkit24.createAsyncThunk)(
 );
 var disableUser2fa = (0, import_toolkit24.createAsyncThunk)(
   `${sliceName8}/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.resolve(dispatch(getUser(userId))))
+  (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(actions8.receivedQrCode(null))]))
 );
 var mapHttpPermission = (permission) => Object.entries(uiPermissionsByArea).reduce(
   (accu, [area, definition]) => {
@@ -4955,9 +5044,9 @@ var mapHttpPermission = (permission) => Object.entries(uiPermissionsByArea).redu
           permissionsAccu.push(uiPermission.value);
         }
         return permissionsAccu;
-      }, []).filter(import_helpers13.duplicateFilter);
+      }, []).filter(import_helpers14.duplicateFilter);
       if (Array.isArray(accu[area])) {
-        accu[area] = [...accu[area], ...collector].filter(import_helpers13.duplicateFilter);
+        accu[area] = [...accu[area], ...collector].filter(import_helpers14.duplicateFilter);
       } else {
         accu[area] = mergePermissions(accu[area], { [scopedPermissionAreas[area].excessiveAccessSelector]: collector });
       }
@@ -4982,7 +5071,7 @@ var permissionActionTypes = {
 };
 var combinePermissions = (existingPermissions, additionalPermissions = {}) => Object.entries(additionalPermissions).reduce((accu, [name, permissions]) => {
   let maybeExistingPermissions = accu[name] || [];
-  accu[name] = [...permissions, ...maybeExistingPermissions].filter(import_helpers13.duplicateFilter);
+  accu[name] = [...permissions, ...maybeExistingPermissions].filter(import_helpers14.duplicateFilter);
   return accu;
 }, existingPermissions);
 var tryParseCustomPermission = (permission) => {
@@ -5007,7 +5096,7 @@ var isEmptyPermissionSet = (permissionSet) => !Object.values(permissionSet).redu
   if (Array.isArray(permissions)) {
     return accu || !!permissions.length;
   }
-  return accu || !(0, import_helpers13.isEmpty)(permissions);
+  return accu || !(0, import_helpers14.isEmpty)(permissions);
 }, false);
 var parseRolePermissions = ({ permission_sets_with_scope = [], permissions = [] }, permissionSets) => {
   const preliminaryResult = permission_sets_with_scope.reduce(
@@ -5075,7 +5164,7 @@ var getPermissionSets = (0, import_toolkit24.createAsyncThunk)(
               return collector;
             }
             if (permissionSet2 === permissionSetObject.name) {
-              collector[area] = [...collector[area], item.value].filter(import_helpers13.duplicateFilter);
+              collector[area] = [...collector[area], item.value].filter(import_helpers14.duplicateFilter);
             }
             return collector;
           }, accu2),
@@ -5094,7 +5183,6 @@ var getPermissionSets = (0, import_toolkit24.createAsyncThunk)(
         accu[permissionSet.name] = permissionSetObject;
         return accu;
       },
-      // @ts-ignore
       { ...getState().users.permissionSetsById }
     );
     return Promise.all([dispatch(actions8.receivedPermissionSets(permissionSets)), permissionSets]);
@@ -5144,7 +5232,7 @@ var transformAreaRoleDataToScopedPermissionsSets = (area, areaPermissions, exces
     if (value.includes(excessiveAccessSelector)) {
       return { name };
     }
-    return { name, scope: { ...scope, value: value.filter(import_helpers13.duplicateFilter) } };
+    return { name, scope: { ...scope, value: value.filter(import_helpers14.duplicateFilter) } };
   });
 };
 var transformRoleDataToRole = (roleData, roleState = {}) => {
@@ -5187,7 +5275,6 @@ var transformRoleDataToRole = (roleData, roleState = {}) => {
     role: {
       ...emptyRole,
       name,
-      // @ts-ignore
       description: description ? description : roleState.description,
       uiPermissions: {
         ...emptyUiPermissions,
@@ -5230,10 +5317,7 @@ var editRole = (0, import_toolkit24.createAsyncThunk)(`${sliceName8}/editRole`,
 });
 var removeRole = (0, import_toolkit24.createAsyncThunk)(
   `${sliceName8}/removeRole`,
-  (roleId, { dispatch }) => (
-    // @ts-ignore
-    general_api_default.delete(`${useradmApiUrlv2}/roles/${roleId}`).then(() => Promise.all([dispatch(actions8.removedRole(roleId)), dispatch(getRoles()), dispatch(setSnackbar6(roleActions.remove.successMessage))])).catch((err) => roleActionErrorHandler(err, "remove", dispatch))
-  )
+  (roleId, { dispatch }) => general_api_default.delete(`${useradmApiUrlv2}/roles/${roleId}`).then(() => Promise.all([dispatch(actions8.removedRole(roleId)), dispatch(getRoles()), dispatch(setSnackbar6(roleActions.remove.successMessage))])).catch((err) => roleActionErrorHandler(err, "remove", dispatch))
 );
 var getGlobalSettings2 = (0, import_toolkit24.createAsyncThunk)(
   `${sliceName8}/getGlobalSettings`,
@@ -5244,7 +5328,6 @@ var getGlobalSettings2 = (0, import_toolkit24.createAsyncThunk)(
 );
 var saveGlobalSettings = (0, import_toolkit24.createAsyncThunk)(
   `${sliceName8}/saveGlobalSettings`,
-  // @ts-ignore
   ({ beOptimistic = false, notify = false, ...settings }, { dispatch, getState }) => {
     if (!window.sessionStorage.getItem(settingsKeys.initialized) && !beOptimistic) {
       return;
@@ -5290,11 +5373,9 @@ var saveUserSettings = (0, import_toolkit24.createAsyncThunk)(`${sliceName8}/sav
     const tooltipState = getTooltipsState(getState());
     const updatedSettings = {
       ...userSettings,
-      // @ts-ignore
       ...settings,
       onboarding: {
         ...onboardingState,
-        // @ts-ignore
         ...settings.onboarding
       },
       tooltips: tooltipState
@@ -5338,10 +5419,7 @@ var generateToken = (0, import_toolkit24.createAsyncThunk)(
 );
 var revokeToken = (0, import_toolkit24.createAsyncThunk)(
   `${sliceName8}/revokeToken`,
-  (token, { dispatch }) => (
-    // @ts-ignore
-    general_api_default.delete(`${useradmApiUrlv1}/settings/tokens/${token.id}`).then(() => Promise.resolve(dispatch(getTokens())))
-  )
+  (token, { dispatch }) => general_api_default.delete(`${useradmApiUrlv1}/settings/tokens/${token.id}`).then(() => Promise.resolve(dispatch(getTokens())))
 );
 var setTooltipReadState = (0, import_toolkit24.createAsyncThunk)(`${sliceName8}/setTooltipReadState`, ({ persist, ...remainder }, { dispatch }) => {
   let tasks = [dispatch(actions8.setTooltipState(remainder))];
@@ -5350,23 +5428,20 @@ var setTooltipReadState = (0, import_toolkit24.createAsyncThunk)(`${sliceName8}/
   }
   return Promise.all(tasks);
 });
-var setAllTooltipsReadState = (0, import_toolkit24.createAsyncThunk)(`${sliceName8}/toggleHelptips`, ({ readState = READ_STATES.read, tooltips }, { dispatch }) => {
-  const updatedTips = tooltips.reduce((accu, id) => ({ ...accu, [id]: { readState } }), {});
+var setAllTooltipsReadState = (0, import_toolkit24.createAsyncThunk)(`${sliceName8}/toggleHelptips`, (readState = READ_STATES.read, { dispatch }) => {
+  const updatedTips = Object.keys(import_helptips.HELPTOOLTIPS).reduce((accu, id) => ({ ...accu, [id]: { readState } }), {});
   return Promise.resolve(dispatch(actions8.setTooltipsState(updatedTips))).then(() => dispatch(saveUserSettings()));
 });
 var submitFeedback = (0, import_toolkit24.createAsyncThunk)(
   `${sliceName8}/submitFeedback`,
-  // @ts-ignore
-  ({ satisfaction, feedback, ...meta }, { dispatch }) => {
-    return general_api_default.post(`${tenantadmApiUrlv2}/contact/support`, {
-      subject: "feedback submission",
-      body: JSON.stringify({ feedback, satisfaction, meta })
-    }).then(() => {
-      const today = /* @__PURE__ */ new Date();
-      dispatch(saveUserSettings({ feedbackCollectedAt: today.toISOString().split("T")[0] }));
-      setTimeout(() => dispatch(actions8.setShowFeedbackDialog(false)), TIMEOUTS.threeSeconds);
-    });
-  }
+  ({ satisfaction, feedback, ...meta }, { dispatch }) => general_api_default.post(`${tenantadmApiUrlv2}/contact/support`, {
+    subject: "feedback submission",
+    body: JSON.stringify({ feedback, satisfaction, meta })
+  }).then(() => {
+    const today = /* @__PURE__ */ new Date();
+    dispatch(saveUserSettings({ feedbackCollectedAt: today.toISOString().split("T")[0] }));
+    setTimeout(() => dispatch(actions8.setShowFeedbackDialog(false)), TIMEOUTS.threeSeconds);
+  })
 );
 
 // src/storehooks.ts
@@ -5404,7 +5479,6 @@ var parseEnvironmentInfo = () => (dispatch, getState) => {
       metaMenderVersion,
       services = {}
     } = mender_environment;
-    onboardingComplete = stringToBoolean(features.isEnterprise) || stringToBoolean(disableOnboarding) || onboardingComplete;
     demoArtifactPort = port || demoArtifactPort;
     environmentData = environmentDatas.reduce((accu, flag) => ({ ...accu, [flag]: mender_environment[flag] || state.app[flag] }), {});
     environmentFeatures = {
@@ -5412,6 +5486,7 @@ var parseEnvironmentInfo = () => (dispatch, getState) => {
       isHosted: features.isHosted || window.location.hostname.includes("hosted.mender.io"),
       isDemoMode: stringToBoolean(isDemoMode || features.isDemoMode)
     };
+    onboardingComplete = !stringToBoolean(features.isHosted) || stringToBoolean(disableOnboarding) || onboardingComplete;
     versionInfo = {
       docs: isNaN(integrationVersion.charAt(0)) ? "" : integrationVersion.split(".").slice(0, 2).join("."),
       remainder: {
@@ -5446,18 +5521,18 @@ var maybeAddOnboardingTasks = ({ devicesByStatus, dispatch, onboardingState, tas
   }, tasks);
 };
 var useAppInit = (userId) => {
-  const dispatch = (0, import_react_redux.useDispatch)();
+  const dispatch = (0, import_react_redux2.useDispatch)();
   const [coreInitDone, setCoreInitDone] = (0, import_react.useState)(false);
-  const isEnterprise = (0, import_react_redux.useSelector)(getIsEnterprise);
-  const { hasMultitenancy, isHosted } = (0, import_react_redux.useSelector)(getFeatures);
-  const devicesByStatus = (0, import_react_redux.useSelector)(getDevicesByStatus);
-  const onboardingState = (0, import_react_redux.useSelector)(getOnboardingState);
-  let { columnSelection = [], trackingConsentGiven: hasTrackingEnabled, tooltips = {} } = (0, import_react_redux.useSelector)(getUserSettings);
-  const { canManageUsers } = (0, import_react_redux.useSelector)(getUserCapabilities);
-  const { interval, intervalUnit } = (0, import_react_redux.useSelector)(getOfflineThresholdSettings);
-  const { id_attribute } = (0, import_react_redux.useSelector)(getGlobalSettings);
-  const { identityAttributes } = (0, import_react_redux.useSelector)(getSortedFilteringAttributes);
-  const isServiceProvider = (0, import_react_redux.useSelector)(getIsServiceProvider);
+  const isEnterprise = (0, import_react_redux2.useSelector)(getIsEnterprise);
+  const { hasMultitenancy, isHosted } = (0, import_react_redux2.useSelector)(getFeatures);
+  const devicesByStatus = (0, import_react_redux2.useSelector)(getDevicesByStatus);
+  const onboardingState = (0, import_react_redux2.useSelector)(getOnboardingState);
+  let { columnSelection = [], trackingConsentGiven: hasTrackingEnabled, tooltips = {} } = (0, import_react_redux2.useSelector)(getUserSettings);
+  const { canManageUsers } = (0, import_react_redux2.useSelector)(getUserCapabilities);
+  const { interval, intervalUnit } = (0, import_react_redux2.useSelector)(getOfflineThresholdSettings);
+  const { id_attribute } = (0, import_react_redux2.useSelector)(getGlobalSettings);
+  const { identityAttributes } = (0, import_react_redux2.useSelector)(getSortedFilteringAttributes);
+  const isServiceProvider = (0, import_react_redux2.useSelector)(getIsServiceProvider);
   const coreInitRunning = (0, import_react.useRef)(false);
   const fullInitRunning = (0, import_react.useRef)(false);
   const retrieveCoreData = (0, import_react.useCallback)(() => {
@@ -5540,7 +5615,7 @@ var useAppInit = (userId) => {
     tooltips
   ]);
   const initializeAppData = (0, import_react.useCallback)(
-    () => retrieveAppData().then(interpretAppData).catch((err) => console.log((0, import_helpers14.extractErrorMessage)(err))).then(() => dispatch(getOnboardingState2())),
+    () => retrieveAppData().then(interpretAppData).catch((err) => console.log((0, import_helpers15.extractErrorMessage)(err))).then(() => dispatch(getOnboardingState2())),
     [dispatch, retrieveAppData, interpretAppData]
   );
   (0, import_react.useEffect)(() => {