@dartech/arsenal-ui 1.3.77 → 1.3.78

package/index.js

@@ -1473,10 +1473,24 @@ const formatTableRowValue = ({
 
 const digitsOnly = new RegExp('^[-+]?[0-9]+$');
 const floatsOnly = new RegExp(/^[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?$/);
-const isExpression = value => {
-  // return typeof value === 'string' ? value.includes('$(') : false;
-  return typeof value === 'string' ? /\$(?:S?JS)?\(/g.test(value) : false;
+const isExpression = (value, useRecursion) => {
+  if (typeof value === 'string') return /\$(?:S?JS)?\(/g.test(value);
+  if (useRecursion) {
+    if (Array.isArray(value)) {
+      for (const item of value) {
+        if (isExpression(item, useRecursion)) return true;
+      }
+    }
+    if (typeof value === 'object') {
+      for (const key in value) {
+        if (isExpression(value[key], useRecursion)) return true;
+      }
+    }
+  }
+  return false;
+  // return typeof value === 'string' ? /\$(?:S?JS)?\(/g.test(value) : false;
 };
+
 const isDateType = propertyType => {
   return propertyType === PropertyType.DATE || propertyType === PropertyType.DATE_TIME || propertyType === PropertyType.TIME;
 };
@@ -1645,7 +1659,6 @@ const propertiesArrayToObject = (properties, isGlobalParameter) => {
       resultProperty['restrictedValues'] = property.restrictedValues;
     }
     if (propertyType === PropertyType.ENTITY_REFERENCE) {
-      resultProperty['source'] = property.source;
       resultProperty['definitionCode'] = property.definitionCode;
       resultProperty['definitionVersion'] = property.definitionVersion;
       resultProperty['labelPropertyCode'] = property.labelPropertyCode;
@@ -1889,7 +1902,7 @@ const ControlNumberInput = _a => {
           } else if (!decimal && !digitsOnly.test(val)) {
             return 'Not valid integer';
           }
-          return true;
+          return validate ? typeof validate === 'function' ? validate(val) : true : true;
         }
       }
     }),
@@ -3430,83 +3443,6 @@ const EntityAdditionalFields = ({
 };
 var EntityAdditionalFields$1 = EntityAdditionalFields;
 
-const sources = [{
-  label: 'Arsenal',
-  value: 'ARSENAL'
-}, {
-  label: 'Scalend',
-  value: 'SCALEND'
-}];
-const modules = [{
-  label: 'Customers',
-  value: 'CUSTOMERS'
-}, {
-  label: 'Products',
-  value: 'PRODUCTS'
-}, {
-  label: 'Pledges',
-  value: 'PLEDGES'
-}];
-const EntityReferencePropertyFields = ({
-  propertyFieldName
-}) => {
-  const {
-    control
-  } = useFormContext();
-  const source = useWatch({
-    control,
-    name: `${propertyFieldName}.source`
-  });
-  return jsxs(Fragment, {
-    children: [jsx(Grid, {
-      children: jsx(ControlSelect, {
-        required: true,
-        control: control,
-        name: `${propertyFieldName}.source`,
-        label: "Source",
-        options: sources
-      })
-    }), source && jsx(Grid, {
-      children: source === 'ARSENAL' ? jsx(ControlInput, {
-        required: true,
-        control: control,
-        name: `${propertyFieldName}.definitionCode`,
-        label: "Definition Code"
-      }) : jsx(ControlSelect, {
-        required: true,
-        control: control,
-        name: `${propertyFieldName}.definitionCode`,
-        label: "Definition Code",
-        valueKey: "value",
-        options: modules
-      })
-    }), jsx(Grid, {
-      children: jsx(ControlInput, {
-        required: true,
-        control: control,
-        name: `${propertyFieldName}.definitionVersion`,
-        label: "Definition Version",
-        defaultValue: 1
-      })
-    }), jsx(Grid, {
-      children: jsx(ControlInput, {
-        required: true,
-        control: control,
-        name: `${propertyFieldName}.labelPropertyCode`,
-        label: "Label Property Code"
-      })
-    }), jsx(Grid, {
-      children: jsx(ControlInput, {
-        required: true,
-        control: control,
-        name: `${propertyFieldName}.valuePropertyCode`,
-        label: "Value Property Code"
-      })
-    })]
-  });
-};
-var EntityReferencePropertyFields$1 = EntityReferencePropertyFields;
-
 const StringPropertyFields = ({
   propertyFieldName
 }) => {
@@ -3633,7 +3569,8 @@ const PropertyAdditionalFields = ({
         defaultValue: DATE_TIME_DEFAULT_FORMAT
       });
     case PropertyType.ENTITY_REFERENCE:
-      return jsx(EntityReferencePropertyFields$1, {
+      // return <EntityReferencePropertyFields propertyFieldName={propertyFieldName} />;
+      return jsx(StringPropertyFields$1, {
         propertyFieldName: propertyFieldName
       });
     case PropertyType.ENTITY:
@@ -3998,18 +3935,19 @@ const usePropertyFiller = ({
         return {};
     }
   }, [propertyType]);
+  const needRecursionCheck = useMemo(() => propertyType === PropertyType.JSON, [propertyType]);
   const checkFillOption = useCallback(() => {
-    if (isExpression(value) && fillOption !== 'expression') {
+    if (isExpression(value, needRecursionCheck)) {
       setFillOption('expression');
-    } else if (value !== null && value !== undefined && !isExpression(value) && fillOption !== 'widget' && fillOption !== 'string') {
+    } else if (value !== null && value !== undefined && !isExpression(value, needRecursionCheck) && fillOption !== 'widget' && fillOption !== 'string') {
       setFillOption('widget');
     }
-  }, [value, fillOption]);
+  }, [value, fillOption, needRecursionCheck]);
   useEffect(() => {
     if (!fillOption) {
       if (isPropertyValueEmpty(value) && (fillOptions === null || fillOptions === void 0 ? void 0 : fillOptions.length)) {
         setFillOption(fillOptions[0].value);
-      } else if (_useExpression && isExpression(value)) {
+      } else if (_useExpression && isExpression(value, needRecursionCheck)) {
         setFillOption('expression');
       } else {
         setFillOption('widget');
@@ -4017,7 +3955,7 @@ const usePropertyFiller = ({
     } else if (!isDirty) {
       checkFillOption();
     }
-  }, [value, fillOption, fillOptions, _useExpression, isDirty, checkFillOption]);
+  }, [value, fillOption, fillOptions, _useExpression, isDirty, checkFillOption, needRecursionCheck]);
   return {
     propertyType,
     valueLabel,
@@ -4232,53 +4170,6 @@ const PropertyFiller = ({
   }));
 };
 
-const JsonEditor = /*#__PURE__*/forwardRef(({
-  validate: _validate = false,
-  name,
-  useParsedValue
-}, ref) => {
-  const {
-    control,
-    setValue,
-    setError,
-    clearErrors
-  } = useFormContext();
-  const value = useWatch({
-    control,
-    name
-  });
-  const handleChange = value => {
-    try {
-      if (value) setValue(name, useParsedValue ? JSON.parse(value) : value);
-      clearErrors(name);
-    } catch (e) {
-      if (_validate) setError(name, {
-        message: 'Invalid JSON'
-      });
-    }
-  };
-  return jsx(CodeMirror, {
-    ref: ref,
-    basicSetup: {
-      autocompletion: true,
-      history: true
-    },
-    theme: abcdef,
-    width: "100%",
-    height: "200px",
-    style: {
-      fontSize: 14,
-      lineHeight: 1.4,
-      zIndex: 0,
-      isolation: 'isolate'
-    },
-    value: typeof value !== 'string' ? value === null ? '' : JSON.stringify(value) : value,
-    onChange: handleChange,
-    extensions: [langs.json()]
-  });
-});
-var JsonEditor$1 = JsonEditor;
-
 const MultiplePropertyWidget = ({
   name,
   property,
@@ -4444,7 +4335,7 @@ const MultiplePropertyFiller = ({
   };
   useEffect(() => {
     if (!value) {
-      onChange(property.isRequired ? [] : null);
+      onChange(property.isRequired && property.isMultiple ? [] : null);
     }
   }, [value, property, onChange]);
   useEffect(() => {
@@ -4487,21 +4378,29 @@ const MultiplePropertyFiller = ({
           }), option.value))
         }))]
       }))
-    })) : null, fillOption === 'expression' && (propertyType === PropertyType.JSON || propertyType === PropertyType.ENTITY || propertyType === PropertyType.ANY ? jsx(JsonEditor$1, {
+    })) : null, fillOption === 'expression' && (propertyType === PropertyType.JSON || propertyType === PropertyType.ENTITY || propertyType === PropertyType.ANY ? jsx(ControlAceEditor, {
       name: name,
-      ref: ref
+      control: control,
+      label: valueLabel,
+      parseValue: true,
+      validateJson: true,
+      hideErrorMessage: true
     }) : jsx(ControlInput, {
       required: true,
       hideErrorMessage: true,
       control: control,
       name: name,
       label: valueLabel
-    })), fillOption === 'json_valid' && jsx(JsonEditor$1, {
-      validate: true,
+    })), fillOption === 'json_valid' && jsx(ControlAceEditor, {
       name: name,
-      ref: ref,
-      useParsedValue: true
-    }), fillOption === 'widget' && jsx(MultiplePropertyWidget$1, {
+      control: control,
+      label: valueLabel,
+      parseValue: true,
+      validateJson: true,
+      hideErrorMessage: true
+    })
+    // <JsonEditor validate name={name} ref={ref} useParsedValue />
+    , fillOption === 'widget' && jsx(MultiplePropertyWidget$1, {
       property: property,
       name: name,
       useExpression: useExpression,
@@ -5662,29 +5561,25 @@ const PropertyValueComponent = ({
       padding: '4px'
     }
   }, {
-    children: value === null ? 'null' : value === null || value === void 0 ? void 0 : value.toString()
+    children: value === null ? 'null' : value.toString()
   }));
-  if (isExpression(data)) {
-    return defaultRender(data);
-  } else {
-    switch (property.propertyType) {
-      case PropertyType.JSON:
-        return jsx(JsonView, {
-          value: data
-        });
-      case PropertyType.ENTITY:
-        return jsx(DefinitionValueView, {
-          properties: properties,
-          data: data
-        });
-      case PropertyType.ANY:
-        // TODO need to prefetch data and show as is
-        return typeof data === 'object' ? jsx(JsonView, {
-          value: data
-        }) : defaultRender(data);
-      default:
-        return defaultRender(data);
-    }
+  switch (property.propertyType) {
+    case PropertyType.JSON:
+      return jsx(JsonView, {
+        value: data
+      });
+    case PropertyType.ENTITY:
+      return jsx(DefinitionValueView, {
+        properties: properties,
+        data: data
+      });
+    case PropertyType.ANY:
+      // TODO need to prefetch data and show as is
+      return typeof data === 'object' ? jsx(JsonView, {
+        value: data
+      }) : defaultRender(data);
+    default:
+      return defaultRender(data);
   }
 };
 const PropertyDataView = ({

package/package.json

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

package/src/utils/validators.d.ts

@@ -1,5 +1,5 @@
 import { PropertyType } from '../interfaces';
 export declare const digitsOnly: RegExp;
 export declare const floatsOnly: RegExp;
-export declare const isExpression: (value: unknown) => boolean;
+export declare const isExpression: (value: unknown, useRecursion?: boolean) => boolean;
 export declare const isDateType: (propertyType: PropertyType) => boolean;