@abgov/jsonforms-components 1.53.5 → 1.53.6

package/index.esm.js

@@ -5808,13 +5808,21 @@ const getProperty = (obj, propName) => {
   }
 };
 // eslint-disable-next-line
-const pickPropertyValues = (obj, property) => {
+const pickPropertyValues = (obj, property, endWithType) => {
   let values = [];
   Object.keys(obj).forEach(function (key) {
+    var _a;
     if (key === property) {
       values.push(obj[key]);
     } else if (_$b.isObject(obj[key])) {
-      values = [...values, ...pickPropertyValues(obj[key], property)];
+      // if the object type is equal to end type, we are not going to continue the recursive approach
+      if (endWithType && ((_a = obj[key]) === null || _a === void 0 ? void 0 : _a.type) === endWithType) {
+        if (obj[key]) {
+          values.push(obj[key]);
+        }
+      } else {
+        values = [...values, ...pickPropertyValues(obj[key], property)];
+      }
     } else if (_$b.isArray(obj[key])) {
       const nextValues = obj[key].map(function (arrayObj) {
         return pickPropertyValues(arrayObj, property);
@@ -6052,7 +6060,8 @@ const createStepperContextInitData = props => {
   const valid = ajv.validate(schema, data || {});
   const categories = (_a = categorization.elements) === null || _a === void 0 ? void 0 : _a.map((c, id) => {
     const scopes = pickPropertyValues(c, 'scope');
-    const incompletePaths = getIncompletePaths(ajv, pickPropertyValues(c, 'scope'));
+    // ListWithDetail path might have conflicts with others. The errors in ListWithDetail will still be caught in the ctx.core.errors
+    const incompletePaths = getIncompletePaths(ajv, pickPropertyValues(c, 'scope', 'ListWithDetail'));
     return {
       id,
       label: deriveLabelForUISchemaElement(c, t),
@@ -7178,7 +7187,7 @@ const NonEmptyCellComponent$1 = /*#__PURE__*/React.memo(function NonEmptyCellCom
                 }) : jsx(GoAFormItem, {
                   error: (_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : '',
                   mb: errorRow && !error && '2xl' || 'xs',
-                  children: jsx(GoAInput, {
+                  children: dataObject.type === 'number' || dataObject.type === 'string' && !dataObject.enum ? jsx(GoAInput, {
                     type: dataObject.type === 'number' ? 'number' : 'text',
                     id: schemaName,
                     name: schemaName,
@@ -7193,6 +7202,12 @@ const NonEmptyCellComponent$1 = /*#__PURE__*/React.memo(function NonEmptyCellCom
                     },
                     "aria-label": schemaName,
                     width: "100%"
+                  }) : jsx(GoACallout, {
+                    type: "important",
+                    size: "medium",
+                    testId: "form-support-callout",
+                    heading: "Not supported",
+                    children: "Only string and number are supported inside arrays"
                   })
                 })
               }, ix);
@@ -7349,9 +7364,12 @@ const ObjectArrayControl = props => {
       currentCategory.data = newCategoryData;
     }
     if ((currentCategory === null || currentCategory === void 0 ? void 0 : currentCategory.count) > 0) currentCategory.count--;
-    const handleChangeData = Object.keys(newCategoryData).map(key => {
+    let handleChangeData = Object.keys(newCategoryData).map(key => {
       return newCategoryData[key];
     });
+    if (handleChangeData.length === 0) {
+      handleChangeData = null;
+    }
     props.handleChange(path, handleChangeData);
     dispatch({
       type: DELETE_ACTION,
@@ -7419,8 +7437,10 @@ const ObjectArrayControl = props => {
     children: [jsxs(ToolBarHeader, {
       children: [isInReview && listTitle && jsx("b", {
         children: listTitle
-      }), !isInReview && listTitle && jsx(ObjectArrayTitle, {
-        children: listTitle
+      }), !isInReview && listTitle && jsxs(ObjectArrayTitle, {
+        children: [listTitle, " ", jsx("span", {
+          children: additionalProps.required && '(required)'
+        })]
       }), !isInReview && jsx(ObjectArrayToolBar, {
         errors: errors,
         label: label,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "1.53.5",
+  "version": "1.53.6",
   "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",

package/src/lib/Controls/FormStepper/util/helpers.d.ts

@@ -1,2 +1,2 @@
 export declare const getProperty: any;
-export declare const pickPropertyValues: (obj: any, property: string) => string[];
+export declare const pickPropertyValues: (obj: any, property: string, endWithType?: string) => string[];