Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2024-12-16 20:26:19 -05:00
Code Issues Activity

fix(console): fix cloud CI failed issue (#6710)

Browse source 
chore: remove useNewSubscriptionData manual updateTenant
This commit is contained in:
Darcy Ye 2024-10-23 11:53:56 +08:00 committed by GitHub
parent 83e942a098
commit b906db730c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 41 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packages/console/src/contexts/SubscriptionDataProvider/use-new-subscription-data.ts
View file

@ -1,4 +1,4 @@
import { cond, condString, pick } from '@silverhand/essentials'; import { cond, pick } from '@silverhand/essentials';
import { useContext, useEffect, useMemo } from 'react'; import { useContext, useEffect, useMemo } from 'react';
import useSWR from 'swr'; import useSWR from 'swr';
@ -21,25 +21,24 @@ import { type NewSubscriptionContext } from './types';
const useNewSubscriptionData: () => NewSubscriptionContext & { isLoading: boolean } = () => { const useNewSubscriptionData: () => NewSubscriptionContext & { isLoading: boolean } = () => {
const cloudApi = useCloudApi(); const cloudApi = useCloudApi();
const { currentTenant, updateTenant } = useContext(TenantsContext); const { currentTenant, currentTenantId, updateTenant } = useContext(TenantsContext);
const { isLoading: isLogtoSkusLoading, data: fetchedLogtoSkus } = useLogtoSkus(); const { isLoading: isLogtoSkusLoading, data: fetchedLogtoSkus } = useLogtoSkus();
const tenantId = condString(currentTenant?.id);
const { const {
data: currentSubscription, data: currentSubscription,
isLoading: isSubscriptionLoading, isLoading: isSubscriptionLoading,
mutate: mutateSubscription, mutate: mutateSubscription,
} = useSubscription(tenantId); } = useSubscription(currentTenantId);
const { const {
data: subscriptionUsageData, data: subscriptionUsageData,
isLoading: isSubscriptionUsageDataLoading, isLoading: isSubscriptionUsageDataLoading,
mutate: mutateSubscriptionQuotaAndUsages, mutate: mutateSubscriptionQuotaAndUsages,
} = useSWR<NewSubscriptionUsageResponse, Error>( } = useSWR<NewSubscriptionUsageResponse, Error>(
isCloud && tenantId && `/api/tenants/${tenantId}/subscription-usage`, isCloud && currentTenantId && `/api/tenants/${currentTenantId}/subscription-usage`,
async () => async () =>
cloudApi.get('/api/tenants/:tenantId/subscription-usage', { cloudApi.get('/api/tenants/:tenantId/subscription-usage', {
params: { tenantId }, params: { tenantId: currentTenantId },
}) })
); );
@ -52,11 +51,11 @@ const useNewSubscriptionData: () => NewSubscriptionContext & { isLoading: boolea
useEffect(() => { useEffect(() => {
if (subscriptionUsageData?.quota) { if (subscriptionUsageData?.quota) {
updateTenant(tenantId, { updateTenant(currentTenantId, {
quota: pick(subscriptionUsageData.quota, 'mauLimit', 'tokenLimit'), quota: pick(subscriptionUsageData.quota, 'mauLimit', 'tokenLimit'),
}); });
} }
}, [tenantId, subscriptionUsageData?.quota, updateTenant]); }, [currentTenantId, subscriptionUsageData?.quota, updateTenant]);
return useMemo( return useMemo(
() => ({ () => ({

50
packages/console/src/contexts/TenantsProvider.tsx
View file

@ -118,31 +118,49 @@ function TenantsProvider({ children }: Props) {
[currentTenantId, tenants] [currentTenantId, tenants]
); );
const resetTenants = useCallback((tenants: TenantResponse[]) => {
setTenants(tenants);
setIsInitComplete(true);
}, []);
const prependTenant = useCallback((tenant: TenantResponse) => {
setTenants((tenants) => [tenant, ...tenants]);
}, []);
const removeTenant = useCallback((tenantId: string) => {
setTenants((tenants) => tenants.filter((tenant) => tenant.id !== tenantId));
}, []);
const updateTenant = useCallback((tenantId: string, data: Partial<TenantResponse>) => {
setTenants((tenants) =>
tenants.map((tenant) => (tenant.id === tenantId ? { ...tenant, ...data } : tenant))
);
}, []);
const memorizedContext = useMemo( const memorizedContext = useMemo(
() => ({ () => ({
tenants, tenants,
resetTenants: (tenants: TenantResponse[]) => { resetTenants,
setTenants(tenants); prependTenant,
setIsInitComplete(true); removeTenant,
}, updateTenant,
prependTenant: (tenant: TenantResponse) => {
setTenants((tenants) => [tenant, ...tenants]);
},
removeTenant: (tenantId: string) => {
setTenants((tenants) => tenants.filter((tenant) => tenant.id !== tenantId));
},
updateTenant: (tenantId: string, data: Partial<TenantResponse>) => {
setTenants((tenants) =>
tenants.map((tenant) => (tenant.id === tenantId ? { ...tenant, ...data } : tenant))
);
},
isInitComplete, isInitComplete,
currentTenantId, currentTenantId,
isDevTenant: currentTenant?.tag === TenantTag.Development, isDevTenant: currentTenant?.tag === TenantTag.Development,
currentTenant, currentTenant,
navigateTenant, navigateTenant,
}), }),
[currentTenant, currentTenantId, isInitComplete, navigateTenant, tenants] [
currentTenant,
currentTenantId,
isInitComplete,
navigateTenant,
tenants,
resetTenants,
prependTenant,
removeTenant,
updateTenant,
]
); );
return <TenantsContext.Provider value={memorizedContext}>{children}</TenantsContext.Provider>; return <TenantsContext.Provider value={memorizedContext}>{children}</TenantsContext.Provider>;