@dartech/arsenal-ui 1.4.47 → 1.4.49

package/index.js

@@ -922,6 +922,7 @@ function ControlQueryAutocomplete(_a) {
       searchBy,
       labelKey,
       multiple = false,
+      mongoQueryJson,
       disabled,
       valueKey,
       sortBy = '',
@@ -934,7 +935,7 @@ function ControlQueryAutocomplete(_a) {
       itemQueryFunction,
       requiredErrorText = ''
     } = _a,
-    autocompleteProps = __rest(_a, ["name", "label", "control", "required", "searchBy", "labelKey", "multiple", "disabled", "valueKey", "sortBy", "hideErrorMessage", "disableCloseOnSelect", "textFieldProps", "onChange", "queryFunction", "validate", "itemQueryFunction", "requiredErrorText"]);
+    autocompleteProps = __rest(_a, ["name", "label", "control", "required", "searchBy", "labelKey", "multiple", "mongoQueryJson", "disabled", "valueKey", "sortBy", "hideErrorMessage", "disableCloseOnSelect", "textFieldProps", "onChange", "queryFunction", "validate", "itemQueryFunction", "requiredErrorText"]);
   const _b = useController({
       control,
       name,
@@ -994,9 +995,31 @@ function ControlQueryAutocomplete(_a) {
       }
     }
   });
+  const modifyFieldsWithString = (data, replacement) => {
+    if (typeof data === 'object') {
+      if (Array.isArray(data)) {
+        return data.map(item => modifyFieldsWithString(item, replacement));
+      } else {
+        const modifiedData = {};
+        for (const key in data) {
+          modifiedData[key] = modifyFieldsWithString(data[key], replacement);
+        }
+        return modifiedData;
+      }
+      // eslint-disable-next-line no-template-curly-in-string
+    } else if (typeof data === 'string' && data.includes('${variable}')) {
+      // eslint-disable-next-line no-template-curly-in-string
+      return data.replace('${variable}', replacement);
+    } else {
+      return data;
+    }
+  };
   const debouncedChange = useDebounce(val => {
     setPage(0);
-    setSearchValue(val);
+    if (mongoQueryJson) {
+      const obj = modifyFieldsWithString(mongoQueryJson, val);
+      setSearchValue(JSON.stringify(obj));
+    } else setSearchValue(val);
   }, 500);
   const handleInputChange = useCallback((_, value) => {
     setInputValue(value);
@@ -1960,11 +1983,11 @@ const formatTableRowValue = ({
         })
       }));
     case 'date':
-      return value ? dateFormat ? jsx(Box, {
+      return value ? dateFormat ? jsx(OverflowTip, {
         children: dateFormat.map((formatString, index) => jsx(Box, {
           children: format(new Date(value), formatString)
         }, index))
-      }) : jsxs(Box, {
+      }) : jsxs(OverflowTip, {
         children: [jsx(Box, {
           children: format(new Date(value), 'dd.MM.yyyy')
         }), jsx(Box, {
@@ -1972,9 +1995,11 @@ const formatTableRowValue = ({
         })]
       }) : '';
     case 'status':
-      return jsx(Status, {
-        text: value,
-        status: statusVariant ? statusVariant : 'default'
+      return jsx(OverflowTip, {
+        children: jsx(Status, {
+          text: value,
+          status: statusVariant ? statusVariant : 'default'
+        })
       });
     case 'json_text':
       return jsx(JsonTypeCell$1, {
@@ -2015,7 +2040,7 @@ const formatTableRowValue = ({
         display: "flex",
         justifyContent: "flex-end"
       }, {
-        children: jsx(Box, {
+        children: jsx(OverflowTip, {
           children: value.toLocaleString('ru-Ru', {
             minimumFractionDigits: 2
           })
@@ -2029,21 +2054,15 @@ const formatTableRowValue = ({
         width: "100%"
       }, {
         children: [shortId ? jsx(OverflowTip, {
-          children: jsx(Box, Object.assign({
-            mr: "auto"
-          }, {
-            children: value ? `${value.slice(0, 6)}...${value.slice(-6)}` : '...'
-          }))
+          children: value ? `${value.slice(0, 6)}...${value.slice(-6)}` : '...'
         }) : _fullText ? jsx(Box, Object.assign({
           sx: {
             whiteSpace: 'normal'
           }
         }, {
           children: typeof value === 'string' ? value : JSON.stringify(value)
-        })) : jsx(Box, {
-          children: jsx(OverflowTip, {
-            children: typeof value === 'string' ? value : JSON.stringify(value)
-          })
+        })) : jsx(OverflowTip, {
+          children: typeof value === 'string' ? value : JSON.stringify(value)
         }), canCopy && jsx(CopyButton, {
           copyText: copyValue ? typeof copyValue === 'string' ? copyValue : JSON.stringify(copyValue) : value
         })]
@@ -3232,6 +3251,9 @@ const ControlPhoneInput = _a => {
     rules: {
       required: required ? requiredErrorText || DEFAULT_REQUIRED_ERROR_TEXT : false,
       validate: val => {
+        if (!required && !val) {
+          return true;
+        }
         if (!/(\+7\s\(\d{3}\)\s)(\d{3}\s\d{2})(\s\d{2})/.test(val)) {
           return 'Incorrect phone number format';
         }
@@ -6829,7 +6851,7 @@ const PropertyFiller = ({
       parseValue: true,
       hideErrorMessage: true,
       useCleanValue: true,
-      mode: propertyType === PropertyType.ANY || propertyType === PropertyType.JSON ? 'text' : 'json'
+      mode: propertyType === PropertyType.ANY ? 'text' : 'json'
     }) : jsx(ControlInput, {
       control: control,
       name: name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dartech/arsenal-ui",
-  "version": "1.4.47",
+  "version": "1.4.49",
   "author": "DAR",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/src/lib/Forms/ControlAutocomplete/ControlQueryAutocomplete.d.ts

@@ -8,10 +8,11 @@ type PaginateParams = {
 };
 type ControlQueryAutocompleteProps<T> = Omit<ControlAutocompleteProps, 'options'> & {
     searchBy: string;
+    mongoQueryJson?: any;
     sortBy?: string;
     queryFunction: (params: PaginateParams) => Promise<PaginateData<T>>;
     itemQueryFunction?: (valueKey: string) => Promise<T>;
     requiredErrorText?: string;
 };
-export declare function ControlQueryAutocomplete<T>({ name, label, control, required, searchBy, labelKey, multiple, disabled, valueKey, sortBy, hideErrorMessage, disableCloseOnSelect, textFieldProps, onChange, queryFunction, validate, itemQueryFunction, requiredErrorText, ...autocompleteProps }: ControlQueryAutocompleteProps<T>): JSX.Element;
+export declare function ControlQueryAutocomplete<T>({ name, label, control, required, searchBy, labelKey, multiple, mongoQueryJson, disabled, valueKey, sortBy, hideErrorMessage, disableCloseOnSelect, textFieldProps, onChange, queryFunction, validate, itemQueryFunction, requiredErrorText, ...autocompleteProps }: ControlQueryAutocompleteProps<T>): JSX.Element;
 export default ControlQueryAutocomplete;