@abgov/jsonforms-components 2.55.1 → 2.55.2

package/index.esm.js

@@ -3055,6 +3055,17 @@ const sinTitle = 'Social insurance number';
 const invalidSin = 'Social insurance number is invalid';
 const DEFAULT_MAX_ITEMS = 50;
 const REQUIRED_PROPERTY_ERROR = 'is a required property';
+const ADDRESS_LOOKUP_LABELS = {
+  addressLine1: 'Address line 1',
+  addressLine2: 'Address line 2',
+  municipality: 'City',
+  postalCode: 'Postal code',
+  subdivisionCode: 'Province',
+  country: 'Country'
+};
+const getAddressLookupFieldLabel = fieldName => {
+  return ADDRESS_LOOKUP_LABELS[fieldName] || fieldName;
+};
 
 /**
  * Sets the first word to be capitalized so that it is sentence cased.
@@ -3246,23 +3257,6 @@ const convertToReadableFormat = input => {
   }
   return input.replace(/([a-z])([A-Z])/g, '$1 $2').split(' ').map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(' ');
 };
-/**
- * Converts a input to sentence case (eg: incomeThresholdExample or IncomeThresholdExample)
- * to 'Income threshold example' with the first letter in the sentence capitalized.
- *
- * @param input - The camelCase or PascalCase string (e.g., "incomeThresholdExample").
- * @returns A formatted string with spaces and capitalization (e.g., "Income threshold example").
- */
-const convertToSentenceCase = input => {
-  if (!input) {
-    return input;
-  }
-  const convertedInput = convertToReadableFormat(input);
-  if (!convertedInput) return convertedInput;
-  const firstWord = convertedInput.split(' ').splice(0, 1);
-  const newWords = convertedInput.split(' ').splice(1).map(word => word.charAt(0).toLowerCase() + word.slice(1).toLowerCase()).join(' ');
-  return firstWord.concat(newWords).join(' ');
-};
 
 var $$y = _export;
 var call$e = functionCall;
@@ -8696,6 +8690,7 @@ const SideMenuItem = styled.div(_t8$1 || (_t8$1 = _$7`
 `));
 const RowFlex = styled.div(_t9$1 || (_t9$1 = _$7`
   display: flex;
+  margin: 1.5rem 0 1.5rem 0;
 
   align-items: flex-start;
 `));
@@ -8723,7 +8718,6 @@ const RowFlexMenuLeft = styled.div(_t1$1 || (_t1$1 = _$7`
   border: 1px solid var(--goa-color-greyscale-300);
   border-radius: var(--goa-border-radius-m);
   margin-top: var(--goa-space-xs);
-  background-color: var(--goa-color-greyscale-white);
   padding: 0;
   gap: 0;
   position: relative;
@@ -9775,14 +9769,13 @@ class ListWithDetailControl extends React.Component {
     // eslint-disable-next-line
     const listTitle = (_ref = (_ref2 = (_ref3 = (_uischema$label = uischema == null ? void 0 : uischema.label) != null ? _uischema$label : uischema == null || (_uischema$options15 = uischema.options) == null ? void 0 : _uischema$options15.title) != null ? _ref3 : getItemsTitle(schema)) != null ? _ref2 : schema == null ? void 0 : schema.title) != null ? _ref : label;
     const withLeftTab = uischema == null || (_uischema$options16 = uischema.options) == null || (_uischema$options16 = _uischema$options16.componentProps) == null ? void 0 : _uischema$options16.withLeftTab;
-    const noLeftTabBlankButton = this.state.currentListPage === 0 && data === 0;
-    const showMainItems = withLeftTab || this.state.currentListPage === 0;
-    const showSecondaryButton = withLeftTab || noLeftTabBlankButton;
+    this.state.currentListPage === 0 && data === 0;
+    const editMode = this.state.currentListPage !== 0 && !withLeftTab;
     return jsxs(Visible, {
       visible: visible,
       "data-testid": "jsonforms-object-list-wrapper",
       children: [jsxs(ToolBarHeader, {
-        children: [listTitle && showMainItems && jsx(MarginTop, {
+        children: [listTitle && jsx(MarginTop, {
           children: jsxs(ObjectArrayTitle, {
             children: [listTitle, " ", jsx("span", {
               children: additionalProps.required && '(required)'
@@ -9794,7 +9787,7 @@ class ListWithDetailControl extends React.Component {
               children: this.state.maxItemsError
             })]
           })
-        }), showSecondaryButton && jsx(ObjectArrayToolBar, {
+        }), jsx(ObjectArrayToolBar, {
           data: data,
           errors: errors,
           label: label,
@@ -9806,7 +9799,7 @@ class ListWithDetailControl extends React.Component {
           uischema: controlElement,
           schema: schema,
           rootSchema: rootSchema,
-          enabled: enabled,
+          enabled: enabled && !editMode,
           setCurrentListPage: listPage => {
             this.setState({
               currentListPage: listPage
@@ -9837,33 +9830,13 @@ class ListWithDetailControl extends React.Component {
           currentListPage: this.state.currentListPage,
           listTitle: listTitle
         }, additionalProps))
-      }), !showSecondaryButton && jsx(ObjectArrayToolBar, {
-        data: data,
-        errors: errors,
-        label: label,
-        addItem: (path, value) => () => {
-          this.addItem(path, value);
-        },
-        numColumns: 0,
-        path: path,
-        uischema: controlElement,
-        schema: schema,
-        rootSchema: rootSchema,
-        enabled: enabled,
-        setCurrentListPage: listPage => {
-          this.setState({
-            currentListPage: listPage
-          });
-        },
-        currentListPage: this.state.currentListPage,
-        buttonType: "tertiary"
       })]
     });
   }
 }
 
 const GoAInputBaseTableReview = props => {
-  var _uischema$options, _jsonForms$core, _uischema$options4;
+  var _uischema$options, _uischema$scope, _jsonForms$core, _uischema$options4;
   const {
     data,
     uischema,
@@ -9877,10 +9850,16 @@ const GoAInputBaseTableReview = props => {
   } = props;
   const context = useContext(JsonFormsStepperContext);
   const jsonForms = useJsonForms();
-  let labelToUpdate = (_uischema$options = uischema.options) != null && _uischema$options.reviewLabel ? uischema.options.reviewLabel : convertToSentenceCase(getLabelText(uischema.scope, label || ''));
-  if (labelToUpdate === '') {
+  const reviewLabel = typeof ((_uischema$options = uischema.options) == null ? void 0 : _uischema$options.reviewLabel) === 'string' ? uischema.options.reviewLabel : '';
+  const propLabel = typeof label === 'string' ? label : '';
+  let labelToUpdate = '';
+  if (reviewLabel.trim() !== '') {
+    labelToUpdate = reviewLabel;
+  } else if (propLabel.trim() !== '') {
+    labelToUpdate = propLabel;
+  } else if ((_uischema$scope = uischema.scope) != null && _uischema$scope.startsWith('#/')) {
     const scopeName = uischema.scope ? getLastSegmentFromPointer(uischema.scope) : '';
-    labelToUpdate = convertToSentenceCase(scopeName);
+    labelToUpdate = convertToReadableFormat(scopeName);
   }
   let reviewText = data;
   const isBoolean = typeof data === 'boolean';
@@ -9909,7 +9888,7 @@ const GoAInputBaseTableReview = props => {
       checkboxLabel = uischema.options.text.trim();
     } else if (uischema.scope && uischema.scope.startsWith('#/')) {
       const fallbackLabel = getLastSegmentFromPointer(uischema.scope);
-      checkboxLabel = fallbackLabel.charAt(0).toUpperCase() + fallbackLabel.slice(1);
+      checkboxLabel = convertToReadableFormat(fallbackLabel);
     }
     if (((_uischema$options3 = uischema.options) == null ? void 0 : _uischema$options3.radio) === true) {
       reviewText = data ? `Yes` : `No`;
@@ -9971,13 +9950,13 @@ const GoAInputBaseTableReview = props => {
       // Fallback: try to extract missing property name and create a friendly message
       if (matchedError.keyword === 'required' && (_matchedError$params = matchedError.params) != null && _matchedError$params.missingProperty) {
         const missing = matchedError.params.missingProperty;
-        const missingPropertyLabel = convertToSentenceCase(missing);
+        const missingPropertyLabel = convertToReadableFormat(missing);
         activeError = `${missingPropertyLabel} is required`;
       } else {
         var _matchedError$message;
         const propertyMatch = (_matchedError$message = matchedError.message) == null ? void 0 : _matchedError$message.match(/'([^']+)'/);
         if (propertyMatch && propertyMatch[1]) {
-          const missingPropertyLabel = convertToSentenceCase(propertyMatch[1]);
+          const missingPropertyLabel = convertToReadableFormat(propertyMatch[1]);
           activeError = `${missingPropertyLabel} is required`;
         } else {
           activeError = matchedError.message;
@@ -12262,9 +12241,6 @@ const AddressLoopUpControlTableReview = props => {
     label: 'Yukon'
   }];
   const provinceLabel = isAlbertaAddress ? 'Alberta' : ((_provinces$find = provinces.find(p => p.value === (data == null ? void 0 : data.subdivisionCode))) == null ? void 0 : _provinces$find.label) || (data == null ? void 0 : data.subdivisionCode);
-  function prettify(prop) {
-    return prop.replace(/([A-Z])/g, ' $1').replace(/[_-]/g, ' ').replace(/^./, c => c.toUpperCase());
-  }
   const getError = propName => {
     var _jsonForms$core;
     const normalizePath = p => p.replace(/\[(\d+)\]/g, '.$1').replace(/^\./, '').replace(/\//g, '.');
@@ -12303,7 +12279,7 @@ const AddressLoopUpControlTableReview = props => {
       if (raw != null && raw.includes('must have required property') || raw != null && raw.includes(REQUIRED_PROPERTY_ERROR)) {
         const propertyMatch = raw.match(/'([^']+)'/);
         if (propertyMatch && propertyMatch[1]) {
-          return prettify(propertyMatch[1]) + ' is required';
+          return `${getAddressLookupFieldLabel(propertyMatch[1])} is required`;
         }
       }
       return raw;
@@ -12363,7 +12339,7 @@ const AddressLoopUpControlTableReview = props => {
           })]
         })
       })
-    }), renderRow('Address line 1', data == null ? void 0 : data.addressLine1, 'addressLine1', false), (data == null ? void 0 : data.addressLine2) && renderRow('Address line 2', data.addressLine2, 'addressLine2', false), renderRow('City', data == null ? void 0 : data.municipality, 'municipality', false), renderRow('Postal Code', data == null ? void 0 : data.postalCode, 'postalCode', false), renderRow('Province', provinceLabel, 'subdivisionCode', false), renderRow('Country', 'Canada', 'country', false)]
+    }), renderRow(getAddressLookupFieldLabel('addressLine1'), data == null ? void 0 : data.addressLine1, 'addressLine1', false), (data == null ? void 0 : data.addressLine2) && renderRow(getAddressLookupFieldLabel('addressLine2'), data.addressLine2, 'addressLine2', false), renderRow(getAddressLookupFieldLabel('municipality'), data == null ? void 0 : data.municipality, 'municipality', false), renderRow(getAddressLookupFieldLabel('postalCode'), data == null ? void 0 : data.postalCode, 'postalCode', false), renderRow(getAddressLookupFieldLabel('subdivisionCode'), provinceLabel, 'subdivisionCode', false), renderRow(getAddressLookupFieldLabel('country'), 'Canada', 'country', false)]
   });
 };
 
@@ -16656,7 +16632,7 @@ const AddressLookUpControl = props => {
   const handleRequiredFieldBlur = name => {
     const err = Object.assign({}, errors);
     if (!(data != null && data[name]) || data[name] === '' || (data == null ? void 0 : data[name]) === undefined) {
-      err[name] = name === 'municipality' ? 'city is required' : `${name} is required`;
+      err[name] = `${getAddressLookupFieldLabel(name)} is required`;
       setErrors(err);
     } else {
       delete errors[name];
@@ -16715,8 +16691,7 @@ const AddressLookUpControl = props => {
       try {
         const response = await fetchAddressSuggestions(formUrl, q, isAlbertaAddress, {
           signal: controller.signal
-        } //update util to accept signal
-        );
+        });
         const filtered = filterSuggestionsWithoutAddressCount(response);
         const finalList = isAlbertaAddress ? filterAlbertaAddresses(filtered) : filtered;
         cacheRef.current.set(q, finalList);

package/package.json

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

package/renderer-catalog.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": "1.0.0",
-  "generatedAt": "2026-03-16T20:36:57.025Z",
-  "sourceCommit": "e0ba3a1eada96011e94c8b3964d421fc77539775",
+  "generatedAt": "2026-03-17T21:52:22.881Z",
+  "sourceCommit": "f73629414bf1125cb5192c06f4b0aafd1cdbdc45",
   "sourcePath": "libs/jsonforms-components/src/index.ts",
   "rendererCount": 32,
   "renderers": [

package/src/lib/common/Constants.d.ts

@@ -2,3 +2,12 @@ export declare const sinTitle = "Social insurance number";
 export declare const invalidSin = "Social insurance number is invalid";
 export declare const DEFAULT_MAX_ITEMS = 50;
 export declare const REQUIRED_PROPERTY_ERROR = "is a required property";
+export declare const ADDRESS_LOOKUP_LABELS: {
+    readonly addressLine1: "Address line 1";
+    readonly addressLine2: "Address line 2";
+    readonly municipality: "City";
+    readonly postalCode: "Postal code";
+    readonly subdivisionCode: "Province";
+    readonly country: "Country";
+};
+export declare const getAddressLookupFieldLabel: (fieldName: string) => string;