@dartech/arsenal-ui 1.3.80 → 1.3.81

package/index.js

@@ -70,11 +70,10 @@ import StepContent from '@mui/material/StepContent';
 import StepConnector from '@mui/material/StepConnector';
 import Select from '@mui/material/Select';
 import InputLabel from '@mui/material/InputLabel';
-import { toast } from 'react-toastify';
-import axios from 'axios';
 import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
 import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
 import classnames from 'classnames';
+import { toast } from 'react-toastify';
 import CssBaseline from '@mui/material/CssBaseline';
 import MuiDrawer from '@mui/material/Drawer';
 import MuiList from '@mui/material/List';
@@ -1659,6 +1658,7 @@ 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;
@@ -3287,7 +3287,6 @@ const EntityAdditionalFields = ({
 }) => {
   const {
     control,
-    setValue,
     getValues,
     trigger
   } = useFormContext();
@@ -3302,7 +3301,8 @@ const EntityAdditionalFields = ({
   });
   const {
     fields,
-    append
+    append,
+    remove
   } = useFieldArray({
     control,
     name: `${parentPropertyFieldName}.properties`
@@ -3422,6 +3422,7 @@ const EntityAdditionalFields = ({
             children: jsx(CreatePropertiesList, {
               hideAddButton: true,
               entityPropFields: fields,
+              parentRemove: remove,
               parentFieldName: parentPropertyFieldName,
               focusOnIndex: focusedProperty,
               entityDefinition: _entityDefinition,
@@ -3645,131 +3646,6 @@ const StringValueField = ({
 };
 var StringValueField$1 = StringValueField;
 
-function useEntitiesService({
-  baseURL
-}) {
-  const entitiesInstance = axios.create({
-    baseURL: baseURL
-  });
-  const getEntitiesByCodeAndVersion = ({
-    definitionCode,
-    definitionVersion
-  }) => __awaiter(this, void 0, void 0, function* () {
-    const response = yield entitiesInstance.get(`/entities/code/${definitionCode}/version/${definitionVersion}`);
-    console.log(response);
-    return response.data;
-  });
-  const getCustomerApplications = params => __awaiter(this, void 0, void 0, function* () {
-    const response = yield entitiesInstance.get('/customer-application-instances', {
-      params
-    });
-    return response.data['collection'];
-  });
-  const getProducts = params => __awaiter(this, void 0, void 0, function* () {
-    const response = yield entitiesInstance.get('/products', {
-      params
-    });
-    return response.data['collection'];
-  });
-  const getPledgeInstances = params => __awaiter(this, void 0, void 0, function* () {
-    const response = yield entitiesInstance.get('/pledge-instances', {
-      params
-    });
-    return response.data['collection'];
-  });
-  return {
-    getEntitiesByCodeAndVersion,
-    getCustomerApplications,
-    getProducts,
-    getPledgeInstances
-  };
-}
-
-const EntityReferenceValueField = ({
-  name,
-  required: _required = false,
-  definitionProperty,
-  baseURL: _baseURL = 'https://dev-sl-api.dar-dev.zone/api/v1'
-}) => {
-  const {
-    control
-  } = useFormContext();
-  const {
-    source,
-    definitionCode,
-    definitionVersion,
-    valuePropertyCode,
-    labelPropertyCode
-  } = definitionProperty;
-  const {
-    getCustomerApplications,
-    getEntitiesByCodeAndVersion,
-    getPledgeInstances,
-    getProducts
-  } = useEntitiesService({
-    baseURL: _baseURL
-  });
-  const [loading, setLoading] = useState(false);
-  const [referredInstancesValues, setReferredInstancesValues] = useState([]);
-  const scalendCallback = useMemo(() => {
-    if (source === 'SCALEND') {
-      switch (definitionCode) {
-        case 'CUSTOMERS':
-          return getCustomerApplications;
-        case 'PLEDGES':
-          return getPledgeInstances;
-        case 'PRODUCTS':
-          return getProducts;
-        default:
-          return null;
-      }
-    }
-    return null;
-  }, [definitionCode, source]);
-  useEffect(() => {
-    if (definitionCode && definitionVersion) {
-      setLoading(true);
-      if (source === 'ARSENAL') {
-        getEntitiesByCodeAndVersion({
-          definitionCode,
-          definitionVersion
-        }).then(instances => {
-          const instanceValues = instances.map(instance => instance['data'][`${valuePropertyCode}`]);
-          setReferredInstancesValues(instanceValues);
-        }).catch(error => {
-          setReferredInstancesValues([]);
-          toast.error(error);
-        }).finally(() => {
-          setLoading(false);
-        });
-      } else if (source === 'SCALEND') {
-        scalendCallback().then(instances => {
-          const instanceValues = instances.map(instance => instance.id);
-          setReferredInstancesValues(instanceValues);
-        }).catch(error => {
-          setReferredInstancesValues([]);
-          toast.error(error);
-        }).finally(() => {
-          setLoading(false);
-        });
-      }
-    }
-  }, [definitionCode, definitionVersion, valuePropertyCode, source, labelPropertyCode, scalendCallback]);
-  return jsx(Grid, {
-    children: jsx(ControlAutocomplete, {
-      required: _required,
-      control: control,
-      name: source === 'SCALEND' ? name : `${name}.${labelPropertyCode}`,
-      label: labelPropertyCode,
-      labelKey: labelPropertyCode,
-      valueKey: valuePropertyCode,
-      loading: loading,
-      options: referredInstancesValues
-    })
-  });
-};
-var EntityReferenceValueField$1 = EntityReferenceValueField;
-
 const PropertyWidget = ({
   property,
   name,
@@ -3858,13 +3734,9 @@ const PropertyWidget = ({
         restrictedValues: property.restrictedValues
       });
     case PropertyType.ENTITY_REFERENCE:
-      return jsx(EntityReferenceValueField$1
-      // required
-      , {
-        // required
+      return jsx(StringValueField$1, {
         name: name,
-        definitionProperty: property,
-        baseURL: baseURL
+        label: label
       });
     case PropertyType.ANY:
       return jsx(ControlAceEditor, {
@@ -5036,7 +4908,8 @@ const CreatePropertiesList = ({
   entityDefinition: _entityDefinition = false,
   globalParameter: _globalParameter = false,
   customPropertyFields: _customPropertyFields = [],
-  entityPropFields
+  entityPropFields,
+  parentRemove
 }) => {
   const fieldName = useMemo(() => parentFieldName ? `${parentFieldName}.properties` : `properties`, [parentFieldName]);
   const {
@@ -5080,9 +4953,16 @@ const CreatePropertiesList = ({
     append(defaultPropertyValues);
     clearErrors(fieldName);
   }, [append, fieldName, clearErrors]);
+  const removeFields = useMemo(() => {
+    if (entityPropFields) {
+      return parentRemove;
+    } else {
+      return remove;
+    }
+  }, [entityPropFields, remove, parentRemove]);
   const handleRemoveParameter = useCallback(index => {
-    remove(index);
-  }, [remove]);
+    removeFields(index);
+  }, [removeFields]);
   const propFields = useMemo(() => {
     if (entityPropFields) {
       return entityPropFields;

package/package.json

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

package/src/lib/Property/UpsertProperty/CreatePropertiesList.d.ts

@@ -11,6 +11,7 @@ type Props = {
     entityPropFields?: Array<object & {
         id: string;
     }>;
+    parentRemove?: (index?: number | number[]) => void;
 };
-export declare const CreatePropertiesList: ({ parentFieldName, hideAddButton, focusOnIndex, required, entityDefinition, globalParameter, customPropertyFields, entityPropFields, }: Props) => JSX.Element;
+export declare const CreatePropertiesList: ({ parentFieldName, hideAddButton, focusOnIndex, required, entityDefinition, globalParameter, customPropertyFields, entityPropFields, parentRemove, }: Props) => JSX.Element;
 export default CreatePropertiesList;