@beinformed/ui 1.12.0 → 1.13.1

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

@@ -2,13 +2,14 @@ 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();
 
     expect(groupingPanel).toBeInstanceOf(GroupingPanelModel);
+    expect(groupingPanel.type).toBe("GroupingPanel");
+    expect(groupingPanel.introtext).toBe("");
 
     expect(
       GroupingPanelModel.isApplicableModel({
@@ -51,10 +52,24 @@ describe("groupingPanelModel", () => {
     expect(groupingPanel.panelLinks).toHaveLength(1);
 
     expect(groupingPanel.hasIntroText()).toBe(true);
+
+    expect(groupingPanel.getInitialChildModelLinks()).toHaveLength(4);
+  });
+
+  it("can handle local taskgroups", () => {
+    const groupingPanel = new GroupingPanelModel({
+      key: "AskingQuestions",
+      data: panelJson,
+      contributions: panelContributionsJson,
+    });
+
+    expect(groupingPanel.hasTaskGroups()).toBe(true);
+    expect(groupingPanel.hasTasks()).toBe(true);
+    expect(groupingPanel.taskGroupCollection).toHaveLength(1);
   });
 
   it("should be able to handle different kind of introtext", () => {
-    const groupingPanelOldStructure = new CaseViewModel({
+    const groupingPanelOldStructure = new GroupingPanelModel({
       key: "Book",
       data: panelJson,
       contributions: panelContributionsJson,
@@ -64,10 +79,10 @@ describe("groupingPanelModel", () => {
       "<p>This is introtext</p>"
     );
 
-    const groupingPanelFromDataPlain = new CaseViewModel({
+    const groupingPanelFromDataPlain = new GroupingPanelModel({
       key: "Book",
       data: {
-        _text: "<p>This is introtext</p>",
+        _content: { text: { message: "<p>This is introtext</p>" } },
         ...panelJson,
       },
       contributions: panelContributionsJson,
@@ -77,12 +92,14 @@ describe("groupingPanelModel", () => {
       "<p>This is introtext</p>"
     );
 
-    const groupingPanelFromDataApplicationMessage = new CaseViewModel({
+    const groupingPanelFromDataApplicationMessage = new GroupingPanelModel({
       key: "Book",
       data: {
         ...panelJson,
-        _text: {
-          message: "<p>This is introtext</p>",
+        _content: {
+          text: {
+            message: "<p>This is introtext</p>",
+          },
         },
       },
       contributions: panelContributionsJson,
@@ -92,29 +109,31 @@ describe("groupingPanelModel", () => {
       "<p>This is introtext</p>"
     );
 
-    const groupingPanelFromNewContributionsRawTextMessage = new CaseViewModel({
-      key: "Book",
-      data: panelJson,
-      contributions: {
-        ...panelContributionsJson,
-        text: {
-          message: "<p>This is introtext</p>",
+    const groupingPanelFromNewContributionsRawTextMessage =
+      new GroupingPanelModel({
+        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>",
-      },
-    });
+    const groupingPanelFromNewContributionsSimpleMessage =
+      new GroupingPanelModel({
+        key: "Book",
+        data: panelJson,
+        contributions: {
+          ...panelContributionsJson,
+          text: "<p>This is introtext</p>",
+        },
+      });
 
     expect(groupingPanelFromNewContributionsSimpleMessage.introtext).toBe(
       "<p>This is introtext</p>"

package/lib/models/process/__tests__/ProcessStatusSettingsModel.spec.js.flow

@@ -1,4 +1,5 @@
 import ProcessStatusSettingsModel from "../ProcessStatusSettingsModel";
+import { DateUtil } from "../../../utils";
 
 describe("processStatusSettingsModel", () => {
   it("should be able to create an empty ProcessStatusSettingsModel object", () => {
@@ -37,5 +38,15 @@ describe("processStatusSettingsModel", () => {
     expect(processStatus.isApplicable).toBeTruthy();
     expect(processStatus.isCompleted).toBeFalsy();
     expect(processStatus.isNeeded).toBeTruthy();
+
+    expect(processStatus.state).toBeNull();
+    expect(processStatus.canComplete).toBeNull();
+
+    expect(processStatus.referenceDate).toBe(DateUtil.now());
+
+    expect(processStatus.links).toHaveLength(1);
+    expect(processStatus.conceptLink.href.path).toBe(
+      "/concepts/Research grant/Business design/Constraints/Eligible for research grant.bixml/EligibleResearchGrant"
+    );
   });
 });

package/lib/models/types.js.flow

@@ -215,21 +215,21 @@ export type ContentElement = {
   },
 };
 
-type PropertyElementMapped = {
+export type PropertyElementMapped = {
   propertyElement: {
     label: string,
     layouthint: LayoutHintCollection,
     properties: Array<PropertyData>,
   },
 };
-type TextFragmentElementMapped = {
+export type TextFragmentElementMapped = {
   textFragmentElement: {
     label: string,
     layouthint: LayoutHintCollection,
     textfragments: Array<TextFragmentData>,
   },
 };
-type ContentElementMapped = {
+export type ContentElementMapped = {
   contentElement: {
     label: string,
     layouthint: LayoutHintCollection,

package/lib/modularui/ModularUIError.js

@@ -9,6 +9,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
 
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/assertThisInitialized"));
@@ -55,7 +57,7 @@ var ModularUIError = /*#__PURE__*/function (_Error) {
     return _this;
   }
 
-  return ModularUIError;
+  return (0, _createClass2.default)(ModularUIError);
 }( /*#__PURE__*/(0, _wrapNativeSuper2.default)(Error));
 
 var _default = ModularUIError;

package/lib/modularui/ModularUIError.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/modularui/ModularUIError.js"],"names":["ModularUIError","message","response","resource","Error","captureStackTrace"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA;AACA;IACMA,c;;;;;AAIJ;AACF;AACE,0BAAYC,OAAZ,EAA6BC,QAA7B,EAA+CC,QAA/C,EAAiE;AAAA;;AAAA;AAC/D,8BAAMF,OAAN;AAD+D;AAAA;AAG/D,UAAKC,QAAL,GAAgBA,QAAhB;AACA,UAAKC,QAAL,GAAgBA,QAAhB,CAJ+D,CAM/D;AACA;AACA;;AACA,QAAIC,KAAK,CAACC,iBAAV,EAA6B;AAC3BD,MAAAA,KAAK,CAACC,iBAAN,8CAA8BL,cAA9B;AACD;;AAX8D;AAYhE;;;+CAlB0BI,K;;eAqBdJ,c","sourcesContent":["// @flow\n/**\n */\nclass ModularUIError extends Error {\n  response: Object;\n  resource: string;\n\n  /**\n   */\n  constructor(message: string, response: Object, resource: string) {\n    super(message);\n\n    this.response = response;\n    this.resource = resource;\n\n    // Without passing ModularUIError to captureStackTrace, the ModularUIError\n    // frame would show up in the .stack property. By passing\n    // the constructor, we omit that frame, and retain all frames below it.\n    if (Error.captureStackTrace) {\n      Error.captureStackTrace(this, ModularUIError);\n    }\n  }\n}\n\nexport default ModularUIError;\n"],"file":"ModularUIError.js"}
+{"version":3,"sources":["../../src/modularui/ModularUIError.js"],"names":["ModularUIError","message","response","resource","Error","captureStackTrace"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA;AACA;IACMA,c;;;;;AAIJ;AACF;AACE,0BAAYC,OAAZ,EAA6BC,QAA7B,EAA+CC,QAA/C,EAAiE;AAAA;;AAAA;AAC/D,8BAAMF,OAAN;AAD+D;AAAA;AAG/D,UAAKC,QAAL,GAAgBA,QAAhB;AACA,UAAKC,QAAL,GAAgBA,QAAhB,CAJ+D,CAM/D;AACA;AACA;;AACA,QAAIC,KAAK,CAACC,iBAAV,EAA6B;AAC3BD,MAAAA,KAAK,CAACC,iBAAN,8CAA8BL,cAA9B;AACD;;AAX8D;AAYhE;;;+CAlB0BI,K;;eAqBdJ,c","sourcesContent":["// @flow\n/**\n */\nclass ModularUIError extends Error {\n  response: Object;\n  resource: string;\n\n  /**\n   */\n  constructor(message: string, response: Object, resource: string) {\n    super(message);\n\n    this.response = response;\n    this.resource = resource;\n\n    // Without passing ModularUIError to captureStackTrace, the ModularUIError\n    // frame would show up in the .stack property. By passing\n    // the constructor, we omit that frame, and retain all frames below it.\n    if (Error.captureStackTrace) {\n      Error.captureStackTrace(this, ModularUIError);\n    }\n  }\n}\n\nexport default ModularUIError;\n"],"file":"ModularUIError.js"}

package/lib/modularui/ModularUIRequest.js

@@ -87,9 +87,9 @@ function _unsupportedIterableToArray(o, minLen) { var _context9; if (!o) return;
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-function ownKeys(object, enumerableOnly) { var keys = _Object$keys10(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); if (enumerableOnly) { symbols = _filterInstanceProperty2(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = _Object$keys10(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty2(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (_Object$getOwnPropertyDescriptors) { Object.defineProperties(target, _Object$getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? Object.defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 /**
  * Helper for fetching data and contributions from the Be Informed modular ui
@@ -540,6 +540,35 @@ var ModularUIRequest = /*#__PURE__*/function () {
 
       return _promise.default.resolve();
     }
+    /**
+     * Retrieve an object of key: link
+     */
+
+  }, {
+    key: "dataLinksPerName",
+    value: function dataLinksPerName(dataLinks) {
+      if (Array.isArray(dataLinks)) {
+        var links = {};
+
+        var _iterator2 = _createForOfIteratorHelper(dataLinks),
+            _step2;
+
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var dataLink = _step2.value;
+            links[dataLink.name] = dataLink;
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+
+        return links;
+      }
+
+      return dataLinks;
+    }
     /**
      * Check if links are empty and hide them when hide-when-empty hint exists
      */
@@ -547,53 +576,44 @@ var ModularUIRequest = /*#__PURE__*/function () {
   }, {
     key: "processLinks",
     value: function processLinks(dataLinks, contributionLinks) {
-      var _this4 = this;
+      var linksPerName = this.dataLinksPerName(dataLinks);
+      var hideWhenEmptyLinks = (0, _filter.default)(contributionLinks).call(contributionLinks, function (contributionLink) {
+        var _contributionLink$lay;
 
+        return (_contributionLink$lay = contributionLink.layouthint) === null || _contributionLink$lay === void 0 ? void 0 : (0, _includes.default)(_contributionLink$lay).call(_contributionLink$lay, _LayoutHints.HIDE_WHEN_EMPTY);
+      });
       var isHiddenListChecks = [];
 
-      var _iterator2 = _createForOfIteratorHelper(contributionLinks),
-          _step2;
+      var _iterator3 = _createForOfIteratorHelper(hideWhenEmptyLinks),
+          _step3;
 
       try {
-        var _loop2 = function _loop2() {
-          var _contributionLink$lay;
-
-          var contributionLink = _step2.value;
-
-          if ((_contributionLink$lay = contributionLink.layouthint) !== null && _contributionLink$lay !== void 0 && (0, _includes.default)(_contributionLink$lay).call(_contributionLink$lay, _LayoutHints.HIDE_WHEN_EMPTY)) {
-            var dataLink = Array.isArray(dataLinks) ? (0, _find.default)(dataLinks).call(dataLinks, function (link) {
-              return link.name === contributionLink.name;
-            }) : dataLinks[contributionLink.name];
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var contributionLink = _step3.value;
+          var dataLink = linksPerName[contributionLink.name];
 
-            if (dataLink !== null && dataLink !== void 0 && dataLink.href) {
-              isHiddenListChecks.push(_this4.isHiddenList(contributionLink.name, dataLink.href));
-            }
+          if (dataLink !== null && dataLink !== void 0 && dataLink.href) {
+            isHiddenListChecks.push(this.isHiddenList(contributionLink.name, dataLink.href));
           }
-        };
-
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          _loop2();
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator2.f();
+        _iterator3.f();
       }
 
       return _promise.default.all(isHiddenListChecks).then(function (hiddenLinks) {
-        var newDataLinks;
-
         if (Array.isArray(dataLinks)) {
-          newDataLinks = (0, _filter.default)(dataLinks).call(dataLinks, function (dataLink) {
+          return (0, _filter.default)(dataLinks).call(dataLinks, function (dataLink) {
             return !(0, _includes.default)(hiddenLinks).call(hiddenLinks, dataLink.name);
           });
-        } else {
-          newDataLinks = {};
+        }
 
-          for (var dataLinkKey in dataLinks) {
-            if (!(0, _includes.default)(hiddenLinks).call(hiddenLinks, dataLinkKey)) {
-              newDataLinks[dataLinkKey] = dataLinks[dataLinkKey];
-            }
+        var newDataLinks = {};
+
+        for (var dataLinkKey in dataLinks) {
+          if (!(0, _includes.default)(hiddenLinks).call(hiddenLinks, dataLinkKey)) {
+            newDataLinks[dataLinkKey] = dataLinks[dataLinkKey];
           }
         }
 
@@ -703,31 +723,31 @@ var ModularUIRequest = /*#__PURE__*/function () {
   }, {
     key: "fetch",
     value: function fetch() {
-      var _this5 = this;
+      var _this4 = this;
 
       return this.fetchDataService().then(function (data) {
         if (data == null) {
-          throw new Error("No data received for ".concat(_this5.href.toString()));
+          throw new Error("No data received for ".concat(_this4.href.toString()));
         }
 
-        _this5.processDataService(data);
+        _this4.processDataService(data);
 
-        return _this5.fetchContributionsService();
+        return _this4.fetchContributionsService();
       }).then(function (contributionsData) {
         if (contributionsData == null) {
-          throw new Error("No contributions data received for ".concat(_this5.contributionsHref));
+          throw new Error("No contributions data received for ".concat(_this4.contributionsHref));
         }
 
-        _this5.processContributionsService(contributionsData);
+        _this4.processContributionsService(contributionsData);
 
-        return _this5.processAsyncLayoutHints();
+        return _this4.processAsyncLayoutHints();
       }).then(function () {
-        return _promise.default.resolve(_this5.createModel());
+        return _promise.default.resolve(_this4.createModel());
       }).then(function (model) {
-        return _this5.loadDynamicValidations(model);
+        return _this4.loadDynamicValidations(model);
       }).then(function (model) {
-        if (_this5.withChildModels) {
-          return _this5.fetchChildModels(model);
+        if (_this4.withChildModels) {
+          return _this4.fetchChildModels(model);
         }
 
         return _promise.default.resolve(model);
@@ -750,12 +770,12 @@ var ModularUIRequest = /*#__PURE__*/function () {
   }, {
     key: "fetchChildModels",
     value: function fetchChildModels(model) {
-      var _this6 = this;
+      var _this5 = this;
 
       var childModelLinks = model.getInitialChildModelLinks();
       var childModelRequests = (0, _map.default)(childModelLinks).call(childModelLinks, function (childModelLink) {
         var request = new ModularUIRequest(childModelLink.href, {
-          locale: _this6.locale
+          locale: _this5.locale
         });
 
         if (childModelLink.targetModel) {
@@ -791,11 +811,11 @@ var ModularUIRequest = /*#__PURE__*/function () {
   }, {
     key: "fetchContent",
     value: function fetchContent(withChildSections) {
-      var _this7 = this;
+      var _this6 = this;
 
       return this.fetchFromCache().then(function (model) {
         if (withChildSections && model instanceof _ContentModel.default && model.childSectionLinks.length > 0) {
-          return _this7.fetchContentChildSections(model);
+          return _this6.fetchContentChildSections(model);
         }
 
         return _promise.default.resolve(model);
@@ -809,13 +829,13 @@ var ModularUIRequest = /*#__PURE__*/function () {
     key: "fetchContentChildSections",
     value: function fetchContentChildSections(contentModel) {
       var _context8,
-          _this8 = this;
+          _this7 = this;
 
       var newContentModel = contentModel.clone();
       return _promise.default.all((0, _map.default)(_context8 = contentModel.childSectionLinks).call(_context8, function (childSectionLink) {
         var contentHrefWithEntryDate = childSectionLink.selfhref.addParameter(_Constants.TIMEVERSION_FILTER_NAME, contentModel.entryDate);
         var request = new ModularUIRequest(contentHrefWithEntryDate, {
-          locale: _this8.locale
+          locale: _this7.locale
         });
         return request.fetchContent(true);
       })).then(function (sectionModels) {

package/lib/modularui/ModularUIRequest.js.flow

@@ -386,6 +386,20 @@ class ModularUIRequest {
     return Promise.resolve();
   }
 
+  /**
+   * Retrieve an object of key: link
+   */
+  dataLinksPerName(dataLinks: any): { [linkName: string]: any } {
+    if (Array.isArray(dataLinks)) {
+      const links = {};
+      for (const dataLink of dataLinks) {
+        links[dataLink.name] = dataLink;
+      }
+      return links;
+    }
+    return dataLinks;
+  }
+
   /**
    * Check if links are empty and hide them when hide-when-empty hint exists
    */
@@ -393,42 +407,44 @@ class ModularUIRequest {
     dataLinks: any,
     contributionLinks: any
   ): Promise<Object | Array<Object>> {
+    const linksPerName = this.dataLinksPerName(dataLinks);
+    const hideWhenEmptyLinks = contributionLinks.filter((contributionLink) =>
+      contributionLink.layouthint?.includes(HIDE_WHEN_EMPTY)
+    );
+
     const isHiddenListChecks = [];
-    for (const contributionLink of contributionLinks) {
-      if (contributionLink.layouthint?.includes(HIDE_WHEN_EMPTY)) {
-        const dataLink = Array.isArray(dataLinks)
-          ? dataLinks.find((link) => link.name === contributionLink.name)
-          : dataLinks[contributionLink.name];
-
-        if (dataLink?.href) {
-          isHiddenListChecks.push(
-            this.isHiddenList(contributionLink.name, dataLink.href)
-          );
-        }
+
+    for (const contributionLink of hideWhenEmptyLinks) {
+      const dataLink = linksPerName[contributionLink.name];
+      if (dataLink?.href) {
+        isHiddenListChecks.push(
+          this.isHiddenList(contributionLink.name, dataLink.href)
+        );
       }
     }
 
-    return Promise.all(isHiddenListChecks).then((hiddenLinks) => {
-      let newDataLinks;
-      if (Array.isArray(dataLinks)) {
-        newDataLinks = dataLinks.filter(
-          (dataLink) => !hiddenLinks.includes(dataLink.name)
-        );
-      } else {
-        newDataLinks = {};
+    return Promise.all(isHiddenListChecks).then(
+      (hiddenLinks: Array<string>) => {
+        if (Array.isArray(dataLinks)) {
+          return dataLinks.filter(
+            (dataLink) => !hiddenLinks.includes(dataLink.name)
+          );
+        }
+
+        const newDataLinks = {};
         for (const dataLinkKey in dataLinks) {
           if (!hiddenLinks.includes(dataLinkKey)) {
             newDataLinks[dataLinkKey] = dataLinks[dataLinkKey];
           }
         }
+        return newDataLinks;
       }
-      return newDataLinks;
-    });
+    );
   }
 
   /**
    */
-  isHiddenList(name: string, href: string): Promise<?string> {
+  isHiddenList(name: string, href: string): Promise<string> {
     return universalFetch({
       ...this.options,
       url: `${BASE}${href}`,