From a731b0912207971208ca3c0f6d473ab4b0584ada Mon Sep 17 00:00:00 2001
From: Darcy Ye <darcyye@silverhand.io>
Date: Mon, 5 Aug 2024 13:18:18 +0800
Subject: [PATCH] fix(console): should not call cloud API when tenant ID is not
 valid (#6399)

---
 packages/console/src/hooks/use-new-subscription-quota.ts        | 2 +-
 packages/console/src/hooks/use-new-subscription-scopes-usage.ts | 2 ++
 packages/console/src/hooks/use-new-subscription-usage.ts        | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/console/src/hooks/use-new-subscription-quota.ts b/packages/console/src/hooks/use-new-subscription-quota.ts
index 4b6f4a8c9f5..495905a1efa 100644
--- 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
index e085456e9c4..5e39c2005d6 100644
--- 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
index a878e3f0d3d..fe25b5cc734 100644
--- 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 },