From 0cd18947ec8d0c40e428b61f3ba05a366b45c9ad Mon Sep 17 00:00:00 2001 From: Weves Date: Thu, 22 Jun 2023 00:19:25 -0600 Subject: [PATCH] fix form refresh --- web/src/app/admin/connectors/confluence/page.tsx | 6 ++---- web/src/app/admin/connectors/github/page.tsx | 6 ++---- web/src/app/admin/connectors/google-drive/page.tsx | 6 +++--- web/src/app/admin/connectors/slack/page.tsx | 6 ++---- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/web/src/app/admin/connectors/confluence/page.tsx b/web/src/app/admin/connectors/confluence/page.tsx index 4aa0464e0ae..f6a2668b6b0 100644 --- a/web/src/app/admin/connectors/confluence/page.tsx +++ b/web/src/app/admin/connectors/confluence/page.tsx @@ -31,7 +31,6 @@ const Main = () => { const { data: credentialsData, isLoading: isCredentialsLoading, - isValidating: isCredentialsValidating, error: isCredentialsError, } = useSWR[]>( "/api/manage/credential", @@ -39,9 +38,8 @@ const Main = () => { ); if ( - isConnectorIndexingStatusesLoading || - isCredentialsLoading || - isCredentialsValidating + (!connectorIndexingStatuses && isConnectorIndexingStatusesLoading) || + (!credentialsData && isCredentialsLoading) ) { return ; } diff --git a/web/src/app/admin/connectors/github/page.tsx b/web/src/app/admin/connectors/github/page.tsx index 7c915c1f8f5..817b16954f2 100644 --- a/web/src/app/admin/connectors/github/page.tsx +++ b/web/src/app/admin/connectors/github/page.tsx @@ -32,7 +32,6 @@ const Main = () => { const { data: credentialsData, isLoading: isCredentialsLoading, - isValidating: isCredentialsValidating, error: isCredentialsError, } = useSWR[]>( "/api/manage/credential", @@ -40,9 +39,8 @@ const Main = () => { ); if ( - isConnectorIndexingStatusesLoading || - isCredentialsLoading || - isCredentialsValidating + (!connectorIndexingStatuses && isConnectorIndexingStatusesLoading) || + (!credentialsData && isCredentialsLoading) ) { return ; } diff --git a/web/src/app/admin/connectors/google-drive/page.tsx b/web/src/app/admin/connectors/google-drive/page.tsx index ada615c0221..3a5c1fe30f2 100644 --- a/web/src/app/admin/connectors/google-drive/page.tsx +++ b/web/src/app/admin/connectors/google-drive/page.tsx @@ -479,9 +479,9 @@ const Main = () => { }; if ( - isCredentialsLoading || - isAppCredentialLoading || - isConnectorIndexingStatusesLoading + (!appCredentialData && isAppCredentialLoading) || + (!connectorIndexingStatuses && isConnectorIndexingStatusesLoading) || + (!credentialsData && isCredentialsLoading) ) { return (
diff --git a/web/src/app/admin/connectors/slack/page.tsx b/web/src/app/admin/connectors/slack/page.tsx index 1f16e9071cc..c621103c9c7 100644 --- a/web/src/app/admin/connectors/slack/page.tsx +++ b/web/src/app/admin/connectors/slack/page.tsx @@ -33,7 +33,6 @@ const MainSection = () => { const { data: credentialsData, isLoading: isCredentialsLoading, - isValidating: isCredentialsValidating, error: isCredentialsError, } = useSWR[]>( "/api/manage/credential", @@ -41,9 +40,8 @@ const MainSection = () => { ); if ( - isConnectorIndexingStatusesLoading || - isCredentialsLoading || - isCredentialsValidating + (!connectorIndexingStatuses && isConnectorIndexingStatusesLoading) || + (!credentialsData && isCredentialsLoading) ) { return ; }