@beinformed/ui 1.59.19 → 1.59.20

package/src/models/attributes/ChoiceAttributeModel.js

@@ -2,7 +2,6 @@
 import { klona } from "klona/full";
 
 import { has } from "../../utils/helpers/objects";
-import { DateUtil } from "../../utils/datetime/DateTimeUtil";
 
 import AttributeModel from "./AttributeModel";
 import ChoiceAttributeOptionCollection from "./ChoiceAttributeOptionCollection";
@@ -43,7 +42,10 @@ export default class ChoiceAttributeModel extends AttributeModel {
   ) {
     super(attribute, attributeContributions, modelOptions);
 
-    this._referenceDate = this.getData("referenceDate", DateUtil.now());
+    this._referenceDate = this.getData(
+      "referenceDate",
+      new Date().toISOString().split("T")[0],
+    );
     this._options = ChoiceAttributeOptionCollection.create(
       attribute,
       attributeContributions,

package/src/models/attributes/ChoiceAttributeOptionCollection.js

@@ -5,8 +5,6 @@ import ListHeaderModel from "../list/ListHeaderModel";
 
 import { getBasePathModularUI } from "../../constants";
 
-import { DateUtil } from "../../utils";
-
 import type { ChoiceAttributeOptionModelOptions } from "./ChoiceAttributeOptionModel";
 /**
  */
@@ -20,7 +18,7 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
     this._modelOptions = modelOptions || {
       origin: "",
       contextPath: getBasePathModularUI(),
-      referenceDate: DateUtil.now(),
+      referenceDate: new Date().toISOString().split("T")[0],
     };
   }
 

package/src/models/attributes/ChoiceAttributeOptionModel.js

@@ -2,7 +2,6 @@
 import BaseModel from "../base/BaseModel";
 import ChoiceAttributeOptionCollection from "./ChoiceAttributeOptionCollection";
 
-import { DateUtil } from "../../utils/datetime/DateTimeUtil";
 import { has } from "../../utils/helpers/objects";
 import { TIMEVERSION_FILTER_NAME } from "../../constants/Constants";
 import { TITLE } from "../../constants/LayoutHints";
@@ -57,7 +56,8 @@ class ChoiceAttributeOptionModel
 
     this._isSelected = selectedValues.includes(this.code);
 
-    this._referenceDate = modelOptions?.referenceDate || DateUtil.now();
+    this._referenceDate =
+      modelOptions?.referenceDate || new Date().toISOString().split("T")[0];
 
     this._level = 0;
 

package/src/models/lookup/LookupOptionCollection.js

@@ -1,7 +1,6 @@
 // @flow
 import ResourceCollection from "../base/ResourceCollection";
 import ChoiceAttributeOptionModel from "../attributes/ChoiceAttributeOptionModel";
-import { DateUtil } from "../../utils";
 
 import type { ModelOptions } from "../types";
 
@@ -27,7 +26,10 @@ class LookupOptionCollection extends ResourceCollection<ChoiceAttributeOptionMod
               optionType: this.getOptionType(option, contributions),
               elementsContributions: contributions.options[0].elements,
             },
-            { ...modelOptions, referenceDate: DateUtil.now() },
+            {
+              ...modelOptions,
+              referenceDate: new Date().toISOString().split("T")[0],
+            },
           ),
         );
       });

package/src/models/process/ProcessStatusSettingsModel.js

@@ -3,7 +3,6 @@ import BaseModel from "../base/BaseModel";
 
 import { TIMEVERSION_FILTER_NAME } from "../../constants/Constants";
 import LinkCollection from "../links/LinkCollection";
-import { DateUtil } from "../../utils/datetime/DateTimeUtil";
 
 import type LinkModel from "../links/LinkModel";
 
@@ -67,7 +66,7 @@ export default class ProcessStatusSettingsModel extends BaseModel {
   /**
    */
   get referenceDate(): ISO_DATE {
-    return DateUtil.now();
+    return new Date().toISOString().split("T")[0];
   }
 
   /**

package/src/redux/reducers/ModelCatalogReducer.js

@@ -1,12 +1,11 @@
 // @flow
-import { DateUtil } from "../../utils";
 import Cache from "../../utils/browser/Cache";
 
 import type { Reducer } from "redux";
 import type { ReduxAction, ModelCatalogState } from "../types";
 
 const initialState: ModelCatalogState = {
-  entryDate: DateUtil.now(),
+  entryDate: new Date().toISOString().split("T")[0],
 };
 
 /**

package/src/redux/selectors/modelcatalog.js

@@ -1,11 +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();
+  return (
+    state.modelcatalog?.entryDate ?? new Date().toISOString().split("T")[0]
+  );
 };

package/src/utils/datetime/DateTimeUtil.js

@@ -1,22 +1,21 @@
 // @flow
-import {
-  format,
-  isAfter,
-  isBefore,
-  isSameDay,
-  isValid,
-  parse,
-  add,
-  sub,
-  set,
-  startOfMonth,
-  endOfMonth,
-  startOfWeek,
-  getHours,
-  getMinutes,
-  getDay,
-  getWeek,
-} from "date-fns";
+import { format } from "date-fns/format";
+import { isAfter } from "date-fns/isAfter";
+import { isBefore } from "date-fns/isBefore";
+import { isSameDay } from "date-fns/isSameDay";
+import { isValid } from "date-fns/isValid";
+import { parse } from "date-fns/parse";
+import { add } from "date-fns/add";
+import { sub } from "date-fns/sub";
+import { set } from "date-fns/set";
+import { startOfMonth } from "date-fns/startOfMonth";
+import { endOfMonth } from "date-fns/endOfMonth";
+import { startOfWeek } from "date-fns/startOfWeek";
+import { getHours } from "date-fns/getHours";
+import { getMinutes } from "date-fns/getMinutes";
+import { getDay } from "date-fns/getDay";
+import { getWeek } from "date-fns/getWeek";
+
 import { enGB, nl } from "date-fns/locale";
 import { tz } from "@date-fns/tz";