@beinformed/ui 1.60.0 → 1.60.2

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.60.2](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.60.1...v1.60.2) (2025-03-03)
+
+
+### Bug Fixes
+
+* **upload:** improve error handling on form uploads ([134de76](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/134de76b6b10dbcaecdd007fe27afc0a9a2a80f6))
+
+## [1.60.1](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.60.0...v1.60.1) (2025-02-19)
+
+
+### Bug Fixes
+
+* **react:** use hydrateRoot and createRoot from react/dom ([7f9d544](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/7f9d54468a7cdbb6b93befc898094efb79cd2692))
+
 ## [1.60.0](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.59.23...v1.60.0) (2025-02-18)
 
 

package/esm/models/form/__tests__/FormModel.spec.js.flow

@@ -284,6 +284,8 @@ describe("formModel", () => {
 
     form.currentFormObject.getAttributeByKey("DateOfBirth").inputvalue = "bla";
 
+    expect(form.errorCollection).toHaveLength(0);
+
     form.handleErrors({
       data: {
         errors: [

package/esm/modularui/UploadRequest.js

@@ -1,9 +1,10 @@
 import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
 import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
-import { getBasePathModularUI, getUploadPath, HTTP_METHODS } from "../constants";
+import { getBasePathModularUI, getSetting, getUploadPath, HTTP_METHODS } from "../constants";
 import xhr from "../utils/fetch/xhr";
 import ErrorModel from "../models/error/ErrorModel";
+import { ErrorResponse } from "../models";
 /**
  * Upload a file to the upload file service of Be Informed
  */
@@ -50,7 +51,7 @@ class UploadRequest {
    */
   uploadFile(file) {
     const maxFileSize = this._uploadConstraints?.maxFileSize?.fileSize ?? -1;
-    if (this.exceedsMaxFileSize(file)) {
+    if (getSetting("USE_CLIENTSIDE_VALIDATION") && this.exceedsMaxFileSize(file)) {
       this._progressHandler(file, {
         error: "errorExceedsMaxFileSize"
       });
@@ -58,7 +59,7 @@ class UploadRequest {
         "max-filesize": maxFileSize
       }, true));
     }
-    if (this.isNotAllowedFileType(file)) {
+    if (getSetting("USE_CLIENTSIDE_VALIDATION") && this.isNotAllowedFileType(file)) {
       this._progressHandler(file, {
         error: "errorExtensionNotAllowed"
       });
@@ -89,7 +90,7 @@ class UploadRequest {
         token: response.token
       });
       return response;
-    });
+    }).catch(e => _Promise.reject(new ErrorResponse(e)));
   }
 }
 export default UploadRequest;

package/esm/modularui/UploadRequest.js.flow

@@ -1,6 +1,7 @@
 // @flow
 import {
   getBasePathModularUI,
+  getSetting,
   getUploadPath,
   HTTP_METHODS,
 } from "../constants";
@@ -12,6 +13,7 @@ import type {
   FiletypeConstraintsType,
 } from "../models";
 import ErrorModel from "../models/error/ErrorModel";
+import { ErrorResponse } from "../models";
 
 type ProgressHandler = (file: File, uploadInfo: Object) => void;
 
@@ -86,7 +88,10 @@ class UploadRequest {
   uploadFile(file: File): Promise<UploadResponse> {
     const maxFileSize = this._uploadConstraints?.maxFileSize?.fileSize ?? -1;
 
-    if (this.exceedsMaxFileSize(file)) {
+    if (
+      getSetting("USE_CLIENTSIDE_VALIDATION") &&
+      this.exceedsMaxFileSize(file)
+    ) {
       this._progressHandler(file, { error: "errorExceedsMaxFileSize" });
       return Promise.reject(
         new ErrorModel(
@@ -100,7 +105,10 @@ class UploadRequest {
       );
     }
 
-    if (this.isNotAllowedFileType(file)) {
+    if (
+      getSetting("USE_CLIENTSIDE_VALIDATION") &&
+      this.isNotAllowedFileType(file)
+    ) {
       this._progressHandler(file, { error: "errorExtensionNotAllowed" });
       return Promise.reject(
         new ErrorModel(
@@ -131,10 +139,12 @@ class UploadRequest {
         }
       },
       data: file,
-    }).then((response) => {
-      this._progressHandler(file, { progress: 100, token: response.token });
-      return response;
-    });
+    })
+      .then((response) => {
+        this._progressHandler(file, { progress: 100, token: response.token });
+        return response;
+      })
+      .catch((e) => Promise.reject(new ErrorResponse(e)));
   }
 }
 

package/esm/modularui/UploadRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"UploadRequest.js","names":["getBasePathModularUI","getUploadPath","HTTP_METHODS","xhr","ErrorModel","UploadRequest","constructor","uploadConstraints","progressHandler","options","_defineProperty","_uploadConstraints","_progressHandler","_origin","origin","_contextPath","contextPath","getFileExtension","file","name","split","pop","toLowerCase","isNotAllowedFileType","allowedFileTypes","fileTypes","length","fileExtension","some","fileType","_context","_includesInstanceProperty","extensions","call","exceedsMaxFileSize","maxFileSize","fileSize","size","uploadFile","error","_Promise","reject","extension","join","url","method","POST","headers","type","encodeURIComponent","toString","onProgress","e","lengthComputable","progress","Math","ceil","loaded","total","data","then","response","token"],"sources":["../../src/modularui/UploadRequest.js"],"sourcesContent":["// @flow\nimport {\n  getBasePathModularUI,\n  getUploadPath,\n  HTTP_METHODS,\n} from \"../constants\";\n\nimport xhr from \"../utils/fetch/xhr\";\n\nimport type {\n  FilesizeConstraintsType,\n  FiletypeConstraintsType,\n} from \"../models\";\nimport ErrorModel from \"../models/error/ErrorModel\";\n\ntype ProgressHandler = (file: File, uploadInfo: Object) => void;\n\ntype UploadRequestOptions = {\n  origin?: string,\n  contextPath?: string,\n};\n\ntype UploadResponse = {\n  token: string,\n};\n\n/**\n * Upload a file to the upload file service of Be Informed\n */\nclass UploadRequest {\n  _uploadConstraints: {\n    fileTypes: FiletypeConstraintsType,\n    maxFileSize: FilesizeConstraintsType,\n    acceptedFiles: Array<string>,\n  };\n  _progressHandler: ProgressHandler;\n  _origin: string = \"\";\n  _contextPath: string = getBasePathModularUI();\n\n  constructor(\n    uploadConstraints: {\n      fileTypes: FiletypeConstraintsType,\n      maxFileSize: FilesizeConstraintsType,\n      acceptedFiles: Array<string>,\n    },\n    progressHandler: ProgressHandler,\n    options?: UploadRequestOptions,\n  ) {\n    this._uploadConstraints = uploadConstraints;\n    this._progressHandler = progressHandler;\n    this._origin = options?.origin || \"\";\n    this._contextPath = options?.contextPath || getBasePathModularUI();\n  }\n\n  /**\n   */\n  getFileExtension(file: File): string {\n    return file.name.split(\".\").pop().toLowerCase();\n  }\n\n  /**\n   */\n  isNotAllowedFileType(file: File): boolean {\n    const allowedFileTypes = this._uploadConstraints.fileTypes;\n\n    if (allowedFileTypes.length > 0) {\n      const fileExtension = this.getFileExtension(file);\n\n      return !allowedFileTypes.some((fileType) =>\n        fileType.extensions.includes(fileExtension),\n      );\n    }\n\n    return false;\n  }\n\n  /**\n   */\n  exceedsMaxFileSize(file: File): boolean {\n    const maxFileSize = this._uploadConstraints?.maxFileSize?.fileSize ?? -1;\n    return maxFileSize > -1 && file.size > maxFileSize;\n  }\n\n  /**\n   */\n  uploadFile(file: File): Promise<UploadResponse> {\n    const maxFileSize = this._uploadConstraints?.maxFileSize?.fileSize ?? -1;\n\n    if (this.exceedsMaxFileSize(file)) {\n      this._progressHandler(file, { error: \"errorExceedsMaxFileSize\" });\n      return Promise.reject(\n        new ErrorModel(\n          \"Constraint.File.MaxFileSizeExceeded\",\n          \"Maximum file upload size is ${max-filesize}\",\n          {\n            \"max-filesize\": maxFileSize,\n          },\n          true,\n        ),\n      );\n    }\n\n    if (this.isNotAllowedFileType(file)) {\n      this._progressHandler(file, { error: \"errorExtensionNotAllowed\" });\n      return Promise.reject(\n        new ErrorModel(\n          \"Constraint.File.InvalidExtension\",\n          \"Allowed extensions are: ${extensions}\",\n          {\n            extension: this.getFileExtension(file),\n            extensions: this._uploadConstraints.fileTypes.join(\", \"),\n          },\n          true,\n        ),\n      );\n    }\n\n    return xhr({\n      url: getUploadPath(this._contextPath, this._origin),\n      method: HTTP_METHODS.POST,\n      headers: {\n        \"Content-Type\": file.type,\n        \"x-filename\": encodeURIComponent(file.name),\n        \"x-filesize\": file.size.toString(),\n      },\n      onProgress: (e: ProgressEvent) => {\n        if (this._progressHandler && e.lengthComputable) {\n          this._progressHandler(file, {\n            progress: Math.ceil((e.loaded / e.total) * 100),\n          });\n        }\n      },\n      data: file,\n    }).then((response) => {\n      this._progressHandler(file, { progress: 100, token: response.token });\n      return response;\n    });\n  }\n}\n\nexport default UploadRequest;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"UploadRequest.js","names":["getBasePathModularUI","getSetting","getUploadPath","HTTP_METHODS","xhr","ErrorModel","ErrorResponse","UploadRequest","constructor","uploadConstraints","progressHandler","options","_defineProperty","_uploadConstraints","_progressHandler","_origin","origin","_contextPath","contextPath","getFileExtension","file","name","split","pop","toLowerCase","isNotAllowedFileType","allowedFileTypes","fileTypes","length","fileExtension","some","fileType","_context","_includesInstanceProperty","extensions","call","exceedsMaxFileSize","maxFileSize","fileSize","size","uploadFile","error","_Promise","reject","extension","join","url","method","POST","headers","type","encodeURIComponent","toString","onProgress","e","lengthComputable","progress","Math","ceil","loaded","total","data","then","response","token","catch"],"sources":["../../src/modularui/UploadRequest.js"],"sourcesContent":["// @flow\nimport {\n  getBasePathModularUI,\n  getSetting,\n  getUploadPath,\n  HTTP_METHODS,\n} from \"../constants\";\n\nimport xhr from \"../utils/fetch/xhr\";\n\nimport type {\n  FilesizeConstraintsType,\n  FiletypeConstraintsType,\n} from \"../models\";\nimport ErrorModel from \"../models/error/ErrorModel\";\nimport { ErrorResponse } from \"../models\";\n\ntype ProgressHandler = (file: File, uploadInfo: Object) => void;\n\ntype UploadRequestOptions = {\n  origin?: string,\n  contextPath?: string,\n};\n\ntype UploadResponse = {\n  token: string,\n};\n\n/**\n * Upload a file to the upload file service of Be Informed\n */\nclass UploadRequest {\n  _uploadConstraints: {\n    fileTypes: FiletypeConstraintsType,\n    maxFileSize: FilesizeConstraintsType,\n    acceptedFiles: Array<string>,\n  };\n  _progressHandler: ProgressHandler;\n  _origin: string = \"\";\n  _contextPath: string = getBasePathModularUI();\n\n  constructor(\n    uploadConstraints: {\n      fileTypes: FiletypeConstraintsType,\n      maxFileSize: FilesizeConstraintsType,\n      acceptedFiles: Array<string>,\n    },\n    progressHandler: ProgressHandler,\n    options?: UploadRequestOptions,\n  ) {\n    this._uploadConstraints = uploadConstraints;\n    this._progressHandler = progressHandler;\n    this._origin = options?.origin || \"\";\n    this._contextPath = options?.contextPath || getBasePathModularUI();\n  }\n\n  /**\n   */\n  getFileExtension(file: File): string {\n    return file.name.split(\".\").pop().toLowerCase();\n  }\n\n  /**\n   */\n  isNotAllowedFileType(file: File): boolean {\n    const allowedFileTypes = this._uploadConstraints.fileTypes;\n\n    if (allowedFileTypes.length > 0) {\n      const fileExtension = this.getFileExtension(file);\n\n      return !allowedFileTypes.some((fileType) =>\n        fileType.extensions.includes(fileExtension),\n      );\n    }\n\n    return false;\n  }\n\n  /**\n   */\n  exceedsMaxFileSize(file: File): boolean {\n    const maxFileSize = this._uploadConstraints?.maxFileSize?.fileSize ?? -1;\n    return maxFileSize > -1 && file.size > maxFileSize;\n  }\n\n  /**\n   */\n  uploadFile(file: File): Promise<UploadResponse> {\n    const maxFileSize = this._uploadConstraints?.maxFileSize?.fileSize ?? -1;\n\n    if (\n      getSetting(\"USE_CLIENTSIDE_VALIDATION\") &&\n      this.exceedsMaxFileSize(file)\n    ) {\n      this._progressHandler(file, { error: \"errorExceedsMaxFileSize\" });\n      return Promise.reject(\n        new ErrorModel(\n          \"Constraint.File.MaxFileSizeExceeded\",\n          \"Maximum file upload size is ${max-filesize}\",\n          {\n            \"max-filesize\": maxFileSize,\n          },\n          true,\n        ),\n      );\n    }\n\n    if (\n      getSetting(\"USE_CLIENTSIDE_VALIDATION\") &&\n      this.isNotAllowedFileType(file)\n    ) {\n      this._progressHandler(file, { error: \"errorExtensionNotAllowed\" });\n      return Promise.reject(\n        new ErrorModel(\n          \"Constraint.File.InvalidExtension\",\n          \"Allowed extensions are: ${extensions}\",\n          {\n            extension: this.getFileExtension(file),\n            extensions: this._uploadConstraints.fileTypes.join(\", \"),\n          },\n          true,\n        ),\n      );\n    }\n\n    return xhr({\n      url: getUploadPath(this._contextPath, this._origin),\n      method: HTTP_METHODS.POST,\n      headers: {\n        \"Content-Type\": file.type,\n        \"x-filename\": encodeURIComponent(file.name),\n        \"x-filesize\": file.size.toString(),\n      },\n      onProgress: (e: ProgressEvent) => {\n        if (this._progressHandler && e.lengthComputable) {\n          this._progressHandler(file, {\n            progress: Math.ceil((e.loaded / e.total) * 100),\n          });\n        }\n      },\n      data: file,\n    })\n      .then((response) => {\n        this._progressHandler(file, { progress: 100, token: response.token });\n        return response;\n      })\n      .catch((e) => Promise.reject(new ErrorResponse(e)));\n  }\n}\n\nexport default UploadRequest;\n"],"mappings":"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","ignoreList":[]}

package/esm/react-client/client.js

@@ -1,7 +1,7 @@
 import _trimInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/trim";
 import _URLSearchParams from "@babel/runtime-corejs3/core-js-stable/url-search-params";
 // eslint-disable-next-line react/no-deprecated
-import { hydrate, render } from "react-dom";
+import { hydrateRoot, createRoot } from "react-dom/client";
 import { has } from "../utils/helpers/objects";
 import setImmediate from "setimmediate";
 import Cache from "../utils/browser/Cache";
@@ -177,9 +177,10 @@ export const addContentLoadedEvent = (store, routerHistory, theme, render, Error
 const mountClient = (applicationNode, element) => {
   const isSSR = applicationNode.querySelector(".application");
   if (isSSR) {
-    hydrate(element, applicationNode);
+    hydrateRoot(element, applicationNode);
   } else {
-    render(element, applicationNode);
+    const root = createRoot(element);
+    root.render(applicationNode);
   }
 };
 

package/esm/react-client/client.js.flow

@@ -1,6 +1,6 @@
 // @flow
 // eslint-disable-next-line react/no-deprecated
-import { hydrate, render } from "react-dom";
+import { hydrateRoot, createRoot } from "react-dom/client";
 
 import { has } from "../utils/helpers/objects";
 import setImmediate from "setimmediate";
@@ -253,9 +253,10 @@ const mountClient = (
 ) => {
   const isSSR = applicationNode.querySelector(".application");
   if (isSSR) {
-    hydrate(element, applicationNode);
+    hydrateRoot(element, applicationNode);
   } else {
-    render(element, applicationNode);
+    const root = createRoot(element);
+    root.render(applicationNode);
   }
 };
 

package/esm/react-client/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","names":["hydrate","render","has","setImmediate","Cache","xhr","createBrowserHistory","configureStore","rehydrate","getBasePathModularUI","getBasePathServer","getSetting","setAllContentInDataSetting","setDateTimeSettings","setLoginPreferences","showXHRErrorNotification","handleError","loginSuccess","updateEntryDate","locationChange","replace","JsonParseException","FetchException","Init","handleBeforeRenderHooks","jsx","_jsx","parseDataToJSON","data","JSON","parse","error","getDataFromServer","_context","dataElement","document","querySelector","Error","_trimInstanceProperty","textContent","call","setUnhandledRejectionEvent","store","window","onunhandledrejection","event","detail","errorMessage","reason","message","toString","dispatch","handleRedirectURI","urlParams","_URLSearchParams","location","search","redirectURI","get","url","catch","e","id","LOGIN_PATH","from","pathname","modal","setModelCatalogEntryDate","entryDateFromUrl","hasItem","getItem","setupClient","customReducers","arguments","length","undefined","beforeRenderHooks","contextPath","clear","browserHistory","basename","routerHistory","getState","loadOtherBrowserTabs","response","listen","action","body","className","addContentLoadedEvent","theme","ErrorFallbackComponent","mount","addEventListener","applicationNode","children","mountClient","element","isSSR","client","_ref"],"sources":["../../src/react-client/client.js"],"sourcesContent":["// @flow\n// eslint-disable-next-line react/no-deprecated\nimport { hydrate, render } from \"react-dom\";\n\nimport { has } from \"../utils/helpers/objects\";\nimport setImmediate from \"setimmediate\";\n\nimport Cache from \"../utils/browser/Cache\";\n\nimport xhr from \"../utils/fetch/xhr\";\n\nimport { createBrowserHistory } from \"history\";\nimport configureStore from \"../redux/store/configureStore\";\n\nimport rehydrate from \"./rehydrate\";\nimport {\n  getBasePathModularUI,\n  getBasePathServer,\n  getSetting,\n} from \"../constants/Settings\";\n\nimport {\n  setAllContentInDataSetting,\n  setDateTimeSettings,\n  setLoginPreferences,\n} from \"../redux/actions/Preferences\";\nimport { showXHRErrorNotification } from \"../redux/actions/Notification\";\nimport { handleError } from \"../redux/actions/Error\";\nimport { loginSuccess } from \"../redux/actions/SignIn\";\nimport { updateEntryDate } from \"../redux/actions/ModelCatalog\";\n\nimport { locationChange, replace } from \"../redux/_router/RouterActions\";\n\nimport { JsonParseException, FetchException } from \"../exceptions\";\n\nimport { Init } from \"./Init\";\n\nimport { handleBeforeRenderHooks } from \"../redux/store/beforeRenderHooks\";\n\nimport type {\n  ComponentType,\n  Element as ReactElement,\n  ElementType,\n} from \"react\";\nimport type { Theme } from \"../react-theme/types\";\nimport type { CustomReducers, ReduxStore } from \"../redux/types\";\nimport type { RouterHistory } from \"react-router\";\nimport type { BeforeRenderHook } from \"../redux/store/beforeRenderHooks\";\nimport type { Props as FallbackProps } from \"../react/ErrorBoundaryFallback\";\n\ntype RenderFunction = () => ReactElement<ElementType>;\ntype MountFunction = (\n  applicationNode: Element,\n  element: ReactElement<ElementType>,\n) => void;\ntype Props = {\n  customReducers?: CustomReducers,\n  theme?: Theme | Array<Theme>,\n  render: RenderFunction,\n  mount: MountFunction,\n  beforeRenderHooks?: Array<BeforeRenderHook>,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>,\n};\n\n/*\n * deserialize serialized data from the server to provide a smooth dehydration.\n */\nconst parseDataToJSON = (data: string) => {\n  try {\n    return JSON.parse(data);\n  } catch (error) {\n    throw new JsonParseException(`Error parsing content ${data}`);\n  }\n};\n\nconst getDataFromServer = () => {\n  const dataElement = document.querySelector(\n    'script[type=\"application/json\"][data-app-state=\"app-json\"]',\n  );\n\n  if (!dataElement) {\n    throw new Error(\"Error loading state, json not found\");\n  } else if (dataElement.textContent.trim() === \"\") {\n    return {};\n  }\n\n  return parseDataToJSON(dataElement.textContent);\n};\n\n/**\n */\nexport const setUnhandledRejectionEvent = (store: ReduxStore) => {\n  window.onunhandledrejection = (event) => {\n    if (event.detail) {\n      return setImmediate(() => {\n        const errorMessage = event.detail.reason.message.toString();\n\n        store.dispatch(showXHRErrorNotification(errorMessage));\n        throw event.detail.reason;\n      });\n    }\n\n    return event;\n  };\n};\n\n/**\n * The redirectURI querystring parameter is available when the server is redirecting an unauthorized deep link\n * @param store\n */\nconst handleRedirectURI = (store: ReduxStore) => {\n  const urlParams = new URLSearchParams(window.location.search);\n  const redirectURI = urlParams.get(\"redirectURI\");\n  if (redirectURI) {\n    xhr({ url: `${getBasePathModularUI()}${redirectURI}` }).catch((e) => {\n      if (\n        e.id === \"UnauthorizedException\" ||\n        e.id === \"Error.NotAuthorized\" ||\n        e.id === \"Error.Authentication.Required\" ||\n        e.id === \"Error.Authentication.InvalidCredentials\"\n      ) {\n        const LOGIN_PATH = getSetting(\"LOGIN_PATH\", \"/signin\");\n        store.dispatch(\n          replace(LOGIN_PATH, {\n            from: { pathname: redirectURI },\n            modal: false,\n          }),\n        );\n      }\n    });\n  }\n};\n\n/**\n */\nexport const setModelCatalogEntryDate = (store: ReduxStore) => {\n  if (typeof window !== \"undefined\") {\n    const entryDateFromUrl = new URLSearchParams(window.location?.search).get(\n      \"entryDate\",\n    );\n    if (entryDateFromUrl) {\n      store.dispatch(updateEntryDate(entryDateFromUrl));\n    } else if (Cache.hasItem(\"ModelCatalogEntryDate\")) {\n      store.dispatch(Cache.getItem(\"ModelCatalogEntryDate\"));\n    }\n  }\n};\n\n/**\n */\nexport const setupClient = (\n  customReducers: CustomReducers = {},\n  beforeRenderHooks: ?Array<BeforeRenderHook>,\n): { store: ReduxStore, routerHistory: RouterHistory } => {\n  if (typeof window.contextPath === \"undefined\") {\n    throw new Error(\"Missing contextPath on window object\");\n  }\n\n  const data = getDataFromServer();\n\n  // remove all resources from cache\n  Cache.clear(\"^res:\");\n\n  // $FlowExpectedError\n  const browserHistory: RouterHistory = createBrowserHistory({\n    basename: getBasePathServer(),\n  });\n  const { routerHistory, store } = configureStore(\n    browserHistory,\n    customReducers,\n    rehydrate(data),\n  );\n\n  handleRedirectURI(store);\n  setModelCatalogEntryDate(store);\n\n  setAllContentInDataSetting(store.getState());\n  setLoginPreferences(store.getState());\n  setDateTimeSettings(store.getState());\n\n  // load existing cache from other browser tabs\n  Cache.loadOtherBrowserTabs(() => {\n    if (Cache.getItem(\"auth\")) {\n      store.dispatch(loginSuccess());\n    }\n  });\n\n  if (has(data, \"error.name\")) {\n    const error = new FetchException(data?.error?.response);\n    store.dispatch(handleError(error));\n  }\n\n  if (Cache.getItem(\"auth\")) {\n    store.dispatch(loginSuccess());\n  }\n\n  // listen to history change and update the redux router store\n  routerHistory.listen((location, action) => {\n    store.dispatch(locationChange(location, action));\n  });\n\n  setUnhandledRejectionEvent(store);\n\n  if (document.body) {\n    document.body.className = \"js\";\n  }\n\n  if (beforeRenderHooks) {\n    handleBeforeRenderHooks(beforeRenderHooks, { store });\n  }\n\n  return { store, routerHistory };\n};\n\n/**\n */\nexport const addContentLoadedEvent = (\n  store: ReduxStore,\n  routerHistory: RouterHistory,\n  theme?: Theme | Array<Theme>,\n  render: RenderFunction,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>,\n  mount: MountFunction,\n) => {\n  window.addEventListener(\"DOMContentLoaded\", () => {\n    const applicationNode = document.querySelector(\"#application\");\n    if (!applicationNode) {\n      throw new Error(\n        \"No DOM element with id application found to attach client to\",\n      );\n    }\n\n    mount(\n      applicationNode,\n      <Init\n        store={store}\n        routerHistory={routerHistory}\n        contextPath={window.contextPath}\n        theme={theme}\n        ErrorFallbackComponent={ErrorFallbackComponent}\n      >\n        {render()}\n      </Init>,\n    );\n  });\n};\n\n/**\n */\nconst mountClient = (\n  applicationNode: Element,\n  element: ReactElement<ElementType>,\n) => {\n  const isSSR = applicationNode.querySelector(\".application\");\n  if (isSSR) {\n    hydrate(element, applicationNode);\n  } else {\n    render(element, applicationNode);\n  }\n};\n\n/**\n * Mount the webapplication to the DOM, setup redux store and caches, add unhandledRejectionEvent, used client side when JavaScript is enabled.\n */\nexport const client = ({\n  customReducers,\n  theme,\n  render,\n  beforeRenderHooks,\n  ErrorFallbackComponent,\n  mount,\n}: Props) => {\n  const { store, routerHistory } = setupClient(\n    customReducers,\n    beforeRenderHooks,\n  );\n\n  addContentLoadedEvent(\n    store,\n    routerHistory,\n    theme,\n    render,\n    ErrorFallbackComponent,\n    mount ?? mountClient,\n  );\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"client.js","names":["hydrateRoot","createRoot","has","setImmediate","Cache","xhr","createBrowserHistory","configureStore","rehydrate","getBasePathModularUI","getBasePathServer","getSetting","setAllContentInDataSetting","setDateTimeSettings","setLoginPreferences","showXHRErrorNotification","handleError","loginSuccess","updateEntryDate","locationChange","replace","JsonParseException","FetchException","Init","handleBeforeRenderHooks","jsx","_jsx","parseDataToJSON","data","JSON","parse","error","getDataFromServer","_context","dataElement","document","querySelector","Error","_trimInstanceProperty","textContent","call","setUnhandledRejectionEvent","store","window","onunhandledrejection","event","detail","errorMessage","reason","message","toString","dispatch","handleRedirectURI","urlParams","_URLSearchParams","location","search","redirectURI","get","url","catch","e","id","LOGIN_PATH","from","pathname","modal","setModelCatalogEntryDate","entryDateFromUrl","hasItem","getItem","setupClient","customReducers","arguments","length","undefined","beforeRenderHooks","contextPath","clear","browserHistory","basename","routerHistory","getState","loadOtherBrowserTabs","response","listen","action","body","className","addContentLoadedEvent","theme","render","ErrorFallbackComponent","mount","addEventListener","applicationNode","children","mountClient","element","isSSR","root","client","_ref"],"sources":["../../src/react-client/client.js"],"sourcesContent":["// @flow\n// eslint-disable-next-line react/no-deprecated\nimport { hydrateRoot, createRoot } from \"react-dom/client\";\n\nimport { has } from \"../utils/helpers/objects\";\nimport setImmediate from \"setimmediate\";\n\nimport Cache from \"../utils/browser/Cache\";\n\nimport xhr from \"../utils/fetch/xhr\";\n\nimport { createBrowserHistory } from \"history\";\nimport configureStore from \"../redux/store/configureStore\";\n\nimport rehydrate from \"./rehydrate\";\nimport {\n  getBasePathModularUI,\n  getBasePathServer,\n  getSetting,\n} from \"../constants/Settings\";\n\nimport {\n  setAllContentInDataSetting,\n  setDateTimeSettings,\n  setLoginPreferences,\n} from \"../redux/actions/Preferences\";\nimport { showXHRErrorNotification } from \"../redux/actions/Notification\";\nimport { handleError } from \"../redux/actions/Error\";\nimport { loginSuccess } from \"../redux/actions/SignIn\";\nimport { updateEntryDate } from \"../redux/actions/ModelCatalog\";\n\nimport { locationChange, replace } from \"../redux/_router/RouterActions\";\n\nimport { JsonParseException, FetchException } from \"../exceptions\";\n\nimport { Init } from \"./Init\";\n\nimport { handleBeforeRenderHooks } from \"../redux/store/beforeRenderHooks\";\n\nimport type {\n  ComponentType,\n  Element as ReactElement,\n  ElementType,\n} from \"react\";\nimport type { Theme } from \"../react-theme/types\";\nimport type { CustomReducers, ReduxStore } from \"../redux/types\";\nimport type { RouterHistory } from \"react-router\";\nimport type { BeforeRenderHook } from \"../redux/store/beforeRenderHooks\";\nimport type { Props as FallbackProps } from \"../react/ErrorBoundaryFallback\";\n\ntype RenderFunction = () => ReactElement<ElementType>;\ntype MountFunction = (\n  applicationNode: Element,\n  element: ReactElement<ElementType>,\n) => void;\ntype Props = {\n  customReducers?: CustomReducers,\n  theme?: Theme | Array<Theme>,\n  render: RenderFunction,\n  mount: MountFunction,\n  beforeRenderHooks?: Array<BeforeRenderHook>,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>,\n};\n\n/*\n * deserialize serialized data from the server to provide a smooth dehydration.\n */\nconst parseDataToJSON = (data: string) => {\n  try {\n    return JSON.parse(data);\n  } catch (error) {\n    throw new JsonParseException(`Error parsing content ${data}`);\n  }\n};\n\nconst getDataFromServer = () => {\n  const dataElement = document.querySelector(\n    'script[type=\"application/json\"][data-app-state=\"app-json\"]',\n  );\n\n  if (!dataElement) {\n    throw new Error(\"Error loading state, json not found\");\n  } else if (dataElement.textContent.trim() === \"\") {\n    return {};\n  }\n\n  return parseDataToJSON(dataElement.textContent);\n};\n\n/**\n */\nexport const setUnhandledRejectionEvent = (store: ReduxStore) => {\n  window.onunhandledrejection = (event) => {\n    if (event.detail) {\n      return setImmediate(() => {\n        const errorMessage = event.detail.reason.message.toString();\n\n        store.dispatch(showXHRErrorNotification(errorMessage));\n        throw event.detail.reason;\n      });\n    }\n\n    return event;\n  };\n};\n\n/**\n * The redirectURI querystring parameter is available when the server is redirecting an unauthorized deep link\n * @param store\n */\nconst handleRedirectURI = (store: ReduxStore) => {\n  const urlParams = new URLSearchParams(window.location.search);\n  const redirectURI = urlParams.get(\"redirectURI\");\n  if (redirectURI) {\n    xhr({ url: `${getBasePathModularUI()}${redirectURI}` }).catch((e) => {\n      if (\n        e.id === \"UnauthorizedException\" ||\n        e.id === \"Error.NotAuthorized\" ||\n        e.id === \"Error.Authentication.Required\" ||\n        e.id === \"Error.Authentication.InvalidCredentials\"\n      ) {\n        const LOGIN_PATH = getSetting(\"LOGIN_PATH\", \"/signin\");\n        store.dispatch(\n          replace(LOGIN_PATH, {\n            from: { pathname: redirectURI },\n            modal: false,\n          }),\n        );\n      }\n    });\n  }\n};\n\n/**\n */\nexport const setModelCatalogEntryDate = (store: ReduxStore) => {\n  if (typeof window !== \"undefined\") {\n    const entryDateFromUrl = new URLSearchParams(window.location?.search).get(\n      \"entryDate\",\n    );\n    if (entryDateFromUrl) {\n      store.dispatch(updateEntryDate(entryDateFromUrl));\n    } else if (Cache.hasItem(\"ModelCatalogEntryDate\")) {\n      store.dispatch(Cache.getItem(\"ModelCatalogEntryDate\"));\n    }\n  }\n};\n\n/**\n */\nexport const setupClient = (\n  customReducers: CustomReducers = {},\n  beforeRenderHooks: ?Array<BeforeRenderHook>,\n): { store: ReduxStore, routerHistory: RouterHistory } => {\n  if (typeof window.contextPath === \"undefined\") {\n    throw new Error(\"Missing contextPath on window object\");\n  }\n\n  const data = getDataFromServer();\n\n  // remove all resources from cache\n  Cache.clear(\"^res:\");\n\n  // $FlowExpectedError\n  const browserHistory: RouterHistory = createBrowserHistory({\n    basename: getBasePathServer(),\n  });\n  const { routerHistory, store } = configureStore(\n    browserHistory,\n    customReducers,\n    rehydrate(data),\n  );\n\n  handleRedirectURI(store);\n  setModelCatalogEntryDate(store);\n\n  setAllContentInDataSetting(store.getState());\n  setLoginPreferences(store.getState());\n  setDateTimeSettings(store.getState());\n\n  // load existing cache from other browser tabs\n  Cache.loadOtherBrowserTabs(() => {\n    if (Cache.getItem(\"auth\")) {\n      store.dispatch(loginSuccess());\n    }\n  });\n\n  if (has(data, \"error.name\")) {\n    const error = new FetchException(data?.error?.response);\n    store.dispatch(handleError(error));\n  }\n\n  if (Cache.getItem(\"auth\")) {\n    store.dispatch(loginSuccess());\n  }\n\n  // listen to history change and update the redux router store\n  routerHistory.listen((location, action) => {\n    store.dispatch(locationChange(location, action));\n  });\n\n  setUnhandledRejectionEvent(store);\n\n  if (document.body) {\n    document.body.className = \"js\";\n  }\n\n  if (beforeRenderHooks) {\n    handleBeforeRenderHooks(beforeRenderHooks, { store });\n  }\n\n  return { store, routerHistory };\n};\n\n/**\n */\nexport const addContentLoadedEvent = (\n  store: ReduxStore,\n  routerHistory: RouterHistory,\n  theme?: Theme | Array<Theme>,\n  render: RenderFunction,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>,\n  mount: MountFunction,\n) => {\n  window.addEventListener(\"DOMContentLoaded\", () => {\n    const applicationNode = document.querySelector(\"#application\");\n    if (!applicationNode) {\n      throw new Error(\n        \"No DOM element with id application found to attach client to\",\n      );\n    }\n\n    mount(\n      applicationNode,\n      <Init\n        store={store}\n        routerHistory={routerHistory}\n        contextPath={window.contextPath}\n        theme={theme}\n        ErrorFallbackComponent={ErrorFallbackComponent}\n      >\n        {render()}\n      </Init>,\n    );\n  });\n};\n\n/**\n */\nconst mountClient = (\n  applicationNode: Element,\n  element: ReactElement<ElementType>,\n) => {\n  const isSSR = applicationNode.querySelector(\".application\");\n  if (isSSR) {\n    hydrateRoot(element, applicationNode);\n  } else {\n    const root = createRoot(element);\n    root.render(applicationNode);\n  }\n};\n\n/**\n * Mount the webapplication to the DOM, setup redux store and caches, add unhandledRejectionEvent, used client side when JavaScript is enabled.\n */\nexport const client = ({\n  customReducers,\n  theme,\n  render,\n  beforeRenderHooks,\n  ErrorFallbackComponent,\n  mount,\n}: Props) => {\n  const { store, routerHistory } = setupClient(\n    customReducers,\n    beforeRenderHooks,\n  );\n\n  addContentLoadedEvent(\n    store,\n    routerHistory,\n    theme,\n    render,\n    ErrorFallbackComponent,\n    mount ?? mountClient,\n  );\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/modularui/UploadRequest.js

@@ -11,6 +11,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/he
 var _constants = require("../constants");
 var _xhr = _interopRequireDefault(require("../utils/fetch/xhr"));
 var _ErrorModel = _interopRequireDefault(require("../models/error/ErrorModel"));
+var _models = require("../models");
 /**
  * Upload a file to the upload file service of Be Informed
  */
@@ -57,7 +58,7 @@ class UploadRequest {
    */
   uploadFile(file) {
     const maxFileSize = this._uploadConstraints?.maxFileSize?.fileSize ?? -1;
-    if (this.exceedsMaxFileSize(file)) {
+    if ((0, _constants.getSetting)("USE_CLIENTSIDE_VALIDATION") && this.exceedsMaxFileSize(file)) {
       this._progressHandler(file, {
         error: "errorExceedsMaxFileSize"
       });
@@ -65,7 +66,7 @@ class UploadRequest {
         "max-filesize": maxFileSize
       }, true));
     }
-    if (this.isNotAllowedFileType(file)) {
+    if ((0, _constants.getSetting)("USE_CLIENTSIDE_VALIDATION") && this.isNotAllowedFileType(file)) {
       this._progressHandler(file, {
         error: "errorExtensionNotAllowed"
       });
@@ -96,7 +97,7 @@ class UploadRequest {
         token: response.token
       });
       return response;
-    });
+    }).catch(e => _promise.default.reject(new _models.ErrorResponse(e)));
   }
 }
 var _default = exports.default = UploadRequest;

package/lib/modularui/UploadRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"UploadRequest.js","names":["_constants","require","_xhr","_interopRequireDefault","_ErrorModel","UploadRequest","constructor","uploadConstraints","progressHandler","options","_defineProperty2","default","getBasePathModularUI","_uploadConstraints","_progressHandler","_origin","origin","_contextPath","contextPath","getFileExtension","file","name","split","pop","toLowerCase","isNotAllowedFileType","allowedFileTypes","fileTypes","length","fileExtension","some","fileType","_context","_includes","extensions","call","exceedsMaxFileSize","maxFileSize","fileSize","size","uploadFile","error","_promise","reject","ErrorModel","extension","join","xhr","url","getUploadPath","method","HTTP_METHODS","POST","headers","type","encodeURIComponent","toString","onProgress","e","lengthComputable","progress","Math","ceil","loaded","total","data","then","response","token","_default","exports"],"sources":["../../src/modularui/UploadRequest.js"],"sourcesContent":["// @flow\nimport {\n  getBasePathModularUI,\n  getUploadPath,\n  HTTP_METHODS,\n} from \"../constants\";\n\nimport xhr from \"../utils/fetch/xhr\";\n\nimport type {\n  FilesizeConstraintsType,\n  FiletypeConstraintsType,\n} from \"../models\";\nimport ErrorModel from \"../models/error/ErrorModel\";\n\ntype ProgressHandler = (file: File, uploadInfo: Object) => void;\n\ntype UploadRequestOptions = {\n  origin?: string,\n  contextPath?: string,\n};\n\ntype UploadResponse = {\n  token: string,\n};\n\n/**\n * Upload a file to the upload file service of Be Informed\n */\nclass UploadRequest {\n  _uploadConstraints: {\n    fileTypes: FiletypeConstraintsType,\n    maxFileSize: FilesizeConstraintsType,\n    acceptedFiles: Array<string>,\n  };\n  _progressHandler: ProgressHandler;\n  _origin: string = \"\";\n  _contextPath: string = getBasePathModularUI();\n\n  constructor(\n    uploadConstraints: {\n      fileTypes: FiletypeConstraintsType,\n      maxFileSize: FilesizeConstraintsType,\n      acceptedFiles: Array<string>,\n    },\n    progressHandler: ProgressHandler,\n    options?: UploadRequestOptions,\n  ) {\n    this._uploadConstraints = uploadConstraints;\n    this._progressHandler = progressHandler;\n    this._origin = options?.origin || \"\";\n    this._contextPath = options?.contextPath || getBasePathModularUI();\n  }\n\n  /**\n   */\n  getFileExtension(file: File): string {\n    return file.name.split(\".\").pop().toLowerCase();\n  }\n\n  /**\n   */\n  isNotAllowedFileType(file: File): boolean {\n    const allowedFileTypes = this._uploadConstraints.fileTypes;\n\n    if (allowedFileTypes.length > 0) {\n      const fileExtension = this.getFileExtension(file);\n\n      return !allowedFileTypes.some((fileType) =>\n        fileType.extensions.includes(fileExtension),\n      );\n    }\n\n    return false;\n  }\n\n  /**\n   */\n  exceedsMaxFileSize(file: File): boolean {\n    const maxFileSize = this._uploadConstraints?.maxFileSize?.fileSize ?? -1;\n    return maxFileSize > -1 && file.size > maxFileSize;\n  }\n\n  /**\n   */\n  uploadFile(file: File): Promise<UploadResponse> {\n    const maxFileSize = this._uploadConstraints?.maxFileSize?.fileSize ?? -1;\n\n    if (this.exceedsMaxFileSize(file)) {\n      this._progressHandler(file, { error: \"errorExceedsMaxFileSize\" });\n      return Promise.reject(\n        new ErrorModel(\n          \"Constraint.File.MaxFileSizeExceeded\",\n          \"Maximum file upload size is ${max-filesize}\",\n          {\n            \"max-filesize\": maxFileSize,\n          },\n          true,\n        ),\n      );\n    }\n\n    if (this.isNotAllowedFileType(file)) {\n      this._progressHandler(file, { error: \"errorExtensionNotAllowed\" });\n      return Promise.reject(\n        new ErrorModel(\n          \"Constraint.File.InvalidExtension\",\n          \"Allowed extensions are: ${extensions}\",\n          {\n            extension: this.getFileExtension(file),\n            extensions: this._uploadConstraints.fileTypes.join(\", \"),\n          },\n          true,\n        ),\n      );\n    }\n\n    return xhr({\n      url: getUploadPath(this._contextPath, this._origin),\n      method: HTTP_METHODS.POST,\n      headers: {\n        \"Content-Type\": file.type,\n        \"x-filename\": encodeURIComponent(file.name),\n        \"x-filesize\": file.size.toString(),\n      },\n      onProgress: (e: ProgressEvent) => {\n        if (this._progressHandler && e.lengthComputable) {\n          this._progressHandler(file, {\n            progress: Math.ceil((e.loaded / e.total) * 100),\n          });\n        }\n      },\n      data: file,\n    }).then((response) => {\n      this._progressHandler(file, { progress: 100, token: response.token });\n      return response;\n    });\n  }\n}\n\nexport default UploadRequest;\n"],"mappings":";;;;;;;;;;AACA,IAAAA,UAAA,GAAAC,OAAA;AAMA,IAAAC,IAAA,GAAAC,sBAAA,CAAAF,OAAA;AAMA,IAAAG,WAAA,GAAAD,sBAAA,CAAAF,OAAA;AAaA;AACA;AACA;AACA,MAAMI,aAAa,CAAC;EAUlBC,WAAWA,CACTC,iBAIC,EACDC,eAAgC,EAChCC,OAA8B,EAC9B;IAAA,IAAAC,gBAAA,CAAAC,OAAA;IAAA,IAAAD,gBAAA,CAAAC,OAAA;IAAA,IAAAD,gBAAA,CAAAC,OAAA,mBAXgB,EAAE;IAAA,IAAAD,gBAAA,CAAAC,OAAA,wBACG,IAAAC,+BAAoB,EAAC,CAAC;IAW3C,IAAI,CAACC,kBAAkB,GAAGN,iBAAiB;IAC3C,IAAI,CAACO,gBAAgB,GAAGN,eAAe;IACvC,IAAI,CAACO,OAAO,GAAGN,OAAO,EAAEO,MAAM,IAAI,EAAE;IACpC,IAAI,CAACC,YAAY,GAAGR,OAAO,EAAES,WAAW,IAAI,IAAAN,+BAAoB,EAAC,CAAC;EACpE;;EAEA;AACF;EACEO,gBAAgBA,CAACC,IAAU,EAAU;IACnC,OAAOA,IAAI,CAACC,IAAI,CAACC,KAAK,CAAC,GAAG,CAAC,CAACC,GAAG,CAAC,CAAC,CAACC,WAAW,CAAC,CAAC;EACjD;;EAEA;AACF;EACEC,oBAAoBA,CAACL,IAAU,EAAW;IACxC,MAAMM,gBAAgB,GAAG,IAAI,CAACb,kBAAkB,CAACc,SAAS;IAE1D,IAAID,gBAAgB,CAACE,MAAM,GAAG,CAAC,EAAE;MAC/B,MAAMC,aAAa,GAAG,IAAI,CAACV,gBAAgB,CAACC,IAAI,CAAC;MAEjD,OAAO,CAACM,gBAAgB,CAACI,IAAI,CAAEC,QAAQ;QAAA,IAAAC,QAAA;QAAA,OACrC,IAAAC,SAAA,CAAAtB,OAAA,EAAAqB,QAAA,GAAAD,QAAQ,CAACG,UAAU,EAAAC,IAAA,CAAAH,QAAA,EAAUH,aAAa,CAAC;MAAA,CAC7C,CAAC;IACH;IAEA,OAAO,KAAK;EACd;;EAEA;AACF;EACEO,kBAAkBA,CAAChB,IAAU,EAAW;IACtC,MAAMiB,WAAW,GAAG,IAAI,CAACxB,kBAAkB,EAAEwB,WAAW,EAAEC,QAAQ,IAAI,CAAC,CAAC;IACxE,OAAOD,WAAW,GAAG,CAAC,CAAC,IAAIjB,IAAI,CAACmB,IAAI,GAAGF,WAAW;EACpD;;EAEA;AACF;EACEG,UAAUA,CAACpB,IAAU,EAA2B;IAC9C,MAAMiB,WAAW,GAAG,IAAI,CAACxB,kBAAkB,EAAEwB,WAAW,EAAEC,QAAQ,IAAI,CAAC,CAAC;IAExE,IAAI,IAAI,CAACF,kBAAkB,CAAChB,IAAI,CAAC,EAAE;MACjC,IAAI,CAACN,gBAAgB,CAACM,IAAI,EAAE;QAAEqB,KAAK,EAAE;MAA0B,CAAC,CAAC;MACjE,OAAOC,QAAA,CAAA/B,OAAA,CAAQgC,MAAM,CACnB,IAAIC,mBAAU,CACZ,qCAAqC,EACrC,6CAA6C,EAC7C;QACE,cAAc,EAAEP;MAClB,CAAC,EACD,IACF,CACF,CAAC;IACH;IAEA,IAAI,IAAI,CAACZ,oBAAoB,CAACL,IAAI,CAAC,EAAE;MACnC,IAAI,CAACN,gBAAgB,CAACM,IAAI,EAAE;QAAEqB,KAAK,EAAE;MAA2B,CAAC,CAAC;MAClE,OAAOC,QAAA,CAAA/B,OAAA,CAAQgC,MAAM,CACnB,IAAIC,mBAAU,CACZ,kCAAkC,EAClC,uCAAuC,EACvC;QACEC,SAAS,EAAE,IAAI,CAAC1B,gBAAgB,CAACC,IAAI,CAAC;QACtCc,UAAU,EAAE,IAAI,CAACrB,kBAAkB,CAACc,SAAS,CAACmB,IAAI,CAAC,IAAI;MACzD,CAAC,EACD,IACF,CACF,CAAC;IACH;IAEA,OAAO,IAAAC,YAAG,EAAC;MACTC,GAAG,EAAE,IAAAC,wBAAa,EAAC,IAAI,CAAChC,YAAY,EAAE,IAAI,CAACF,OAAO,CAAC;MACnDmC,MAAM,EAAEC,uBAAY,CAACC,IAAI;MACzBC,OAAO,EAAE;QACP,cAAc,EAAEjC,IAAI,CAACkC,IAAI;QACzB,YAAY,EAAEC,kBAAkB,CAACnC,IAAI,CAACC,IAAI,CAAC;QAC3C,YAAY,EAAED,IAAI,CAACmB,IAAI,CAACiB,QAAQ,CAAC;MACnC,CAAC;MACDC,UAAU,EAAGC,CAAgB,IAAK;QAChC,IAAI,IAAI,CAAC5C,gBAAgB,IAAI4C,CAAC,CAACC,gBAAgB,EAAE;UAC/C,IAAI,CAAC7C,gBAAgB,CAACM,IAAI,EAAE;YAC1BwC,QAAQ,EAAEC,IAAI,CAACC,IAAI,CAAEJ,CAAC,CAACK,MAAM,GAAGL,CAAC,CAACM,KAAK,GAAI,GAAG;UAChD,CAAC,CAAC;QACJ;MACF,CAAC;MACDC,IAAI,EAAE7C;IACR,CAAC,CAAC,CAAC8C,IAAI,CAAEC,QAAQ,IAAK;MACpB,IAAI,CAACrD,gBAAgB,CAACM,IAAI,EAAE;QAAEwC,QAAQ,EAAE,GAAG;QAAEQ,KAAK,EAAED,QAAQ,CAACC;MAAM,CAAC,CAAC;MACrE,OAAOD,QAAQ;IACjB,CAAC,CAAC;EACJ;AACF;AAAC,IAAAE,QAAA,GAAAC,OAAA,CAAA3D,OAAA,GAEcN,aAAa","ignoreList":[]}
+{"version":3,"file":"UploadRequest.js","names":["_constants","require","_xhr","_interopRequireDefault","_ErrorModel","_models","UploadRequest","constructor","uploadConstraints","progressHandler","options","_defineProperty2","default","getBasePathModularUI","_uploadConstraints","_progressHandler","_origin","origin","_contextPath","contextPath","getFileExtension","file","name","split","pop","toLowerCase","isNotAllowedFileType","allowedFileTypes","fileTypes","length","fileExtension","some","fileType","_context","_includes","extensions","call","exceedsMaxFileSize","maxFileSize","fileSize","size","uploadFile","getSetting","error","_promise","reject","ErrorModel","extension","join","xhr","url","getUploadPath","method","HTTP_METHODS","POST","headers","type","encodeURIComponent","toString","onProgress","e","lengthComputable","progress","Math","ceil","loaded","total","data","then","response","token","catch","ErrorResponse","_default","exports"],"sources":["../../src/modularui/UploadRequest.js"],"sourcesContent":["// @flow\nimport {\n  getBasePathModularUI,\n  getSetting,\n  getUploadPath,\n  HTTP_METHODS,\n} from \"../constants\";\n\nimport xhr from \"../utils/fetch/xhr\";\n\nimport type {\n  FilesizeConstraintsType,\n  FiletypeConstraintsType,\n} from \"../models\";\nimport ErrorModel from \"../models/error/ErrorModel\";\nimport { ErrorResponse } from \"../models\";\n\ntype ProgressHandler = (file: File, uploadInfo: Object) => void;\n\ntype UploadRequestOptions = {\n  origin?: string,\n  contextPath?: string,\n};\n\ntype UploadResponse = {\n  token: string,\n};\n\n/**\n * Upload a file to the upload file service of Be Informed\n */\nclass UploadRequest {\n  _uploadConstraints: {\n    fileTypes: FiletypeConstraintsType,\n    maxFileSize: FilesizeConstraintsType,\n    acceptedFiles: Array<string>,\n  };\n  _progressHandler: ProgressHandler;\n  _origin: string = \"\";\n  _contextPath: string = getBasePathModularUI();\n\n  constructor(\n    uploadConstraints: {\n      fileTypes: FiletypeConstraintsType,\n      maxFileSize: FilesizeConstraintsType,\n      acceptedFiles: Array<string>,\n    },\n    progressHandler: ProgressHandler,\n    options?: UploadRequestOptions,\n  ) {\n    this._uploadConstraints = uploadConstraints;\n    this._progressHandler = progressHandler;\n    this._origin = options?.origin || \"\";\n    this._contextPath = options?.contextPath || getBasePathModularUI();\n  }\n\n  /**\n   */\n  getFileExtension(file: File): string {\n    return file.name.split(\".\").pop().toLowerCase();\n  }\n\n  /**\n   */\n  isNotAllowedFileType(file: File): boolean {\n    const allowedFileTypes = this._uploadConstraints.fileTypes;\n\n    if (allowedFileTypes.length > 0) {\n      const fileExtension = this.getFileExtension(file);\n\n      return !allowedFileTypes.some((fileType) =>\n        fileType.extensions.includes(fileExtension),\n      );\n    }\n\n    return false;\n  }\n\n  /**\n   */\n  exceedsMaxFileSize(file: File): boolean {\n    const maxFileSize = this._uploadConstraints?.maxFileSize?.fileSize ?? -1;\n    return maxFileSize > -1 && file.size > maxFileSize;\n  }\n\n  /**\n   */\n  uploadFile(file: File): Promise<UploadResponse> {\n    const maxFileSize = this._uploadConstraints?.maxFileSize?.fileSize ?? -1;\n\n    if (\n      getSetting(\"USE_CLIENTSIDE_VALIDATION\") &&\n      this.exceedsMaxFileSize(file)\n    ) {\n      this._progressHandler(file, { error: \"errorExceedsMaxFileSize\" });\n      return Promise.reject(\n        new ErrorModel(\n          \"Constraint.File.MaxFileSizeExceeded\",\n          \"Maximum file upload size is ${max-filesize}\",\n          {\n            \"max-filesize\": maxFileSize,\n          },\n          true,\n        ),\n      );\n    }\n\n    if (\n      getSetting(\"USE_CLIENTSIDE_VALIDATION\") &&\n      this.isNotAllowedFileType(file)\n    ) {\n      this._progressHandler(file, { error: \"errorExtensionNotAllowed\" });\n      return Promise.reject(\n        new ErrorModel(\n          \"Constraint.File.InvalidExtension\",\n          \"Allowed extensions are: ${extensions}\",\n          {\n            extension: this.getFileExtension(file),\n            extensions: this._uploadConstraints.fileTypes.join(\", \"),\n          },\n          true,\n        ),\n      );\n    }\n\n    return xhr({\n      url: getUploadPath(this._contextPath, this._origin),\n      method: HTTP_METHODS.POST,\n      headers: {\n        \"Content-Type\": file.type,\n        \"x-filename\": encodeURIComponent(file.name),\n        \"x-filesize\": file.size.toString(),\n      },\n      onProgress: (e: ProgressEvent) => {\n        if (this._progressHandler && e.lengthComputable) {\n          this._progressHandler(file, {\n            progress: Math.ceil((e.loaded / e.total) * 100),\n          });\n        }\n      },\n      data: file,\n    })\n      .then((response) => {\n        this._progressHandler(file, { progress: 100, token: response.token });\n        return response;\n      })\n      .catch((e) => Promise.reject(new ErrorResponse(e)));\n  }\n}\n\nexport default UploadRequest;\n"],"mappings":"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","ignoreList":[]}

package/lib/react-client/client.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.setupClient = exports.setUnhandledRejectionEvent = exports.setModelCatalogEntryDate = exports.client = exports.addContentLoadedEvent = void 0;
 var _trim = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/trim"));
 var _urlSearchParams = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/url-search-params"));
-var _reactDom = require("react-dom");
+var _client = require("react-dom/client");
 var _objects = require("../utils/helpers/objects");
 var _setimmediate = _interopRequireDefault(require("setimmediate"));
 var _Cache = _interopRequireDefault(require("../utils/browser/Cache"));
@@ -188,9 +188,10 @@ exports.addContentLoadedEvent = addContentLoadedEvent;
 const mountClient = (applicationNode, element) => {
   const isSSR = applicationNode.querySelector(".application");
   if (isSSR) {
-    (0, _reactDom.hydrate)(element, applicationNode);
+    (0, _client.hydrateRoot)(element, applicationNode);
   } else {
-    (0, _reactDom.render)(element, applicationNode);
+    const root = (0, _client.createRoot)(element);
+    root.render(applicationNode);
   }
 };
 

package/lib/react-client/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","names":["_reactDom","require","_objects","_setimmediate","_interopRequireDefault","_Cache","_xhr","_history","_configureStore","_rehydrate","_Settings","_Preferences","_Notification","_Error","_SignIn","_ModelCatalog","_RouterActions","_exceptions","_Init","_beforeRenderHooks","_jsxRuntime","parseDataToJSON","data","JSON","parse","error","JsonParseException","getDataFromServer","_context","dataElement","document","querySelector","Error","_trim","default","textContent","call","setUnhandledRejectionEvent","store","window","onunhandledrejection","event","detail","setImmediate","errorMessage","reason","message","toString","dispatch","showXHRErrorNotification","exports","handleRedirectURI","urlParams","_urlSearchParams","location","search","redirectURI","get","xhr","url","getBasePathModularUI","catch","e","id","LOGIN_PATH","getSetting","replace","from","pathname","modal","setModelCatalogEntryDate","entryDateFromUrl","updateEntryDate","Cache","hasItem","getItem","setupClient","customReducers","arguments","length","undefined","beforeRenderHooks","contextPath","clear","browserHistory","createBrowserHistory","basename","getBasePathServer","routerHistory","configureStore","rehydrate","setAllContentInDataSetting","getState","setLoginPreferences","setDateTimeSettings","loadOtherBrowserTabs","loginSuccess","has","FetchException","response","handleError","listen","action","locationChange","body","className","handleBeforeRenderHooks","addContentLoadedEvent","theme","render","ErrorFallbackComponent","mount","addEventListener","applicationNode","jsx","Init","children","mountClient","element","isSSR","hydrate","client","_ref"],"sources":["../../src/react-client/client.js"],"sourcesContent":["// @flow\n// eslint-disable-next-line react/no-deprecated\nimport { hydrate, render } from \"react-dom\";\n\nimport { has } from \"../utils/helpers/objects\";\nimport setImmediate from \"setimmediate\";\n\nimport Cache from \"../utils/browser/Cache\";\n\nimport xhr from \"../utils/fetch/xhr\";\n\nimport { createBrowserHistory } from \"history\";\nimport configureStore from \"../redux/store/configureStore\";\n\nimport rehydrate from \"./rehydrate\";\nimport {\n  getBasePathModularUI,\n  getBasePathServer,\n  getSetting,\n} from \"../constants/Settings\";\n\nimport {\n  setAllContentInDataSetting,\n  setDateTimeSettings,\n  setLoginPreferences,\n} from \"../redux/actions/Preferences\";\nimport { showXHRErrorNotification } from \"../redux/actions/Notification\";\nimport { handleError } from \"../redux/actions/Error\";\nimport { loginSuccess } from \"../redux/actions/SignIn\";\nimport { updateEntryDate } from \"../redux/actions/ModelCatalog\";\n\nimport { locationChange, replace } from \"../redux/_router/RouterActions\";\n\nimport { JsonParseException, FetchException } from \"../exceptions\";\n\nimport { Init } from \"./Init\";\n\nimport { handleBeforeRenderHooks } from \"../redux/store/beforeRenderHooks\";\n\nimport type {\n  ComponentType,\n  Element as ReactElement,\n  ElementType,\n} from \"react\";\nimport type { Theme } from \"../react-theme/types\";\nimport type { CustomReducers, ReduxStore } from \"../redux/types\";\nimport type { RouterHistory } from \"react-router\";\nimport type { BeforeRenderHook } from \"../redux/store/beforeRenderHooks\";\nimport type { Props as FallbackProps } from \"../react/ErrorBoundaryFallback\";\n\ntype RenderFunction = () => ReactElement<ElementType>;\ntype MountFunction = (\n  applicationNode: Element,\n  element: ReactElement<ElementType>,\n) => void;\ntype Props = {\n  customReducers?: CustomReducers,\n  theme?: Theme | Array<Theme>,\n  render: RenderFunction,\n  mount: MountFunction,\n  beforeRenderHooks?: Array<BeforeRenderHook>,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>,\n};\n\n/*\n * deserialize serialized data from the server to provide a smooth dehydration.\n */\nconst parseDataToJSON = (data: string) => {\n  try {\n    return JSON.parse(data);\n  } catch (error) {\n    throw new JsonParseException(`Error parsing content ${data}`);\n  }\n};\n\nconst getDataFromServer = () => {\n  const dataElement = document.querySelector(\n    'script[type=\"application/json\"][data-app-state=\"app-json\"]',\n  );\n\n  if (!dataElement) {\n    throw new Error(\"Error loading state, json not found\");\n  } else if (dataElement.textContent.trim() === \"\") {\n    return {};\n  }\n\n  return parseDataToJSON(dataElement.textContent);\n};\n\n/**\n */\nexport const setUnhandledRejectionEvent = (store: ReduxStore) => {\n  window.onunhandledrejection = (event) => {\n    if (event.detail) {\n      return setImmediate(() => {\n        const errorMessage = event.detail.reason.message.toString();\n\n        store.dispatch(showXHRErrorNotification(errorMessage));\n        throw event.detail.reason;\n      });\n    }\n\n    return event;\n  };\n};\n\n/**\n * The redirectURI querystring parameter is available when the server is redirecting an unauthorized deep link\n * @param store\n */\nconst handleRedirectURI = (store: ReduxStore) => {\n  const urlParams = new URLSearchParams(window.location.search);\n  const redirectURI = urlParams.get(\"redirectURI\");\n  if (redirectURI) {\n    xhr({ url: `${getBasePathModularUI()}${redirectURI}` }).catch((e) => {\n      if (\n        e.id === \"UnauthorizedException\" ||\n        e.id === \"Error.NotAuthorized\" ||\n        e.id === \"Error.Authentication.Required\" ||\n        e.id === \"Error.Authentication.InvalidCredentials\"\n      ) {\n        const LOGIN_PATH = getSetting(\"LOGIN_PATH\", \"/signin\");\n        store.dispatch(\n          replace(LOGIN_PATH, {\n            from: { pathname: redirectURI },\n            modal: false,\n          }),\n        );\n      }\n    });\n  }\n};\n\n/**\n */\nexport const setModelCatalogEntryDate = (store: ReduxStore) => {\n  if (typeof window !== \"undefined\") {\n    const entryDateFromUrl = new URLSearchParams(window.location?.search).get(\n      \"entryDate\",\n    );\n    if (entryDateFromUrl) {\n      store.dispatch(updateEntryDate(entryDateFromUrl));\n    } else if (Cache.hasItem(\"ModelCatalogEntryDate\")) {\n      store.dispatch(Cache.getItem(\"ModelCatalogEntryDate\"));\n    }\n  }\n};\n\n/**\n */\nexport const setupClient = (\n  customReducers: CustomReducers = {},\n  beforeRenderHooks: ?Array<BeforeRenderHook>,\n): { store: ReduxStore, routerHistory: RouterHistory } => {\n  if (typeof window.contextPath === \"undefined\") {\n    throw new Error(\"Missing contextPath on window object\");\n  }\n\n  const data = getDataFromServer();\n\n  // remove all resources from cache\n  Cache.clear(\"^res:\");\n\n  // $FlowExpectedError\n  const browserHistory: RouterHistory = createBrowserHistory({\n    basename: getBasePathServer(),\n  });\n  const { routerHistory, store } = configureStore(\n    browserHistory,\n    customReducers,\n    rehydrate(data),\n  );\n\n  handleRedirectURI(store);\n  setModelCatalogEntryDate(store);\n\n  setAllContentInDataSetting(store.getState());\n  setLoginPreferences(store.getState());\n  setDateTimeSettings(store.getState());\n\n  // load existing cache from other browser tabs\n  Cache.loadOtherBrowserTabs(() => {\n    if (Cache.getItem(\"auth\")) {\n      store.dispatch(loginSuccess());\n    }\n  });\n\n  if (has(data, \"error.name\")) {\n    const error = new FetchException(data?.error?.response);\n    store.dispatch(handleError(error));\n  }\n\n  if (Cache.getItem(\"auth\")) {\n    store.dispatch(loginSuccess());\n  }\n\n  // listen to history change and update the redux router store\n  routerHistory.listen((location, action) => {\n    store.dispatch(locationChange(location, action));\n  });\n\n  setUnhandledRejectionEvent(store);\n\n  if (document.body) {\n    document.body.className = \"js\";\n  }\n\n  if (beforeRenderHooks) {\n    handleBeforeRenderHooks(beforeRenderHooks, { store });\n  }\n\n  return { store, routerHistory };\n};\n\n/**\n */\nexport const addContentLoadedEvent = (\n  store: ReduxStore,\n  routerHistory: RouterHistory,\n  theme?: Theme | Array<Theme>,\n  render: RenderFunction,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>,\n  mount: MountFunction,\n) => {\n  window.addEventListener(\"DOMContentLoaded\", () => {\n    const applicationNode = document.querySelector(\"#application\");\n    if (!applicationNode) {\n      throw new Error(\n        \"No DOM element with id application found to attach client to\",\n      );\n    }\n\n    mount(\n      applicationNode,\n      <Init\n        store={store}\n        routerHistory={routerHistory}\n        contextPath={window.contextPath}\n        theme={theme}\n        ErrorFallbackComponent={ErrorFallbackComponent}\n      >\n        {render()}\n      </Init>,\n    );\n  });\n};\n\n/**\n */\nconst mountClient = (\n  applicationNode: Element,\n  element: ReactElement<ElementType>,\n) => {\n  const isSSR = applicationNode.querySelector(\".application\");\n  if (isSSR) {\n    hydrate(element, applicationNode);\n  } else {\n    render(element, applicationNode);\n  }\n};\n\n/**\n * Mount the webapplication to the DOM, setup redux store and caches, add unhandledRejectionEvent, used client side when JavaScript is enabled.\n */\nexport const client = ({\n  customReducers,\n  theme,\n  render,\n  beforeRenderHooks,\n  ErrorFallbackComponent,\n  mount,\n}: Props) => {\n  const { store, routerHistory } = setupClient(\n    customReducers,\n    beforeRenderHooks,\n  );\n\n  addContentLoadedEvent(\n    store,\n    routerHistory,\n    theme,\n    render,\n    ErrorFallbackComponent,\n    mount ?? mountClient,\n  );\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"client.js","names":["_client","require","_objects","_setimmediate","_interopRequireDefault","_Cache","_xhr","_history","_configureStore","_rehydrate","_Settings","_Preferences","_Notification","_Error","_SignIn","_ModelCatalog","_RouterActions","_exceptions","_Init","_beforeRenderHooks","_jsxRuntime","parseDataToJSON","data","JSON","parse","error","JsonParseException","getDataFromServer","_context","dataElement","document","querySelector","Error","_trim","default","textContent","call","setUnhandledRejectionEvent","store","window","onunhandledrejection","event","detail","setImmediate","errorMessage","reason","message","toString","dispatch","showXHRErrorNotification","exports","handleRedirectURI","urlParams","_urlSearchParams","location","search","redirectURI","get","xhr","url","getBasePathModularUI","catch","e","id","LOGIN_PATH","getSetting","replace","from","pathname","modal","setModelCatalogEntryDate","entryDateFromUrl","updateEntryDate","Cache","hasItem","getItem","setupClient","customReducers","arguments","length","undefined","beforeRenderHooks","contextPath","clear","browserHistory","createBrowserHistory","basename","getBasePathServer","routerHistory","configureStore","rehydrate","setAllContentInDataSetting","getState","setLoginPreferences","setDateTimeSettings","loadOtherBrowserTabs","loginSuccess","has","FetchException","response","handleError","listen","action","locationChange","body","className","handleBeforeRenderHooks","addContentLoadedEvent","theme","render","ErrorFallbackComponent","mount","addEventListener","applicationNode","jsx","Init","children","mountClient","element","isSSR","hydrateRoot","root","createRoot","client","_ref"],"sources":["../../src/react-client/client.js"],"sourcesContent":["// @flow\n// eslint-disable-next-line react/no-deprecated\nimport { hydrateRoot, createRoot } from \"react-dom/client\";\n\nimport { has } from \"../utils/helpers/objects\";\nimport setImmediate from \"setimmediate\";\n\nimport Cache from \"../utils/browser/Cache\";\n\nimport xhr from \"../utils/fetch/xhr\";\n\nimport { createBrowserHistory } from \"history\";\nimport configureStore from \"../redux/store/configureStore\";\n\nimport rehydrate from \"./rehydrate\";\nimport {\n  getBasePathModularUI,\n  getBasePathServer,\n  getSetting,\n} from \"../constants/Settings\";\n\nimport {\n  setAllContentInDataSetting,\n  setDateTimeSettings,\n  setLoginPreferences,\n} from \"../redux/actions/Preferences\";\nimport { showXHRErrorNotification } from \"../redux/actions/Notification\";\nimport { handleError } from \"../redux/actions/Error\";\nimport { loginSuccess } from \"../redux/actions/SignIn\";\nimport { updateEntryDate } from \"../redux/actions/ModelCatalog\";\n\nimport { locationChange, replace } from \"../redux/_router/RouterActions\";\n\nimport { JsonParseException, FetchException } from \"../exceptions\";\n\nimport { Init } from \"./Init\";\n\nimport { handleBeforeRenderHooks } from \"../redux/store/beforeRenderHooks\";\n\nimport type {\n  ComponentType,\n  Element as ReactElement,\n  ElementType,\n} from \"react\";\nimport type { Theme } from \"../react-theme/types\";\nimport type { CustomReducers, ReduxStore } from \"../redux/types\";\nimport type { RouterHistory } from \"react-router\";\nimport type { BeforeRenderHook } from \"../redux/store/beforeRenderHooks\";\nimport type { Props as FallbackProps } from \"../react/ErrorBoundaryFallback\";\n\ntype RenderFunction = () => ReactElement<ElementType>;\ntype MountFunction = (\n  applicationNode: Element,\n  element: ReactElement<ElementType>,\n) => void;\ntype Props = {\n  customReducers?: CustomReducers,\n  theme?: Theme | Array<Theme>,\n  render: RenderFunction,\n  mount: MountFunction,\n  beforeRenderHooks?: Array<BeforeRenderHook>,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>,\n};\n\n/*\n * deserialize serialized data from the server to provide a smooth dehydration.\n */\nconst parseDataToJSON = (data: string) => {\n  try {\n    return JSON.parse(data);\n  } catch (error) {\n    throw new JsonParseException(`Error parsing content ${data}`);\n  }\n};\n\nconst getDataFromServer = () => {\n  const dataElement = document.querySelector(\n    'script[type=\"application/json\"][data-app-state=\"app-json\"]',\n  );\n\n  if (!dataElement) {\n    throw new Error(\"Error loading state, json not found\");\n  } else if (dataElement.textContent.trim() === \"\") {\n    return {};\n  }\n\n  return parseDataToJSON(dataElement.textContent);\n};\n\n/**\n */\nexport const setUnhandledRejectionEvent = (store: ReduxStore) => {\n  window.onunhandledrejection = (event) => {\n    if (event.detail) {\n      return setImmediate(() => {\n        const errorMessage = event.detail.reason.message.toString();\n\n        store.dispatch(showXHRErrorNotification(errorMessage));\n        throw event.detail.reason;\n      });\n    }\n\n    return event;\n  };\n};\n\n/**\n * The redirectURI querystring parameter is available when the server is redirecting an unauthorized deep link\n * @param store\n */\nconst handleRedirectURI = (store: ReduxStore) => {\n  const urlParams = new URLSearchParams(window.location.search);\n  const redirectURI = urlParams.get(\"redirectURI\");\n  if (redirectURI) {\n    xhr({ url: `${getBasePathModularUI()}${redirectURI}` }).catch((e) => {\n      if (\n        e.id === \"UnauthorizedException\" ||\n        e.id === \"Error.NotAuthorized\" ||\n        e.id === \"Error.Authentication.Required\" ||\n        e.id === \"Error.Authentication.InvalidCredentials\"\n      ) {\n        const LOGIN_PATH = getSetting(\"LOGIN_PATH\", \"/signin\");\n        store.dispatch(\n          replace(LOGIN_PATH, {\n            from: { pathname: redirectURI },\n            modal: false,\n          }),\n        );\n      }\n    });\n  }\n};\n\n/**\n */\nexport const setModelCatalogEntryDate = (store: ReduxStore) => {\n  if (typeof window !== \"undefined\") {\n    const entryDateFromUrl = new URLSearchParams(window.location?.search).get(\n      \"entryDate\",\n    );\n    if (entryDateFromUrl) {\n      store.dispatch(updateEntryDate(entryDateFromUrl));\n    } else if (Cache.hasItem(\"ModelCatalogEntryDate\")) {\n      store.dispatch(Cache.getItem(\"ModelCatalogEntryDate\"));\n    }\n  }\n};\n\n/**\n */\nexport const setupClient = (\n  customReducers: CustomReducers = {},\n  beforeRenderHooks: ?Array<BeforeRenderHook>,\n): { store: ReduxStore, routerHistory: RouterHistory } => {\n  if (typeof window.contextPath === \"undefined\") {\n    throw new Error(\"Missing contextPath on window object\");\n  }\n\n  const data = getDataFromServer();\n\n  // remove all resources from cache\n  Cache.clear(\"^res:\");\n\n  // $FlowExpectedError\n  const browserHistory: RouterHistory = createBrowserHistory({\n    basename: getBasePathServer(),\n  });\n  const { routerHistory, store } = configureStore(\n    browserHistory,\n    customReducers,\n    rehydrate(data),\n  );\n\n  handleRedirectURI(store);\n  setModelCatalogEntryDate(store);\n\n  setAllContentInDataSetting(store.getState());\n  setLoginPreferences(store.getState());\n  setDateTimeSettings(store.getState());\n\n  // load existing cache from other browser tabs\n  Cache.loadOtherBrowserTabs(() => {\n    if (Cache.getItem(\"auth\")) {\n      store.dispatch(loginSuccess());\n    }\n  });\n\n  if (has(data, \"error.name\")) {\n    const error = new FetchException(data?.error?.response);\n    store.dispatch(handleError(error));\n  }\n\n  if (Cache.getItem(\"auth\")) {\n    store.dispatch(loginSuccess());\n  }\n\n  // listen to history change and update the redux router store\n  routerHistory.listen((location, action) => {\n    store.dispatch(locationChange(location, action));\n  });\n\n  setUnhandledRejectionEvent(store);\n\n  if (document.body) {\n    document.body.className = \"js\";\n  }\n\n  if (beforeRenderHooks) {\n    handleBeforeRenderHooks(beforeRenderHooks, { store });\n  }\n\n  return { store, routerHistory };\n};\n\n/**\n */\nexport const addContentLoadedEvent = (\n  store: ReduxStore,\n  routerHistory: RouterHistory,\n  theme?: Theme | Array<Theme>,\n  render: RenderFunction,\n  ErrorFallbackComponent?: ComponentType<FallbackProps>,\n  mount: MountFunction,\n) => {\n  window.addEventListener(\"DOMContentLoaded\", () => {\n    const applicationNode = document.querySelector(\"#application\");\n    if (!applicationNode) {\n      throw new Error(\n        \"No DOM element with id application found to attach client to\",\n      );\n    }\n\n    mount(\n      applicationNode,\n      <Init\n        store={store}\n        routerHistory={routerHistory}\n        contextPath={window.contextPath}\n        theme={theme}\n        ErrorFallbackComponent={ErrorFallbackComponent}\n      >\n        {render()}\n      </Init>,\n    );\n  });\n};\n\n/**\n */\nconst mountClient = (\n  applicationNode: Element,\n  element: ReactElement<ElementType>,\n) => {\n  const isSSR = applicationNode.querySelector(\".application\");\n  if (isSSR) {\n    hydrateRoot(element, applicationNode);\n  } else {\n    const root = createRoot(element);\n    root.render(applicationNode);\n  }\n};\n\n/**\n * Mount the webapplication to the DOM, setup redux store and caches, add unhandledRejectionEvent, used client side when JavaScript is enabled.\n */\nexport const client = ({\n  customReducers,\n  theme,\n  render,\n  beforeRenderHooks,\n  ErrorFallbackComponent,\n  mount,\n}: Props) => {\n  const { store, routerHistory } = setupClient(\n    customReducers,\n    beforeRenderHooks,\n  );\n\n  addContentLoadedEvent(\n    store,\n    routerHistory,\n    theme,\n    render,\n    ErrorFallbackComponent,\n    mount ?? mountClient,\n  );\n};\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.60.0",
+  "version": "1.60.2",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "https://support.beinformed.com",
@@ -18,7 +18,7 @@
     "watch:esm": "cross-env BABEL_ENV=esm babel --watch src --out-dir esm --ignore \"**/__tests__/**\" --ignore \"**/__mock__/**\" --ignore \"**/__mocks__/**\"",
     "quality": "npm run lint && npm run flow && npm run test",
     "dev": "npm run clean && npm run build:lib && npm run build:flow && npm run build:proxies && npm run build:esm",
-    "build": "npm run quality && npm run clean && npm run build:lib && npm run build:flow && npm run build:proxies && npm run build:esm && npm run build:ts && npm run docs",
+    "build": "npm run clean && npm run build:lib && npm run build:flow && npm run build:proxies && npm run build:esm && npm run build:ts && npm run docs",
     "build:lib": "babel src --out-dir lib --ignore \"**/__tests__/**\" --ignore \"**/__mock__/**\" --ignore \"**/__mocks__/**\" --source-maps",
     "build:esm": "cross-env BABEL_ENV=esm babel src --out-dir esm --ignore \"**/__tests__/**\" --ignore \"**/__mock__/**\" --ignore \"**/__mocks__/**\" --source-maps",
     "build:proxies": "node .build/proxies.js",
@@ -35,8 +35,7 @@
     "test:ci": "jest --ci",
     "test:changed": "jest --onlyChanged",
     "upgrade-interactive": "npm-check -u",
-    "prerelease": "",
-    "release": "commit-and-tag-version",
+    "release": "npm run quality && commit-and-tag-version",
     "beta-release": "commit-and-tag-version --prerelease beta",
     "prepublishOnly": "npm run build",
     "docs": "rimraf docs && node ./.build/docs.mjs",
@@ -59,8 +58,8 @@
   "peerDependencies": {
     "history": "^4.0.0",
     "polished": "^4.0.0",
-    "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
-    "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0",
+    "react": "^18.0.0 || ^19.0.0",
+    "react-dom": "^18.0.0 || ^19.0.0",
     "react-helmet-async": "^1.0.0 || ^2.0.0",
     "react-redux": "^7.0.0 || ^8.0.0",
     "react-router": "^5.0.0",
@@ -109,13 +108,13 @@
     "cross-env": "^7.0.3",
     "documentation": "^14.0.2",
     "eslint": "^8.57.0",
-    "eslint-config-prettier": "^10.0.1",
+    "eslint-config-prettier": "^10.0.2",
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-ft-flow": "^3.0.11",
     "eslint-plugin-jest": "^28.11.0",
     "eslint-plugin-jsdoc": "^50.6.3",
     "eslint-plugin-react": "^7.37.4",
-    "eslint-plugin-react-hooks": "^5.1.0",
+    "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",
     "flow-bin": "^0.200.1",
     "flow-copy-source": "^2.0.9",
@@ -130,7 +129,7 @@
     "jscodeshift": "^17.1.2",
     "lint-staged": "^15.4.3",
     "polished": "^4.0.0",
-    "prettier": "^3.5.1",
+    "prettier": "^3.5.3",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-helmet-async": "^2.0.5",
@@ -142,7 +141,7 @@
     "redux-thunk": "^2.4.2",
     "rimraf": "^6.0.1",
     "styled-components": "^5.3.11",
-    "typescript": "^5.7.3",
+    "typescript": "^5.8.2",
     "xhr-mock": "^2.5.1"
   },
   "scarfSettings": {

package/src/models/form/__tests__/FormModel.spec.js

@@ -284,6 +284,8 @@ describe("formModel", () => {
 
     form.currentFormObject.getAttributeByKey("DateOfBirth").inputvalue = "bla";
 
+    expect(form.errorCollection).toHaveLength(0);
+
     form.handleErrors({
       data: {
         errors: [

package/src/modularui/UploadRequest.js

@@ -1,6 +1,7 @@
 // @flow
 import {
   getBasePathModularUI,
+  getSetting,
   getUploadPath,
   HTTP_METHODS,
 } from "../constants";
@@ -12,6 +13,7 @@ import type {
   FiletypeConstraintsType,
 } from "../models";
 import ErrorModel from "../models/error/ErrorModel";
+import { ErrorResponse } from "../models";
 
 type ProgressHandler = (file: File, uploadInfo: Object) => void;
 
@@ -86,7 +88,10 @@ class UploadRequest {
   uploadFile(file: File): Promise<UploadResponse> {
     const maxFileSize = this._uploadConstraints?.maxFileSize?.fileSize ?? -1;
 
-    if (this.exceedsMaxFileSize(file)) {
+    if (
+      getSetting("USE_CLIENTSIDE_VALIDATION") &&
+      this.exceedsMaxFileSize(file)
+    ) {
       this._progressHandler(file, { error: "errorExceedsMaxFileSize" });
       return Promise.reject(
         new ErrorModel(
@@ -100,7 +105,10 @@ class UploadRequest {
       );
     }
 
-    if (this.isNotAllowedFileType(file)) {
+    if (
+      getSetting("USE_CLIENTSIDE_VALIDATION") &&
+      this.isNotAllowedFileType(file)
+    ) {
       this._progressHandler(file, { error: "errorExtensionNotAllowed" });
       return Promise.reject(
         new ErrorModel(
@@ -131,10 +139,12 @@ class UploadRequest {
         }
       },
       data: file,
-    }).then((response) => {
-      this._progressHandler(file, { progress: 100, token: response.token });
-      return response;
-    });
+    })
+      .then((response) => {
+        this._progressHandler(file, { progress: 100, token: response.token });
+        return response;
+      })
+      .catch((e) => Promise.reject(new ErrorResponse(e)));
   }
 }
 

package/src/react-client/client.js

@@ -1,6 +1,6 @@
 // @flow
 // eslint-disable-next-line react/no-deprecated
-import { hydrate, render } from "react-dom";
+import { hydrateRoot, createRoot } from "react-dom/client";
 
 import { has } from "../utils/helpers/objects";
 import setImmediate from "setimmediate";
@@ -253,9 +253,10 @@ const mountClient = (
 ) => {
   const isSSR = applicationNode.querySelector(".application");
   if (isSSR) {
-    hydrate(element, applicationNode);
+    hydrateRoot(element, applicationNode);
   } else {
-    render(element, applicationNode);
+    const root = createRoot(element);
+    root.render(applicationNode);
   }
 };