@northern.tech/store 0.28.0 → 0.30.0

package/dist/storehooks.cjs

@@ -765,7 +765,6 @@ var initialState = {
     hasManifestsEnabled: false,
     hasMonitor: false,
     hasMCUEnabled: false,
-    hasReporting: false,
     isHosted: true,
     isEnterprise: false
   },
@@ -1716,6 +1715,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)(
@@ -2200,7 +2200,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
@@ -2208,14 +2207,6 @@ var getIsEnterprise = (0, import_toolkit15.createSelector)(
   [getOrganization, getFeatures],
   ({ plan = PLANS.os.id }, { isEnterprise, isHosted }) => isEnterprise || isHosted && plan === PLANS.enterprise.id
 );
-var getAttrsEndpoint = (0, import_toolkit15.createSelector)(
-  [getFeatures],
-  ({ hasReporting }) => hasReporting ? `${import_constants5.reportingApiUrl}/devices/search/attributes` : `${import_constants5.inventoryApiUrlV2}/filters/attributes`
-);
-var getSearchEndpoint = (0, import_toolkit15.createSelector)(
-  [getFeatures],
-  ({ hasReporting }) => hasReporting ? `${import_constants5.reportingApiUrl}/devices/search` : `${import_constants5.inventoryApiUrlV2}/filters/search`
-);
 var getUserRoles = (0, import_toolkit15.createSelector)([getCurrentUser, getRolesById, getIsEnterprise], (currentUser, rolesById2, isEnterprise) => {
   const isAdmin = currentUser.roles?.length ? currentUser.roles.some((role) => role === import_constants5.rolesByName.admin) : !isEnterprise;
   const uiPermissions = isAdmin ? mapUserRolesToUiPermissions([import_constants5.rolesByName.admin], rolesById2) : mapUserRolesToUiPermissions(currentUser.roles || [], rolesById2);
@@ -2349,9 +2340,9 @@ var getSelectedDeploymentData = (0, import_toolkit15.createSelector)(
   }
 );
 var getAvailableIssueOptionsByType = (0, import_toolkit15.createSelector)(
-  [getFeatures, getTenantCapabilities, getIssueCountsByType],
-  ({ hasReporting }, { hasFullFiltering, hasMonitor }, issueCounts) => Object.values(import_constants5.DEVICE_ISSUE_OPTIONS).reduce((accu, { isCategory, key, needsFullFiltering, needsMonitor, needsReporting, title }) => {
-    if (isCategory || needsReporting && !hasReporting || needsFullFiltering && !hasFullFiltering || needsMonitor && !hasMonitor) {
+  [getTenantCapabilities, getIssueCountsByType],
+  ({ hasFullFiltering, hasMonitor }, issueCounts) => Object.values(import_constants5.DEVICE_ISSUE_OPTIONS).reduce((accu, { isCategory, key, needsFullFiltering, needsMonitor, title }) => {
+    if (isCategory || needsFullFiltering && !hasFullFiltering || needsMonitor && !hasMonitor) {
       return accu;
     }
     accu[key] = { count: issueCounts[key].filtered, key, title };
@@ -3036,7 +3027,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);
     }
@@ -3348,7 +3339,7 @@ var getAllGroupDevices = createAppAsyncThunk(
       state: getState(),
       status: import_constants5.DEVICE_STATES.accepted
     });
-    const getAllDevices = (perPage = MAX_PAGE_SIZE, page = defaultPage2, devices = []) => general_api_default.post(getSearchEndpoint(getState()), {
+    const getAllDevices = (perPage = MAX_PAGE_SIZE, page = defaultPage2, devices = []) => general_api_default.post(`${import_constants5.inventoryApiUrlV2}/filters/search`, {
       page,
       per_page: perPage,
       filters: filterTerms,
@@ -3377,18 +3368,21 @@ var getAllDynamicGroupDevices = createAppAsyncThunk(
       state: getState(),
       status: import_constants5.DEVICE_STATES.accepted
     });
-    const getAllDevices = (perPage = MAX_PAGE_SIZE, page = defaultPage2, devices = []) => general_api_default.post(getSearchEndpoint(getState()), { page, per_page: perPage, filters, attributes: [...attributes, { scope: "inventory", attribute }] }).then(
-      (res) => {
-        const state = getState();
-        const deviceAccu = reduceReceivedDevices(res.data, devices, state);
-        dispatch(actions3.receivedDevices(deviceAccu.devicesById));
-        const total = Number(res.headers[import_constants5.headerNames.total]);
-        if (total > deviceAccu.ids.length) {
-          return getAllDevices(perPage, page + 1, deviceAccu.ids);
-        }
-        return Promise.resolve(dispatch(actions3.addGroup({ group: { deviceIds: deviceAccu.ids, total }, groupName: group })));
+    const getAllDevices = (perPage = MAX_PAGE_SIZE, page = defaultPage2, devices = []) => general_api_default.post(`${import_constants5.inventoryApiUrlV2}/filters/search`, {
+      page,
+      per_page: perPage,
+      filters,
+      attributes: [...attributes, { scope: "inventory", attribute }]
+    }).then((res) => {
+      const state = getState();
+      const deviceAccu = reduceReceivedDevices(res.data, devices, state);
+      dispatch(actions3.receivedDevices(deviceAccu.devicesById));
+      const total = Number(res.headers[import_constants5.headerNames.total]);
+      if (total > deviceAccu.ids.length) {
+        return getAllDevices(perPage, page + 1, deviceAccu.ids);
       }
-    );
+      return Promise.resolve(dispatch(actions3.addGroup({ group: { deviceIds: deviceAccu.ids, total }, groupName: group })));
+    });
     return getAllDevices();
   }
 );
@@ -3516,7 +3510,7 @@ var getDevicesByStatus2 = createAppAsyncThunk(
       status
     });
     const attributes = [...defaultAttributes, getIdAttribute(getState()), ...selectedAttributes];
-    return general_api_default.post(getSearchEndpoint(getState()), {
+    return general_api_default.post(`${import_constants5.inventoryApiUrlV2}/filters/search`, {
       page,
       per_page: perPage,
       filters: filterTerms,
@@ -3546,7 +3540,7 @@ var getAllDevicesByStatus = createAppAsyncThunk(
   `${sliceName3}/getAllDevicesByStatus`,
   ({ status, attribute }, { dispatch, getState }) => {
     const attributes = [...defaultAttributes, getIdAttribute(getState())];
-    const getAllDevices = (perPage = MAX_PAGE_SIZE, page = 1, devices = []) => general_api_default.post(getSearchEndpoint(getState()), {
+    const getAllDevices = (perPage = MAX_PAGE_SIZE, page = 1, devices = []) => general_api_default.post(`${import_constants5.inventoryApiUrlV2}/filters/search`, {
       page,
       per_page: perPage,
       filters: mapFiltersToTerms([{ key: "status", value: status, operator: import_constants5.DEVICE_FILTERING_OPTIONS.$eq.key, scope: "identity" }]),
@@ -3574,7 +3568,7 @@ var searchDevices = createAppAsyncThunk(`${sliceName3}/searchDevices`, (passedOp
   const { columnSelection = [] } = getUserSettings(state);
   const selectedAttributes = columnSelection.map((column) => ({ attribute: column.key, scope: column.scope }));
   const attributes = (0, import_helpers9.attributeDuplicateFilter)([...defaultAttributes, getIdAttribute(state), ...selectedAttributes], "attribute");
-  return general_api_default.post(getSearchEndpoint(getState()), {
+  return general_api_default.post(`${import_constants5.inventoryApiUrlV2}/filters/search`, {
     page,
     per_page: 10,
     filters: [],
@@ -3602,7 +3596,7 @@ var attributeReducer = (attributes = []) => attributes.slice(0, ATTRIBUTE_LIST_C
 );
 var getDeviceAttributes = createAppAsyncThunk(
   `${sliceName3}/getDeviceAttributes`,
-  (_, { dispatch, getState }) => general_api_default.get(getAttrsEndpoint(getState())).then(({ data }) => {
+  (_, { dispatch }) => general_api_default.get(`${import_constants5.inventoryApiUrlV2}/filters/attributes`).then(({ data }) => {
     const { identity: identityAttributes, inventory: inventoryAttributes, system: systemAttributes, tags: tagAttributes } = attributeReducer(data || []);
     return dispatch(actions3.setFilterAttributes({ identityAttributes, inventoryAttributes, systemAttributes, tagAttributes }));
   })
@@ -3902,7 +3896,7 @@ var getSystemDevices = createAppAsyncThunk(`${sliceName3}/getSystemDevices`, (op
     { ...emptyFilter, key: "mender_gateway_system_id", value: mender_gateway_system_id, scope: "inventory" }
   ];
   const { attributes, filterTerms } = prepareSearchArguments({ filters, state });
-  return general_api_default.post(getSearchEndpoint(getState()), {
+  return general_api_default.post(`${import_constants5.inventoryApiUrlV2}/filters/search`, {
     page,
     per_page: perPage,
     filters: filterTerms,
@@ -3929,7 +3923,7 @@ var getGatewayDevices = createAppAsyncThunk(`${sliceName3}/getGatewayDevices`, (
     { ...emptyFilter, key: "mender_gateway_system_id", value: mender_gateway_system_id, scope: "inventory" }
   ];
   const { attributes: attributeSelection, filterTerms } = prepareSearchArguments({ filters, state });
-  return general_api_default.post(getSearchEndpoint(getState()), {
+  return general_api_default.post(`${import_constants5.inventoryApiUrlV2}/filters/search`, {
     page: 1,
     per_page: MAX_PAGE_SIZE,
     filters: filterTerms,
@@ -3981,7 +3975,7 @@ var getIssueCountsByType2 = createAppAsyncThunk(
       selectedIssues: [type],
       status
     });
-    return general_api_default.post(getSearchEndpoint(getState()), {
+    return general_api_default.post(`${import_constants5.inventoryApiUrlV2}/filters/search`, {
       page: 1,
       per_page: 1,
       filters: filterTerms,
@@ -4124,7 +4118,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();
@@ -4393,14 +4386,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);
@@ -4605,7 +4597,7 @@ var getArtifactInstallCount = createAppAsyncThunk(`${sliceName7}/getArtifactInst
   const { filterTerms } = convertDeviceListStateToFilters({
     filters: [{ ...emptyFilter, key: attribute, value: version, scope: "inventory" }]
   });
-  return general_api_default.post(getSearchEndpoint(getState()), {
+  return general_api_default.post(`${import_constants5.inventoryApiUrlV2}/filters/search`, {
     page: 1,
     per_page: 1,
     filters: filterTerms,
@@ -4645,7 +4637,7 @@ var getArtifactUrl = createAppAsyncThunk(
       ...release,
       artifacts: releaseArtifacts
     };
-    return dispatch(actions7.receiveRelease(release));
+    return Promise.all([Promise.resolve(dispatch(actions7.receiveRelease(release))), Promise.resolve(response.data.uri)]);
   })
 );
 var pollLocation = async (location, attempt = 1, maxAttempts = 5, delay = TIMEOUTS.oneSecond) => {
@@ -5550,7 +5542,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 });
@@ -5617,7 +5610,6 @@ var featureFlags = [
   "hasDeviceConfig",
   "hasDeviceConnect",
   "hasFeedbackEnabled",
-  "hasReporting",
   "hasManifestsEnabled",
   "hasMonitor",
   "hasMCUEnabled",