@abgov/jsonforms-components 2.60.14 → 2.60.15

package/index.esm.js

@@ -8888,7 +8888,7 @@ styled.div(_t18$1 || (_t18$1 = _$8`
   padding: 0 1.5rem 0 0;
   border: 1px solid #dcdcdc;
 `));
-const TableTHHeader = styled.th(_t19$1 || (_t19$1 = _$8`
+styled.th(_t19$1 || (_t19$1 = _$8`
   background-color: var(--goa-color-greyscale-100) !important;
   vertical-align: top;
 `));
@@ -9376,7 +9376,13 @@ const SummaryDisplay = ({
             paddingTop: 'var(--goa-space-xs)',
             paddingBottom: 'var(--goa-space-xs)'
           },
-          children: String(pair.value)
+          children: typeof pair.value === 'boolean' ? pair.value ? 'Yes' : 'No' : pair.value !== null && typeof pair.value === 'object' ? (() => {
+            const v = pair.value;
+            if (('day' in v || 'date' in v) && 'month' in v && 'year' in v) {
+              return `${v.year}-${v.month}-${'day' in v ? v.day : v.date}`;
+            }
+            return Object.values(v).filter(x => x !== undefined && x !== null && x !== '').join(' ');
+          })() : String(pair.value)
         })]
       }, `${pair.label}-${index}`))
     })
@@ -11853,14 +11859,19 @@ const renderCellColumn = ({
   const path = `/${rowPath}/${index}/${element}/${index === 0 ? index : index - 1}`;
   const nestedErrors = errors == null ? void 0 : errors.filter(e => e.instancePath.includes(path));
   /* istanbul ignore next */
-  if (typeof data === 'string') {
+  if (typeof data === 'boolean') {
+    return data ? 'Yes' : 'No';
+  } else if (typeof data === 'number') {
+    return String(data);
+  } else if (typeof data === 'string') {
     return data;
   } else if (typeof data === 'object' || Array.isArray(data)) {
     const result = Object.keys(data);
     if (!isRequired && nestedErrors.length === 0) {
-      if ('year' in data && 'month' in data && 'day' in data) {
+      if ('year' in data && 'month' in data && ('day' in data || 'date' in data)) {
         const dateObj = data;
-        return `${dateObj.year}-${dateObj.month}-${dateObj.day}`;
+        const dayValue = 'day' in dateObj ? dateObj.day : dateObj.date;
+        return `${dateObj.year}-${dateObj.month}-${dayValue}`;
       }
       return jsx("pre", {
         children: JSON.stringify(data, null, 2)
@@ -12010,41 +12021,103 @@ const NonEmptyCellComponent = /*#__PURE__*/React.memo(function NonEmptyCellCompo
     return err.instancePath.includes(rowPath);
   })) == null ? void 0 : _errors$filter.length) > 0 : false;
   return jsxs(NonEmptyCellStyle, {
-    children: [uischema == null || (_uischema$elements = uischema.elements) == null ? void 0 : _uischema$elements.map(element => {
+    children: [!isInReview && (uischema == null || (_uischema$elements = uischema.elements) == null ? void 0 : _uischema$elements.map(element => {
       return jsx(JsonFormsDispatch, {
         "data-testid": `jsonforms-object-list-defined-elements-dispatch`,
         schema: schema,
         uischema: element,
         path: rowPath,
         enabled: enabled,
-        renderers: isInReview ? GoAReviewRenderers : renderers,
+        renderers: renderers,
         cells: cells
       }, rowPath);
-    }), properties && Object.keys(properties).length > 0 && jsxs(Fragment, {
-      children: [jsx(FixTableHeaderAlignment, {
+    })), properties && Object.keys(properties).length > 0 && jsxs(Fragment, {
+      children: [isInReview ? jsx("div", {
+        style: {
+          padding: '0.75rem 0'
+        },
+        children: range(count || 0).map(i => {
+          const rowData = data && data[i];
+          if (!rowData) return null;
+          const hasAnyValue = Object.keys(tableKeys).some(key => {
+            const value = rowData[key];
+            return value !== undefined && value !== null && value !== '';
+          });
+          const hasRowErrors = (errors || []).some(e => e.instancePath.includes(`/${props.rowPath.replace(/\./g, '/')}/${i}`));
+          if (!hasAnyValue && !hasRowErrors) return null;
+          return jsx("div", {
+            style: {
+              marginBottom: '1.5rem'
+            },
+            children: Object.entries(tableKeys).map(([key, label]) => {
+              var _required$includes, _properties$key;
+              const value = rowData[key];
+              const isRequiredField = (_required$includes = required == null ? void 0 : required.includes(key)) != null ? _required$includes : false;
+              const fieldPath = `/${props.rowPath.replace(/\./g, '/')}/${i}/${key}`;
+              const rowPathMatch = `/${props.rowPath.replace(/\./g, '/')}/${i}`;
+              const fieldError = (errors || []).find(e => {
+                var _msg$match;
+                const msg = e.message || '';
+                const requiredProperty = (_msg$match = msg.match(/'([^']+)'/)) == null ? void 0 : _msg$match[1];
+                return e.instancePath === fieldPath || e.instancePath === rowPathMatch && msg.includes(key) || e.instancePath === rowPathMatch && requiredProperty === key;
+              });
+              const isEmptyValue = value === undefined || value === null || value === '';
+              if (isEmptyValue && !isRequiredField && !fieldError) return null;
+              let reviewError = '';
+              if (fieldError) {
+                const raw = fieldError.message || '';
+                reviewError = raw.includes('required') ? `${capitalizeFirstLetter(key.replace(/[_-]/g, ' '))} is required` : raw;
+              } else if (isRequiredField && isEmptyValue) {
+                reviewError = `${capitalizeFirstLetter(key.replace(/[_-]/g, ' '))} is required`;
+              }
+              return jsxs("div", {
+                style: {
+                  display: 'flex',
+                  marginBottom: '0.5rem',
+                  alignItems: 'center'
+                },
+                children: [jsxs("strong", {
+                  style: {
+                    width: '50%',
+                    flexShrink: 0
+                  },
+                  children: [(properties == null || (_properties$key = properties[key]) == null ? void 0 : _properties$key.title) || (label !== key ? label : key.replace(/([A-Z])/g, ' $1').replace(/[_-]/g, ' ').replace(/^./, c => c.toUpperCase())), isRequiredField && jsx(RequiredSpan, {
+                    children: " (required)"
+                  }), " :"]
+                }), jsx("span", {
+                  style: {
+                    marginLeft: '1rem'
+                  },
+                  "data-testid": `#/properties/${key}-input-${i}-review`,
+                  children: renderCellColumn({
+                    data: isEmptyValue ? undefined : value,
+                    error: reviewError,
+                    isRequired: isRequiredField,
+                    errors: errors !== undefined ? errors : [],
+                    element: key,
+                    rowPath,
+                    index: i
+                  })
+                })]
+              }, key);
+            })
+          }, i);
+        })
+      }) : jsx(FixTableHeaderAlignment, {
         children: jsxs(GoabTable, {
           width: "100%",
           children: [jsx("thead", {
             children: jsxs("tr", {
               children: [Object.entries(tableKeys).map(([value, index]) => {
                 const currentProperty = properties[value];
-                if (!isInReview) {
-                  return jsx("th", {
-                    children: jsxs("p", {
-                      children: [(currentProperty == null ? void 0 : currentProperty.title) || index, (required == null ? void 0 : required.includes(value)) && jsx(RequiredSpan, {
-                        children: "(required)"
-                      })]
-                    })
-                  }, index);
-                }
-                return jsx(TableTHHeader, {
+                return jsx("th", {
                   children: jsxs("p", {
-                    children: [`${(currentProperty == null ? void 0 : currentProperty.title) || index}`, (required == null ? void 0 : required.includes(value)) && jsxs(RequiredSpan, {
-                      children: [jsx("br", {}), " (required)"]
+                    children: [(currentProperty == null ? void 0 : currentProperty.title) || index, (required == null ? void 0 : required.includes(value)) && jsx(RequiredSpan, {
+                      children: "(required)"
                     })]
                   })
                 }, index);
-              }), isInReview !== true && jsx("th", {
+              }), jsx("th", {
                 children: jsx("p", {
                   children: "Actions"
                 })
@@ -12092,26 +12165,6 @@ const NonEmptyCellComponent = /*#__PURE__*/React.memo(function NonEmptyCellCompo
                   if (error != null && (_error$message = error.message) != null && _error$message.includes('must NOT have fewer') && required.find(r => r === schemaName) && (isEmptyBoolean(schema, currentData) || isEmptyNumber(schema, currentData))) {
                     humanMessage = `${capitalizeFirstLetter(schemaName)} is required`;
                   }
-                  if (isInReview === true) {
-                    var _required$includes;
-                    return jsx("td", {
-                      children: jsx("div", {
-                        "data-testid": `#/properties/${schemaName}-input-${i}-review`,
-                        style: {
-                          display: 'block'
-                        },
-                        children: renderCellColumn({
-                          data: currentData !== '' && currentData !== null && currentData !== undefined ? currentData : undefined,
-                          error: humanMessage,
-                          isRequired: (_required$includes = required == null ? void 0 : required.includes(element)) != null ? _required$includes : false,
-                          errors: errors !== undefined ? errors : [],
-                          element,
-                          rowPath,
-                          index: i
-                        })
-                      })
-                    }, ix);
-                  }
                   return jsx("td", {
                     children: jsx(GoabFormItem, {
                       error: humanMessage != null ? humanMessage : '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "2.60.14",
+  "version": "2.60.15",
   "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/renderer-catalog.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": "1.0.0",
-  "generatedAt": "2026-04-27T15:21:40.298Z",
-  "sourceCommit": "e57ed99fcade0b72edeaba79895fc83296644fdc",
+  "generatedAt": "2026-04-27T19:55:39.353Z",
+  "sourceCommit": "c9005bf394764ce1ad7e3af2c39bff2c9b90f254",
   "sourcePath": "libs/jsonforms-components/src/index.ts",
   "rendererCount": 33,
   "renderers": [