@abgov/jsonforms-components 2.56.0 → 2.57.0

package/index.esm.js

@@ -7142,59 +7142,78 @@ function useDebounce(value, delay) {
 const defineFields = fields => fields;
 const autoLabel = name => `${name} (auto from user profile)`;
 const buildInsertText = (key, schema) => `${key}": ${JSON.stringify(schema, null, 2)}`;
+const getNameParts = user => {
+  const [first = '', last = ''] = ((user == null ? void 0 : user.name) || '').split(' ');
+  return {
+    first,
+    last
+  };
+};
+const fullNameSchema = {
+  type: 'string',
+  minLength: 3,
+  description: 'Please enter your full name'
+};
+const firstNameSchema = {
+  type: 'string',
+  minLength: 3,
+  description: 'Please enter your first name'
+};
+const lastNameSchema = {
+  type: 'string',
+  minLength: 3,
+  description: 'Please enter your last name'
+};
+const emailSchema = {
+  type: 'string',
+  format: 'email',
+  maxLength: 100,
+  pattern: '^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\\\.[a-zA-Z]{2,}$',
+  description: 'Please enter a valid email address (e.g., name@example.com).',
+  errorMessage: {
+    pattern: '(e.g., name@example.com).',
+    maxLength: 'Email must be less than 100 characters.'
+  }
+};
 const USER_FIELD_DEFINITIONS = defineFields({
   fullName: {
-    schema: {
-      type: 'string',
-      minLength: 3,
-      description: 'Please enter your full name'
-    },
+    schema: fullNameSchema,
     getValue: user => user == null ? void 0 : user.name
   },
   name: {
-    schema: {
-      type: 'string',
-      minLength: 3,
-      description: 'Please enter your full name'
-    },
+    schema: fullNameSchema,
     getValue: user => user == null ? void 0 : user.name
   },
   firstName: {
-    schema: {
-      type: 'string',
-      minLength: 3,
-      description: 'Please enter your first name'
-    },
+    schema: firstNameSchema,
+    getValue: user => getNameParts(user).first
+  },
+  givenName: {
+    schema: firstNameSchema,
     getValue: user => getNameParts(user).first
   },
   lastName: {
-    schema: {
-      type: 'string',
-      minLength: 3,
-      description: 'Please enter your last name'
-    },
+    schema: lastNameSchema,
     getValue: user => getNameParts(user).last
   },
-  userName: {
-    schema: {
-      type: 'string',
-      minLength: 3,
-      description: 'Please enter your username'
-    },
-    getValue: user => (user == null ? void 0 : user.preferredUsername) || (user == null ? void 0 : user.email) || ''
+  familyName: {
+    schema: lastNameSchema,
+    getValue: user => getNameParts(user).last
+  },
+  surname: {
+    schema: lastNameSchema,
+    getValue: user => getNameParts(user).last
   },
   email: {
-    schema: {
-      type: 'string',
-      format: 'email',
-      maxLength: 100,
-      pattern: '^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\\\.[a-zA-Z]{2,}$',
-      description: 'Please enter a valid email address (e.g., name@example.com).',
-      errorMessage: {
-        pattern: '(e.g., name@example.com).',
-        maxLength: 'Email must be less than 100 characters.'
-      }
-    },
+    schema: emailSchema,
+    getValue: user => (user == null ? void 0 : user.email) || ''
+  },
+  emailAddress: {
+    schema: emailSchema,
+    getValue: user => (user == null ? void 0 : user.email) || ''
+  },
+  primaryEmail: {
+    schema: emailSchema,
     getValue: user => (user == null ? void 0 : user.email) || ''
   }
 });
@@ -7207,13 +7226,6 @@ const autoPopulatePropertiesMonaco = Object.entries(USER_FIELD_DEFINITIONS).map(
   label: autoLabel(key),
   insertText: buildInsertText(key, field.schema)
 }));
-const getNameParts = user => {
-  const [first = '', last = ''] = ((user == null ? void 0 : user.name) || '').split(' ');
-  return {
-    first,
-    last
-  };
-};
 
 function fetchRegisterConfigFromOptions$1(options) {
   if (!(options != null && options.url) && !(options != null && options.urn)) return undefined;
@@ -10776,55 +10788,42 @@ const isFullName = createSchemaMatchTester(['firstName', 'middleName', 'lastName
 const FullNameTester = rankWith(4, isFullName);
 
 const FullNameControlReview = props => {
-  var _props$uischema;
+  var _props$uischema, _props$schema$require, _props$schema;
   const context = useContext(JsonFormsStepperContext);
   const stepId = (_props$uischema = props.uischema) == null || (_props$uischema = _props$uischema.options) == null ? void 0 : _props$uischema.stepId;
   const {
-    label,
-    errors,
-    required,
     uischema,
     data,
     id
   } = props;
-  const renderRow = (fieldLabel, value, testId) => jsx("tr", {
+  const requiredFields = (_props$schema$require = (_props$schema = props.schema) == null ? void 0 : _props$schema.required) != null ? _props$schema$require : [];
+  const isMissing = value => value === undefined || value === null || value === '';
+  const renderRow = (fieldLabel, value, fieldName, testId) => jsx("tr", {
     children: jsxs(PageReviewContainer, {
       colSpan: 3,
-      children: [jsx(ReviewHeader, {
-        children: jsx(ReviewLabel, {
+      children: [jsxs(ReviewHeader, {
+        children: [jsx(ReviewLabel, {
           children: fieldLabel
-        })
-      }), jsx(ReviewValue, {
-        children: jsx("div", {
+        }), 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
-        })
+          children: value != null ? value : ''
+        }), requiredFields.includes(fieldName) && isMissing(value) && jsx(GoabFormItem, {
+          error: `${fieldLabel} is required`,
+          label: ""
+        })]
       })]
     })
   }, testId);
   return jsxs(Fragment, {
-    children: [jsx("tr", {
-      "data-testid": "full-name-header",
-      children: jsxs(PageReviewContainer, {
-        colSpan: 3,
-        children: [jsxs(ReviewHeader, {
-          children: [jsxs(ReviewLabel, {
-            children: [label, required && jsx(RequiredTextLabel, {
-              children: " (required)"
-            })]
-          }), stepId !== undefined && jsx(GoabButton, {
-            type: "tertiary",
-            size: "compact",
-            onClick: () => context == null ? void 0 : context.goToPage(stepId, uischema.scope),
-            testId: "full-name-change-btn",
-            children: "Change"
-          })]
-        }), errors && jsx(GoabFormItem, {
-          error: errors != null && errors.includes(REQUIRED_PROPERTY_ERROR) ? `${label} is required` : errors,
-          label: ""
-        })]
-      })
-    }), renderRow('First name', data == null ? void 0 : data.firstName, `firstName-control-${id}`), (data == null ? void 0 : data.middleName) && renderRow('Middle name', data == null ? void 0 : data.middleName, `middleName-control-${id}`), renderRow('Last name', data == null ? void 0 : data.lastName, `lastName-control-${id}`)]
+    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}`)]
   });
 };
 const GoAInputBaseFullNameControlReview = withJsonFormsAllOfProps(FullNameControlReview);
@@ -10833,55 +10832,42 @@ const isFullNameDoB = createSchemaMatchTester(['firstName', 'middleName', 'lastN
 const FullNameDobTester = rankWith(4, isFullNameDoB);
 
 const FullNameDobReviewControl = props => {
-  var _uischema$options;
+  var _uischema$options, _props$schema$require, _props$schema;
   const {
     data,
     id,
-    uischema,
-    label,
-    required,
-    errors
+    uischema
   } = props;
   const context = useContext(JsonFormsStepperContext);
   const stepId = uischema == null || (_uischema$options = uischema.options) == null ? void 0 : _uischema$options.stepId;
-  const renderRow = (fieldLabel, value, testId) => jsx("tr", {
+  const requiredFields = (_props$schema$require = (_props$schema = props.schema) == null ? void 0 : _props$schema.required) != null ? _props$schema$require : [];
+  const isMissing = value => value === undefined || value === null || value === '';
+  const renderRow = (fieldLabel, value, fieldName, testId) => jsx("tr", {
     children: jsxs(PageReviewContainer, {
       colSpan: 3,
-      children: [jsx(ReviewHeader, {
-        children: jsx(ReviewLabel, {
+      children: [jsxs(ReviewHeader, {
+        children: [jsx(ReviewLabel, {
           children: fieldLabel
-        })
-      }), jsx(ReviewValue, {
-        children: jsx("div", {
+        }), 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
-        })
+          children: value != null ? value : ''
+        }), requiredFields.includes(fieldName) && isMissing(value) && jsx(GoabFormItem, {
+          error: `${fieldLabel} is required`,
+          label: ""
+        })]
       })]
     })
   }, testId);
   return jsxs(Fragment, {
-    children: [jsx("tr", {
-      "data-testid": "fullname-dob-header",
-      children: jsxs(PageReviewContainer, {
-        colSpan: 3,
-        children: [jsxs(ReviewHeader, {
-          children: [jsxs(ReviewLabel, {
-            children: [label, required && jsx(RequiredTextLabel, {
-              children: " (required)"
-            })]
-          }), stepId !== undefined && jsx(GoabButton, {
-            type: "tertiary",
-            size: "compact",
-            onClick: () => context == null ? void 0 : context.goToPage(stepId, uischema.scope),
-            testId: "fullname-dob-change-btn",
-            children: "Change"
-          })]
-        }), errors && jsx(GoabFormItem, {
-          error: errors != null && errors.includes(REQUIRED_PROPERTY_ERROR) ? `${label} is required` : errors,
-          label: ""
-        })]
-      })
-    }), renderRow('First name', data == null ? void 0 : data.firstName, `firstName-control-${id}`), (data == null ? void 0 : data.middleName) && renderRow('Middle name', data == null ? void 0 : data.middleName, `middleName-control-${id}`), renderRow('Last name', data == null ? void 0 : data.lastName, `lastName-control-${id}`), renderRow('Date of birth', data == null ? void 0 : data.dateOfBirth, `dob-control-${id}`)]
+    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}`)]
   });
 };
 const GoAInputBaseFullNameDobControlReview = withJsonFormsAllOfProps(FullNameDobReviewControl);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/jsonforms-components",
-  "version": "2.56.0",
+  "version": "2.57.0",
   "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-19T15:19:54.516Z",
-  "sourceCommit": "036c46eec46317c8be0c03cbe21211e036a1800c",
+  "generatedAt": "2026-03-20T15:52:41.902Z",
+  "sourceCommit": "aa3a0d1881ea0990b3ed15d966fe93ef1d5ebaf1",
   "sourcePath": "libs/jsonforms-components/src/index.ts",
   "rendererCount": 32,
   "renderers": [

package/src/lib/util/autoPopulate.d.ts

@@ -24,6 +24,14 @@ export declare const USER_FIELD_DEFINITIONS: {
         };
         getValue: (user: User) => string;
     };
+    givenName: {
+        schema: {
+            type: string;
+            minLength: number;
+            description: string;
+        };
+        getValue: (user: User) => string;
+    };
     lastName: {
         schema: {
             type: string;
@@ -32,7 +40,15 @@ export declare const USER_FIELD_DEFINITIONS: {
         };
         getValue: (user: User) => string;
     };
-    userName: {
+    familyName: {
+        schema: {
+            type: string;
+            minLength: number;
+            description: string;
+        };
+        getValue: (user: User) => string;
+    };
+    surname: {
         schema: {
             type: string;
             minLength: number;
@@ -54,6 +70,34 @@ export declare const USER_FIELD_DEFINITIONS: {
         };
         getValue: (user: User) => string;
     };
+    emailAddress: {
+        schema: {
+            type: string;
+            format: string;
+            maxLength: number;
+            pattern: string;
+            description: string;
+            errorMessage: {
+                pattern: string;
+                maxLength: string;
+            };
+        };
+        getValue: (user: User) => string;
+    };
+    primaryEmail: {
+        schema: {
+            type: string;
+            format: string;
+            maxLength: number;
+            pattern: string;
+            description: string;
+            errorMessage: {
+                pattern: string;
+                maxLength: string;
+            };
+        };
+        getValue: (user: User) => string;
+    };
 };
 export type UserField = keyof typeof USER_FIELD_DEFINITIONS;
 export declare const autoPopulateValue: (user: User, props: {