@ukhomeoffice/cop-react-form-renderer 3.15.0 → 3.16.1-alpha

package/dist/components/FormPage/FormPage.js

@@ -104,7 +104,9 @@ var FormPage = function FormPage(_ref) {
       formData: _objectSpread(_objectSpread({}, page.formData), patch)
     });
   }), /*#__PURE__*/_react.default.createElement(_PageActions.default, {
-    actions: page.actions,
+    actions: page.actions.filter(function (action) {
+      return _utils.default.Component.show(action, page.formData);
+    }),
     onAction: function onAction(action) {
       return _onAction(action, patch);
     }

package/dist/components/FormPage/FormPage.test.js

@@ -92,6 +92,44 @@ describe('components.FormPage', function () {
         }
       }
     };
+    var PAGE_WITH_CONDITIONAL_BUTTONS = {
+      id: 'pageId',
+      // eslint-disable-next-line no-template-curly-in-string
+      title: '${title}',
+      components: [TEXT_WITH_EXPRESSION, AUTO_WITH_EXPRESSION],
+      actions: [{
+        type: 'submit',
+        validate: true,
+        label: 'Button 1',
+        show_when: [{
+          field: 'currentUser.givenName',
+          op: '!=',
+          value: 'Doe'
+        }]
+      }, {
+        type: 'submit',
+        validate: false,
+        label: 'Button 2',
+        show_when: [{
+          field: 'currentUser.givenName',
+          op: '=',
+          value: 'Doe'
+        }]
+      }],
+      formData: {
+        title: 'Order Form',
+        text1: "Text1 ".concat(VALUE),
+        text2: "Text2 ".concat(VALUE),
+        wrapper: {
+          email: 'test@example.email',
+          nextAction: 'Payment',
+          prevAction: 'User Details'
+        },
+        currentUser: {
+          givenName: 'Doe'
+        }
+      }
+    };
     var ON_ACTION_CALLS = [];
 
     var checkInputField = function checkInputField(formGroup, fieldId, lbl, hnt, val) {
@@ -305,5 +343,26 @@ describe('components.FormPage', function () {
         }
       }, _callee4);
     })));
+    it('should render only the conditionally shown button', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
+      var _renderWithValidation5, container, page;
+
+      return regeneratorRuntime.wrap(function _callee5$(_context5) {
+        while (1) {
+          switch (_context5.prev = _context5.next) {
+            case 0:
+              _renderWithValidation5 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react2.default.createElement(_FormPage.default, {
+                page: PAGE_WITH_CONDITIONAL_BUTTONS,
+                onAction: ON_ACTION
+              })), container = _renderWithValidation5.container;
+              page = container.childNodes[0];
+              checkFormButtonGroup(page.childNodes[3], ['Button 2']); // Just the second button shown
+
+            case 3:
+            case "end":
+              return _context5.stop();
+          }
+        }
+      }, _callee5);
+    })));
   });
 });

package/dist/components/TaskList/Task.js

@@ -81,7 +81,7 @@ Task.propTypes = {
   task: _propTypes.default.shape({
     name: _propTypes.default.string.isRequired,
     pages: _propTypes.default.array.isRequired,
-    state: _propTypes.default.string.isRequired
+    state: _propTypes.default.string
   }).isRequired,
   onClick: _propTypes.default.func.isRequired
 };

package/dist/components/TaskList/TaskList.js

@@ -100,7 +100,7 @@ TaskList.propTypes = {
     tasks: _propTypes.default.arrayOf(_propTypes.default.shape({
       name: _propTypes.default.string.isRequired,
       pages: _propTypes.default.array.isRequired,
-      state: _propTypes.default.string.isRequired
+      state: _propTypes.default.string
     })).isRequired
   })).isRequired,
   classBlock: _propTypes.default.string,

package/dist/components/TaskList/TaskState.js

@@ -25,18 +25,18 @@ var TaskState = function TaskState(_ref) {
 
   var classes = _copReactComponents.Utils.classBuilder(DEFAULT_CLASS, undefined, undefined);
 
-  if (!_models.TaskStates.DETAILS[state]) {
-    return null;
-  }
-
+  var details = _models.TaskStates.DETAILS[state] || _models.TaskStates.DETAILS.cannotStartYet;
   return /*#__PURE__*/_react.default.createElement(_copReactComponents.Tag, {
-    classModifiers: [_models.TaskStates.DETAILS[state].colour],
+    classModifiers: details.colour,
     className: classes('tag')
-  }, _models.TaskStates.DETAILS[state].label);
+  }, details.label);
 };
 
 TaskState.propTypes = {
-  state: _propTypes.default.string.isRequired
+  state: _propTypes.default.string
+};
+TaskState.defaultProps = {
+  state: _models.TaskStates.TYPES.CANNOT_START_YET
 };
 var _default = TaskState;
 exports.default = _default;

package/dist/components/TaskList/TaskState.test.js

@@ -14,6 +14,14 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // Local imports
 describe('components', function () {
   describe('TaskList.TaskState', function () {
+    var checkIsCannotStartYet = function checkIsCannotStartYet(container) {
+      expect(container.childNodes.length).toEqual(1);
+      expect(container.childNodes[0].classList).toContain('hods-tag');
+      expect(container.childNodes[0].classList).toContain("hods-tag--".concat(_models.TaskStates.DETAILS.cannotStartYet.colour));
+      expect(container.childNodes[0].textContent).toEqual(_models.TaskStates.DETAILS.cannotStartYet.label);
+      return true;
+    };
+
     it('should render a complete state icon', function () {
       var STATE = _models.TaskStates.TYPES.COMPLETE;
 
@@ -60,12 +68,9 @@ describe('components', function () {
       })),
           container = _render4.container;
 
-      expect(container.childNodes.length).toEqual(1);
-      expect(container.childNodes[0].classList).toContain('hods-tag');
-      expect(container.childNodes[0].classList).toContain("hods-tag--".concat(_models.TaskStates.DETAILS.cannotStartYet.colour));
-      expect(container.childNodes[0].textContent).toEqual(_models.TaskStates.DETAILS.cannotStartYet.label);
+      expect(checkIsCannotStartYet(container)).toBeTruthy();
     });
-    it('should not render a state if given an unknown value', function () {
+    it('should render the "Cannot start yet" state if given an unknown value', function () {
       var STATE = 'spellingError';
 
       var _render5 = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_TaskState.default, {
@@ -73,9 +78,9 @@ describe('components', function () {
       })),
           container = _render5.container;
 
-      expect(container.childNodes.length).toEqual(0);
+      expect(checkIsCannotStartYet(container)).toBeTruthy();
     });
-    it('should not render a state if given null', function () {
+    it('should render the "Cannot start yet" state if given null', function () {
       var STATE = null;
 
       var _render6 = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_TaskState.default, {
@@ -83,9 +88,9 @@ describe('components', function () {
       })),
           container = _render6.container;
 
-      expect(container.childNodes.length).toEqual(0);
+      expect(checkIsCannotStartYet(container)).toBeTruthy();
     });
-    it('should not render a state if given undefined', function () {
+    it('should render the "Cannot start yet" state if given undefined', function () {
       var STATE = undefined;
 
       var _render7 = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_TaskState.default, {
@@ -93,7 +98,7 @@ describe('components', function () {
       })),
           container = _render7.container;
 
-      expect(container.childNodes.length).toEqual(0);
+      expect(checkIsCannotStartYet(container)).toBeTruthy();
     });
   });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "3.15.0",
+  "version": "3.16.1-alpha",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",