@beinformed/ui 1.59.10 → 1.59.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.59.10",
+  "version": "1.59.12",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -110,7 +110,7 @@
     "@babel/preset-env": "^7.26.0",
     "@babel/preset-flow": "^7.25.9",
     "@babel/preset-react": "^7.26.3",
-    "@commitlint/cli": "^19.6.0",
+    "@commitlint/cli": "^19.6.1",
     "@commitlint/config-conventional": "^19.6.0",
     "@testing-library/react": "^16.1.0",
     "auditjs": "^4.0.46",
@@ -125,9 +125,9 @@
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-ft-flow": "^3.0.11",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jest": "^28.9.0",
-    "eslint-plugin-jsdoc": "^50.6.0",
-    "eslint-plugin-react": "^7.37.2",
+    "eslint-plugin-jest": "^28.10.0",
+    "eslint-plugin-jsdoc": "^50.6.1",
+    "eslint-plugin-react": "^7.37.3",
     "eslint-plugin-react-hooks": "^5.1.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",
     "flow-bin": "^0.200.1",
@@ -141,7 +141,7 @@
     "jest-junit": "^16.0.0",
     "jest-sonar-reporter": "^2.0.0",
     "jscodeshift": "^17.1.1",
-    "lint-staged": "^15.2.10",
+    "lint-staged": "^15.3.0",
     "polished": "^4.0.0",
     "prettier": "^3.4.2",
     "react": "^18.3.1",

package/src/hooks/__tests__/useModelCatalog.spec.js

@@ -156,7 +156,7 @@ describe("modelcatalog hooks", () => {
     assertTargetModel(
       () => useContentType("/contenttypes/contenttype"),
       "contenttypes",
-      "/contenttypes/contenttype?entryDate=" + DateUtil.now(),
+      "/contenttypes/contenttype",
       ContentTypeModel,
     );
   });

package/src/hooks/useModelCatalog.js

@@ -142,10 +142,7 @@ export const useContentType = (
   key?: string = "contenttypes",
   options?: UseModularUIBasicOptions<ContentTypeModel>,
 ): ?ContentTypeModel => {
-  const { entryDate } = useEntryDate();
-
-  const href = createHref("contenttypes", contentType, entryDate, null, []);
-
+  const href = createHref("contenttypes", contentType, null, null, []);
   return useModularUIBasic(key, href, {
     expectedModels: ["ContentType"],
     targetModel: ContentTypeModel,

package/src/modularui/ModularUIRequest.js

@@ -66,7 +66,7 @@ class ModularUIRequest {
     this._response = new ModularUIResponse();
 
     this.href = typeof href === "string" ? new Href(href) : href;
-    this.locale = options.locale ?? "en";
+    this.locale = this.getRequestLocale(options.locale);
 
     // copy request parameters to response, to be able to use them in the models
     // self links are missing the request parameters
@@ -95,6 +95,21 @@ class ModularUIRequest {
     }
   }
 
+  /**
+   * Retrieve the preferred language for this request, falls back to the browser language or english
+   */
+  getRequestLocale(optionLocale: ?string): string {
+    if (optionLocale) {
+      return optionLocale;
+    }
+
+    if (navigator.language) {
+      return navigator.language.split("-")[0] || "en";
+    }
+
+    return "en";
+  }
+
   /**
    */
   get origin(): string {

package/src/redux/_i18n/I18nReducer.js

@@ -46,10 +46,17 @@ const setLocales = (
   };
 };
 
+const getDefaultLocale = () => {
+  if (navigator?.language) {
+    return navigator?.language.split("-")[0] || "en";
+  }
+  return "en";
+};
+
 // REDUCER
 const initialState: I18nState = {
   locales: new Locales(),
-  locale: "en",
+  locale: getDefaultLocale(),
 };
 
 /**

package/src/redux/_modularui/ModularUIActions.js

@@ -99,6 +99,21 @@ const loadModelSuccessAction = (
   return setModel(key, model);
 };
 
+/**
+ * Retrieve the preferred language for this request, falls back to the browser language or english
+ */
+const getRequestLocale = (optionLocale: ?string): string => {
+  if (optionLocale) {
+    return optionLocale;
+  }
+
+  if (navigator.language) {
+    return navigator.language.split("-")[0] || "en";
+  }
+
+  return "en";
+};
+
 /**
  * This action is handled by the modularui middleware
  */
@@ -121,7 +136,7 @@ export const loadModel = (
           }),
     method: options?.method ?? HTTP_METHODS.GET,
     data: options?.data,
-    locale: options?.locale ?? "en",
+    locale: getRequestLocale(options?.locale),
     childmodels: options?.childmodels,
     targetModel: options?.targetModel,
     forceTargetModel: options?.forceTargetModel,

package/src/utils/helpers/createHref.js

@@ -77,7 +77,7 @@ export const filterParameters = (
 export const createHref = (
   context: string,
   dynamicPart: string | Href,
-  entryDate?: ISO_DATE,
+  entryDate?: ?ISO_DATE,
   location?: ?Location,
   allowedParameters?: Array<string>,
 ): Href => {