@northern.tech/store 0.27.0 → 0.29.0

package/dist/storehooks.js

@@ -16,35 +16,35 @@ import {
   getUserSettings as getUserSettings2,
   saveGlobalSettings,
   saveUserSettings
-} from "./chunk-3JFB22RN.js";
+} from "./chunk-FXPRG4WH.js";
 import {
   getReleases
-} from "./chunk-GEJJVRND.js";
-import "./chunk-MTY2ODOS.js";
-import "./chunk-DXMRQEP6.js";
+} from "./chunk-Z4QLZNAN.js";
+import "./chunk-KEQAPMP6.js";
+import "./chunk-UE2EPKRU.js";
 import "./chunk-SDWPOLHM.js";
 import "./chunk-VK6FVQ5K.js";
 import {
   actions_default
-} from "./chunk-GDJES5SY.js";
+} from "./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 {
   getSessionInfo
 } from "./chunk-WXRYJOL3.js";
-import "./chunk-KR5IU7TA.js";
+import "./chunk-4573DUCR.js";
 import "./chunk-NMAXZ3ZY.js";
 import {
   getIsEnterprise,
   getOnboardingState,
   getUserCapabilities
-} from "./chunk-DWK4R74O.js";
+} from "./chunk-4BUO44SS.js";
 import "./chunk-VLII64V6.js";
 import {
   getGlobalSettings,
@@ -54,13 +54,13 @@ import {
 import {
   getIsServiceProvider
 } from "./chunk-XHLNGIAP.js";
-import "./chunk-FAKWYYOB.js";
+import "./chunk-YO22XLHI.js";
 import "./chunk-JIS4PA3R.js";
+import "./chunk-FAKWYYOB.js";
 import {
   getDevicesByStatus,
   getSortedFilteringAttributes
-} from "./chunk-WIGVDU4L.js";
-import "./chunk-YO22XLHI.js";
+} from "./chunk-66LI4BJO.js";
 import {
   getFeatures
 } from "./chunk-4BHM6WVX.js";

package/dist/thunks.cjs

@@ -1139,6 +1139,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_toolkit2.createSelector)([getUploads], (uploadsById) => !!Object.keys(uploadsById).length);
 var getSearchedDevices = (0, import_toolkit2.createSelector)([getSearchState], ({ deviceIds }) => deviceIds);
 var getVersionInformation = (0, import_toolkit2.createSelector)(
@@ -1299,9 +1300,11 @@ var getAttributesList = (0, import_toolkit4.createSelector)(
   [getFilteringAttributes, getFilteringAttributesFromConfig],
   ({ identityAttributes = [], inventoryAttributes = [] }, { identity = [], inventory = [] }) => [...identityAttributes, ...inventoryAttributes, ...identity, ...inventory].filter(import_helpers2.duplicateFilter)
 );
-var getDeviceLimitStats = (0, import_toolkit4.createSelector)([getDeviceLimits, getAcceptedDevices], (limits, accepted) => {
+var getEnabledTierLimits = (0, import_toolkit4.createSelector)([getDeviceLimits], (limits) => Object.entries(limits).filter(([, limit]) => limit !== 0));
+var getEnabledTiers = (0, import_toolkit4.createSelector)([getEnabledTierLimits], (enabledTierLimits) => enabledTierLimits.map(([type]) => type));
+var getDeviceLimitStats = (0, import_toolkit4.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
@@ -1602,7 +1605,6 @@ var getOfflineThresholdSettings = (0, import_toolkit7.createSelector)([getGlobal
   intervalUnit: offlineThreshold?.intervalUnit || DEVICE_ONLINE_CUTOFF.intervalName
 }));
 var getRolesList = (0, import_toolkit7.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
@@ -3185,7 +3187,7 @@ var saveDeltaDeploymentsConfig = createAppAsyncThunk(
 );
 var generateDeploymentLogAnalysis = createAppAsyncThunk(
   `${sliceName2}/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);
     }
@@ -4273,7 +4275,6 @@ var advanceOnboarding = createAppAsyncThunk(`${sliceName5}/advanceOnboarding`, (
 var import_helpers11 = require("@northern.tech/utils/helpers");
 var import_dayjs2 = __toESM(require("dayjs"), 1);
 var import_utc = __toESM(require("dayjs/plugin/utc.js"), 1);
-var import_jwt_decode = require("jwt-decode");
 var import_md5 = __toESM(require("md5"), 1);
 var import_universal_cookie5 = __toESM(require("universal-cookie"), 1);
 var cookies5 = new import_universal_cookie5.default();
@@ -4542,14 +4543,13 @@ var removeTenant = createAppAsyncThunk(
 var getUserOrganization = createAppAsyncThunk(
   `${sliceName6}/getUserOrganization`,
   (_, { dispatch, getState }) => general_api_default.get(`${import_constants5.tenantadmApiUrlv1}/user/tenant?tiers=true`).then((res) => {
-    const tasks = [dispatch(actions6.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(actions6.setOrganization(res.data))];
+    if (currentId && !(0, import_helpers11.deepCompare)({ addons, plan, trial }, { addons: currentAddons, plan: currentPlan, trial: currentTrial })) {
       const hash = (0, import_md5.default)(tenantDataDivergedMessage);
-      cookies5.remove(`${jwt.sub}${hash}`);
+      const { id: currentUserId } = getCurrentUser(getState());
+      cookies5.remove(`${currentUserId}${hash}`);
       tasks.push(dispatch(setAnnouncement(tenantDataDivergedMessage)));
     }
     return Promise.all(tasks);
@@ -5699,7 +5699,8 @@ var setHideAnnouncement = createAppAsyncThunk(
   `${sliceName8}/setHideAnnouncement`,
   ({ shouldHide, userId }, { dispatch, getState }) => {
     const currentUserId = userId || getCurrentUser(getState()).id;
-    const hash = getState().app.hostedAnnouncement ? (0, import_md52.default)(getState().app.hostedAnnouncement) : "";
+    const announcement = getHostedAnnouncement(getState());
+    const hash = announcement ? (0, import_md52.default)(announcement) : "";
     const announceCookie = cookies6.get(`${currentUserId}${hash}`);
     if (shouldHide || hash.length && typeof announceCookie !== "undefined") {
       cookies6.set(`${currentUserId}${hash}`, true, { maxAge: 604800 });