@beinformed/ui 1.27.3 → 1.27.5

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.27.5](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.27.4...v1.27.5) (2023-02-07)
+
+### Bug Fixes
+
+- **actions:** allow for action collections where part of contributions is not available ([ee1f482](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/ee1f482edf21f3c783b4f5f5b927f6838d36f626))
+
+### [1.27.4](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.27.3...v1.27.4) (2023-02-07)
+
+### Bug Fixes
+
+- **server:** add property to skip preloading the web application on the server ([b9c8e17](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/b9c8e178bbef7cf94f9d3d80da9f64f78e228a24))
+
 ### [1.27.3](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.27.2...v1.27.3) (2023-02-06)
 
 ### Bug Fixes

package/esm/models/actions/ActionCollection.js

@@ -1,10 +1,9 @@
-import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
 import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
+import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import BaseCollection from "../base/BaseCollection";
 import ActionModel from "./ActionModel";
-import { IllegalArgumentException } from "../../exceptions";
 
 /**
  * Collection of actions
@@ -14,22 +13,17 @@ export default class ActionCollection extends BaseCollection {
     super();
 
     // no actions gives an empty collection
-    if (!actions) {
+    if (!Array.isArray(actions)) {
       this.collection = [];
-
-      // When actions are available but no contributions, then an error occured
-    } else if (!actionsContributions || !Array.isArray(actionsContributions)) {
-      throw new IllegalArgumentException("Data for ActionCollection found, but no contributions available");
-    } else {
-      this.collection = _mapInstanceProperty(actions).call(actions, action => {
-        if (actionsContributions) {
-          const contributions = _findInstanceProperty(actionsContributions).call(actionsContributions, actionContribution => actionContribution.name === action.name);
-          if (contributions) {
-            return new ActionModel(action, contributions);
-          }
+    } else if (Array.isArray(actionsContributions)) {
+      const actionModels = [];
+      for (const actionData of actions) {
+        const actionContribution = _findInstanceProperty(actionsContributions).call(actionsContributions, actionContribution => actionContribution.name === actionData.name);
+        if (actionContribution) {
+          actionModels.push(new ActionModel(actionData, actionContribution));
         }
-        throw new Error(`Contributions not found for action ${action.name}`);
-      });
+      }
+      this.collection = actionModels;
     }
   }
 

package/esm/models/actions/ActionCollection.js.map

@@ -1 +1 @@
-{"version":3,"file":"ActionCollection.js","names":["BaseCollection","ActionModel","IllegalArgumentException","ActionCollection","constructor","actions","actionsContributions","collection","Array","isArray","action","contributions","actionContribution","name","Error","getActionByKey","key","newCollection","first","getActionsByType","type","getActionsByLayoutHint","hints","layouthint","has","hasActionsByLayoutHint","length","routePath","enabledRoutes","isDisabled","path","selfhref","join"],"sources":["../../../src/models/actions/ActionCollection.js"],"sourcesContent":["// @flow\nimport BaseCollection from \"../base/BaseCollection\";\nimport ActionModel from \"./ActionModel\";\nimport { IllegalArgumentException } from \"../../exceptions\";\n\n/**\n * Collection of actions\n */\nexport default class ActionCollection extends BaseCollection<ActionModel> {\n  constructor(actions?: Object, actionsContributions?: Object) {\n    super();\n\n    // no actions gives an empty collection\n    if (!actions) {\n      this.collection = [];\n\n      // When actions are available but no contributions, then an error occured\n    } else if (!actionsContributions || !Array.isArray(actionsContributions)) {\n      throw new IllegalArgumentException(\n        \"Data for ActionCollection found, but no contributions available\"\n      );\n    } else {\n      this.collection = actions.map((action) => {\n        if (actionsContributions) {\n          const contributions = actionsContributions.find(\n            (actionContribution) => actionContribution.name === action.name\n          );\n\n          if (contributions) {\n            return new ActionModel(action, contributions);\n          }\n        }\n\n        throw new Error(`Contributions not found for action ${action.name}`);\n      });\n    }\n  }\n\n  /**\n   * Retrieve action by key\n   */\n  getActionByKey(key: string): ActionModel | null {\n    const newCollection = new ActionCollection();\n\n    newCollection.collection = this.filter((action) => action.key === key);\n\n    return newCollection.first;\n  }\n\n  /**\n   * Retrieve actions by type\n   */\n  getActionsByType(type: string | Array<string>): ActionCollection {\n    const newCollection = new ActionCollection();\n\n    newCollection.collection = this.filter((action) =>\n      Array.isArray(type) ? type.includes(action.type) : action.type === type\n    );\n\n    return newCollection;\n  }\n\n  /**\n   * Retrieve actions including a layout hint\n   */\n  getActionsByLayoutHint(...hints: Array<string>): ActionCollection {\n    const newCollection = new ActionCollection();\n\n    newCollection.collection = this.filter((action) =>\n      action.layouthint.has(...hints)\n    );\n\n    return newCollection;\n  }\n\n  /**\n   * Indicates if an action with layout hint exists\n   */\n  hasActionsByLayoutHint(...hints: Array<string>): boolean {\n    return this.getActionsByLayoutHint(...hints).length > 0;\n  }\n\n  /**\n   * Use as path regex for react router routes\n   */\n  get routePath(): string {\n    const enabledRoutes = this.collection.filter(\n      (action) => !action.isDisabled\n    );\n\n    if (enabledRoutes.length === 0) {\n      return \"__NON_EXISTING_ROUTE__\";\n    }\n\n    const path = enabledRoutes.map((action) => action.selfhref.path).join(\"|\");\n\n    return this.length > 1 ? `(${path})` : path;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"ActionCollection.js","names":["BaseCollection","ActionModel","ActionCollection","constructor","actions","actionsContributions","Array","isArray","collection","actionModels","actionData","actionContribution","name","push","getActionByKey","key","newCollection","action","first","getActionsByType","type","getActionsByLayoutHint","hints","layouthint","has","hasActionsByLayoutHint","length","routePath","enabledRoutes","isDisabled","path","selfhref","join"],"sources":["../../../src/models/actions/ActionCollection.js"],"sourcesContent":["// @flow\nimport BaseCollection from \"../base/BaseCollection\";\nimport ActionModel from \"./ActionModel\";\n\n/**\n * Collection of actions\n */\nexport default class ActionCollection extends BaseCollection<ActionModel> {\n  constructor(actions?: Object, actionsContributions?: Object) {\n    super();\n\n    // no actions gives an empty collection\n    if (!Array.isArray(actions)) {\n      this.collection = [];\n    } else if (Array.isArray(actionsContributions)) {\n      const actionModels = [];\n      for (const actionData of actions) {\n        const actionContribution = actionsContributions.find(\n          (actionContribution) => actionContribution.name === actionData.name\n        );\n\n        if (actionContribution) {\n          actionModels.push(new ActionModel(actionData, actionContribution));\n        }\n      }\n\n      this.collection = actionModels;\n    }\n  }\n\n  /**\n   * Retrieve action by key\n   */\n  getActionByKey(key: string): ActionModel | null {\n    const newCollection = new ActionCollection();\n\n    newCollection.collection = this.filter((action) => action.key === key);\n\n    return newCollection.first;\n  }\n\n  /**\n   * Retrieve actions by type\n   */\n  getActionsByType(type: string | Array<string>): ActionCollection {\n    const newCollection = new ActionCollection();\n\n    newCollection.collection = this.filter((action) =>\n      Array.isArray(type) ? type.includes(action.type) : action.type === type\n    );\n\n    return newCollection;\n  }\n\n  /**\n   * Retrieve actions including a layout hint\n   */\n  getActionsByLayoutHint(...hints: Array<string>): ActionCollection {\n    const newCollection = new ActionCollection();\n\n    newCollection.collection = this.filter((action) =>\n      action.layouthint.has(...hints)\n    );\n\n    return newCollection;\n  }\n\n  /**\n   * Indicates if an action with layout hint exists\n   */\n  hasActionsByLayoutHint(...hints: Array<string>): boolean {\n    return this.getActionsByLayoutHint(...hints).length > 0;\n  }\n\n  /**\n   * Use as path regex for react router routes\n   */\n  get routePath(): string {\n    const enabledRoutes = this.collection.filter(\n      (action) => !action.isDisabled\n    );\n\n    if (enabledRoutes.length === 0) {\n      return \"__NON_EXISTING_ROUTE__\";\n    }\n\n    const path = enabledRoutes.map((action) => action.selfhref.path).join(\"|\");\n\n    return this.length > 1 ? `(${path})` : path;\n  }\n}\n"],"mappings":";;;;AACA,OAAOA,cAAc,MAAM,wBAAwB;AACnD,OAAOC,WAAW,MAAM,eAAe;;AAEvC;AACA;AACA;AACA,eAAe,MAAMC,gBAAgB,SAASF,cAAc,CAAc;EACxEG,WAAW,CAACC,OAAgB,EAAEC,oBAA6B,EAAE;IAC3D,KAAK,EAAE;;IAEP;IACA,IAAI,CAACC,KAAK,CAACC,OAAO,CAACH,OAAO,CAAC,EAAE;MAC3B,IAAI,CAACI,UAAU,GAAG,EAAE;IACtB,CAAC,MAAM,IAAIF,KAAK,CAACC,OAAO,CAACF,oBAAoB,CAAC,EAAE;MAC9C,MAAMI,YAAY,GAAG,EAAE;MACvB,KAAK,MAAMC,UAAU,IAAIN,OAAO,EAAE;QAChC,MAAMO,kBAAkB,GAAG,sBAAAN,oBAAoB,OAApBA,oBAAoB,EAC5CM,kBAAkB,IAAKA,kBAAkB,CAACC,IAAI,KAAKF,UAAU,CAACE,IAAI,CACpE;QAED,IAAID,kBAAkB,EAAE;UACtBF,YAAY,CAACI,IAAI,CAAC,IAAIZ,WAAW,CAACS,UAAU,EAAEC,kBAAkB,CAAC,CAAC;QACpE;MACF;MAEA,IAAI,CAACH,UAAU,GAAGC,YAAY;IAChC;EACF;;EAEA;AACF;AACA;EACEK,cAAc,CAACC,GAAW,EAAsB;IAAA;IAC9C,MAAMC,aAAa,GAAG,IAAId,gBAAgB,EAAE;IAE5Cc,aAAa,CAACR,UAAU,GAAG,uCAAI,iBAASS,MAAM,IAAKA,MAAM,CAACF,GAAG,KAAKA,GAAG,CAAC;IAEtE,OAAOC,aAAa,CAACE,KAAK;EAC5B;;EAEA;AACF;AACA;EACEC,gBAAgB,CAACC,IAA4B,EAAoB;IAAA;IAC/D,MAAMJ,aAAa,GAAG,IAAId,gBAAgB,EAAE;IAE5Cc,aAAa,CAACR,UAAU,GAAG,wCAAI,kBAASS,MAAM,IAC5CX,KAAK,CAACC,OAAO,CAACa,IAAI,CAAC,GAAG,0BAAAA,IAAI,OAAJA,IAAI,EAAUH,MAAM,CAACG,IAAI,CAAC,GAAGH,MAAM,CAACG,IAAI,KAAKA,IAAI,CACxE;IAED,OAAOJ,aAAa;EACtB;;EAEA;AACF;AACA;EACEK,sBAAsB,GAA4C;IAAA;IAAA,kCAAxCC,KAAK;MAALA,KAAK;IAAA;IAC7B,MAAMN,aAAa,GAAG,IAAId,gBAAgB,EAAE;IAE5Cc,aAAa,CAACR,UAAU,GAAG,wCAAI,kBAASS,MAAM,IAC5CA,MAAM,CAACM,UAAU,CAACC,GAAG,CAAC,GAAGF,KAAK,CAAC,CAChC;IAED,OAAON,aAAa;EACtB;;EAEA;AACF;AACA;EACES,sBAAsB,GAAmC;IACvD,OAAO,IAAI,CAACJ,sBAAsB,CAAC,YAAQ,CAAC,CAACK,MAAM,GAAG,CAAC;EACzD;;EAEA;AACF;AACA;EACE,IAAIC,SAAS,GAAW;IAAA;IACtB,MAAMC,aAAa,GAAG,wCAAI,CAACpB,UAAU,kBAClCS,MAAM,IAAK,CAACA,MAAM,CAACY,UAAU,CAC/B;IAED,IAAID,aAAa,CAACF,MAAM,KAAK,CAAC,EAAE;MAC9B,OAAO,wBAAwB;IACjC;IAEA,MAAMI,IAAI,GAAG,qBAAAF,aAAa,OAAbA,aAAa,EAAMX,MAAM,IAAKA,MAAM,CAACc,QAAQ,CAACD,IAAI,CAAC,CAACE,IAAI,CAAC,GAAG,CAAC;IAE1E,OAAO,IAAI,CAACN,MAAM,GAAG,CAAC,GAAI,IAAGI,IAAK,GAAE,GAAGA,IAAI;EAC7C;AACF"}

package/esm/react-server/serverNoSSR.js

@@ -16,7 +16,8 @@ const serverNoSSR = _ref => {
     theme,
     render,
     template,
-    beforeRenderHooks
+    beforeRenderHooks,
+    preloadApplication = true
   } = _ref;
   const UUID = createUUID();
   __webpack_nonce__ = UUID; // NOSONAR
@@ -31,7 +32,9 @@ const serverNoSSR = _ref => {
     createTheme(storedTheme, theme);
   }
   setI18n(store, locales, request);
-  setApplication(store);
+  if (preloadApplication) {
+    setApplication(store);
+  }
   handleErrors(store);
   handleBeforeRenderHooks(beforeRenderHooks, {
     store,

package/esm/react-server/serverNoSSR.js.map

@@ -1 +1 @@
-{"version":3,"file":"serverNoSSR.js","names":["createUUID","getFullRequestHref","createReduxStore","setI18n","setApplication","setServerPreferences","setConfigurationTheme","handleErrors","handleBeforeRenderHooks","renderSSRMinimal","createTheme","serverNoSSR","request","locales","customReducers","serverPreferences","theme","render","template","beforeRenderHooks","UUID","__webpack_nonce__","requestHref","store","storedTheme","getState","preferences"],"sources":["../../src/react-server/serverNoSSR.js"],"sourcesContent":["// @flow\nimport \"./contextPath\";\n\nimport createUUID from \"../utils/helpers/createUUID\";\nimport { getFullRequestHref } from \"./requestInformation\";\n\nimport {\n  createReduxStore,\n  setI18n,\n  setApplication,\n  setServerPreferences,\n  setConfigurationTheme,\n  handleErrors,\n} from \"./serverUtil\";\n\nimport { handleBeforeRenderHooks } from \"../redux/store/beforeRenderHooks\";\n\nimport renderSSRMinimal from \"./renderSSRMinimal\";\n\nimport createTheme from \"../react-theme/createTheme\";\n\nimport type { TemplateProps } from \"./htmlpage\";\nimport type { BeforeRenderHook } from \"../redux/store/beforeRenderHooks\";\nimport type { PreferenceValue } from \"./serverUtil\";\nimport type { LocaleConfiguration } from \"../i18n/types\";\nimport type { Theme } from \"../react-theme/types\";\n\ntype serverProps = {\n  request: HttpServletRequestJava,\n  locales?: Array<LocaleConfiguration>,\n  customReducers?: Object,\n  theme?: Theme | Array<Theme>,\n  serverPreferences?: Array<string | PreferenceValue>,\n  render: Function,\n  template?: (TemplateProps) => string,\n  beforeRenderHooks?: Array<BeforeRenderHook>,\n};\n\n/**\n */\nconst serverNoSSR = ({\n  request,\n  locales,\n  customReducers,\n  serverPreferences = [],\n  theme,\n  render,\n  template,\n  beforeRenderHooks,\n}: serverProps): string => {\n  const UUID = createUUID();\n  __webpack_nonce__ = UUID; // NOSONAR\n\n  const requestHref = getFullRequestHref(request);\n\n  const store = createReduxStore(requestHref, customReducers);\n\n  setServerPreferences(store, serverPreferences);\n  setConfigurationTheme(store);\n\n  if (theme) {\n    const storedTheme = store.getState()?.preferences?.theme;\n    //$FlowFixMe[incompatible-call]\n    createTheme(storedTheme, theme);\n  }\n\n  setI18n(store, locales, request);\n\n  setApplication(store);\n\n  handleErrors(store);\n\n  handleBeforeRenderHooks(beforeRenderHooks, { store, request });\n\n  return renderSSRMinimal({ store, theme, UUID, render, template });\n};\n\nexport default serverNoSSR;\n"],"mappings":"AACA,OAAO,eAAe;AAEtB,OAAOA,UAAU,MAAM,6BAA6B;AACpD,SAASC,kBAAkB,QAAQ,sBAAsB;AAEzD,SACEC,gBAAgB,EAChBC,OAAO,EACPC,cAAc,EACdC,oBAAoB,EACpBC,qBAAqB,EACrBC,YAAY,QACP,cAAc;AAErB,SAASC,uBAAuB,QAAQ,kCAAkC;AAE1E,OAAOC,gBAAgB,MAAM,oBAAoB;AAEjD,OAAOC,WAAW,MAAM,4BAA4B;AAmBpD;AACA;AACA,MAAMC,WAAW,GAAG,QASO;EAAA,IATN;IACnBC,OAAO;IACPC,OAAO;IACPC,cAAc;IACdC,iBAAiB,GAAG,EAAE;IACtBC,KAAK;IACLC,MAAM;IACNC,QAAQ;IACRC;EACW,CAAC;EACZ,MAAMC,IAAI,GAAGpB,UAAU,EAAE;EACzBqB,iBAAiB,GAAGD,IAAI,CAAC,CAAC;;EAE1B,MAAME,WAAW,GAAGrB,kBAAkB,CAACW,OAAO,CAAC;EAE/C,MAAMW,KAAK,GAAGrB,gBAAgB,CAACoB,WAAW,EAAER,cAAc,CAAC;EAE3DT,oBAAoB,CAACkB,KAAK,EAAER,iBAAiB,CAAC;EAC9CT,qBAAqB,CAACiB,KAAK,CAAC;EAE5B,IAAIP,KAAK,EAAE;IACT,MAAMQ,WAAW,GAAGD,KAAK,CAACE,QAAQ,EAAE,EAAEC,WAAW,EAAEV,KAAK;IACxD;IACAN,WAAW,CAACc,WAAW,EAAER,KAAK,CAAC;EACjC;EAEAb,OAAO,CAACoB,KAAK,EAAEV,OAAO,EAAED,OAAO,CAAC;EAEhCR,cAAc,CAACmB,KAAK,CAAC;EAErBhB,YAAY,CAACgB,KAAK,CAAC;EAEnBf,uBAAuB,CAACW,iBAAiB,EAAE;IAAEI,KAAK;IAAEX;EAAQ,CAAC,CAAC;EAE9D,OAAOH,gBAAgB,CAAC;IAAEc,KAAK;IAAEP,KAAK;IAAEI,IAAI;IAAEH,MAAM;IAAEC;EAAS,CAAC,CAAC;AACnE,CAAC;AAED,eAAeP,WAAW"}
+{"version":3,"file":"serverNoSSR.js","names":["createUUID","getFullRequestHref","createReduxStore","setI18n","setApplication","setServerPreferences","setConfigurationTheme","handleErrors","handleBeforeRenderHooks","renderSSRMinimal","createTheme","serverNoSSR","request","locales","customReducers","serverPreferences","theme","render","template","beforeRenderHooks","preloadApplication","UUID","__webpack_nonce__","requestHref","store","storedTheme","getState","preferences"],"sources":["../../src/react-server/serverNoSSR.js"],"sourcesContent":["// @flow\nimport \"./contextPath\";\n\nimport createUUID from \"../utils/helpers/createUUID\";\nimport { getFullRequestHref } from \"./requestInformation\";\n\nimport {\n  createReduxStore,\n  setI18n,\n  setApplication,\n  setServerPreferences,\n  setConfigurationTheme,\n  handleErrors,\n} from \"./serverUtil\";\n\nimport { handleBeforeRenderHooks } from \"../redux/store/beforeRenderHooks\";\n\nimport renderSSRMinimal from \"./renderSSRMinimal\";\n\nimport createTheme from \"../react-theme/createTheme\";\n\nimport type { TemplateProps } from \"./htmlpage\";\nimport type { BeforeRenderHook } from \"../redux/store/beforeRenderHooks\";\nimport type { PreferenceValue } from \"./serverUtil\";\nimport type { LocaleConfiguration } from \"../i18n/types\";\nimport type { Theme } from \"../react-theme/types\";\n\ntype serverProps = {\n  request: HttpServletRequestJava,\n  locales?: Array<LocaleConfiguration>,\n  customReducers?: Object,\n  theme?: Theme | Array<Theme>,\n  serverPreferences?: Array<string | PreferenceValue>,\n  render: Function,\n  template?: (TemplateProps) => string,\n  beforeRenderHooks?: Array<BeforeRenderHook>,\n  preloadApplication?: boolean,\n};\n\n/**\n */\nconst serverNoSSR = ({\n  request,\n  locales,\n  customReducers,\n  serverPreferences = [],\n  theme,\n  render,\n  template,\n  beforeRenderHooks,\n  preloadApplication = true,\n}: serverProps): string => {\n  const UUID = createUUID();\n  __webpack_nonce__ = UUID; // NOSONAR\n\n  const requestHref = getFullRequestHref(request);\n\n  const store = createReduxStore(requestHref, customReducers);\n\n  setServerPreferences(store, serverPreferences);\n  setConfigurationTheme(store);\n\n  if (theme) {\n    const storedTheme = store.getState()?.preferences?.theme;\n    //$FlowFixMe[incompatible-call]\n    createTheme(storedTheme, theme);\n  }\n\n  setI18n(store, locales, request);\n\n  if (preloadApplication) {\n    setApplication(store);\n  }\n\n  handleErrors(store);\n\n  handleBeforeRenderHooks(beforeRenderHooks, { store, request });\n\n  return renderSSRMinimal({ store, theme, UUID, render, template });\n};\n\nexport default serverNoSSR;\n"],"mappings":"AACA,OAAO,eAAe;AAEtB,OAAOA,UAAU,MAAM,6BAA6B;AACpD,SAASC,kBAAkB,QAAQ,sBAAsB;AAEzD,SACEC,gBAAgB,EAChBC,OAAO,EACPC,cAAc,EACdC,oBAAoB,EACpBC,qBAAqB,EACrBC,YAAY,QACP,cAAc;AAErB,SAASC,uBAAuB,QAAQ,kCAAkC;AAE1E,OAAOC,gBAAgB,MAAM,oBAAoB;AAEjD,OAAOC,WAAW,MAAM,4BAA4B;AAoBpD;AACA;AACA,MAAMC,WAAW,GAAG,QAUO;EAAA,IAVN;IACnBC,OAAO;IACPC,OAAO;IACPC,cAAc;IACdC,iBAAiB,GAAG,EAAE;IACtBC,KAAK;IACLC,MAAM;IACNC,QAAQ;IACRC,iBAAiB;IACjBC,kBAAkB,GAAG;EACV,CAAC;EACZ,MAAMC,IAAI,GAAGrB,UAAU,EAAE;EACzBsB,iBAAiB,GAAGD,IAAI,CAAC,CAAC;;EAE1B,MAAME,WAAW,GAAGtB,kBAAkB,CAACW,OAAO,CAAC;EAE/C,MAAMY,KAAK,GAAGtB,gBAAgB,CAACqB,WAAW,EAAET,cAAc,CAAC;EAE3DT,oBAAoB,CAACmB,KAAK,EAAET,iBAAiB,CAAC;EAC9CT,qBAAqB,CAACkB,KAAK,CAAC;EAE5B,IAAIR,KAAK,EAAE;IACT,MAAMS,WAAW,GAAGD,KAAK,CAACE,QAAQ,EAAE,EAAEC,WAAW,EAAEX,KAAK;IACxD;IACAN,WAAW,CAACe,WAAW,EAAET,KAAK,CAAC;EACjC;EAEAb,OAAO,CAACqB,KAAK,EAAEX,OAAO,EAAED,OAAO,CAAC;EAEhC,IAAIQ,kBAAkB,EAAE;IACtBhB,cAAc,CAACoB,KAAK,CAAC;EACvB;EAEAjB,YAAY,CAACiB,KAAK,CAAC;EAEnBhB,uBAAuB,CAACW,iBAAiB,EAAE;IAAEK,KAAK;IAAEZ;EAAQ,CAAC,CAAC;EAE9D,OAAOH,gBAAgB,CAAC;IAAEe,KAAK;IAAER,KAAK;IAAEK,IAAI;IAAEJ,MAAM;IAAEC;EAAS,CAAC,CAAC;AACnE,CAAC;AAED,eAAeP,WAAW"}

package/lib/models/actions/ActionCollection.js

@@ -5,13 +5,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
+var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 var _BaseCollection = _interopRequireDefault(require("../base/BaseCollection"));
 var _ActionModel = _interopRequireDefault(require("./ActionModel"));
-var _exceptions = require("../../exceptions");
 /**
  * Collection of actions
  */
@@ -20,22 +19,17 @@ class ActionCollection extends _BaseCollection.default {
     super();
 
     // no actions gives an empty collection
-    if (!actions) {
+    if (!Array.isArray(actions)) {
       this.collection = [];
-
-      // When actions are available but no contributions, then an error occured
-    } else if (!actionsContributions || !Array.isArray(actionsContributions)) {
-      throw new _exceptions.IllegalArgumentException("Data for ActionCollection found, but no contributions available");
-    } else {
-      this.collection = (0, _map.default)(actions).call(actions, action => {
-        if (actionsContributions) {
-          const contributions = (0, _find.default)(actionsContributions).call(actionsContributions, actionContribution => actionContribution.name === action.name);
-          if (contributions) {
-            return new _ActionModel.default(action, contributions);
-          }
+    } else if (Array.isArray(actionsContributions)) {
+      const actionModels = [];
+      for (const actionData of actions) {
+        const actionContribution = (0, _find.default)(actionsContributions).call(actionsContributions, actionContribution => actionContribution.name === actionData.name);
+        if (actionContribution) {
+          actionModels.push(new _ActionModel.default(actionData, actionContribution));
         }
-        throw new Error(`Contributions not found for action ${action.name}`);
-      });
+      }
+      this.collection = actionModels;
     }
   }
 

package/lib/models/actions/ActionCollection.js.flow

@@ -1,7 +1,6 @@
 // @flow
 import BaseCollection from "../base/BaseCollection";
 import ActionModel from "./ActionModel";
-import { IllegalArgumentException } from "../../exceptions";
 
 /**
  * Collection of actions
@@ -11,28 +10,21 @@ export default class ActionCollection extends BaseCollection<ActionModel> {
     super();
 
     // no actions gives an empty collection
-    if (!actions) {
+    if (!Array.isArray(actions)) {
       this.collection = [];
-
-      // When actions are available but no contributions, then an error occured
-    } else if (!actionsContributions || !Array.isArray(actionsContributions)) {
-      throw new IllegalArgumentException(
-        "Data for ActionCollection found, but no contributions available"
-      );
-    } else {
-      this.collection = actions.map((action) => {
-        if (actionsContributions) {
-          const contributions = actionsContributions.find(
-            (actionContribution) => actionContribution.name === action.name
-          );
-
-          if (contributions) {
-            return new ActionModel(action, contributions);
-          }
+    } else if (Array.isArray(actionsContributions)) {
+      const actionModels = [];
+      for (const actionData of actions) {
+        const actionContribution = actionsContributions.find(
+          (actionContribution) => actionContribution.name === actionData.name
+        );
+
+        if (actionContribution) {
+          actionModels.push(new ActionModel(actionData, actionContribution));
         }
+      }
 
-        throw new Error(`Contributions not found for action ${action.name}`);
-      });
+      this.collection = actionModels;
     }
   }
 

package/lib/models/actions/ActionCollection.js.map

@@ -1 +1 @@
-{"version":3,"file":"ActionCollection.js","names":["ActionCollection","BaseCollection","constructor","actions","actionsContributions","collection","Array","isArray","IllegalArgumentException","action","contributions","actionContribution","name","ActionModel","Error","getActionByKey","key","newCollection","first","getActionsByType","type","getActionsByLayoutHint","hints","layouthint","has","hasActionsByLayoutHint","length","routePath","enabledRoutes","isDisabled","path","selfhref","join"],"sources":["../../../src/models/actions/ActionCollection.js"],"sourcesContent":["// @flow\nimport BaseCollection from \"../base/BaseCollection\";\nimport ActionModel from \"./ActionModel\";\nimport { IllegalArgumentException } from \"../../exceptions\";\n\n/**\n * Collection of actions\n */\nexport default class ActionCollection extends BaseCollection<ActionModel> {\n  constructor(actions?: Object, actionsContributions?: Object) {\n    super();\n\n    // no actions gives an empty collection\n    if (!actions) {\n      this.collection = [];\n\n      // When actions are available but no contributions, then an error occured\n    } else if (!actionsContributions || !Array.isArray(actionsContributions)) {\n      throw new IllegalArgumentException(\n        \"Data for ActionCollection found, but no contributions available\"\n      );\n    } else {\n      this.collection = actions.map((action) => {\n        if (actionsContributions) {\n          const contributions = actionsContributions.find(\n            (actionContribution) => actionContribution.name === action.name\n          );\n\n          if (contributions) {\n            return new ActionModel(action, contributions);\n          }\n        }\n\n        throw new Error(`Contributions not found for action ${action.name}`);\n      });\n    }\n  }\n\n  /**\n   * Retrieve action by key\n   */\n  getActionByKey(key: string): ActionModel | null {\n    const newCollection = new ActionCollection();\n\n    newCollection.collection = this.filter((action) => action.key === key);\n\n    return newCollection.first;\n  }\n\n  /**\n   * Retrieve actions by type\n   */\n  getActionsByType(type: string | Array<string>): ActionCollection {\n    const newCollection = new ActionCollection();\n\n    newCollection.collection = this.filter((action) =>\n      Array.isArray(type) ? type.includes(action.type) : action.type === type\n    );\n\n    return newCollection;\n  }\n\n  /**\n   * Retrieve actions including a layout hint\n   */\n  getActionsByLayoutHint(...hints: Array<string>): ActionCollection {\n    const newCollection = new ActionCollection();\n\n    newCollection.collection = this.filter((action) =>\n      action.layouthint.has(...hints)\n    );\n\n    return newCollection;\n  }\n\n  /**\n   * Indicates if an action with layout hint exists\n   */\n  hasActionsByLayoutHint(...hints: Array<string>): boolean {\n    return this.getActionsByLayoutHint(...hints).length > 0;\n  }\n\n  /**\n   * Use as path regex for react router routes\n   */\n  get routePath(): string {\n    const enabledRoutes = this.collection.filter(\n      (action) => !action.isDisabled\n    );\n\n    if (enabledRoutes.length === 0) {\n      return \"__NON_EXISTING_ROUTE__\";\n    }\n\n    const path = enabledRoutes.map((action) => action.selfhref.path).join(\"|\");\n\n    return this.length > 1 ? `(${path})` : path;\n  }\n}\n"],"mappings":";;;;;;;;;;;AACA;AACA;AACA;AAEA;AACA;AACA;AACe,MAAMA,gBAAgB,SAASC,uBAAc,CAAc;EACxEC,WAAW,CAACC,OAAgB,EAAEC,oBAA6B,EAAE;IAC3D,KAAK,EAAE;;IAEP;IACA,IAAI,CAACD,OAAO,EAAE;MACZ,IAAI,CAACE,UAAU,GAAG,EAAE;;MAEpB;IACF,CAAC,MAAM,IAAI,CAACD,oBAAoB,IAAI,CAACE,KAAK,CAACC,OAAO,CAACH,oBAAoB,CAAC,EAAE;MACxE,MAAM,IAAII,oCAAwB,CAChC,iEAAiE,CAClE;IACH,CAAC,MAAM;MACL,IAAI,CAACH,UAAU,GAAG,kBAAAF,OAAO,OAAPA,OAAO,EAAMM,MAAM,IAAK;QACxC,IAAIL,oBAAoB,EAAE;UACxB,MAAMM,aAAa,GAAG,mBAAAN,oBAAoB,OAApBA,oBAAoB,EACvCO,kBAAkB,IAAKA,kBAAkB,CAACC,IAAI,KAAKH,MAAM,CAACG,IAAI,CAChE;UAED,IAAIF,aAAa,EAAE;YACjB,OAAO,IAAIG,oBAAW,CAACJ,MAAM,EAAEC,aAAa,CAAC;UAC/C;QACF;QAEA,MAAM,IAAII,KAAK,CAAE,sCAAqCL,MAAM,CAACG,IAAK,EAAC,CAAC;MACtE,CAAC,CAAC;IACJ;EACF;;EAEA;AACF;AACA;EACEG,cAAc,CAACC,GAAW,EAAsB;IAAA;IAC9C,MAAMC,aAAa,GAAG,IAAIjB,gBAAgB,EAAE;IAE5CiB,aAAa,CAACZ,UAAU,GAAG,oCAAI,iBAASI,MAAM,IAAKA,MAAM,CAACO,GAAG,KAAKA,GAAG,CAAC;IAEtE,OAAOC,aAAa,CAACC,KAAK;EAC5B;;EAEA;AACF;AACA;EACEC,gBAAgB,CAACC,IAA4B,EAAoB;IAAA;IAC/D,MAAMH,aAAa,GAAG,IAAIjB,gBAAgB,EAAE;IAE5CiB,aAAa,CAACZ,UAAU,GAAG,qCAAI,kBAASI,MAAM,IAC5CH,KAAK,CAACC,OAAO,CAACa,IAAI,CAAC,GAAG,uBAAAA,IAAI,OAAJA,IAAI,EAAUX,MAAM,CAACW,IAAI,CAAC,GAAGX,MAAM,CAACW,IAAI,KAAKA,IAAI,CACxE;IAED,OAAOH,aAAa;EACtB;;EAEA;AACF;AACA;EACEI,sBAAsB,GAA4C;IAAA;IAAA,kCAAxCC,KAAK;MAALA,KAAK;IAAA;IAC7B,MAAML,aAAa,GAAG,IAAIjB,gBAAgB,EAAE;IAE5CiB,aAAa,CAACZ,UAAU,GAAG,qCAAI,kBAASI,MAAM,IAC5CA,MAAM,CAACc,UAAU,CAACC,GAAG,CAAC,GAAGF,KAAK,CAAC,CAChC;IAED,OAAOL,aAAa;EACtB;;EAEA;AACF;AACA;EACEQ,sBAAsB,GAAmC;IACvD,OAAO,IAAI,CAACJ,sBAAsB,CAAC,YAAQ,CAAC,CAACK,MAAM,GAAG,CAAC;EACzD;;EAEA;AACF;AACA;EACE,IAAIC,SAAS,GAAW;IAAA;IACtB,MAAMC,aAAa,GAAG,qCAAI,CAACvB,UAAU,kBAClCI,MAAM,IAAK,CAACA,MAAM,CAACoB,UAAU,CAC/B;IAED,IAAID,aAAa,CAACF,MAAM,KAAK,CAAC,EAAE;MAC9B,OAAO,wBAAwB;IACjC;IAEA,MAAMI,IAAI,GAAG,kBAAAF,aAAa,OAAbA,aAAa,EAAMnB,MAAM,IAAKA,MAAM,CAACsB,QAAQ,CAACD,IAAI,CAAC,CAACE,IAAI,CAAC,GAAG,CAAC;IAE1E,OAAO,IAAI,CAACN,MAAM,GAAG,CAAC,GAAI,IAAGI,IAAK,GAAE,GAAGA,IAAI;EAC7C;AACF;AAAC"}
+{"version":3,"file":"ActionCollection.js","names":["ActionCollection","BaseCollection","constructor","actions","actionsContributions","Array","isArray","collection","actionModels","actionData","actionContribution","name","push","ActionModel","getActionByKey","key","newCollection","action","first","getActionsByType","type","getActionsByLayoutHint","hints","layouthint","has","hasActionsByLayoutHint","length","routePath","enabledRoutes","isDisabled","path","selfhref","join"],"sources":["../../../src/models/actions/ActionCollection.js"],"sourcesContent":["// @flow\nimport BaseCollection from \"../base/BaseCollection\";\nimport ActionModel from \"./ActionModel\";\n\n/**\n * Collection of actions\n */\nexport default class ActionCollection extends BaseCollection<ActionModel> {\n  constructor(actions?: Object, actionsContributions?: Object) {\n    super();\n\n    // no actions gives an empty collection\n    if (!Array.isArray(actions)) {\n      this.collection = [];\n    } else if (Array.isArray(actionsContributions)) {\n      const actionModels = [];\n      for (const actionData of actions) {\n        const actionContribution = actionsContributions.find(\n          (actionContribution) => actionContribution.name === actionData.name\n        );\n\n        if (actionContribution) {\n          actionModels.push(new ActionModel(actionData, actionContribution));\n        }\n      }\n\n      this.collection = actionModels;\n    }\n  }\n\n  /**\n   * Retrieve action by key\n   */\n  getActionByKey(key: string): ActionModel | null {\n    const newCollection = new ActionCollection();\n\n    newCollection.collection = this.filter((action) => action.key === key);\n\n    return newCollection.first;\n  }\n\n  /**\n   * Retrieve actions by type\n   */\n  getActionsByType(type: string | Array<string>): ActionCollection {\n    const newCollection = new ActionCollection();\n\n    newCollection.collection = this.filter((action) =>\n      Array.isArray(type) ? type.includes(action.type) : action.type === type\n    );\n\n    return newCollection;\n  }\n\n  /**\n   * Retrieve actions including a layout hint\n   */\n  getActionsByLayoutHint(...hints: Array<string>): ActionCollection {\n    const newCollection = new ActionCollection();\n\n    newCollection.collection = this.filter((action) =>\n      action.layouthint.has(...hints)\n    );\n\n    return newCollection;\n  }\n\n  /**\n   * Indicates if an action with layout hint exists\n   */\n  hasActionsByLayoutHint(...hints: Array<string>): boolean {\n    return this.getActionsByLayoutHint(...hints).length > 0;\n  }\n\n  /**\n   * Use as path regex for react router routes\n   */\n  get routePath(): string {\n    const enabledRoutes = this.collection.filter(\n      (action) => !action.isDisabled\n    );\n\n    if (enabledRoutes.length === 0) {\n      return \"__NON_EXISTING_ROUTE__\";\n    }\n\n    const path = enabledRoutes.map((action) => action.selfhref.path).join(\"|\");\n\n    return this.length > 1 ? `(${path})` : path;\n  }\n}\n"],"mappings":";;;;;;;;;;;AACA;AACA;AAEA;AACA;AACA;AACe,MAAMA,gBAAgB,SAASC,uBAAc,CAAc;EACxEC,WAAW,CAACC,OAAgB,EAAEC,oBAA6B,EAAE;IAC3D,KAAK,EAAE;;IAEP;IACA,IAAI,CAACC,KAAK,CAACC,OAAO,CAACH,OAAO,CAAC,EAAE;MAC3B,IAAI,CAACI,UAAU,GAAG,EAAE;IACtB,CAAC,MAAM,IAAIF,KAAK,CAACC,OAAO,CAACF,oBAAoB,CAAC,EAAE;MAC9C,MAAMI,YAAY,GAAG,EAAE;MACvB,KAAK,MAAMC,UAAU,IAAIN,OAAO,EAAE;QAChC,MAAMO,kBAAkB,GAAG,mBAAAN,oBAAoB,OAApBA,oBAAoB,EAC5CM,kBAAkB,IAAKA,kBAAkB,CAACC,IAAI,KAAKF,UAAU,CAACE,IAAI,CACpE;QAED,IAAID,kBAAkB,EAAE;UACtBF,YAAY,CAACI,IAAI,CAAC,IAAIC,oBAAW,CAACJ,UAAU,EAAEC,kBAAkB,CAAC,CAAC;QACpE;MACF;MAEA,IAAI,CAACH,UAAU,GAAGC,YAAY;IAChC;EACF;;EAEA;AACF;AACA;EACEM,cAAc,CAACC,GAAW,EAAsB;IAAA;IAC9C,MAAMC,aAAa,GAAG,IAAIhB,gBAAgB,EAAE;IAE5CgB,aAAa,CAACT,UAAU,GAAG,oCAAI,iBAASU,MAAM,IAAKA,MAAM,CAACF,GAAG,KAAKA,GAAG,CAAC;IAEtE,OAAOC,aAAa,CAACE,KAAK;EAC5B;;EAEA;AACF;AACA;EACEC,gBAAgB,CAACC,IAA4B,EAAoB;IAAA;IAC/D,MAAMJ,aAAa,GAAG,IAAIhB,gBAAgB,EAAE;IAE5CgB,aAAa,CAACT,UAAU,GAAG,qCAAI,kBAASU,MAAM,IAC5CZ,KAAK,CAACC,OAAO,CAACc,IAAI,CAAC,GAAG,uBAAAA,IAAI,OAAJA,IAAI,EAAUH,MAAM,CAACG,IAAI,CAAC,GAAGH,MAAM,CAACG,IAAI,KAAKA,IAAI,CACxE;IAED,OAAOJ,aAAa;EACtB;;EAEA;AACF;AACA;EACEK,sBAAsB,GAA4C;IAAA;IAAA,kCAAxCC,KAAK;MAALA,KAAK;IAAA;IAC7B,MAAMN,aAAa,GAAG,IAAIhB,gBAAgB,EAAE;IAE5CgB,aAAa,CAACT,UAAU,GAAG,qCAAI,kBAASU,MAAM,IAC5CA,MAAM,CAACM,UAAU,CAACC,GAAG,CAAC,GAAGF,KAAK,CAAC,CAChC;IAED,OAAON,aAAa;EACtB;;EAEA;AACF;AACA;EACES,sBAAsB,GAAmC;IACvD,OAAO,IAAI,CAACJ,sBAAsB,CAAC,YAAQ,CAAC,CAACK,MAAM,GAAG,CAAC;EACzD;;EAEA;AACF;AACA;EACE,IAAIC,SAAS,GAAW;IAAA;IACtB,MAAMC,aAAa,GAAG,qCAAI,CAACrB,UAAU,kBAClCU,MAAM,IAAK,CAACA,MAAM,CAACY,UAAU,CAC/B;IAED,IAAID,aAAa,CAACF,MAAM,KAAK,CAAC,EAAE;MAC9B,OAAO,wBAAwB;IACjC;IAEA,MAAMI,IAAI,GAAG,kBAAAF,aAAa,OAAbA,aAAa,EAAMX,MAAM,IAAKA,MAAM,CAACc,QAAQ,CAACD,IAAI,CAAC,CAACE,IAAI,CAAC,GAAG,CAAC;IAE1E,OAAO,IAAI,CAACN,MAAM,GAAG,CAAC,GAAI,IAAGI,IAAK,GAAE,GAAGA,IAAI;EAC7C;AACF;AAAC"}

package/lib/models/actions/__tests__/ActionCollection.spec.js.flow

@@ -1,6 +1,5 @@
 import ActionCollection from "../ActionCollection";
 import ActionModel from "../ActionModel";
-import { IllegalArgumentException } from "../../../exceptions";
 
 describe("actionCollection", () => {
   const collectionData = [
@@ -62,9 +61,8 @@ describe("actionCollection", () => {
   });
 
   it("should throw an error when action data is available but no contributions", () => {
-    expect(() => {
-      new ActionCollection(collectionData);
-    }).toThrow(IllegalArgumentException);
+    const coll = new ActionCollection(collectionData);
+    expect(coll).toHaveLength(0);
   });
 
   it("should be able to create an ActionCollection with standard modular ui json", () => {
@@ -83,4 +81,18 @@ describe("actionCollection", () => {
       ActionModel
     );
   });
+
+  it("should be able to create an ActionCollection with part of contributions available", () => {
+    const actionCollection = new ActionCollection(collectionData, [
+      {
+        name: "sample2",
+        label: "Example of an action by layouthint",
+        type: "generic",
+        layouthint: ["testaction"],
+      },
+    ]);
+
+    expect(actionCollection).toHaveLength(1);
+    expect(actionCollection.getActionsByType("form")).toHaveLength(0);
+  });
 });

package/lib/react-server/serverNoSSR.js

@@ -23,7 +23,8 @@ const serverNoSSR = _ref => {
     theme,
     render,
     template,
-    beforeRenderHooks
+    beforeRenderHooks,
+    preloadApplication = true
   } = _ref;
   const UUID = (0, _createUUID.default)();
   __webpack_nonce__ = UUID; // NOSONAR
@@ -38,7 +39,9 @@ const serverNoSSR = _ref => {
     (0, _createTheme.default)(storedTheme, theme);
   }
   (0, _serverUtil.setI18n)(store, locales, request);
-  (0, _serverUtil.setApplication)(store);
+  if (preloadApplication) {
+    (0, _serverUtil.setApplication)(store);
+  }
   (0, _serverUtil.handleErrors)(store);
   (0, _beforeRenderHooks.handleBeforeRenderHooks)(beforeRenderHooks, {
     store,

package/lib/react-server/serverNoSSR.js.flow

@@ -34,6 +34,7 @@ type serverProps = {
   render: Function,
   template?: (TemplateProps) => string,
   beforeRenderHooks?: Array<BeforeRenderHook>,
+  preloadApplication?: boolean,
 };
 
 /**
@@ -47,6 +48,7 @@ const serverNoSSR = ({
   render,
   template,
   beforeRenderHooks,
+  preloadApplication = true,
 }: serverProps): string => {
   const UUID = createUUID();
   __webpack_nonce__ = UUID; // NOSONAR
@@ -66,7 +68,9 @@ const serverNoSSR = ({
 
   setI18n(store, locales, request);
 
-  setApplication(store);
+  if (preloadApplication) {
+    setApplication(store);
+  }
 
   handleErrors(store);
 

package/lib/react-server/serverNoSSR.js.map

@@ -1 +1 @@
-{"version":3,"file":"serverNoSSR.js","names":["serverNoSSR","request","locales","customReducers","serverPreferences","theme","render","template","beforeRenderHooks","UUID","createUUID","__webpack_nonce__","requestHref","getFullRequestHref","store","createReduxStore","setServerPreferences","setConfigurationTheme","storedTheme","getState","preferences","createTheme","setI18n","setApplication","handleErrors","handleBeforeRenderHooks","renderSSRMinimal"],"sources":["../../src/react-server/serverNoSSR.js"],"sourcesContent":["// @flow\nimport \"./contextPath\";\n\nimport createUUID from \"../utils/helpers/createUUID\";\nimport { getFullRequestHref } from \"./requestInformation\";\n\nimport {\n  createReduxStore,\n  setI18n,\n  setApplication,\n  setServerPreferences,\n  setConfigurationTheme,\n  handleErrors,\n} from \"./serverUtil\";\n\nimport { handleBeforeRenderHooks } from \"../redux/store/beforeRenderHooks\";\n\nimport renderSSRMinimal from \"./renderSSRMinimal\";\n\nimport createTheme from \"../react-theme/createTheme\";\n\nimport type { TemplateProps } from \"./htmlpage\";\nimport type { BeforeRenderHook } from \"../redux/store/beforeRenderHooks\";\nimport type { PreferenceValue } from \"./serverUtil\";\nimport type { LocaleConfiguration } from \"../i18n/types\";\nimport type { Theme } from \"../react-theme/types\";\n\ntype serverProps = {\n  request: HttpServletRequestJava,\n  locales?: Array<LocaleConfiguration>,\n  customReducers?: Object,\n  theme?: Theme | Array<Theme>,\n  serverPreferences?: Array<string | PreferenceValue>,\n  render: Function,\n  template?: (TemplateProps) => string,\n  beforeRenderHooks?: Array<BeforeRenderHook>,\n};\n\n/**\n */\nconst serverNoSSR = ({\n  request,\n  locales,\n  customReducers,\n  serverPreferences = [],\n  theme,\n  render,\n  template,\n  beforeRenderHooks,\n}: serverProps): string => {\n  const UUID = createUUID();\n  __webpack_nonce__ = UUID; // NOSONAR\n\n  const requestHref = getFullRequestHref(request);\n\n  const store = createReduxStore(requestHref, customReducers);\n\n  setServerPreferences(store, serverPreferences);\n  setConfigurationTheme(store);\n\n  if (theme) {\n    const storedTheme = store.getState()?.preferences?.theme;\n    //$FlowFixMe[incompatible-call]\n    createTheme(storedTheme, theme);\n  }\n\n  setI18n(store, locales, request);\n\n  setApplication(store);\n\n  handleErrors(store);\n\n  handleBeforeRenderHooks(beforeRenderHooks, { store, request });\n\n  return renderSSRMinimal({ store, theme, UUID, render, template });\n};\n\nexport default serverNoSSR;\n"],"mappings":";;;;;;;AACA;AAEA;AACA;AAEA;AASA;AAEA;AAEA;AAmBA;AACA;AACA,MAAMA,WAAW,GAAG,QASO;EAAA,IATN;IACnBC,OAAO;IACPC,OAAO;IACPC,cAAc;IACdC,iBAAiB,GAAG,EAAE;IACtBC,KAAK;IACLC,MAAM;IACNC,QAAQ;IACRC;EACW,CAAC;EACZ,MAAMC,IAAI,GAAG,IAAAC,mBAAU,GAAE;EACzBC,iBAAiB,GAAGF,IAAI,CAAC,CAAC;;EAE1B,MAAMG,WAAW,GAAG,IAAAC,sCAAkB,EAACZ,OAAO,CAAC;EAE/C,MAAMa,KAAK,GAAG,IAAAC,4BAAgB,EAACH,WAAW,EAAET,cAAc,CAAC;EAE3D,IAAAa,gCAAoB,EAACF,KAAK,EAAEV,iBAAiB,CAAC;EAC9C,IAAAa,iCAAqB,EAACH,KAAK,CAAC;EAE5B,IAAIT,KAAK,EAAE;IACT,MAAMa,WAAW,GAAGJ,KAAK,CAACK,QAAQ,EAAE,EAAEC,WAAW,EAAEf,KAAK;IACxD;IACA,IAAAgB,oBAAW,EAACH,WAAW,EAAEb,KAAK,CAAC;EACjC;EAEA,IAAAiB,mBAAO,EAACR,KAAK,EAAEZ,OAAO,EAAED,OAAO,CAAC;EAEhC,IAAAsB,0BAAc,EAACT,KAAK,CAAC;EAErB,IAAAU,wBAAY,EAACV,KAAK,CAAC;EAEnB,IAAAW,0CAAuB,EAACjB,iBAAiB,EAAE;IAAEM,KAAK;IAAEb;EAAQ,CAAC,CAAC;EAE9D,OAAO,IAAAyB,yBAAgB,EAAC;IAAEZ,KAAK;IAAET,KAAK;IAAEI,IAAI;IAAEH,MAAM;IAAEC;EAAS,CAAC,CAAC;AACnE,CAAC;AAAC,eAEaP,WAAW;AAAA"}
+{"version":3,"file":"serverNoSSR.js","names":["serverNoSSR","request","locales","customReducers","serverPreferences","theme","render","template","beforeRenderHooks","preloadApplication","UUID","createUUID","__webpack_nonce__","requestHref","getFullRequestHref","store","createReduxStore","setServerPreferences","setConfigurationTheme","storedTheme","getState","preferences","createTheme","setI18n","setApplication","handleErrors","handleBeforeRenderHooks","renderSSRMinimal"],"sources":["../../src/react-server/serverNoSSR.js"],"sourcesContent":["// @flow\nimport \"./contextPath\";\n\nimport createUUID from \"../utils/helpers/createUUID\";\nimport { getFullRequestHref } from \"./requestInformation\";\n\nimport {\n  createReduxStore,\n  setI18n,\n  setApplication,\n  setServerPreferences,\n  setConfigurationTheme,\n  handleErrors,\n} from \"./serverUtil\";\n\nimport { handleBeforeRenderHooks } from \"../redux/store/beforeRenderHooks\";\n\nimport renderSSRMinimal from \"./renderSSRMinimal\";\n\nimport createTheme from \"../react-theme/createTheme\";\n\nimport type { TemplateProps } from \"./htmlpage\";\nimport type { BeforeRenderHook } from \"../redux/store/beforeRenderHooks\";\nimport type { PreferenceValue } from \"./serverUtil\";\nimport type { LocaleConfiguration } from \"../i18n/types\";\nimport type { Theme } from \"../react-theme/types\";\n\ntype serverProps = {\n  request: HttpServletRequestJava,\n  locales?: Array<LocaleConfiguration>,\n  customReducers?: Object,\n  theme?: Theme | Array<Theme>,\n  serverPreferences?: Array<string | PreferenceValue>,\n  render: Function,\n  template?: (TemplateProps) => string,\n  beforeRenderHooks?: Array<BeforeRenderHook>,\n  preloadApplication?: boolean,\n};\n\n/**\n */\nconst serverNoSSR = ({\n  request,\n  locales,\n  customReducers,\n  serverPreferences = [],\n  theme,\n  render,\n  template,\n  beforeRenderHooks,\n  preloadApplication = true,\n}: serverProps): string => {\n  const UUID = createUUID();\n  __webpack_nonce__ = UUID; // NOSONAR\n\n  const requestHref = getFullRequestHref(request);\n\n  const store = createReduxStore(requestHref, customReducers);\n\n  setServerPreferences(store, serverPreferences);\n  setConfigurationTheme(store);\n\n  if (theme) {\n    const storedTheme = store.getState()?.preferences?.theme;\n    //$FlowFixMe[incompatible-call]\n    createTheme(storedTheme, theme);\n  }\n\n  setI18n(store, locales, request);\n\n  if (preloadApplication) {\n    setApplication(store);\n  }\n\n  handleErrors(store);\n\n  handleBeforeRenderHooks(beforeRenderHooks, { store, request });\n\n  return renderSSRMinimal({ store, theme, UUID, render, template });\n};\n\nexport default serverNoSSR;\n"],"mappings":";;;;;;;AACA;AAEA;AACA;AAEA;AASA;AAEA;AAEA;AAoBA;AACA;AACA,MAAMA,WAAW,GAAG,QAUO;EAAA,IAVN;IACnBC,OAAO;IACPC,OAAO;IACPC,cAAc;IACdC,iBAAiB,GAAG,EAAE;IACtBC,KAAK;IACLC,MAAM;IACNC,QAAQ;IACRC,iBAAiB;IACjBC,kBAAkB,GAAG;EACV,CAAC;EACZ,MAAMC,IAAI,GAAG,IAAAC,mBAAU,GAAE;EACzBC,iBAAiB,GAAGF,IAAI,CAAC,CAAC;;EAE1B,MAAMG,WAAW,GAAG,IAAAC,sCAAkB,EAACb,OAAO,CAAC;EAE/C,MAAMc,KAAK,GAAG,IAAAC,4BAAgB,EAACH,WAAW,EAAEV,cAAc,CAAC;EAE3D,IAAAc,gCAAoB,EAACF,KAAK,EAAEX,iBAAiB,CAAC;EAC9C,IAAAc,iCAAqB,EAACH,KAAK,CAAC;EAE5B,IAAIV,KAAK,EAAE;IACT,MAAMc,WAAW,GAAGJ,KAAK,CAACK,QAAQ,EAAE,EAAEC,WAAW,EAAEhB,KAAK;IACxD;IACA,IAAAiB,oBAAW,EAACH,WAAW,EAAEd,KAAK,CAAC;EACjC;EAEA,IAAAkB,mBAAO,EAACR,KAAK,EAAEb,OAAO,EAAED,OAAO,CAAC;EAEhC,IAAIQ,kBAAkB,EAAE;IACtB,IAAAe,0BAAc,EAACT,KAAK,CAAC;EACvB;EAEA,IAAAU,wBAAY,EAACV,KAAK,CAAC;EAEnB,IAAAW,0CAAuB,EAAClB,iBAAiB,EAAE;IAAEO,KAAK;IAAEd;EAAQ,CAAC,CAAC;EAE9D,OAAO,IAAA0B,yBAAgB,EAAC;IAAEZ,KAAK;IAAEV,KAAK;IAAEK,IAAI;IAAEJ,MAAM;IAAEC;EAAS,CAAC,CAAC;AACnE,CAAC;AAAC,eAEaP,WAAW;AAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.27.3",
+  "version": "1.27.5",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",

package/src/models/actions/ActionCollection.js

@@ -1,7 +1,6 @@
 // @flow
 import BaseCollection from "../base/BaseCollection";
 import ActionModel from "./ActionModel";
-import { IllegalArgumentException } from "../../exceptions";
 
 /**
  * Collection of actions
@@ -11,28 +10,21 @@ export default class ActionCollection extends BaseCollection<ActionModel> {
     super();
 
     // no actions gives an empty collection
-    if (!actions) {
+    if (!Array.isArray(actions)) {
       this.collection = [];
-
-      // When actions are available but no contributions, then an error occured
-    } else if (!actionsContributions || !Array.isArray(actionsContributions)) {
-      throw new IllegalArgumentException(
-        "Data for ActionCollection found, but no contributions available"
-      );
-    } else {
-      this.collection = actions.map((action) => {
-        if (actionsContributions) {
-          const contributions = actionsContributions.find(
-            (actionContribution) => actionContribution.name === action.name
-          );
-
-          if (contributions) {
-            return new ActionModel(action, contributions);
-          }
+    } else if (Array.isArray(actionsContributions)) {
+      const actionModels = [];
+      for (const actionData of actions) {
+        const actionContribution = actionsContributions.find(
+          (actionContribution) => actionContribution.name === actionData.name
+        );
+
+        if (actionContribution) {
+          actionModels.push(new ActionModel(actionData, actionContribution));
         }
+      }
 
-        throw new Error(`Contributions not found for action ${action.name}`);
-      });
+      this.collection = actionModels;
     }
   }
 

package/src/models/actions/__tests__/ActionCollection.spec.js

@@ -1,6 +1,5 @@
 import ActionCollection from "../ActionCollection";
 import ActionModel from "../ActionModel";
-import { IllegalArgumentException } from "../../../exceptions";
 
 describe("actionCollection", () => {
   const collectionData = [
@@ -62,9 +61,8 @@ describe("actionCollection", () => {
   });
 
   it("should throw an error when action data is available but no contributions", () => {
-    expect(() => {
-      new ActionCollection(collectionData);
-    }).toThrow(IllegalArgumentException);
+    const coll = new ActionCollection(collectionData);
+    expect(coll).toHaveLength(0);
   });
 
   it("should be able to create an ActionCollection with standard modular ui json", () => {
@@ -83,4 +81,18 @@ describe("actionCollection", () => {
       ActionModel
     );
   });
+
+  it("should be able to create an ActionCollection with part of contributions available", () => {
+    const actionCollection = new ActionCollection(collectionData, [
+      {
+        name: "sample2",
+        label: "Example of an action by layouthint",
+        type: "generic",
+        layouthint: ["testaction"],
+      },
+    ]);
+
+    expect(actionCollection).toHaveLength(1);
+    expect(actionCollection.getActionsByType("form")).toHaveLength(0);
+  });
 });

package/src/react-server/serverNoSSR.js

@@ -34,6 +34,7 @@ type serverProps = {
   render: Function,
   template?: (TemplateProps) => string,
   beforeRenderHooks?: Array<BeforeRenderHook>,
+  preloadApplication?: boolean,
 };
 
 /**
@@ -47,6 +48,7 @@ const serverNoSSR = ({
   render,
   template,
   beforeRenderHooks,
+  preloadApplication = true,
 }: serverProps): string => {
   const UUID = createUUID();
   __webpack_nonce__ = UUID; // NOSONAR
@@ -66,7 +68,9 @@ const serverNoSSR = ({
 
   setI18n(store, locales, request);
 
-  setApplication(store);
+  if (preloadApplication) {
+    setApplication(store);
+  }
 
   handleErrors(store);