@beinformed/ui 1.65.2 → 1.65.4

package/lib/models/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../src/models/types.js"],"sourcesContent":["// @flow\nimport type ApplicationModel from \"./application/ApplicationModel\";\nimport type BooleanAttributeModel from \"./attributes/BooleanAttributeModel\";\nimport type CaptchaAttributeModel from \"./attributes/CaptchaAttributeModel\";\nimport type ChoiceAttributeModel from \"./attributes/ChoiceAttributeModel\";\nimport type CompositeAttributeModel from \"./attributes/CompositeAttributeModel\";\nimport type DatetimeAttributeModel from \"./attributes/DatetimeAttributeModel\";\nimport type HelptextAttributeModel from \"./attributes/HelptextAttributeModel\";\nimport type LabelAttributeModel from \"./attributes/LabelAttributeModel\";\nimport type MemoAttributeModel from \"./attributes/MemoAttributeModel\";\nimport type MoneyAttributeModel from \"./attributes/MoneyAttributeModel\";\nimport type NumberAttributeModel from \"./attributes/NumberAttributeModel\";\nimport type PasswordAttributeModel from \"./attributes/PasswordAttributeModel\";\nimport type StringAttributeModel from \"./attributes/StringAttributeModel\";\nimport type UploadAttributeModel from \"./attributes/UploadAttributeModel\";\nimport type XMLAttributeModel from \"./attributes/XMLAttributeModel\";\nimport type CaseViewModel from \"./caseview/CaseViewModel\";\nimport type BusinessScenarioModel from \"./concepts/BusinessScenarioModel\";\nimport type ConceptDetailModel from \"./concepts/ConceptDetailModel\";\nimport type ConceptIndexModel from \"./concepts/ConceptIndexModel\";\nimport type ConceptTypeDetailModel from \"./concepts/ConceptTypeDetailModel\";\nimport type ContentIndexModel from \"./content/ContentIndexModel\";\nimport type ContentModel from \"./content/ContentModel\";\nimport type SectionModel from \"./content/SectionModel\";\nimport type ContentTOCModel from \"./content/ContentTOCModel\";\nimport type ContentTypeModel from \"./content/ContentTypeModel\";\nimport type DetailModel from \"./detail/DetailModel\";\nimport type AssignmentFilterModel from \"./filters/AssignmentFilterModel\";\nimport type FilterModel from \"./filters/FilterModel\";\nimport type RangeFilterModel from \"./filters/RangeFilterModel\";\nimport type ConceptIndexFilterModel from \"./filters/ConceptIndexFilterModel\";\nimport type FormModel from \"./form/FormModel\";\nimport type ListDetailModel from \"./list/ListDetailModel\";\nimport type ListModel from \"./list/ListModel\";\nimport type ModelCatalogModel from \"./modelcatalog/ModelCatalogModel\";\nimport type GroupingPanelModel from \"./panels/GroupingPanelModel\";\nimport type CaseSearchModel from \"./search/CaseSearchModel\";\nimport type TabModel from \"./tab/TabModel\";\nimport type TaskGroupModel from \"./taskgroup/TaskGroupModel\";\nimport type UserModel from \"./user/UserModel\";\nimport type UserServicesModel from \"./user/UserServicesModel\";\nimport type LinkModel from \"./links/LinkModel\";\nimport type LookupOptionsModel from \"./lookup/LookupOptionsModel\";\nimport type BaseFilterModel from \"./filters/BaseFilterModel\";\nimport type AttributeCollection from \"./attributes/AttributeCollection\";\nimport type AttributeModel from \"./attributes/AttributeModel\";\nimport type LayoutHintCollection from \"./layouthint/LayoutHintCollection\";\nimport type ErrorResponse from \"./error/ErrorResponse\";\n\nexport type ModularUIModel =\n  | ApplicationModel\n  | CaseSearchModel\n  | CaseViewModel\n  | ListDetailModel\n  | DetailModel\n  | FormModel\n  | GroupingPanelModel\n  | ListModel\n  | TabModel\n  | TaskGroupModel\n  | UserModel\n  | UserServicesModel\n  | ModelCatalogModel\n  | ConceptIndexModel\n  | ConceptDetailModel\n  | BusinessScenarioModel\n  | ConceptTypeDetailModel\n  | ContentIndexModel\n  | ContentTOCModel\n  | ContentModel\n  | ContentTypeModel\n  | LookupOptionsModel;\n\nexport type AttributeType =\n  | BooleanAttributeModel\n  | CaptchaAttributeModel\n  | ChoiceAttributeModel\n  | DatetimeAttributeModel\n  | HelptextAttributeModel\n  | LabelAttributeModel\n  | MemoAttributeModel\n  | MoneyAttributeModel\n  | NumberAttributeModel\n  | PasswordAttributeModel\n  | CompositeAttributeModel\n  | StringAttributeModel\n  | UploadAttributeModel\n  | XMLAttributeModel;\n\nexport type RangeChildAttributeType =\n  | NumberAttributeModel\n  | DatetimeAttributeModel;\n\nexport type FilterType =\n  | BaseFilterModel\n  | FilterModel\n  | AssignmentFilterModel\n  | RangeFilterModel\n  | ConceptIndexFilterModel;\n\nexport type FormErrorAnchor = {\n  id: string,\n  properties?: {\n    [propertyName: string]: string | number,\n  },\n  anchor?: {\n    objectid: string,\n    elementid?: string,\n    _links?: Object,\n    index?: number,\n    \"index-identifier\"?: string,\n  },\n  layouthint: LayoutHintCollection,\n  message: string,\n  param?: {\n    name: string,\n  },\n};\n\nexport type labelsJSON = {\n  _id: string,\n  label: string,\n  value: string,\n};\n\nexport type propertyJSON = {\n  _id: string,\n  type: string,\n  mandatory: string,\n  label: string,\n  value: string,\n};\n\nexport type textfragmentJSON = {\n  label: string,\n  text: string,\n  type: string,\n};\n\nexport interface IConstraintModel {\n  +id: string;\n  +defaultMessage: string;\n  +parameters: Object;\n  +isMandatoryConstraint: boolean;\n  validate(value: any): boolean;\n  hasValidation(): boolean;\n}\n\nexport interface ILayoutHintRule {\n  process(attribute: AttributeModel, attributes: AttributeCollection): void;\n}\n\nexport interface IModelWithChildModels {\n  getInitialChildModelLinks(): Array<LinkModel>;\n  setChildModels(\n    models: Array<ModularUIModel>,\n    errors: Array<ErrorResponse>,\n  ): void;\n}\n\nexport type AuthenticationType = {\n  name: string,\n  authentication: string,\n  redirectUri?: string,\n  isPrimary: boolean,\n};\n\nexport type FileEntryType = {\n  name: string,\n  size?: number,\n  progress: number,\n  error?: string,\n  token?: string,\n};\n\nexport type FilesType = {\n  [filename: string]: FileEntryType,\n};\n\nexport type FiletypeConstraintsType = Array<{|\n  extensions: Array<string>,\n  mimeTypes: Array<string>,\n|}>;\n\nexport type FilesizeConstraintsType = {\n  fileSize: ?number,\n  maxTotalFileSize: ?number,\n  isMaxTotal: boolean,\n};\n\nexport type PropertyData = { type: string, label: string, value: string };\nexport type TextFragmentData = {\n  type: string,\n  label: string,\n  text: string | { id?: string, message: string, properties?: Object },\n};\nexport type SectionData = {\n  id: string,\n  type: string,\n  label?: string,\n  number?: string,\n  body: string | { id?: string, message: string, properties?: Object },\n  _links: { self: { href: string } },\n  childSections?: Array<SectionData>,\n  sections?: Array<SectionData>,\n  subSections: Array<SectionData>,\n};\n\nexport type PropertyElement = {\n  propertyElement: {\n    label: string,\n    layouthint: Array<string>,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElement = {\n  textFragmentElement: {\n    label: string,\n    layouthint: Array<string>,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElement = {\n  contentElement: {\n    label: string,\n    layouthint: Array<string>,\n    sections: Array<SectionData>,\n  },\n};\n\nexport type PropertyElementMapped = {\n  propertyElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElementMapped = {\n  textFragmentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElementMapped = {\n  contentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    sections: Array<SectionModel>,\n  },\n};\n\nexport type ContentAll = Array<\n  PropertyElementMapped | TextFragmentElementMapped | ContentElementMapped,\n>;\n\nexport type ContentData = {\n  header: {\n    label?: string,\n    description?: { id?: string, message: string, properties?: Object },\n  },\n  label?: string,\n  elements: Array<PropertyElement | TextFragmentElement | ContentElement>,\n};\n\nexport type SectionFragment = {\n  text: string,\n  startOffset: number,\n  endOffset: number,\n};\n\nexport type ModelOptions = {\n  origin?: ?string,\n  contextPath?: ?string,\n};\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../src/models/types.js"],"sourcesContent":["// @flow\nimport type ApplicationModel from \"./application/ApplicationModel\";\nimport type BooleanAttributeModel from \"./attributes/BooleanAttributeModel\";\nimport type CaptchaAttributeModel from \"./attributes/CaptchaAttributeModel\";\nimport type ChoiceAttributeModel from \"./attributes/ChoiceAttributeModel\";\nimport type CompositeAttributeModel from \"./attributes/CompositeAttributeModel\";\nimport type DatetimeAttributeModel from \"./attributes/DatetimeAttributeModel\";\nimport type HelptextAttributeModel from \"./attributes/HelptextAttributeModel\";\nimport type LabelAttributeModel from \"./attributes/LabelAttributeModel\";\nimport type MemoAttributeModel from \"./attributes/MemoAttributeModel\";\nimport type MoneyAttributeModel from \"./attributes/MoneyAttributeModel\";\nimport type NumberAttributeModel from \"./attributes/NumberAttributeModel\";\nimport type PasswordAttributeModel from \"./attributes/PasswordAttributeModel\";\nimport type StringAttributeModel from \"./attributes/StringAttributeModel\";\nimport type UploadAttributeModel from \"./attributes/UploadAttributeModel\";\nimport type XMLAttributeModel from \"./attributes/XMLAttributeModel\";\nimport type CaseViewModel from \"./caseview/CaseViewModel\";\nimport type BusinessScenarioModel from \"./concepts/BusinessScenarioModel\";\nimport type ConceptDetailModel from \"./concepts/ConceptDetailModel\";\nimport type ConceptIndexModel from \"./concepts/ConceptIndexModel\";\nimport type ConceptTypeDetailModel from \"./concepts/ConceptTypeDetailModel\";\nimport type ContentIndexModel from \"./content/ContentIndexModel\";\nimport type ContentModel from \"./content/ContentModel\";\nimport type SectionModel from \"./content/SectionModel\";\nimport type ContentTOCModel from \"./content/ContentTOCModel\";\nimport type ContentTypeModel from \"./content/ContentTypeModel\";\nimport type DetailModel from \"./detail/DetailModel\";\nimport type AssignmentFilterModel from \"./filters/AssignmentFilterModel\";\nimport type FilterModel from \"./filters/FilterModel\";\nimport type RangeFilterModel from \"./filters/RangeFilterModel\";\nimport type ConceptIndexFilterModel from \"./filters/ConceptIndexFilterModel\";\nimport type FormModel from \"./form/FormModel\";\nimport type ListDetailModel from \"./list/ListDetailModel\";\nimport type ListModel from \"./list/ListModel\";\nimport type ModelCatalogModel from \"./modelcatalog/ModelCatalogModel\";\nimport type GroupingPanelModel from \"./panels/GroupingPanelModel\";\nimport type CaseSearchModel from \"./search/CaseSearchModel\";\nimport type TabModel from \"./tab/TabModel\";\nimport type TaskGroupModel from \"./taskgroup/TaskGroupModel\";\nimport type UserModel from \"./user/UserModel\";\nimport type UserServicesModel from \"./user/UserServicesModel\";\nimport type LinkModel from \"./links/LinkModel\";\nimport type LookupOptionsModel from \"./lookup/LookupOptionsModel\";\nimport type AttributeCollection from \"./attributes/AttributeCollection\";\nimport type AttributeModel from \"./attributes/AttributeModel\";\nimport type LayoutHintCollection from \"./layouthint/LayoutHintCollection\";\nimport type ErrorResponse from \"./error/ErrorResponse\";\n\nexport type ModularUIModel =\n  | ApplicationModel\n  | CaseSearchModel\n  | CaseViewModel\n  | ListDetailModel\n  | DetailModel\n  | FormModel\n  | GroupingPanelModel\n  | ListModel\n  | TabModel\n  | TaskGroupModel\n  | UserModel\n  | UserServicesModel\n  | ModelCatalogModel\n  | ConceptIndexModel\n  | ConceptDetailModel\n  | BusinessScenarioModel\n  | ConceptTypeDetailModel\n  | ContentIndexModel\n  | ContentTOCModel\n  | ContentModel\n  | ContentTypeModel\n  | LookupOptionsModel;\n\nexport type AttributeType =\n  | BooleanAttributeModel\n  | CaptchaAttributeModel\n  | ChoiceAttributeModel\n  | DatetimeAttributeModel\n  | HelptextAttributeModel\n  | LabelAttributeModel\n  | MemoAttributeModel\n  | MoneyAttributeModel\n  | NumberAttributeModel\n  | PasswordAttributeModel\n  | CompositeAttributeModel\n  | StringAttributeModel\n  | UploadAttributeModel\n  | XMLAttributeModel;\n\nexport type RangeChildAttributeType =\n  | NumberAttributeModel\n  | DatetimeAttributeModel;\n\nexport type FilterType =\n  | AssignmentFilterModel\n  | FilterModel\n  | RangeFilterModel\n  | ConceptIndexFilterModel;\n\nexport type FormErrorAnchor = {\n  id: string,\n  properties?: {\n    [propertyName: string]: string | number,\n  },\n  anchor?: {\n    objectid: string,\n    elementid?: string,\n    _links?: Object,\n    index?: number,\n    \"index-identifier\"?: string,\n  },\n  layouthint: LayoutHintCollection,\n  message: string,\n  param?: {\n    name: string,\n  },\n};\n\nexport type labelsJSON = {\n  _id: string,\n  label: string,\n  value: string,\n};\n\nexport type propertyJSON = {\n  _id: string,\n  type: string,\n  mandatory: string,\n  label: string,\n  value: string,\n};\n\nexport type textfragmentJSON = {\n  label: string,\n  text: string,\n  type: string,\n};\n\nexport interface IConstraintModel {\n  +id: string;\n  +defaultMessage: string;\n  +parameters: Object;\n  +isMandatoryConstraint: boolean;\n  validate(value: any): boolean;\n  hasValidation(): boolean;\n}\n\nexport interface ILayoutHintRule {\n  process(attribute: AttributeModel, attributes: AttributeCollection): void;\n}\n\nexport interface IModelWithChildModels {\n  getInitialChildModelLinks(): Array<LinkModel>;\n  setChildModels(\n    models: Array<ModularUIModel>,\n    errors: Array<ErrorResponse>,\n  ): void;\n}\n\nexport type AuthenticationType = {\n  name: string,\n  authentication: string,\n  redirectUri?: string,\n  isPrimary: boolean,\n};\n\nexport type FileEntryType = {\n  name: string,\n  size?: number,\n  progress: number,\n  error?: string,\n  token?: string,\n};\n\nexport type FilesType = {\n  [filename: string]: FileEntryType,\n};\n\nexport type FiletypeConstraintsType = Array<{|\n  extensions: Array<string>,\n  mimeTypes: Array<string>,\n|}>;\n\nexport type FilesizeConstraintsType = {\n  fileSize: ?number,\n  maxTotalFileSize: ?number,\n  isMaxTotal: boolean,\n};\n\nexport type PropertyData = { type: string, label: string, value: string };\nexport type TextFragmentData = {\n  type: string,\n  label: string,\n  text: string | { id?: string, message: string, properties?: Object },\n};\nexport type SectionData = {\n  id: string,\n  type: string,\n  label?: string,\n  number?: string,\n  body: string | { id?: string, message: string, properties?: Object },\n  _links: { self: { href: string } },\n  childSections?: Array<SectionData>,\n  sections?: Array<SectionData>,\n  subSections: Array<SectionData>,\n};\n\nexport type PropertyElement = {\n  propertyElement: {\n    label: string,\n    layouthint: Array<string>,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElement = {\n  textFragmentElement: {\n    label: string,\n    layouthint: Array<string>,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElement = {\n  contentElement: {\n    label: string,\n    layouthint: Array<string>,\n    sections: Array<SectionData>,\n  },\n};\n\nexport type PropertyElementMapped = {\n  propertyElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElementMapped = {\n  textFragmentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElementMapped = {\n  contentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    sections: Array<SectionModel>,\n  },\n};\n\nexport type ContentAll = Array<\n  PropertyElementMapped | TextFragmentElementMapped | ContentElementMapped,\n>;\n\nexport type ContentData = {\n  header: {\n    label?: string,\n    description?: { id?: string, message: string, properties?: Object },\n  },\n  label?: string,\n  elements: Array<PropertyElement | TextFragmentElement | ContentElement>,\n};\n\nexport type SectionFragment = {\n  text: string,\n  startOffset: number,\n  endOffset: number,\n};\n\nexport type ModelOptions = {\n  origin?: ?string,\n  contextPath?: ?string,\n};\n"],"mappings":"","ignoreList":[]}

package/lib/redux/_modularui/ModularUIConnector.js

@@ -88,12 +88,13 @@ const modularUIConnector = (name, resource, options = {
       }, [dispatch, doReload, url, modelKey]);
 
       // Remove model when hoc unloads
-      (0, _react.useEffect)(() => {
-        return () => {
-          if (finalRemoveOnUnmount) {
-            dispatch((0, _ModularUIActions.removeModelByKey)(modelKey));
-          }
-        };
+      (0, _react.useEffect)(
+      // prettier-ignore
+      () => () => {
+        //NOSONAR
+        if (finalRemoveOnUnmount) {
+          dispatch((0, _ModularUIActions.removeModelByKey)(modelKey));
+        }
       }, [dispatch, modelKey, finalRemoveOnUnmount]);
 
       // Create new properties object to inject modularui properties to own props

package/lib/redux/_modularui/ModularUIConnector.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModularUIConnector.js","names":["_react","require","_reactRedux","_reactRouter","_ModularUIActions","_Href","_interopRequireDefault","_utils","_ModularUIUtils","_useModularUI","_useI18n","_FormModel","_jsxRuntime","patchUpdateModelOption","oldOptions","updateModel","FormModel","updateHandler","newModel","clonedModel","clone","update","modularUIConnector","name","resource","options","propName","removeOnUnmount","otherOptions","Component","WrappedComponent","props","finalRemoveOnUnmount","dispatch","useDispatch","location","useLocation","url","useUrl","displayName","getDisplayName","contextId","modelEntry","useModularUI","modelKey","model","connectKey","handleManualReload","reloadOptions","reloadModel","handleFetch","href","fetchOptions","loadModularUI","reload","state","doReload","useReload","useEffect","isReload","removeModelByKey","locale","useLocale","newProps","status","lastModification","hasModel","Boolean","fetchModularUI","jsx","_default","exports","default"],"sources":["../../../src/redux/_modularui/ModularUIConnector.js"],"sourcesContent":["// @flow\nimport { useEffect } from \"react\";\nimport { useDispatch } from \"react-redux\";\nimport { useLocation } from \"react-router\";\n\nimport {\n  loadModularUI,\n  reloadModel,\n  removeModelByKey,\n} from \"./ModularUIActions\";\n\nimport Href from \"../../models/href/Href\";\nimport { getDisplayName } from \"../../react/utils\";\n\nimport { useUrl, useReload } from \"./ModularUIUtils\";\nimport { useModularUI } from \"../../hooks/useModularUI\";\nimport { useLocale } from \"../../hooks/useI18n\";\n\nimport type { ComponentType, Node } from \"react\";\nimport type { Location } from \"react-router\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { ModularUIOptions } from \"./types\";\nimport FormModel from \"../../models/form/FormModel\";\n\nexport type InjectedProps = {\n  +modelKey: string,\n  +location: Location,\n  +status: string | null,\n  +lastModification: number | null,\n  +hasModel: boolean,\n  +locale: string,\n  +fetchModularUI: (href: string | Href, fetchOptions: Object) => void,\n  +reloadModel: (model: ModularUIModel, options: Object) => void,\n  +data?: ?ModularUIModel,\n};\n\nconst patchUpdateModelOption = (oldOptions: Object) => {\n  if (\n    \"updateModel\" in oldOptions &&\n    oldOptions.updateModel instanceof FormModel\n  ) {\n    return {\n      ...oldOptions,\n      updateHandler: (newModel: ModularUIModel): ModularUIModel => {\n        if (newModel instanceof FormModel) {\n          // $FLowFixMe\n          const clonedModel: FormModel = oldOptions.updateModel.clone();\n          clonedModel.update(newModel);\n          return clonedModel;\n        }\n        return newModel;\n      },\n    };\n  }\n\n  return oldOptions;\n};\n\n/**\n */\nconst modularUIConnector = (\n  name: string,\n  resource: string | Function,\n  options: ModularUIOptions = { propName: \"data\", removeOnUnmount: false },\n): ((Component: ComponentType<any>) => (props: any) => Node) => {\n  const {\n    propName = \"data\",\n    removeOnUnmount = false,\n    ...otherOptions\n  } = options;\n\n  return (Component: ComponentType<any>) => {\n    const WrappedComponent = (props: any) => {\n      // explicit property for removeOnMount overwrite the setting\n      const finalRemoveOnUnmount = props.removeOnUnmount ?? removeOnUnmount;\n\n      const dispatch = useDispatch();\n      const location = useLocation();\n\n      const url = useUrl(resource, { location, ...props });\n      const displayName = getDisplayName(Component, name, props.contextId);\n\n      // Load the model through the useModUI hook\n      const modelEntry = useModularUI(displayName, url, {\n        ...otherOptions,\n        removeOnUnmount: finalRemoveOnUnmount,\n      });\n      const modelKey = modelEntry?.model?.connectKey;\n\n      // handle manual reload of model\n      const handleManualReload = (\n        model: ModularUIModel,\n        reloadOptions?: Object,\n      ) => {\n        dispatch(reloadModel(model, reloadOptions));\n      };\n\n      // Provide connected models with a fetchModularUI method to be able\n      // to run the loadModularUI action from a handler / callback in the component\n      const handleFetch = (href: string | Href, fetchOptions: Object) => {\n        dispatch(\n          loadModularUI(modelKey, href, patchUpdateModelOption(fetchOptions)),\n        );\n      };\n\n      // Check if current model needs a reload\n      const reload = location?.state?.reload ?? 0;\n      const doReload = useReload(modelEntry, reload);\n      useEffect(() => {\n        if (doReload) {\n          dispatch(\n            loadModularUI(modelKey, url, {\n              ...patchUpdateModelOption(otherOptions),\n              isReload: true,\n            }),\n          );\n        }\n      }, [dispatch, doReload, url, modelKey]);\n\n      // Remove model when hoc unloads\n      useEffect(() => {\n        return () => {\n          if (finalRemoveOnUnmount) {\n            dispatch(removeModelByKey(modelKey));\n          }\n        };\n      }, [dispatch, modelKey, finalRemoveOnUnmount]);\n\n      // Create new properties object to inject modularui properties to own props\n      const locale = useLocale();\n      const newProps: InjectedProps = {\n        modelKey,\n        [propName]: modelEntry?.model ?? null,\n        location,\n        status: modelEntry?.status ?? null,\n        lastModification: modelEntry?.lastModification ?? null,\n        hasModel: Boolean(modelEntry),\n        locale,\n        fetchModularUI: handleFetch,\n        reloadModel: handleManualReload,\n      };\n\n      return <Component {...props} {...newProps} />;\n    };\n\n    WrappedComponent.displayName = `BI.modularui(${getDisplayName(\n      WrappedComponent,\n      name,\n    )}`;\n\n    return WrappedComponent;\n  };\n};\n\nexport default modularUIConnector;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ModularUIConnector.js","names":["_react","require","_reactRedux","_reactRouter","_ModularUIActions","_Href","_interopRequireDefault","_utils","_ModularUIUtils","_useModularUI","_useI18n","_FormModel","_jsxRuntime","patchUpdateModelOption","oldOptions","updateModel","FormModel","updateHandler","newModel","clonedModel","clone","update","modularUIConnector","name","resource","options","propName","removeOnUnmount","otherOptions","Component","WrappedComponent","props","finalRemoveOnUnmount","dispatch","useDispatch","location","useLocation","url","useUrl","displayName","getDisplayName","contextId","modelEntry","useModularUI","modelKey","model","connectKey","handleManualReload","reloadOptions","reloadModel","handleFetch","href","fetchOptions","loadModularUI","reload","state","doReload","useReload","useEffect","isReload","removeModelByKey","locale","useLocale","newProps","status","lastModification","hasModel","Boolean","fetchModularUI","jsx","_default","exports","default"],"sources":["../../../src/redux/_modularui/ModularUIConnector.js"],"sourcesContent":["// @flow\nimport { useEffect } from \"react\";\nimport { useDispatch } from \"react-redux\";\nimport { useLocation } from \"react-router\";\n\nimport {\n  loadModularUI,\n  reloadModel,\n  removeModelByKey,\n} from \"./ModularUIActions\";\n\nimport Href from \"../../models/href/Href\";\nimport { getDisplayName } from \"../../react/utils\";\n\nimport { useUrl, useReload } from \"./ModularUIUtils\";\nimport { useModularUI } from \"../../hooks/useModularUI\";\nimport { useLocale } from \"../../hooks/useI18n\";\n\nimport type { ComponentType, Node } from \"react\";\nimport type { Location } from \"react-router\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { ModularUIOptions } from \"./types\";\nimport FormModel from \"../../models/form/FormModel\";\n\nexport type InjectedProps = {\n  +modelKey: string,\n  +location: Location,\n  +status: string | null,\n  +lastModification: number | null,\n  +hasModel: boolean,\n  +locale: string,\n  +fetchModularUI: (href: string | Href, fetchOptions: Object) => void,\n  +reloadModel: (model: ModularUIModel, options: Object) => void,\n  +data?: ?ModularUIModel,\n};\n\nconst patchUpdateModelOption = (oldOptions: Object) => {\n  if (\n    \"updateModel\" in oldOptions &&\n    oldOptions.updateModel instanceof FormModel\n  ) {\n    return {\n      ...oldOptions,\n      updateHandler: (newModel: ModularUIModel): ModularUIModel => {\n        if (newModel instanceof FormModel) {\n          // $FLowFixMe\n          const clonedModel: FormModel = oldOptions.updateModel.clone();\n          clonedModel.update(newModel);\n          return clonedModel;\n        }\n        return newModel;\n      },\n    };\n  }\n\n  return oldOptions;\n};\n\n/**\n */\nconst modularUIConnector = (\n  name: string,\n  resource: string | Function,\n  options: ModularUIOptions = { propName: \"data\", removeOnUnmount: false },\n): ((Component: ComponentType<any>) => (props: any) => Node) => {\n  const {\n    propName = \"data\",\n    removeOnUnmount = false,\n    ...otherOptions\n  } = options;\n\n  return (Component: ComponentType<any>) => {\n    const WrappedComponent = (props: any) => {\n      // explicit property for removeOnMount overwrite the setting\n      const finalRemoveOnUnmount = props.removeOnUnmount ?? removeOnUnmount;\n\n      const dispatch = useDispatch();\n      const location = useLocation();\n\n      const url = useUrl(resource, { location, ...props });\n      const displayName = getDisplayName(Component, name, props.contextId);\n\n      // Load the model through the useModUI hook\n      const modelEntry = useModularUI(displayName, url, {\n        ...otherOptions,\n        removeOnUnmount: finalRemoveOnUnmount,\n      });\n      const modelKey = modelEntry?.model?.connectKey;\n\n      // handle manual reload of model\n      const handleManualReload = (\n        model: ModularUIModel,\n        reloadOptions?: Object,\n      ) => {\n        dispatch(reloadModel(model, reloadOptions));\n      };\n\n      // Provide connected models with a fetchModularUI method to be able\n      // to run the loadModularUI action from a handler / callback in the component\n      const handleFetch = (href: string | Href, fetchOptions: Object) => {\n        dispatch(\n          loadModularUI(modelKey, href, patchUpdateModelOption(fetchOptions)),\n        );\n      };\n\n      // Check if current model needs a reload\n      const reload = location?.state?.reload ?? 0;\n      const doReload = useReload(modelEntry, reload);\n      useEffect(() => {\n        if (doReload) {\n          dispatch(\n            loadModularUI(modelKey, url, {\n              ...patchUpdateModelOption(otherOptions),\n              isReload: true,\n            }),\n          );\n        }\n      }, [dispatch, doReload, url, modelKey]);\n\n      // Remove model when hoc unloads\n      useEffect(\n        // prettier-ignore\n        () => () => { //NOSONAR\n          if (finalRemoveOnUnmount) {\n            dispatch(removeModelByKey(modelKey));\n          }\n        },\n        [dispatch, modelKey, finalRemoveOnUnmount],\n      );\n\n      // Create new properties object to inject modularui properties to own props\n      const locale = useLocale();\n      const newProps: InjectedProps = {\n        modelKey,\n        [propName]: modelEntry?.model ?? null,\n        location,\n        status: modelEntry?.status ?? null,\n        lastModification: modelEntry?.lastModification ?? null,\n        hasModel: Boolean(modelEntry),\n        locale,\n        fetchModularUI: handleFetch,\n        reloadModel: handleManualReload,\n      };\n\n      return <Component {...props} {...newProps} />;\n    };\n\n    WrappedComponent.displayName = `BI.modularui(${getDisplayName(\n      WrappedComponent,\n      name,\n    )}`;\n\n    return WrappedComponent;\n  };\n};\n\nexport default modularUIConnector;\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.65.2",
+  "version": "1.65.4",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "https://support.beinformed.com",
@@ -71,7 +71,7 @@
   "dependencies": {
     "@babel/runtime-corejs3": "^7.28.4",
     "@date-fns/tz": "^1.4.1",
-    "baseline-browser-mapping": "^2.9.7",
+    "baseline-browser-mapping": "^2.9.11",
     "big.js": "^7.0.1",
     "date-fns": "^4.1.0",
     "deepmerge": "^4.3.1",
@@ -99,8 +99,8 @@
     "@babel/preset-env": "^7.28.5",
     "@babel/preset-flow": "^7.27.1",
     "@babel/preset-react": "^7.28.5",
-    "@commitlint/cli": "^19.8.1",
-    "@commitlint/config-conventional": "^19.8.1",
+    "@commitlint/cli": "^20.3.0",
+    "@commitlint/config-conventional": "^20.3.0",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.1",
     "auditjs": "^4.0.47",
@@ -122,7 +122,7 @@
     "flow-bin": "^0.200.1",
     "flow-copy-source": "^2.0.9",
     "flow-typed": "^3.9.0",
-    "hermes-eslint": "^0.33.0",
+    "hermes-eslint": "^0.33.2",
     "history": "^4.0.0",
     "husky": "^9.1.7",
     "jest": "^30.2.0",
@@ -130,7 +130,7 @@
     "jest-junit": "^16.0.0",
     "jest-sonar-reporter": "^2.0.0",
     "jscodeshift": "^17.3.0",
-    "lint-staged": "^15.5.1",
+    "lint-staged": "^16.2.7",
     "polished": "^4.3.1",
     "prettier": "^3.7.4",
     "react": "^19.2.3",

package/src/hooks/useList.js

@@ -12,7 +12,7 @@ import type { HookOptions } from "./useModularUIBasic";
 import { useHistory } from "react-router";
 
 type ListNavigationHook = {
-  fetch: (list: ListModel, resetPage?: boolean) => void,
+  update: (list: ListModel, resetPage?: boolean) => void,
 };
 
 /**
@@ -58,7 +58,7 @@ export const useListNavigation = (): ListNavigationHook => {
   const history = useHistory();
   const dispatch = useDispatch();
 
-  const fetch = (list: ListModel, resetPage: boolean = false) => {
+  const update = (list: ListModel, resetPage: boolean = false) => {
     const listHref = list.selfhref;
     if (resetPage) {
       listHref.page = null;
@@ -66,7 +66,7 @@ export const useListNavigation = (): ListNavigationHook => {
 
     if (list.requestMethod === HTTP_METHODS.POST) {
       history.push({ search: listHref.querystring, state: list.formdata });
-      return dispatch(
+      dispatch(
         loadModularUI(list.connectKey, listHref, {
           method: HTTP_METHODS.POST,
           data: list.formdata,
@@ -75,7 +75,7 @@ export const useListNavigation = (): ListNavigationHook => {
       );
     } else {
       history.push({ search: listHref.querystring });
-      return dispatch(
+      dispatch(
         loadModularUI(list.connectKey, listHref, {
           method: HTTP_METHODS.GET,
           targetModel: ListModel,
@@ -85,6 +85,6 @@ export const useListNavigation = (): ListNavigationHook => {
   };
 
   return {
-    fetch,
+    update,
   };
 };

package/src/models/concepts/ConceptIndexModel.js

@@ -129,14 +129,15 @@ export default class ConceptIndexModel extends ResourceModel {
   /**
    * Retrieve modelcatalog.js of content toc
    */
-  get entryDate(): string | null {
+  get entryDate(): ISO_DATE | null {
     const timeversionFilter = this.filterCollection.getFilterByAttributeKey(
       TIMEVERSION_FILTER_NAME,
     );
-    if (timeversionFilter && timeversionFilter.attribute) {
-      return timeversionFilter.attribute.value;
-    }
 
+    const date = timeversionFilter?.value;
+    if (typeof date === "string") {
+      return date;
+    }
     return null;
   }
 

package/src/models/content/ContentIndexModel.js

@@ -6,10 +6,11 @@ import ContentLinkModel from "./ContentLinkModel";
 import Href from "../href/Href";
 import ChoiceAttributeModel from "../attributes/ChoiceAttributeModel";
 
-import type { FilterType, ModularUIModel } from "../types";
+import type { ModularUIModel } from "../types";
 import type { ModularUIResponse } from "../../modularui";
 import type LinkModel from "../links/LinkModel";
 import type ErrorResponse from "../error/ErrorResponse";
+import ConceptIndexFilterModel from "../filters/ConceptIndexFilterModel";
 
 /**
  * Get Index of concepts, to filter model catalog
@@ -109,8 +110,12 @@ export default class ContentIndexModel extends ResourceModel {
   /**
    * Get index filter
    */
-  get indexfilter(): FilterType | null {
-    return this._filterCollection.getFilterByAttributeKey("index");
+  get indexfilter(): ConceptIndexFilterModel | null {
+    const indexFilter = this._filterCollection.getFilterByAttributeKey("index");
+    if (indexFilter instanceof ConceptIndexFilterModel) {
+      return indexFilter;
+    }
+    return null;
   }
 
   /**

package/src/models/content/ContentModel.js

@@ -110,10 +110,11 @@ export default class ContentModel extends ResourceModel {
     const entryDateFilter = this.filterCollection?.getFilterByAttributeKey(
       TIMEVERSION_FILTER_NAME,
     );
-    if (entryDateFilter && entryDateFilter.attribute) {
-      return entryDateFilter.attribute.value;
-    }
 
+    const date = entryDateFilter?.value;
+    if (typeof date === "string") {
+      return date;
+    }
     return null;
   }
 

package/src/models/content/ContentTOCModel.js

@@ -220,7 +220,11 @@ export default class ContentTOCModel extends ResourceModel {
       TIMEVERSION_FILTER_NAME,
     );
 
-    return timeversionFilter?.attribute?.value ?? null;
+    const date = timeversionFilter?.value;
+    if (typeof date === "string") {
+      return date;
+    }
+    return null;
   }
 
   /**
@@ -228,6 +232,6 @@ export default class ContentTOCModel extends ResourceModel {
   get isCompleteSource(): boolean {
     const completeFilter =
       this.filterCollection.getFilterByAttributeKey("complete");
-    return completeFilter?.attribute?.value === "true";
+    return completeFilter?.value === "true";
   }
 }

package/src/models/filters/AssignmentFilterModel.js

@@ -3,13 +3,14 @@ import BaseFilterModel from "../filters/BaseFilterModel";
 
 import type { AttributeType, ModelOptions } from "../types";
 import { IllegalStateException } from "../../exceptions";
+import createAttribute from "../attributes/_createAttribute";
 /**
  * Assignment filter consists of two filters: assignment type and user filter
  */
 export default class AssignmentFilterModel extends BaseFilterModel {
   _listKey: string;
-  _assignmenttype: ?AttributeType;
-  _user: ?AttributeType;
+  _assignmenttype: AttributeType;
+  _user: AttributeType;
 
   /**
    * Construct an assignment filter
@@ -31,29 +32,16 @@ export default class AssignmentFilterModel extends BaseFilterModel {
     return this.data.name;
   }
 
-  /**
-   * Getting key of the list these filters apply to
-   */
-  get listkey(): string {
-    return this._listKey;
-  }
-
-  /**
-   * Set key of list this filter belongs to
-   */
-  set listkey(key: string) {
-    this._listKey = key;
-  }
-
   /**
    */
   get contextid(): string {
     return this.getContribution("contextid", "");
   }
+
   /**
    * Creates an assignmenttype model when assignmenttype json is present
    */
-  createAssignmentTypeModel(): ?AttributeType {
+  createAssignmentTypeModel(): AttributeType {
     const key = `${this.contextid}ASSIGNMENTTYPE`;
     const assignmentTypeData = this.data[key];
 
@@ -71,22 +59,23 @@ export default class AssignmentFilterModel extends BaseFilterModel {
 
     const assignmentTypeContributions = {
       ...this.contributions[key],
+      type: "choice",
       enumerated: true,
       optionMode: assignmentTypeData._links ? "lookup" : "static",
     };
 
-    return this.createAttribute(
-      "choice",
+    return createAttribute(
       assignmentTypeData.name || assignmentTypeData.param,
       assignmentTypeData,
       assignmentTypeContributions,
+      this.modelOptions,
     );
   }
 
   /**
    * Creates an assignmenttype model when userkey json is present
    */
-  createUserModel(): ?AttributeType {
+  createUserModel(): AttributeType {
     const key = `${this.contextid}USERKEY`;
     const userData = this.data[key];
 
@@ -98,28 +87,30 @@ export default class AssignmentFilterModel extends BaseFilterModel {
 
     const userContributions = {
       ...this.contributions[key],
+      type: "choice",
+      enumerated: true,
       optionMode: userData._links ? "lookup" : "static",
     };
 
-    return this.createAttribute(
-      "choice",
+    return createAttribute(
       userData.name || userData.param,
       userData,
       userContributions,
+      this.modelOptions,
     );
   }
 
   /**
    * The assignment filter consists of two part. This method return the assignment type attribute
    */
-  get assignmenttype(): ?AttributeType {
+  get assignmenttype(): AttributeType {
     return this._assignmenttype;
   }
 
   /**
    * The assignment filter consists of two part. This method return the user identifier attribute
    */
-  get user(): ?AttributeType {
+  get user(): AttributeType {
     return this._user;
   }
 
@@ -127,20 +118,45 @@ export default class AssignmentFilterModel extends BaseFilterModel {
    * Getting the parameters of this filter
    */
   get params(): Array<{ name: string, value: ?string }> {
-    if (this.assignmenttype && this.user) {
-      return [
-        {
-          name: this.assignmenttype.name,
-          value: this.assignmenttype.value,
-        },
-        {
-          name: this.user.name,
-          value: this.user.value,
-        },
-      ];
-    }
+    return [
+      {
+        name: this.assignmenttype.name,
+        value: this.assignmenttype.value,
+      },
+      {
+        name: this.user.name,
+        value: this.user.value,
+      },
+    ];
+  }
 
-    return [];
+  /**
+   */
+  get value(): { [string]: any } {
+    return {
+      [this.assignmenttype.name]: this.assignmenttype.value,
+      [this.user.name]: this.user.value,
+    };
+  }
+
+  /**
+   */
+  get inputvalue(): { [string]: any } {
+    return {
+      [this.assignmenttype.name]: this.assignmenttype.inputvalue,
+      [this.user.name]: this.user.inputvalue,
+    };
+  }
+
+  /**
+   * Indicates if the filter has a value.
+   */
+  hasValue(): boolean {
+    return (
+      (this.assignmenttype.value !== null &&
+        this.assignmenttype.value !== "") ||
+      (this.user.value !== null && this.user.value !== "")
+    );
   }
 
   /**
@@ -192,4 +208,19 @@ export default class AssignmentFilterModel extends BaseFilterModel {
       this.user.isValid
     );
   }
+
+  /**
+   */
+  get readonlyvalue(): { [string]: string } {
+    return {
+      [this.assignmenttype.name]: this.assignmenttype.readonlyvalue,
+      [this.user.name]: this.user.readonlyvalue,
+    };
+  }
+
+  /**
+   */
+  get formdata(): { [string]: any } | null {
+    return this.value;
+  }
 }

package/src/models/filters/BaseFilterModel.js

@@ -1,19 +1,17 @@
 // @flow
 import BaseModel from "../base/BaseModel";
-import createAttribute from "../attributes/_createAttribute";
+
 import {
   PARAMETER_SEPARATOR,
   PARAMETER_TYPES,
 } from "../../constants/Constants";
 
-import type { AttributeType, FilterType, ModelOptions } from "../types";
-import { IllegalStateException } from "../../exceptions";
+import type { ModelOptions } from "../types";
 
 /**
  * Base class for filters
  */
 export default class BaseFilterModel extends BaseModel {
-  _attribute: AttributeType | null = null;
   _context: Object;
   _listKey: string;
 
@@ -26,13 +24,6 @@ export default class BaseFilterModel extends BaseModel {
   ) {
     super(data, contributions, modelOptions);
 
-    this._attribute = this.createAttribute(
-      this.type,
-      this.param,
-      this.data,
-      this.contributions,
-    );
-
     if (this.contributions.listKey) {
       this.listkey = this.contributions.listKey;
     }
@@ -60,30 +51,6 @@ export default class BaseFilterModel extends BaseModel {
     }
   }
 
-  /**
-   * Create attribute through the attribute factory. Create type based on filter key without the filter suffix
-   */
-  createAttribute(
-    type: string,
-    param: string,
-    data: Object,
-    contributions: Object,
-  ): AttributeType | null {
-    if (type === "assignment") {
-      return null;
-    }
-
-    return createAttribute(
-      param,
-      data,
-      {
-        ...contributions,
-        type: type,
-      },
-      this.modelOptions,
-    );
-  }
-
   /**
    * Inidiates if filter is multiplechoice
    */
@@ -151,75 +118,6 @@ export default class BaseFilterModel extends BaseModel {
     return this.data.param ?? this.data.name;
   }
 
-  /**
-   * Get attribute of filter
-   */
-  get attribute(): AttributeType {
-    if (!this._attribute) {
-      throw new IllegalStateException(
-        `Missing filter attribute on filter model: ${this.label}`,
-      );
-    }
-    return this._attribute;
-  }
-
-  /**
-   * Retrieve the parameters with it's value for this filter
-   */
-  get params(): Array<{ name: string, value: ?string }> {
-    if (!this.param) {
-      return [];
-    }
-
-    return [
-      {
-        name: this.param,
-        value: this.attribute?.value,
-      },
-    ];
-  }
-
-  /**
-   * Getting the value of the filter
-   */
-  get value(): string | null {
-    return this.attribute?.value;
-  }
-
-  /**
-   * Getting the inputvalue of the filter
-   */
-  get inputvalue(): string {
-    return this.attribute?.inputvalue;
-  }
-
-  /**
-   * Indicates if the filter has a value.
-   */
-  hasValue(): boolean {
-    return this.value !== null && this.value !== "";
-  }
-
-  /**
-   * Reset the value of this filter to undefined
-   */
-  reset(): FilterType {
-    if (this.attribute) {
-      this.attribute.reset();
-    }
-
-    return this;
-  }
-
-  /**
-   * Update this filter with input name and value
-   */
-  update(attribute: AttributeType, value: string) {
-    if (this.attribute) {
-      this.attribute.update(value);
-    }
-  }
-
   /**
    * Inidicates if filter is a quick search filter
    */
@@ -227,39 +125,10 @@ export default class BaseFilterModel extends BaseModel {
     return this.contributions.quicksearch === true;
   }
 
-  /**
-   * Inidiates if filter is active
-   */
-  isActive(): boolean {
-    return this.attribute !== null && this.attribute.initvalue !== null;
-  }
-
-  /**
-   * Inidiates if filter is valid
-   */
-  get isValid(): boolean {
-    return this.attribute !== null && this.attribute.isValid;
-  }
-
-  /**
-   */
-  get readonlyvalue(): string {
-    if (this.attribute) {
-      return this.attribute.readonlyvalue;
-    }
-    return "";
-  }
-
   /**
    * Get assistant message
    */
   get assistantMessage(): string | null {
     return this.getContribution("assistant");
   }
-
-  /**
-   */
-  get formdata(): { [string]: any } | null {
-    return this.attribute.formdata ?? null;
-  }
 }

package/src/models/filters/ConceptIndexFilterModel.js

@@ -1,5 +1,5 @@
 // @flow
-import BaseFilterModel from "../filters/BaseFilterModel";
+import FilterModel from "../filters/FilterModel";
 import ChoiceAttributeModel from "../attributes/ChoiceAttributeModel";
 
 import type { ModelOptions } from "../types";
@@ -7,7 +7,7 @@ import type { ModelOptions } from "../types";
 /**
  * The concept index model is a special filter used to index all first concept label letters in de modelcatalog.
  */
-export default class ConceptIndexFilterModel extends BaseFilterModel {
+export default class ConceptIndexFilterModel extends FilterModel {
   /**
    * Construct a filter
    */