@beinformed/ui 1.25.4 → 1.25.5

package/src/modularui/ModularUIRequest.js

@@ -42,6 +42,7 @@ class ModularUIRequest {
   _href: Href;
   _options: RequestModularUIOptions;
   _targetModel: ?TargetModel;
+  _forceTargetModel: boolean = false;
   _contributionsHref: string;
   _locale: string;
   _method: $Keys<typeof HTTP_METHODS> = HTTP_METHODS.GET;
@@ -153,6 +154,7 @@ class ModularUIRequest {
     /* eslint-disable no-unused-vars */
     const {
       targetModel,
+      forceTargetModel,
       updateModel,
       childmodels,
       isValidationRequest,
@@ -189,6 +191,18 @@ class ModularUIRequest {
     return this._targetModel;
   }
 
+  /**
+   */
+  set forceTargetModel(forceTargetModel: boolean) {
+    this._forceTargetModel = forceTargetModel ?? false;
+  }
+
+  /**
+   */
+  get forceTargetModel(): boolean {
+    return this._forceTargetModel;
+  }
+
   /**
    */
   resolveModel(): Class<ModularUIModel> {
@@ -197,6 +211,10 @@ class ModularUIRequest {
       availableModels = Array.isArray(this.targetModel)
         ? [...this.targetModel]
         : [this.targetModel];
+
+      if (this.forceTargetModel) {
+        return availableModels[0];
+      }
     }
 
     const Model: Class<ModularUIModel> | null = resolveModel(
@@ -210,14 +228,14 @@ class ModularUIRequest {
 
     if (availableModels) {
       throw new IllegalStateException(
-        `data is not applicable for model(s): ${availableModels
+        `data for ${this.href.toString()} is not applicable for model(s): ${availableModels
           .map((m) => m.modelName)
-          .join(", ")}`
+          .join(", ")}, received response: ${JSON.stringify(this.response)}`
       );
     }
 
     throw new IllegalStateException(
-      `no javascript model is applicable for received response: ${JSON.stringify(
+      `no javascript model is applicable for received request of ${this.href.toString()}, with response: ${JSON.stringify(
         this.response
       )}`
     );

package/src/redux/_modularui/ModularUIActions.js

@@ -90,6 +90,7 @@ const loadModelSuccessAction = (
 };
 
 /**
+ * This action is handled by the modularui middleware
  */
 export const loadModel = (
   key: string,
@@ -104,6 +105,7 @@ export const loadModel = (
     locale: options?.locale ?? "en",
     childmodels: options?.childmodels,
     targetModel: options?.targetModel,
+    forceTargetModel: options?.forceTargetModel,
     /**
      */
     successAction: (model) =>

package/src/redux/_modularui/ModularUIMiddleware.js

@@ -25,6 +25,7 @@ type RequestOptions = {
   locale: string,
   childmodels?: boolean,
   targetModel?: TargetModel,
+  forceTargetModel?: boolean,
   isReload?: boolean,
 };
 
@@ -42,6 +43,7 @@ const createRequest = (modularui: RequestOptions): ModularUIRequest => {
 
   if (modularui.targetModel) {
     request.targetModel = modularui.targetModel;
+    request.forceTargetModel = modularui.forceTargetModel ?? false;
   }
 
   return request;

package/src/redux/_modularui/types.js

@@ -58,6 +58,7 @@ export type ModularUIAction = {
     locale: string,
     childmodels?: boolean,
     targetModel?: TargetModel,
+    forceTargetModel?: boolean,
     successAction: (
       model: ModularUIModel
     ) => UpdateModelAction | SetModelAction,

package/src/utils/fetch/types.js

@@ -34,9 +34,9 @@ export type RequestOptions = { ...RequestURLOptions, ...RequestBaseOptions };
 export type RequestModularUIOptions = {
   ...RequestBaseOptions,
   targetModel?: TargetModel,
+  forceTargetModel?: boolean,
   updateModel?: ModularUIModel,
   childmodels?: boolean,
   isValidationRequest?: boolean,
-
   removeOnUnmount?: boolean,
 };