@beinformed/ui 1.25.6 → 1.26.0

package/lib/redux/_modularui/ModularUIReducer.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ModularUIReducer = void 0;
+var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/assign"));
 var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
-var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/assign"));
 var _exceptions = require("../../exceptions");
 var _Constants = require("../../constants/Constants");
 var _models = require("../../models");
@@ -55,6 +55,24 @@ const setModel = (state, _ref2) => {
   throw new _exceptions.IllegalArgumentException("No model for setModel");
 };
 
+/**
+ */
+const initModularUI = (state, models) => {
+  const newState = (0, _assign.default)({}, state);
+  models.forEach(_ref3 => {
+    let {
+      key,
+      model
+    } = _ref3;
+    newState[key] = {
+      status: _Constants.MODULARUI_STATUS.FINISHED,
+      lastModification: Date.now(),
+      model
+    };
+  });
+  return newState;
+};
+
 /**
  */
 const getModelKey = (state, model) => {
@@ -112,6 +130,8 @@ const ModularUIReducer = function () {
     return state;
   }
   switch (action.type) {
+    case "MODULARUI/INIT":
+      return initModularUI(state, action.payload);
     case "MODULARUI/RESET":
       return resetModularUI(state);
     case "MODULARUI/STATUS":

package/lib/redux/_modularui/ModularUIReducer.js.flow

@@ -53,6 +53,25 @@ const setModel = (
   throw new IllegalArgumentException("No model for setModel");
 };
 
+/**
+ */
+const initModularUI = (
+  state: ModularUIState,
+  models: Array<{ key: string, model: ModularUIModel }>
+) => {
+  const newState = Object.assign({}, state);
+
+  models.forEach(({ key, model }) => {
+    newState[key] = {
+      status: MODULARUI_STATUS.FINISHED,
+      lastModification: Date.now(),
+      model,
+    };
+  });
+
+  return newState;
+};
+
 /**
  */
 const getModelKey = (state: ModularUIState, model: ModularUIModel) =>
@@ -112,6 +131,9 @@ export const ModularUIReducer: Reducer<ModularUIState, ReduxAction> = (
   }
 
   switch (action.type) {
+    case "MODULARUI/INIT":
+      return initModularUI(state, action.payload);
+
     case "MODULARUI/RESET":
       return resetModularUI(state);
 

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

@@ -1 +1 @@
-{"version":3,"file":"ModularUIReducer.js","names":["updateStatus","state","key","status","MODULARUI_STATUS","LOADING","lastModification","Date","now","setModel","model","IllegalArgumentException","getModelKey","connectKey","updateModel","modelKey","Error","removeKey","newState","resetModularUI","ApplicationModel","initialState","ModularUIReducer","action","type","payload"],"sources":["../../../src/redux/_modularui/ModularUIReducer.js"],"sourcesContent":["// @flow\nimport { IllegalArgumentException } from \"../../exceptions\";\nimport { MODULARUI_STATUS } from \"../../constants/Constants\";\nimport { ApplicationModel } from \"../../models\";\n\nimport type { Reducer } from \"redux\";\nimport type { ReduxAction } from \"../types\";\nimport type { ModularUIState } from \"./types\";\nimport type { ModularUIModel } from \"../../models\";\n\n/**\n */\nconst updateStatus = (\n  state: ModularUIState,\n  { key, status }: { key: string, status: $Keys<typeof MODULARUI_STATUS> }\n) => {\n  // model should always be available when status is not loading\n  if (status !== MODULARUI_STATUS.LOADING && !state[key]) {\n    return state;\n  }\n\n  return {\n    ...state,\n    [key]: {\n      ...state[key],\n      status,\n      lastModification: Date.now(),\n    },\n  };\n};\n\n/**\n */\nconst setModel = (\n  state: ModularUIState,\n  { key, model }: { key: string, model: ?ModularUIModel }\n) => {\n  if (!state[key]) {\n    return state;\n  }\n\n  if (model) {\n    return {\n      ...state,\n      [key]: {\n        ...state[key],\n        model,\n        lastModification: Date.now(),\n      },\n    };\n  }\n\n  throw new IllegalArgumentException(\"No model for setModel\");\n};\n\n/**\n */\nconst getModelKey = (state: ModularUIState, model: ModularUIModel) =>\n  Object.keys(state).find((key) => {\n    const connectKey = state[key]?.model?.connectKey ?? \"\";\n    return connectKey === model.connectKey;\n  });\n\n/**\n */\nconst updateModel = (state: ModularUIState, model: ModularUIModel) => {\n  const modelKey = getModelKey(state, model);\n\n  if (modelKey) {\n    return setModel(state, { key: modelKey, model });\n  }\n\n  throw new Error(\n    `ModularUIReducer: Cannot update model with key ${model.connectKey}`\n  );\n};\n\n/**\n */\nconst removeKey = (modelKey: string, state: ModularUIState): ModularUIState => {\n  const newState = Object.assign({}, state);\n  delete newState[modelKey];\n  return newState;\n};\n\n/**\n * Remove all but application models\n */\nconst resetModularUI = (state: ModularUIState) => {\n  const newState: ModularUIState = {};\n\n  for (const key in state) {\n    if (state[key].model instanceof ApplicationModel) {\n      newState[key] = { ...state[key] };\n    }\n  }\n\n  return newState;\n};\n\nconst initialState: ModularUIState = {};\n\n/**\n * Modular UI Reducer\n */\nexport const ModularUIReducer: Reducer<ModularUIState, ReduxAction> = (\n  state = initialState,\n  action\n) => {\n  if (!action) {\n    return state;\n  }\n\n  switch (action.type) {\n    case \"MODULARUI/RESET\":\n      return resetModularUI(state);\n\n    case \"MODULARUI/STATUS\":\n      return updateStatus(state, action.payload);\n\n    case \"MODULARUI/SET\":\n      return setModel(state, action.payload);\n\n    case \"MODULARUI/UPDATE\":\n      return updateModel(state, action.payload);\n\n    case \"MODULARUI/REMOVE_KEY\":\n      return removeKey(action.payload, state);\n\n    default:\n      return state;\n  }\n};\n"],"mappings":"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"}
+{"version":3,"file":"ModularUIReducer.js","names":["updateStatus","state","key","status","MODULARUI_STATUS","LOADING","lastModification","Date","now","setModel","model","IllegalArgumentException","initModularUI","models","newState","forEach","FINISHED","getModelKey","connectKey","updateModel","modelKey","Error","removeKey","resetModularUI","ApplicationModel","initialState","ModularUIReducer","action","type","payload"],"sources":["../../../src/redux/_modularui/ModularUIReducer.js"],"sourcesContent":["// @flow\nimport { IllegalArgumentException } from \"../../exceptions\";\nimport { MODULARUI_STATUS } from \"../../constants/Constants\";\nimport { ApplicationModel } from \"../../models\";\n\nimport type { Reducer } from \"redux\";\nimport type { ReduxAction } from \"../types\";\nimport type { ModularUIState } from \"./types\";\nimport type { ModularUIModel } from \"../../models\";\n\n/**\n */\nconst updateStatus = (\n  state: ModularUIState,\n  { key, status }: { key: string, status: $Keys<typeof MODULARUI_STATUS> }\n) => {\n  // model should always be available when status is not loading\n  if (status !== MODULARUI_STATUS.LOADING && !state[key]) {\n    return state;\n  }\n\n  return {\n    ...state,\n    [key]: {\n      ...state[key],\n      status,\n      lastModification: Date.now(),\n    },\n  };\n};\n\n/**\n */\nconst setModel = (\n  state: ModularUIState,\n  { key, model }: { key: string, model: ?ModularUIModel }\n) => {\n  if (!state[key]) {\n    return state;\n  }\n\n  if (model) {\n    return {\n      ...state,\n      [key]: {\n        ...state[key],\n        model,\n        lastModification: Date.now(),\n      },\n    };\n  }\n\n  throw new IllegalArgumentException(\"No model for setModel\");\n};\n\n/**\n */\nconst initModularUI = (\n  state: ModularUIState,\n  models: Array<{ key: string, model: ModularUIModel }>\n) => {\n  const newState = Object.assign({}, state);\n\n  models.forEach(({ key, model }) => {\n    newState[key] = {\n      status: MODULARUI_STATUS.FINISHED,\n      lastModification: Date.now(),\n      model,\n    };\n  });\n\n  return newState;\n};\n\n/**\n */\nconst getModelKey = (state: ModularUIState, model: ModularUIModel) =>\n  Object.keys(state).find((key) => {\n    const connectKey = state[key]?.model?.connectKey ?? \"\";\n    return connectKey === model.connectKey;\n  });\n\n/**\n */\nconst updateModel = (state: ModularUIState, model: ModularUIModel) => {\n  const modelKey = getModelKey(state, model);\n\n  if (modelKey) {\n    return setModel(state, { key: modelKey, model });\n  }\n\n  throw new Error(\n    `ModularUIReducer: Cannot update model with key ${model.connectKey}`\n  );\n};\n\n/**\n */\nconst removeKey = (modelKey: string, state: ModularUIState): ModularUIState => {\n  const newState = Object.assign({}, state);\n  delete newState[modelKey];\n  return newState;\n};\n\n/**\n * Remove all but application models\n */\nconst resetModularUI = (state: ModularUIState) => {\n  const newState: ModularUIState = {};\n\n  for (const key in state) {\n    if (state[key].model instanceof ApplicationModel) {\n      newState[key] = { ...state[key] };\n    }\n  }\n\n  return newState;\n};\n\nconst initialState: ModularUIState = {};\n\n/**\n * Modular UI Reducer\n */\nexport const ModularUIReducer: Reducer<ModularUIState, ReduxAction> = (\n  state = initialState,\n  action\n) => {\n  if (!action) {\n    return state;\n  }\n\n  switch (action.type) {\n    case \"MODULARUI/INIT\":\n      return initModularUI(state, action.payload);\n\n    case \"MODULARUI/RESET\":\n      return resetModularUI(state);\n\n    case \"MODULARUI/STATUS\":\n      return updateStatus(state, action.payload);\n\n    case \"MODULARUI/SET\":\n      return setModel(state, action.payload);\n\n    case \"MODULARUI/UPDATE\":\n      return updateModel(state, action.payload);\n\n    case \"MODULARUI/REMOVE_KEY\":\n      return removeKey(action.payload, state);\n\n    default:\n      return state;\n  }\n};\n"],"mappings":"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"}

package/lib/redux/_modularui/types.js.flow

@@ -36,6 +36,14 @@ export type SetModelAction = {
   },
 };
 
+export type InitModelAction = {
+  type: "MODULARUI/INIT",
+  payload: Array<{
+    key: string,
+    model: ModularUIModel,
+  }>,
+};
+
 export type UpdateModelAction = {
   type: "MODULARUI/UPDATE",
   payload: ModularUIModel,

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../src/redux/_modularui/types.js"],"sourcesContent":["// @flow\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { FetchException } from \"../../exceptions\";\nimport type { NoAction } from \"../types\";\nimport typeof {\n  HTTP_METHODS,\n  MODULARUI_STATUS,\n} from \"../../constants/Constants\";\nimport type { ComponentType } from \"react\";\nimport type { TargetModel } from \"../../modularui/types\";\nimport type { RequestModularUIOptions } from \"../../utils/fetch/types\";\n\nexport type ModularUIOptions = {\n  propName?: string,\n  removeOnUnmount?: boolean,\n  ...RequestModularUIOptions,\n};\n\nexport type ModelEntry = {\n  +status: string,\n  +model: ModularUIModel,\n  +lastModification: number,\n};\n\nexport type ModularUIState = {\n  [string]: ModelEntry,\n  ...\n};\n\nexport type SetModelAction = {\n  type: \"MODULARUI/SET\",\n  payload: {\n    key: string,\n    model: ?ModularUIModel,\n  },\n};\n\nexport type UpdateModelAction = {\n  type: \"MODULARUI/UPDATE\",\n  payload: ModularUIModel,\n};\n\nexport type SuccessAction = (\n  model: ModularUIModel\n) => UpdateModelAction | SetModelAction;\n\nexport type ErrorAction = (\n  error: FetchException\n) => UpdateStatusAction | RemoveModelByKeyAction | NoAction;\n\nexport type ModularUIAction = {\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    href: Href,\n    method?: $Keys<HTTP_METHODS>,\n    data?: string | { [key: string]: string },\n    locale: string,\n    childmodels?: boolean,\n    targetModel?: TargetModel,\n    forceTargetModel?: boolean,\n    successAction: (\n      model: ModularUIModel\n    ) => UpdateModelAction | SetModelAction,\n    errorAction?: ErrorAction,\n  },\n};\n\nexport type RemoveModelByKeyAction = {\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: string,\n};\n\nexport type ResetModularUIAction = {\n  type: \"MODULARUI/RESET\",\n};\n\nexport type UpdateStatusAction = {\n  type: \"MODULARUI/STATUS\",\n  payload: {\n    key: string,\n    status: $Keys<MODULARUI_STATUS>,\n  },\n};\n\nexport type ModularUIConnector = (\n  Component: ComponentType<any>\n) => ComponentType<any>;\n"],"mappings":""}
+{"version":3,"file":"types.js","names":[],"sources":["../../../src/redux/_modularui/types.js"],"sourcesContent":["// @flow\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { FetchException } from \"../../exceptions\";\nimport type { NoAction } from \"../types\";\nimport typeof {\n  HTTP_METHODS,\n  MODULARUI_STATUS,\n} from \"../../constants/Constants\";\nimport type { ComponentType } from \"react\";\nimport type { TargetModel } from \"../../modularui/types\";\nimport type { RequestModularUIOptions } from \"../../utils/fetch/types\";\n\nexport type ModularUIOptions = {\n  propName?: string,\n  removeOnUnmount?: boolean,\n  ...RequestModularUIOptions,\n};\n\nexport type ModelEntry = {\n  +status: string,\n  +model: ModularUIModel,\n  +lastModification: number,\n};\n\nexport type ModularUIState = {\n  [string]: ModelEntry,\n  ...\n};\n\nexport type SetModelAction = {\n  type: \"MODULARUI/SET\",\n  payload: {\n    key: string,\n    model: ?ModularUIModel,\n  },\n};\n\nexport type InitModelAction = {\n  type: \"MODULARUI/INIT\",\n  payload: Array<{\n    key: string,\n    model: ModularUIModel,\n  }>,\n};\n\nexport type UpdateModelAction = {\n  type: \"MODULARUI/UPDATE\",\n  payload: ModularUIModel,\n};\n\nexport type SuccessAction = (\n  model: ModularUIModel\n) => UpdateModelAction | SetModelAction;\n\nexport type ErrorAction = (\n  error: FetchException\n) => UpdateStatusAction | RemoveModelByKeyAction | NoAction;\n\nexport type ModularUIAction = {\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    href: Href,\n    method?: $Keys<HTTP_METHODS>,\n    data?: string | { [key: string]: string },\n    locale: string,\n    childmodels?: boolean,\n    targetModel?: TargetModel,\n    forceTargetModel?: boolean,\n    successAction: (\n      model: ModularUIModel\n    ) => UpdateModelAction | SetModelAction,\n    errorAction?: ErrorAction,\n  },\n};\n\nexport type RemoveModelByKeyAction = {\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: string,\n};\n\nexport type ResetModularUIAction = {\n  type: \"MODULARUI/RESET\",\n};\n\nexport type UpdateStatusAction = {\n  type: \"MODULARUI/STATUS\",\n  payload: {\n    key: string,\n    status: $Keys<MODULARUI_STATUS>,\n  },\n};\n\nexport type ModularUIConnector = (\n  Component: ComponentType<any>\n) => ComponentType<any>;\n"],"mappings":""}

package/lib/redux/store/configureStore.js

@@ -25,7 +25,7 @@ const configureStore = (history, customReducers, initialState) => {
   const middleware = (0, _redux.applyMiddleware)(_ModularUIMiddleware.modularUIMiddleware, (0, _RouterMiddleware.routerMiddleware)(history), _reduxThunk.default);
   const enhancers = composeEnhancers(middleware);
   const store = (0, _redux.createStore)(combinedReducers, initialState, enhancers);
-  if (!initialState) {
+  if (!initialState?.router) {
     store.dispatch((0, _RouterActions.locationChange)(history.location, "PUSH"));
   }
   return {

package/lib/redux/store/configureStore.js.flow

@@ -49,7 +49,7 @@ const configureStore = (
     enhancers
   );
 
-  if (!initialState) {
+  if (!initialState?.router) {
     store.dispatch(locationChange(history.location, "PUSH"));
   }
   return { history, store };

package/lib/redux/store/configureStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"configureStore.js","names":["configureStore","history","customReducers","initialState","composeEnhancers","compose","process","env","NODE_ENV","window","__REDUX_DEVTOOLS_EXTENSION_COMPOSE__","combinedReducers","combineReducers","createReducer","middleware","applyMiddleware","modularUIMiddleware","routerMiddleware","thunk","enhancers","store","createReduxStore","dispatch","locationChange","location"],"sources":["../../../src/redux/store/configureStore.js"],"sourcesContent":["// @flow\nimport {\n  applyMiddleware,\n  compose,\n  combineReducers,\n  createStore as createReduxStore,\n} from \"redux\";\nimport thunk from \"redux-thunk\";\n\nimport { routerMiddleware } from \"../_router/RouterMiddleware\";\nimport { modularUIMiddleware } from \"../_modularui/ModularUIMiddleware\";\n\nimport { createReducer } from \"../reducers/createReducer\";\nimport { locationChange } from \"../_router/RouterActions\";\n\nimport type { RouterHistory } from \"react-router\";\nimport type { ReduxAction, ReduxState, ReduxStore } from \"../types\";\nimport type { Reducer } from \"redux\";\n\n/**\n */\nconst configureStore = (\n  history: RouterHistory,\n  customReducers?: Object,\n  initialState?: $Shape<ReduxState>\n): { history: RouterHistory, store: ReduxStore } => {\n  let composeEnhancers = compose;\n\n  if (process.env.NODE_ENV !== \"production\" && typeof window !== \"undefined\") {\n    composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;\n  }\n\n  const combinedReducers: Reducer<ReduxState, ReduxAction> = combineReducers({\n    ...customReducers,\n    ...createReducer(),\n  });\n\n  const middleware = applyMiddleware(\n    modularUIMiddleware,\n    routerMiddleware(history),\n    thunk\n  );\n\n  const enhancers = composeEnhancers(middleware);\n\n  const store: ReduxStore = createReduxStore(\n    combinedReducers,\n    initialState,\n    enhancers\n  );\n\n  if (!initialState) {\n    store.dispatch(locationChange(history.location, \"PUSH\"));\n  }\n  return { history, store };\n};\n\nexport default configureStore;\n"],"mappings":";;;;;;;AACA;AAMA;AAEA;AACA;AAEA;AACA;AAMA;AACA;AACA,MAAMA,cAAc,GAAG,CACrBC,OAAsB,EACtBC,cAAuB,EACvBC,YAAiC,KACiB;EAClD,IAAIC,gBAAgB,GAAGC,cAAO;EAE9B,IAAIC,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,YAAY,IAAI,OAAOC,MAAM,KAAK,WAAW,EAAE;IAC1EL,gBAAgB,GAAGK,MAAM,CAACC,oCAAoC,IAAIL,cAAO;EAC3E;EAEA,MAAMM,gBAAkD,GAAG,IAAAC,sBAAe,EAAC;IACzE,GAAGV,cAAc;IACjB,GAAG,IAAAW,4BAAa;EAClB,CAAC,CAAC;EAEF,MAAMC,UAAU,GAAG,IAAAC,sBAAe,EAChCC,wCAAmB,EACnB,IAAAC,kCAAgB,EAAChB,OAAO,CAAC,EACzBiB,mBAAK,CACN;EAED,MAAMC,SAAS,GAAGf,gBAAgB,CAACU,UAAU,CAAC;EAE9C,MAAMM,KAAiB,GAAG,IAAAC,kBAAgB,EACxCV,gBAAgB,EAChBR,YAAY,EACZgB,SAAS,CACV;EAED,IAAI,CAAChB,YAAY,EAAE;IACjBiB,KAAK,CAACE,QAAQ,CAAC,IAAAC,6BAAc,EAACtB,OAAO,CAACuB,QAAQ,EAAE,MAAM,CAAC,CAAC;EAC1D;EACA,OAAO;IAAEvB,OAAO;IAAEmB;EAAM,CAAC;AAC3B,CAAC;AAAC,eAEapB,cAAc;AAAA"}
+{"version":3,"file":"configureStore.js","names":["configureStore","history","customReducers","initialState","composeEnhancers","compose","process","env","NODE_ENV","window","__REDUX_DEVTOOLS_EXTENSION_COMPOSE__","combinedReducers","combineReducers","createReducer","middleware","applyMiddleware","modularUIMiddleware","routerMiddleware","thunk","enhancers","store","createReduxStore","router","dispatch","locationChange","location"],"sources":["../../../src/redux/store/configureStore.js"],"sourcesContent":["// @flow\nimport {\n  applyMiddleware,\n  compose,\n  combineReducers,\n  createStore as createReduxStore,\n} from \"redux\";\nimport thunk from \"redux-thunk\";\n\nimport { routerMiddleware } from \"../_router/RouterMiddleware\";\nimport { modularUIMiddleware } from \"../_modularui/ModularUIMiddleware\";\n\nimport { createReducer } from \"../reducers/createReducer\";\nimport { locationChange } from \"../_router/RouterActions\";\n\nimport type { RouterHistory } from \"react-router\";\nimport type { ReduxAction, ReduxState, ReduxStore } from \"../types\";\nimport type { Reducer } from \"redux\";\n\n/**\n */\nconst configureStore = (\n  history: RouterHistory,\n  customReducers?: Object,\n  initialState?: $Shape<ReduxState>\n): { history: RouterHistory, store: ReduxStore } => {\n  let composeEnhancers = compose;\n\n  if (process.env.NODE_ENV !== \"production\" && typeof window !== \"undefined\") {\n    composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;\n  }\n\n  const combinedReducers: Reducer<ReduxState, ReduxAction> = combineReducers({\n    ...customReducers,\n    ...createReducer(),\n  });\n\n  const middleware = applyMiddleware(\n    modularUIMiddleware,\n    routerMiddleware(history),\n    thunk\n  );\n\n  const enhancers = composeEnhancers(middleware);\n\n  const store: ReduxStore = createReduxStore(\n    combinedReducers,\n    initialState,\n    enhancers\n  );\n\n  if (!initialState?.router) {\n    store.dispatch(locationChange(history.location, \"PUSH\"));\n  }\n  return { history, store };\n};\n\nexport default configureStore;\n"],"mappings":";;;;;;;AACA;AAMA;AAEA;AACA;AAEA;AACA;AAMA;AACA;AACA,MAAMA,cAAc,GAAG,CACrBC,OAAsB,EACtBC,cAAuB,EACvBC,YAAiC,KACiB;EAClD,IAAIC,gBAAgB,GAAGC,cAAO;EAE9B,IAAIC,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,YAAY,IAAI,OAAOC,MAAM,KAAK,WAAW,EAAE;IAC1EL,gBAAgB,GAAGK,MAAM,CAACC,oCAAoC,IAAIL,cAAO;EAC3E;EAEA,MAAMM,gBAAkD,GAAG,IAAAC,sBAAe,EAAC;IACzE,GAAGV,cAAc;IACjB,GAAG,IAAAW,4BAAa;EAClB,CAAC,CAAC;EAEF,MAAMC,UAAU,GAAG,IAAAC,sBAAe,EAChCC,wCAAmB,EACnB,IAAAC,kCAAgB,EAAChB,OAAO,CAAC,EACzBiB,mBAAK,CACN;EAED,MAAMC,SAAS,GAAGf,gBAAgB,CAACU,UAAU,CAAC;EAE9C,MAAMM,KAAiB,GAAG,IAAAC,kBAAgB,EACxCV,gBAAgB,EAChBR,YAAY,EACZgB,SAAS,CACV;EAED,IAAI,CAAChB,YAAY,EAAEmB,MAAM,EAAE;IACzBF,KAAK,CAACG,QAAQ,CAAC,IAAAC,6BAAc,EAACvB,OAAO,CAACwB,QAAQ,EAAE,MAAM,CAAC,CAAC;EAC1D;EACA,OAAO;IAAExB,OAAO;IAAEmB;EAAM,CAAC;AAC3B,CAAC;AAAC,eAEapB,cAAc;AAAA"}

package/lib/redux/types.js.flow

@@ -23,6 +23,7 @@ import type {
   UpdateModelAction,
   RemoveModelByKeyAction,
   ResetModularUIAction,
+  InitModelAction,
 } from "./_modularui/types";
 import type {
   RouterState,
@@ -135,6 +136,7 @@ export type UpdateAutosaveAction = {
 export type ReduxAction =
   | UpdateStatusAction
   | SetModelAction
+  | InitModelAction
   | UpdateModelAction
   | RemoveModelByKeyAction
   | ResetModularUIAction

package/lib/redux/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../src/redux/types.js"],"sourcesContent":["// @flow\nimport type { Store, DispatchAPI } from \"redux\";\n\nimport type ErrorResponse from \"../models/error/ErrorResponse\";\n\nimport type FormModel from \"../models/form/FormModel\";\nimport typeof {\n  NOTIFICATION_TYPES,\n  AUTOSAVE_STATUS,\n} from \"../constants/Constants\";\n\nimport type { MessageObject } from \"../i18n/types\";\nimport type {\n  I18nState,\n  UpdateLocaleAction,\n  SetLocalesAction,\n} from \"./_i18n/types\";\nimport type {\n  ModularUIState,\n  ModularUIAction,\n  UpdateStatusAction,\n  SetModelAction,\n  UpdateModelAction,\n  RemoveModelByKeyAction,\n  ResetModularUIAction,\n} from \"./_modularui/types\";\nimport type {\n  RouterState,\n  LocationChangeAction,\n  PushAction,\n  ReplaceAction,\n  GoAction,\n  GoBackAction,\n  GoForwardAction,\n} from \"./_router/types\";\n\nexport type PreferenceValue =\n  | null\n  | string\n  | boolean\n  | { [key: string]: any }\n  | Array<PreferenceValue>;\n\nexport type UpdateFormOptions = {\n  autosubmit: boolean,\n  autosave: boolean,\n  forceUpdate?: boolean,\n  /** Default true: Activate/deactivate the form object validate by an update */\n  validate?: boolean,\n};\n\nexport type NoAction = {\n  type: \"NO_ACTION\",\n};\n\nexport type SaveErrorAction = {\n  type: \"SAVE_ERROR\",\n  payload: ErrorResponse,\n};\n\nexport type ShowModalAction = {\n  type: \"SHOW_MODAL\",\n  payload: string,\n};\n\nexport type CloseModalAction = {\n  type: \"CLOSE_MODAL\",\n  payload: string,\n};\n\nexport type DismissNotificationAction = {\n  type: \"DISMISS_NOTIFICATION\",\n};\nexport type ShowNotificationAction = {\n  type: \"SHOW_NOTIFICATION\",\n  payload: {\n    type: $Keys<NOTIFICATION_TYPES>,\n    message: MessageObject,\n    error: ?ErrorResponse,\n  },\n};\n\nexport type SetPreferenceAction = {\n  type: \"SET_PREFERENCE\",\n  payload: { [name: string]: PreferenceValue },\n};\nexport type SetPreferencesAction = {\n  type: \"SET_PREFERENCES\",\n  payload: { [name: string]: PreferenceValue },\n};\n\nexport type StartProgressAction = {\n  type: \"START_PROGRESS\",\n};\nexport type FinishProgressAction = {\n  type: \"FINISH_PROGRESS\",\n};\nexport type ResetProgressAction = {\n  type: \"RESET_PROGRESS\",\n};\nexport type UpdateProgressAction = {\n  type: \"UPDATE_PROGRESS\",\n  payload: { percentComplete: number },\n};\n\nexport type SendAuthenticationErrorAction = {\n  type: \"AUTHENTICATION_ERROR\",\n  payload: string,\n};\n\nexport type ResetAuthErrorsAction = {\n  type: \"AUTHENTICATION_RESET_ERRORS\",\n};\n\nexport type LoginSuccessAction = {\n  type: \"AUTHENTICATION_SUCCESS\",\n};\n\nexport type ChangePasswordAction = {\n  type: \"CHANGE_PASSWORD\",\n};\n\nexport type LogoutSuccessAction = {\n  type: \"AUTHENTICATION_LOGOUT\",\n};\n\nexport type UpdateAutosaveAction = {\n  type: \"UPDATE_AUTOSAVE_STATUS\",\n  payload: {\n    status: $Keys<AUTOSAVE_STATUS>,\n    model: FormModel,\n  },\n};\n\nexport type ReduxAction =\n  | UpdateStatusAction\n  | SetModelAction\n  | UpdateModelAction\n  | RemoveModelByKeyAction\n  | ResetModularUIAction\n  | SaveErrorAction\n  | UpdateLocaleAction\n  | SetLocalesAction\n  | ShowModalAction\n  | CloseModalAction\n  | DismissNotificationAction\n  | ShowNotificationAction\n  | SetPreferenceAction\n  | SetPreferencesAction\n  | StartProgressAction\n  | FinishProgressAction\n  | ResetProgressAction\n  | UpdateProgressAction\n  | ResetAuthErrorsAction\n  | SendAuthenticationErrorAction\n  | LoginSuccessAction\n  | ChangePasswordAction\n  | LogoutSuccessAction\n  | UpdateAutosaveAction\n  | LocationChangeAction\n  | PushAction\n  | ReplaceAction\n  | GoAction\n  | GoBackAction\n  | GoForwardAction\n  | ModularUIAction\n  | NoAction;\n\n// Redux state\nexport type AuthState = {\n  +mustChangePassword: boolean,\n  +error: ?string,\n};\n\nexport type ErrorState = null | ErrorResponse;\n\nexport type ModalState = {\n  +key: string,\n  +visible: boolean,\n  +size?: string,\n};\n\nexport type ModalsState = {\n  +modals: Array<ModalState>,\n};\n\nexport type NotificationState = {\n  +render: boolean,\n  +messageType: string | null,\n  +message: MessageObject | null,\n  +error: ?ErrorResponse | null,\n};\n\nexport type PreferencesState = {\n  +[name: string]: PreferenceValue,\n};\n\nexport type ProgressIndicatorState = {\n  +count: number,\n  +timestamp: number,\n  +percentComplete: number,\n};\n\nexport type ReduxState = {\n  +router: RouterState,\n  +modularui: ModularUIState,\n  +i18n: I18nState,\n  +auth: AuthState,\n  +error: ErrorState,\n  +modals: ModalsState,\n  +notification: NotificationState,\n  +progressindicator: ProgressIndicatorState,\n  +preferences: PreferencesState,\n  ...\n};\n\nexport type GetState = () => ReduxState;\nexport type ThunkAction = (dispatch: Dispatch, getState: GetState) => any;\nexport type PromiseAction = Promise<PossibleAction>;\nexport type Dispatch = DispatchAPI<PossibleAction>;\nexport type ReduxStore = Store<ReduxState, ReduxAction, Dispatch>;\n\nexport type PossibleAction = ReduxAction | ThunkAction | PromiseAction;\n\nexport type CustomReducers = { [reducerKey: string]: any };\n"],"mappings":""}
+{"version":3,"file":"types.js","names":[],"sources":["../../src/redux/types.js"],"sourcesContent":["// @flow\nimport type { Store, DispatchAPI } from \"redux\";\n\nimport type ErrorResponse from \"../models/error/ErrorResponse\";\n\nimport type FormModel from \"../models/form/FormModel\";\nimport typeof {\n  NOTIFICATION_TYPES,\n  AUTOSAVE_STATUS,\n} from \"../constants/Constants\";\n\nimport type { MessageObject } from \"../i18n/types\";\nimport type {\n  I18nState,\n  UpdateLocaleAction,\n  SetLocalesAction,\n} from \"./_i18n/types\";\nimport type {\n  ModularUIState,\n  ModularUIAction,\n  UpdateStatusAction,\n  SetModelAction,\n  UpdateModelAction,\n  RemoveModelByKeyAction,\n  ResetModularUIAction,\n  InitModelAction,\n} from \"./_modularui/types\";\nimport type {\n  RouterState,\n  LocationChangeAction,\n  PushAction,\n  ReplaceAction,\n  GoAction,\n  GoBackAction,\n  GoForwardAction,\n} from \"./_router/types\";\n\nexport type PreferenceValue =\n  | null\n  | string\n  | boolean\n  | { [key: string]: any }\n  | Array<PreferenceValue>;\n\nexport type UpdateFormOptions = {\n  autosubmit: boolean,\n  autosave: boolean,\n  forceUpdate?: boolean,\n  /** Default true: Activate/deactivate the form object validate by an update */\n  validate?: boolean,\n};\n\nexport type NoAction = {\n  type: \"NO_ACTION\",\n};\n\nexport type SaveErrorAction = {\n  type: \"SAVE_ERROR\",\n  payload: ErrorResponse,\n};\n\nexport type ShowModalAction = {\n  type: \"SHOW_MODAL\",\n  payload: string,\n};\n\nexport type CloseModalAction = {\n  type: \"CLOSE_MODAL\",\n  payload: string,\n};\n\nexport type DismissNotificationAction = {\n  type: \"DISMISS_NOTIFICATION\",\n};\nexport type ShowNotificationAction = {\n  type: \"SHOW_NOTIFICATION\",\n  payload: {\n    type: $Keys<NOTIFICATION_TYPES>,\n    message: MessageObject,\n    error: ?ErrorResponse,\n  },\n};\n\nexport type SetPreferenceAction = {\n  type: \"SET_PREFERENCE\",\n  payload: { [name: string]: PreferenceValue },\n};\nexport type SetPreferencesAction = {\n  type: \"SET_PREFERENCES\",\n  payload: { [name: string]: PreferenceValue },\n};\n\nexport type StartProgressAction = {\n  type: \"START_PROGRESS\",\n};\nexport type FinishProgressAction = {\n  type: \"FINISH_PROGRESS\",\n};\nexport type ResetProgressAction = {\n  type: \"RESET_PROGRESS\",\n};\nexport type UpdateProgressAction = {\n  type: \"UPDATE_PROGRESS\",\n  payload: { percentComplete: number },\n};\n\nexport type SendAuthenticationErrorAction = {\n  type: \"AUTHENTICATION_ERROR\",\n  payload: string,\n};\n\nexport type ResetAuthErrorsAction = {\n  type: \"AUTHENTICATION_RESET_ERRORS\",\n};\n\nexport type LoginSuccessAction = {\n  type: \"AUTHENTICATION_SUCCESS\",\n};\n\nexport type ChangePasswordAction = {\n  type: \"CHANGE_PASSWORD\",\n};\n\nexport type LogoutSuccessAction = {\n  type: \"AUTHENTICATION_LOGOUT\",\n};\n\nexport type UpdateAutosaveAction = {\n  type: \"UPDATE_AUTOSAVE_STATUS\",\n  payload: {\n    status: $Keys<AUTOSAVE_STATUS>,\n    model: FormModel,\n  },\n};\n\nexport type ReduxAction =\n  | UpdateStatusAction\n  | SetModelAction\n  | InitModelAction\n  | UpdateModelAction\n  | RemoveModelByKeyAction\n  | ResetModularUIAction\n  | SaveErrorAction\n  | UpdateLocaleAction\n  | SetLocalesAction\n  | ShowModalAction\n  | CloseModalAction\n  | DismissNotificationAction\n  | ShowNotificationAction\n  | SetPreferenceAction\n  | SetPreferencesAction\n  | StartProgressAction\n  | FinishProgressAction\n  | ResetProgressAction\n  | UpdateProgressAction\n  | ResetAuthErrorsAction\n  | SendAuthenticationErrorAction\n  | LoginSuccessAction\n  | ChangePasswordAction\n  | LogoutSuccessAction\n  | UpdateAutosaveAction\n  | LocationChangeAction\n  | PushAction\n  | ReplaceAction\n  | GoAction\n  | GoBackAction\n  | GoForwardAction\n  | ModularUIAction\n  | NoAction;\n\n// Redux state\nexport type AuthState = {\n  +mustChangePassword: boolean,\n  +error: ?string,\n};\n\nexport type ErrorState = null | ErrorResponse;\n\nexport type ModalState = {\n  +key: string,\n  +visible: boolean,\n  +size?: string,\n};\n\nexport type ModalsState = {\n  +modals: Array<ModalState>,\n};\n\nexport type NotificationState = {\n  +render: boolean,\n  +messageType: string | null,\n  +message: MessageObject | null,\n  +error: ?ErrorResponse | null,\n};\n\nexport type PreferencesState = {\n  +[name: string]: PreferenceValue,\n};\n\nexport type ProgressIndicatorState = {\n  +count: number,\n  +timestamp: number,\n  +percentComplete: number,\n};\n\nexport type ReduxState = {\n  +router: RouterState,\n  +modularui: ModularUIState,\n  +i18n: I18nState,\n  +auth: AuthState,\n  +error: ErrorState,\n  +modals: ModalsState,\n  +notification: NotificationState,\n  +progressindicator: ProgressIndicatorState,\n  +preferences: PreferencesState,\n  ...\n};\n\nexport type GetState = () => ReduxState;\nexport type ThunkAction = (dispatch: Dispatch, getState: GetState) => any;\nexport type PromiseAction = Promise<PossibleAction>;\nexport type Dispatch = DispatchAPI<PossibleAction>;\nexport type ReduxStore = Store<ReduxState, ReduxAction, Dispatch>;\n\nexport type PossibleAction = ReduxAction | ThunkAction | PromiseAction;\n\nexport type CustomReducers = { [reducerKey: string]: any };\n"],"mappings":""}

package/package.json

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

package/src/models/attributes/ChoiceAttributeOptionCollection.js

@@ -166,17 +166,6 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
     });
   }
 
-  /**
-   */
-  getDefaultValueForOption(value: any, contributions: Object): string {
-    const layouthints = contributions.layouthint ?? [];
-
-    const requireDefaultValue =
-      layouthints.includes("checkbox") || layouthints.includes("toggle");
-
-    return requireDefaultValue ? "false" : "";
-  }
-
   /**
    * Create two static options for true and false,
    * there might be alternative labels configured for each option value
@@ -185,13 +174,10 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
     value: any,
     contributions: Object
   ): ChoiceAttributeOptionCollection {
-    const optionValue =
-      value == null
-        ? this.getDefaultValueForOption(value, contributions)
-        : value.toString();
+    const optionValue = value == null ? [] : [value.toString()];
 
-    this.addBooleanOption("true", "Yes", [optionValue], contributions.options);
-    this.addBooleanOption("false", "No", [optionValue], contributions.options);
+    this.addBooleanOption("true", "Yes", optionValue, contributions.options);
+    this.addBooleanOption("false", "No", optionValue, contributions.options);
 
     return this;
   }

package/src/modularui/ModularUIRequest.js

@@ -763,6 +763,45 @@ class ModularUIRequest {
       return form.update(response);
     });
   }
+
+  /**
+   * Simplified synchronous version of fetch (returns the model, not a Promise)
+   * This can be used on the server to retrieve a model. It only loads the request url and it's child models
+   */
+  fetchSync(): ModularUIModel {
+    const options = { headers: { "Accept-Language": this.locale } };
+
+    const dataString = dataFetcher.fetch(this.href.toString(), options);
+    if (dataString == null) {
+      throw new Error(`No data received for ${this.href.toString()}`);
+    }
+
+    this.processDataService(JSON.parse(dataString));
+
+    const contributionsString = dataFetcher.fetch(
+      this.contributionsHref.toString(),
+      options
+    );
+    if (contributionsString == null) {
+      throw new Error(
+        `No constributions received for ${this.contributionsHref.toString()}`
+      );
+    }
+    this.processContributionsService(JSON.parse(contributionsString));
+
+    const model = this.createModel();
+
+    const childModelLinks = model.getInitialChildModelLinks();
+
+    const childModels = childModelLinks.map((childModelLink) => {
+      return new ModularUIRequest(childModelLink.href, {
+        locale: this.locale,
+      }).fetchSync();
+    });
+    model.addChildModels(childModels);
+
+    return model;
+  }
 }
 
 export default ModularUIRequest;

package/src/react-server/serverNoSSR.js

@@ -7,6 +7,7 @@ import { getFullRequestHref } from "./requestInformation";
 import {
   createReduxStore,
   setI18n,
+  setApplication,
   setServerPreferences,
   setConfigurationTheme,
   handleErrors,
@@ -23,6 +24,7 @@ import type { BeforeRenderHook } from "../redux/store/beforeRenderHooks";
 import type { PreferenceValue } from "./serverUtil";
 import type { LocaleConfiguration } from "../i18n/types";
 import type { Theme } from "../react-theme/types";
+
 type serverProps = {
   request: HttpServletRequestJava,
   locales?: Array<LocaleConfiguration>,
@@ -50,6 +52,7 @@ const serverNoSSR = ({
   __webpack_nonce__ = UUID; // NOSONAR
 
   const requestHref = getFullRequestHref(request);
+
   const store = createReduxStore(requestHref, customReducers);
 
   setServerPreferences(store, serverPreferences);
@@ -63,6 +66,8 @@ const serverNoSSR = ({
 
   setI18n(store, locales, request);
 
+  setApplication(store);
+
   handleErrors(store);
 
   handleBeforeRenderHooks(beforeRenderHooks, { store, request });

package/src/react-server/serverUtil.js

@@ -23,8 +23,13 @@ import { getSetting } from "../constants/Settings";
 
 import { IllegalArgumentException } from "../exceptions";
 
+import { initModels } from "../redux";
+import { getLocale } from "../redux/selectors/i18n";
+
+import ModularUIRequest from "../modularui/ModularUIRequest";
+
 import type { LocaleConfiguration } from "../i18n/types";
-import type { ReduxStore } from "../redux/types";
+import type { ReduxState, ReduxStore } from "../redux/types";
 import type Href from "../models/href/Href";
 import type { RouterHistory } from "react-router";
 
@@ -38,14 +43,15 @@ export type PreferenceValue = {
  */
 const createReduxStore = (
   requestHref: Href,
-  customReducers: Object
+  customReducers: Object,
+  initialState?: $Shape<ReduxState>
 ): ReduxStore => {
   // $FlowExpectedError
   const history: RouterHistory = createMemoryHistory({
     initialEntries: [requestHref.toString()],
   });
 
-  const { store } = configureStore(history, customReducers);
+  const { store } = configureStore(history, customReducers, initialState);
 
   return store;
 };
@@ -161,6 +167,29 @@ const setConfigurationTheme = (store: ReduxStore) => {
   }
 };
 
+/**
+ */
+const setApplication = (store: ReduxStore) => {
+  try {
+    const locale = getLocale(store.getState());
+    const application = new ModularUIRequest("/", {
+      locale: locale,
+    }).fetchSync();
+
+    store.dispatch(
+      initModels([
+        {
+          key: `application(/)(${locale})`,
+          model: application,
+        },
+      ])
+    );
+  } catch (e) {
+    // eslint-disable-next-line no-console
+    console.info("Could not load webapplication on server");
+  }
+};
+
 /**
  */
 const handleErrors = (store: ReduxStore) => {
@@ -180,19 +209,23 @@ const handleErrors = (store: ReduxStore) => {
 const dehydrate = (store: ReduxStore): string => {
   const state = store.getState();
 
-  const modularui: { [key: string]: { status: string, model: ?Object } } = {};
+  const modularui: {
+    [key: string]: { status: string, lastModification: number, model: ?Object },
+  } = {};
+
   for (const key in state.modularui) {
-    const status = state.modularui[key].status;
-    const model = state.modularui[key].model;
+    const { status, model, lastModification } = state.modularui[key];
 
     if (model) {
       modularui[key] = {
         status,
+        lastModification,
         model: model.dehydrate(),
       };
     } else {
       modularui[key] = {
         status,
+        lastModification,
         model: undefined,
       };
     }
@@ -233,6 +266,7 @@ const createHead = (
 export {
   createReduxStore,
   setI18n,
+  setApplication,
   setServerPreferences,
   setConfigurationTheme,
   createHead,

package/src/redux/_modularui/ModularUIActions.js

@@ -10,6 +10,7 @@ import type { Dispatch, ThunkAction } from "../types";
 import type {
   ModularUIAction,
   SetModelAction,
+  InitModelAction,
   UpdateModelAction,
   RemoveModelByKeyAction,
   ResetModularUIAction,
@@ -34,6 +35,15 @@ export const setModel = (
   };
 };
 
+/**
+ */
+export const initModels = (
+  models: Array<{ key: string, model: ModularUIModel }>
+): InitModelAction => ({
+  type: "MODULARUI/INIT",
+  payload: models,
+});
+
 /**
  */
 export const updateModel = (model: ModularUIModel): UpdateModelAction => ({

package/src/redux/_modularui/ModularUIReducer.js

@@ -53,6 +53,25 @@ const setModel = (
   throw new IllegalArgumentException("No model for setModel");
 };
 
+/**
+ */
+const initModularUI = (
+  state: ModularUIState,
+  models: Array<{ key: string, model: ModularUIModel }>
+) => {
+  const newState = Object.assign({}, state);
+
+  models.forEach(({ key, model }) => {
+    newState[key] = {
+      status: MODULARUI_STATUS.FINISHED,
+      lastModification: Date.now(),
+      model,
+    };
+  });
+
+  return newState;
+};
+
 /**
  */
 const getModelKey = (state: ModularUIState, model: ModularUIModel) =>
@@ -112,6 +131,9 @@ export const ModularUIReducer: Reducer<ModularUIState, ReduxAction> = (
   }
 
   switch (action.type) {
+    case "MODULARUI/INIT":
+      return initModularUI(state, action.payload);
+
     case "MODULARUI/RESET":
       return resetModularUI(state);
 

package/src/redux/_modularui/types.js

@@ -36,6 +36,14 @@ export type SetModelAction = {
   },
 };
 
+export type InitModelAction = {
+  type: "MODULARUI/INIT",
+  payload: Array<{
+    key: string,
+    model: ModularUIModel,
+  }>,
+};
+
 export type UpdateModelAction = {
   type: "MODULARUI/UPDATE",
   payload: ModularUIModel,

package/src/redux/store/configureStore.js

@@ -49,7 +49,7 @@ const configureStore = (
     enhancers
   );
 
-  if (!initialState) {
+  if (!initialState?.router) {
     store.dispatch(locationChange(history.location, "PUSH"));
   }
   return { history, store };

package/src/redux/types.js

@@ -23,6 +23,7 @@ import type {
   UpdateModelAction,
   RemoveModelByKeyAction,
   ResetModularUIAction,
+  InitModelAction,
 } from "./_modularui/types";
 import type {
   RouterState,
@@ -135,6 +136,7 @@ export type UpdateAutosaveAction = {
 export type ReduxAction =
   | UpdateStatusAction
   | SetModelAction
+  | InitModelAction
   | UpdateModelAction
   | RemoveModelByKeyAction
   | ResetModularUIAction

package/types/models/attributes/ChoiceAttributeOptionCollection.d.ts

@@ -30,9 +30,6 @@ declare class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceA
     /**
      */
     addBooleanOption(code: "true" | "false", defaultLabel: string, data: string | Array<string>, options?: Array<Object>): void;
-    /**
-     */
-    getDefaultValueForOption(value: any, contributions: Object): string;
     /**
      * Create two static options for true and false,
      * there might be alternative labels configured for each option value

package/types/modularui/ModularUIRequest.d.ts

@@ -11,11 +11,13 @@ declare class ModularUIRequest {
     _href: Href;
     _options: RequestModularUIOptions;
     _targetModel: TargetModel | null;
+    _forceTargetModel: boolean;
     _contributionsHref: string;
     _locale: string;
     _method: $Keys<{
         POST: string;
-        GET: string;
+        GET: string; /**
+         */
     }>;
     _progressEvent: ProgressEventHandler;
     /**
@@ -46,13 +48,15 @@ declare class ModularUIRequest {
      */
     set method(arg: $Keys<{
         POST: string;
-        GET: string;
+        GET: string; /**
+         */
     }>);
     /**
      */
     get method(): $Keys<{
         POST: string;
-        GET: string;
+        GET: string; /**
+         */
     }>;
     /**
      */
@@ -69,6 +73,12 @@ declare class ModularUIRequest {
     /**
      */
     get withChildModels(): boolean;
+    /**
+     */
+    set forceTargetModel(arg: boolean);
+    /**
+     */
+    get forceTargetModel(): boolean;
     /**
      */
     resolveModel(): Class<ModularUIModel>;
@@ -174,6 +184,11 @@ declare class ModularUIRequest {
      * @returns {Promise<FormModel>}
      */
     postForm(form: FormModel): Promise<FormModel>;
+    /**
+     * Simplified synchronous version of fetch (returns the model, not a Promise)
+     * This can be used on the server to retrieve a model. It only loads the request url and it's child models
+     */
+    fetchSync(): ModularUIModel;
 }
 import ModularUIResponse from "./ModularUIResponse";
 import Href from "../models/href/Href";

package/types/redux/_modularui/types.d.ts

@@ -12,6 +12,13 @@ type SetModelAction = {
         model: ModularUIModel;
     };
 };
+type InitModelAction = {
+    type: "MODULARUI/INIT";
+    payload: {
+        key: string;
+        model: ModularUIModel;
+    }[];
+};
 type UpdateModelAction = {
     type: "MODULARUI/UPDATE";
     payload: ModularUIModel;
@@ -29,6 +36,7 @@ type ModularUIAction = {
         locale: string;
         childmodels?: boolean;
         targetModel?: any;
+        forceTargetModel?: boolean;
         successAction: (model: ModularUIModel) => SetModelAction | UpdateModelAction;
         errorAction?: ErrorAction;
     };

package/types/redux/types.d.ts

@@ -84,7 +84,7 @@ type UpdateAutosaveAction = {
         model: FormModel;
     };
 };
-type ReduxAction = UpdateLocaleAction | SetLocalesAction | SetModelAction | UpdateModelAction | UpdateStatusAction | RemoveModelByKeyAction | NoAction | ModularUIAction | ResetModularUIAction | LocationChangeAction | PushAction | ReplaceAction | GoAction | GoBackAction | GoForwardAction | SaveErrorAction | ShowModalAction | CloseModalAction | DismissNotificationAction | ShowNotificationAction | SetPreferenceAction | SetPreferencesAction | StartProgressAction | FinishProgressAction | ResetProgressAction | UpdateProgressAction | SendAuthenticationErrorAction | ResetAuthErrorsAction | LoginSuccessAction | ChangePasswordAction | LogoutSuccessAction | UpdateAutosaveAction;
+type ReduxAction = UpdateLocaleAction | SetLocalesAction | SetModelAction | InitModelAction | UpdateModelAction | UpdateStatusAction | RemoveModelByKeyAction | NoAction | ModularUIAction | ResetModularUIAction | LocationChangeAction | PushAction | ReplaceAction | GoAction | GoBackAction | GoForwardAction | SaveErrorAction | ShowModalAction | CloseModalAction | DismissNotificationAction | ShowNotificationAction | SetPreferenceAction | SetPreferencesAction | StartProgressAction | FinishProgressAction | ResetProgressAction | UpdateProgressAction | SendAuthenticationErrorAction | ResetAuthErrorsAction | LoginSuccessAction | ChangePasswordAction | LogoutSuccessAction | UpdateAutosaveAction;
 type AuthState = {};
 type ErrorState = ErrorResponse;
 type ModalState = {};