awing-library 2.1.30-beta → 2.1.31-beta

package/lib/AWING/DataForm/DataInput.js

@@ -43,14 +43,14 @@ var GeoFencing_1 = __importDefault(require("../../ACM-AXN/GeoFencing"));
 var i18n_1 = __importDefault(require("../../i18n"));
 var omit = require('lodash/omit');
 function DataInput(props) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     var t = (0, react_i18next_1.useTranslation)(undefined, { i18n: i18n_1.default }).t;
     var fieldDefinition = props.fieldDefinition, onChange = props.onChange, value = props.value, error = props.error, disableHelperText = props.disableHelperText;
     var fieldName = fieldDefinition.fieldName, type = fieldDefinition.type, onValidate = fieldDefinition.onValidate, min = fieldDefinition.min, max = fieldDefinition.max, other = __rest(fieldDefinition, ["fieldName", "type", "onValidate", "min", "max"]);
-    var _j = react_2.default.useState(t('Common.InvalidData')), errorText = _j[0], setErrorText = _j[1];
+    var _k = react_2.default.useState(t('Common.InvalidData')), errorText = _k[0], setErrorText = _k[1];
     var checkValidationValue = function (fieldDefinition, val) {
         if (!fieldDefinition.required &&
-            (val === undefined || val === null || val === '' || val === []))
+            (val === undefined || val === null || val === '' || (Array.isArray(val) && val.length === 0)))
             return true;
         if (fieldDefinition.onValidate)
             return fieldDefinition.onValidate(val, fieldDefinition === null || fieldDefinition === void 0 ? void 0 : fieldDefinition.length, fieldDefinition === null || fieldDefinition === void 0 ? void 0 : fieldDefinition.pattern);
@@ -63,6 +63,8 @@ function DataInput(props) {
                 else
                     return (0, validation_1.notNullValid)(val);
             }
+            case 'multiple-hierarchical':
+                return (0, validation_1.arrayIsNotEmptyValid)(val);
             case 'month':
             case 'date':
                 return (0, validation_1.dateValid)(val);
@@ -108,10 +110,10 @@ function DataInput(props) {
         case 'autocomplete': {
             return ((0, jsx_runtime_1.jsx)(material_1.Autocomplete, { multiple: fieldDefinition.multiple, options: fieldDefinition.options, getOptionLabel: function (option) { var _a, _b; return (_b = (_a = option.label) !== null && _a !== void 0 ? _a : option.text) !== null && _b !== void 0 ? _b : ''; }, isOptionEqualToValue: function (option, value) {
                     return (option === null || option === void 0 ? void 0 : option.value) === (value === null || value === void 0 ? void 0 : value.value);
-                }, onChange: function (e, value) {
+                }, disableclearable: fieldDefinition.disableClearable, onChange: function (e, value) {
                     var newValue = fieldDefinition.multiple
-                        ? value.map(function (x) { return x.value; })
-                        : value.value;
+                        ? value.map(function (x) { return x === null || x === void 0 ? void 0 : x.value; })
+                        : value === null || value === void 0 ? void 0 : value.value;
                     onChange(newValue, checkValidationValue(fieldDefinition, newValue));
                 }, value: fieldDefinition.multiple
                     ? fieldDefinition.options.filter(function (x) {
@@ -155,7 +157,7 @@ function DataInput(props) {
                 }, readOnly: fieldDefinition.readOnly }));
         }
         case 'date-range': {
-            var _k = other, isDayBlocked = _k.isDayBlocked, isOutsideRange = _k.isOutsideRange;
+            var _l = other, isDayBlocked = _l.isDayBlocked, isOutsideRange = _l.isOutsideRange;
             return ((0, jsx_runtime_1.jsx)(AWING_1.DateRangePicker, { noBorder: true, variant: "standard", textFieldProps: __assign({ fullWidth: true, style: { margin: '8px 0px' } }, omit(other, ['isDayBlocked', 'isOutsideRange'])), value: {
                     startDate: (value === null || value === void 0 ? void 0 : value[0]) || null,
                     endDate: (value === null || value === void 0 ? void 0 : value[1]) || null,
@@ -208,6 +210,13 @@ function DataInput(props) {
                         }), { children: (_a = item.label) !== null && _a !== void 0 ? _a : item.text }), "".concat(fieldName.toString(), "-opt-").concat(index)));
                     })] })));
         }
+        case 'multiple-hierarchical': {
+            return ((0, jsx_runtime_1.jsx)(AWING_1.MultipleHierarchicalChoice, __assign({}, fieldDefinition, { variant: "standard", value: value, onChange: function (value) {
+                    onChange(value, checkValidationValue(fieldDefinition, value));
+                }, error: error, helperText: !disableHelperText && error
+                    ? (_h = fieldDefinition.helperText) !== null && _h !== void 0 ? _h : t('Common.InvalidData')
+                    : '' })));
+        }
         case 'geo-fencing': {
             var configs = fieldDefinition.configs, label = fieldDefinition.label, initValue = fieldDefinition.initValue, value_1 = fieldDefinition.value, limit = fieldDefinition.limit, isOnlyMap = fieldDefinition.isOnlyMap;
             return ((0, jsx_runtime_1.jsx)("div", { style: { marginTop: '16px' }, children: (0, jsx_runtime_1.jsx)(GeoFencing_1.default, { configs: configs, label: label, initValue: initValue, value: value_1, limit: limit, isOnlyMap: isOnlyMap, onChange: function (newValue) {
@@ -218,7 +227,7 @@ function DataInput(props) {
             return ((0, jsx_runtime_1.jsx)(material_1.TextField, __assign({ id: fieldName.toString(), name: fieldName.toString(), type: fieldDefinition.type, fullWidth: true, variant: "standard" }, other, { value: value !== null && value !== void 0 ? value : '', onChange: function (event) {
                     return onChange(event.target.value, checkValidationValue(fieldDefinition, event.target.value));
                 }, error: error, helperText: !disableHelperText && error
-                    ? (_h = fieldDefinition.helperText) !== null && _h !== void 0 ? _h : t('Common.InvalidData')
+                    ? (_j = fieldDefinition.helperText) !== null && _j !== void 0 ? _j : t('Common.InvalidData')
                     : '' })));
         }
     }

package/lib/AWING/DataForm/interface.d.ts

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 import { BaseTextFieldProps } from '@mui/material/TextField';
-import { DataObject, MenuOption } from '../../AWING';
+import { DataObject, IMultipleHierarchicalChoiceProps, MenuOption } from '../../AWING';
 import { IMainObj, IListFunctions } from '../../AWING/LogicExpression/interface';
 import { GeoFencingValue, IConfig } from '../../ACM-AXN/GeoFencing/interface';
 import { Moment } from 'moment';
@@ -44,6 +44,7 @@ export type AutocompleteFieldDefinition<T extends DataObject> = BaseFieldDefinit
     type: 'autocomplete';
     options: Array<MenuOption>;
     loading?: boolean;
+    disableClearable?: boolean;
 };
 export interface CheckBoxFieldDefinition<T extends DataObject> extends BaseFieldDefinition<T> {
     type: 'checkbox';
@@ -122,5 +123,8 @@ export type SelectFieldDefinition<T extends DataObject> = BaseFieldDefinition<T>
     row?: Partial<T>;
     onDisabledSelectItem?: (value: any, row?: Partial<T>) => boolean;
 };
-export type FieldDefinition<T extends DataObject> = AsyncAutocompleteFieldDefinition<T> | AutocompleteFieldDefinition<T> | LogicExpressionDefinition<T> | CheckBoxFieldDefinition<T> | DateTimeFieldDefinition<T> | DateRangeFieldDefinition<T> | NumberFieldDefinition<T> | RadioFieldDefinition<T> | SelectFieldDefinition<T> | TextFieldDefinition<T> | GeoFencingDefinition<T>;
+export type MultipleHierarchicalDefinition<T extends DataObject> = BaseFieldDefinition<T> & Omit<IMultipleHierarchicalChoiceProps, 'defaultValue' | 'onChange'> & {
+    type: 'multiple-hierarchical';
+};
+export type FieldDefinition<T extends DataObject> = AsyncAutocompleteFieldDefinition<T> | AutocompleteFieldDefinition<T> | LogicExpressionDefinition<T> | CheckBoxFieldDefinition<T> | DateTimeFieldDefinition<T> | DateRangeFieldDefinition<T> | NumberFieldDefinition<T> | RadioFieldDefinition<T> | SelectFieldDefinition<T> | TextFieldDefinition<T> | GeoFencingDefinition<T> | MultipleHierarchicalDefinition<T>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "awing-library",
-  "version": "2.1.30-beta",
+  "version": "2.1.31-beta",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",