@northern.tech/store 0.12.0 → 0.13.0

package/dist/devicesSlice/selectors.js

@@ -22,7 +22,7 @@ import {
   getSelectedGroup,
   getSelectedGroupInfo,
   getSortedFilteringAttributes
-} from "../chunk-MH5WPYQI.js";
+} from "../chunk-X7NEALMI.js";
 import "../chunk-WWED74SG.js";
 import "../chunk-2DYA3X77.js";
 import "../chunk-FAJ3I2UQ.js";

package/dist/devicesSlice/thunks.cjs

@@ -46,7 +46,6 @@ __export(thunks_exports, {
   getDeviceById: () => getDeviceById2,
   getDeviceConfig: () => getDeviceConfig,
   getDeviceConnect: () => getDeviceConnect,
-  getDeviceCount: () => getDeviceCount,
   getDeviceFileDownloadLink: () => getDeviceFileDownloadLink,
   getDeviceInfo: () => getDeviceInfo,
   getDeviceLimits: () => getDeviceLimits2,
@@ -810,12 +809,10 @@ var initialState = {
     // }
   },
   byStatus: {
-    [import_constants5.DEVICE_STATES.accepted]: { deviceIds: [], total: 0 },
-    active: { deviceIds: [], total: 0 },
-    inactive: { deviceIds: [], total: 0 },
-    [import_constants5.DEVICE_STATES.pending]: { deviceIds: [], total: 0 },
-    [import_constants5.DEVICE_STATES.preauth]: { deviceIds: [], total: 0 },
-    [import_constants5.DEVICE_STATES.rejected]: { deviceIds: [], total: 0 }
+    [import_constants5.DEVICE_STATES.accepted]: { deviceIds: [], counts: { standard: 0, micro: 0, system: 0, total: 0 } },
+    [import_constants5.DEVICE_STATES.pending]: { deviceIds: [], counts: { standard: 0, micro: 0, system: 0, total: 0 } },
+    [import_constants5.DEVICE_STATES.preauth]: { deviceIds: [], counts: { standard: 0, micro: 0, system: 0, total: 0 } },
+    [import_constants5.DEVICE_STATES.rejected]: { deviceIds: [], counts: { standard: 0, micro: 0, system: 0, total: 0 } }
   },
   deviceList: {
     deviceIds: [],
@@ -945,21 +942,19 @@ var devicesSlice = (0, import_toolkit.createSlice)({
       }
       state.filters = action.payload.filter((filter) => filter.key && filter.operator && filter.scope && typeof filter.value !== "undefined");
     },
-    setInactiveDevices: (state, action) => {
-      const { activeDeviceTotal, inactiveDeviceTotal } = action.payload;
-      state.byStatus.active.total = activeDeviceTotal;
-      state.byStatus.inactive.total = inactiveDeviceTotal;
-    },
     setDeviceReports: (state, action) => {
       state.reports = action.payload;
     },
     setDevicesByStatus: (state, action) => {
-      const { forceUpdate, status, total, deviceIds } = action.payload;
-      state.byStatus[status] = total || forceUpdate ? { deviceIds, total } : state.byStatus[status];
+      const { status, total, deviceIds } = action.payload;
+      if (total) {
+        state.byStatus[status].deviceIds = deviceIds;
+        state.byStatus[status].counts.total = total;
+      }
     },
     setDevicesCountByStatus: (state, action) => {
-      const { count, status } = action.payload;
-      state.byStatus[status].total = count;
+      const { countsPerTier, status } = action.payload;
+      state.byStatus[status].counts = { ...countsPerTier, total: Object.values(countsPerTier).reduce((accu, tieredCount) => accu += tieredCount, 0) };
     },
     setDeviceLimits: (state, action) => {
       state.limits = action.payload;
@@ -976,7 +971,15 @@ var devicesSlice = (0, import_toolkit.createSlice)({
       const hasMultipleAuthSets = authId && device.auth_sets ? device.auth_sets.filter((authset) => authset.id !== authId).length > 0 : false;
       if (!hasMultipleAuthSets && Object.values(import_constants5.DEVICE_STATES).includes(device.status)) {
         const deviceIds = state.byStatus[device.status].deviceIds.filter((id) => id !== deviceId);
-        state.byStatus[device.status] = { deviceIds, total: Math.max(0, state.byStatus[device.status].total - 1) };
+        const deviceTier = device.attributes.tier || "standard";
+        state.byStatus[device.status] = {
+          deviceIds,
+          counts: {
+            ...state.byStatus[device.status].counts,
+            [deviceTier]: Math.max(0, state.byStatus[device.status].counts[deviceTier] - 1),
+            total: Math.max(0, state.byStatus[device.status].counts.total - 1)
+          }
+        };
       }
     }
   }
@@ -1909,15 +1912,22 @@ var getDeviceIdentityAttributes = (0, import_toolkit11.createSelector)(
 );
 var getDeviceCountsByStatus = (0, import_toolkit11.createSelector)(
   [getDevicesByStatus],
-  (byStatus) => Object.values(import_constants5.DEVICE_STATES).reduce((accu, state) => {
-    accu[state] = byStatus[state].total || 0;
-    return accu;
-  }, {})
+  (byStatus) => Object.values(import_constants5.DEVICE_STATES).reduce(
+    (accu, deviceState) => {
+      const { counts } = byStatus[deviceState];
+      const { total, ...tieredCounts } = counts;
+      const count = Object.values(tieredCounts).reduce((accu2, countPerTier) => accu2 + countPerTier, 0);
+      accu[deviceState] = count;
+      accu.total = accu.total + count;
+      return accu;
+    },
+    { total: 0 }
+  )
 );
 var getDeviceById = (0, import_toolkit11.createSelector)([getDevicesById, (_, deviceId) => deviceId], (devicesById, deviceId = "") => devicesById[deviceId] ?? {});
 var getSelectedGroupInfo = (0, import_toolkit11.createSelector)(
-  [getAcceptedDevices, getGroupsById, getSelectedGroup],
-  ({ total: acceptedDeviceTotal }, groupsById, selectedGroup) => {
+  [getDeviceCountsByStatus, getGroupsById, getSelectedGroup],
+  ({ accepted: acceptedDeviceTotal }, groupsById, selectedGroup) => {
     let groupCount = acceptedDeviceTotal;
     let groupFilters = [];
     if (selectedGroup && groupsById[selectedGroup]) {
@@ -1933,8 +1943,8 @@ var getCombinedLimit = (0, import_toolkit11.createSelector)(
   // limit might be -1 for unlimited devices
 );
 var getLimitMaxed = (0, import_toolkit11.createSelector)(
-  [getAcceptedDevices, getCombinedLimit],
-  ({ total: acceptedDevices = 0 }, combinedLimit) => !!combinedLimit && combinedLimit <= acceptedDevices
+  [getDeviceCountsByStatus, getCombinedLimit],
+  ({ accepted: acceptedDevices }, combinedLimit) => !!combinedLimit && combinedLimit <= acceptedDevices
 );
 var getGroupsByIdWithoutUngrouped = (0, import_toolkit11.createSelector)([getGroupsById], ({ [UNGROUPED_GROUP.id]: ungrouped, ...groups }) => groups);
 var getGroupData = (0, import_toolkit11.createSelector)([getGroupsByIdWithoutUngrouped], (groups) => {
@@ -4094,21 +4104,13 @@ var getDeviceInfo = createAppAsyncThunk(`${sliceName}/getDeviceInfo`, (deviceId,
   }
   return Promise.all(tasks);
 });
-var getDeviceCount = createAppAsyncThunk(
-  `${sliceName}/getDeviceCount`,
-  (status, { dispatch, getState }) => general_api_default.post(getSearchEndpoint(getState()), {
-    page: 1,
-    per_page: 1,
-    filters: mapFiltersToTerms([{ key: "status", value: status, operator: import_constants5.DEVICE_FILTERING_OPTIONS.$eq.key, scope: "identity" }]),
-    attributes: defaultAttributes
-  }).then((response) => {
-    const count = Number(response.headers[import_constants5.headerNames.total]);
-    return dispatch(actions.setDevicesCountByStatus({ count, status }));
-  })
-);
 var getAllDeviceCounts = createAppAsyncThunk(
   `${sliceName}/getAllDeviceCounts`,
-  (_, { dispatch }) => Promise.all([import_constants5.DEVICE_STATES.accepted, import_constants5.DEVICE_STATES.pending].map((status) => dispatch(getDeviceCount(status))))
+  (_, { dispatch }) => general_api_default.get(`${import_constants5.inventoryApiUrlV2}/statistics`).then(({ data }) => {
+    const { devices_by_status } = data;
+    Object.entries(devices_by_status).map(([status, countsPerTier]) => dispatch(actions.setDevicesCountByStatus({ countsPerTier, status })));
+    return;
+  })
 );
 var getDeviceLimits2 = createAppAsyncThunk(
   `${sliceName}/getDeviceLimit`,
@@ -4180,7 +4182,7 @@ var getDevicesByStatus2 = createAppAsyncThunk(
       const state2 = getState();
       const deviceAccu = reduceReceivedDevices(response.data, [], state2, status);
       let total = !applicableFilters.length ? Number(response.headers[import_constants5.headerNames.total]) : 0;
-      if (status && state2.devices.byStatus[status].total === deviceAccu.ids.length) {
+      if (status && state2.devices.byStatus[status].counts.total === deviceAccu.ids.length) {
         total = deviceAccu.ids.length;
       }
       const tasks = [dispatch(actions.receivedDevices(deviceAccu.devicesById))];
@@ -4287,8 +4289,8 @@ var updateReportData = createAppAsyncThunk(`${sliceName}/updateReportData`, (rep
   const { group = "" } = report;
   const devicesById = getDevicesById(getState());
   const groups = getGroupsById(getState());
-  const acceptedDevices = getAcceptedDevices(getState());
-  const totalDeviceCount = groups[group] ? groups[group].total : acceptedDevices.total;
+  const { accepted: acceptedDevicesCount } = getDeviceCountsByStatus(getState());
+  const totalDeviceCount = groups[group] ? groups[group].total : acceptedDevicesCount;
   const reportsData = getDeviceReports(getState());
   const newReports = [...reportsData];
   newReports[reportIndex] = initializeDistributionData(report, groups, devicesById, totalDeviceCount);
@@ -4306,6 +4308,7 @@ var getReportDataWithoutBackendSupport = createAppAsyncThunk(
     const effectiveAttribute = software ? software : attribute;
     const devicesById = getDevicesById(getState());
     const acceptedDevices = getAcceptedDevices(getState());
+    const { accepted: acceptedDevicesCount } = getDeviceCountsByStatus(getState());
     const groups = getGroupsById(getState());
     const { deviceIds = [], filters = [], total = 0 } = groups[group] || {};
     let groupDevicesRequest = Promise.resolve({
@@ -4313,7 +4316,7 @@ var getReportDataWithoutBackendSupport = createAppAsyncThunk(
     });
     if (group && (!(deviceIds.length && total) || deviceIds.length !== total || !deviceIds.every((id) => !!devicesById[id]))) {
       groupDevicesRequest = filters.length ? dispatch(getAllDynamicGroupDevices({ group, attribute: effectiveAttribute })).unwrap() : dispatch(getAllGroupDevices({ group, attribute: effectiveAttribute })).unwrap();
-    } else if (!group && (acceptedDevices.deviceIds.length !== acceptedDevices.total || !acceptedDevices.deviceIds.every((id) => !!devicesById[id]))) {
+    } else if (!group && (acceptedDevices.deviceIds.length !== acceptedDevicesCount || !acceptedDevices.deviceIds.every((id) => !!devicesById[id]))) {
       groupDevicesRequest = dispatch(getAllDevicesByStatus({ status: import_constants5.DEVICE_STATES.accepted, attribute: effectiveAttribute })).unwrap();
     }
     return groupDevicesRequest.then(() => dispatch(updateReportData(reportIndex)));
@@ -4612,7 +4615,6 @@ var getGatewayDevices = createAppAsyncThunk(`${sliceName}/getGatewayDevices`, (d
   getDeviceById,
   getDeviceConfig,
   getDeviceConnect,
-  getDeviceCount,
   getDeviceFileDownloadLink,
   getDeviceInfo,
   getDeviceLimits,