@beinformed/ui 1.25.5 → 1.26.0

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 = {};

package/types/utils/fetch/types.d.ts

@@ -33,6 +33,7 @@ type RequestOptions = {
 type RequestModularUIOptions = {
     RequestBaseOptions: any;
     targetModel?: any;
+    forceTargetModel?: boolean;
     updateModel?: ModularUIModel;
     childmodels?: boolean;
     isValidationRequest?: boolean;