@dartech/arsenal-ui 1.3.62 → 1.3.63

package/index.js

@@ -1214,22 +1214,10 @@ const JsonView = ({
   height: _height = '200px',
   fontSize: _fontSize = 16
 }) => {
-  const stringValue = useMemo(() => {
-    if (typeof value === 'string') {
-      return value;
-    } else if (typeof value === 'object') {
-      try {
-        return JSON.stringify(value, null, 2);
-      } catch (error) {
-        return 'Failed to stringify Object';
-      }
-    }
-    return '';
-  }, [value]);
   return jsx(CodeMirror, {
     readOnly: true,
     width: "100%",
-    value: stringValue,
+    value: typeof value === 'string' ? value : JSON.stringify(value, null, 2),
     height: _height,
     basicSetup: {
       autocompletion: true,
@@ -3715,17 +3703,16 @@ const PropertyWidget = ({
       });
     // return <JsonEditor validate name={name} ref={ref} useParsedValue />;
     case PropertyType.STRING:
-      return jsx(StringValueField$1
-      // required={!property.isRequired}
-      , {
-        // required={!property.isRequired}
+      return jsx(StringValueField$1, {
         name: name,
         label: label,
         restrictedValues: property.restrictedValues
       });
     case PropertyType.ENTITY_REFERENCE:
-      return jsx(ControlInput, {
-        required: true,
+      return jsx(ControlInput
+      // required
+      , {
+        // required
         hideErrorMessage: true,
         name: name,
         label: label,
@@ -3803,7 +3790,7 @@ const usePropertyFiller = ({
   const checkFillOption = useCallback(() => {
     if (isExpression(value) && fillOption !== 'expression') {
       setFillOption('expression');
-    } else if (value !== null && value !== undefined && !isExpression(value) && fillOption !== 'widget') {
+    } else if (value !== null && value !== undefined && !isExpression(value) && fillOption !== 'widget' && fillOption !== 'string') {
       setFillOption('widget');
     }
   }, [value, fillOption]);
@@ -3868,7 +3855,10 @@ const PropertyFiller = ({
     control,
     defaultValue: property.defaultValue,
     rules: {
-      required
+      validate: val => {
+        if (required && val === null) return 'Please, fill this field555';
+        return true;
+      }
     }
   });
   const {
@@ -3921,7 +3911,6 @@ const PropertyFiller = ({
           setValue(name, definitionValue);
         } catch (error) {
           setValue(name, defaultArrayValue);
-          // console.log('Parse failed');
         }
       } else {
         setValue(name, defaultArrayValue);
@@ -3935,10 +3924,10 @@ const PropertyFiller = ({
     }
   }, [isDirty, property, name, setValue]);
   useEffect(() => {
-    if (property.isRequired && !value) {
+    if (value === undefined || property.isRequired && value === null && !property.defaultValue) {
       setValue(name, defaultProperyValue);
     }
-  }, [value, setValue, defaultProperyValue, property, name, isDirty]);
+  }, [value, setValue, defaultProperyValue, property, name]);
   return jsxs(Grid$1, Object.assign({
     xs: 12
   }, {
@@ -3975,9 +3964,7 @@ const PropertyFiller = ({
           }), option.value))
         }))]
       }))
-    })) : null, fillOption === 'expression' && (propertyType === PropertyType.JSON || propertyType === PropertyType.ENTITY || propertyType === PropertyType.ANY ?
-    // <JsonEditor validate name={name} useParsedValue />
-    jsx(ControlAceEditor, {
+    })) : null, fillOption === 'expression' && (propertyType === PropertyType.JSON || propertyType === PropertyType.ENTITY || propertyType === PropertyType.ANY ? jsx(ControlAceEditor, {
       name: name,
       control: control,
       label: valueLabel,
@@ -3988,17 +3975,13 @@ const PropertyFiller = ({
       control: control,
       name: name,
       label: valueLabel,
-      required: true,
       hideErrorMessage: true
     })), fillOption === 'string' && jsx(ControlInput, {
       control: control,
       name: name,
       label: valueLabel,
-      required: true,
       hideErrorMessage: true
-    }), fillOption === 'json_notvalid' &&
-    // <JsonEditor validate name={name} />
-    jsx(ControlAceEditor, {
+    }), fillOption === 'json_notvalid' && jsx(ControlAceEditor, {
       name: name,
       control: control,
       label: valueLabel,
@@ -4008,8 +3991,7 @@ const PropertyFiller = ({
       property: property,
       name: name,
       useExpression: useExpression,
-      label: valueLabel,
-      required: required
+      label: valueLabel
     }), fillOption === 'dem_builder' && jsx(CreateDefinition, {
       title: "JSON",
       definitionFieldName: name

package/package.json

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

package/src/lib/Property/PropertyWidget/PropertyWidget.d.ts

@@ -6,7 +6,6 @@ type Props = {
     name: string;
     label?: string;
     useExpression?: boolean;
-    required?: boolean;
     control: Control<any>;
 };
 export declare const PropertyWidget: ({ property, name, label, useExpression, control }: Props) => JSX.Element;