@evoke-platform/ui-components 1.10.1-dev.3 → 1.10.1-dev.5

package/dist/published/components/custom/Form/FormComponents/CriteriaComponent/Criteria.js

@@ -65,6 +65,11 @@ export const Criteria = (props) => {
                                     name: `${prop.name} Zip Code`,
                                     type: 'string',
                                 },
+                                {
+                                    id: `${prop.id}.country`,
+                                    name: `${prop.name} Country`,
+                                    type: 'string',
+                                },
                             ];
                         }
                         return prop;

package/dist/published/components/custom/Form/FormComponents/FormFieldComponent.js

@@ -8,7 +8,7 @@ import { FormField } from '../../../custom';
 import { FormComponentWrapper } from '../Common';
 import { isPropertyVisible } from '../utils';
 function isAddressProperties(key) {
-    return /\.line1|\.line2|\.city|\.county|\.state|\.zipCode$/.test(key);
+    return /\.line1|\.line2|\.city|\.county|\.state|\.zipCode|\.country$/.test(key);
 }
 Handlebars.registerHelper('addDays', function (addend1, addend2) {
     const dateAddend1 = DateTime.fromISO(addend1);
@@ -76,6 +76,7 @@ export class FormFieldComponent extends ReactComponent {
                     `${this.component.addressPropertyId}.county`,
                     `${this.component.addressPropertyId}.state`,
                     `${this.component.addressPropertyId}.zipCode`,
+                    `${this.component.addressPropertyId}.country`,
                 ].includes(comp.key))
                     .forEach((comp) => {
                     this.emit('changed-' + comp.key, value[comp.key.replace(`${this.component.addressPropertyId}.`, '')]);
@@ -159,7 +160,8 @@ export class FormFieldComponent extends ReactComponent {
         if (this.component.key.includes('.city') ||
             this.component.key.includes('.county') ||
             this.component.key.includes('.state') ||
-            this.component.key.includes('.zipCode')) {
+            this.component.key.includes('.zipCode') ||
+            this.component.key.includes('.country')) {
             this.on('changed-' + this.component.key, (value) => {
                 this.setValue(value ?? '');
                 this.updateValue(value, { modified: true });
@@ -244,7 +246,7 @@ export class FormFieldComponent extends ReactComponent {
             }
             else if (/^{{.*}}$/.test(this.component.initialValue)) {
                 if (isAddressProperties(this.component.key)) {
-                    const regex = /^{{input\.(?<relatedObjectProperty>[a-zA-Z][a-zA-Z0-9_]*)\.(?<addressProperty>[a-zA-Z][a-zA-Z0-9_]*)\.(?<nestedAddressProperty>line1|line2|city|county|state|zipCode)}}$/;
+                    const regex = /^{{input\.(?<relatedObjectProperty>[a-zA-Z][a-zA-Z0-9_]*)\.(?<addressProperty>[a-zA-Z][a-zA-Z0-9_]*)\.(?<nestedAddressProperty>line1|line2|city|county|state|zipCode|country)}}$/;
                     const groups = regex.exec(this.component.initialValue)?.groups;
                     if (groups?.relatedObjectProperty && groups?.addressProperty && groups?.nestedAddressProperty) {
                         this.on(`changed-${groups.relatedObjectProperty}`, (value) => {

package/dist/published/components/custom/Form/FormComponents/ObjectComponent/ObjectComponent.js

@@ -42,7 +42,7 @@ export class ObjectComponent extends ReactComponent {
                 let compKey = compKeyFragments[0];
                 const property = this.component.properties.find((c) => c.id === compKey);
                 if (property?.type === 'address' &&
-                    ['line1', 'line2', 'city', 'state', 'zipCode'].includes(compKeyFragments[1])) {
+                    ['line1', 'line2', 'city', 'state', 'zipCode', 'country'].includes(compKeyFragments[1])) {
                     compKey = inputProp;
                 }
                 this.on(`changed-${compKey}`, async (value) => {
@@ -86,7 +86,7 @@ export class ObjectComponent extends ReactComponent {
                 let compKey = compKeyFragments[0];
                 const property = this.component.properties.find((c) => c.id === compKey);
                 if (property?.type === 'address' &&
-                    ['line1', 'line2', 'city', 'state', 'zipCode'].includes(compKeyFragments[1])) {
+                    ['line1', 'line2', 'city', 'state', 'zipCode', 'country'].includes(compKeyFragments[1])) {
                     compKey = inputProp;
                 }
                 this.on(`changed-${compKey}`, async (value) => {

package/dist/published/components/custom/Form/FormComponents/RepeatableFieldComponent/RepeatableFieldComponent.js

@@ -31,7 +31,7 @@ export class RepeatableFieldComponent extends ReactComponent {
                 let compKey = compKeyFragments[0];
                 const property = this.component.properties.find((c) => c.id === compKey);
                 if (property?.type === 'address' &&
-                    ['line1', 'line2', 'city', 'state', 'zipCode'].includes(compKeyFragments[1])) {
+                    ['line1', 'line2', 'city', 'state', 'zipCode', 'country'].includes(compKeyFragments[1])) {
                     compKey = inputProp;
                 }
                 this.on(`changed-${compKey}`, async (value) => {

package/dist/published/components/custom/Form/types.d.ts

@@ -88,6 +88,7 @@ export type Address = {
     county?: string;
     state?: string;
     zipCode?: string;
+    country?: string;
 };
 export type User = {
     id: string;

package/dist/published/components/custom/Form/utils.js

@@ -554,6 +554,11 @@ formComponents, allCriteriaInputs, instance, objectPropertyInputProps, associate
                 name: `${property.name} Zip Code`,
                 type: 'string',
             },
+            {
+                id: `${property.id}.country`,
+                name: `${property.name} Country`,
+                type: 'string',
+            },
         ]
         : [property]);
     return [
@@ -1048,6 +1053,27 @@ export const buildComponentPropsFromObjectProperties = (properties, objectId, in
                     fieldHeight,
                     autoSave,
                 },
+                {
+                    type,
+                    key: `${property.id}.country`,
+                    label: `${property.name} Country`,
+                    inputMask: property.mask,
+                    readOnly: !hasActionPermissions || readOnly || !!property?.formula,
+                    instance: instance,
+                    defaultValue: instance ? instance[property.id]?.[`country`] : undefined,
+                    user: objectPropertyInputProps?.user,
+                    property: {
+                        id: `${property.id}.country`,
+                        name: `${property.name} Country`,
+                        type: 'string',
+                    },
+                    validate: {
+                        required: property.required,
+                    },
+                    objectId,
+                    fieldHeight,
+                    autoSave,
+                },
             ];
         }
         let minDate = property.validation?.from ?? '';

package/dist/published/components/custom/FormField/AddressFieldComponent/AddressFieldComponent.test.js

@@ -20,6 +20,7 @@ it('displays matching addresses', async () => {
                 county: 'Howard',
                 state: 'Maryland',
                 zipCode: '21046',
+                country: 'USA',
             },
         },
         {
@@ -29,6 +30,7 @@ it('displays matching addresses', async () => {
                 county: 'Howard',
                 state: 'Maryland',
                 zipCode: '21046',
+                country: 'USA',
             },
         },
     ];
@@ -58,6 +60,7 @@ it('returns selected search result', async () => {
                 county: 'Howard',
                 state: 'Maryland',
                 zipCode: '21046',
+                country: 'USA',
             },
         },
     ];
@@ -72,5 +75,6 @@ it('returns selected search result', async () => {
         county: 'Howard',
         state: 'Maryland',
         zipCode: '21046',
+        country: 'USA',
     }, addressProperty, undefined);
 });

package/dist/published/components/custom/FormField/AddressFieldComponent/addressFieldComponent.d.ts

@@ -8,6 +8,7 @@ export type Address = {
         county?: string;
         state?: string;
         zipCode?: string;
+        country?: string;
     };
 };
 declare const AddressFieldComponent: (props: FormFieldProps & {

package/dist/published/components/custom/FormField/AddressFieldComponent/addressFieldComponent.js

@@ -25,9 +25,9 @@ const AddressFieldComponent = (props) => {
                 setSelectOptions(addresses
                     .filter((address) => address.address.line1)
                     .map((address) => {
-                    const { line1, city, county, state, zipCode } = address.address;
+                    const { line1, city, county, state, zipCode, country } = address.address;
                     const label = line1 ?? '';
-                    let sublabel = [city, county, state].filter(Boolean).join(', ');
+                    let sublabel = [city, county, state, country].filter(Boolean).join(', ');
                     if (zipCode) {
                         sublabel = sublabel ? `${sublabel} ${zipCode}` : zipCode;
                     }

package/dist/published/components/custom/FormV2/components/FormFieldTypes/AddressFields.js

@@ -25,7 +25,7 @@ function AddressFields(props) {
     const handleAddressChange = async (name, value) => {
         try {
             if (addressField === 'line1' && typeof value === 'object' && value.line1) {
-                const addressKeys = ['line1', 'city', 'county', 'state', 'zipCode'];
+                const addressKeys = ['line1', 'city', 'county', 'state', 'zipCode', 'country'];
                 // Await each handleChange sequentially to ensure proper order
                 for (const key of addressKeys) {
                     const fullKey = `${addressObject}.${key}`;

package/dist/published/components/custom/FormV2/components/types.d.ts

@@ -7,6 +7,7 @@ export type FieldAddress = {
     county?: string;
     state?: string;
     zipCode?: string;
+    country?: string;
 };
 export type AccessCheck = {
     result: boolean;

package/dist/published/components/custom/FormV2/components/utils.js

@@ -63,7 +63,7 @@ const evaluateCondition = (condition, formValues, instance) => {
     }
 };
 export function isAddressProperty(key) {
-    return /\.line1|\.line2|\.city|\.county|\.state|\.zipCode$/.test(key);
+    return /\.line1|\.line2|\.city|\.county|\.state|\.zipCode|\.country$/.test(key);
 }
 /**
  * Determine if a form entry is visible or not.
@@ -172,6 +172,11 @@ export function addressProperties(addressProperty) {
             name: `${addressProperty.name} Zip Code`,
             type: 'string',
         },
+        {
+            id: `${addressProperty.id}.country`,
+            name: `${addressProperty.name} Country`,
+            type: 'string',
+        },
     ];
 }
 export const normalizeDates = (instance, evokeObject) => {
@@ -414,7 +419,7 @@ export const convertPropertiesToParams = (object) => {
         return property.type === 'address'
             ? [
                 ...acc,
-                ...['city', 'county', 'state', 'line1', 'line2', 'zipCode'].map((field) => ({
+                ...['city', 'county', 'state', 'line1', 'line2', 'zipCode', 'country'].map((field) => ({
                     id: `${property.id}.${field}`,
                     name: `${property.name} ${startCase(field)}`,
                     type: 'string',

package/dist/published/stories/CriteriaBuilder.stories.js

@@ -322,6 +322,11 @@ CriteriaBuilderRelatedObject.args = {
                             name: 'Applicant Address County',
                             type: 'string',
                         },
+                        {
+                            id: 'homeAddress.country',
+                            name: 'Applicant Address Country',
+                            type: 'string',
+                        },
                     ],
                     actions: [],
                 });
@@ -516,6 +521,11 @@ CriteriaBuilderRelatedObject.args = {
                     name: 'Applicant Address County',
                     type: 'string',
                 },
+                {
+                    id: 'homeAddress.country',
+                    name: 'Applicant Address Country',
+                    type: 'string',
+                },
                 {
                     id: 'name',
                     name: 'Name',
@@ -634,6 +644,11 @@ CriteriaBuilderRelatedObject.args = {
             name: 'Applicant Address County',
             type: 'string',
         },
+        {
+            id: 'homeAddress.country',
+            name: 'Applicant Address Country',
+            type: 'string',
+        },
         {
             id: 'name',
             name: 'Name',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@evoke-platform/ui-components",
-    "version": "1.10.1-dev.3",
+    "version": "1.10.1-dev.5",
     "description": "",
     "main": "dist/published/index.js",
     "module": "dist/published/index.js",
@@ -96,7 +96,7 @@
         "yalc": "^1.0.0-pre.53"
     },
     "peerDependencies": {
-        "@evoke-platform/context": "^1.5.0",
+        "@evoke-platform/context": "^1.6.0-0",
         "react": "^18.1.0",
         "react-dom": "^18.1.0"
     },