@northern.tech/store 0.3.2 → 0.3.4

package/dist/{chunk-74OJIKXF.js → chunk-EQLHIPPR.js}

@@ -1,20 +1,61 @@
 import {
   getDeviceMonitorConfig,
   getLatestDeviceAlerts
-} from "./chunk-NI4SZOCF.js";
+} from "./chunk-4RWZR3BN.js";
 import {
   users_api_default
-} from "./chunk-JAROCU6M.js";
+} from "./chunk-NCSKCF2S.js";
 import {
   general_api_default
-} from "./chunk-YT73QWCN.js";
+} from "./chunk-AUBJUUP3.js";
+import {
+  commonErrorFallback,
+  commonErrorHandler
+} from "./chunk-PAIB5V27.js";
+import {
+  actions_default
+} from "./chunk-ZZMFXRQK.js";
+import {
+  actions as actions2,
+  sliceName as sliceName2
+} from "./chunk-DGQKXSRI.js";
+import {
+  actions as actions6,
+  sliceName as sliceName6
+} from "./chunk-7YZCUAXZ.js";
+import {
+  actions as actions5,
+  sliceName as sliceName5
+} from "./chunk-FRSA2YB5.js";
+import {
+  actions as actions4,
+  sliceName as sliceName4
+} from "./chunk-RX32WLVJ.js";
+import {
+  actions as actions3,
+  sliceName as sliceName3
+} from "./chunk-X3GZILYD.js";
+import {
+  actions,
+  sliceName
+} from "./chunk-AFICTIVU.js";
+import {
+  cleanUp,
+  getSessionInfo,
+  maxSessionAge,
+  setSessionInfo
+} from "./chunk-GAI4VYRZ.js";
 import {
   getAttrsEndpoint,
   getOnboardingState,
   getSearchEndpoint,
   getTenantCapabilities,
   getUserCapabilities
-} from "./chunk-ANB5BM5J.js";
+} from "./chunk-FVCYB5OP.js";
+import {
+  getDeploymentsById,
+  getDeploymentsByStatus
+} from "./chunk-ZWOAFHAR.js";
 import {
   getCurrentSession,
   getCurrentUser,
@@ -22,19 +63,21 @@ import {
   getIdAttribute,
   getOfflineThresholdSettings,
   getRolesById,
+  getSelectedDeviceAttribute,
   getTooltipsState,
-  getUserSettings
-} from "./chunk-KAQJH2YL.js";
-import {
-  getDeploymentsById,
-  getDeploymentsByStatus
-} from "./chunk-RX55KAKX.js";
+  getUserSettings,
+  getUsersById
+} from "./chunk-FQDSV3NK.js";
 import {
   getAuditlogState,
   getDeviceTwinIntegrations,
   getOrganization,
   getTenantsList
-} from "./chunk-Q6M5TTDQ.js";
+} from "./chunk-JO33IORF.js";
+import {
+  getFeatures,
+  getSearchState
+} from "./chunk-LIJIIRON.js";
 import {
   getDeviceById,
   getDeviceFilters,
@@ -43,7 +86,7 @@ import {
   getGroups,
   getGroupsById,
   getSelectedGroup
-} from "./chunk-XXHONFSQ.js";
+} from "./chunk-L3SY3J5M.js";
 import {
   convertDeviceListStateToFilters,
   filtersFilter,
@@ -53,48 +96,7 @@ import {
   mapTermsToFilters,
   mergePermissions,
   progress
-} from "./chunk-YETZPQFR.js";
-import {
-  getFeatures,
-  getSearchState
-} from "./chunk-LIJIIRON.js";
-import {
-  commonErrorFallback,
-  commonErrorHandler
-} from "./chunk-2RJIDREZ.js";
-import {
-  actions_default
-} from "./chunk-NNADGHSL.js";
-import {
-  actions as actions6,
-  sliceName as sliceName6
-} from "./chunk-YGBFDXXA.js";
-import {
-  actions as actions2,
-  sliceName as sliceName2
-} from "./chunk-E5LEU5PF.js";
-import {
-  actions as actions4,
-  sliceName as sliceName4
-} from "./chunk-FGKMJS3B.js";
-import {
-  actions as actions5,
-  sliceName as sliceName5
-} from "./chunk-XTRPX7JZ.js";
-import {
-  actions as actions3,
-  sliceName as sliceName3
-} from "./chunk-YTQUNAZP.js";
-import {
-  actions,
-  sliceName
-} from "./chunk-7PVGDMNM.js";
-import {
-  cleanUp,
-  getSessionInfo,
-  maxSessionAge,
-  setSessionInfo
-} from "./chunk-AMGWP7A4.js";
+} from "./chunk-GWJIY56H.js";
 import {
   ALL_DEVICE_STATES,
   DEPLOYMENT_ROUTES,
@@ -104,6 +106,7 @@ import {
   OWN_USER_ID,
   PermissionTypes,
   READ_STATES,
+  REPORT_CHART_SIZE_LIMIT,
   SSO_TYPES,
   TENANT_LIST_DEFAULT,
   USER_LOGOUT,
@@ -133,7 +136,7 @@ import {
   uiPermissionsById,
   useradmApiUrlv1,
   useradmApiUrlv2
-} from "./chunk-A6CT6GTI.js";
+} from "./chunk-OEP2D6QL.js";
 import {
   rootfsImageVersion
 } from "./chunk-CK6YE6AN.js";
@@ -148,7 +151,7 @@ import {
   defaultReports,
   headerNames,
   locations
-} from "./chunk-25AKG5HH.js";
+} from "./chunk-Y575RZHR.js";
 import {
   ALL_DEVICES,
   ALL_RELEASES,
@@ -161,16 +164,17 @@ import {
   UNGROUPED_GROUP,
   emptyRole,
   emptyUiPermissions
-} from "./chunk-4B3IMP4I.js";
+} from "./chunk-BSN2TOQC.js";
 
 // src/deploymentsSlice/thunks.ts
-import { deepCompare, isEmpty, standardizePhases, startTimeSort } from "@northern.tech/utils/helpers";
+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";
 var { receivedDevice, setSnackbar } = actions_default;
 var { page: defaultPage, perPage: defaultPerPage } = DEVICE_LIST_DEFAULTS;
 var deriveDeploymentGroup = ({ filter = {}, group, groups = [], name }) => group || groups.length === 1 && !isUUID(name) ? groups[0] : filter.name;
-var transformDeployments = (deployments, deploymentsById) => deployments.sort(startTimeSort).reduce(
+var transformDeployments = (deployments, deploymentsById) => deployments.sort(customSort(true, "created")).reduce(
   (accu, item) => {
     const filter = item.filter ?? {};
     let deployment = {
@@ -221,6 +225,26 @@ var getDeploymentsByStatus2 = createAsyncThunk(`${sliceName2}/getDeploymentsBySt
     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) => {
+  Tracking.event({ category: "deployments", action: "create" });
+  if (!totalDeploymentCount) {
+    if (!hasDeployments) {
+      Tracking.event({ category: "deployments", action: "create_initial_deployment" });
+      if (isWithinFirstMonth(trial_expiration)) {
+        Tracking.event({ category: "deployments", action: "create_initial_deployment_first_month" });
+      }
+    }
+    Tracking.event({ category: "deployments", action: "create_initial_deployment_user" });
+  }
+};
 var MAX_PREVIOUS_PHASES_COUNT = 5;
 var createDeployment = createAsyncThunk(`${sliceName2}/createDeployment`, ({ newDeployment, hasNewRetryDefault = false }, { dispatch, getState }) => {
   let request;
@@ -231,6 +255,9 @@ var createDeployment = createAsyncThunk(`${sliceName2}/createDeployment`, ({ new
   } 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);
@@ -245,6 +272,7 @@ var createDeployment = createAsyncThunk(`${sliceName2}/createDeployment`, ({ new
       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;
@@ -919,7 +947,7 @@ var getDevicesByStatus = createAsyncThunk2(`${sliceName3}/getDevicesByStatus`, (
     page = defaultPage2,
     perPage = defaultPerPage2,
     sortOptions = [],
-    selectedAttributes = []
+    selectedAttributes = getSelectedDeviceAttribute(getState())
   } = options;
   const state = getState();
   const { applicableFilters, filterTerms } = convertDeviceListStateToFilters({
@@ -1032,7 +1060,6 @@ var getReportingLimits = createAsyncThunk2(
   })
 );
 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" }];
@@ -1112,6 +1139,13 @@ var getDeviceConnect = createAsyncThunk2(
     ({ 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(
+  `${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}` : "";
@@ -1214,12 +1248,12 @@ var deleteAuthset = createAsyncThunk2(
 );
 var preauthDevice = createAsyncThunk2(
   `${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(setSnackbar2("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(setSnackbar2("Device was successfully added to the preauthorization list", TIMEOUTS.fiveSeconds))))
+  })
 );
 var decommissionDevice = createAsyncThunk2(
   `${sliceName3}/decommissionDevice`,
@@ -1385,6 +1419,7 @@ var getDevicesInBounds = createAsyncThunk2(`${sliceName3}/getDevicesInBounds`, (
 
 // 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();
@@ -1466,7 +1501,7 @@ var setOnboardingCanceled = createAsyncThunk3(
     Promise.resolve(dispatch(actions4.setShowOnboardingHelp(false))),
     Promise.resolve(dispatch(actions4.setShowDismissOnboardingTipsDialog(false))),
     Promise.resolve(dispatch(actions4.setOnboardingComplete(true)))
-  ]).then(() => dispatch(advanceOnboarding(onboardingSteps.DEPLOYMENTS_PAST_COMPLETED_FAILURE)))
+  ]).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 }) => {
   const steps = orderedOnboardingSteps;
@@ -1477,7 +1512,8 @@ var advanceOnboarding = createAsyncThunk3(`${sliceName4}/advanceOnboarding`, (st
   }
   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;
+  Tracking2.event({ category: "onboarding", action: stepId });
   return Promise.all([dispatch(actions4.setOnboardingProgress(madeProgress)), dispatch(saveUserSettings({ onboarding: state }))]);
 });
 
@@ -1556,7 +1592,7 @@ var startUpgrade = createAsyncThunk4(
 var cancelUpgrade = createAsyncThunk4(`${sliceName5}/cancelUpgrade`, (tenantId) => general_api_default.post(`${tenantadmApiUrlv2}/tenants/${tenantId}/upgrade/cancel`));
 var completeUpgrade = createAsyncThunk4(
   `${sliceName5}/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(getDeviceLimit()), dispatch(getUserOrganization())]))
 );
 var prepareAuditlogQuery = ({ startDate, endDate, user: userFilter, type, detail: detailFilter, sort = {} }) => {
   const userId = userFilter?.id || userFilter;
@@ -1604,9 +1640,15 @@ var setAuditlogsState = createAsyncThunk4(`${sliceName5}/setAuditlogsState`, (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 = createAsyncThunk4(`${sliceName5}/createTenant`, (selectionState, { dispatch }) => {
-  return general_api_default.post(`${tenantadmApiUrlv2}/tenants`, selectionState).then(() => Promise.all([dispatch(getTenants()), dispatch(setSnackbar3("Tenant was created successfully."))])).catch((err) => commonErrorHandler(err, "There was an error creating tenant", dispatch, commonErrorFallback));
-});
+var addTenant = createAsyncThunk4(
+  `${sliceName5}/createTenant`,
+  (selectionState, { dispatch }) => general_api_default.post(`${tenantadmApiUrlv2}/tenants`, selectionState).then(
+    () => Promise.all([
+      dispatch(setSnackbar3("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();
@@ -1631,21 +1673,29 @@ var setTenantsListState = createAsyncThunk4(`${sliceName5}/setTenantsListState`,
   }
   return dispatch(actions5.setTenantListState({ ...nextState }));
 });
-var editTenantDeviceLimit = createAsyncThunk4(`${sliceName5}/editDeviceLimit`, ({ newLimit, id, name }, { dispatch }) => {
-  return general_api_default.put(`${tenantadmApiUrlv2}/tenants/${id}/child`, { device_limit: newLimit, name }).catch((err) => commonErrorHandler(err, `Device Limit cannot be changed`, dispatch)).then(() => {
-    const tasks = [Promise.resolve(dispatch(setSnackbar3("Device Limit was changed successfully")))];
-    tasks.push(dispatch(getTenants()));
-    tasks.push(dispatch(getUserOrganization()));
-    return Promise.all(tasks);
-  });
-});
-var removeTenant = createAsyncThunk4(`${sliceName5}/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(setSnackbar3("Device Limit was changed successfully"))), dispatch(getTenants()), dispatch(getUserOrganization())])
-  );
-});
-var getUserOrganization = createAsyncThunk4(`${sliceName5}/getUserOrganization`, (_, { dispatch, getState }) => {
-  return general_api_default.get(`${tenantadmApiUrlv1}/user/tenant`).then((res) => {
+var editTenantDeviceLimit = createAsyncThunk4(
+  `${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([
+      dispatch(setSnackbar3("Device Limit was changed successfully")),
+      dispatch(getUserOrganization()),
+      new Promise((resolve) => setTimeout(() => resolve(dispatch(getTenants())), TIMEOUTS.oneSecond))
+    ])
+  )
+);
+var removeTenant = createAsyncThunk4(
+  `${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([
+      dispatch(setSnackbar3("The tenant was removed successfully")),
+      dispatch(getUserOrganization()),
+      new Promise((resolve) => setTimeout(() => resolve(dispatch(getTenants())), TIMEOUTS.oneSecond))
+    ])
+  )
+);
+var getUserOrganization = createAsyncThunk4(
+  `${sliceName5}/getUserOrganization`,
+  (_, { dispatch, getState }) => general_api_default.get(`${tenantadmApiUrlv1}/user/tenant`).then((res) => {
     let tasks = [dispatch(actions5.setOrganization(res.data))];
     const { addons, plan, trial } = res.data;
     const { token } = getCurrentSession(getState());
@@ -1657,15 +1707,18 @@ var getUserOrganization = createAsyncThunk4(`${sliceName5}/getUserOrganization`,
       tasks.push(dispatch(setAnnouncement(tenantDataDivergedMessage)));
     }
     return Promise.all(tasks);
-  });
-});
+  })
+);
 var sendSupportMessage = createAsyncThunk4(
   `${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(
   `${sliceName5}/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(setSnackbar3({ 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(setSnackbar3({ message: "Your request was sent successfully", autoHideDuration: TIMEOUTS.fiveSeconds }))))
 );
 var downloadLicenseReport = createAsyncThunk4(
   `${sliceName5}/downloadLicenseReport`,
@@ -1758,6 +1811,7 @@ 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 { clearAllRetryTimers } from "@northern.tech/utils/retrytimer";
 import { createAsyncThunk as createAsyncThunk5 } from "@reduxjs/toolkit";
@@ -1776,7 +1830,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(setSnackbar4(preformatWithRequestID(err.response, errorMessage), null, "Copy to clipboard")));
+  return Promise.reject(dispatch(setSnackbar4({ message: preformatWithRequestID(err.response, errorMessage), action: "Copy to clipboard" })));
 };
 var loginUser = createAsyncThunk5(
   `${sliceName6}/loginUser`,
@@ -1800,19 +1854,16 @@ var loginUser = createAsyncThunk5(
     const expiresAt = stayLoggedIn ? void 0 : now.toISOString();
     setSessionInfo({ token, expiresAt });
     cookies3.remove("JWT", { path: "/" });
-    return (
-      // @ts-ignore
-      Promise.resolve(dispatch(getUser(OWN_USER_ID))).unwrap().catch((e) => {
-        cleanUp();
-        return Promise.reject(dispatch(setSnackbar4(extractErrorMessage2(e))));
-      }).then(() => {
-        window.sessionStorage.removeItem("pendings-redirect");
-        if (window.location.pathname !== "/ui/") {
-          window.location.replace("/ui/");
-        }
-        return Promise.resolve(dispatch(actions6.successfullyLoggedIn({ expiresAt, token })));
-      })
-    );
+    return dispatch(getUser(OWN_USER_ID)).unwrap().catch((e) => {
+      cleanUp();
+      return Promise.reject(dispatch(setSnackbar4(extractErrorMessage2(e))));
+    }).then(() => {
+      window.sessionStorage.removeItem("pendings-redirect");
+      if (window.location.pathname !== "/ui/") {
+        window.location.replace("/ui/");
+      }
+      return Promise.resolve(dispatch(actions6.successfullyLoggedIn({ expiresAt, token })));
+    });
   })
 );
 var logoutUser = createAsyncThunk5(`${sliceName6}/logoutUser`, (_, { dispatch, getState }) => {
@@ -1830,6 +1881,7 @@ var switchUserOrganization = createAsyncThunk5(`${sliceName6}/switchUserOrganiza
     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();
   });
@@ -1870,11 +1922,18 @@ var verify2FA = createAsyncThunk5(
 );
 var getUserList = createAsyncThunk5(
   `${sliceName6}/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(actions6.receivedUserList(users));
   }).catch((err) => commonErrorHandler(err, `Users couldn't be loaded.`, dispatch, commonErrorFallback))
 );
@@ -1883,9 +1942,7 @@ var getUser = createAsyncThunk5(
   (id, { dispatch, rejectWithValue }) => general_api_default.get(`${useradmApiUrlv1}/users/${id}`).then(
     ({ data: user }) => Promise.all([
       dispatch(actions6.receivedUser(user)),
-      // @ts-ignore
       dispatch(setHideAnnouncement({ shouldHide: false, userId: user.id })),
-      // @ts-ignore
       dispatch(updateUserColumnSettings({ currentUserId: user.id })),
       user
     ])
@@ -1932,10 +1989,7 @@ var createUser = createAsyncThunk5(
 );
 var removeUser = createAsyncThunk5(
   `${sliceName6}/removeUser`,
-  (userId, { dispatch }) => (
-    // @ts-ignore
-    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(`${useradmApiUrlv1}/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(
   `${sliceName6}/editUser`,
@@ -1956,7 +2010,7 @@ var enableUser2fa = createAsyncThunk5(
 );
 var disableUser2fa = createAsyncThunk5(
   `${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.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(actions6.receivedQrCode(null))]))
 );
 var mapHttpPermission = (permission) => Object.entries(uiPermissionsByArea).reduce(
   (accu, [area, definition]) => {
@@ -2109,7 +2163,6 @@ var getPermissionSets = createAsyncThunk5(
         accu[permissionSet.name] = permissionSetObject;
         return accu;
       },
-      // @ts-ignore
       { ...getState().users.permissionSetsById }
     );
     return Promise.all([dispatch(actions6.receivedPermissionSets(permissionSets)), permissionSets]);
@@ -2202,7 +2255,6 @@ var transformRoleDataToRole = (roleData, roleState = {}) => {
     role: {
       ...emptyRole,
       name,
-      // @ts-ignore
       description: description ? description : roleState.description,
       uiPermissions: {
         ...emptyUiPermissions,
@@ -2245,10 +2297,7 @@ var editRole = createAsyncThunk5(`${sliceName6}/editRole`, (roleData, { dispatch
 });
 var removeRole = createAsyncThunk5(
   `${sliceName6}/removeRole`,
-  (roleId, { dispatch }) => (
-    // @ts-ignore
-    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))
-  )
+  (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(
   `${sliceName6}/getGlobalSettings`,
@@ -2259,7 +2308,6 @@ var getGlobalSettings2 = createAsyncThunk5(
 );
 var saveGlobalSettings = createAsyncThunk5(
   `${sliceName6}/saveGlobalSettings`,
-  // @ts-ignore
   ({ beOptimistic = false, notify = false, ...settings }, { dispatch, getState }) => {
     if (!window.sessionStorage.getItem(settingsKeys.initialized) && !beOptimistic) {
       return;
@@ -2305,11 +2353,9 @@ var saveUserSettings = createAsyncThunk5(`${sliceName6}/saveUserSettings`, (sett
     const tooltipState = getTooltipsState(getState());
     const updatedSettings = {
       ...userSettings,
-      // @ts-ignore
       ...settings,
       onboarding: {
         ...onboardingState,
-        // @ts-ignore
         ...settings.onboarding
       },
       tooltips: tooltipState
@@ -2353,10 +2399,7 @@ var generateToken = createAsyncThunk5(
 );
 var revokeToken = createAsyncThunk5(
   `${sliceName6}/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 = createAsyncThunk5(`${sliceName6}/setTooltipReadState`, ({ persist, ...remainder }, { dispatch }) => {
   let tasks = [dispatch(actions6.setTooltipState(remainder))];
@@ -2365,23 +2408,20 @@ var setTooltipReadState = createAsyncThunk5(`${sliceName6}/setTooltipReadState`,
   }
   return Promise.all(tasks);
 });
-var setAllTooltipsReadState = createAsyncThunk5(`${sliceName6}/toggleHelptips`, ({ readState = READ_STATES.read, tooltips }, { dispatch }) => {
-  const updatedTips = tooltips.reduce((accu, id) => ({ ...accu, [id]: { readState } }), {});
+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(
   `${sliceName6}/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(actions6.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(actions6.setShowFeedbackDialog(false)), TIMEOUTS.threeSeconds);
+  })
 );
 
 // src/appSlice/thunks.ts
@@ -2540,6 +2580,7 @@ export {
   deriveReportsData,
   getReportsDataWithoutBackendSupport,
   getDeviceConnect,
+  triggerDeviceUpdate,
   getSessionDetails,
   getDeviceFileDownloadLink,
   deviceFileUpload,
@@ -2559,7 +2600,6 @@ export {
   getSystemDevices,
   getGatewayDevices,
   getDevicesInBounds,
-  applyOnboardingFallbacks,
   getOnboardingState2 as getOnboardingState,
   setOnboardingDeviceType,
   setOnboardingApproach,
@@ -2635,4 +2675,4 @@ export {
   setAllTooltipsReadState,
   submitFeedback
 };
-//# sourceMappingURL=chunk-74OJIKXF.js.map
+//# sourceMappingURL=chunk-EQLHIPPR.js.map