@ukhomeoffice/cop-react-form-renderer 2.1.0 → 2.6.0

package/dist/models/ComponentTypes.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var TYPE_AUTOCOMPLETE = 'autocomplete';
 var TYPE_CHECKBOXES = 'checkboxes';
+var TYPE_CONTAINER = 'container';
 var TYPE_DATE = 'date';
 var TYPE_EMAIL = 'email';
 var TYPE_HEADING = 'heading';
@@ -15,9 +16,11 @@ var TYPE_PHONE_NUMBER = 'phone-number';
 var TYPE_RADIOS = 'radios';
 var TYPE_TEXT = 'text';
 var TYPE_TEXT_AREA = 'textarea';
+var TYPE_TIME = 'time';
 var ComponentTypes = {
   AUTOCOMPLETE: TYPE_AUTOCOMPLETE,
   CHECKBOXES: TYPE_CHECKBOXES,
+  CONTAINER: TYPE_CONTAINER,
   DATE: TYPE_DATE,
   EMAIL: TYPE_EMAIL,
   HEADING: TYPE_HEADING,
@@ -26,7 +29,8 @@ var ComponentTypes = {
   PHONE_NUMBER: TYPE_PHONE_NUMBER,
   RADIOS: TYPE_RADIOS,
   TEXT: TYPE_TEXT,
-  TEXT_AREA: TYPE_TEXT_AREA
+  TEXT_AREA: TYPE_TEXT_AREA,
+  TIME: TYPE_TIME
 };
 var _default = ComponentTypes;
 exports.default = _default;

package/dist/models/FormTypes.js

@@ -7,11 +7,13 @@ exports.default = void 0;
 var TYPE_FORM = 'form';
 var TYPE_CHECK_YOUR_ANSWERS = 'cya';
 var TYPE_HUB_AND_SPOKE = 'hub-and-spoke';
+var TYPE_TASK_LIST = 'task-list';
 var TYPE_WIZARD = 'wizard';
 var FormTypes = {
   FORM: TYPE_FORM,
   CYA: TYPE_CHECK_YOUR_ANSWERS,
   HUB: TYPE_HUB_AND_SPOKE,
+  TASK: TYPE_TASK_LIST,
   WIZARD: TYPE_WIZARD
 };
 var _default = FormTypes;

package/dist/models/HubFormats.js

@@ -5,8 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var HUB_FORMAT_CYA = 'CYA';
+var HUB_FORMAT_TASK = 'TASK';
 var HubFormats = {
-  CYA: HUB_FORMAT_CYA
+  CYA: HUB_FORMAT_CYA,
+  TASK: HUB_FORMAT_TASK
 };
 var _default = HubFormats;
 exports.default = _default;

package/dist/models/PageAction.js

@@ -11,11 +11,13 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 var TYPE_NAVIGATE = 'navigate';
 var TYPE_SAVE_AND_CONTINUE = 'saveAndContinue';
+var TYPE_SAVE_AND_NAVIGATE = 'saveAndNavigate';
 var TYPE_SAVE_AND_RETURN = 'saveAndReturn';
 var TYPE_SUBMIT = 'submit';
 var PageActionTypes = {
   NAVIGATE: TYPE_NAVIGATE,
   SAVE_AND_CONTINUE: TYPE_SAVE_AND_CONTINUE,
+  SAVE_AND_NAVIGATE: TYPE_SAVE_AND_NAVIGATE,
   SAVE_AND_RETURN: TYPE_SAVE_AND_RETURN,
   SUBMIT: TYPE_SUBMIT
 };
@@ -24,6 +26,9 @@ var DefaultPageActions = (_DefaultPageActions = {}, _defineProperty(_DefaultPage
   type: TYPE_SAVE_AND_CONTINUE,
   validate: true,
   label: 'Save and continue'
+}), _defineProperty(_DefaultPageActions, TYPE_SAVE_AND_NAVIGATE, {
+  type: TYPE_SAVE_AND_NAVIGATE,
+  validate: true
 }), _defineProperty(_DefaultPageActions, TYPE_SAVE_AND_RETURN, {
   type: TYPE_SAVE_AND_RETURN,
   validate: false,

package/dist/models/TaskStates.js

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.StateTypes = void 0;
+
+var _StateDetails;
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+var TYPE_COMPLETE = 'complete';
+var TYPE_IN_PROGRESS = 'inProgress';
+var TYPE_NOT_STARTED = 'notStarted';
+var TYPE_CANNOT_START_YET = 'cannotStartYet';
+var StateTypes = {
+  COMPLETE: TYPE_COMPLETE,
+  IN_PROGRESS: TYPE_IN_PROGRESS,
+  NOT_STARTED: TYPE_NOT_STARTED,
+  CANNOT_START_YET: TYPE_CANNOT_START_YET
+};
+exports.StateTypes = StateTypes;
+var StateDetails = (_StateDetails = {}, _defineProperty(_StateDetails, TYPE_COMPLETE, {
+  label: 'Completed',
+  colour: ''
+}), _defineProperty(_StateDetails, TYPE_IN_PROGRESS, {
+  label: 'In Progress',
+  colour: 'blue'
+}), _defineProperty(_StateDetails, TYPE_NOT_STARTED, {
+  label: 'Not Started',
+  colour: 'grey'
+}), _defineProperty(_StateDetails, TYPE_CANNOT_START_YET, {
+  label: 'Cannot Start Yet',
+  colour: 'grey'
+}), _StateDetails);
+var TaskStates = {
+  TYPES: StateTypes,
+  DETAILS: StateDetails
+};
+var _default = TaskStates;
+exports.default = _default;

package/dist/models/index.js

@@ -39,6 +39,12 @@ Object.defineProperty(exports, "PageAction", {
     return _PageAction.default;
   }
 });
+Object.defineProperty(exports, "TaskStates", {
+  enumerable: true,
+  get: function get() {
+    return _TaskStates.default;
+  }
+});
 
 var _ComponentTypes = _interopRequireDefault(require("./ComponentTypes"));
 
@@ -52,4 +58,6 @@ var _HubFormats = _interopRequireDefault(require("./HubFormats"));
 
 var _PageAction = _interopRequireDefault(require("./PageAction"));
 
+var _TaskStates = _interopRequireDefault(require("./TaskStates"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/dist/utils/CheckYourAnswers/getCYARowsForContainer.js

@@ -0,0 +1,40 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _models = require("../../models");
+
+var _getCYARow = _interopRequireDefault(require("./getCYARow"));
+
+var _showComponentCYA = _interopRequireDefault(require("./showComponentCYA"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(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) { _defineProperty(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 _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+var getCYARowsForContainer = function getCYARowsForContainer(page, container, formData, onAction) {
+  if ((0, _showComponentCYA.default)(container, page.formData)) {
+    return container.components.filter(function (c) {
+      return (0, _showComponentCYA.default)(c, page.formData);
+    }).flatMap(function (component) {
+      if (component.type === _models.ComponentTypes.CONTAINER) {
+        var fd = formData ? formData[component.fieldId] : undefined;
+        return getCYARowsForContainer(page, component, fd, onAction);
+      }
+
+      return (0, _getCYARow.default)(_objectSpread(_objectSpread({}, page), {}, {
+        formData: formData
+      }), component, onAction);
+    });
+  }
+};
+
+var _default = getCYARowsForContainer;
+exports.default = _default;

package/dist/utils/CheckYourAnswers/getCYARowsForContainer.test.js

@@ -0,0 +1,257 @@
+"use strict";
+
+var _models = require("../../models");
+
+var _getCYARowsForContainer = _interopRequireDefault(require("./getCYARowsForContainer"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// Local imports
+describe('utils.CheckYourAnswers.getCYARowsForContainer', function () {
+  var expectObjectLike = function expectObjectLike(received, expected) {
+    Object.keys(expected).forEach(function (key) {
+      expect(received[key]).toEqual(expected[key]);
+    });
+  };
+
+  it('should get an appropriate row for a container with a single readonly text component', function () {
+    var FORM_DATA = {
+      container: {
+        a: 'Bravo'
+      }
+    };
+    var PAGE = {
+      id: 'page',
+      formData: FORM_DATA,
+      cya_link: {}
+    };
+    var COMPONENT = {
+      type: 'text',
+      readonly: true,
+      id: 'a',
+      fieldId: 'a',
+      label: 'Alpha'
+    };
+    var CONTAINER = {
+      id: 'container',
+      fieldId: 'container',
+      type: _models.ComponentTypes.CONTAINER,
+      components: [COMPONENT],
+      value: FORM_DATA.container,
+      formData: FORM_DATA
+    };
+
+    var ON_ACTION = function ON_ACTION() {};
+
+    var ROWS = (0, _getCYARowsForContainer.default)(PAGE, CONTAINER, FORM_DATA.container, ON_ACTION);
+    expect(ROWS.length).toEqual(1);
+    ROWS.forEach(function (row, index) {
+      expectObjectLike(row, {
+        pageId: PAGE.id,
+        fieldId: CONTAINER.components[index].fieldId,
+        key: CONTAINER.components[index].label,
+        action: null,
+        component: COMPONENT,
+        value: 'Bravo'
+      });
+    });
+  });
+  it('should get appropriate rows for a container with two editable text components', function () {
+    var FORM_DATA = {
+      container: {
+        a: 'Alpha Charlie',
+        b: 'Bravo Charlie'
+      }
+    };
+    var PAGE = {
+      id: 'page',
+      formData: FORM_DATA,
+      cya_link: {}
+    };
+    var COMPONENT_A = {
+      type: 'text',
+      id: 'a',
+      fieldId: 'a',
+      label: 'Alpha'
+    };
+    var COMPONENT_B = {
+      type: 'text',
+      id: 'b',
+      fieldId: 'b',
+      label: 'Bravo'
+    };
+    var CONTAINER = {
+      id: 'container',
+      fieldId: 'container',
+      type: _models.ComponentTypes.CONTAINER,
+      components: [COMPONENT_A, COMPONENT_B],
+      value: FORM_DATA.container,
+      formData: FORM_DATA
+    };
+
+    var ON_ACTION = function ON_ACTION() {};
+
+    var ROWS = (0, _getCYARowsForContainer.default)(PAGE, CONTAINER, FORM_DATA.container, ON_ACTION);
+    expect(ROWS.length).toEqual(2);
+    ROWS.forEach(function (row, index) {
+      expectObjectLike(row, {
+        pageId: PAGE.id,
+        fieldId: CONTAINER.components[index].fieldId,
+        key: CONTAINER.components[index].label,
+        component: CONTAINER.components[index],
+        value: "".concat(CONTAINER.components[index].label, " Charlie")
+      });
+      expectObjectLike(row.action, {
+        onAction: ON_ACTION
+      });
+    });
+  });
+  it("should filter out any components that shouldn't be shown", function () {
+    var FORM_DATA = {
+      container: {
+        a: 'Alpha Charlie',
+        b: 'Bravo Charlie'
+      }
+    };
+    var PAGE = {
+      id: 'page',
+      formData: FORM_DATA,
+      cya_link: {}
+    };
+    var COMPONENT_A = {
+      type: 'text',
+      id: 'a',
+      fieldId: 'a',
+      label: 'Alpha'
+    };
+    var COMPONENT_B = {
+      type: 'text',
+      id: 'b',
+      fieldId: 'b',
+      label: 'Bravo'
+    };
+    var COMPONENT_C = {
+      type: 'heading',
+      content: 'Heading component'
+    };
+    var CONTAINER = {
+      id: 'container',
+      fieldId: 'container',
+      type: _models.ComponentTypes.CONTAINER,
+      components: [COMPONENT_A, COMPONENT_B, COMPONENT_C],
+      value: FORM_DATA.container,
+      formData: FORM_DATA
+    };
+
+    var ON_ACTION = function ON_ACTION() {};
+
+    var ROWS = (0, _getCYARowsForContainer.default)(PAGE, CONTAINER, FORM_DATA.container, ON_ACTION);
+    expect(ROWS.length).toEqual(2);
+    ROWS.forEach(function (row, index) {
+      expectObjectLike(row, {
+        pageId: PAGE.id,
+        fieldId: CONTAINER.components[index].fieldId,
+        key: CONTAINER.components[index].label,
+        component: CONTAINER.components[index],
+        value: "".concat(CONTAINER.components[index].label, " Charlie")
+      });
+      expectObjectLike(row.action, {
+        onAction: ON_ACTION
+      });
+    });
+  });
+  it('should get an appropriate row for a container with a single readonly text component inside a nested container', function () {
+    var FORM_DATA = {
+      container: {
+        nested: {
+          a: 'Bravo'
+        }
+      }
+    };
+    var PAGE = {
+      id: 'page',
+      formData: FORM_DATA,
+      cya_link: {}
+    };
+    var COMPONENT = {
+      type: 'text',
+      readonly: true,
+      id: 'a',
+      fieldId: 'a',
+      label: 'Alpha'
+    };
+    var NESTED_CONTAINER = {
+      id: 'nested',
+      fieldId: 'nested',
+      type: _models.ComponentTypes.CONTAINER,
+      components: [COMPONENT],
+      value: FORM_DATA.container.nested,
+      formData: FORM_DATA
+    };
+    var CONTAINER = {
+      id: 'container',
+      fieldId: 'container',
+      type: _models.ComponentTypes.CONTAINER,
+      components: [NESTED_CONTAINER],
+      value: FORM_DATA.container,
+      formData: FORM_DATA
+    };
+
+    var ON_ACTION = function ON_ACTION() {};
+
+    var ROWS = (0, _getCYARowsForContainer.default)(PAGE, CONTAINER, FORM_DATA.container, ON_ACTION);
+    expect(ROWS.length).toEqual(1);
+    ROWS.forEach(function (row, index) {
+      expectObjectLike(row, {
+        pageId: PAGE.id,
+        fieldId: NESTED_CONTAINER.components[index].fieldId,
+        key: NESTED_CONTAINER.components[index].label,
+        action: null,
+        component: COMPONENT,
+        value: 'Bravo'
+      });
+    });
+  });
+  it('should get an appropriate row for a container with a single readonly text component inside a nested container but no formData', function () {
+    var FORM_DATA = undefined;
+    var PAGE = {
+      id: 'page',
+      formData: FORM_DATA,
+      cya_link: {}
+    };
+    var COMPONENT = {
+      type: 'text',
+      readonly: true,
+      id: 'a',
+      fieldId: 'a',
+      label: 'Alpha'
+    };
+    var NESTED_CONTAINER = {
+      id: 'nested',
+      fieldId: 'nested',
+      type: _models.ComponentTypes.CONTAINER,
+      components: [COMPONENT]
+    };
+    var CONTAINER = {
+      id: 'container',
+      fieldId: 'container',
+      type: _models.ComponentTypes.CONTAINER,
+      components: [NESTED_CONTAINER]
+    };
+
+    var ON_ACTION = function ON_ACTION() {};
+
+    var ROWS = (0, _getCYARowsForContainer.default)(PAGE, CONTAINER, undefined, ON_ACTION);
+    expect(ROWS.length).toEqual(1);
+    ROWS.forEach(function (row, index) {
+      expectObjectLike(row, {
+        pageId: PAGE.id,
+        fieldId: NESTED_CONTAINER.components[index].fieldId,
+        key: NESTED_CONTAINER.components[index].label,
+        action: null,
+        component: COMPONENT,
+        value: ''
+      });
+    });
+  });
+});

package/dist/utils/CheckYourAnswers/getCYARowsForPage.js

@@ -5,10 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _models = require("../../models");
+
 var _FormPage = _interopRequireDefault(require("../FormPage"));
 
 var _getCYARow = _interopRequireDefault(require("./getCYARow"));
 
+var _getCYARowsForContainer = _interopRequireDefault(require("./getCYARowsForContainer"));
+
 var _showComponentCYA = _interopRequireDefault(require("./showComponentCYA"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -27,7 +31,11 @@ var getCYARowsForPage = function getCYARowsForPage(page, onAction) {
   if (_FormPage.default.show(page, page.formData)) {
     return page.components.filter(function (c) {
       return (0, _showComponentCYA.default)(c, page.formData);
-    }).map(function (component) {
+    }).flatMap(function (component) {
+      if (component.type === _models.ComponentTypes.CONTAINER) {
+        return (0, _getCYARowsForContainer.default)(page, component, page.formData[component.fieldId], onAction);
+      }
+
       return (0, _getCYARow.default)(page, component, onAction);
     });
   }

package/dist/utils/CheckYourAnswers/getCYARowsForPage.test.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _models = require("../../models");
+
 var _getCYARowsForPage = _interopRequireDefault(require("./getCYARowsForPage"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -129,6 +131,48 @@ describe('utils', function () {
           });
         });
       });
+      it('should get a appropriate row for a page with a single readonly text component inside of a container', function () {
+        var FORM_DATA = {
+          container: {
+            a: 'Bravo'
+          }
+        };
+        var COMPONENT = {
+          type: 'text',
+          readonly: true,
+          id: 'a',
+          fieldId: 'a',
+          label: 'Alpha'
+        };
+        var CONTAINER = {
+          id: 'container',
+          fieldId: 'container',
+          type: _models.ComponentTypes.CONTAINER,
+          components: [COMPONENT],
+          value: FORM_DATA.container,
+          formData: FORM_DATA
+        };
+        var PAGE = {
+          id: 'page',
+          components: [CONTAINER],
+          formData: FORM_DATA
+        };
+
+        var ON_ACTION = function ON_ACTION() {};
+
+        var ROWS = (0, _getCYARowsForPage.default)(PAGE, ON_ACTION);
+        expect(ROWS.length).toEqual(1);
+        ROWS.forEach(function (row, index) {
+          expectObjectLike(row, {
+            pageId: PAGE.id,
+            fieldId: CONTAINER.components[index].fieldId,
+            key: CONTAINER.components[index].label,
+            action: null,
+            component: COMPONENT,
+            value: 'Bravo'
+          });
+        });
+      });
     });
   });
 });

package/dist/utils/CheckYourAnswers/showComponentCYA.js

@@ -9,6 +9,8 @@ var _models = require("../../models");
 
 var _Component = _interopRequireDefault(require("../Component"));
 
+var _Container = _interopRequireDefault(require("../Container"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // Local imports
@@ -31,6 +33,10 @@ var showComponentCYA = function showComponentCYA(options, data) {
     return false;
   }
 
+  if (options.type === _models.ComponentTypes.CONTAINER) {
+    return _Container.default.show(options, data);
+  }
+
   return _Component.default.show(options, data);
 };
 

package/dist/utils/Component/cleanAttributes.js

@@ -19,7 +19,7 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 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; }
 
-var JSON_ONLY_PROPERTIES = ['source', 'use', 'show_when', 'options'];
+var JSON_ONLY_PROPERTIES = ['source', 'use', 'show_when', 'options', 'additionalValidation', 'full_path'];
 /**
  * This method removes and properties that are entirely specific to the JSON
  * configuration and that should not be used as HTML attributes.

package/dist/utils/Component/getComponent.js

@@ -95,6 +95,11 @@ var getTextInput = function getTextInput(config) {
   return /*#__PURE__*/_react.default.createElement(_copReactComponents.TextInput, attrs);
 };
 
+var getTime = function getTime(config) {
+  var attrs = (0, _cleanAttributes.default)(config);
+  return /*#__PURE__*/_react.default.createElement(_copReactComponents.TimeInput, attrs);
+};
+
 var getComponentByType = function getComponentByType(config) {
   switch (config.type) {
     case _models.ComponentTypes.HTML:
@@ -123,6 +128,9 @@ var getComponentByType = function getComponentByType(config) {
     case _models.ComponentTypes.DATE:
       return getDate(config);
 
+    case _models.ComponentTypes.TIME:
+      return getTime(config);
+
     case _models.ComponentTypes.CHECKBOXES:
       return getCheckboxes(config);
 
@@ -132,9 +140,27 @@ var getComponentByType = function getComponentByType(config) {
       }
   }
 };
+/**
+ * Get a renderable component, based on a configuration object.
+ * @param {object} config The configuration object for the component.
+ * @param {boolean} wrap Indicates whether or not the component should be wrapped.
+ * @param {Function} fnOverride An optional override function for component rendering.
+ * @returns A renderable component.
+ */
+
 
 var getComponent = function getComponent(config) {
   var wrap = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  var fnOverride = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
+
+  if (typeof fnOverride === 'function') {
+    var overrideComponent = fnOverride(config, wrap);
+
+    if (overrideComponent) {
+      return overrideComponent;
+    }
+  }
+
   var component = getComponentByType(config);
 
   if (component && wrap && (0, _isEditable.default)(config)) {

package/dist/utils/Component/isEditable.js

@@ -8,7 +8,7 @@ exports.default = exports.EDITABLE_TYPES = void 0;
 var _models = require("../../models");
 
 // Local imports
-var EDITABLE_TYPES = [_models.ComponentTypes.AUTOCOMPLETE, _models.ComponentTypes.CHECKBOXES, _models.ComponentTypes.DATE, _models.ComponentTypes.EMAIL, _models.ComponentTypes.PHONE_NUMBER, _models.ComponentTypes.RADIOS, _models.ComponentTypes.TEXT, _models.ComponentTypes.TEXT_AREA];
+var EDITABLE_TYPES = [_models.ComponentTypes.AUTOCOMPLETE, _models.ComponentTypes.CHECKBOXES, _models.ComponentTypes.DATE, _models.ComponentTypes.EMAIL, _models.ComponentTypes.PHONE_NUMBER, _models.ComponentTypes.RADIOS, _models.ComponentTypes.TEXT, _models.ComponentTypes.TEXT_AREA, _models.ComponentTypes.TIME];
 exports.EDITABLE_TYPES = EDITABLE_TYPES;
 
 var isEditable = function isEditable(options) {

package/dist/utils/Component/showComponent.js

@@ -5,9 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _Data = _interopRequireDefault(require("../Data"));
-
-var _meetsCondition = _interopRequireDefault(require("../meetsCondition"));
+var _Condition = _interopRequireDefault(require("../Condition"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -21,23 +19,7 @@ var showComponent = function showComponent(component, data) {
     return false;
   }
 
-  if (component.show_when) {
-    if (Array.isArray(component.show_when)) {
-      var allConditionsMet = true;
-      component.show_when.forEach(function (condition) {
-        var sourceDataValue = _Data.default.getSource(data, condition.field);
-
-        allConditionsMet = allConditionsMet && (0, _meetsCondition.default)(condition, sourceDataValue);
-      });
-      return allConditionsMet;
-    } else {
-      var sourceDataValue = _Data.default.getSource(data, component.show_when.field);
-
-      return (0, _meetsCondition.default)(component.show_when, sourceDataValue);
-    }
-  }
-
-  return true;
+  return _Condition.default.meetsAll(component, data);
 };
 
 var _default = showComponent;

package/dist/utils/Condition/index.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _meetsAllConditions = _interopRequireDefault(require("./meetsAllConditions"));
+
+var _meetsCondition = _interopRequireDefault(require("./meetsCondition"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var Condition = {
+  meetsAll: _meetsAllConditions.default,
+  met: _meetsCondition.default
+};
+var _default = Condition;
+exports.default = _default;