From b1e87d4f579feaecbfc624d99a008524b8e03992 Mon Sep 17 00:00:00 2001
From: Elio Struyf <elio@struyfconsulting.be>
Date: Thu, 22 Feb 2024 10:29:51 +0100
Subject: [PATCH] #760 - Fix to keep locale filter

---
 src/dashboardWebView/hooks/usePages.tsx | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/dashboardWebView/hooks/usePages.tsx b/src/dashboardWebView/hooks/usePages.tsx
index d6ef66b8..a43a585b 100644
--- a/src/dashboardWebView/hooks/usePages.tsx
+++ b/src/dashboardWebView/hooks/usePages.tsx
@@ -220,16 +220,6 @@ export default function usePages(pages: Page[]) {
         }
       }
 
-      if (tabPrevious !== tab || !locales || locales.length === 0) {
-        // Store the locale information
-        const config: I18nConfig[] = [];
-        crntPages.forEach((page) => {
-          if (page.fmLocale && !config.some(locale => locale.locale === page.fmLocale?.locale)) {
-            config.push(page.fmLocale);
-          }
-        });
-        setLocales(config);
-      }
 
       // Set the pages
       setPageItems(crntPages);
@@ -276,6 +266,17 @@ export default function usePages(pages: Page[]) {
     } else {
       startPageProcessing();
     }
+
+    if (pages && pages.length > 0) {
+      // Store the locale information
+      const config: I18nConfig[] = [];
+      pages.forEach((page) => {
+        if (page.fmLocale && !config.some(locale => locale.locale === page.fmLocale?.locale)) {
+          config.push(page.fmLocale);
+        }
+      });
+      setLocales(config);
+    }
   }, [settings?.draftField, pages, sorting, search, tag, category, locale, filters, folder]);
 
   useEffect(() => {