fix(console): should not call cloud API when tenant ID is not valid (#…

…6399)
logto-io · Aug 5, 2024 · a731b09 · a731b09
1 parent 2e3a006
commit a731b09
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/packages/console/src/hooks/use-new-subscription-quota.ts b/packages/console/src/hooks/use-new-subscription-quota.ts
@@ -8,7 +8,7 @@ const useNewSubscriptionQuota = (tenantId: string) => {
   const cloudApi = useCloudApi();
 
   return useSWR<NewSubscriptionQuota, Error>(
-    isCloud && isDevFeaturesEnabled && `/api/tenants/${tenantId}/subscription/quota`,
+    isCloud && isDevFeaturesEnabled && tenantId && `/api/tenants/${tenantId}/subscription/quota`,
     async () =>
       cloudApi.get('/api/tenants/:tenantId/subscription/quota', {
         params: { tenantId },

diff --git a/packages/console/src/hooks/use-new-subscription-scopes-usage.ts b/packages/console/src/hooks/use-new-subscription-scopes-usage.ts
@@ -14,6 +14,7 @@ const useNewSubscriptionScopeUsage = (tenantId: string) => {
     scopeResourceUsage: useSWR<NewSubscriptionScopeUsage, Error>(
       isCloud &&
         isDevFeaturesEnabled &&
+        tenantId &&
         `/api/tenants/${tenantId}/subscription/usage/${resourceEntityName}/scopes`,
       async () =>
         cloudApi.get('/api/tenants/:tenantId/subscription/usage/:entityName/scopes', {
@@ -24,6 +25,7 @@ const useNewSubscriptionScopeUsage = (tenantId: string) => {
     scopeRoleUsage: useSWR<NewSubscriptionScopeUsage, Error>(
       isCloud &&
         isDevFeaturesEnabled &&
+        tenantId &&
         `/api/tenants/${tenantId}/subscription/usage/${roleEntityName}/scopes`,
       async () =>
         cloudApi.get('/api/tenants/:tenantId/subscription/usage/:entityName/scopes', {

diff --git a/packages/console/src/hooks/use-new-subscription-usage.ts b/packages/console/src/hooks/use-new-subscription-usage.ts
@@ -8,7 +8,7 @@ const useNewSubscriptionUsage = (tenantId: string) => {
   const cloudApi = useCloudApi();
 
   return useSWR<NewSubscriptionUsage, Error>(
-    isCloud && isDevFeaturesEnabled && `/api/tenants/${tenantId}/subscription/usage`,
+    isCloud && isDevFeaturesEnabled && tenantId && `/api/tenants/${tenantId}/subscription/usage`,
     async () =>
       cloudApi.get('/api/tenants/:tenantId/subscription/usage', {
         params: { tenantId },