From 40dc4708d2ec8b5fe7baaf684554e8c4109198ed Mon Sep 17 00:00:00 2001 From: pablodanswer Date: Sat, 12 Oct 2024 18:44:28 -0700 Subject: [PATCH] slightly cleaner loading (#2776) --- .../configuration/search/UpgradingPage.tsx | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/web/src/app/admin/configuration/search/UpgradingPage.tsx b/web/src/app/admin/configuration/search/UpgradingPage.tsx index 2d9415e10..60177661c 100644 --- a/web/src/app/admin/configuration/search/UpgradingPage.tsx +++ b/web/src/app/admin/configuration/search/UpgradingPage.tsx @@ -27,11 +27,11 @@ export default function UpgradingPage({ const [isCancelling, setIsCancelling] = useState(false); const { setPopup, popup } = usePopup(); - const { data: connectors } = useSWR[]>( - "/api/manage/connector", - errorHandlingFetcher, - { refreshInterval: 5000 } // 5 seconds - ); + const { data: connectors, isLoading: isLoadingConnectors } = useSWR< + Connector[] + >("/api/manage/connector", errorHandlingFetcher, { + refreshInterval: 5000, // 5 seconds + }); const { data: ongoingReIndexingStatus, @@ -90,6 +90,10 @@ export default function UpgradingPage({ }); }, [ongoingReIndexingStatus]); + if (isLoadingConnectors || isLoadingOngoingReIndexingStatus) { + return ; + } + return ( <> {popup} @@ -150,9 +154,7 @@ export default function UpgradingPage({ downtime is necessary during this transition. - {isLoadingOngoingReIndexingStatus ? ( - - ) : sortedReindexingProgress ? ( + {sortedReindexingProgress ? (