@abgov/jsonforms-components 2.43.5 → 2.43.7

package/index.esm.js

@@ -6867,7 +6867,7 @@ const Dropdown = props => {
   const [inputText, setInputText] = useState(selected);
   const prevCountRef = useRef(props.items);
   const trailingIcon = isOpen ? 'chevron-up' : 'chevron-down';
-  const textInputName = `dropdown-${label}`;
+  const textInputName = `dropdown-${label}-${id}`;
   const textInput = (_document$getElements = document.getElementsByName(textInputName)[0]) != null ? _document$getElements : null;
   const PREFIX = 'jsonforms-dropdown';
   useEffect(() => {
@@ -7040,7 +7040,7 @@ const Dropdown = props => {
       },
       children: jsx(GoabInput, {
         disabled: !enabled,
-        name: `dropdown-${label}`,
+        name: `dropdown-${label}-${id}`,
         width: "100%",
         value: inputText,
         testId: `${id}-input`,
@@ -7757,7 +7757,7 @@ const EnumSelect = props => {
       enabled: enabled,
       selected: typeof data === 'object' ? ___default.get(data, valuePath) : data,
       width: width,
-      id: `jsonforms-${label}-dropdown`,
+      id: `jsonforms-${path}-dropdown`,
       label: label,
       isAutoCompletion: autoCompletion,
       onChange: value => {
@@ -7769,7 +7769,7 @@ const EnumSelect = props => {
           handleChange(path, value);
         }
       }
-    }, `jsonforms-${label}-dropdown`)
+    }, `jsonforms-${path}-dropdown`)
   });
 };
 const enumControl = props => {
@@ -11969,19 +11969,35 @@ const MainTab = ({
   const rowData = getDataAtPath(core == null ? void 0 : core.data, childPath);
   const orderedRowData = orderRowData(rowData, uischema == null || (_uischema$options10 = uischema.options) == null ? void 0 : _uischema$options10.detail);
   function resolveField(e) {
+    var _e$params;
     if (e.keyword === 'required') {
       return e.params.missingProperty;
+    } else if (e.keyword === 'errorMessage' && (_e$params = e.params) != null && _e$params.errors[0].params.missingProperty) {
+      return e.params.errors[0].params.missingProperty;
     }
     const path = e.instancePath.split('/');
     return path[path.length - 1];
   }
   const rowBase = `/${childPath.replace(/\./g, '/')}`;
   const fieldErrors = core == null || (_core$errors = core.errors) == null ? void 0 : _core$errors.filter(e => e.instancePath === rowBase || e.instancePath.startsWith(rowBase + '/')).reduce((acc, e) => {
+    var _e$params2;
     const field = resolveField(e);
-    acc[field] = humanizeAjvError(e, core.schema, core.uischema); //e.message;
+    if (e.keyword === 'errorMessage' && (_e$params2 = e.params) != null && _e$params2.errors) {
+      if (field) {
+        acc.fields[field] = e.message || 'Unknown error';
+      } else {
+        acc.row = (e == null ? void 0 : e.message) || 'Unknown error';
+        return acc;
+      }
+    }
+    if (!acc.fields[field]) {
+      acc.fields[field] = humanizeAjvError(e, core.schema, core.uischema);
+    }
     return acc;
-  }, {});
-  const errorText = fieldErrors && Object.values(fieldErrors).length > 0 ? Object.values(fieldErrors).join(', ') : undefined;
+  }, {
+    fields: {}
+  });
+  const errorText = fieldErrors && Object.values(fieldErrors.fields).length > 0 ? Object.values(fieldErrors.fields).join(', ') : fieldErrors == null ? void 0 : fieldErrors.row;
   return jsx("div", {
     "data-testid": `object-array-main-item-${rowIndex}`,
     children: errorText ? jsx(GoabFormItem, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "2.43.5",
+  "version": "2.43.7",
   "license": "Apache-2.0",
   "description": "Government of Alberta - React renderers for JSON Forms based on the design system.",
   "repository": "https://github.com/GovAlta/adsp-monorepo",