Merge pull request #2063 from shuhaib-aot/Feature/FWF-3320-set-lang-t…

…o-develop

Feature/fwf 3320 set lang to develop and also bring changes from master

CHANGELOG.md

@@ -2,13 +2,18 @@
 
 Mark  items as `Added`, `Changed`, `Fixed`, `Modified`, `Removed`, `Untested Features`, `Upcoming Features`, `Known Issues`
 
-## 6.0.1 - 2024-05-16
+## 6.0.1 - 2024-05-21
 
 `Added`
 
 **forms-flow-web-root-config**
 * Added resouce bundle for Spanish 
 
+`Fixed`
+
+**forms-flow-web-root-config**
+* Fixed service worker cache issue
+
 ## 6.0.0 - 2024-04-05
 
 `Added`

forms-flow-web/src/_tests_/test-redux-states/redux-state-sample.js

@@ -139,4 +139,7 @@ export const appState = {
     isFormChecked: false,
     isAllFormChecked: false,
   },
+  tenants:{ 
+  tenantData: {}
+  }
 };

forms-flow-web/src/components/PrivateRoute.jsx

@@ -76,6 +76,8 @@ const PrivateRoute = React.memo((props) => {
   const userRoles = useSelector((state) => state.user.roles || []);
   const { tenantId } = useParams();
   const redirecUrl = MULTITENANCY_ENABLED ? `/tenant/${tenantId}/` : `/`;
+  const selectedLanguage = useSelector((state) => state.user.lang);
+  const tenant = useSelector((state) => state.tenants);
 
   const [kcInstance, setKcInstance] = React.useState(getKcInstance());
 
@@ -85,7 +87,6 @@ const PrivateRoute = React.memo((props) => {
     );
     dispatch(setUserAuth(instance.isAuthenticated()));
     store.dispatch(setUserToken(instance.getToken()));
-    store.dispatch(setLanguage(instance.getUserData()?.locale || "en"));
     //Set Cammunda/Formio Base URL
     setApiBaseUrlToLocalStorage();
     // get formio roles
@@ -139,6 +140,18 @@ const PrivateRoute = React.memo((props) => {
     }
   }, [props.store, tenantId, dispatch]);
 
+  /**
+   * Retrieves the user's locale from the Keycloak instance or the tenant data, and dispatches an action to set the language in the application state.
+   * This effect is triggered whenever the Keycloak instance or the tenant data changes.
+   */
+  useEffect(() => {
+    const lang =
+      kcInstance?.getInstance()?.getUserData().locale ||
+      tenant?.tenantData?.details?.locale ||
+      selectedLanguage;
+    dispatch(setLanguage(lang));
+  }, [kcInstance, tenant?.tenantData]);
+
   // useMemo prevents unneccessary rerendering caused by the route update.
 
   const DesignerRoute = useMemo(