@beinformed/ui 1.57.5 → 1.58.0

package/lib/utils/helpers/__tests__/createHref.spec.js.flow

@@ -7,25 +7,29 @@ describe("createHref", () => {
     const location = {
       search: "?entryDate=2024-03-08&index=C&notAllowed=true",
     };
+    const expectedSearch = "?index=C&notAllowed=true&entryDate=2010-01-01";
 
     expect(createHref("concepts", dynamicPart)).toEqual(
       new Href("/concepts/" + dynamicPart),
     );
-    expect(createHref("concepts", dynamicPart, location)).toEqual(
-      new Href("/concepts/" + dynamicPart + location.search),
+    expect(createHref("concepts", dynamicPart, "2010-01-01", location)).toEqual(
+      new Href("/concepts/" + dynamicPart + expectedSearch),
     );
     expect(
-      createHref("concepts", dynamicPart, location, ["entryDate", "index"]),
+      createHref("concepts", dynamicPart, "2010-01-01", location, ["index"]),
     ).toEqual(
-      new Href("/concepts/" + dynamicPart + "?entryDate=2024-03-08&index=C"),
+      new Href("/concepts/" + dynamicPart + "?index=C&entryDate=2010-01-01"),
     );
     expect(
-      createHref("concepts", dynamicPart + location.search, location, [
-        "entryDate",
-        "index",
-      ]),
+      createHref(
+        "concepts",
+        dynamicPart + location.search,
+        "2010-01-01",
+        location,
+        ["index"],
+      ),
     ).toEqual(
-      new Href("/concepts/" + dynamicPart + "?entryDate=2024-03-08&index=C"),
+      new Href("/concepts/" + dynamicPart + "?index=C&entryDate=2010-01-01"),
     );
 
     expect(createHref("concepts", dynamicPart + "#hash")).toEqual(

package/lib/utils/helpers/createHref.js

@@ -75,7 +75,7 @@ const filterParameters = (href, allowedParameters) => {
 /**
  */
 exports.filterParameters = filterParameters;
-const createHref = (context, dynamicPart, location, allowedParameters) => {
+const createHref = (context, dynamicPart, entryDate, location, allowedParameters) => {
   let href = dynamicPart.toString();
   if (!(0, _startsWith.default)(href).call(href, `/${context}/`)) {
     href = `/${context}/${href}`;
@@ -86,13 +86,16 @@ const createHref = (context, dynamicPart, location, allowedParameters) => {
     const search = (0, _startsWith.default)(_context = location.search).call(_context, "?") ? location.search.substring(1) : location.search;
     href = `${href}?${search}`;
   }
-  if (dynamicPart instanceof _Href.default) {
-    return filterParameters(new _Href.default(href, dynamicPart.resourcetype, {
-      origin: dynamicPart.origin,
-      contextPath: dynamicPart.contextPath
-    }), allowedParameters);
+  const finalHref = dynamicPart instanceof _Href.default ? filterParameters(new _Href.default(href, dynamicPart.resourcetype, {
+    origin: dynamicPart.origin,
+    contextPath: dynamicPart.contextPath
+  }), allowedParameters) : filterParameters(href, allowedParameters);
+  if (entryDate) {
+    finalHref.setParameter("entryDate", entryDate);
+  } else {
+    finalHref.removeParameter("entryDate");
   }
-  return filterParameters(href, allowedParameters);
+  return finalHref;
 };
 exports.createHref = createHref;
 //# sourceMappingURL=createHref.js.map

package/lib/utils/helpers/createHref.js.flow

@@ -77,6 +77,7 @@ export const filterParameters = (
 export const createHref = (
   context: string,
   dynamicPart: string | Href,
+  entryDate?: ISO_DATE,
   location?: ?Location,
   allowedParameters?: Array<string>,
 ): Href => {
@@ -95,15 +96,22 @@ export const createHref = (
     href = `${href}?${search}`;
   }
 
-  if (dynamicPart instanceof Href) {
-    return filterParameters(
-      new Href(href, dynamicPart.resourcetype, {
-        origin: dynamicPart.origin,
-        contextPath: dynamicPart.contextPath,
-      }),
-      allowedParameters,
-    );
+  const finalHref =
+    dynamicPart instanceof Href
+      ? filterParameters(
+          new Href(href, dynamicPart.resourcetype, {
+            origin: dynamicPart.origin,
+            contextPath: dynamicPart.contextPath,
+          }),
+          allowedParameters,
+        )
+      : filterParameters(href, allowedParameters);
+
+  if (entryDate) {
+    finalHref.setParameter("entryDate", entryDate);
+  } else {
+    finalHref.removeParameter("entryDate");
   }
 
-  return filterParameters(href, allowedParameters);
+  return finalHref;
 };

package/lib/utils/helpers/createHref.js.map

@@ -1 +1 @@
-{"version":3,"file":"createHref.js","names":["_Href","_interopRequireDefault","require","parseUrl","href","Href","path","querystring","hash","_includes","default","call","hashSplit","split","qsSplit","exports","filterParameters","allowedParameters","Array","isArray","url","filteredUrl","searchParams","_urlSearchParams","params","_from","_keys","param","delete","toString","resourcetype","origin","contextPath","createHref","context","dynamicPart","location","_startsWith","replace","search","_context","substring"],"sources":["../../../src/utils/helpers/createHref.js"],"sourcesContent":["// @flow\nimport Href from \"../../models/href/Href\";\n\nimport type { Location } from \"react-router\";\n\n/**\n */\nexport const parseUrl = (\n  href: string | Href,\n): { path: string, querystring: null | string, hash: null | string } => {\n  if (href instanceof Href) {\n    return {\n      path: href.path,\n      querystring: href.querystring,\n      hash: href.hash,\n    };\n  }\n\n  let path = href;\n  let hash = null;\n  let querystring = null;\n  if (href.includes(\"#\")) {\n    const hashSplit = href.split(\"#\");\n    path = hashSplit[0];\n    hash = hashSplit[1];\n  }\n  if (href.includes(\"?\")) {\n    const qsSplit = path.split(\"?\");\n    path = qsSplit[0];\n    querystring = qsSplit[1];\n  }\n  return {\n    path,\n    querystring,\n    hash,\n  };\n};\n\n/**\n */\nexport const filterParameters = (\n  href: string | Href,\n  allowedParameters?: Array<string>,\n): Href => {\n  if (!Array.isArray(allowedParameters)) {\n    return new Href(href);\n  }\n\n  const url = parseUrl(href);\n  let filteredUrl = url.path;\n  if (url.querystring) {\n    const searchParams = new URLSearchParams(url.querystring);\n    const params = Array.from(searchParams.keys());\n    for (const param of params) {\n      if (!allowedParameters.includes(param)) {\n        searchParams.delete(param);\n      }\n    }\n    filteredUrl = filteredUrl + \"?\" + searchParams.toString();\n  }\n  if (url.hash) {\n    filteredUrl = filteredUrl + \"#\" + url.hash;\n  }\n\n  if (href instanceof Href) {\n    return new Href(filteredUrl, href.resourcetype, {\n      origin: href.origin,\n      contextPath: href.contextPath,\n    });\n  }\n\n  return new Href(filteredUrl);\n};\n\n/**\n */\nexport const createHref = (\n  context: string,\n  dynamicPart: string | Href,\n  location?: ?Location,\n  allowedParameters?: Array<string>,\n): Href => {\n  let href = dynamicPart.toString();\n\n  if (!href.startsWith(`/${context}/`)) {\n    href = `/${context}/${href}`;\n  }\n\n  href = href.replace(/\\/\\//g, \"/\");\n\n  if (location?.search && !href.includes(\"?\")) {\n    const search = location.search.startsWith(\"?\")\n      ? location.search.substring(1)\n      : location.search;\n    href = `${href}?${search}`;\n  }\n\n  if (dynamicPart instanceof Href) {\n    return filterParameters(\n      new Href(href, dynamicPart.resourcetype, {\n        origin: dynamicPart.origin,\n        contextPath: dynamicPart.contextPath,\n      }),\n      allowedParameters,\n    );\n  }\n\n  return filterParameters(href, allowedParameters);\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"createHref.js","names":["_Href","_interopRequireDefault","require","parseUrl","href","Href","path","querystring","hash","_includes","default","call","hashSplit","split","qsSplit","exports","filterParameters","allowedParameters","Array","isArray","url","filteredUrl","searchParams","_urlSearchParams","params","_from","_keys","param","delete","toString","resourcetype","origin","contextPath","createHref","context","dynamicPart","entryDate","location","_startsWith","replace","search","_context","substring","finalHref","setParameter","removeParameter"],"sources":["../../../src/utils/helpers/createHref.js"],"sourcesContent":["// @flow\nimport Href from \"../../models/href/Href\";\n\nimport type { Location } from \"react-router\";\n\n/**\n */\nexport const parseUrl = (\n  href: string | Href,\n): { path: string, querystring: null | string, hash: null | string } => {\n  if (href instanceof Href) {\n    return {\n      path: href.path,\n      querystring: href.querystring,\n      hash: href.hash,\n    };\n  }\n\n  let path = href;\n  let hash = null;\n  let querystring = null;\n  if (href.includes(\"#\")) {\n    const hashSplit = href.split(\"#\");\n    path = hashSplit[0];\n    hash = hashSplit[1];\n  }\n  if (href.includes(\"?\")) {\n    const qsSplit = path.split(\"?\");\n    path = qsSplit[0];\n    querystring = qsSplit[1];\n  }\n  return {\n    path,\n    querystring,\n    hash,\n  };\n};\n\n/**\n */\nexport const filterParameters = (\n  href: string | Href,\n  allowedParameters?: Array<string>,\n): Href => {\n  if (!Array.isArray(allowedParameters)) {\n    return new Href(href);\n  }\n\n  const url = parseUrl(href);\n  let filteredUrl = url.path;\n  if (url.querystring) {\n    const searchParams = new URLSearchParams(url.querystring);\n    const params = Array.from(searchParams.keys());\n    for (const param of params) {\n      if (!allowedParameters.includes(param)) {\n        searchParams.delete(param);\n      }\n    }\n    filteredUrl = filteredUrl + \"?\" + searchParams.toString();\n  }\n  if (url.hash) {\n    filteredUrl = filteredUrl + \"#\" + url.hash;\n  }\n\n  if (href instanceof Href) {\n    return new Href(filteredUrl, href.resourcetype, {\n      origin: href.origin,\n      contextPath: href.contextPath,\n    });\n  }\n\n  return new Href(filteredUrl);\n};\n\n/**\n */\nexport const createHref = (\n  context: string,\n  dynamicPart: string | Href,\n  entryDate?: ISO_DATE,\n  location?: ?Location,\n  allowedParameters?: Array<string>,\n): Href => {\n  let href = dynamicPart.toString();\n\n  if (!href.startsWith(`/${context}/`)) {\n    href = `/${context}/${href}`;\n  }\n\n  href = href.replace(/\\/\\//g, \"/\");\n\n  if (location?.search && !href.includes(\"?\")) {\n    const search = location.search.startsWith(\"?\")\n      ? location.search.substring(1)\n      : location.search;\n    href = `${href}?${search}`;\n  }\n\n  const finalHref =\n    dynamicPart instanceof Href\n      ? filterParameters(\n          new Href(href, dynamicPart.resourcetype, {\n            origin: dynamicPart.origin,\n            contextPath: dynamicPart.contextPath,\n          }),\n          allowedParameters,\n        )\n      : filterParameters(href, allowedParameters);\n\n  if (entryDate) {\n    finalHref.setParameter(\"entryDate\", entryDate);\n  } else {\n    finalHref.removeParameter(\"entryDate\");\n  }\n\n  return finalHref;\n};\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.57.5",
+  "version": "1.58.0",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -108,10 +108,10 @@
     "@babel/preset-env": "^7.26.0",
     "@babel/preset-flow": "^7.25.9",
     "@babel/preset-react": "^7.25.9",
-    "@commitlint/cli": "^19.5.0",
-    "@commitlint/config-conventional": "^19.5.0",
+    "@commitlint/cli": "^19.6.0",
+    "@commitlint/config-conventional": "^19.6.0",
     "@testing-library/react": "^16.0.1",
-    "auditjs": "^4.0.45",
+    "auditjs": "^4.0.46",
     "babel-jest": "^29.7.0",
     "babel-plugin-styled-components": "^2.1.4",
     "cherry-pick": "^0.5.0",
@@ -123,8 +123,8 @@
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-ft-flow": "^3.0.11",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jest": "^28.8.3",
-    "eslint-plugin-jsdoc": "^50.4.3",
+    "eslint-plugin-jest": "^28.9.0",
+    "eslint-plugin-jsdoc": "^50.5.0",
     "eslint-plugin-react": "^7.37.2",
     "eslint-plugin-react-hooks": "^5.0.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",
@@ -133,12 +133,12 @@
     "flow-typed": "^3.9.0",
     "hermes-eslint": "^0.25.0",
     "history": "^4.0.0",
-    "husky": "^9.1.6",
+    "husky": "^9.1.7",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "jest-junit": "^16.0.0",
     "jest-sonar-reporter": "^2.0.0",
-    "jscodeshift": "^17.0.0",
+    "jscodeshift": "^17.1.1",
     "lint-staged": "^15.2.10",
     "polished": "^4.0.0",
     "prettier": "^3.3.3",

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

@@ -23,6 +23,7 @@ import {
   useModelCatalog,
   useContentType,
 } from "../useModelCatalog";
+import { DateUtil } from "../../utils";
 
 const middlewares = [thunk];
 const mockStore = configureMockStore(middlewares);
@@ -68,7 +69,7 @@ describe("modelcatalog hooks", () => {
       {
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
-          key: `${key}(${url})(en)`,
+          key: `${key}(${url.split("?")[0]})(en)`,
           href: new Href(url),
           locale: "en",
           targetModel: targetModel,
@@ -106,7 +107,7 @@ describe("modelcatalog hooks", () => {
     assertTargetModel(
       () => useConceptIndex("/conceptindex"),
       "conceptindex",
-      "/conceptindex",
+      "/conceptindex?entryDate=" + DateUtil.now(),
       ConceptIndexModel,
     );
   });
@@ -116,7 +117,7 @@ describe("modelcatalog hooks", () => {
     assertTargetModel(
       () => useConceptDetail("/conceptdetail"),
       "conceptdetail",
-      "/concepts/conceptdetail",
+      "/concepts/conceptdetail?entryDate=" + DateUtil.now(),
     );
   });
 
@@ -135,7 +136,7 @@ describe("modelcatalog hooks", () => {
     assertTargetModel(
       () => useContentTOC("/contenttoc"),
       "contenttoc",
-      "/content/contenttoc",
+      "/content/contenttoc?entryDate=" + DateUtil.now(),
       ContentTOCModel,
     );
   });
@@ -145,7 +146,7 @@ describe("modelcatalog hooks", () => {
     assertTargetModel(
       () => useContent("/contentdetail"),
       "content",
-      "/content/contentdetail",
+      "/content/contentdetail?entryDate=" + DateUtil.now(),
       ContentModel,
     );
   });
@@ -155,7 +156,7 @@ describe("modelcatalog hooks", () => {
     assertTargetModel(
       () => useContentType("/contenttypes/contenttype"),
       "contenttypes",
-      "/contenttypes/contenttype",
+      "/contenttypes/contenttype?entryDate=" + DateUtil.now(),
       ContentTypeModel,
     );
   });

package/src/hooks/useModelCatalog.js

@@ -1,4 +1,5 @@
 // @flow
+import { useSelector, useDispatch } from "react-redux";
 import { useLocation } from "./useRouter";
 
 import { createHref, filterParameters } from "../utils/helpers/createHref";
@@ -14,8 +15,12 @@ import ContentModel from "../models/content/ContentModel";
 import { useModularUIBasic } from "./useModularUIBasic";
 import { ContentTypeModel } from "../models";
 
+import { getEntryDate } from "../redux/selectors/modelcatalog";
+import { updateEntryDate } from "../redux/actions/EntryDate";
+
 import type Href from "../models/href/Href";
 import type { UseModularUIBasicOptions } from "./useModularUIBasic";
+import type { UpdateEntryDateAction } from "../redux";
 export type SearchFilter = {
   index?: string,
   label?: string,
@@ -42,13 +47,15 @@ export const useConceptIndex = (
   key?: string = "conceptindex",
   options?: UseModularUIBasicOptions<ConceptIndexModel>,
 ): ?ConceptIndexModel => {
+  const { entryDate } = useEntryDate();
   const url = filterParameters(href, [
-    "entryDate",
     "index",
     "label",
     "modelcategory",
     "type",
   ]);
+  url.setParameter("entryDate", entryDate);
+
   return useModularUIBasic(key, url, {
     expectedModels: ["ConceptIndex"],
     targetModel: ConceptIndexModel,
@@ -65,9 +72,11 @@ export const useConceptDetail = (
     ConceptDetailModel | BusinessScenarioModel,
   >,
 ): ?ConceptDetailModel | ?BusinessScenarioModel => {
+  const { entryDate } = useEntryDate();
   const location = useLocation();
 
-  const href = createHref("concepts", concept, location, ["entryDate"]);
+  const href = createHref("concepts", concept, entryDate, location, []);
+
   return useModularUIBasic(key, href, {
     expectedModels: ["ConceptDetail", "BusinessScenario"],
     ...options,
@@ -96,8 +105,11 @@ export const useContentTOC = (
   key?: string = "contenttoc",
   options?: UseModularUIBasicOptions<ContentTOCModel>,
 ): ?ContentTOCModel => {
+  const { entryDate } = useEntryDate();
   const location = useLocation();
-  const href = createHref("content", content, location, ["entryDate"]);
+
+  const href = createHref("content", content, entryDate, location, []);
+
   return useModularUIBasic(key, href, {
     expectedModels: ["ContentTOC"],
     targetModel: ContentTOCModel,
@@ -112,7 +124,10 @@ export const useContent = (
   key?: string = "content",
   options?: UseModularUIBasicOptions<ContentModel>,
 ): ?ContentModel => {
-  const href = createHref("content", contentSection, null, ["entryDate"]);
+  const { entryDate } = useEntryDate();
+
+  const href = createHref("content", contentSection, entryDate, null, []);
+
   return useModularUIBasic(key, href, {
     expectedModels: ["Content"],
     targetModel: ContentModel,
@@ -127,7 +142,10 @@ export const useContentType = (
   key?: string = "contenttypes",
   options?: UseModularUIBasicOptions<ContentTypeModel>,
 ): ?ContentTypeModel => {
-  const href = createHref("contenttypes", contentType, null, ["entryDate"]);
+  const { entryDate } = useEntryDate();
+
+  const href = createHref("contenttypes", contentType, entryDate, null, []);
+
   return useModularUIBasic(key, href, {
     expectedModels: ["ContentType"],
     targetModel: ContentTypeModel,
@@ -177,3 +195,19 @@ export const useContentSearch = (
   const href = getSearchHref("/content", filters);
   return useContentIndex(href, key, options);
 };
+
+/**
+ * Retrieve and update the entrydate for the modelcatalog
+ */
+export const useEntryDate = (): ({
+  entryDate: ISO_DATE,
+  setEntryDate: (entryDate: ISO_DATE) => UpdateEntryDateAction,
+}) => {
+  const dispatch = useDispatch();
+  const entryDate = useSelector(getEntryDate);
+
+  return {
+    entryDate,
+    setEntryDate: (entryDate: ISO_DATE) => dispatch(updateEntryDate(entryDate)),
+  };
+};

package/src/models/concepts/ConceptDetailModel.js

@@ -328,7 +328,7 @@ export default class ConceptDetailModel extends ResourceModel {
   }
 
   /**
-   * Retrieve entrydate
+   * Retrieve modelcatalog.js
    */
   get entryDate(): string | null {
     return this.data.filter?.[TIMEVERSION_FILTER_NAME]?.value ?? null;

package/src/models/concepts/ConceptIndexModel.js

@@ -125,7 +125,7 @@ export default class ConceptIndexModel extends ResourceModel {
   }
 
   /**
-   * Retrieve entrydate of content toc
+   * Retrieve modelcatalog.js of content toc
    */
   get entryDate(): string | null {
     const timeversionFilter = this.filterCollection.getFilterByAttributeKey(

package/src/models/content/ContentModel.js

@@ -104,7 +104,7 @@ export default class ContentModel extends ResourceModel {
   }
 
   /**
-   * Retrieve entrydate of content toc
+   * Retrieve modelcatalog.js of content toc
    */
   get entryDate(): ISO_DATE | null {
     const entryDateFilter = this.filterCollection?.getFilterByAttributeKey(

package/src/models/content/ContentTOCModel.js

@@ -173,7 +173,7 @@ export default class ContentTOCModel extends ResourceModel {
   }
 
   /**
-   * Retrieve entrydate of content toc
+   * Retrieve modelcatalog.js of content toc
    */
   get entryDate(): ISO_DATE | null {
     const timeversionFilter = this.filterCollection.getFilterByAttributeKey(

package/src/redux/actions/EntryDate.js

@@ -0,0 +1,12 @@
+// @flow
+import type { UpdateEntryDateAction } from "../types";
+
+/**
+ * Update the entry date being used in the modelcatalog
+ */
+export const updateEntryDate = (
+  entryDate: ISO_DATE,
+): UpdateEntryDateAction => ({
+  type: "UPDATE_ENTRYDATE",
+  payload: entryDate,
+});

package/src/redux/actions/index.js

@@ -1,6 +1,7 @@
 // @flow
 export * from "./Application";
 export * from "./Authorization";
+export * from "./EntryDate";
 export * from "./Error";
 export * from "./Form";
 export * from "./FormAttributeSet";

package/src/redux/reducers/ModelCatalogReducer.js

@@ -0,0 +1,46 @@
+// @flow
+import { DateUtil } from "../../utils";
+import Cache from "../../utils/browser/Cache";
+
+import type { Reducer } from "redux";
+import type { ReduxAction, ModelCatalogState } from "../types";
+
+const getQueryParam = (paramName: string): ?string => {
+  if (typeof window !== "undefined") {
+    const urlParams = new URLSearchParams(window.location?.search);
+    return urlParams.get(paramName);
+  }
+  return null;
+};
+
+const initialState: ModelCatalogState = {
+  entryDate:
+    getQueryParam("entryDate") ||
+    Cache.getItem("ModelCatalogEntryDate") ||
+    DateUtil.now(),
+};
+
+/**
+ * Keep track of the entry date for the modelcatalog
+ */
+const ModelCatalogReducer: Reducer<ModelCatalogState, ReduxAction> = (
+  state = initialState,
+  action,
+) => {
+  if (!action) {
+    return state;
+  }
+
+  switch (action.type) {
+    case "UPDATE_ENTRYDATE":
+      Cache.addItem("ModelCatalogEntryDate", action.payload);
+      return {
+        ...state,
+        entryDate: action.payload,
+      };
+    default:
+      return state;
+  }
+};
+
+export default ModelCatalogReducer;

package/src/redux/reducers/createReducer.js

@@ -6,6 +6,7 @@ import { I18nReducer } from "../_i18n/I18nReducer";
 import ModalsReducer from "./ModalsReducer";
 import AuthReducer from "./AuthReducer";
 import ErrorReducer from "./ErrorReducer";
+import ModelCatalogReducer from "./ModelCatalogReducer";
 import NotificationReducer from "./NotificationReducer";
 import ProgressIndicatorReducer from "./ProgressIndicatorReducer";
 import PreferencesReducer from "./PreferencesReducer";
@@ -19,6 +20,7 @@ import type {
   ModalsState,
   ErrorState,
   AuthState,
+  ModelCatalogState,
 } from "../types";
 import type { RouterState } from "../_router/types";
 import type { ModularUIState } from "../_modularui/types";
@@ -29,6 +31,7 @@ type Reducers = {
   error: Reducer<ErrorState, ReduxAction>,
   i18n: Reducer<I18nState, ReduxAction>,
   modals: Reducer<ModalsState, ReduxAction>,
+  modelcatalog: Reducer<ModelCatalogState, ReduxAction>,
   modularui: Reducer<ModularUIState, ReduxAction>,
   notification: Reducer<NotificationState, ReduxAction>,
   preferences: Reducer<PreferencesState, ReduxAction>,
@@ -45,6 +48,7 @@ export const createReducer = (): Reducers => ({
   auth: AuthReducer,
   error: ErrorReducer,
   modals: ModalsReducer,
+  modelcatalog: ModelCatalogReducer,
   notification: NotificationReducer,
   progressindicator: ProgressIndicatorReducer,
   preferences: PreferencesReducer,

package/src/redux/reducers/index.js

@@ -2,6 +2,7 @@
 export * from "./createReducer";
 
 export { default as AuthReducer } from "./AuthReducer";
+export { default as ModelCatalogReducer } from "./ModelCatalogReducer";
 export { default as ErrorReducer } from "./ErrorReducer";
 export { default as ModalsReducer } from "./ModalsReducer";
 export { default as NotificationReducer } from "./NotificationReducer";

package/src/redux/selectors/index.js

@@ -1,2 +1,3 @@
 // @flow
 export * from "./i18n";
+export * from "./modelcatalog";

package/src/redux/selectors/modelcatalog.js

@@ -0,0 +1,11 @@
+// @flow
+import { DateUtil } from "../../utils";
+
+import type { ReduxState } from "../types";
+
+/**
+ * Retrieve entrydate for the model catalog
+ */
+export const getEntryDate = (state: ReduxState): ISO_DATE => {
+  return state.modelcatalog?.entryDate ?? DateUtil.now();
+};

package/src/redux/types.js

@@ -135,6 +135,11 @@ export type UpdateAutosaveAction = {
   },
 };
 
+export type UpdateEntryDateAction = {
+  type: "UPDATE_ENTRYDATE",
+  payload: ISO_DATE,
+};
+
 export type ReduxAction =
   | UpdateStatusAction
   | SetModelAction
@@ -162,6 +167,7 @@ export type ReduxAction =
   | ChangePasswordAction
   | LogoutSuccessAction
   | UpdateAutosaveAction
+  | UpdateEntryDateAction
   | LocationChangeAction
   | PushAction
   | ReplaceAction
@@ -206,11 +212,16 @@ export type ProgressIndicatorState = {
   +percentComplete: number,
 };
 
+export type ModelCatalogState = {
+  entryDate: ISO_DATE,
+};
+
 export type ReduxState = {
   +router: RouterState,
   +modularui: ModularUIState,
   +i18n: I18nState,
   +auth: AuthState,
+  +modelcatalog: ModelCatalogState,
   +error: ErrorState,
   +modals: ModalsState,
   +notification: NotificationState,

package/src/utils/helpers/__tests__/createHref.spec.js

@@ -7,25 +7,29 @@ describe("createHref", () => {
     const location = {
       search: "?entryDate=2024-03-08&index=C&notAllowed=true",
     };
+    const expectedSearch = "?index=C&notAllowed=true&entryDate=2010-01-01";
 
     expect(createHref("concepts", dynamicPart)).toEqual(
       new Href("/concepts/" + dynamicPart),
     );
-    expect(createHref("concepts", dynamicPart, location)).toEqual(
-      new Href("/concepts/" + dynamicPart + location.search),
+    expect(createHref("concepts", dynamicPart, "2010-01-01", location)).toEqual(
+      new Href("/concepts/" + dynamicPart + expectedSearch),
     );
     expect(
-      createHref("concepts", dynamicPart, location, ["entryDate", "index"]),
+      createHref("concepts", dynamicPart, "2010-01-01", location, ["index"]),
     ).toEqual(
-      new Href("/concepts/" + dynamicPart + "?entryDate=2024-03-08&index=C"),
+      new Href("/concepts/" + dynamicPart + "?index=C&entryDate=2010-01-01"),
     );
     expect(
-      createHref("concepts", dynamicPart + location.search, location, [
-        "entryDate",
-        "index",
-      ]),
+      createHref(
+        "concepts",
+        dynamicPart + location.search,
+        "2010-01-01",
+        location,
+        ["index"],
+      ),
     ).toEqual(
-      new Href("/concepts/" + dynamicPart + "?entryDate=2024-03-08&index=C"),
+      new Href("/concepts/" + dynamicPart + "?index=C&entryDate=2010-01-01"),
     );
 
     expect(createHref("concepts", dynamicPart + "#hash")).toEqual(

package/src/utils/helpers/createHref.js

@@ -77,6 +77,7 @@ export const filterParameters = (
 export const createHref = (
   context: string,
   dynamicPart: string | Href,
+  entryDate?: ISO_DATE,
   location?: ?Location,
   allowedParameters?: Array<string>,
 ): Href => {
@@ -95,15 +96,22 @@ export const createHref = (
     href = `${href}?${search}`;
   }
 
-  if (dynamicPart instanceof Href) {
-    return filterParameters(
-      new Href(href, dynamicPart.resourcetype, {
-        origin: dynamicPart.origin,
-        contextPath: dynamicPart.contextPath,
-      }),
-      allowedParameters,
-    );
+  const finalHref =
+    dynamicPart instanceof Href
+      ? filterParameters(
+          new Href(href, dynamicPart.resourcetype, {
+            origin: dynamicPart.origin,
+            contextPath: dynamicPart.contextPath,
+          }),
+          allowedParameters,
+        )
+      : filterParameters(href, allowedParameters);
+
+  if (entryDate) {
+    finalHref.setParameter("entryDate", entryDate);
+  } else {
+    finalHref.removeParameter("entryDate");
   }
 
-  return filterParameters(href, allowedParameters);
+  return finalHref;
 };

package/types/models/concepts/ConceptDetailModel.d.ts

@@ -60,7 +60,7 @@ export default class ConceptDetailModel extends ResourceModel {
      */
     getSourceReferencesForCurrentLanguage(availableLocales: Array<string>): Array<Object>;
     /**
-     * Retrieve entrydate
+     * Retrieve modelcatalog.js
      */
     get entryDate(): string;
     /**