@northern.tech/store 0.29.0 → 0.30.0

package/dist/appSlice/thunks.cjs

@@ -757,7 +757,6 @@ var initialState = {
     hasManifestsEnabled: false,
     hasMonitor: false,
     hasMCUEnabled: false,
-    hasReporting: false,
     isHosted: true,
     isEnterprise: false
   },
@@ -1412,14 +1411,6 @@ var getIsEnterprise = (0, import_toolkit8.createSelector)(
   [getOrganization, getFeatures],
   ({ plan = PLANS.os.id }, { isEnterprise, isHosted }) => isEnterprise || isHosted && plan === PLANS.enterprise.id
 );
-var getAttrsEndpoint = (0, import_toolkit8.createSelector)(
-  [getFeatures],
-  ({ hasReporting }) => hasReporting ? `${import_constants5.reportingApiUrl}/devices/search/attributes` : `${import_constants5.inventoryApiUrlV2}/filters/attributes`
-);
-var getSearchEndpoint = (0, import_toolkit8.createSelector)(
-  [getFeatures],
-  ({ hasReporting }) => hasReporting ? `${import_constants5.reportingApiUrl}/devices/search` : `${import_constants5.inventoryApiUrlV2}/filters/search`
-);
 var getUserRoles = (0, import_toolkit8.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);
@@ -1553,9 +1544,9 @@ var getSelectedDeploymentData = (0, import_toolkit8.createSelector)(
   }
 );
 var getAvailableIssueOptionsByType = (0, import_toolkit8.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 };
@@ -3197,7 +3188,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,
@@ -3226,18 +3217,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();
   }
 );
@@ -3365,7 +3359,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,
@@ -3395,7 +3389,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" }]),
@@ -3423,7 +3417,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_helpers8.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: [],
@@ -3451,7 +3445,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 }));
   })
@@ -3751,7 +3745,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,
@@ -3778,7 +3772,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,
@@ -3830,7 +3824,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,