@bcrs-shared-components/base-address 2.2.1 → 2.2.2

package/BaseAddress.vue

@@ -165,7 +165,7 @@ import { Validations } from 'vuelidate-property-decorators'
 import { uniqueId } from 'lodash'
 import { ValidationMixin, CountriesProvincesMixin } from '@bcrs-shared-components/mixins'
 import { FormIF } from '@bcrs-shared-components/interfaces'
-
+import { isPostalCodeOptionalForCountry } from '@/validators'
 /**
  * The component for displaying and editing an address.
  * Vuelidate is used to implement the validation rules (eg, what 'required' means and whether it's satisfied).
@@ -335,7 +335,14 @@ export default class BaseAddress extends Mixins(ValidationMixin, CountriesProvin
     } else {
       label = 'Postal Code'
     }
-    return label + (this.isSchemaRequired('postalCode') ? '' : ' (Optional)')
+
+    let isRequired = this.isSchemaRequired('postalCode')
+    // If schema uses isRequiredPostalCode validator, check if country requires postal codes
+    if (!isRequired && this.schemaLocal?.postalCode?.isRequiredPostalCode) {
+      isRequired = !isPostalCodeOptionalForCountry(this.addressCountry)
+    }
+
+    return label + (isRequired ? '' : ' (Optional)')
   }
 
   /** The Address Country label with 'optional' as needed. */
@@ -358,7 +365,7 @@ export default class BaseAddress extends Mixins(ValidationMixin, CountriesProvin
 
   /** Whether the specified prop is required according to the schema. */
   isSchemaRequired (prop: string): boolean {
-    return Boolean(this.schemaLocal && this.schemaLocal[prop] && this.schemaLocal[prop].required)
+    return Boolean(this.schemaLocal?.[prop]?.required)
   }
 
   /** Array of validation rules used by input elements to prevent extra whitespace. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bcrs-shared-components/base-address",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "publishConfig": {
     "access": "public"
   },
@@ -14,5 +14,5 @@
     "vue-property-decorator": "^9.1.2",
     "vuelidate-property-decorators": "1.0.28"
   },
-  "gitHead": "30eec9b5b0bc7d7d35c3373e0acd6007ba6a1476"
+  "gitHead": "4c249d93bf6b86ad7d1c9bfd205fee2cca3edb45"
 }