fix(core,console): disable quota guard and unblock resource creation for pro tenants

packages/console/src/ds-components/TabNav/TabNavItem.tsx

@@ -51,7 +51,11 @@ function TabNavItem<Paths extends string>({
         )}
       </div>
       {errorCount > 0 && (
-        <div className={styles.errors}>{t('general.tab_errors', { count: errorCount })}</div>
+        <div className={styles.errors}>
+          {errorCount === 1
+            ? t('general.tab_error', { count: errorCount })
+            : t('general.tab_errors', { count: errorCount })}
+        </div>
       )}
     </div>
   );

packages/console/src/pages/EnterpriseSso/SsoCreationModal/index.tsx

@@ -62,7 +62,8 @@ function SsoCreationModal({ isOpen, onClose: rawOnClose }: Props) {
   const isSsoEnabled =
     !isCloud ||
     currentSubscriptionQuota.enterpriseSsoLimit === null ||
-    currentSubscriptionQuota.enterpriseSsoLimit > 0;
+    currentSubscriptionQuota.enterpriseSsoLimit > 0 ||
+    planId === ReservedPlanId.Pro;
 
   const { data, error } = useSWR<SsoConnectorProvidersResponse, RequestError>(
     'api/sso-connector-providers'

packages/console/src/pages/EnterpriseSso/index.tsx

@@ -37,15 +37,16 @@ function EnterpriseSso() {
   const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' });
   const { isDevTenant } = useContext(TenantsContext);
   const {
-    currentSubscription: { isAddOnAvailable },
+    currentSubscription: { planId, isAddOnAvailable },
     currentSubscriptionQuota,
   } = useContext(SubscriptionDataContext);
 
   const [{ page }, updateSearchParameters] = useSearchParametersWatcher({
     page: 1,
   });
 
-  const isSsoEnabled = !isCloud || currentSubscriptionQuota.enterpriseSsoLimit !== 0;
+  const isSsoEnabled =
+    !isCloud || currentSubscriptionQuota.enterpriseSsoLimit !== 0 || planId === ReservedPlanId.Pro;
 
   const url = buildUrl('api/sso-connectors', {
     page: String(page),

packages/console/src/pages/Mfa/MfaForm/index.tsx

@@ -1,4 +1,4 @@
-import { MfaFactor, MfaPolicy, type SignInExperience } from '@logto/schemas';
+import { MfaFactor, MfaPolicy, ReservedPlanId, type SignInExperience } from '@logto/schemas';
 import { useContext, useMemo } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 import { toast } from 'react-hot-toast';
@@ -33,9 +33,13 @@ type Props = {
 };
 
 function MfaForm({ data, onMfaUpdated }: Props) {
-  const { currentSubscriptionQuota, mutateSubscriptionQuotaAndUsages } =
-    useContext(SubscriptionDataContext);
-  const isMfaDisabled = isCloud && !currentSubscriptionQuota.mfaEnabled;
+  const {
+    currentSubscription: { planId },
+    currentSubscriptionQuota,
+    mutateSubscriptionQuotaAndUsages,
+  } = useContext(SubscriptionDataContext);
+  const isMfaDisabled =
+    isCloud && !currentSubscriptionQuota.mfaEnabled && planId !== ReservedPlanId.Pro;
 
   const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' });
   const { getDocumentationUrl } = useDocumentationUrl();

packages/console/src/pages/Mfa/PageWrapper/index.tsx

@@ -17,10 +17,10 @@ type Props = {
 function PageWrapper({ children }: Props) {
   const { isDevTenant } = useContext(TenantsContext);
   const {
-    currentSubscription: { isAddOnAvailable },
+    currentSubscription: { planId, isAddOnAvailable },
     currentSubscriptionQuota: { mfaEnabled },
   } = useContext(SubscriptionDataContext);
-  const isMfaEnabled = !isCloud || mfaEnabled;
+  const isMfaEnabled = !isCloud || mfaEnabled || planId === ReservedPlanId.Pro;
 
   return (
     <div className={styles.container}>

packages/console/src/pages/OrganizationTemplate/index.tsx

@@ -32,9 +32,13 @@ const basePathname = '/organization-template';
 function OrganizationTemplate() {
   const { getDocumentationUrl } = useDocumentationUrl();
   const [isGuideDrawerOpen, setIsGuideDrawerOpen] = useState(false);
-  const { currentSubscriptionQuota } = useContext(SubscriptionDataContext);
+  const {
+    currentSubscription: { planId },
+    currentSubscriptionQuota,
+  } = useContext(SubscriptionDataContext);
   const { isDevTenant } = useContext(TenantsContext);
-  const isOrganizationsDisabled = isCloud && !currentSubscriptionQuota.organizationsEnabled;
+  const isOrganizationsDisabled =
+    isCloud && !currentSubscriptionQuota.organizationsEnabled && planId !== ReservedPlanId.Pro;
   const { navigate } = useTenantPathname();
 
   const handleUpgradePlan = useCallback(() => {

packages/console/src/pages/Organizations/CreateOrganizationModal/index.tsx

@@ -40,7 +40,8 @@ function CreateOrganizationModal({ isOpen, onClose }: Props) {
     data: { organizationUpsellNoticeAcknowledged },
     update,
   } = useUserPreferences();
-  const isOrganizationsDisabled = isCloud && !currentSubscriptionQuota.organizationsEnabled;
+  const isOrganizationsDisabled =
+    isCloud && !currentSubscriptionQuota.organizationsEnabled && planId !== ReservedPlanId.Pro;
 
   const {
     reset,

packages/console/src/pages/Organizations/index.tsx

@@ -26,15 +26,16 @@ const organizationsPathname = '/organizations';
 function Organizations() {
   const { getDocumentationUrl } = useDocumentationUrl();
   const {
-    currentSubscription: { isAddOnAvailable },
+    currentSubscription: { planId, isAddOnAvailable },
     currentSubscriptionQuota,
   } = useContext(SubscriptionDataContext);
   const { isDevTenant } = useContext(TenantsContext);
 
   const { navigate } = useTenantPathname();
   const [isCreating, setIsCreating] = useState(false);
 
-  const isOrganizationsDisabled = isCloud && !currentSubscriptionQuota.organizationsEnabled;
+  const isOrganizationsDisabled =
+    isCloud && !currentSubscriptionQuota.organizationsEnabled && planId !== ReservedPlanId.Pro;
 
   const upgradePlan = useCallback(() => {
     navigate(subscriptionPage);

packages/core/src/libraries/quota.ts

@@ -14,11 +14,16 @@
 
 export type QuotaLibrary = ReturnType<typeof createQuotaLibrary>;
 
+/**
+ * @remarks
+ * Should report usage changes to the Cloud only when the following conditions are met:
+ * 1. The tenant is on the Pro plan.
+ * 2. The usage key is add-on related usage key.
+ */
 const shouldReportSubscriptionUpdates = (
   planId: string,
   key: keyof SubscriptionQuota,
-  isAddOnAvailable?: boolean
-) => planId === ReservedPlanId.Pro && isAddOnAvailable && isReportSubscriptionUpdatesUsageKey(key);
+) => planId === ReservedPlanId.Pro && isReportSubscriptionUpdatesUsageKey(key);
 
 export const createQuotaLibrary = (cloudConnection: CloudConnectionLibrary) => {
   const guardTenantUsageByKey = async (key: keyof SubscriptionQuota) => {
@@ -36,13 +41,12 @@
 
     const {
       planId,
-      isAddOnAvailable,
       quota: fullQuota,
       usage: fullUsage,
     } = await getTenantSubscriptionData(cloudConnection);
 
     // Do not block Pro plan from adding add-on resources.
-    if (shouldReportSubscriptionUpdates(planId, key, isAddOnAvailable)) {
+    if (shouldReportSubscriptionUpdates(planId,key)) {
       return;
     }
 
@@ -159,7 +163,7 @@
 
     const { planId, isAddOnAvailable } = await getTenantSubscriptionData(cloudConnection);
 
-    if (shouldReportSubscriptionUpdates(planId, key, isAddOnAvailable)) {
+    if (shouldReportSubscriptionUpdates(planId, key) && isAddOnAvailable) {
       await reportSubscriptionUpdates(cloudConnection, key);
     }
   };

packages/core/src/utils/subscription/index.ts

@@ -57,6 +57,10 @@ export const reportSubscriptionUpdates = async (
   );
 };
 
+/**
+ * @remarks
+ * Check whether the provided usage key is add-on related usage key.
+ */
 export const isReportSubscriptionUpdatesUsageKey = (
   value: string
 ): value is ReportSubscriptionUpdatesUsageKey => {

packages/phrases/src/locales/en/translation/admin-console/general.ts

@@ -46,6 +46,7 @@ const general = {
   continue: 'Continue',
   page_info: '{{min, number}}-{{max, number}} of {{total, number}}',
   learn_more: 'Learn more',
+  tab_error: '{{count, number}} error',
   tab_errors: '{{count, number}} errors',
   skip_for_now: 'Skip for now',
   remove: 'Remove',