@abgov/jsonforms-components 2.60.1 → 2.60.2

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) {
@@ -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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "2.60.1",
+  "version": "2.60.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",
@@ -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-15T21:58:29.714Z",
+  "sourceCommit": "437fc5583187822f070dbda79b67b20daa47557d",
   "sourcePath": "libs/jsonforms-components/src/index.ts",
   "rendererCount": 33,
   "renderers": [