@beinformed/ui 1.9.0-beta.9 → 1.9.3

package/lib/models/list/__tests__/ListDetailModel.spec.js.flow

@@ -27,4 +27,68 @@ describe("listDetailModel", () => {
       "Highly Inappropriate Tales for Young People"
     );
   });
+
+  it("should be able to handle different kind of introtext", () => {
+    const listdetailOldStructure = new ListDetailModel({
+      key: "Book",
+      data: data.Book,
+      contributions: contributions.Book,
+    });
+
+    expect(listdetailOldStructure.introtext).toBe("<p>This is introtext</p>");
+
+    const listdetailFromDataPlain = new ListDetailModel({
+      key: "Book",
+      data: {
+        _text: "<p>This is introtext</p>",
+        ...data.Book,
+      },
+      contributions: contributions.Book,
+    });
+
+    expect(listdetailFromDataPlain.introtext).toBe("<p>This is introtext</p>");
+
+    const listdetailFromDataApplicationMessage = new ListDetailModel({
+      key: "Book",
+      data: {
+        ...data.Book,
+        _text: {
+          message: "<p>This is introtext</p>",
+        },
+      },
+      contributions: contributions.Book,
+    });
+
+    expect(listdetailFromDataApplicationMessage.introtext).toBe(
+      "<p>This is introtext</p>"
+    );
+
+    const listdetailFromNewContributionsRawTextMessage = new ListDetailModel({
+      key: "Book",
+      data: data.Book,
+      contributions: {
+        ...contributions.Book,
+        text: {
+          message: "<p>This is introtext</p>",
+        },
+      },
+    });
+
+    expect(listdetailFromNewContributionsRawTextMessage.introtext).toBe(
+      "<p>This is introtext</p>"
+    );
+
+    const listdetailFromNewContributionsSimpleMessage = new ListDetailModel({
+      key: "Book",
+      data: data.Book,
+      contributions: {
+        ...contributions.Book,
+        text: "<p>This is introtext</p>",
+      },
+    });
+
+    expect(listdetailFromNewContributionsSimpleMessage.introtext).toBe(
+      "<p>This is introtext</p>"
+    );
+  });
 });

package/lib/models/list/__tests__/ListModel.spec.js.flow

@@ -54,8 +54,70 @@ describe("listModel spec", () => {
 
     expect(list.headers).toHaveLength(6);
 
-    expect(list.introtext).toStrictEqual(
-      "<p>This is a list of <em>books</em><br />For each book the <strong>contributers</strong> and the <strong>publishers</strong> are added as <u>additional details</u>.<br />For more information see amazon</p>"
+    expect(list.introtext).toStrictEqual("<p>This is introtext</p>");
+  });
+
+  it("should be able to handle different kind of introtext", () => {
+    const listOldStructure = new ListModel({
+      key: "Books",
+      data: mockList.Books,
+      contributions: mockListContributions.Books,
+    });
+
+    expect(listOldStructure.introtext).toBe("<p>This is introtext</p>");
+
+    const listFromDataPlain = new ListModel({
+      key: "Books",
+      data: {
+        text: "<p>This is introtext</p>",
+        ...mockList.Books,
+      },
+      contributions: mockListContributions.Books,
+    });
+
+    expect(listFromDataPlain.introtext).toBe("<p>This is introtext</p>");
+
+    const listFromDataApplicationMessage = new ListModel({
+      key: "Books",
+      data: {
+        ...mockList.Books,
+        text: {
+          message: "<p>This is introtext</p>",
+        },
+      },
+      contributions: mockListContributions.Books,
+    });
+
+    expect(listFromDataApplicationMessage.introtext).toBe(
+      "<p>This is introtext</p>"
+    );
+
+    const listFromNewContributionsRawTextMessage = new ListModel({
+      key: "Books",
+      data: mockList.Books,
+      contributions: {
+        ...mockListContributions.Books,
+        text: {
+          message: "<p>This is introtext</p>",
+        },
+      },
+    });
+
+    expect(listFromNewContributionsRawTextMessage.introtext).toBe(
+      "<p>This is introtext</p>"
+    );
+
+    const listFromNewContributionsSimpleMessage = new ListModel({
+      key: "Books",
+      data: mockList.Books,
+      contributions: {
+        ...mockListContributions.Books,
+        text: "<p>This is introtext</p>",
+      },
+    });
+
+    expect(listFromNewContributionsSimpleMessage.introtext).toBe(
+      "<p>This is introtext</p>"
     );
   });
 });

package/lib/models/panels/GroupingPanelModel.js

@@ -9,12 +9,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
-
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
 
+var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
+
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
@@ -123,11 +123,7 @@ var GroupingPanelModel = /*#__PURE__*/function (_ResourceModel) {
   }, {
     key: "hasIntroText",
     value: function hasIntroText() {
-      var _context;
-
-      return this.contributions.texts && (0, _find.default)(_context = this.contributions.texts).call(_context, function (item) {
-        return item.type === "master";
-      });
+      return this.introtext !== "";
     }
     /**
      * Getting the introduction text configured on the grouping panel
@@ -136,13 +132,20 @@ var GroupingPanelModel = /*#__PURE__*/function (_ResourceModel) {
   }, {
     key: "introtext",
     get: function get() {
-      if (this.contributions.texts) {
-        var _context2;
+      if (this.data._text) {
+        var _this$data$_text$mess;
 
-        var text = (0, _find.default)(_context2 = this.contributions.texts).call(_context2, function (item) {
-          return item.type === "master";
-        });
-        return text ? text.text : "";
+        return (_this$data$_text$mess = this.data._text.message) !== null && _this$data$_text$mess !== void 0 ? _this$data$_text$mess : this.data._text;
+      }
+
+      if (this.contributions.text) {
+        var _this$contributions$t;
+
+        return (_this$contributions$t = this.contributions.text.message) !== null && _this$contributions$t !== void 0 ? _this$contributions$t : this.contributions.text;
+      }
+
+      if (Array.isArray(this.contributions.texts)) {
+        return this.contributions.texts[0].text;
       }
 
       return "";
@@ -153,15 +156,15 @@ var GroupingPanelModel = /*#__PURE__*/function (_ResourceModel) {
   }, {
     key: "createTaskGroupCollection",
     value: function createTaskGroupCollection() {
-      var _context3;
+      var _context;
 
       var allTaskgroupsData = this.getData("taskgroups", []);
       var allTaskgroupsContributions = this.getContribution("taskgroups", []);
-      this.taskGroupCollection = (0, _map.default)(_context3 = (0, _filter.default)(allTaskgroupsData).call(allTaskgroupsData, function (taskgroup) {
+      this.taskGroupCollection = (0, _map.default)(_context = (0, _filter.default)(allTaskgroupsData).call(allTaskgroupsData, function (taskgroup) {
         return allTaskgroupsContributions.some(function (taskgroupContribution) {
           return taskgroupContribution.name === taskgroup.name;
         });
-      })).call(_context3, function (taskgroup) {
+      })).call(_context, function (taskgroup) {
         var taskgroupContributions = (0, _find.default)(allTaskgroupsContributions).call(allTaskgroupsContributions, function (taskgroupContribution) {
           return taskgroupContribution.name === taskgroup.name;
         });
@@ -205,9 +208,9 @@ var GroupingPanelModel = /*#__PURE__*/function (_ResourceModel) {
   }], [{
     key: "isApplicableModel",
     value: function isApplicableModel(data) {
-      var _context4;
+      var _context2;
 
-      return data.contributions.resourcetype && (0, _includes.default)(_context4 = ["GroupingPanel", "CaseTabGroupingPanel", "TabGroupingPanel"]).call(_context4, data.contributions.resourcetype);
+      return data.contributions.resourcetype && (0, _includes.default)(_context2 = ["GroupingPanel", "CaseTabGroupingPanel", "TabGroupingPanel"]).call(_context2, data.contributions.resourcetype);
     }
   }]);
   return GroupingPanelModel;

package/lib/models/panels/GroupingPanelModel.js.flow

@@ -78,22 +78,23 @@ export default class GroupingPanelModel extends ResourceModel {
    * Check if an introtext exists for this caseview
    */
   hasIntroText(): boolean {
-    return (
-      this.contributions.texts &&
-      this.contributions.texts.find((item) => item.type === "master")
-    );
+    return this.introtext !== "";
   }
 
   /**
    * Getting the introduction text configured on the grouping panel
    */
   get introtext(): string {
-    if (this.contributions.texts) {
-      const text = this.contributions.texts.find(
-        (item) => item.type === "master"
-      );
+    if (this.data._text) {
+      return this.data._text.message ?? this.data._text;
+    }
+
+    if (this.contributions.text) {
+      return this.contributions.text.message ?? this.contributions.text;
+    }
 
-      return text ? text.text : "";
+    if (Array.isArray(this.contributions.texts)) {
+      return this.contributions.texts[0].text;
     }
 
     return "";

package/lib/models/panels/GroupingPanelModel.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/models/panels/GroupingPanelModel.js"],"names":["GroupingPanelModel","modularuiResponse","createTaskGroupCollection","contributions","label","links","getLinksByGroup","all","models","taskGroups","i","length","TaskGroupModel","push","taskGroupCollection","add","texts","item","type","text","allTaskgroupsData","getData","allTaskgroupsContributions","getContribution","taskgroup","some","taskgroupContribution","name","taskgroupContributions","create","_taskGroupCollection","taskgroups","TaskGroupCollection","hasItems","hasTasks","data","resourcetype","ResourceModel"],"mappings":"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","sourcesContent":["// @flow\nimport ResourceModel from \"../base/ResourceModel\";\nimport TaskGroupCollection from \"../taskgroup/TaskGroupCollection\";\n\nimport TaskGroupModel from \"../taskgroup/TaskGroupModel\";\n\nimport type { ModularUIResponse } from \"../../modularui\";\nimport type { ModularUIModel } from \"../types\";\nimport type LinkModel from \"../links/LinkModel\";\nimport type LinkCollection from \"../links/LinkCollection\";\n\n/**\n * Panel that groups other panels\n */\nexport default class GroupingPanelModel extends ResourceModel {\n  _taskGroupCollection: TaskGroupCollection;\n\n  /**\n   * Constructs GroupingPanel\n   */\n  constructor(modularuiResponse: ModularUIResponse) {\n    super(modularuiResponse);\n\n    this.createTaskGroupCollection();\n  }\n\n  /**\n   */\n  get type(): string {\n    return \"GroupingPanel\";\n  }\n\n  /**\n   */\n  static isApplicableModel(data: ModularUIResponse): boolean {\n    return (\n      data.contributions.resourcetype &&\n      [\"GroupingPanel\", \"CaseTabGroupingPanel\", \"TabGroupingPanel\"].includes(\n        data.contributions.resourcetype\n      )\n    );\n  }\n\n  /**\n   * Getting the label of the panel\n   */\n  get label(): string {\n    return this.contributions.label;\n  }\n\n  /**\n   */\n  getInitialChildModelLinks(): Array<LinkModel> {\n    return this.links.getLinksByGroup(\"taskgroup\").all;\n  }\n\n  /**\n   */\n  get panelLinks(): LinkCollection {\n    return this.links.getLinksByGroup(\"panel\");\n  }\n\n  /**\n   */\n  setChildModels(models: Array<ModularUIModel>) {\n    const taskGroups = [];\n\n    for (let i = 0; i < models.length; i++) {\n      if (models[i] instanceof TaskGroupModel) {\n        taskGroups.push(models[i]);\n      }\n    }\n\n    this.taskGroupCollection.add(taskGroups);\n  }\n\n  /**\n   * Check if an introtext exists for this caseview\n   */\n  hasIntroText(): boolean {\n    return (\n      this.contributions.texts &&\n      this.contributions.texts.find((item) => item.type === \"master\")\n    );\n  }\n\n  /**\n   * Getting the introduction text configured on the grouping panel\n   */\n  get introtext(): string {\n    if (this.contributions.texts) {\n      const text = this.contributions.texts.find(\n        (item) => item.type === \"master\"\n      );\n\n      return text ? text.text : \"\";\n    }\n\n    return \"\";\n  }\n\n  /**\n   */\n  createTaskGroupCollection() {\n    const allTaskgroupsData = this.getData(\"taskgroups\", []);\n    const allTaskgroupsContributions = this.getContribution(\"taskgroups\", []);\n\n    this.taskGroupCollection = allTaskgroupsData\n      .filter((taskgroup) =>\n        allTaskgroupsContributions.some(\n          (taskgroupContribution) =>\n            taskgroupContribution.name === taskgroup.name\n        )\n      )\n      .map((taskgroup) => {\n        const taskgroupContributions = allTaskgroupsContributions.find(\n          (taskgroupContribution) =>\n            taskgroupContribution.name === taskgroup.name\n        );\n\n        return TaskGroupModel.create(\n          taskgroup.name,\n          taskgroup,\n          taskgroupContributions\n        );\n      });\n  }\n\n  /**\n   * Setting the taskgroup panel collection\n   */\n  set taskGroupCollection(taskgroups: Array<TaskGroupModel>) {\n    this._taskGroupCollection = new TaskGroupCollection(taskgroups);\n  }\n\n  /**\n   * Getting the taskgrouppanels on the tab\n   */\n  get taskGroupCollection(): TaskGroupCollection {\n    return this._taskGroupCollection;\n  }\n\n  /**\n   * Has taskgroups\n   */\n  hasTaskGroups(): boolean {\n    return this.taskGroupCollection && this.taskGroupCollection.hasItems;\n  }\n\n  /**\n   * Has tasks\n   */\n  hasTasks(): boolean {\n    return this.taskGroupCollection.hasTasks();\n  }\n}\n"],"file":"GroupingPanelModel.js"}
+{"version":3,"sources":["../../../src/models/panels/GroupingPanelModel.js"],"names":["GroupingPanelModel","modularuiResponse","createTaskGroupCollection","contributions","label","links","getLinksByGroup","all","models","taskGroups","i","length","TaskGroupModel","push","taskGroupCollection","add","introtext","data","_text","message","text","Array","isArray","texts","allTaskgroupsData","getData","allTaskgroupsContributions","getContribution","taskgroup","some","taskgroupContribution","name","taskgroupContributions","create","_taskGroupCollection","taskgroups","TaskGroupCollection","hasItems","hasTasks","resourcetype","ResourceModel"],"mappings":"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","sourcesContent":["// @flow\nimport ResourceModel from \"../base/ResourceModel\";\nimport TaskGroupCollection from \"../taskgroup/TaskGroupCollection\";\n\nimport TaskGroupModel from \"../taskgroup/TaskGroupModel\";\n\nimport type { ModularUIResponse } from \"../../modularui\";\nimport type { ModularUIModel } from \"../types\";\nimport type LinkModel from \"../links/LinkModel\";\nimport type LinkCollection from \"../links/LinkCollection\";\n\n/**\n * Panel that groups other panels\n */\nexport default class GroupingPanelModel extends ResourceModel {\n  _taskGroupCollection: TaskGroupCollection;\n\n  /**\n   * Constructs GroupingPanel\n   */\n  constructor(modularuiResponse: ModularUIResponse) {\n    super(modularuiResponse);\n\n    this.createTaskGroupCollection();\n  }\n\n  /**\n   */\n  get type(): string {\n    return \"GroupingPanel\";\n  }\n\n  /**\n   */\n  static isApplicableModel(data: ModularUIResponse): boolean {\n    return (\n      data.contributions.resourcetype &&\n      [\"GroupingPanel\", \"CaseTabGroupingPanel\", \"TabGroupingPanel\"].includes(\n        data.contributions.resourcetype\n      )\n    );\n  }\n\n  /**\n   * Getting the label of the panel\n   */\n  get label(): string {\n    return this.contributions.label;\n  }\n\n  /**\n   */\n  getInitialChildModelLinks(): Array<LinkModel> {\n    return this.links.getLinksByGroup(\"taskgroup\").all;\n  }\n\n  /**\n   */\n  get panelLinks(): LinkCollection {\n    return this.links.getLinksByGroup(\"panel\");\n  }\n\n  /**\n   */\n  setChildModels(models: Array<ModularUIModel>) {\n    const taskGroups = [];\n\n    for (let i = 0; i < models.length; i++) {\n      if (models[i] instanceof TaskGroupModel) {\n        taskGroups.push(models[i]);\n      }\n    }\n\n    this.taskGroupCollection.add(taskGroups);\n  }\n\n  /**\n   * Check if an introtext exists for this caseview\n   */\n  hasIntroText(): boolean {\n    return this.introtext !== \"\";\n  }\n\n  /**\n   * Getting the introduction text configured on the grouping panel\n   */\n  get introtext(): string {\n    if (this.data._text) {\n      return this.data._text.message ?? this.data._text;\n    }\n\n    if (this.contributions.text) {\n      return this.contributions.text.message ?? this.contributions.text;\n    }\n\n    if (Array.isArray(this.contributions.texts)) {\n      return this.contributions.texts[0].text;\n    }\n\n    return \"\";\n  }\n\n  /**\n   */\n  createTaskGroupCollection() {\n    const allTaskgroupsData = this.getData(\"taskgroups\", []);\n    const allTaskgroupsContributions = this.getContribution(\"taskgroups\", []);\n\n    this.taskGroupCollection = allTaskgroupsData\n      .filter((taskgroup) =>\n        allTaskgroupsContributions.some(\n          (taskgroupContribution) =>\n            taskgroupContribution.name === taskgroup.name\n        )\n      )\n      .map((taskgroup) => {\n        const taskgroupContributions = allTaskgroupsContributions.find(\n          (taskgroupContribution) =>\n            taskgroupContribution.name === taskgroup.name\n        );\n\n        return TaskGroupModel.create(\n          taskgroup.name,\n          taskgroup,\n          taskgroupContributions\n        );\n      });\n  }\n\n  /**\n   * Setting the taskgroup panel collection\n   */\n  set taskGroupCollection(taskgroups: Array<TaskGroupModel>) {\n    this._taskGroupCollection = new TaskGroupCollection(taskgroups);\n  }\n\n  /**\n   * Getting the taskgrouppanels on the tab\n   */\n  get taskGroupCollection(): TaskGroupCollection {\n    return this._taskGroupCollection;\n  }\n\n  /**\n   * Has taskgroups\n   */\n  hasTaskGroups(): boolean {\n    return this.taskGroupCollection && this.taskGroupCollection.hasItems;\n  }\n\n  /**\n   * Has tasks\n   */\n  hasTasks(): boolean {\n    return this.taskGroupCollection.hasTasks();\n  }\n}\n"],"file":"GroupingPanelModel.js"}

package/lib/models/panels/__tests__/GroupingPanelModel.spec.js.flow

@@ -1,5 +1,9 @@
 import GroupingPanelModel from "../GroupingPanelModel";
 
+import panelJson from "./groupingPanel.json";
+import panelContributionsJson from "./groupingPanelContributions.json";
+import CaseViewModel from "../../caseview/CaseViewModel";
+
 describe("groupingPanelModel", () => {
   it("should be able to create an empty GroupingPanelModel object", () => {
     const groupingPanel = new GroupingPanelModel();
@@ -30,4 +34,90 @@ describe("groupingPanelModel", () => {
       })
     ).toBe(true);
   });
+
+  it("should be able to create a grouping panel from a typical modular UI json structure", () => {
+    const groupingPanel = new GroupingPanelModel({
+      key: "AskingQuestions",
+      data: panelJson,
+      contributions: panelContributionsJson,
+    });
+
+    expect(groupingPanel).toBeInstanceOf(GroupingPanelModel);
+
+    expect(groupingPanel.key).toBe("AskingQuestions");
+    expect(groupingPanel.label).toBe("Asking questions");
+
+    expect(groupingPanel.links).toHaveLength(8);
+    expect(groupingPanel.panelLinks).toHaveLength(1);
+
+    expect(groupingPanel.hasIntroText()).toBe(true);
+  });
+
+  it("should be able to handle different kind of introtext", () => {
+    const groupingPanelOldStructure = new CaseViewModel({
+      key: "Book",
+      data: panelJson,
+      contributions: panelContributionsJson,
+    });
+
+    expect(groupingPanelOldStructure.introtext).toBe(
+      "<p>This is introtext</p>"
+    );
+
+    const groupingPanelFromDataPlain = new CaseViewModel({
+      key: "Book",
+      data: {
+        _text: "<p>This is introtext</p>",
+        ...panelJson,
+      },
+      contributions: panelContributionsJson,
+    });
+
+    expect(groupingPanelFromDataPlain.introtext).toBe(
+      "<p>This is introtext</p>"
+    );
+
+    const groupingPanelFromDataApplicationMessage = new CaseViewModel({
+      key: "Book",
+      data: {
+        ...panelJson,
+        _text: {
+          message: "<p>This is introtext</p>",
+        },
+      },
+      contributions: panelContributionsJson,
+    });
+
+    expect(groupingPanelFromDataApplicationMessage.introtext).toBe(
+      "<p>This is introtext</p>"
+    );
+
+    const groupingPanelFromNewContributionsRawTextMessage = new CaseViewModel({
+      key: "Book",
+      data: panelJson,
+      contributions: {
+        ...panelContributionsJson,
+        text: {
+          message: "<p>This is introtext</p>",
+        },
+      },
+    });
+
+    expect(groupingPanelFromNewContributionsRawTextMessage.introtext).toBe(
+      "<p>This is introtext</p>"
+    );
+
+    const groupingPanelFromNewContributionsSimpleMessage = new CaseViewModel({
+      key: "Book",
+      data: panelJson,
+      contributions: {
+        ...panelContributionsJson,
+        text: "<p>This is introtext</p>",
+      },
+    });
+
+    expect(groupingPanelFromNewContributionsSimpleMessage.introtext).toBe(
+      "<p>This is introtext</p>"
+    );
+  });
 });

package/lib/models/types.js.flow

@@ -44,6 +44,7 @@ import type LookupOptionsModel from "./lookup/LookupOptionsModel";
 import type BaseFilterModel from "./filters/BaseFilterModel";
 import type AttributeCollection from "./attributes/AttributeCollection";
 import type AttributeModel from "./attributes/AttributeModel";
+import type LayoutHintCollection from "./layouthint/LayoutHintCollection";
 
 export type ModularUIModel =
   | ApplicationModel
@@ -192,36 +193,52 @@ export type SectionData = {
   subSections: Array<SectionData>,
 };
 
-export type PropertiesElement = {
-  propertiesElement: {
+export type PropertyElement = {
+  propertyElement: {
     label: string,
-    id: string,
+    layouthint: Array<string>,
     properties: Array<PropertyData>,
   },
 };
 export type TextFragmentElement = {
   textFragmentElement: {
     label: string,
-    id: string,
+    layouthint: Array<string>,
     textfragments: Array<TextFragmentData>,
   },
 };
 export type ContentElement = {
   contentElement: {
     label: string,
+    layouthint: Array<string>,
     sections: Array<SectionData>,
   },
 };
 
+type PropertyElementMapped = {
+  propertyElement: {
+    label: string,
+    layouthint: LayoutHintCollection,
+    properties: Array<PropertyData>,
+  },
+};
+type TextFragmentElementMapped = {
+  textFragmentElement: {
+    label: string,
+    layouthint: LayoutHintCollection,
+    textfragments: Array<TextFragmentData>,
+  },
+};
 type ContentElementMapped = {
   contentElement: {
     label: string,
+    layouthint: LayoutHintCollection,
     sections: Array<SectionModel>,
   },
 };
 
 export type ContentAll = Array<
-  PropertiesElement | TextFragmentElement | ContentElementMapped
+  PropertyElementMapped | TextFragmentElementMapped | ContentElementMapped
 >;
 
 export type ContentData = {
@@ -229,5 +246,6 @@ export type ContentData = {
     label?: string,
     description?: { id?: string, message: string, properties?: Object },
   },
-  elements: Array<PropertiesElement | TextFragmentElement | ContentElement>,
+  label?: string,
+  elements: Array<PropertyElement | TextFragmentElement | ContentElement>,
 };

package/lib/modularui/ModularUIRequest.js

@@ -659,7 +659,8 @@ var ModularUIRequest = /*#__PURE__*/function () {
       var prevData = typeof this.options.data === "string" ? JSON.parse(this.options.data) : this.options.data;
 
       if (model instanceof _FormModel.default) {
-        var newData = JSON.parse(model.validationData);
+        var newData = JSON.parse(model.validationData); // $FlowFixMe incompatible-call
+
         return (0, _stringify.default)((0, _deepmerge.default)(prevData || {}, newData));
       }
 

package/lib/modularui/ModularUIRequest.js.flow

@@ -475,6 +475,7 @@ class ModularUIRequest {
 
     if (model instanceof FormModel) {
       const newData = JSON.parse(model.validationData);
+      // $FlowFixMe incompatible-call
       return JSON.stringify(deepmerge(prevData || {}, newData));
     }