abmp-npm 2.0.43 → 2.0.44

package/backend/routers/utils.js

@@ -66,6 +66,11 @@ function transformMemberToProfileData(member, siteAssociation) {
           numeric: true,
         })
       ) || [];
+
+  const phones = Array.isArray(member.phones) ? member.phones : [];
+  const toShowPhone = member.toShowPhone || '';
+  const phone = toShowPhone && phones.includes(toShowPhone) ? toShowPhone : '';
+
   return {
     mainAddress,
     testimonials: member.testimonial || [],
@@ -84,7 +89,7 @@ function transformMemberToProfileData(member, siteAssociation) {
     bookingUrl: member.bookingUrl,
     aboutService: member.aboutService,
     businessName: (member.showBusinessName && member.businessName) || '',
-    phone: member.toShowPhone || '',
+    phone,
     areasOfPractices,
     gallery: member.gallery,
     bannerImages: member.bannerImages,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "2.0.43",
+  "version": "2.0.44",
   "main": "index.js",
   "scripts": {
     "check-cycles": "madge --circular .",

package/pages/personalDetails.js

@@ -2122,16 +2122,19 @@ async function personalDetailsOnReady({
     const phoneToRemove = currentData.find(item => item._id === phoneId);
 
     if (phoneToRemove) {
-      if (itemMemberObj.toShowPhone === phoneToRemove.phoneNumber) {
-        itemMemberObj.toShowPhone = null;
-      }
-
       if (itemMemberObj.phones) {
         itemMemberObj.phones = itemMemberObj.phones.filter(
           phone => phone !== phoneToRemove.phoneNumber
         );
       }
 
+      // Clear toShowPhone if it was the removed phone or if it's no longer in the list
+      // (handles format mismatch e.g. "(406)655-4940" vs "(406) 655-4940")
+      const remainingPhones = Array.isArray(itemMemberObj.phones) ? itemMemberObj.phones : [];
+      if (itemMemberObj.toShowPhone && !remainingPhones.includes(itemMemberObj.toShowPhone)) {
+        itemMemberObj.toShowPhone = null;
+      }
+
       const updatedData = currentData.filter(item => item._id !== phoneId);
       renderPhonesList(updatedData);
       checkFormChanges(FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING);
@@ -2152,7 +2155,13 @@ async function personalDetailsOnReady({
   }
 
   function getToShowPhone() {
-    return itemMemberObj.toShowPhone || null;
+    const phones = Array.isArray(itemMemberObj.phones) ? itemMemberObj.phones : [];
+    const toShow = itemMemberObj.toShowPhone || null;
+    // Never expose toShowPhone when phones is empty, so save payload clears it in CMS
+    if (phones.length === 0) return null;
+    // If toShowPhone is not in the list (e.g. format mismatch), treat as none selected
+    if (toShow && !phones.includes(toShow)) return null;
+    return toShow;
   }
 
   function getContactAndBookingData() {