@abgov/jsonforms-components 1.53.5 → 1.53.7

package/index.esm.js

@@ -2835,28 +2835,6 @@ const onKeyPressForTextControl = props => {
     handleChange(path, value);
   }
 };
-/**
- * Helper functions to process onKeyPress events for Numeric controls.
- * @param props - EventKeyPressControlProps
- */
-const onKeyPressNumericControl = props => {
-  const {
-    value,
-    key,
-    controlProps
-  } = props;
-  const {
-    handleChange,
-    path
-  } = controlProps;
-  if (isNotKeyPressTabOrShift(key)) {
-    let newValue = '';
-    if (value !== '') {
-      newValue = +value;
-    }
-    handleChange(path, newValue);
-  }
-};
 /**
  * Helper function to process onKeyPress events for Time controls
  * @param props - EventKeyPressControlProps
@@ -3013,9 +2991,7 @@ const onChangeForInputControl = props => {
     handleChange,
     path
   } = controlProps;
-  if (value && value !== null) {
-    handleChange(path, value);
-  }
+  handleChange(path, value);
 };
 /**
  * Helper function to process onChange event for Date controls.
@@ -4508,14 +4484,7 @@ const GoAInputText = props => {
           controlProps: props
         });
       },
-      onKeyPress: (name, value, key) => {
-        onKeyPressForTextControl({
-          name,
-          value: autoCapitalize ? value.toUpperCase() : value,
-          key,
-          controlProps: props
-        });
-      },
+      onKeyPress: (name, value, key) => {},
       onBlur: (name, value) => {
         onBlurForTextControl({
           name,
@@ -4741,14 +4710,7 @@ const GoANumberInput = props => {
     width: width,
     name: (appliedUiSchemaOptions === null || appliedUiSchemaOptions === void 0 ? void 0 : appliedUiSchemaOptions.name) || `${id || label}-input`,
     testId: (appliedUiSchemaOptions === null || appliedUiSchemaOptions === void 0 ? void 0 : appliedUiSchemaOptions.testId) || `${id}-input`,
-    onKeyPress: (name, value, key) => {
-      onKeyPressNumericControl({
-        name,
-        value,
-        key,
-        controlProps: props
-      });
-    },
+    onKeyPress: (name, value, key) => {},
     onBlur: (name, value) => {
       onBlurForNumericControl({
         name,
@@ -4809,14 +4771,7 @@ const GoAInputInteger = props => {
     placeholder: placeholder,
     name: (appliedUiSchemaOptions === null || appliedUiSchemaOptions === void 0 ? void 0 : appliedUiSchemaOptions.name) || `${id || label}-input`,
     testId: (appliedUiSchemaOptions === null || appliedUiSchemaOptions === void 0 ? void 0 : appliedUiSchemaOptions.testId) || `${id}-input`,
-    onKeyPress: (name, value, key) => {
-      onKeyPressNumericControl({
-        name,
-        value,
-        key,
-        controlProps: props
-      });
-    },
+    onKeyPress: (name, value, key) => {},
     onBlur: (name, value) => {
       onBlurForNumericControl({
         name,
@@ -5808,16 +5763,24 @@ 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 (property in obj[key]) {
+          values.push(obj[key][property]);
+        }
+      } else {
+        values = [...values, ...pickPropertyValues(obj[key], property, endWithType)];
+      }
     } else if (_$b.isArray(obj[key])) {
       const nextValues = obj[key].map(function (arrayObj) {
-        return pickPropertyValues(arrayObj, property);
+        return pickPropertyValues(arrayObj, property, endWithType);
       });
       values = [...values, ...nextValues];
     }
@@ -5937,8 +5900,14 @@ const subErrorInParent = (error, paths) => {
     For example: error with instance path /roadmap/0/when belongs to /roadmap
   */
   const errorPaths = error.instancePath.split('/');
-  if (errorPaths.length < 3) return false;
-  if (isNumber(errorPaths[errorPaths.length - 2])) {
+  if (errorPaths.length < 2) return false;
+  // For case /roadmap/0
+  if (errorPaths.length > 1 && isNumber(errorPaths[errorPaths.length - 1])) {
+    const parentPath = errorPaths.slice(0, errorPaths.length - 1).join('/');
+    return paths.includes(parentPath);
+  }
+  // For case /roadmap/0/when
+  if (errorPaths.length > 2 && isNumber(errorPaths[errorPaths.length - 2])) {
     const parentPath = errorPaths.slice(0, errorPaths.length - 2).join('/');
     return paths.includes(parentPath);
   }
@@ -6051,8 +6020,9 @@ const createStepperContextInitData = props => {
   const categorization = uischema;
   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'));
+    const scopes = pickPropertyValues(c, 'scope', 'ListWithDetail');
+    // ListWithDetail path might have conflicts with others. The errors in ListWithDetail will still be caught in the ctx.core.errors
+    const incompletePaths = getIncompletePaths(ajv, scopes);
     return {
       id,
       label: deriveLabelForUISchemaElement(c, t),
@@ -6828,6 +6798,11 @@ const ToolBarHeader = styled.div(_t3$1 || (_t3$1 = _$2`
 `));
 const ObjectArrayTitle = styled.h3(_t4$1 || (_t4$1 = _$2`
   margin-bottom: var(--goa-space-l);
+
+  span {
+    color: #666666;
+    font-size: var(--goa-font-size-2);
+  }
 `));
 const TextCenter = styled.div(_t5$1 || (_t5$1 = _$2`
   text-align: center;
@@ -7178,7 +7153,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 +7168,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 +7330,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 +7403,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.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",

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[];