@northern.tech/store 0.9.0 → 0.11.0

package/dist/storehooks.cjs

@@ -1081,7 +1081,11 @@ var initialState3 = {
     // { items: [{ key: "someKey", count: 42  }], otherCount: 123, total: <otherCount + itemsCount> }
   ],
   total: 0,
-  limit: 0,
+  limits: {
+    standard: 0,
+    micro: 0,
+    system: 0
+  },
   groups: {
     byId: {
       // groupName: { deviceIds: [], total: 0, filters: [] },
@@ -1187,8 +1191,8 @@ var devicesSlice = (0, import_toolkit3.createSlice)({
       const { count, status } = action.payload;
       state.byStatus[status].total = count;
     },
-    setDeviceLimit: (state, action) => {
-      state.limit = action.payload;
+    setDeviceLimits: (state, action) => {
+      state.limits = action.payload;
     },
     receivedDevice: (state, action) => {
       state.byId[action.payload.id] = {
@@ -1808,7 +1812,7 @@ var getSortedFilteringAttributes = (0, import_toolkit11.createSelector)([getFilt
   ...filteringAttributes,
   identityAttributes: [...filteringAttributes.identityAttributes, "id"]
 }));
-var getDeviceLimit = (state) => state.devices.limit;
+var getDeviceLimits = (state) => state.devices.limits;
 var getFilteringAttributesLimit = (state) => state.devices.filteringAttributesLimit;
 var getDeviceIdentityAttributes = (0, import_toolkit11.createSelector)(
   [getFilteringAttributes, getFilteringAttributesLimit],
@@ -1846,9 +1850,14 @@ var getSelectedGroupInfo = (0, import_toolkit11.createSelector)(
     return { groupCount, selectedGroup, groupFilters };
   }
 );
+var getCombinedLimit = (0, import_toolkit11.createSelector)(
+  [getDeviceLimits],
+  (deviceLimits) => Object.values(deviceLimits).reduce((accu, limit) => accu + Math.max(limit ?? 0, 0), 0)
+  // limit might be -1 for unlimited devices
+);
 var getLimitMaxed = (0, import_toolkit11.createSelector)(
-  [getAcceptedDevices, getDeviceLimit],
-  ({ total: acceptedDevices = 0 }, deviceLimit) => Boolean(deviceLimit && deviceLimit <= acceptedDevices)
+  [getAcceptedDevices, getCombinedLimit],
+  ({ total: acceptedDevices = 0 }, 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) => {
@@ -3367,9 +3376,9 @@ var getAllDeviceCounts = createAppAsyncThunk(
   `${sliceName3}/getAllDeviceCounts`,
   (_, { dispatch }) => Promise.all([import_constants5.DEVICE_STATES.accepted, import_constants5.DEVICE_STATES.pending].map((status) => dispatch(getDeviceCount(status))))
 );
-var getDeviceLimit2 = createAppAsyncThunk(
+var getDeviceLimits2 = createAppAsyncThunk(
   `${sliceName3}/getDeviceLimit`,
-  (_, { dispatch }) => general_api_default.get(`${import_constants5.deviceAuthV2}/limits/max_devices`).then((res) => dispatch(actions3.setDeviceLimit(res.data.limit)))
+  (_, { dispatch }) => general_api_default.get(`${import_constants5.deviceAuthV2}/limits/devices`).then((res) => dispatch(actions3.setDeviceLimits(res.data)))
 );
 var setDeviceListState = createAppAsyncThunk(
   `${sliceName3}/setDeviceListState`,
@@ -3949,13 +3958,22 @@ var deductOnboardingState = ({ devicesById, devicesByStatus, onboardingState, pa
   const pendingDevices = devicesByStatus[import_constants5.DEVICE_STATES.pending].deviceIds;
   let deviceType = onboardingState.deviceType ?? [];
   deviceType = !deviceType.length && acceptedDevices.length && devicesById[acceptedDevices[0]].hasOwnProperty("attributes") ? devicesById[acceptedDevices[0]].attributes.device_type : deviceType;
+  const deviceTier = acceptedDevices.length && devicesById[acceptedDevices[0]].tier;
+  let approach = null;
+  if (deviceType.some((type) => type.startsWith("qemu"))) {
+    approach = "virtual";
+  } else if (deviceType.some((type) => type.startsWith("esp32")) || deviceTier === "micro") {
+    approach = "mcu";
+  } else if (deviceType.length) {
+    approach = "physical";
+  }
   const progress2 = applyOnboardingFallbacks(onboardingState.progress || determineProgress(acceptedDevices, pendingDevices, releases, pastDeployments));
   return {
     ...onboardingState,
     complete: !!(Boolean(userCookie) || onboardingState.complete || acceptedDevices.length > 1 && pendingDevices.length > 0 && releases.length > 1 && pastDeployments.length > 1 || acceptedDevices.length >= 1 && releases.length >= 2 && pastDeployments.length > 2 || acceptedDevices.length >= 1 && pendingDevices.length > 0 && releases.length >= 2 && pastDeployments.length >= 2 || orderedOnboardingSteps.findIndex((step) => step === progress2) >= orderedOnboardingSteps.length - 1 || onboardingState.disable || ![canDeploy, canManageDevices, canReadDeployments, canReadDevices, canReadReleases, canUploadReleases].every((i) => i)),
     showTips: onboardingState.showTips != null ? onboardingState.showTips : true,
     deviceType,
-    approach: onboardingState.approach || (deviceType.some((type) => type.startsWith("qemu")) ? "virtual" : "physical"),
+    approach: onboardingState.approach || approach,
     progress: progress2
   };
 };
@@ -4103,7 +4121,7 @@ var cancelUpgrade = createAppAsyncThunk(
 );
 var completeUpgrade = createAppAsyncThunk(
   `${sliceName6}/completeUpgrade`,
-  ({ tenantId, plan, billing_profile }, { dispatch }) => general_api_default.post(`${import_constants5.tenantadmApiUrlv2}/tenants/${tenantId}/upgrade/complete`, { plan, billing_profile }).catch((err) => commonErrorHandler(err, `There was an error upgrading your account:`, dispatch)).then(() => Promise.all([dispatch(getDeviceLimit2()), dispatch(getUserOrganization())]))
+  ({ tenantId, plan, billing_profile }, { dispatch }) => general_api_default.post(`${import_constants5.tenantadmApiUrlv2}/tenants/${tenantId}/upgrade/complete`, { plan, billing_profile }).catch((err) => commonErrorHandler(err, `There was an error upgrading your account:`, dispatch)).then(() => Promise.all([dispatch(getDeviceLimits2()), dispatch(getUserOrganization())]))
 );
 var prepareAuditlogQuery = ({
   startDate,
@@ -4265,7 +4283,7 @@ var getCurrentSubscription = createAppAsyncThunk(
 );
 var requestPlanUpgrade = createAppAsyncThunk(
   `${sliceName6}/requestPlanUpgrade`,
-  (order, { dispatch }) => general_api_default.post(`${import_constants5.tenantadmApiUrlv2}/billing/subscription`, order).catch((err) => commonErrorHandler(err, "There was an error sending your request", dispatch, commonErrorFallback)).then(() => Promise.all([setTimeout(() => dispatch(getDeviceLimit2()), TIMEOUTS.threeSeconds), dispatch(getUserOrganization())]))
+  (order, { dispatch }) => general_api_default.post(`${import_constants5.tenantadmApiUrlv2}/billing/subscription`, order).catch((err) => commonErrorHandler(err, "There was an error sending your request", dispatch, commonErrorFallback)).then(() => Promise.all([setTimeout(() => dispatch(getDeviceLimits2()), TIMEOUTS.threeSeconds), dispatch(getUserOrganization())]))
 );
 var sendSupportMessage = createAppAsyncThunk(
   `${sliceName6}/sendSupportMessage`,
@@ -5530,7 +5548,7 @@ var useAppInit = (userId) => {
     if (isServiceProvider) {
       return Promise.resolve(dispatch(getRoles()));
     }
-    return Promise.all([
+    const tasks = [
       dispatch(getDeviceAttributes()),
       dispatch(getDeploymentsByStatus2({ status: DEPLOYMENT_STATES.finished, shouldSelect: false })),
       dispatch(getDeploymentsByStatus2({ status: DEPLOYMENT_STATES.inprogress })),
@@ -5541,11 +5559,14 @@ var useAppInit = (userId) => {
       dispatch(getDynamicGroups()),
       dispatch(getGroups2()),
       dispatch(getIntegrations()),
-      dispatch(getReleases()),
-      dispatch(getDeviceLimit2()),
-      dispatch(getRoles())
-    ]);
-  }, [dispatch, isServiceProvider]);
+      dispatch(getReleases())
+    ];
+    if (hasMultitenancy) {
+      tasks.push(dispatch(getDeviceLimits2()));
+      tasks.push(dispatch(getRoles()));
+    }
+    return Promise.all(tasks);
+  }, [dispatch, hasMultitenancy, isServiceProvider]);
   const interpretAppData = (0, import_react2.useCallback)(() => {
     const settings = {};
     if (cookies6.get("_ga") && typeof hasTrackingEnabled === "undefined") {