iglooform 2.5.45 → 2.5.47

package/lib/free-form/step/index.js

@@ -33,6 +33,8 @@ var _formUtils = require("../../utils/form-utils");
 
 var _formContext = _interopRequireDefault(require("../../form-context"));
 
+var _invariant = _interopRequireDefault(require("invariant"));
+
 require("./style/index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -84,10 +86,12 @@ var Step = function Step(_ref) {
       children = _ref.children,
       shouldRender = _ref.shouldRender,
       subscribedFields = _ref.subscribedFields,
-      buttonText = _ref.buttonText;
+      buttonText = _ref.buttonText,
+      validationRule = _ref.validationRule;
 
   var _useContext = (0, _react.useContext)(_locale.LocaleContext),
-      formatMessage = _useContext.formatMessage;
+      formatMessage = _useContext.formatMessage,
+      currentLang = _useContext.currentLang;
 
   var _useContext2 = (0, _react.useContext)(_formContext.default),
       continueText = _useContext2.continueText,
@@ -95,6 +99,7 @@ var Step = function Step(_ref) {
       submitting = _useContext2.submitting,
       form = _useContext2.form,
       showSubmitButton = _useContext2.showSubmitButton,
+      getRuleValidationApi = _useContext2.getRuleValidationApi,
       getScrollContainer = _useContext2.getScrollContainer,
       registerDependencies = _useContext2.registerDependencies;
 
@@ -112,6 +117,7 @@ var Step = function Step(_ref) {
       _ = _useReducer2[0],
       dispatch = _useReducer2[1];
 
+  (0, _invariant.default)(!validationRule || getRuleValidationApi, 'Please provide getRuleValidationApi in Form props');
   (0, _react.useEffect)(function () {
     if (shouldRender || getButtonDisabledState) {
       registerDependencies(Array.isArray(subscribedFields) ? subscribedFields : 'SUBSCRIBE_ALL', dispatch);
@@ -171,12 +177,13 @@ var Step = function Step(_ref) {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var _allFields$filter;
 
-      var allFields, fields, errors;
+      var allFields, allValues, fields, res, errors;
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               allFields = (form === null || form === void 0 ? void 0 : form.getFieldsError()) || [];
+              allValues = form === null || form === void 0 ? void 0 : form.getFieldsValue(true);
               fields = allFields === null || allFields === void 0 ? void 0 : (_allFields$filter = allFields.filter(function (_ref3) {
                 var name = _ref3.name;
                 return name.join().startsWith(pName === null || pName === void 0 ? void 0 : pName.join());
@@ -184,54 +191,85 @@ var Step = function Step(_ref) {
                 var name = _ref4.name;
                 return name;
               });
-              _context.prev = 2;
-              _context.next = 5;
+              _context.prev = 3;
+              _context.next = 6;
               return form === null || form === void 0 ? void 0 : form.validateFields(fields);
 
-            case 5:
-              _context.next = 11;
+            case 6:
+              _context.next = 12;
               break;
 
-            case 7:
-              _context.prev = 7;
-              _context.t0 = _context["catch"](2);
+            case 8:
+              _context.prev = 8;
+              _context.t0 = _context["catch"](3);
               form === null || form === void 0 ? void 0 : form.scrollToField(_context.t0.errorFields[0].name);
               return _context.abrupt("return");
 
-            case 11:
+            case 12:
+              if (!(validationRule && getRuleValidationApi)) {
+                _context.next = 26;
+                break;
+              }
+
+              _context.prev = 13;
+              _context.next = 16;
+              return (0, _formUtils.getRuleValidation)(getRuleValidationApi, validationRule, allValues, currentLang);
+
+            case 16:
+              res = _context.sent;
+
+              if (!(Array.isArray(res) && res.length)) {
+                _context.next = 21;
+                break;
+              }
+
+              form === null || form === void 0 ? void 0 : form.setFields(res);
+              form === null || form === void 0 ? void 0 : form.scrollToField(res[0].name);
+              return _context.abrupt("return");
+
+            case 21:
+              _context.next = 26;
+              break;
+
+            case 23:
+              _context.prev = 23;
+              _context.t1 = _context["catch"](13);
+              return _context.abrupt("return");
+
+            case 26:
               if (!(typeof handleNextProp === 'function')) {
-                _context.next = 22;
+                _context.next = 37;
                 break;
               }
 
-              _context.prev = 12;
-              _context.next = 15;
+              _context.prev = 27;
+              _context.next = 30;
               return handleNextProp(form === null || form === void 0 ? void 0 : form.getFieldsValue(fields));
 
-            case 15:
+            case 30:
               errors = _context.sent;
 
               if (Array.isArray(errors)) {
                 form === null || form === void 0 ? void 0 : form.setFields(errors);
               }
 
-              _context.next = 22;
+              _context.next = 37;
               break;
 
-            case 19:
-              _context.prev = 19;
-              _context.t1 = _context["catch"](12);
+            case 34:
+              _context.prev = 34;
+              _context.t2 = _context["catch"](27);
               return _context.abrupt("return");
 
-            case 22:
+            case 37:
               handleNextStep && handleNextStep(fields);
 
-            case 23:
+            case 38:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[2, 7], [12, 19]]);
+      }, _callee, null, [[3, 8], [13, 23], [27, 34]]);
     }));
 
     return function handleNext() {

package/lib/types.d.ts

@@ -28,6 +28,8 @@ export interface FormBasicConfig {
     onFirstModified?: () => any;
     uploadApi?: string;
     selectDatasourceApi?: string;
+    validationRule?: string;
+    getRuleValidationApi?: string;
     stepDirection?: 'vertical' | 'horizontal';
 }
 export declare type FormItemAssert = {
@@ -120,6 +122,7 @@ export interface FormItemExtraConfig extends FormItemProps {
     minLength?: number;
     maxLength?: number;
     idType?: 'KTP' | 'NIK';
+    validationRule?: string;
     [key: string]: any;
 }
 export interface FormItemConfig extends FormItemExtraConfig {

package/lib/utils/form-utils.d.ts

@@ -73,3 +73,4 @@ export declare const calcSelectValue: (selectValue?: FormItemSelectValue[] | und
     disabled: boolean | undefined;
 };
 export declare const calcShouldRender: (dependencies?: NamePath[], asserts?: FormItemAssert[], shouldRender?: ((form?: FormInstance<any> | undefined) => boolean) | undefined, form?: FormInstance<any> | undefined) => boolean;
+export declare const getRuleValidation: (url: string, rule: string | string[], values?: any, lang?: string | undefined) => Promise<any>;

package/lib/utils/form-utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.testAssert = exports.calcShouldRender = exports.calcSelectValue = exports.calcNamePath = exports.calcFormItemProps = exports.calcDisabled = exports.calcCopyValue = void 0;
+exports.testAssert = exports.getRuleValidation = exports.calcShouldRender = exports.calcSelectValue = exports.calcNamePath = exports.calcFormItemProps = exports.calcDisabled = exports.calcCopyValue = void 0;
 
 var _jsxRuntime = require("react/jsx-runtime");
 
@@ -20,6 +20,10 @@ var _excluded = ["type", "name", "required", "requiredAsserts", "showOptional",
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -543,4 +547,76 @@ var calcShouldRender = function calcShouldRender() {
   return true;
 };
 
-exports.calcShouldRender = calcShouldRender;
+exports.calcShouldRender = calcShouldRender;
+
+var getRuleValidation = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(url, rule, values, lang) {
+    var _lang, _lang$split;
+
+    var res, json, _ref4, conclusion, details;
+
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            lang = ((_lang = lang) === null || _lang === void 0 ? void 0 : (_lang$split = _lang.split('-')) === null || _lang$split === void 0 ? void 0 : _lang$split[0]) || 'en';
+            _context.next = 3;
+            return fetch("".concat(url, "?lang=").concat(lang), {
+              method: 'post',
+              headers: {
+                'Content-Type': 'application/json; charset=utf-8'
+              },
+              body: JSON.stringify({
+                form: values || {},
+                rules: Array.isArray(rule) ? rule : [rule]
+              })
+            });
+
+          case 3:
+            res = _context.sent;
+            _context.next = 6;
+            return res.json();
+
+          case 6:
+            json = _context.sent;
+            _ref4 = json || {}, conclusion = _ref4.conclusion, details = _ref4.details;
+
+            if (!conclusion) {
+              _context.next = 10;
+              break;
+            }
+
+            return _context.abrupt("return");
+
+          case 10:
+            if (!(conclusion === false)) {
+              _context.next = 12;
+              break;
+            }
+
+            return _context.abrupt("return", details === null || details === void 0 ? void 0 : details.map(function (_ref5) {
+              var err_message = _ref5.err_message,
+                  path = _ref5.path;
+              return {
+                name: path.split('.'),
+                errors: [err_message]
+              };
+            }));
+
+          case 12:
+            return _context.abrupt("return", Promise.reject(json.message));
+
+          case 13:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function getRuleValidation(_x, _x2, _x3, _x4) {
+    return _ref3.apply(this, arguments);
+  };
+}();
+
+exports.getRuleValidation = getRuleValidation;

package/lib/utils/option-utils.d.ts

@@ -13,6 +13,7 @@ export interface HOCProps extends IglooComponentProps {
         parentKey: string;
         options: Options;
     }[];
+    datasourceFilters?: string[];
     datasourceKey?: string;
     datasourceApi?: string;
     dependField?: NamePath;

package/lib/utils/option-utils.js

@@ -15,7 +15,7 @@ var _formContext = _interopRequireDefault(require("../form-context"));
 
 var _invariant = _interopRequireDefault(require("invariant"));
 
-var _excluded = ["options", "optionGroups", "getOptions", "datasourceKey", "dependField", "children", "onSearch"];
+var _excluded = ["options", "optionGroups", "getOptions", "datasourceFilters", "datasourceKey", "dependField", "children", "onSearch"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -107,6 +107,7 @@ function optionsHOC(Component) {
     var options = props.options,
         optionGroups = props.optionGroups,
         getOptions = props.getOptions,
+        datasourceFilters = props.datasourceFilters,
         datasourceKey = props.datasourceKey,
         dependField = props.dependField,
         children = props.children,
@@ -148,6 +149,7 @@ function optionsHOC(Component) {
       }
     }, [optionsFromGetOptions]);
     (0, _invariant.default)(datasourceKey && selectDatasourceApi || !datasourceKey, 'Please provide selectDatasourceApi in Form props');
+    (0, _invariant.default)(datasourceFilters && datasourceKey && selectDatasourceApi || !datasourceFilters, 'Please provide selectDatasourceApi in Form props');
     (0, _react.useEffect)(function () {
       if (Array.isArray(optionsFromGetOptions)) {
         return;
@@ -211,7 +213,7 @@ function optionsHOC(Component) {
 
                 case 9:
                   if (!(selectDatasourceApi && datasourceKey)) {
-                    _context.next = 27;
+                    _context.next = 28;
                     break;
                   }
 
@@ -223,35 +225,41 @@ function optionsHOC(Component) {
                     query += "&search_keyword=".concat(searchKey);
                   }
 
+                  if (datasourceFilters) {
+                    query += datasourceFilters.map(function (f) {
+                      return "filter=".concat(f);
+                    }).join('&');
+                  }
+
                   api = "".concat(selectDatasourceApi, "/").concat(datasourceKey);
-                  _context.prev = 13;
-                  _context.next = 16;
+                  _context.prev = 14;
+                  _context.next = 17;
                   return fetch(query ? "".concat(api, "?").concat(query) : api);
 
-                case 16:
+                case 17:
                   rst = _context.sent;
-                  _context.next = 19;
+                  _context.next = 20;
                   return rst.json();
 
-                case 19:
+                case 20:
                   _yield$rst$json = _context.sent;
                   data = _yield$rst$json.data;
                   return _context.abrupt("return", data || []);
 
-                case 24:
-                  _context.prev = 24;
-                  _context.t0 = _context["catch"](13);
+                case 25:
+                  _context.prev = 25;
+                  _context.t0 = _context["catch"](14);
                   return _context.abrupt("return", []);
 
-                case 27:
+                case 28:
                   return _context.abrupt("return", []);
 
-                case 28:
+                case 29:
                 case "end":
                   return _context.stop();
               }
             }
-          }, _callee, null, [[13, 24]]);
+          }, _callee, null, [[14, 25]]);
         }));
 
         return function calcOptions() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iglooform",
-  "version": "2.5.45",
+  "version": "2.5.47",
   "scripts": {
     "start": "dumi dev",
     "build-dev": "dumi build",