@abgov/jsonforms-components 2.47.0 → 2.47.2

package/index.esm.js

@@ -6784,6 +6784,8 @@ const GoAInputBaseControl = props => {
       visible: visible,
       children: jsx(FormFieldWrapper, {
         ref: controlRef,
+        className: "jsonforms-elements-wrapper",
+        id: isStepperReview === true ? `review-base-${path}-element-wrapper` : `${path}-element-wrappe`,
         children: jsx(GoabFormItem, {
           requirement: (_uischema$options$com = uischema == null || (_uischema$options = uischema.options) == null || (_uischema$options = _uischema$options.componentProps) == null ? void 0 : _uischema$options.requirement) != null ? _uischema$options$com : requiredNow ? 'required' : undefined,
           error: isVisited === true ? modifiedErrors : undefined,
@@ -12753,89 +12755,88 @@ const GoABaseTableReviewRenderers$1 = [
   renderer: CalloutReviewControl
 }];
 const FormStepperReviewer = props => {
-  var _uischema$options$com, _uischema$options, _componentProps$readO;
+  var _uischema$options$com, _uischema$options;
   const {
     uischema,
     data,
     schema,
     ajv,
     cells,
-    enabled,
-    navigationFunc
+    enabled
   } = props;
-  const componentProps = (_uischema$options$com = (_uischema$options = uischema.options) == null ? void 0 : _uischema$options.componentProps) != null ? _uischema$options$com : {};
-  (_componentProps$readO = componentProps == null ? void 0 : componentProps.readOnly) != null ? _componentProps$readO : false;
+  (_uischema$options$com = (_uischema$options = uischema.options) == null ? void 0 : _uischema$options.componentProps) != null ? _uischema$options$com : {};
   const categorization = uischema;
-  const categories = categorization.elements.filter(category => isVisible(category, data, '', ajv, undefined));
+  const categories = categorization.elements;
   const rescopeMaps = ['#/properties/albertaAddress', '#/properties/canadianAddress', '#/properties/sin'];
+  const hasVisibleContent = element => {
+    if (!isVisible(element, data, '', ajv, undefined)) {
+      return false;
+    }
+    // Exclude non-reviewable types
+    if (element.type === 'HelpContent' || element.type === 'Callout') {
+      return false;
+    }
+    // Recurse into layouts
+    if (element.elements && Array.isArray(element.elements)) {
+      return element.elements.some(child => hasVisibleContent(child));
+    }
+    return true;
+  };
   return jsx(ReviewItem, {
     children: categories.map((category, categoryIndex) => {
+      // Preserve index stability
+      if (!isVisible(category, data, '', ajv, undefined)) {
+        return null;
+      }
       const categoryLabel = category.label || category.i18n || 'Unknown Category';
-      const hasVisibleContent = element => {
-        if (!isVisible(element, data, '', ajv, undefined)) {
-          return false;
-        }
-        if (element.type === 'HelpContent' || element.type === 'Callout') {
-          return false;
-        }
-        if (element.elements && Array.isArray(element.elements)) {
-          return element.elements.some(child => hasVisibleContent(child));
-        }
-        return true;
-      };
-      const elementsToRender = category.elements
-      //eslint-disable-next-line
-      .filter(field => {
+      // Build visible elements list
+      const elementsToRender = category.elements.filter(field => {
         var _field$rule;
         if (!hasVisibleContent(field)) {
           return false;
         }
         const conditionProps = (_field$rule = field.rule) == null ? void 0 : _field$rule.condition;
-        /* istanbul ignore next */
         if (conditionProps && data) {
           var _conditionProps$scope;
-          const canHideControlParts = conditionProps == null || (_conditionProps$scope = conditionProps.scope) == null ? void 0 : _conditionProps$scope.split('/');
-          const canHideControl = canHideControlParts && canHideControlParts[(canHideControlParts == null ? void 0 : canHideControlParts.length) - 1];
-          const isHidden = getProperty(data, canHideControl);
-          if (!isHidden) {
-            return field;
-          }
-          return false;
+          const parts = (_conditionProps$scope = conditionProps.scope) == null ? void 0 : _conditionProps$scope.split('/');
+          const property = parts == null ? void 0 : parts[parts.length - 1];
+          const isHidden = getProperty(data, property);
+          return !isHidden;
         }
         return true;
       }).map(e => {
         const layout = e;
         if (rescopeMaps.some(scope => {
           var _layout$elements;
-          return (_layout$elements = layout.elements) == null ? void 0 : _layout$elements.map(el => {
-            const element = el;
-            return element.scope;
-          }).includes(scope);
+          return (_layout$elements = layout.elements) == null ? void 0 : _layout$elements.map(el => el.scope).includes(scope);
         })) {
           return layout.elements;
-        } else {
-          return e;
         }
+        return e;
       }).flat();
+      // Do not render empty categories
       if (elementsToRender.length === 0) {
         return null;
       }
       return jsxs(ReviewItemSection, {
+        className: "jsonforms-table-review-section",
+        id: `jsonforms-table-review-section-${categoryIndex}`,
         children: [jsx(ReviewItemHeader, {
           children: jsx(ReviewItemTitle, {
             children: categoryLabel
           })
         }), elementsToRender.map((element, elementIndex) => {
-          const stepperElement = Object.assign({}, element);
-          stepperElement.options = Object.assign({}, stepperElement.options, {
-            stepId: categoryIndex
+          const stepperElement = Object.assign({}, element, {
+            options: Object.assign({}, element.options, {
+              stepId: categoryIndex
+            })
           });
           return jsx(GoabTable, {
             width: "100%",
             mb: "m",
             children: jsx("tbody", {
               children: jsx(JsonFormsDispatch, {
-                "data-testid": `jsonforms-object-list-defined-elements-dispatch`,
+                "data-testid": "jsonforms-object-list-defined-elements-dispatch",
                 schema: schema,
                 uischema: stepperElement,
                 enabled: enabled,

package/package.json

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