@northern.tech/store 0.27.0 → 0.29.0

package/dist/onboardingSlice/thunks.js

@@ -5,32 +5,32 @@ import {
   setOnboardingCanceled,
   setOnboardingComplete,
   setOnboardingDeviceType
-} from "../chunk-3JFB22RN.js";
-import "../chunk-GEJJVRND.js";
-import "../chunk-MTY2ODOS.js";
-import "../chunk-DXMRQEP6.js";
+} from "../chunk-FXPRG4WH.js";
+import "../chunk-Z4QLZNAN.js";
+import "../chunk-KEQAPMP6.js";
+import "../chunk-UE2EPKRU.js";
 import "../chunk-SDWPOLHM.js";
 import "../chunk-VK6FVQ5K.js";
-import "../chunk-GDJES5SY.js";
+import "../chunk-5OLM3HEG.js";
 import "../chunk-525LX7VL.js";
 import "../chunk-4YLOOOZH.js";
 import "../chunk-LSAJE3IU.js";
-import "../chunk-2QIGK5IU.js";
-import "../chunk-CQXDAXQF.js";
 import "../chunk-HVZ5BOM6.js";
-import "../chunk-GX3X2E57.js";
+import "../chunk-CQXDAXQF.js";
 import "../chunk-UBFFGYQ4.js";
+import "../chunk-GX3X2E57.js";
+import "../chunk-2QIGK5IU.js";
 import "../chunk-WXRYJOL3.js";
-import "../chunk-KR5IU7TA.js";
+import "../chunk-4573DUCR.js";
 import "../chunk-NMAXZ3ZY.js";
-import "../chunk-DWK4R74O.js";
+import "../chunk-4BUO44SS.js";
 import "../chunk-VLII64V6.js";
 import "../chunk-QX67O5A2.js";
 import "../chunk-XHLNGIAP.js";
-import "../chunk-FAKWYYOB.js";
-import "../chunk-JIS4PA3R.js";
-import "../chunk-WIGVDU4L.js";
 import "../chunk-YO22XLHI.js";
+import "../chunk-JIS4PA3R.js";
+import "../chunk-FAKWYYOB.js";
+import "../chunk-66LI4BJO.js";
 import "../chunk-4BHM6WVX.js";
 import "../chunk-SDHCQ62K.js";
 import "../chunk-CMXRPUOF.js";

package/dist/organizationSlice/thunks.cjs

@@ -76,7 +76,6 @@ module.exports = __toCommonJS(thunks_exports);
 var import_helpers11 = require("@northern.tech/utils/helpers");
 var import_dayjs3 = __toESM(require("dayjs"), 1);
 var import_utc = __toESM(require("dayjs/plugin/utc.js"), 1);
-var import_jwt_decode = require("jwt-decode");
 var import_md52 = __toESM(require("md5"), 1);
 var import_universal_cookie5 = __toESM(require("universal-cookie"), 1);
 
@@ -1800,6 +1799,7 @@ var getFeatures = (state) => state.app.features;
 var getFullVersionInformation = (state) => state.app.versionInformation;
 var getSearchState = (state) => state.app.searchState;
 var getUploads = (state) => state.app.uploadsById;
+var getHostedAnnouncement = (state) => state.app.hostedAnnouncement;
 var getIsUploading = (0, import_toolkit9.createSelector)([getUploads], (uploadsById) => !!Object.keys(uploadsById).length);
 var getSearchedDevices = (0, import_toolkit9.createSelector)([getSearchState], ({ deviceIds }) => deviceIds);
 var getVersionInformation = (0, import_toolkit9.createSelector)(
@@ -1960,9 +1960,11 @@ var getAttributesList = (0, import_toolkit11.createSelector)(
   [getFilteringAttributes, getFilteringAttributesFromConfig],
   ({ identityAttributes = [], inventoryAttributes = [] }, { identity = [], inventory = [] }) => [...identityAttributes, ...inventoryAttributes, ...identity, ...inventory].filter(import_helpers3.duplicateFilter)
 );
-var getDeviceLimitStats = (0, import_toolkit11.createSelector)([getDeviceLimits, getAcceptedDevices], (limits, accepted) => {
+var getEnabledTierLimits = (0, import_toolkit11.createSelector)([getDeviceLimits], (limits) => Object.entries(limits).filter(([, limit]) => limit !== 0));
+var getEnabledTiers = (0, import_toolkit11.createSelector)([getEnabledTierLimits], (enabledTierLimits) => enabledTierLimits.map(([type]) => type));
+var getDeviceLimitStats = (0, import_toolkit11.createSelector)([getEnabledTierLimits, getAcceptedDevices], (enabledTierLimits, accepted) => {
   const { counts } = accepted;
-  return Object.entries(limits).filter(([, limit]) => limit !== 0).map(([type, limit]) => ({
+  return enabledTierLimits.map(([type, limit]) => ({
     type,
     limit,
     total: counts[type] || 0
@@ -2263,7 +2265,6 @@ var getOfflineThresholdSettings = (0, import_toolkit14.createSelector)([getGloba
   intervalUnit: offlineThreshold?.intervalUnit || DEVICE_ONLINE_CUTOFF.intervalName
 }));
 var getRolesList = (0, import_toolkit14.createSelector)([getRolesById], (rolesById2) => Object.entries(rolesById2).map(([value, role]) => ({ value, ...role })));
-var getCurrentSession = (state) => state.users.currentSession;
 var getSecurityAlertDismissedTimestamp = (state) => state.users.userSettings.securityAlertDismissedTimestamp;
 
 // src/commonSelectors.ts
@@ -3053,7 +3054,7 @@ var saveDeltaDeploymentsConfig = createAppAsyncThunk(
 );
 var generateDeploymentLogAnalysis = createAppAsyncThunk(
   `${sliceName3}/generateDeploymentLogAnalysis`,
-  ({ deploymentId, deviceId }, { dispatch, rejectWithValue }) => general_api_default.get(`${import_constants5.apiRoot}/v1alpha1/deployments/deployments/${deploymentId}/devices/${deviceId}/log/explain`).then(({ data: result }) => Promise.resolve(result)).catch((err) => {
+  ({ deploymentId, deviceId }, { dispatch, rejectWithValue }) => general_api_default.get(`${import_constants5.apiRoot}/v1alpha1/deployments/deployments/${deploymentId}/devices/${deviceId}/log/explain`, { timeout: 60 * TIMEOUTS.oneSecond }).then(({ data: result }) => Promise.resolve(result)).catch((err) => {
     if (err.response.status === 429) {
       return rejectWithValue(err.response);
     }
@@ -4643,7 +4644,8 @@ var setHideAnnouncement = createAppAsyncThunk(
   `${sliceName8}/setHideAnnouncement`,
   ({ shouldHide, userId }, { dispatch, getState }) => {
     const currentUserId = userId || getCurrentUser(getState()).id;
-    const hash = getState().app.hostedAnnouncement ? (0, import_md5.default)(getState().app.hostedAnnouncement) : "";
+    const announcement = getHostedAnnouncement(getState());
+    const hash = announcement ? (0, import_md5.default)(announcement) : "";
     const announceCookie = cookies4.get(`${currentUserId}${hash}`);
     if (shouldHide || hash.length && typeof announceCookie !== "undefined") {
       cookies4.set(`${currentUserId}${hash}`, true, { maxAge: 604800 });
@@ -4965,14 +4967,13 @@ var removeTenant = createAppAsyncThunk(
 var getUserOrganization = createAppAsyncThunk(
   `${sliceName}/getUserOrganization`,
   (_, { dispatch, getState }) => general_api_default.get(`${import_constants5.tenantadmApiUrlv1}/user/tenant?tiers=true`).then((res) => {
-    const tasks = [dispatch(actions.setOrganization(res.data))];
     const { addons, plan, trial } = res.data;
-    const { token } = getCurrentSession(getState());
-    const jwt = (0, import_jwt_decode.jwtDecode)(token);
-    const jwtData = { addons: jwt["mender.addons"], plan: jwt["mender.plan"], trial: jwt["mender.trial"] };
-    if (!(0, import_helpers11.deepCompare)({ addons, plan, trial }, jwtData)) {
+    const { addons: currentAddons, id: currentId, plan: currentPlan, trial: currentTrial } = getOrganization(getState());
+    const tasks = [dispatch(actions.setOrganization(res.data))];
+    if (currentId && !(0, import_helpers11.deepCompare)({ addons, plan, trial }, { addons: currentAddons, plan: currentPlan, trial: currentTrial })) {
       const hash = (0, import_md52.default)(tenantDataDivergedMessage);
-      cookies5.remove(`${jwt.sub}${hash}`);
+      const { id: currentUserId } = getCurrentUser(getState());
+      cookies5.remove(`${currentUserId}${hash}`);
       tasks.push(dispatch(setAnnouncement2(tenantDataDivergedMessage)));
     }
     return Promise.all(tasks);