oa-componentbook 1.0.1-stage.65 → 1.0.1-stage.66

package/build/widgets/oa-widget-approval/ApprovalWidgetNew.js

@@ -22,7 +22,7 @@ var _CustomButton = _interopRequireDefault(require("../../components/oa-componen
 var _MaterialIcon = _interopRequireDefault(require("../../components/oa-component-icons/MaterialIcon"));
 var _CustomTag = _interopRequireDefault(require("../../components/oa-component-tag/CustomTag"));
 var _CustomTooltip = _interopRequireDefault(require("../../components/oa-component-tooltip/CustomTooltip"));
-const _excluded = ["children", "description", "docDetails", "approvalForm", "isMandatory", "hasDivider", "isQuestionStyleWidget", "questionId", "title", "viewOnClick", "actionRenderType", "actionContent", "systemStatus", "documentTitle", "descriptionTitle", "data-test"];
+const _excluded = ["children", "description", "docDetails", "approvalForm", "isMandatory", "hasDivider", "isQuestionStyleWidget", "questionId", "title", "viewOnClick", "actionRenderType", "actionContent", "systemStatus", "documentTitle", "descriptionTitle", "data-test", "form"];
 /* eslint-disable */
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -71,7 +71,8 @@ function ApprovalWidget(_ref) {
       systemStatus,
       documentTitle,
       descriptionTitle,
-      "data-test": dataTest
+      "data-test": dataTest,
+      form
     } = _ref,
     props = _objectWithoutProperties(_ref, _excluded);
   const getInitialValue = isApproved => {
@@ -85,6 +86,7 @@ function ApprovalWidget(_ref) {
     }
   };
   const [isApproved, setIsApproved] = (0, _react.useState)(getInitialValue(approvalForm === null || approvalForm === void 0 ? void 0 : approvalForm.isApproved));
+  const getFieldDecorator = form === null || form === void 0 ? void 0 : form.getFieldDecorator;
   const onRadioChange = event => setIsApproved(event.target.value);
   return /*#__PURE__*/_react.default.createElement(_styles.StyledContainer, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "row"
@@ -207,13 +209,24 @@ function ApprovalWidget(_ref) {
   }, /*#__PURE__*/_react.default.createElement(_antd.Input.TextArea, {
     "data-test": dataTest ? "".concat(dataTest, "--remarks") : undefined,
     disabled: (_approvalForm$disable4 = approvalForm === null || approvalForm === void 0 ? void 0 : approvalForm.disabled) !== null && _approvalForm$disable4 !== void 0 ? _approvalForm$disable4 : false
-  })))), actionRenderType === "buttonWithForm" && /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
-    name: "validateDocumentButton#".concat(questionId),
-    rules: isMandatory ? [{
+  })))), actionRenderType === "buttonWithForm" &&
+  /*#__PURE__*/
+  // <Form.Item
+  //   name={`validateDocumentButton#${questionId}`}
+  //   rules={
+  //     isMandatory
+  //       ? [{ required: true, message: "Reason is required" }]
+  //       : []
+  //   }
+  // >
+  //
+  // </Form.Item>
+  _react.default.createElement(_antd.Form.Item, null, getFieldDecorator("validateDocumentButton#".concat(questionId), {
+    rules: [{
       required: true,
-      message: "Reason is required"
-    }] : []
-  }, /*#__PURE__*/_react.default.createElement(_CustomButton.default, actionContent))) || undefined), hasDivider && /*#__PURE__*/_react.default.createElement(_antd.Divider, null));
+      message: "This field is required"
+    }]
+  })( /*#__PURE__*/_react.default.createElement(_CustomButton.default, actionContent)))) || undefined), hasDivider && /*#__PURE__*/_react.default.createElement(_antd.Divider, null));
 }
 ApprovalWidget.propTypes = {
   children: _propTypes.default.node,
@@ -254,7 +267,8 @@ ApprovalWidget.propTypes = {
     title: _propTypes.default.string
   })),
   documentTitle: _propTypes.default.string,
-  descriptionTitle: _propTypes.default.string
+  descriptionTitle: _propTypes.default.string,
+  form: _propTypes.default.object
 };
 ApprovalWidget.defaultProps = {
   children: null,
@@ -270,6 +284,7 @@ ApprovalWidget.defaultProps = {
   actionContent: {},
   systemStatus: [],
   documentTitle: "",
-  descriptionTitle: ""
+  descriptionTitle: "",
+  form: null
 };
 var _default = exports.default = ApprovalWidget;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oa-componentbook",
-  "version": "1.0.1-stage.65",
+  "version": "1.0.1-stage.66",
   "private": false,
   "description": "Reusable components",
   "main": "build/index.js",