@dartech/arsenal-ui 1.3.75 → 1.3.77

package/index.js

@@ -1474,18 +1474,8 @@ const formatTableRowValue = ({
 const digitsOnly = new RegExp('^[-+]?[0-9]+$');
 const floatsOnly = new RegExp(/^[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?$/);
 const isExpression = value => {
-  if (typeof value === 'string') return /\$(?:S?JS)?\(/g.test(value);
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      if (isExpression(item)) return true;
-    }
-  }
-  if (typeof value === 'object') {
-    for (const key in value) {
-      if (isExpression(value[key])) return true;
-    }
-  }
-  return false;
+  // return typeof value === 'string' ? value.includes('$(') : 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;
@@ -1655,6 +1645,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;
@@ -1898,7 +1889,7 @@ const ControlNumberInput = _a => {
           } else if (!decimal && !digitsOnly.test(val)) {
             return 'Not valid integer';
           }
-          return validate ? typeof validate === 'function' ? validate(val) : true : true;
+          return true;
         }
       }
     }),
@@ -3439,6 +3430,83 @@ 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
 }) => {
@@ -3565,8 +3633,7 @@ const PropertyAdditionalFields = ({
         defaultValue: DATE_TIME_DEFAULT_FORMAT
       });
     case PropertyType.ENTITY_REFERENCE:
-      // return <EntityReferencePropertyFields propertyFieldName={propertyFieldName} />;
-      return jsx(StringPropertyFields$1, {
+      return jsx(EntityReferencePropertyFields$1, {
         propertyFieldName: propertyFieldName
       });
     case PropertyType.ENTITY:
@@ -5595,25 +5662,29 @@ const PropertyValueComponent = ({
       padding: '4px'
     }
   }, {
-    children: value === null ? 'null' : value.toString()
+    children: value === null ? 'null' : value === null || value === void 0 ? void 0 : value.toString()
   }));
-  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);
+  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);
+    }
   }
 };
 const PropertyDataView = ({

package/package.json

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

package/src/lib/Definition/DefinitionValueView/DefinitionValueView.d.ts

@@ -3,7 +3,6 @@ import { PropertiesArrayType } from '../../../interfaces';
 type Props = {
     properties: PropertiesArrayType<unknown>;
     data: unknown;
-    update?: number;
 };
 export declare const DefinitionValueView: ({ properties, data }: Props) => JSX.Element;
 export default DefinitionValueView;