@dartech/arsenal-ui 1.3.92 → 1.3.93

package/index.js

@@ -2057,7 +2057,8 @@ const ControlDate = ({
     rules: {
       required: required && 'Please, fill this field',
       validate: val => {
-        if (isMatch(val, localFormat)) {
+        console.log('DATE', val);
+        if (val === '' || isMatch(val, localFormat)) {
           return true;
         }
         return 'Incorrect date format';
@@ -3284,13 +3285,17 @@ var EntityPropertiesShortView$1 = EntityPropertiesShortView;
 
 const defaultPropertyValues$1 = {
   key: '',
-  propertyType: '',
+  propertyType: null,
   name: '',
   defaultValue: '',
+  value: '',
+  defaultValues: [],
   isRequired: true,
   isMultiple: false,
   sortOrder: 0,
-  isEnabled: true
+  isEnabled: true,
+  executeValue: '',
+  uiSettings: ''
 };
 const EntityAdditionalFields = ({
   parentPropertyFieldName,
@@ -3814,10 +3819,8 @@ const PropertyWidget = ({
   entityReferenceValueComponent: EntityReferenceValueComponent,
   fileReferenceValueComponent: FileReferenceValueComponent
 }) => {
-  const propertyType = useMemo(() => {
-    var _a;
-    return typeof property.propertyType === 'string' ? property.propertyType : (_a = property['propertyType']) === null || _a === void 0 ? void 0 : _a['value'];
-  }, [property]);
+  var _a;
+  const propertyType = typeof property.propertyType === 'string' ? property.propertyType : (_a = property['propertyType']) === null || _a === void 0 ? void 0 : _a['value'];
   switch (propertyType) {
     case PropertyType.BIG_DECIMAL:
     case PropertyType.FLOAT:
@@ -3993,7 +3996,7 @@ const usePropertyFiller = ({
       case PropertyType.FLOAT:
         return 0;
       default:
-        return {};
+        return null;
     }
   }, [propertyType]);
   const needRecursionCheck = useMemo(() => propertyType === PropertyType.JSON || propertyType === PropertyType.ANY, [propertyType]);
@@ -4057,6 +4060,7 @@ const PropertyFiller = ({
     watch
   } = useFormContext();
   const {
+    // field: { value },
     fieldState: {
       error,
       isDirty
@@ -4146,13 +4150,13 @@ const PropertyFiller = ({
     clearErrors();
   }, [name, defaultProperyValue, clearErrors, value, setFillOption, fillOption, propertyType, setValue, property]);
   useEffect(() => {
-    if (!isDirty && property.defaultValue && !value) {
-      setValue(name, property.defaultValue);
+    if (!isDirty && (property.defaultValue || property.value) && !value) {
+      setValue(name, property.defaultValue || property.value);
     }
   }, [isDirty, property, name, setValue, value]);
   useEffect(() => {
     var _a;
-    if (value === undefined || property.isRequired && value === null && !property.defaultValue) {
+    if (value === undefined || property.isRequired && value === null && !(property.defaultValue || property.value)) {
       setValue(name, (_a = prevValueRef.current[fillOption]) !== null && _a !== void 0 ? _a : defaultProperyValue);
     }
   }, [value, setValue, defaultProperyValue, property, name, fillOption]);
@@ -4500,33 +4504,55 @@ const PropertyValueField = ({
   fileReferenceValueComponent
 }) => {
   const {
-    watch
+    control
   } = useFormContext();
-  const propertyType = watch(`${propertyFieldName}.propertyType`);
-  const isMultiple = watch(`${propertyFieldName}.isMultiple`);
-  const format = watch(`${propertyFieldName}.format`);
-  const restrictedValues = watch(`${propertyFieldName}.restrictedValues`);
-  const properties = watch(`${propertyFieldName}.properties`);
-  const isRequired = watch(`${propertyFieldName}.isRequired`);
+  const propertyType = useWatch({
+    control,
+    name: `${propertyFieldName}.propertyType`
+  });
+  const isMultiple = useWatch({
+    control,
+    name: `${propertyFieldName}.isMultiple`
+  });
+  const format = useWatch({
+    control,
+    name: `${propertyFieldName}.format`
+  });
+  const restrictedValues = useWatch({
+    control,
+    name: `${propertyFieldName}.restrictedValues`
+  });
+  const properties = useWatch({
+    control,
+    name: `${propertyFieldName}.properties`
+  });
+  const isRequired = useWatch({
+    control,
+    name: `${propertyFieldName}.isRequired`
+  });
   const fillerProperty = useMemo(() => {
-    const typeValue = typeof propertyType === 'string' ? propertyType : propertyType.value;
-    return {
+    return Object.assign(Object.assign(Object.assign(Object.assign({
       name: _label,
       isRequired: required !== null && required !== void 0 ? required : isRequired,
-      isMultiple,
-      format,
-      restrictedValues,
-      properties,
-      propertyType: typeValue,
+      isMultiple
+    }, !!format && {
+      format
+    }), {
+      restrictedValues
+    }), !!properties && {
+      properties
+    }), {
+      propertyType: typeof propertyType === 'string' ? propertyType : propertyType.value,
       defaultValue: null,
       defaultValues: [],
       sortOrder: 0,
       isEnabled: true,
       uiSettings: null,
       validationNode: null
-    };
-  }, [propertyType, format, restrictedValues, isMultiple, _label, isRequired, properties, required]);
-  console.log('isMultiple', isMultiple);
+    });
+  }, [propertyType, format, restrictedValues, isMultiple, _label,
+  // key,
+  isRequired, properties, required]);
   return isMultiple ? jsx(MultiplePropertyFiller, {
     name: name,
     property: fillerProperty,
@@ -4950,9 +4976,18 @@ const CreatePropertyFormFields = ({
     setValue,
     watch
   } = useFormContext();
-  const propertyType = watch(`${propertyFieldName}.propertyType`);
-  const isMultiple = watch(`${propertyFieldName}.isMultiple`);
-  const isRequired = watch(`${propertyFieldName}.isRequired`);
+  const propertyType = useWatch({
+    control,
+    name: `${propertyFieldName}.propertyType`
+  });
+  const isMultiple = useWatch({
+    control,
+    name: `${propertyFieldName}.isMultiple`
+  });
+  const isRequired = useWatch({
+    control,
+    name: `${propertyFieldName}.isRequired`
+  });
   const {
     customCheckboxes,
     customFields

package/package.json

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