@beinformed/ui 1.58.3 → 1.59.0

package/src/models/content/SubSectionModel.js

@@ -6,17 +6,25 @@ import LinkCollection from "../links/LinkCollection";
 import Href from "../href/Href";
 import LinkModel from "../links/LinkModel";
 import { retrieveText } from "../../utils";
+import type { ModelOptions } from "../types";
 
 /**
  * Link to a concept
  */
 export default class SubSectionModel extends BaseModel {
+  _entryDate: ISO_DATE | null;
   _links: LinkCollection;
 
   /**
    */
-  constructor(data: Object) {
-    super(data, {});
+  constructor(
+    data: Object,
+    entryDate: ISO_DATE | null,
+    modelOptions?: ModelOptions,
+  ) {
+    super(data, {}, modelOptions);
+
+    this._entryDate = entryDate;
   }
 
   /**
@@ -66,7 +74,8 @@ export default class SubSectionModel extends BaseModel {
   get subSections(): Array<SubSectionModel> {
     return this.data.subSections
       ? this.data.subSections.map(
-          (subSection) => new SubSectionModel(subSection),
+          (subSection) =>
+            new SubSectionModel(subSection, this.entryDate, this.modelOptions),
         )
       : [];
   }
@@ -99,6 +108,12 @@ export default class SubSectionModel extends BaseModel {
     return this.selflink ? this.selflink.href : null;
   }
 
+  /**
+   */
+  get entryDate(): ISO_DATE | null {
+    return this._entryDate;
+  }
+
   /**
    */
   get relatedConceptsHrefs(): Array<Href> {
@@ -131,7 +146,9 @@ export default class SubSectionModel extends BaseModel {
           : "";
       }
 
+      href.addParameter("entryDate", this.entryDate);
       href.setReferenceHash(this.referenceHash);
+
       return href;
     }
 

package/src/models/content/__tests__/ContentModel.spec.js

@@ -133,10 +133,10 @@ describe("contentmodel", () => {
       "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource/Chapter5_1/relatedConcepts?entryDate=2024-07-17",
     );
     expect(contentModel.relatedConceptsHrefs[1].toString()).toBe(
-      "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource/Chapter5_1a/relatedConcepts",
+      "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource/Chapter5_1a/relatedConcepts?entryDate=2024-07-17",
     );
     expect(contentModel.relatedConceptsHrefs[2].toString()).toBe(
-      "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource/Chapter5_1b/relatedConcepts",
+      "/content/bundle-nl.government.grant.funding.agreement.source/Grant%20Funding%20Agreement/Grant%20Funding%20Agreement.formalsource/Chapter5_1b/relatedConcepts?entryDate=2024-07-17",
     );
   });
 
@@ -196,7 +196,7 @@ describe("contentmodel", () => {
     );
     expect(firstSubSection.relatedConceptsHrefs).toHaveLength(1);
     expect(firstSubSection.relatedConceptsHref.href.toString()).toBe(
-      "/content/Incident/Business design/Content/Blaastest subsections.formalsource/Pass/relatedConcepts",
+      "/content/Incident/Business design/Content/Blaastest subsections.formalsource/Pass/relatedConcepts?entryDate=2021-08-31",
     );
     expect(firstSubSection.relatedConceptsHref.getReferenceHash()).toBe(
       145842294,

package/src/react-client/client.js

@@ -21,6 +21,7 @@ import {
 
 import {
   setAllContentInDataSetting,
+  setDateTimeSettings,
   setLoginPreferences,
 } from "../redux/actions/Preferences";
 import { showXHRErrorNotification } from "../redux/actions/Notification";
@@ -175,6 +176,7 @@ export const setupClient = (
 
   setAllContentInDataSetting(store.getState());
   setLoginPreferences(store.getState());
+  setDateTimeSettings(store.getState());
 
   // load existing cache from other browser tabs
   Cache.loadOtherBrowserTabs(() => {

package/src/react-server/__tests__/serverUtil.spec.js

@@ -119,6 +119,12 @@ describe("serverUtil", () => {
           "security.clients": null,
         },
       },
+      {
+        type: "SET_PREFERENCE",
+        payload: {
+          isIncludeTimeOffsetInDateTimes: false,
+        },
+      },
     ]);
   });
 
@@ -166,6 +172,12 @@ describe("serverUtil", () => {
           "security.clients": null,
         },
       },
+      {
+        type: "SET_PREFERENCE",
+        payload: {
+          isIncludeTimeOffsetInDateTimes: false,
+        },
+      },
     ]);
   });
 });

package/src/react-server/serverUtil.js

@@ -17,6 +17,7 @@ import {
   setPreference,
   setAllContentInDataSetting,
   setLoginPreferences,
+  setDateTimeSettings,
 } from "../redux/actions/Preferences";
 
 import { getSetting } from "../constants/Settings";
@@ -134,6 +135,7 @@ const setServerPreferences = (
 
   store.dispatch(setAllContentInDataSetting());
   store.dispatch(setLoginPreferences());
+  store.dispatch(setDateTimeSettings());
 
   if (
     preferencesProvider &&

package/src/redux/actions/Preferences.js

@@ -13,6 +13,7 @@ import type {
 
 import {
   ALL_CONTENT_IN_DATA_SETTING,
+  INCLUDE_TIME_OFFSET,
   LOGIN_TYPE,
   LOGIN_PASSWORD_SETTING,
   LOGIN_PATH_SETTING,
@@ -116,6 +117,27 @@ export const setAllContentInDataSetting = (
   return setPreference(ALL_CONTENT_IN_DATA_SETTING, allContentInDataSetting);
 };
 
+/**
+ * Retrieve settings for date time conversion
+ */
+export const setDateTimeSettings = (
+  state?: ReduxState,
+): SetPreferenceAction => {
+  let isIncludeTimeOffsetInDateTimes: PreferenceValue = false;
+  if (
+    typeof preferencesProvider !== "undefined" &&
+    typeof preferencesProvider.isIncludeTimeOffsetInDateTimes !== "undefined"
+  ) {
+    isIncludeTimeOffsetInDateTimes =
+      preferencesProvider.isIncludeTimeOffsetInDateTimes();
+  } else if (typeof state !== "undefined") {
+    isIncludeTimeOffsetInDateTimes = state.preferences[INCLUDE_TIME_OFFSET];
+  }
+
+  setSetting(INCLUDE_TIME_OFFSET, !!isIncludeTimeOffsetInDateTimes);
+  return setPreference(INCLUDE_TIME_OFFSET, isIncludeTimeOffsetInDateTimes);
+};
+
 /**
  * Retrieves login settings from runtime preferences and sets them as setting in the preference reducer
  */

package/src/redux/reducers/__tests__/ModelCatalogReducer.spec.js

@@ -0,0 +1,23 @@
+import ModelCatalogReducer from "../ModelCatalogReducer";
+import { DateUtil } from "../../../utils";
+import { INCLUDE_TIME_OFFSET, setSettings } from "../../../constants";
+
+describe("modelcatalog reducer", () => {
+  it("should return the initial state", () => {
+    setSettings({ [INCLUDE_TIME_OFFSET]: false });
+
+    expect(ModelCatalogReducer(undefined, {})).toStrictEqual({
+      entryDate: DateUtil.now(),
+    });
+    expect(ModelCatalogReducer()).toStrictEqual({ entryDate: DateUtil.now() });
+  });
+
+  it("should handle UPDATE_ENTRYDATE", () => {
+    expect(
+      ModelCatalogReducer(undefined, {
+        type: "UPDATE_ENTRYDATE",
+        payload: "2024-01-01",
+      }),
+    ).toStrictEqual({ entryDate: "2024-01-01" });
+  });
+});