@northern.tech/store 0.3.2 → 0.3.3

package/dist/constants.js

@@ -14,6 +14,7 @@ import {
   OWN_USER_ID,
   PermissionTypes,
   READ_STATES,
+  REPORT_CHART_SIZE_LIMIT,
   SP_AUDIT_LOGS_TYPES,
   SSO_TYPES,
   TENANT_LIST_DEFAULT,
@@ -21,6 +22,7 @@ import {
   XML_METADATA_FORMAT,
   alertChannels,
   auditLogsApiUrl,
+  auditlogTypes,
   checkPermissionsObject,
   defaultPermissionSets,
   defaultStats,
@@ -62,7 +64,7 @@ import {
   uiPermissionsById,
   useradmApiUrlv1,
   useradmApiUrlv2
-} from "./chunk-A6CT6GTI.js";
+} from "./chunk-C5NEDBJI.js";
 import {
   ARTIFACT_GENERATION_TYPE,
   currentArtifact,
@@ -92,7 +94,7 @@ import {
   headerNames,
   locations,
   yes
-} from "./chunk-25AKG5HH.js";
+} from "./chunk-UWMYZNUB.js";
 import {
   ALL_DEVICES,
   ALL_RELEASES,
@@ -147,6 +149,7 @@ export {
   PLANS,
   PermissionTypes,
   READ_STATES,
+  REPORT_CHART_SIZE_LIMIT,
   SORTING_OPTIONS,
   SP_AUDIT_LOGS_TYPES,
   SSO_TYPES,
@@ -159,6 +162,7 @@ export {
   apiRoot,
   apiUrl,
   auditLogsApiUrl,
+  auditlogTypes,
   canAccess,
   chartTypes,
   checkPermissionsObject,

package/dist/deploymentdevicehook.cjs

@@ -27,14 +27,14 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/deploymentdevicehook.js
+// src/deploymentdevicehook.ts
 var deploymentdevicehook_exports = {};
 __export(deploymentdevicehook_exports, {
   useDeploymentDevice: () => useDeploymentDevice
 });
 module.exports = __toCommonJS(deploymentdevicehook_exports);
 var import_react = require("react");
-var import_react_redux = require("react-redux");
+var import_react_redux2 = require("react-redux");
 
 // src/appSlice/selectors.ts
 var import_helpers = require("@northern.tech/utils/helpers");
@@ -86,28 +86,28 @@ var PLANS = {
     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 = {
@@ -440,6 +440,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" };
@@ -521,13 +522,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,
@@ -660,7 +664,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: [
@@ -811,7 +815,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: {
@@ -1183,7 +1187,7 @@ var getGroups = (0, import_toolkit3.createSelector)([getGroupsById], (groupsById
     (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 {
@@ -1256,14 +1260,15 @@ var getAuditLogEntry = (0, import_toolkit4.createSelector)([getAuditLog, getAudi
 // src/utils.ts
 var import_helpers3 = 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_helpers3.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_helpers3.yes,
+  [DEVICE_FILTERING_OPTIONS.$nexists.key]: () => false
 };
 var filterAliases = {
   $nexists: { alias: DEVICE_FILTERING_OPTIONS.$exists.key, value: false }
@@ -1387,8 +1392,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_toolkit6.createSelector)([getUsersById], (usersById) => Object.values(usersById));
 var getCurrentUser = (0, import_toolkit6.createSelector)([getUsersById, getCurrentUserId], (usersById, userId) => usersById[userId] ?? {});
 var getUserSettings = (state) => state.users.userSettings;
+var getSelectedDeviceAttribute = (0, import_toolkit6.createSelector)(
+  [getUserSettings],
+  ({ columnSelection }) => columnSelection.map((attribute) => ({ attribute: attribute.key, scope: attribute.scope }))
+);
 var getIsDarkMode = (0, import_toolkit6.createSelector)([getUserSettings], ({ mode }) => isDarkMode(mode));
 var getShowHelptips = (0, import_toolkit6.createSelector)(
   [getTooltipsById],
@@ -1413,7 +1423,7 @@ var getOfflineThresholdSettings = (0, import_toolkit6.createSelector)([getGlobal
   interval: offlineThreshold?.interval || DEVICE_ONLINE_CUTOFF.interval,
   intervalUnit: offlineThreshold?.intervalUnit || DEVICE_ONLINE_CUTOFF.intervalName
 }));
-var getRolesList = (0, import_toolkit6.createSelector)([getRolesById], (rolesById2) => Object.entries(rolesById2).map(([id, role]) => ({ id, ...role })));
+var getRolesList = (0, import_toolkit6.createSelector)([getRolesById], (rolesById2) => Object.entries(rolesById2).map(([value, role]) => ({ value, ...role })));
 
 // src/commonSelectors.ts
 var getIsEnterprise = (0, import_toolkit7.createSelector)(
@@ -1474,12 +1484,18 @@ var getUserCapabilities = (0, import_toolkit7.createSelector)([getUserRoles, get
 });
 var getTenantCapabilities = (0, import_toolkit7.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,
@@ -1609,7 +1625,7 @@ var getAuditlogDevice = (0, import_toolkit7.createSelector)([getAuditLogEntry, g
 var getRelevantRoles = (0, import_toolkit7.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);
@@ -1617,7 +1633,7 @@ var getRelevantRoles = (0, import_toolkit7.createSelector)([getOrganization, get
     }, 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);
@@ -2685,13 +2701,12 @@ var actions_default = {
 };
 
 // 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) => {
@@ -2717,6 +2732,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)({
@@ -2732,15 +2755,17 @@ var getConfiguredStore = (options = {}) => {
         ignoredActionPaths: ["uploads", "snackbar", /payload\..*$/],
         ignoredPaths: ["app.uploadsById", "app.snackbar", "organization.externalDeviceIntegrations"]
       }
-    })
+    }).concat(rejectionLoggerMiddleware)
   });
 };
 var store = getConfiguredStore({
   preloadedState: {}
 });
+var useAppDispatch = import_react_redux.useDispatch;
 
 // 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;
@@ -2797,6 +2822,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;
@@ -2807,6 +2852,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);
@@ -2821,6 +2869,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;
@@ -3495,7 +3544,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({
@@ -3608,7 +3657,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" }];
@@ -3688,6 +3736,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}` : "";
@@ -3790,12 +3845,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`,
@@ -4022,6 +4077,9 @@ var changeNotificationSetting = (0, import_toolkit20.createAsyncThunk)(
   }
 );
 
+// src/usersSlice/thunks.ts
+var import_helptips = require("@northern.tech/common-ui/helptips");
+
 // src/api/users-api.ts
 var import_axios3 = __toESM(require("axios"), 1);
 var Api2 = {
@@ -4055,7 +4113,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((0, import_helpers10.preformatWithRequestID)(err.response, errorMessage), null, "Copy to clipboard")));
+  return Promise.reject(dispatch(setSnackbar4({ message: (0, import_helpers10.preformatWithRequestID)(err.response, errorMessage), action: "Copy to clipboard" })));
 };
 var loginUser = (0, import_toolkit21.createAsyncThunk)(
   `${sliceName8}/loginUser`,
@@ -4079,19 +4137,16 @@ var loginUser = (0, import_toolkit21.createAsyncThunk)(
     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((0, import_helpers10.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(setSnackbar4((0, import_helpers10.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_toolkit21.createAsyncThunk)(`${sliceName8}/logoutUser`, (_, { dispatch, getState }) => {
@@ -4109,6 +4164,7 @@ var switchUserOrganization = (0, import_toolkit21.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();
   });
@@ -4149,11 +4205,18 @@ var verify2FA = (0, import_toolkit21.createAsyncThunk)(
 );
 var getUserList = (0, import_toolkit21.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))
 );
@@ -4162,9 +4225,7 @@ var getUser = (0, import_toolkit21.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
     ])
@@ -4211,10 +4272,7 @@ var createUser = (0, import_toolkit21.createAsyncThunk)(
 );
 var removeUser = (0, import_toolkit21.createAsyncThunk)(
   `${sliceName8}/removeUser`,
-  (userId, { dispatch }) => (
-    // @ts-ignore
-    general_api_default.delete(`${useradmApiUrlv1}/users/${userId}`).then(() => Promise.all([dispatch(actions8.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(actions8.removedUser(userId)), dispatch(getUserList()), dispatch(setSnackbar4(userActions.remove.successMessage))])).catch((err) => userActionErrorHandler(err, "remove", dispatch))
 );
 var editUser = (0, import_toolkit21.createAsyncThunk)(
   `${sliceName8}/editUser`,
@@ -4235,7 +4293,7 @@ var enableUser2fa = (0, import_toolkit21.createAsyncThunk)(
 );
 var disableUser2fa = (0, import_toolkit21.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]) => {
@@ -4388,7 +4446,6 @@ var getPermissionSets = (0, import_toolkit21.createAsyncThunk)(
         accu[permissionSet.name] = permissionSetObject;
         return accu;
       },
-      // @ts-ignore
       { ...getState().users.permissionSetsById }
     );
     return Promise.all([dispatch(actions8.receivedPermissionSets(permissionSets)), permissionSets]);
@@ -4481,7 +4538,6 @@ var transformRoleDataToRole = (roleData, roleState = {}) => {
     role: {
       ...emptyRole,
       name,
-      // @ts-ignore
       description: description ? description : roleState.description,
       uiPermissions: {
         ...emptyUiPermissions,
@@ -4524,10 +4580,7 @@ var editRole = (0, import_toolkit21.createAsyncThunk)(`${sliceName8}/editRole`,
 });
 var removeRole = (0, import_toolkit21.createAsyncThunk)(
   `${sliceName8}/removeRole`,
-  (roleId, { dispatch }) => (
-    // @ts-ignore
-    general_api_default.delete(`${useradmApiUrlv2}/roles/${roleId}`).then(() => Promise.all([dispatch(actions8.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(actions8.removedRole(roleId)), dispatch(getRoles()), dispatch(setSnackbar4(roleActions.remove.successMessage))])).catch((err) => roleActionErrorHandler(err, "remove", dispatch))
 );
 var getGlobalSettings2 = (0, import_toolkit21.createAsyncThunk)(
   `${sliceName8}/getGlobalSettings`,
@@ -4538,7 +4591,6 @@ var getGlobalSettings2 = (0, import_toolkit21.createAsyncThunk)(
 );
 var saveGlobalSettings = (0, import_toolkit21.createAsyncThunk)(
   `${sliceName8}/saveGlobalSettings`,
-  // @ts-ignore
   ({ beOptimistic = false, notify = false, ...settings }, { dispatch, getState }) => {
     if (!window.sessionStorage.getItem(settingsKeys.initialized) && !beOptimistic) {
       return;
@@ -4584,11 +4636,9 @@ var saveUserSettings = (0, import_toolkit21.createAsyncThunk)(`${sliceName8}/sav
     const tooltipState = getTooltipsState(getState());
     const updatedSettings = {
       ...userSettings,
-      // @ts-ignore
       ...settings,
       onboarding: {
         ...onboardingState,
-        // @ts-ignore
         ...settings.onboarding
       },
       tooltips: tooltipState
@@ -4632,10 +4682,7 @@ var generateToken = (0, import_toolkit21.createAsyncThunk)(
 );
 var revokeToken = (0, import_toolkit21.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_toolkit21.createAsyncThunk)(`${sliceName8}/setTooltipReadState`, ({ persist, ...remainder }, { dispatch }) => {
   let tasks = [dispatch(actions8.setTooltipState(remainder))];
@@ -4644,31 +4691,28 @@ var setTooltipReadState = (0, import_toolkit21.createAsyncThunk)(`${sliceName8}/
   }
   return Promise.all(tasks);
 });
-var setAllTooltipsReadState = (0, import_toolkit21.createAsyncThunk)(`${sliceName8}/toggleHelptips`, ({ readState = READ_STATES.read, tooltips }, { dispatch }) => {
-  const updatedTips = tooltips.reduce((accu, id) => ({ ...accu, [id]: { readState } }), {});
+var setAllTooltipsReadState = (0, import_toolkit21.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_toolkit21.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/deploymentdevicehook.js
+// src/deploymentdevicehook.ts
 var import_validator2 = require("validator");
 var useDeploymentDevice = (deploymentName) => {
   const isLoading = (0, import_react.useRef)(false);
-  const dispatch = (0, import_react_redux.useDispatch)();
-  const devicesById = (0, import_react_redux.useSelector)(getDevicesById);
+  const dispatch = useAppDispatch();
+  const devicesById = (0, import_react_redux2.useSelector)(getDevicesById);
   const hasDeviceInfo = !!devicesById[deploymentName];
   (0, import_react.useEffect)(() => {
     if (isLoading.current) {