@agilemotion/oui-react-js 1.3.7 → 1.3.9

package/dist/components/form/BaseField.js

@@ -21,79 +21,45 @@ var _DynamicJS = _interopRequireDefault(require("../../DynamicJS"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _createForOfIteratorHelper(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { 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(_e2) { throw _e2; }, 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 = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(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); }
+const BaseField = props => {
+  const [hasError, setHasError] = _react.default.useState(false);
 
-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; }
+  const [errorMessage, setErrorMessage] = _react.default.useState('');
 
-function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+  const [valueObject, setValueObject] = _react.default.useState({});
 
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-const BaseField = props => {
-  const _React$useState = _react.default.useState(false),
-        _React$useState2 = _slicedToArray(_React$useState, 2),
-        hasError = _React$useState2[0],
-        setHasError = _React$useState2[1];
-
-  const _React$useState3 = _react.default.useState(""),
-        _React$useState4 = _slicedToArray(_React$useState3, 2),
-        errorMessage = _React$useState4[0],
-        setErrorMessage = _React$useState4[1];
-
-  const _React$useState5 = _react.default.useState({}),
-        _React$useState6 = _slicedToArray(_React$useState5, 2),
-        valueObject = _React$useState6[0],
-        setValueObject = _React$useState6[1];
-
-  const _React$useState7 = _react.default.useState(null),
-        _React$useState8 = _slicedToArray(_React$useState7, 2),
-        valueProperty = _React$useState8[0],
-        setValueProperty = _React$useState8[1];
+  const [valueProperty, setValueProperty] = _react.default.useState(null);
 
   const loadingRef = _react.default.useRef(true);
 
-  const _React$useState9 = _react.default.useState(null),
-        _React$useState10 = _slicedToArray(_React$useState9, 2),
-        config = _React$useState10[0],
-        setConfig = _React$useState10[1];
+  const [config, setConfig] = _react.default.useState(null);
 
-  const _React$useState11 = _react.default.useState(!_Utils.default.isNull(props.value) ? props.value : null),
-        _React$useState12 = _slicedToArray(_React$useState11, 2),
-        value = _React$useState12[0],
-        setValue = _React$useState12[1];
+  const [value, setValue] = _react.default.useState(!_Utils.default.isNull(props.value) ? props.value : null);
 
-  const _React$useState13 = _react.default.useState([]),
-        _React$useState14 = _slicedToArray(_React$useState13, 2),
-        selectOptions = _React$useState14[0],
-        setSelectOptions = _React$useState14[1];
+  const [selectOptions, setSelectOptions] = _react.default.useState([]);
 
-  const _React$useState15 = _react.default.useState(false),
-        _React$useState16 = _slicedToArray(_React$useState15, 2),
-        disabled = _React$useState16[0],
-        setDisabled = _React$useState16[1];
+  const [disabled, setDisabled] = _react.default.useState(false);
 
-  const _React$useState17 = _react.default.useState(false),
-        _React$useState18 = _slicedToArray(_React$useState17, 2),
-        visible = _React$useState18[0],
-        setVisible = _React$useState18[1];
+  const [visible, setVisible] = _react.default.useState(false);
 
-  const _React$useState19 = _react.default.useState(null),
-        _React$useState20 = _slicedToArray(_React$useState19, 2),
-        required = _React$useState20[0],
-        setRequired = _React$useState20[1];
+  const [required, setRequired] = _react.default.useState(null);
 
   const validateOnChange = _react.default.useRef();
 
   const valid = _react.default.useRef(false);
 
   _react.default.useEffect(() => {
-    setValue(valueObject[valueProperty]);
+    let value = valueObject[valueProperty];
+
+    if (props.config.fieldType === 'SELECT' || props.config.fieldType === 'LOOKUP') {
+      if (!value || _Utils.default.isNull(value.id)) {
+        setValue(null);
+      } else {
+        setValue(value);
+      }
+    } else {
+      setValue(value);
+    }
   }, [valueObject[valueProperty]]); // Change the required value and re-validate field if necessary
 
 
@@ -123,16 +89,22 @@ const BaseField = props => {
       result = _Utils.default.validateField(path.valueProperty, required, path.valueObject, currentValue, config.validator);
     }
 
-    setErrorMessage(_ApplicationContext.default.isFormMarkersEnabled() ? result.message : "");
+    setErrorMessage(_ApplicationContext.default.isFormMarkersEnabled() ? result.message : '');
     setHasError(!result.valid && _ApplicationContext.default.isFormMarkersEnabled());
     valid.current = result.valid && _ApplicationContext.default.isFormMarkersEnabled();
-    props.form().setFieldError(config.id, typeof result.message === 'undefined' ? null : result.message);
+
+    if (_ApplicationContext.default.isFormMarkersEnabled()) {
+      props.form().setFieldError(config.id, typeof result.message === 'undefined' ? null : result.message);
+    }
+
     return result.valid;
   };
 
   _react.default.useEffect(() => {
     props.handle.api = api();
+  });
 
+  _react.default.useEffect(() => {
     if (_Utils.default.isNull(config)) {
       let parsedConfig = _Utils.default.parseConfig(props.config, props.viewId);
 
@@ -142,8 +114,9 @@ const BaseField = props => {
 
       setConfig(parsedConfig);
       setVisible(_Utils.default.evaluateBooleanExpression(parsedConfig.visible, parsedConfig.id, true));
+      setDisabled(_Utils.default.evaluateBooleanExpression(parsedConfig.disabled, parsedConfig.id, false));
     }
-  });
+  }, []);
 
   _react.default.useEffect(() => {
     if (!_Utils.default.isNull(props.values) && !_Utils.default.isNull(config)) {
@@ -177,10 +150,6 @@ const BaseField = props => {
           setErrorMessage(field.error);
         }
       }
-
-      if (!_Utils.default.isNull(props.loadCompleteHandler)) {
-        props.loadCompleteHandler(config.id);
-      }
     }
   });
 
@@ -198,7 +167,7 @@ const BaseField = props => {
     let valueChanged = newValue !== value;
 
     if (!_Utils.default.isNull(newValue) && !_Utils.default.isNull(value)) {
-      if (config.fieldType === 'SELECT' || config.fieldType === 'LOOKUP') {
+      if (props.config.fieldType === 'SELECT' || props.config.fieldType === 'LOOKUP') {
         valueChanged = newValue.id !== value.id;
       } else {
         valueChanged = JSON.stringify(value) !== JSON.stringify(newValue);
@@ -206,33 +175,22 @@ const BaseField = props => {
     }
 
     if (valueChanged) {
-      let id = config.dataBinding ? config.dataBinding : config.id;
+      let id = props.config.dataBinding ? props.config.dataBinding : props.config.id;
 
       _ApplicationContext.default.enableFormMarkers(true);
 
-      if (config.fieldType === 'SELECT') {
+      if (props.config.fieldType === 'SELECT') {
         setValue(props.form().handleSelectItemChange(id, selectOptions, newValue));
 
-        var _iterator = _createForOfIteratorHelper(selectOptions),
-            _step;
-
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            const selectOption = _step.value;
-
-            if (selectOption.id === newValue) {
-              newValue = selectOption;
-              break;
-            }
+        for (const selectOption of selectOptions) {
+          if (selectOption.id === newValue) {
+            newValue = selectOption;
+            break;
           }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
         }
       } else {
         setValue(newValue);
-        props.form().handleChange(!_Utils.default.isNull(config.dataBinding) ? config.dataBinding : id, newValue);
+        props.form().handleChange(!_Utils.default.isNull(props.config.dataBinding) ? props.config.dataBinding : id, newValue);
       }
 
       if (!_Utils.default.isNull(props.valueChangeHandler)) {
@@ -278,10 +236,18 @@ const BaseField = props => {
       },
 
       get value() {
-        if (!_Utils.default.isNull(valueObject) && !_Utils.default.isNull(valueProperty)) {
+        if (!_Utils.default.isNull(valueObject) && !_Utils.default.isNull(valueProperty) && !_Utils.default.isNull(valueObject[valueProperty])) {
           return !_Utils.default.isNull(props.valueParser) ? props.valueParser(valueObject[valueProperty], false) : valueObject[valueProperty];
         }
 
+        if (value) {
+          if (valueObject) {
+            valueObject[valueProperty] = value;
+          }
+
+          return props.valueParser ? props.valueParser(value, false) : value;
+        }
+
         return null;
       },
 
@@ -306,23 +272,20 @@ const BaseField = props => {
       },
 
       refresh() {
-        setVisible(_Utils.default.evaluateBooleanExpression(config.visible, config.id, true));
-        setDisabled(_Utils.default.evaluateBooleanExpression(config.disabled, config.id));
-        let requiredNewVal = !_Utils.default.isNull(config.validator) ? !_Utils.default.evaluateBooleanExpression(config.validator.nullable, config.id, true) : false;
-        validateOnChange.current = required !== null && required !== requiredNewVal && loadingRef.current === false;
-        setRequired(requiredNewVal);
+        if (config) {
+          setVisible(_Utils.default.evaluateBooleanExpression(config.visible, config.id, true));
+          setDisabled(_Utils.default.evaluateBooleanExpression(config.disabled, config.id));
+          let requiredNewVal = !_Utils.default.isNull(config.validator) ? !_Utils.default.evaluateBooleanExpression(config.validator.nullable, config.id, true) : false;
+          validateOnChange.current = required !== null && required !== requiredNewVal && loadingRef.current === false;
+          setRequired(requiredNewVal);
+        }
       },
 
       get required() {
         return required;
       },
 
-      setFieldRequired(newVal) {
-        validateOnChange.current = true;
-        setRequired(newVal);
-      },
-
-      setFieldRequired(newVal, validate) {
+      setFieldRequired(newVal, validate = true) {
         validateOnChange.current = validate;
         setRequired(newVal);
       },
@@ -333,18 +296,25 @@ const BaseField = props => {
         }
 
         return [];
+      },
+
+      loadData() {
+        if (props.loadDataHandler) {
+          props.loadDataHandler();
+        }
       }
+
     };
   };
 
   return config ? /*#__PURE__*/_react.default.createElement("div", {
     className: "col-*-*",
     key: config.id,
-    style: {
+    style: _Utils.default.mergeStyles({
       textAlign: 'left',
       marginLeft: '15px',
       display: !visible || _Utils.default.getComponentAttribute(config, 'hidden', false) === true ? 'none' : 'block'
-    }
+    }, props.config)
   }, /*#__PURE__*/_react.default.createElement("span", null, props.children({
     required: required,
     disabled: disabled,

package/dist/components/form/DatePicker.js

@@ -27,28 +27,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(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; }
-
-function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 const CustomDatePickerComponent = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwardRef((props, ref) => {
-  const _React$useState = _react.default.useState(null),
-        _React$useState2 = _slicedToArray(_React$useState, 2),
-        minDate = _React$useState2[0],
-        setMinDate = _React$useState2[1];
+  const [minDate, setMinDate] = _react.default.useState(null);
 
-  const _React$useState3 = _react.default.useState(null),
-        _React$useState4 = _slicedToArray(_React$useState3, 2),
-        maxDate = _React$useState4[0],
-        setMaxDate = _React$useState4[1];
+  const [maxDate, setMaxDate] = _react.default.useState(null);
 
   const base = props.base;
   const defaultDate = !_Utils.default.isNull(base.valueObject[base.valueProperty]) ? new Date(base.valueObject[base.valueProperty]) : null;
@@ -162,7 +144,7 @@ const DatePicker = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default
   return /*#__PURE__*/_react.default.createElement(_BaseField.BaseField, _extends({}, props, {
     handle: props.handle,
     valueParser: (value, inbound) => {
-      return !_Utils.default.isNull(value) ? inbound ? new Date(parseFloat(value.toString())) : value.getTime() : null;
+      return !_Utils.default.isNull(value) ? inbound ? new Date(value.toString()) : new Date(value).toLocaleDateString('en-GB').split('/').reverse().join('-') : null;
     }
   }), base => /*#__PURE__*/_react.default.createElement(CustomDatePickerComponent, _extends({
     ref: ref,