@abgov/jsonforms-components 2.60.1 → 2.60.3

package/index.esm.js

@@ -3713,16 +3713,11 @@ const areAllUppercase = label => {
   return /^[^a-z]*$/.test(label);
 };
 const getExplicitControlLabel = props => {
-  var _props$uischema, _props$schema, _props$uischema2;
-  const optionText = (_props$uischema = props.uischema) == null || (_props$uischema = _props$uischema.options) == null ? void 0 : _props$uischema.text;
-  if (typeof optionText === 'string' && optionText.trim()) {
-    return optionText.trim();
-  }
-  if (typeof ((_props$schema = props.schema) == null ? void 0 : _props$schema.title) === 'string' && props.schema.title.trim()) {
-    return props.schema.title.trim();
-  }
-  const uiLabel = (_props$uischema2 = props.uischema) == null ? void 0 : _props$uischema2.label;
-  if (typeof uiLabel === 'string' && uiLabel.trim()) {
+  var _props$uischema, _props$uischema2, _props$schema;
+  // uischema.label has highest priority. An explicit empty string suppresses the
+  // auto-generated label (and prevents options.text from leaking into the form-item label).
+  const uiLabel = (_props$uischema = props.uischema) == null ? void 0 : _props$uischema.label;
+  if (typeof uiLabel === 'string') {
     return uiLabel.trim();
   }
   if (typeof uiLabel === 'object' && uiLabel !== null && 'text' in uiLabel) {
@@ -3731,6 +3726,13 @@ const getExplicitControlLabel = props => {
       return text.trim();
     }
   }
+  const optionText = (_props$uischema2 = props.uischema) == null || (_props$uischema2 = _props$uischema2.options) == null ? void 0 : _props$uischema2.text;
+  if (typeof optionText === 'string' && optionText.trim()) {
+    return optionText.trim();
+  }
+  if (typeof ((_props$schema = props.schema) == null ? void 0 : _props$schema.title) === 'string' && props.schema.title.trim()) {
+    return props.schema.title.trim();
+  }
   return undefined;
 };
 const getGeneratedLabelFromScope = scope => {
@@ -3744,7 +3746,7 @@ const getGeneratedLabelFromScope = scope => {
 const getControlLabelText = props => {
   var _props$uischema3;
   const explicitLabel = getExplicitControlLabel(props);
-  if (explicitLabel) {
+  if (explicitLabel !== undefined) {
     return explicitLabel;
   }
   if ((_props$uischema3 = props.uischema) != null && (_props$uischema3 = _props$uischema3.scope) != null && _props$uischema3.startsWith('#/')) {
@@ -8493,7 +8495,7 @@ const GoABaseInputReviewComponent = props => {
     if (((_uischema$options5 = uischema.options) == null ? void 0 : _uischema$options5.radio) === true) {
       reviewText = data ? `Yes` : `No`;
     } else {
-      reviewText = data ? `Yes (${checkboxLabel})` : `No (${checkboxLabel})`;
+      reviewText = data ? checkboxLabel ? `Yes (${checkboxLabel})` : `Yes` : checkboxLabel ? `No (${checkboxLabel})` : `No`;
     }
   }
   if (isTime) {
@@ -9901,7 +9903,7 @@ class ListWithDetailControl extends React.Component {
 }
 
 const GoAInputBaseTableReview = props => {
-  var _uischema$options, _uischema$scope2, _jsonForms$core, _uischema$options4;
+  var _uischema$options, _uischema$scope2, _jsonForms$core, _uischema$options4, _uischema$options5;
   const {
     data,
     uischema,
@@ -10058,9 +10060,19 @@ const GoAInputBaseTableReview = props => {
   if (activeError && /\sis required$/i.test(activeError)) {
     activeError = `${labelToUpdate} is required`;
   }
+  // For required boolean fields (e.g. anyOf: [{enum: [true]}]), suppress the raw AJV
+  // "must be equal to one of the allowed values" error and show a friendly message instead.
+  if ((schema == null ? void 0 : schema.type) === 'boolean' && activeError && activeError.toLowerCase().includes('must be equal')) {
+    activeError = data === false ? `${labelToUpdate} is required` : undefined;
+  }
   if (required && isNilOrEmptyValue(data, true) && !activeError) {
     activeError = `${labelToUpdate} is required`;
   }
+  // If a required checkbox is unchecked, show only the validation message in
+  // review mode (not a contradictory "No (...)" value line).
+  if ((schema == null ? void 0 : schema.type) === 'boolean' && data === false && activeError && /\sis required$/i.test(activeError)) {
+    reviewText = '';
+  }
   // eslint-disable-next-line
   const stepId = (_uischema$options4 = uischema.options) == null ? void 0 : _uischema$options4.stepId;
   const showInlineValue = reviewText === null || reviewText === undefined || typeof reviewText === 'string' || typeof reviewText === 'number' || /*#__PURE__*/React.isValidElement(reviewText) || Array.isArray(reviewText) && reviewText.length === 0;
@@ -10073,7 +10085,7 @@ const GoAInputBaseTableReview = props => {
           children: [labelToUpdate, required && jsx(RequiredTextLabel, {
             children: " (required)"
           })]
-        }), stepId !== undefined && jsx(GoabButton, {
+        }), stepId !== undefined && !((_uischema$options5 = uischema.options) != null && (_uischema$options5 = _uischema$options5.componentProps) != null && _uischema$options5.readOnly) && jsx(GoabButton, {
           type: "tertiary",
           size: "compact",
           onClick: () => context == null ? void 0 : context.goToPage(stepId, uischema.scope),
@@ -10859,30 +10871,33 @@ const FullNameControlReview = props => {
   } = props;
   const requiredFields = (_props$schema$require = (_props$schema = props.schema) == null ? void 0 : _props$schema.required) != null ? _props$schema$require : [];
   const isMissing = value => isNilOrEmptyString(value);
-  const renderRow = (fieldLabel, value, fieldName, testId) => jsx("tr", {
-    children: jsxs(PageReviewContainer, {
-      colSpan: 3,
-      children: [jsxs(ReviewHeader, {
-        children: [jsx(ReviewLabel, {
-          children: fieldLabel
-        }), stepId !== undefined && jsx(GoabButton, {
-          type: "tertiary",
-          size: "compact",
-          onClick: () => context == null ? void 0 : context.goToPage(stepId, uischema.scope),
-          testId: `${fieldName}-change-btn`,
-          children: "Change"
-        })]
-      }), jsxs(ReviewValue, {
-        children: [jsx("div", {
-          "data-testid": testId,
-          children: value != null ? value : ''
-        }), requiredFields.includes(fieldName) && isMissing(value) && jsx(GoabFormItem, {
-          error: `${fieldLabel} is required`,
-          label: ""
+  const renderRow = (fieldLabel, value, fieldName, testId) => {
+    var _uischema$options;
+    return jsx("tr", {
+      children: jsxs(PageReviewContainer, {
+        colSpan: 3,
+        children: [jsxs(ReviewHeader, {
+          children: [jsx(ReviewLabel, {
+            children: fieldLabel
+          }), stepId !== undefined && !((_uischema$options = uischema.options) != null && (_uischema$options = _uischema$options.componentProps) != null && _uischema$options.readOnly) && jsx(GoabButton, {
+            type: "tertiary",
+            size: "compact",
+            onClick: () => context == null ? void 0 : context.goToPage(stepId, uischema.scope),
+            testId: `${fieldName}-change-btn`,
+            children: "Change"
+          })]
+        }), jsxs(ReviewValue, {
+          children: [jsx("div", {
+            "data-testid": testId,
+            children: value != null ? value : ''
+          }), requiredFields.includes(fieldName) && isMissing(value) && jsx(GoabFormItem, {
+            error: `${fieldLabel} is required`,
+            label: ""
+          })]
         })]
-      })]
-    })
-  }, testId);
+      })
+    }, testId);
+  };
   return jsxs(Fragment, {
     children: [renderRow('First name', data == null ? void 0 : data.firstName, 'firstName', `firstName-control-${id}`), (data == null ? void 0 : data.middleName) && renderRow('Middle name', data == null ? void 0 : data.middleName, 'middleName', `middleName-control-${id}`), renderRow('Last name', data == null ? void 0 : data.lastName, 'lastName', `lastName-control-${id}`)]
   });
@@ -10903,30 +10918,33 @@ const FullNameDobReviewControl = props => {
   const stepId = uischema == null || (_uischema$options = uischema.options) == null ? void 0 : _uischema$options.stepId;
   const requiredFields = (_props$schema$require = (_props$schema = props.schema) == null ? void 0 : _props$schema.required) != null ? _props$schema$require : [];
   const isMissing = value => isNilOrEmptyString(value);
-  const renderRow = (fieldLabel, value, fieldName, testId) => jsx("tr", {
-    children: jsxs(PageReviewContainer, {
-      colSpan: 3,
-      children: [jsxs(ReviewHeader, {
-        children: [jsx(ReviewLabel, {
-          children: fieldLabel
-        }), stepId !== undefined && jsx(GoabButton, {
-          type: "tertiary",
-          size: "compact",
-          onClick: () => context == null ? void 0 : context.goToPage(stepId, uischema.scope),
-          testId: `${fieldName}-change-btn`,
-          children: "Change"
-        })]
-      }), jsxs(ReviewValue, {
-        children: [jsx("div", {
-          "data-testid": testId,
-          children: value != null ? value : ''
-        }), requiredFields.includes(fieldName) && isMissing(value) && jsx(GoabFormItem, {
-          error: `${fieldLabel} is required`,
-          label: ""
+  const renderRow = (fieldLabel, value, fieldName, testId) => {
+    var _uischema$options2;
+    return jsx("tr", {
+      children: jsxs(PageReviewContainer, {
+        colSpan: 3,
+        children: [jsxs(ReviewHeader, {
+          children: [jsx(ReviewLabel, {
+            children: fieldLabel
+          }), stepId !== undefined && !((_uischema$options2 = uischema.options) != null && (_uischema$options2 = _uischema$options2.componentProps) != null && _uischema$options2.readOnly) && jsx(GoabButton, {
+            type: "tertiary",
+            size: "compact",
+            onClick: () => context == null ? void 0 : context.goToPage(stepId, uischema.scope),
+            testId: `${fieldName}-change-btn`,
+            children: "Change"
+          })]
+        }), jsxs(ReviewValue, {
+          children: [jsx("div", {
+            "data-testid": testId,
+            children: value != null ? value : ''
+          }), requiredFields.includes(fieldName) && isMissing(value) && jsx(GoabFormItem, {
+            error: `${fieldLabel} is required`,
+            label: ""
+          })]
         })]
-      })]
-    })
-  }, testId);
+      })
+    }, testId);
+  };
   return jsxs(Fragment, {
     children: [renderRow('First name', data == null ? void 0 : data.firstName, 'firstName', `firstName-control-${id}`), (data == null ? void 0 : data.middleName) && renderRow('Middle name', data == null ? void 0 : data.middleName, 'middleName', `middleName-control-${id}`), renderRow('Last name', data == null ? void 0 : data.lastName, 'lastName', `lastName-control-${id}`), renderRow('Date of birth', data == null ? void 0 : data.dateOfBirth, 'dateOfBirth', `dob-control-${id}`)]
   });
@@ -11285,30 +11303,33 @@ const ContractInfoControlReview = props => {
   } = props;
   const requiredFields = (_schema$required = schema == null ? void 0 : schema.required) != null ? _schema$required : [];
   const isMissing = value => value === undefined || value === null || value === '';
-  const renderRow = (fieldLabel, value, fieldName, testId) => jsx("tr", {
-    children: jsxs(PageReviewContainer, {
-      colSpan: 3,
-      children: [jsxs(ReviewHeader, {
-        children: [jsx(ReviewLabel, {
-          children: fieldLabel
-        }), stepId !== undefined && jsx(GoabButton, {
-          type: "tertiary",
-          size: "compact",
-          onClick: () => context == null ? void 0 : context.goToPage(stepId, uischema.scope),
-          testId: `${fieldName}-change-btn`,
-          children: "Change"
-        })]
-      }), jsxs(ReviewValue, {
-        children: [jsx("div", {
-          "data-testid": testId,
-          children: value != null ? value : ''
-        }), requiredFields.includes(fieldName) && isMissing(value) && jsx(GoabFormItem, {
-          error: `${fieldLabel} is required`,
-          label: ""
+  const renderRow = (fieldLabel, value, fieldName, testId) => {
+    var _uischema$options;
+    return jsx("tr", {
+      children: jsxs(PageReviewContainer, {
+        colSpan: 3,
+        children: [jsxs(ReviewHeader, {
+          children: [jsx(ReviewLabel, {
+            children: fieldLabel
+          }), stepId !== undefined && !((_uischema$options = uischema.options) != null && (_uischema$options = _uischema$options.componentProps) != null && _uischema$options.readOnly) && jsx(GoabButton, {
+            type: "tertiary",
+            size: "compact",
+            onClick: () => context == null ? void 0 : context.goToPage(stepId, uischema.scope),
+            testId: `${fieldName}-change-btn`,
+            children: "Change"
+          })]
+        }), jsxs(ReviewValue, {
+          children: [jsx("div", {
+            "data-testid": testId,
+            children: value != null ? value : ''
+          }), requiredFields.includes(fieldName) && isMissing(value) && jsx(GoabFormItem, {
+            error: `${fieldLabel} is required`,
+            label: ""
+          })]
         })]
-      })]
-    })
-  }, testId);
+      })
+    }, testId);
+  };
   const {
     options
   } = uischema;
@@ -12624,7 +12645,7 @@ const AddressLookUpControlReview = props => {
   });
 };
 const AddressLoopUpControlTableReview = props => {
-  var _uischema$options, _schema$properties2, _provinces$find;
+  var _uischema$options, _schema$properties2, _provinces$find, _uischema$options3;
   const {
     data,
     schema,
@@ -12729,6 +12750,7 @@ const AddressLoopUpControlTableReview = props => {
   // Build the target scope for the address control
   const targetScope = (uischema == null ? void 0 : uischema.scope) || (path ? `#/properties/${path}` : undefined);
   const renderRow = (label, value, propName, showButton = false) => {
+    var _uischema$options2;
     let error = getError(propName);
     const required = isRequired(propName);
     if (required && !value && !error) {
@@ -12743,7 +12765,7 @@ const AddressLoopUpControlTableReview = props => {
             children: [label, required && jsx(RequiredTextLabel, {
               children: " (required)"
             })]
-          }), showButton && stepId !== undefined && jsx(GoabButton, {
+          }), showButton && stepId !== undefined && !((_uischema$options2 = uischema.options) != null && (_uischema$options2 = _uischema$options2.componentProps) != null && _uischema$options2.readOnly) && jsx(GoabButton, {
             type: "tertiary",
             size: "compact",
             onClick: () => formStepperCtx == null ? void 0 : formStepperCtx.goToPage(stepId, targetScope),
@@ -12767,7 +12789,7 @@ const AddressLoopUpControlTableReview = props => {
         children: jsxs(ReviewHeader, {
           children: [jsx(ReviewLabel, {
             children: `${isAlbertaAddress ? 'Alberta' : 'Canada'} postal address`
-          }), stepId !== undefined && jsx(GoabButton, {
+          }), stepId !== undefined && !((_uischema$options3 = uischema.options) != null && (_uischema$options3 = _uischema$options3.componentProps) != null && _uischema$options3.readOnly) && jsx(GoabButton, {
             type: "tertiary",
             size: "compact",
             onClick: () => formStepperCtx == null ? void 0 : formStepperCtx.goToPage(stepId, targetScope),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "2.60.1",
+  "version": "2.60.3",
   "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",
@@ -20,7 +20,7 @@
     "pluralize": "^8.0.0"
   },
   "dependencies": {
-    "axios": "1.13.5",
+    "axios": "1.15.0",
     "lodash": "^4.17.23",
     "styled-components": "^6.0.0"
   },

package/renderer-catalog.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": "1.0.0",
-  "generatedAt": "2026-04-10T21:10:16.242Z",
-  "sourceCommit": "a4154355fd3fd785c475219fee548e6bb9678d58",
+  "generatedAt": "2026-04-15T22:47:55.536Z",
+  "sourceCommit": "c6ed1617cb77a6af93af89e0c715feb74b3dbf12",
   "sourcePath": "libs/jsonforms-components/src/index.ts",
   "rendererCount": 33,
   "renderers": [