Merge pull request #671 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "8.8.0",
+  "version": "8.8.1",
   "author": "CIPP Contributors",
   "homepage": "https://cipp.app/",
   "bugs": {
@@ -118,4 +118,4 @@
     "eslint": "9.35.0",
     "eslint-config-next": "15.5.2"
   }
-}
+}

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "8.8.0"
-}
+  "version": "8.8.1"
+}

src/components/CippComponents/CippTenantSelector.jsx

@@ -205,7 +205,7 @@ export const CippTenantSelector = (props) => {
 
   // This effect handles when the URL parameter changes externally
   useEffect(() => {
-    if (!router.isReady || !tenantList.isSuccess) return;
+    if (!router.isReady || !tenantList.isSuccess || !settings.isInitialized) return;
 
     // Get the current tenant from URL or settings
     const urlTenant = router.query.tenantFilter || settings.currentTenant;
@@ -230,11 +230,17 @@ export const CippTenantSelector = (props) => {
         });
       }
     }
-  }, [router.isReady, router.query.tenantFilter, tenantList.isSuccess, settings.currentTenant]);
+  }, [
+    router.isReady,
+    router.query.tenantFilter,
+    tenantList.isSuccess,
+    settings.currentTenant,
+    settings.isInitialized,
+  ]);
 
   // This effect ensures the tenant filter parameter is included in the URL when missing
   useEffect(() => {
-    if (!router.isReady || !settings.currentTenant) return;
+    if (!router.isReady || !settings.isInitialized || !settings.currentTenant) return;
 
     // If the tenant parameter is missing from the URL but we have it in settings
     if (!router.query.tenantFilter && settings.currentTenant) {
@@ -248,7 +254,7 @@ export const CippTenantSelector = (props) => {
         { shallow: true }
       );
     }
-  }, [router.isReady, router.query, settings.currentTenant]);
+  }, [router.isReady, router.query, settings.currentTenant, settings.isInitialized]);
 
   useEffect(() => {
     if (tenant && currentTenant?.value && currentTenant?.value !== "AllTenants") {

src/contexts/settings-context.js

@@ -132,14 +132,22 @@ export const SettingsProvider = (props) => {
 
   const handleUpdate = useCallback((settings) => {
     setState((prevState) => {
+      // Filter out null and undefined values to prevent resetting settings
+      const filteredSettings = Object.entries(settings).reduce((acc, [key, value]) => {
+        if (value !== null && value !== undefined) {
+          acc[key] = value;
+        }
+        return acc;
+      }, {});
+
       storeSettings({
         ...prevState,
-        ...settings,
+        ...filteredSettings,
       });
 
       return {
         ...prevState,
-        ...settings,
+        ...filteredSettings,
       };
     });
   }, []);

src/pages/_app.js

@@ -366,14 +366,13 @@ const App = (props) => {
             <LocalizationProvider dateAdapter={AdapterDateFns} adapterLocale={dateLocale}>
               <SettingsConsumer>
                 {(settings) => {
-                  if (!settings.isInitialized) {
-                  }
+                  // Create theme even while initializing to avoid blank screen
                   const theme = createTheme({
                     colorPreset: "orange",
-                    direction: settings.direction,
+                    direction: settings.direction || "ltr",
                     paletteMode:
                       settings.currentTheme?.value !== "browser"
-                        ? settings.currentTheme?.value
+                        ? settings.currentTheme?.value || "light"
                         : preferredTheme,
                     contrast: "high",
                   });