From 7e414202f11ba1eadf1a5541f7b2cf7d9565964d Mon Sep 17 00:00:00 2001
From: schroda <50052685+schroda@users.noreply.github.com>
Date: Sun, 5 May 2024 00:45:50 +0200
Subject: [PATCH] Prevent incorrect missing repo info in Extensions

Server settings request loading and error state were never handled, thus, in case this request was still loading or failed, instead of showing the proper page state, the missing repo info was shown
---
 src/screens/Extensions.tsx | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/screens/Extensions.tsx b/src/screens/Extensions.tsx
index c7c48188..7ef184a3 100644
--- a/src/screens/Extensions.tsx
+++ b/src/screens/Extensions.tsx
@@ -106,7 +106,12 @@ export function Extensions() {
     const theme = useTheme();
     const isMobileWidth = useMediaQuery(theme.breakpoints.down('sm'));
 
-    const { data: serverSettingsData } = requestManager.useGetServerSettings();
+    const {
+        data: serverSettingsData,
+        loading: areServerSettingsLoading,
+        error: serverSettingsError,
+        refetch: refetchServerSettings,
+    } = requestManager.useGetServerSettings({ notifyOnNetworkStatusChange: true });
     const areReposDefined = !!serverSettingsData?.settings.extensionRepos.length;
     const areMultipleReposInUse = (serverSettingsData?.settings.extensionRepos.length ?? 0) > 1;
 
@@ -116,7 +121,8 @@ export function Extensions() {
     const [query] = useQueryParam('query', StringParam);
 
     const [refetchExtensions, setRefetchExtensions] = useState({});
-    const [fetchExtensions, { data, loading: isLoading, error }] = requestManager.useExtensionListFetch();
+    const [fetchExtensions, { data, loading: areExtensionsLoading, error: extensionsError }] =
+        requestManager.useExtensionListFetch();
     const allExtensions = data?.fetchExtensions.extensions;
 
     const handleExtensionUpdate = useCallback(() => setRefetchExtensions({}), []);
@@ -231,6 +237,9 @@ export function Extensions() {
         [],
     );
 
+    const isLoading = areServerSettingsLoading || areExtensionsLoading;
+    const error = serverSettingsError ?? extensionsError;
+
     if (isLoading) {
         return <LoadingPlaceholder />;
     }
@@ -240,7 +249,15 @@ export function Extensions() {
             <EmptyViewAbsoluteCentered
                 message={t('global.error.label.failed_to_load_data')}
                 messageExtra={error.message}
-                retry={() => fetchExtensions().catch(defaultPromiseErrorHandler('Extensions::refetch'))}
+                retry={() => {
+                    if (serverSettingsError) {
+                        refetchServerSettings().catch(defaultPromiseErrorHandler('Extensions::refetchServerSettings'));
+                    }
+
+                    if (extensionsError) {
+                        fetchExtensions().catch(defaultPromiseErrorHandler('Extensions::refetchExtensions'));
+                    }
+                }}
             />
         );
     }