@northern.tech/store 0.22.0 → 0.24.0

package/dist/organizationSlice/selectors.d.ts

@@ -1,3 +1,4 @@
+import * as _northern_tech_utils_constants from '@northern.tech/utils/constants';
 import * as reselect from 'reselect';
 import { UserSliceType } from '../usersSlice/index.js';
 import { ReleaseSliceType } from '../releasesSlice/index.js';
@@ -8,13 +9,12 @@ import { DeploymentsSliceType } from '../deploymentsSlice/index.js';
 import { DeviceSliceType } from '../devicesSlice/index.js';
 import { AppSliceType } from '../appSlice/index.js';
 import * as _northern_tech_types_types_gen from '@northern.tech/types/types.gen';
-import { Organization, ProductConfig, AuditLogSelectionState, Card, SSOConfig, TenantList } from './types.js';
+import { AuditLogSelectionState, Card, Organization, ProductConfig, SSOConfig, Tenant, TenantList } from './types.js';
 import { RootState } from '../store.js';
 import 'redux';
 import '@reduxjs/toolkit';
 import 'immer';
 import '@northern.tech/types/MenderTypes';
-import '@northern.tech/utils/constants';
 import '../commonConstants.js';
 import 'react/jsx-runtime';
 import '../usersSlice/constants.js';
@@ -201,5 +201,289 @@ declare const getAuditLogEntry: ((state: {
     memoize: typeof reselect.weakMapMemoize;
     argsMemoize: typeof reselect.weakMapMemoize;
 };
+declare const getDisabledTiers: ((state: {
+    app: AppSliceType;
+    devices: DeviceSliceType;
+    deployments: DeploymentsSliceType;
+    monitor: MonitorSliceType;
+    onboarding: OnboardingSliceType;
+    organization: OrganizationSliceType;
+    releases: ReleaseSliceType;
+    users: UserSliceType;
+}) => string[]) & {
+    clearCache: () => void;
+    resultsCount: () => number;
+    resetResultsCount: () => void;
+} & {
+    resultFunc: (resultFuncArgs_0: {
+        disabled: string[];
+        limits: Record<string, object>;
+    }) => string[];
+    memoizedResultFunc: ((resultFuncArgs_0: {
+        disabled: string[];
+        limits: Record<string, object>;
+    }) => string[]) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    };
+    lastResult: () => string[];
+    dependencies: [((state: {
+        app: AppSliceType;
+        devices: DeviceSliceType;
+        deployments: DeploymentsSliceType;
+        monitor: MonitorSliceType;
+        onboarding: OnboardingSliceType;
+        organization: OrganizationSliceType;
+        releases: ReleaseSliceType;
+        users: UserSliceType;
+    }) => {
+        disabled: string[];
+        limits: Record<string, object>;
+    }) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    } & {
+        resultFunc: (resultFuncArgs_0: Partial<Organization>) => {
+            disabled: string[];
+            limits: Record<string, object>;
+        };
+        memoizedResultFunc: ((resultFuncArgs_0: Partial<Organization>) => {
+            disabled: string[];
+            limits: Record<string, object>;
+        }) & {
+            clearCache: () => void;
+            resultsCount: () => number;
+            resetResultsCount: () => void;
+        };
+        lastResult: () => {
+            disabled: string[];
+            limits: Record<string, object>;
+        };
+        dependencies: [(state: RootState) => Partial<Organization>];
+        recomputations: () => number;
+        resetRecomputations: () => void;
+        dependencyRecomputations: () => number;
+        resetDependencyRecomputations: () => void;
+    } & {
+        memoize: typeof reselect.weakMapMemoize;
+        argsMemoize: typeof reselect.weakMapMemoize;
+    }];
+    recomputations: () => number;
+    resetRecomputations: () => void;
+    dependencyRecomputations: () => number;
+    resetDependencyRecomputations: () => void;
+} & {
+    memoize: typeof reselect.weakMapMemoize;
+    argsMemoize: typeof reselect.weakMapMemoize;
+};
+declare const getSpLimits: ((state: {
+    app: AppSliceType;
+    devices: DeviceSliceType;
+    deployments: DeploymentsSliceType;
+    monitor: MonitorSliceType;
+    onboarding: OnboardingSliceType;
+    organization: OrganizationSliceType;
+    releases: ReleaseSliceType;
+    users: UserSliceType;
+}) => Record<string, object>) & {
+    clearCache: () => void;
+    resultsCount: () => number;
+    resetResultsCount: () => void;
+} & {
+    resultFunc: (resultFuncArgs_0: {
+        disabled: string[];
+        limits: Record<string, object>;
+    }) => Record<string, object>;
+    memoizedResultFunc: ((resultFuncArgs_0: {
+        disabled: string[];
+        limits: Record<string, object>;
+    }) => Record<string, object>) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    };
+    lastResult: () => Record<string, object>;
+    dependencies: [((state: {
+        app: AppSliceType;
+        devices: DeviceSliceType;
+        deployments: DeploymentsSliceType;
+        monitor: MonitorSliceType;
+        onboarding: OnboardingSliceType;
+        organization: OrganizationSliceType;
+        releases: ReleaseSliceType;
+        users: UserSliceType;
+    }) => {
+        disabled: string[];
+        limits: Record<string, object>;
+    }) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    } & {
+        resultFunc: (resultFuncArgs_0: Partial<Organization>) => {
+            disabled: string[];
+            limits: Record<string, object>;
+        };
+        memoizedResultFunc: ((resultFuncArgs_0: Partial<Organization>) => {
+            disabled: string[];
+            limits: Record<string, object>;
+        }) & {
+            clearCache: () => void;
+            resultsCount: () => number;
+            resetResultsCount: () => void;
+        };
+        lastResult: () => {
+            disabled: string[];
+            limits: Record<string, object>;
+        };
+        dependencies: [(state: RootState) => Partial<Organization>];
+        recomputations: () => number;
+        resetRecomputations: () => void;
+        dependencyRecomputations: () => number;
+        resetDependencyRecomputations: () => void;
+    } & {
+        memoize: typeof reselect.weakMapMemoize;
+        argsMemoize: typeof reselect.weakMapMemoize;
+    }];
+    recomputations: () => number;
+    resetRecomputations: () => void;
+    dependencyRecomputations: () => number;
+    resetDependencyRecomputations: () => void;
+} & {
+    memoize: typeof reselect.weakMapMemoize;
+    argsMemoize: typeof reselect.weakMapMemoize;
+};
+declare const getTenantListWithLimits: ((state: {
+    app: AppSliceType;
+    devices: DeviceSliceType;
+    deployments: DeploymentsSliceType;
+    monitor: MonitorSliceType;
+    onboarding: OnboardingSliceType;
+    organization: OrganizationSliceType;
+    releases: ReleaseSliceType;
+    users: UserSliceType;
+}) => {
+    tenants: {
+        device_limits: Record<string, object>;
+        id: string;
+        name: string;
+        tenant_token: string;
+        status?: "active" | "suspended";
+        plan?: "os" | "enterprise" | "professional";
+        trial?: boolean;
+        trial_expiration?: string;
+        addons?: Array<_northern_tech_types_types_gen.Addon>;
+        service_provider?: boolean;
+        parent_tenant_id?: string;
+        additional_info?: _northern_tech_types_types_gen.TenantAdditionalInfo;
+        api_limits?: _northern_tech_types_types_gen.TenantApiLimits;
+        created_at?: string;
+        updated_at?: string;
+        device_count?: number;
+        device_limit?: number;
+    }[];
+    page: number;
+    perPage: number;
+    selectedTenant: Tenant | null;
+    sort: _northern_tech_utils_constants.SortOptions;
+    total: number;
+}) & {
+    clearCache: () => void;
+    resultsCount: () => number;
+    resetResultsCount: () => void;
+} & {
+    resultFunc: (resultFuncArgs_0: TenantList) => {
+        tenants: {
+            device_limits: Record<string, object>;
+            id: string;
+            name: string;
+            tenant_token: string;
+            status?: "active" | "suspended";
+            plan?: "os" | "enterprise" | "professional";
+            trial?: boolean;
+            trial_expiration?: string;
+            addons?: Array<_northern_tech_types_types_gen.Addon>;
+            service_provider?: boolean;
+            parent_tenant_id?: string;
+            additional_info?: _northern_tech_types_types_gen.TenantAdditionalInfo;
+            api_limits?: _northern_tech_types_types_gen.TenantApiLimits;
+            created_at?: string;
+            updated_at?: string;
+            device_count?: number;
+            device_limit?: number;
+        }[];
+        page: number;
+        perPage: number;
+        selectedTenant: Tenant | null;
+        sort: _northern_tech_utils_constants.SortOptions;
+        total: number;
+    };
+    memoizedResultFunc: ((resultFuncArgs_0: TenantList) => {
+        tenants: {
+            device_limits: Record<string, object>;
+            id: string;
+            name: string;
+            tenant_token: string;
+            status?: "active" | "suspended";
+            plan?: "os" | "enterprise" | "professional";
+            trial?: boolean;
+            trial_expiration?: string;
+            addons?: Array<_northern_tech_types_types_gen.Addon>;
+            service_provider?: boolean;
+            parent_tenant_id?: string;
+            additional_info?: _northern_tech_types_types_gen.TenantAdditionalInfo;
+            api_limits?: _northern_tech_types_types_gen.TenantApiLimits;
+            created_at?: string;
+            updated_at?: string;
+            device_count?: number;
+            device_limit?: number;
+        }[];
+        page: number;
+        perPage: number;
+        selectedTenant: Tenant | null;
+        sort: _northern_tech_utils_constants.SortOptions;
+        total: number;
+    }) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    };
+    lastResult: () => {
+        tenants: {
+            device_limits: Record<string, object>;
+            id: string;
+            name: string;
+            tenant_token: string;
+            status?: "active" | "suspended";
+            plan?: "os" | "enterprise" | "professional";
+            trial?: boolean;
+            trial_expiration?: string;
+            addons?: Array<_northern_tech_types_types_gen.Addon>;
+            service_provider?: boolean;
+            parent_tenant_id?: string;
+            additional_info?: _northern_tech_types_types_gen.TenantAdditionalInfo;
+            api_limits?: _northern_tech_types_types_gen.TenantApiLimits;
+            created_at?: string;
+            updated_at?: string;
+            device_count?: number;
+            device_limit?: number;
+        }[];
+        page: number;
+        perPage: number;
+        selectedTenant: Tenant | null;
+        sort: _northern_tech_utils_constants.SortOptions;
+        total: number;
+    };
+    dependencies: [(state: RootState) => TenantList];
+    recomputations: () => number;
+    resetRecomputations: () => void;
+    dependencyRecomputations: () => number;
+    resetDependencyRecomputations: () => void;
+} & {
+    memoize: typeof reselect.weakMapMemoize;
+    argsMemoize: typeof reselect.weakMapMemoize;
+};
 
-export { getAuditLog, getAuditLogEntry, getAuditLogSelectionState, getAuditlogState, getBillingProfile, getCard, getDeviceTwinIntegrations, getExternalIntegrations, getIsServiceProvider, getOrganization, getProducts, getSsoConfig, getSubscription, getTenantsList, getWebhookEventInfo, getWebhookEventTotal, getWebhookEvents, getWebhooks };
+export { getAuditLog, getAuditLogEntry, getAuditLogSelectionState, getAuditlogState, getBillingProfile, getCard, getDeviceTwinIntegrations, getDisabledTiers, getExternalIntegrations, getIsServiceProvider, getOrganization, getProducts, getSpLimits, getSsoConfig, getSubscription, getTenantListWithLimits, getTenantsList, getWebhookEventInfo, getWebhookEventTotal, getWebhookEvents, getWebhooks };

package/dist/organizationSlice/selectors.js

@@ -6,19 +6,22 @@ import {
   getBillingProfile,
   getCard,
   getDeviceTwinIntegrations,
+  getDisabledTiers,
   getExternalIntegrations,
   getIsServiceProvider,
   getOrganization,
   getProducts,
+  getSpLimits,
   getSsoConfig,
   getSubscription,
+  getTenantListWithLimits,
   getTenantsList,
   getWebhookEventInfo,
   getWebhookEventTotal,
   getWebhookEvents,
   getWebhooks
-} from "../chunk-ZZQJWNQT.js";
-import "../chunk-WWED74SG.js";
+} from "../chunk-X6AM6P6X.js";
+import "../chunk-AERWBWRM.js";
 import "../chunk-2DYA3X77.js";
 import "../chunk-FAJ3I2UQ.js";
 import "../chunk-ZKAH3APE.js";
@@ -31,12 +34,15 @@ export {
   getBillingProfile,
   getCard,
   getDeviceTwinIntegrations,
+  getDisabledTiers,
   getExternalIntegrations,
   getIsServiceProvider,
   getOrganization,
   getProducts,
+  getSpLimits,
   getSsoConfig,
   getSubscription,
+  getTenantListWithLimits,
   getTenantsList,
   getWebhookEventInfo,
   getWebhookEventTotal,

package/dist/organizationSlice/thunks.cjs

@@ -44,7 +44,7 @@ __export(thunks_exports, {
   deleteSsoConfig: () => deleteSsoConfig,
   downloadLicenseReport: () => downloadLicenseReport,
   editBillingProfile: () => editBillingProfile,
-  editTenantDeviceLimit: () => editTenantDeviceLimit,
+  editTenant: () => editTenant,
   getAuditLogs: () => getAuditLogs,
   getAuditLogsCsvLink: () => getAuditLogsCsvLink,
   getBillingPreview: () => getBillingPreview,
@@ -205,6 +205,7 @@ var TIMEOUTS = {
 };
 var DEVICE_ONLINE_CUTOFF = { interval: 1, intervalName: timeUnits.days };
 var defaultIdAttribute = Object.freeze({ attribute: "id", scope: import_constants5.ATTRIBUTE_SCOPES.identity });
+var productOrder = ["micro", "standard", "system"];
 var credentialTypes = {
   aws: "aws",
   http: "http",
@@ -893,9 +894,9 @@ var initialState2 = {
     hasDeviceConfig: false,
     hasDeviceConnect: false,
     hasFeedbackEnabled: false,
+    hasManifestsEnabled: false,
     hasMonitor: false,
     hasMCUEnabled: false,
-    hasOldTheme: false,
     hasReporting: false,
     isHosted: true,
     isEnterprise: false
@@ -2016,6 +2017,41 @@ var getAuditLogEntry = (0, import_toolkit12.createSelector)([getAuditLog, getAud
   const [eventAction, eventTime] = atob(selectedId).split("|");
   return events.find((item) => item.action === eventAction && item.time === eventTime);
 });
+var toTierName = (key) => key.replace(/max_|_?devices/g, "") || "standard";
+var processDeviceLimits = (deviceLimits, skipFilter = false) => {
+  const result = { limits: {}, disabled: [] };
+  if (!deviceLimits) return result;
+  const tiersByName = Object.fromEntries(Object.entries(deviceLimits).map(([key, limit]) => [toTierName(key), { key, limit }]));
+  return productOrder.reduce((accu, tierName) => {
+    const entry = tiersByName[tierName];
+    if (!entry) return accu;
+    const { key, limit } = entry;
+    if (limit.value === 0) {
+      accu.disabled.push(tierName);
+      if (!skipFilter) return accu;
+    }
+    accu.limits[tierName] = {
+      id: tierName,
+      backendId: key,
+      limit: limit.value,
+      current: limit.current_value,
+      name: tierName,
+      quotaLeft: Math.max(limit.value - limit.current_value, 0),
+      limitReached: limit.value !== -1 && limit.value <= limit.current_value
+    };
+    return accu;
+  }, result);
+};
+var getDeviceLimitsInfo = (0, import_toolkit12.createSelector)([getOrganization], ({ device_limits }) => processDeviceLimits(device_limits));
+var getDisabledTiers = (0, import_toolkit12.createSelector)([getDeviceLimitsInfo], ({ disabled }) => disabled);
+var getSpLimits = (0, import_toolkit12.createSelector)([getDeviceLimitsInfo], ({ limits }) => limits);
+var getTenantListWithLimits = (0, import_toolkit12.createSelector)([getTenantsList], (tenantList) => ({
+  ...tenantList,
+  tenants: tenantList.tenants.map((tenant) => ({
+    ...tenant,
+    device_limits: processDeviceLimits(tenant.device_limits, true).limits
+  }))
+}));
 
 // src/releasesSlice/selectors.ts
 var import_toolkit13 = require("@reduxjs/toolkit");
@@ -4092,7 +4128,7 @@ var verifyEmailStart = createAppAsyncThunk(
 );
 var verifyEmailComplete = createAppAsyncThunk(
   `${sliceName8}/verifyEmailComplete`,
-  (secret_hash, { dispatch }) => general_api_default.post(`${import_constants5.useradmApiUrl}/auth/verify-email/complete`, { secret_hash }).catch((err) => commonErrorHandler(err, "An error occured completing the email verification process:", dispatch)).finally(() => Promise.resolve(dispatch(getUser(OWN_USER_ID))))
+  (secret_hash, { dispatch }) => general_api_default.post(`${import_constants5.useradmApiUrl}/auth/verify-email/complete`, { secret_hash }).then(() => dispatch(actions8.receivedActivationCode(""))).catch((err) => commonErrorHandler(err, "An error occured completing the email verification process:", dispatch)).finally(() => Promise.resolve(dispatch(getUser(OWN_USER_ID))))
 );
 var verify2FA = createAppAsyncThunk(
   `${sliceName8}/verify2FA`,
@@ -4850,7 +4886,7 @@ var addTenant = createAppAsyncThunk(
 );
 var tenantListRetrieval = async (config) => {
   const { page, perPage } = config;
-  const params = new URLSearchParams({ page, per_page: perPage }).toString();
+  const params = new URLSearchParams({ page, per_page: perPage, tiers: "true" }).toString();
   const tenantList = await general_api_default.get(`${import_constants5.tenantadmApiUrlv2}/tenants?${params}`);
   const totalCount = tenantList.headers[import_constants5.headerNames.total] || TENANT_LIST_DEFAULT.perPage;
   return [tenantList.data, Number(totalCount)];
@@ -4875,11 +4911,11 @@ var setTenantsListState = createAppAsyncThunk(
     return dispatch(actions.setTenantListState({ ...nextState }));
   }
 );
-var editTenantDeviceLimit = createAppAsyncThunk(
+var editTenant = createAppAsyncThunk(
   `${sliceName}/editDeviceLimit`,
-  ({ newLimit, id, name }, { dispatch }) => general_api_default.put(`${import_constants5.tenantadmApiUrlv2}/tenants/${id}/child`, { device_limit: newLimit, name }).catch((err) => commonErrorHandler(err, `Device Limit cannot be changed`, dispatch)).then(
+  ({ device_limits, id, name }, { dispatch }) => general_api_default.put(`${import_constants5.tenantadmApiUrlv2}/tenants/${id}/child`, { device_limits, name }).catch((err) => commonErrorHandler(err, `Device Limit cannot be changed`, dispatch)).then(
     () => Promise.all([
-      dispatch(setSnackbar5("Device Limit was changed successfully")),
+      dispatch(setSnackbar5("Tenant was changed successfully")),
       dispatch(getUserOrganization()),
       new Promise((resolve) => setTimeout(() => resolve(dispatch(getTenants())), TIMEOUTS.oneSecond))
     ])
@@ -4905,7 +4941,7 @@ var removeTenant = createAppAsyncThunk(
 );
 var getUserOrganization = createAppAsyncThunk(
   `${sliceName}/getUserOrganization`,
-  (_, { dispatch, getState }) => general_api_default.get(`${import_constants5.tenantadmApiUrlv1}/user/tenant`).then((res) => {
+  (_, { dispatch, getState }) => general_api_default.get(`${import_constants5.tenantadmApiUrlv1}/user/tenant?tiers=true`).then((res) => {
     const tasks = [dispatch(actions.setOrganization(res.data))];
     const { addons, plan, trial } = res.data;
     const { token } = getCurrentSession(getState());
@@ -5065,7 +5101,7 @@ var getSsoConfigs = createAppAsyncThunk(
   deleteSsoConfig,
   downloadLicenseReport,
   editBillingProfile,
-  editTenantDeviceLimit,
+  editTenant,
   getAuditLogs,
   getAuditLogsCsvLink,
   getBillingPreview,