@beinformed/ui 1.20.8 → 1.20.9

package/esm/modularui/ModularUIRequest.js

@@ -1,37 +1,12 @@
-import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
-import _Object$getOwnPropertyDescriptor from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor";
-import _Object$getOwnPropertyDescriptors from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors";
-import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
-import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
-import _Symbol from "@babel/runtime-corejs3/core-js-stable/symbol";
-import _getIteratorMethod from "@babel/runtime-corejs3/core-js/get-iterator-method";
-import _typeof from "@babel/runtime-corejs3/helpers/esm/typeof";
-import _asyncToGenerator from "@babel/runtime-corejs3/helpers/esm/asyncToGenerator";
-import _slicedToArray from "@babel/runtime-corejs3/helpers/esm/slicedToArray";
-import _classCallCheck from "@babel/runtime-corejs3/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime-corejs3/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
-
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-function _unsupportedIterableToArray(o, minLen) { var _context9; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context9 = Object.prototype.toString.call(o)).call(_context9, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-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; }
-
-import _regeneratorRuntime from "@babel/runtime-corejs3/regenerator";
 import _JSON$stringify from "@babel/runtime-corejs3/core-js-stable/json/stringify";
-import _Object$keys3 from "@babel/runtime-corejs3/core-js-stable/object/keys";
+import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
 import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
 import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
-
-function ownKeys(object, enumerableOnly) { var keys = _Object$keys3(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(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; }
-
 import deepmerge from "deepmerge";
 import { BASE, HTTP_METHODS, TIMEVERSION_FILTER_NAME } from "../constants/Constants";
 import { HIDE_WHEN_EMPTY } from "../constants/LayoutHints";
@@ -50,15 +25,13 @@ import { isPlainObject } from "../utils/helpers/objects";
  * Helper for fetching data and contributions from the Be Informed modular ui
  * and merge it into a target or resolvable model.
  */
-var ModularUIRequest = /*#__PURE__*/function () {
+class ModularUIRequest {
   /**
    */
-  function ModularUIRequest(href) {
+  constructor(href) {
     var _options$locale;
 
-    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-    _classCallCheck(this, ModularUIRequest);
+    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
     _defineProperty(this, "_response", void 0);
 
@@ -102,722 +75,595 @@ var ModularUIRequest = /*#__PURE__*/function () {
    */
 
 
-  _createClass(ModularUIRequest, [{
-    key: "contributionsHref",
-    get: function get() {
-      return this._contributionsHref;
-    }
-    /**
-     */
-    ,
-    set: function set(contributionsHref) {
-      this._contributionsHref = contributionsHref;
-    }
-    /**
-     */
-
-  }, {
-    key: "locale",
-    get:
-    /**
-     */
-    function get() {
-      return this._locale;
-    }
-    /**
-     */
-    ,
-    set: function set(locale) {
-      this._locale = locale;
-      this._response.locale = locale;
-    }
-  }, {
-    key: "response",
-    get: function get() {
-      return this._response;
-    }
-    /**
-     */
-
-  }, {
-    key: "href",
-    get:
-    /**
-     */
-    function get() {
-      return this._href;
-    }
-    /**
-     */
-    ,
-    set: function set(href) {
-      this._href = href;
-    }
-  }, {
-    key: "method",
-    get:
-    /**
-     */
-    function get() {
-      return this._method;
-    }
-    /**
-     */
-    ,
-    set: function set(method) {
-      this._method = method;
-    }
-  }, {
-    key: "options",
-    get: function get() {
-      return _objectSpread(_objectSpread({}, this._options), {}, {
-        locale: this.locale,
-        method: this.method
-      });
-    }
-    /**
-     */
-    ,
-    set: function set(options) {
-      this._options = options;
-    }
-    /**
-     */
+  get contributionsHref() {
+    return this._contributionsHref;
+  }
+  /**
+   */
 
-  }, {
-    key: "withChildModels",
-    get: function get() {
-      return !("childmodels" in this.options) || this.options.childmodels === true;
-    }
-    /**
-     */
-
-  }, {
-    key: "targetModel",
-    get:
-    /**
-     */
-    function get() {
-      return this._targetModel;
+
+  set contributionsHref(contributionsHref) {
+    this._contributionsHref = contributionsHref;
+  }
+  /**
+   */
+
+
+  set locale(locale) {
+    this._locale = locale;
+    this._response.locale = locale;
+  }
+  /**
+   */
+
+
+  get locale() {
+    return this._locale;
+  }
+  /**
+   */
+
+
+  get response() {
+    return this._response;
+  }
+  /**
+   */
+
+
+  set href(href) {
+    this._href = href;
+  }
+  /**
+   */
+
+
+  get href() {
+    return this._href;
+  }
+  /**
+   */
+
+
+  set method(method) {
+    this._method = method;
+  }
+  /**
+   */
+
+
+  get method() {
+    return this._method;
+  }
+  /**
+   */
+
+
+  get options() {
+    return { ...this._options,
+      locale: this.locale,
+      method: this.method
+    };
+  }
+  /**
+   */
+
+
+  set options(options) {
+    this._options = options;
+  }
+  /**
+   */
+
+
+  get withChildModels() {
+    return !("childmodels" in this.options) || this.options.childmodels === true;
+  }
+  /**
+   */
+
+
+  set targetModel(targetModel) {
+    this._targetModel = targetModel;
+  }
+  /**
+   */
+
+
+  get targetModel() {
+    return this._targetModel;
+  }
+  /**
+   */
+
+
+  createModel() {
+    const Model = this.targetModel || resolveModel(this.response); // check for ResourceModel
+
+    if (Model && Model.isApplicableModel) {
+      return new Model(this.response);
     }
-    /**
-     */
-    ,
-    set: function set(targetModel) {
-      this._targetModel = targetModel;
+
+    throw new IllegalStateException("No model available for data: ".concat(_JSON$stringify(this.response)));
+  }
+  /**
+   */
+
+
+  processContributionsService(contributionsData) {
+    if (!isPlainObject(contributionsData)) {
+      throw new IllegalArgumentException("Missing contributions data or contributions is not JSON");
     }
-  }, {
-    key: "createModel",
-    value: function createModel() {
-      var Model = this.targetModel || resolveModel(this.response); // check for ResourceModel
 
-      if (Model && Model.isApplicableModel) {
-        return new Model(this.response);
-      }
+    const [contributionsKey] = _Object$keys(contributionsData);
 
-      throw new IllegalStateException("No model available for data: ".concat(_JSON$stringify(this.response)));
+    if (contributionsData.error && contributionsKey === "error") {
+      this.handleContributionsError(contributionsData.error);
+    } // The key of the data service is different from the contributions service for forms
+
+
+    if (!(this.response.key in contributionsData)) {
+      this.response.key = contributionsKey;
     }
-    /**
-     */
-
-  }, {
-    key: "processContributionsService",
-    value: function processContributionsService(contributionsData) {
-      if (!isPlainObject(contributionsData)) {
-        throw new IllegalArgumentException("Missing contributions data or contributions is not JSON");
-      }
 
-      var _Object$keys = _Object$keys3(contributionsData),
-          _Object$keys2 = _slicedToArray(_Object$keys, 1),
-          contributionsKey = _Object$keys2[0];
+    this.response.contributions = contributionsData[this.response.key];
+  }
+  /**
+   */
 
-      if (contributionsData.error && contributionsKey === "error") {
-        this.handleContributionsError(contributionsData.error);
-      } // The key of the data service is different from the contributions service for forms
 
+  handleContributionsError(error) {
+    var _error$properties$mes, _error$properties;
 
-      if (!(this.response.key in contributionsData)) {
-        this.response.key = contributionsKey;
-      }
+    const errorMessage = (_error$properties$mes = (_error$properties = error.properties) === null || _error$properties === void 0 ? void 0 : _error$properties.message) !== null && _error$properties$mes !== void 0 ? _error$properties$mes : "Error in contribution";
+    throw new ModularUIError(errorMessage, error, this.contributionsHref);
+  }
+  /**
+   */
 
-      this.response.contributions = contributionsData[this.response.key];
-    }
-    /**
-     */
 
-  }, {
-    key: "handleContributionsError",
-    value: function handleContributionsError(error) {
-      var _error$properties$mes, _error$properties;
+  handleDataError(error) {
+    if (error.properties) {
+      var _error$properties$mes2, _error$properties2;
 
-      var errorMessage = (_error$properties$mes = (_error$properties = error.properties) === null || _error$properties === void 0 ? void 0 : _error$properties.message) !== null && _error$properties$mes !== void 0 ? _error$properties$mes : "Error in contribution";
-      throw new ModularUIError(errorMessage, error, this.contributionsHref);
+      const errorMessage = (_error$properties$mes2 = (_error$properties2 = error.properties) === null || _error$properties2 === void 0 ? void 0 : _error$properties2.message) !== null && _error$properties$mes2 !== void 0 ? _error$properties$mes2 : "Error in data";
+      throw new ModularUIError(errorMessage, error, this.href.path.toString());
     }
-    /**
-     */
 
-  }, {
-    key: "handleDataError",
-    value: function handleDataError(error) {
-      if (error.properties) {
-        var _error$properties$mes2, _error$properties2;
+    throw new IllegalArgumentException(error);
+  }
+  /**
+   */
 
-        var errorMessage = (_error$properties$mes2 = (_error$properties2 = error.properties) === null || _error$properties2 === void 0 ? void 0 : _error$properties2.message) !== null && _error$properties$mes2 !== void 0 ? _error$properties$mes2 : "Error in data";
-        throw new ModularUIError(errorMessage, error, this.href.path.toString());
-      }
 
-      throw new IllegalArgumentException(error);
+  handleData(key, data) {
+    this.response.key = key;
+    this.response.data = data;
+    const links = data._links;
+
+    if (links && links.contributions) {
+      this.contributionsHref = links.contributions.href;
+    } else if (Array.isArray(links) && links[0].contributions) {
+      this.contributionsHref = links[0].contributions.href;
+    } else {
+      throw new IllegalArgumentException("Contributions link not found for data with key ".concat(key));
     }
-    /**
-     */
-
-  }, {
-    key: "handleData",
-    value: function handleData(key, data) {
-      this.response.key = key;
-      this.response.data = data;
-      var links = data._links;
-
-      if (links && links.contributions) {
-        this.contributionsHref = links.contributions.href;
-      } else if (Array.isArray(links) && links[0].contributions) {
-        this.contributionsHref = links[0].contributions.href;
-      } else {
-        throw new IllegalArgumentException("Contributions link not found for data with key ".concat(key));
-      }
+  }
+  /**
+   */
+
+
+  processDataService(data) {
+    if (!isPlainObject(data)) {
+      throw new IllegalArgumentException("Missing data or data is not JSON");
     }
-    /**
-     */
-
-  }, {
-    key: "processDataService",
-    value: function processDataService(data) {
-      if (!isPlainObject(data)) {
-        throw new IllegalArgumentException("Missing data or data is not JSON");
-      }
 
-      if (data.error) {
-        this.handleDataError(data.error);
-      } else {
-        var _Object$keys4 = _Object$keys3(data),
-            _Object$keys5 = _slicedToArray(_Object$keys4, 1),
-            key = _Object$keys5[0];
+    if (data.error) {
+      this.handleDataError(data.error);
+    } else {
+      const [key] = _Object$keys(data);
 
-        this.handleData(key, data[key]);
-      }
+      this.handleData(key, data[key]);
     }
-    /**
-     */
+  }
+  /**
+   */
 
-  }, {
-    key: "fetchContributionsService",
-    value: function fetchContributionsService() {
-      var _context;
 
-      if (!this.contributionsHref) {
-        throw new IllegalStateException("Missing a contributions href");
-      }
+  fetchContributionsService() {
+    var _context;
 
-      return universalFetch({
-        url: _concatInstanceProperty(_context = "".concat(BASE)).call(_context, this.contributionsHref),
-        cache: true,
-        locale: this.options.locale
-      });
-    }
-    /**
-     */
-
-  }, {
-    key: "fetchDataService",
-    value: function fetchDataService() {
-      var _context2;
-
-      return universalFetch(_objectSpread(_objectSpread({}, this.options), {}, {
-        url: _concatInstanceProperty(_context2 = "".concat(BASE)).call(_context2, this.href.path),
-        params: this.href.getQuerystringForModularUI(),
-        locale: this.options.locale,
-        onProgress: this.onProgress
-      }));
+    if (!this.contributionsHref) {
+      throw new IllegalStateException("Missing a contributions href");
     }
-    /**
-     * Check if links contain a 'hide-when-empty' layout hint and remove the link from
-     * the component when it exists and no results are available
-     */
-
-  }, {
-    key: "processAsyncLayoutHints",
-    value: function () {
-      var _processAsyncLayoutHints = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        return _regeneratorRuntime.wrap(function _callee$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                if (!getSetting("ALLOW_HIDE_WHEN_EMPTY_ON_TABS")) {
-                  _context3.next = 5;
-                  break;
-                }
-
-                _context3.next = 3;
-                return this.processApplicationLinks();
-
-              case 3:
-                _context3.next = 5;
-                return this.processTabLinks();
-
-              case 5:
-                _context3.next = 7;
-                return this.processPanelLinks();
-
-              case 7:
-                return _context3.abrupt("return", _Promise.resolve());
-
-              case 8:
-              case "end":
-                return _context3.stop();
-            }
-          }
-        }, _callee, this);
-      }));
 
-      function processAsyncLayoutHints() {
-        return _processAsyncLayoutHints.apply(this, arguments);
-      }
+    return universalFetch({
+      url: _concatInstanceProperty(_context = "".concat(BASE)).call(_context, this.contributionsHref),
+      cache: true,
+      locale: this.options.locale
+    });
+  }
+  /**
+   */
 
-      return processAsyncLayoutHints;
-    }()
-    /**
-     * hide application links<br>
-     * _links on application data contains an extra level of tab links
-     */
 
-  }, {
-    key: "processApplicationLinks",
-    value: function processApplicationLinks() {
-      var _this = this;
+  fetchDataService() {
+    var _context2;
 
-      var contributionLinks = this.response.contributions._links;
-      var dataLinks = this.response.data._links;
+    return universalFetch({ ...this.options,
+      url: _concatInstanceProperty(_context2 = "".concat(BASE)).call(_context2, this.href.path),
+      params: this.href.getQuerystringForModularUI(),
+      locale: this.options.locale,
+      onProgress: this.onProgress
+    });
+  }
+  /**
+   * Check if links contain a 'hide-when-empty' layout hint and remove the link from
+   * the component when it exists and no results are available
+   */
 
-      if (!contributionLinks || !dataLinks) {
-        return _Promise.resolve();
-      }
 
-      if ("tab" in contributionLinks && "tab" in dataLinks) {
-        var _iterator = _createForOfIteratorHelper(contributionLinks.tab),
-            _step;
+  async processAsyncLayoutHints() {
+    if (getSetting("ALLOW_HIDE_WHEN_EMPTY_ON_TABS")) {
+      await this.processApplicationLinks();
+      await this.processTabLinks();
+    }
 
-        try {
-          var _loop = function _loop() {
-            var contributionTabLink = _step.value;
+    await this.processPanelLinks();
+    return _Promise.resolve();
+  }
+  /**
+   * hide application links<br>
+   * _links on application data contains an extra level of tab links
+   */
 
-            if ("components" in contributionTabLink) {
-              var _context4;
 
-              var dataTabLinks = _findInstanceProperty(_context4 = dataLinks.tab).call(_context4, function (dataLink) {
-                return dataLink.name === contributionTabLink.name;
-              });
+  processApplicationLinks() {
+    const contributionLinks = this.response.contributions._links;
+    const dataLinks = this.response.data._links;
 
-              if (dataTabLinks && "components" in dataTabLinks) {
-                return {
-                  v: _this.processLinks(dataTabLinks.components, contributionTabLink.components).then(function (newLinks) {
-                    return _this.replaceApplicationLinks(contributionTabLink.name, newLinks);
-                  })
-                };
-              }
-            }
-          };
+    if (!contributionLinks || !dataLinks) {
+      return _Promise.resolve();
+    }
 
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var _ret = _loop();
+    if ("tab" in contributionLinks && "tab" in dataLinks) {
+      for (const contributionTabLink of contributionLinks.tab) {
+        if ("components" in contributionTabLink) {
+          var _context3;
 
-            if (_typeof(_ret) === "object") return _ret.v;
+          const dataTabLinks = _findInstanceProperty(_context3 = dataLinks.tab).call(_context3, dataLink => dataLink.name === contributionTabLink.name);
+
+          if (dataTabLinks && "components" in dataTabLinks) {
+            return this.processLinks(dataTabLinks.components, contributionTabLink.components).then(newLinks => this.replaceApplicationLinks(contributionTabLink.name, newLinks));
           }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
         }
       }
-
-      return _Promise.resolve();
     }
-    /**
-     * Replace hidden link in application link tree
-     */
 
-  }, {
-    key: "replaceApplicationLinks",
-    value: function replaceApplicationLinks(tabName, newLinks) {
-      var _context5;
+    return _Promise.resolve();
+  }
+  /**
+   * Replace hidden link in application link tree
+   */
 
-      this.response.data._links.tab = _mapInstanceProperty(_context5 = this.response.data._links.tab).call(_context5, function (tabLink) {
-        var key = tabLink.name;
 
-        if (tabName === key) {
-          tabLink.components = newLinks;
-        }
+  replaceApplicationLinks(tabName, newLinks) {
+    var _context4;
 
-        return tabLink;
-      });
-    }
-    /**
-     */
+    this.response.data._links.tab = _mapInstanceProperty(_context4 = this.response.data._links.tab).call(_context4, tabLink => {
+      const key = tabLink.name;
 
-  }, {
-    key: "processTabLinks",
-    value: function processTabLinks() {
-      var _this2 = this;
+      if (tabName === key) {
+        tabLink.components = newLinks;
+      }
 
-      var contributionLinks = this.response.contributions._links;
+      return tabLink;
+    });
+  }
+  /**
+   */
 
-      if (!contributionLinks) {
-        return _Promise.resolve();
-      }
 
-      if ("component" in contributionLinks) {
-        return this.processLinks(this.response.data._links.component, contributionLinks.component).then(function (newLinks) {
-          _this2.response.data._links.component = newLinks;
-        });
-      }
+  processTabLinks() {
+    const contributionLinks = this.response.contributions._links;
 
+    if (!contributionLinks) {
       return _Promise.resolve();
     }
-    /**
-     */
 
-  }, {
-    key: "processPanelLinks",
-    value: function processPanelLinks() {
-      var _this3 = this;
+    if ("component" in contributionLinks) {
+      return this.processLinks(this.response.data._links.component, contributionLinks.component).then(newLinks => {
+        this.response.data._links.component = newLinks;
+      });
+    }
 
-      var contributionLinks = this.response.contributions._links;
+    return _Promise.resolve();
+  }
+  /**
+   */
 
-      if (!contributionLinks) {
-        return _Promise.resolve();
-      }
 
-      if ("panel" in contributionLinks) {
-        return this.processLinks(this.response.data._links, contributionLinks.panel).then(function (newLinks) {
-          _this3.response.data._links = newLinks;
-        });
-      }
+  processPanelLinks() {
+    const contributionLinks = this.response.contributions._links;
 
+    if (!contributionLinks) {
       return _Promise.resolve();
     }
-    /**
-     * Retrieve an object of key: link
-     */
 
-  }, {
-    key: "dataLinksPerName",
-    value: function dataLinksPerName(dataLinks) {
-      if (Array.isArray(dataLinks)) {
-        var links = {};
+    if ("panel" in contributionLinks) {
+      return this.processLinks(this.response.data._links, contributionLinks.panel).then(newLinks => {
+        this.response.data._links = newLinks;
+      });
+    }
 
-        var _iterator2 = _createForOfIteratorHelper(dataLinks),
-            _step2;
+    return _Promise.resolve();
+  }
+  /**
+   * Retrieve an object of key: link
+   */
 
-        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;
+  dataLinksPerName(dataLinks) {
+    if (Array.isArray(dataLinks)) {
+      const links = {};
+
+      for (const dataLink of dataLinks) {
+        links[dataLink.name] = dataLink;
       }
 
-      return dataLinks;
+      return links;
     }
-    /**
-     * Check if links are empty and hide them when hide-when-empty hint exists
-     */
 
-  }, {
-    key: "processLinks",
-    value: function processLinks(dataLinks, contributionLinks) {
-      var linksPerName = this.dataLinksPerName(dataLinks);
+    return dataLinks;
+  }
+  /**
+   * Check if links are empty and hide them when hide-when-empty hint exists
+   */
 
-      var hideWhenEmptyLinks = _filterInstanceProperty(contributionLinks).call(contributionLinks, function (contributionLink) {
-        var _contributionLink$lay;
 
-        return (_contributionLink$lay = contributionLink.layouthint) === null || _contributionLink$lay === void 0 ? void 0 : _includesInstanceProperty(_contributionLink$lay).call(_contributionLink$lay, HIDE_WHEN_EMPTY);
-      });
+  processLinks(dataLinks, contributionLinks) {
+    const linksPerName = this.dataLinksPerName(dataLinks);
 
-      var isHiddenListChecks = [];
+    const hideWhenEmptyLinks = _filterInstanceProperty(contributionLinks).call(contributionLinks, contributionLink => {
+      var _contributionLink$lay;
 
-      var _iterator3 = _createForOfIteratorHelper(hideWhenEmptyLinks),
-          _step3;
+      return (_contributionLink$lay = contributionLink.layouthint) === null || _contributionLink$lay === void 0 ? void 0 : _includesInstanceProperty(_contributionLink$lay).call(_contributionLink$lay, HIDE_WHEN_EMPTY);
+    });
 
-      try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var contributionLink = _step3.value;
-          var dataLink = linksPerName[contributionLink.name];
+    const isHiddenListChecks = [];
 
-          if (dataLink !== null && dataLink !== void 0 && dataLink.href) {
-            isHiddenListChecks.push(this.isHiddenList(contributionLink.name, dataLink.href));
-          }
-        }
-      } catch (err) {
-        _iterator3.e(err);
-      } finally {
-        _iterator3.f();
+    for (const contributionLink of hideWhenEmptyLinks) {
+      const dataLink = linksPerName[contributionLink.name];
+
+      if (dataLink !== null && dataLink !== void 0 && dataLink.href) {
+        isHiddenListChecks.push(this.isHiddenList(contributionLink.name, dataLink.href));
+      }
+    }
+
+    return _Promise.all(isHiddenListChecks).then(hiddenLinks => {
+      if (Array.isArray(dataLinks)) {
+        return _filterInstanceProperty(dataLinks).call(dataLinks, dataLink => !_includesInstanceProperty(hiddenLinks).call(hiddenLinks, dataLink.name));
       }
 
-      return _Promise.all(isHiddenListChecks).then(function (hiddenLinks) {
-        if (Array.isArray(dataLinks)) {
-          return _filterInstanceProperty(dataLinks).call(dataLinks, function (dataLink) {
-            return !_includesInstanceProperty(hiddenLinks).call(hiddenLinks, dataLink.name);
-          });
+      const newDataLinks = {};
+
+      for (const dataLinkKey in dataLinks) {
+        if (!_includesInstanceProperty(hiddenLinks).call(hiddenLinks, dataLinkKey)) {
+          newDataLinks[dataLinkKey] = dataLinks[dataLinkKey];
         }
+      }
 
-        var newDataLinks = {};
+      return newDataLinks;
+    });
+  }
+  /**
+   */
 
-        for (var dataLinkKey in dataLinks) {
-          if (!_includesInstanceProperty(hiddenLinks).call(hiddenLinks, dataLinkKey)) {
-            newDataLinks[dataLinkKey] = dataLinks[dataLinkKey];
-          }
+
+  isHiddenList(name, href) {
+    var _context5;
+
+    const HIDE_WHEN_EMPTY_IGNORE_TASKS = getSetting("HIDE_WHEN_EMPTY_IGNORE_TASKS", false);
+    return universalFetch({ ...this.options,
+      url: _concatInstanceProperty(_context5 = "".concat(BASE)).call(_context5, href)
+    }).then(response => {
+      if (isPlainObject(response)) {
+        const [key] = _Object$keys(response);
+
+        const {
+          _embedded,
+          actions
+        } = response[key];
+        const noListItems = _embedded === null;
+        const noActions = actions == null || HIDE_WHEN_EMPTY_IGNORE_TASKS;
+        const isHidden = noListItems && noActions;
+
+        if (isHidden) {
+          return name;
         }
+      }
 
-        return newDataLinks;
-      });
+      return "";
+    }).catch(() => {
+      return "";
+    });
+  }
+  /**
+   */
+
+
+  set onProgress(progressEvent) {
+    this._progressEvent = progressEvent;
+  }
+  /**
+   */
+
+
+  get onProgress() {
+    return this._progressEvent || null;
+  }
+  /**
+   * Combine previous send request data with new validation data to create a complete request object
+   * The received model is new FormModel containing ONLY the current question, not the previously entered questions
+   * to create a complete request we append the originally send form objects
+   */
+
+
+  getDynamicValidationData(model) {
+    var _JSON$stringify2;
+
+    const prevData = typeof this.options.data === "string" ? JSON.parse(this.options.data) : this.options.data;
+
+    if (model instanceof FormModel) {
+      const newData = JSON.parse(model.validationData); // $FlowFixMe incompatible-call
+
+      return _JSON$stringify(deepmerge(prevData || {}, newData));
     }
-    /**
-     */
 
-  }, {
-    key: "isHiddenList",
-    value: function isHiddenList(name, href) {
+    return (_JSON$stringify2 = _JSON$stringify(prevData)) !== null && _JSON$stringify2 !== void 0 ? _JSON$stringify2 : "{}";
+  }
+  /**
+   * First load of dynamic values when a form is loaded
+   */
+
+
+  loadDynamicValidations(model) {
+    if (!this.options.isValidationRequest && getSetting("USE_INSTANT_SERVER_VALIDATION") && model instanceof FormModel && model.currentFormObject && model.currentFormObject.hasDynamicValidations) {
       var _context6;
 
-      var HIDE_WHEN_EMPTY_IGNORE_TASKS = getSetting("HIDE_WHEN_EMPTY_IGNORE_TASKS", false);
-      return universalFetch(_objectSpread(_objectSpread({}, this.options), {}, {
-        url: _concatInstanceProperty(_context6 = "".concat(BASE)).call(_context6, href)
-      })).then(function (response) {
-        if (isPlainObject(response)) {
-          var _Object$keys6 = _Object$keys3(response),
-              _Object$keys7 = _slicedToArray(_Object$keys6, 1),
-              key = _Object$keys7[0];
-
-          var _response$key = response[key],
-              _embedded = _response$key._embedded,
-              actions = _response$key.actions;
-          var noListItems = _embedded === null;
-          var noActions = actions == null || HIDE_WHEN_EMPTY_IGNORE_TASKS;
-          var isHidden = noListItems && noActions;
-
-          if (isHidden) {
-            return name;
-          }
+      const validationHref = this.href.setParameter("commit", "false");
+      return universalFetch({ ...this.options,
+        url: _concatInstanceProperty(_context6 = "".concat(BASE)).call(_context6, this.href.path),
+        params: validationHref.getQuerystringForModularUI(),
+        childmodels: false,
+        data: this.getDynamicValidationData(model)
+      }).then(data => {
+        if (data == null || typeof data !== "object") {
+          return model;
         }
 
-        return "";
-      }).catch(function () {
-        return "";
+        const [key] = _Object$keys(data);
+
+        return model.updateValidations(data[key]);
       });
     }
-    /**
-     */
-
-  }, {
-    key: "onProgress",
-    get:
-    /**
-     */
-    function get() {
-      return this._progressEvent || null;
-    }
-    /**
-     * Combine previous send request data with new validation data to create a complete request object
-     * The received model is new FormModel containing ONLY the current question, not the previously entered questions
-     * to create a complete request we append the originally send form objects
-     */
-    ,
-    set: function set(progressEvent) {
-      this._progressEvent = progressEvent;
-    }
-  }, {
-    key: "getDynamicValidationData",
-    value: function getDynamicValidationData(model) {
-      var _JSON$stringify2;
 
-      var prevData = typeof this.options.data === "string" ? JSON.parse(this.options.data) : this.options.data;
+    return _Promise.resolve(model);
+  }
+  /**
+   */
 
-      if (model instanceof FormModel) {
-        var newData = JSON.parse(model.validationData); // $FlowFixMe incompatible-call
 
-        return _JSON$stringify(deepmerge(prevData || {}, newData));
+  fetch() {
+    return this.fetchDataService().then(data => {
+      if (data == null) {
+        throw new Error("No data received for ".concat(this.href.toString()));
       }
 
-      return (_JSON$stringify2 = _JSON$stringify(prevData)) !== null && _JSON$stringify2 !== void 0 ? _JSON$stringify2 : "{}";
-    }
-    /**
-     * First load of dynamic values when a form is loaded
-     */
-
-  }, {
-    key: "loadDynamicValidations",
-    value: function loadDynamicValidations(model) {
-      if (!this.options.isValidationRequest && getSetting("USE_INSTANT_SERVER_VALIDATION") && model instanceof FormModel && model.currentFormObject && model.currentFormObject.hasDynamicValidations) {
-        var _context7;
-
-        var validationHref = this.href.setParameter("commit", "false");
-        return universalFetch(_objectSpread(_objectSpread({}, this.options), {}, {
-          url: _concatInstanceProperty(_context7 = "".concat(BASE)).call(_context7, this.href.path),
-          params: validationHref.getQuerystringForModularUI(),
-          childmodels: false,
-          data: this.getDynamicValidationData(model)
-        })).then(function (data) {
-          if (data == null || _typeof(data) !== "object") {
-            return model;
-          }
-
-          var _Object$keys8 = _Object$keys3(data),
-              _Object$keys9 = _slicedToArray(_Object$keys8, 1),
-              key = _Object$keys9[0];
+      this.processDataService(data);
+      return this.fetchContributionsService();
+    }).then(contributionsData => {
+      if (contributionsData == null) {
+        throw new Error("No contributions data received for ".concat(this.contributionsHref));
+      }
 
-          return model.updateValidations(data[key]);
-        });
+      this.processContributionsService(contributionsData);
+      return this.processAsyncLayoutHints();
+    }).then(() => _Promise.resolve(this.createModel())).then(model => this.loadDynamicValidations(model)).then(model => {
+      if (this.withChildModels) {
+        return this.fetchChildModels(model);
       }
 
       return _Promise.resolve(model);
-    }
-    /**
-     */
-
-  }, {
-    key: "fetch",
-    value: function fetch() {
-      var _this4 = this;
-
-      return this.fetchDataService().then(function (data) {
-        if (data == null) {
-          throw new Error("No data received for ".concat(_this4.href.toString()));
-        }
+    });
+  }
+  /**
+   */
 
-        _this4.processDataService(data);
 
-        return _this4.fetchContributionsService();
-      }).then(function (contributionsData) {
-        if (contributionsData == null) {
-          throw new Error("No contributions data received for ".concat(_this4.contributionsHref));
-        }
+  fetchFromCache() {
+    this.options = { ...this.options,
+      cache: true
+    };
+    return this.fetch();
+  }
+  /**
+   */
 
-        _this4.processContributionsService(contributionsData);
 
-        return _this4.processAsyncLayoutHints();
-      }).then(function () {
-        return _Promise.resolve(_this4.createModel());
-      }).then(function (model) {
-        return _this4.loadDynamicValidations(model);
-      }).then(function (model) {
-        if (_this4.withChildModels) {
-          return _this4.fetchChildModels(model);
-        }
+  fetchChildModels(model) {
+    const childModelLinks = model.getInitialChildModelLinks();
 
-        return _Promise.resolve(model);
-      });
-    }
-    /**
-     */
-
-  }, {
-    key: "fetchFromCache",
-    value: function fetchFromCache() {
-      this.options = _objectSpread(_objectSpread({}, this.options), {}, {
-        cache: true
+    const childModelRequests = _mapInstanceProperty(childModelLinks).call(childModelLinks, childModelLink => {
+      const request = new ModularUIRequest(childModelLink.href, {
+        locale: this.locale
       });
-      return this.fetch();
-    }
-    /**
-     */
 
-  }, {
-    key: "fetchChildModels",
-    value: function fetchChildModels(model) {
-      var _this5 = this;
+      if (childModelLink.targetModel) {
+        request.targetModel = childModelLink.targetModel;
+      }
 
-      var childModelLinks = model.getInitialChildModelLinks();
+      if (childModelLink.isCacheable) {
+        return request.fetchFromCache();
+      }
 
-      var childModelRequests = _mapInstanceProperty(childModelLinks).call(childModelLinks, function (childModelLink) {
-        var request = new ModularUIRequest(childModelLink.href, {
-          locale: _this5.locale
-        });
+      return request.fetch();
+    });
 
-        if (childModelLink.targetModel) {
-          request.targetModel = childModelLink.targetModel;
-        }
+    return _Promise.allSettled(childModelRequests).then(childModels => {
+      const resolvedChildModels = [];
+      childModels.forEach(childModel => {
+        if (childModel.status === "rejected") {
+          const {
+            reason
+          } = childModel;
 
-        if (childModelLink.isCacheable) {
-          return request.fetchFromCache();
+          if (reason.name !== "Error.ChangePasswordRequired") {
+            console.error("Unexpected error when retrieving child model:", reason);
+          }
+        } else {
+          resolvedChildModels.push(childModel.value);
         }
-
-        return request.fetch();
       });
+      model.addChildModels(resolvedChildModels);
+      return model;
+    });
+  }
+  /**
+   */
 
-      return _Promise.allSettled(childModelRequests).then(function (childModels) {
-        var resolvedChildModels = [];
-        childModels.forEach(function (childModel) {
-          if (childModel.status === "rejected") {
-            var reason = childModel.reason;
-
-            if (reason.name !== "Error.ChangePasswordRequired") {
-              console.error("Unexpected error when retrieving child model:", reason);
-            }
-          } else {
-            resolvedChildModels.push(childModel.value);
-          }
-        });
-        model.addChildModels(resolvedChildModels);
-        return model;
-      });
-    }
-    /**
-     */
 
-  }, {
-    key: "fetchContent",
-    value: function fetchContent(withChildSections) {
-      var _this6 = this;
+  fetchContent(withChildSections) {
+    return this.fetchFromCache().then(model => {
+      if (withChildSections && model instanceof ContentModel && model.childSectionLinks.length > 0) {
+        return this.fetchContentChildSections(model);
+      }
 
-      return this.fetchFromCache().then(function (model) {
-        if (withChildSections && model instanceof ContentModel && model.childSectionLinks.length > 0) {
-          return _this6.fetchContentChildSections(model);
-        }
+      return _Promise.resolve(model);
+    });
+  }
+  /**
+   * Recursively return child sections defined on the content model
+   */
 
-        return _Promise.resolve(model);
-      });
-    }
-    /**
-     * Recursively return child sections defined on the content model
-     */
-
-  }, {
-    key: "fetchContentChildSections",
-    value: function fetchContentChildSections(contentModel) {
-      var _context8,
-          _this7 = this;
-
-      var newContentModel = contentModel.clone();
-      return _Promise.all(_mapInstanceProperty(_context8 = contentModel.childSectionLinks).call(_context8, function (childSectionLink) {
-        var contentHrefWithEntryDate = childSectionLink.selfhref.addParameter(TIMEVERSION_FILTER_NAME, contentModel.entryDate);
-        var request = new ModularUIRequest(contentHrefWithEntryDate, {
-          locale: _this7.locale
-        });
-        return request.fetchContent(true);
-      })).then(function (sectionModels) {
-        newContentModel.childSections = sectionModels;
-        return newContentModel;
+
+  fetchContentChildSections(contentModel) {
+    var _context7;
+
+    const newContentModel = contentModel.clone();
+    return _Promise.all(_mapInstanceProperty(_context7 = contentModel.childSectionLinks).call(_context7, childSectionLink => {
+      const contentHrefWithEntryDate = childSectionLink.selfhref.addParameter(TIMEVERSION_FILTER_NAME, contentModel.entryDate);
+      const request = new ModularUIRequest(contentHrefWithEntryDate, {
+        locale: this.locale
       });
-    }
-  }]);
+      return request.fetchContent(true);
+    })).then(sectionModels => {
+      newContentModel.childSections = sectionModels;
+      return newContentModel;
+    });
+  }
 
-  return ModularUIRequest;
-}();
+}
 
 export default ModularUIRequest;
 //# sourceMappingURL=ModularUIRequest.js.map