abmp-npm 2.0.61 → 2.0.63

package/package.json

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

package/pages/Home.js

@@ -10,6 +10,7 @@ const {
   formatPracticeAreasForDisplay,
   checkAddressIsVisible,
   isWixHostedImage,
+  normalizeExternalUrl,
 } = require('../public/Utils/sharedUtils.js');
 
 let filter = JSON.parse(JSON.stringify(DEFAULT_FILTER));
@@ -198,7 +199,7 @@ const homePageOnReady = async ({
         $item('#websiteContainer').collapse();
       } else {
         if (itemData.showWebsite) {
-          $item('#website').link = itemData.website;
+          $item('#website').link = normalizeExternalUrl(itemData.website);
         } else {
           $item('#website').link = `${baseUrl}/profile/${itemData.url}`;
         }
@@ -256,7 +257,7 @@ const homePageOnReady = async ({
       // 9) "Book now" button
       if (itemData.bookingUrl) {
         $item('#bookNowButton').show();
-        $item('#bookNowButton').link = itemData.bookingUrl;
+        $item('#bookNowButton').link = normalizeExternalUrl(itemData.bookingUrl);
         $item('#bookNowButton').target = '_blank';
       } else {
         $item('#bookNowButton').hide();

package/pages/personalDetails.js

@@ -9,7 +9,11 @@ const {
   LIGHTBOX_NAMES,
 } = require('../public/consts');
 const { handleOnCustomValidation, isNotValidUrl } = require('../public/Utils/personalDetailsUtils');
-const { generateId, isWixHostedImage } = require('../public/Utils/sharedUtils');
+const {
+  generateId,
+  isWixHostedImage,
+  normalizeExternalUrl,
+} = require('../public/Utils/sharedUtils');
 
 const MAX_PHONES_COUNT = 10;
 const MAX_ADDRESSES_COUNT = 10;
@@ -2039,9 +2043,14 @@ async function personalDetailsOnReady({
         return;
       }
 
+      const $item = _$w.at(event.context);
       const isChecked = event.target.checked;
       let updated;
       if (isChecked) {
+        // Same pattern as #mainAddressCheckbox: clear every row, then select one (repeater
+        // often does not refresh sibling items' controls when only `data` changes).
+        _$w('#showPhoneCheckbox').checked = false;
+        $item('#showPhoneCheckbox').checked = true;
         updated = data.map(item =>
           item._id === clickedItemData._id
             ? { ...item, showPhone: true }
@@ -2094,6 +2103,34 @@ async function personalDetailsOnReady({
     $item('#phoneNumberLabel').text = `Phone ${itemData.phoneIndex}`;
   }
 
+  /** Only one "Show your phone" row at a time; aligns UI with itemMemberObj.toShowPhone. */
+  function normalizePhoneShowFlags(phoneData) {
+    if (!phoneData?.length) return phoneData;
+
+    const cms = (itemMemberObj.toShowPhone || '').trim();
+    if (cms) {
+      let matched = false;
+      return phoneData.map(p => {
+        const t = (p.phoneNumber || '').trim();
+        const isMatch = Boolean(t && t === cms);
+        if (isMatch && !matched) {
+          matched = true;
+          return { ...p, showPhone: true };
+        }
+        return { ...p, showPhone: false };
+      });
+    }
+
+    const trueIdxs = phoneData.map((p, i) => (p.showPhone ? i : -1)).filter(i => i >= 0);
+    if (trueIdxs.length <= 1) return phoneData;
+
+    const keep = trueIdxs[0];
+    return phoneData.map((p, i) => ({
+      ...p,
+      showPhone: i === keep,
+    }));
+  }
+
   function renderPhonesList(updatedPhones) {
     let phoneData = updatedPhones || [];
 
@@ -2109,12 +2146,28 @@ async function personalDetailsOnReady({
       }));
     }
 
+    phoneData = normalizePhoneShowFlags(phoneData);
+
     const repeater = _$w('#phoneNumbersList');
 
     repeater.data = phoneData;
+    refreshPhoneShowCheckboxState(phoneData);
     updatePhoneAddButtonState();
   }
 
+  /**
+   * Repeater may not re-run onItemReady for sibling items when only showPhone flags change;
+   * keep each #showPhoneCheckbox in sync with data (same idea as refreshAddressListIsMainState).
+   */
+  function refreshPhoneShowCheckboxState(phoneData) {
+    const repeater = _$w('#phoneNumbersList');
+    const data = phoneData || repeater.data || [];
+    repeater.forEachItem(($item, _itemData, index) => {
+      const show = index < data.length ? data[index].showPhone : false;
+      $item('#showPhoneCheckbox').checked = Boolean(show);
+    });
+  }
+
   function updatePhoneAddButtonState() {
     const currentData = _$w('#phoneNumbersList').data || [];
     const addPhoneButton = _$w('#addPhoneButton');
@@ -2131,7 +2184,22 @@ async function personalDetailsOnReady({
     const itemIndex = currentData.findIndex(item => item._id === phoneId);
 
     if (itemIndex !== -1) {
-      currentData[itemIndex].phoneNumber = newPhoneNumber;
+      const item = currentData[itemIndex];
+      const prevTrimmed = (item.phoneNumber || '').trim();
+      const newTrimmed = newPhoneNumber.trim();
+
+      item.phoneNumber = newPhoneNumber;
+
+      if (item.showPhone) {
+        itemMemberObj.toShowPhone = newTrimmed || null;
+      } else if (
+        itemMemberObj.toShowPhone &&
+        prevTrimmed &&
+        itemMemberObj.toShowPhone === prevTrimmed
+      ) {
+        itemMemberObj.toShowPhone = newTrimmed || null;
+      }
+
       renderPhonesList(currentData);
       syncPhonesFromRepeater();
       checkFormChanges(FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING);
@@ -2187,14 +2255,14 @@ async function personalDetailsOnReady({
       return;
     }
 
+    const trimmed = (selectedItem.phoneNumber || '').trim();
+
     if (isVisible) {
-      itemMemberObj.toShowPhone = selectedItem.phoneNumber?.trim()
-        ? selectedItem.phoneNumber
-        : null;
+      itemMemberObj.toShowPhone = trimmed || null;
       return;
     }
 
-    if (selectedItem.phoneNumber) {
+    if (itemMemberObj.toShowPhone === trimmed) {
       itemMemberObj.toShowPhone = null;
     }
   }
@@ -2216,12 +2284,15 @@ async function personalDetailsOnReady({
     const addresses = Array.isArray(itemMemberObj.addresses) ? itemMemberObj.addresses : [];
     const phones = Array.isArray(itemMemberObj.phones) ? itemMemberObj.phones : [];
 
+    const rawWebsite = (_$w('#UrlInput').value || '').trim();
+    const rawBooking = (_$w('#schedulingLinkInput').value || '').trim();
+
     return {
       showContactForm: _$w('#showCotactFormCheckbox').checked,
       contactFormEmail: _$w('#contactFormEmailInput').value,
       toShowPhone: getToShowPhone(),
-      bookingUrl: _$w('#schedulingLinkInput').value,
-      website: _$w('#UrlInput').value,
+      bookingUrl: rawBooking ? normalizeExternalUrl(rawBooking) : '',
+      website: rawWebsite ? normalizeExternalUrl(rawWebsite) : '',
       showWebsite: showExistingUrl,
       showWixUrl,
       addresses,

package/public/Utils/homePage.js

@@ -5,37 +5,7 @@ const { DEFAULT_FILTER } = require('../consts.js');
 
 const { debouncedFunction } = require('./sharedUtils.js');
 
-/** Returned when an in-flight search was superseded; do not apply results to UI */
-const STALE_SEARCH_RESPONSE = Symbol('STALE_SEARCH_RESPONSE');
-
-function generateSearchId() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
-    const r = (Math.random() * 16) | 0;
-    const v = c === 'x' ? r : (r & 0x3) | 0x8;
-    return v.toString(16);
-  });
-}
-
 const createHomepageUtils = (_$w, filterProfiles) => {
-  let currentSearchId = null;
-
-  async function fetchProfilesWithSearchId(args) {
-    const thisSearchId = generateSearchId();
-    currentSearchId = thisSearchId;
-    try {
-      const response = await filterProfiles(args);
-      if (thisSearchId !== currentSearchId) {
-        return STALE_SEARCH_RESPONSE;
-      }
-      return response;
-    } catch (error) {
-      if (thisSearchId !== currentSearchId) {
-        return STALE_SEARCH_RESPONSE;
-      }
-      throw error;
-    }
-  }
-
   const getFiltersSelectors = filterName => ({
     checkBoxContainerSelector: _$w(`#${filterName}CheckBoxContainer`),
     searchTextInputSelector: _$w(`#${filterName}TextInput`),
@@ -717,10 +687,7 @@ const createHomepageUtils = (_$w, filterProfiles) => {
       }
       const nonDebouncedFilterProfiles = async () => {
         try {
-          const result = await fetchProfilesWithSearchId({ filter, isSearchingNearby });
-          if (result === STALE_SEARCH_RESPONSE) {
-            return { success: true, response: STALE_SEARCH_RESPONSE };
-          }
+          const result = await filterProfiles({ filter, isSearchingNearby });
           return { success: true, response: result };
         } catch (error) {
           return { success: false, error };
@@ -732,15 +699,12 @@ const createHomepageUtils = (_$w, filterProfiles) => {
           ? () => nonDebouncedFilterProfiles()
           : () =>
               debouncedFunction({
-                func: fetchProfilesWithSearchId,
+                func: filterProfiles,
                 debounceTimeout,
                 timeoutType,
                 args: { filter, isSearchingNearby },
               });
       const { success, response, error } = await funcPromise();
-      if (response === STALE_SEARCH_RESPONSE) {
-        return [];
-      }
       if (!success) {
         _$w('#numberOfResults').text = '';
         console.error('[search] failed with error:', error);

package/public/Utils/sharedUtils.js

@@ -186,6 +186,15 @@ function isWixHostedImage(imageUrl) {
   );
 }
 
+/** Web URLs only: bare hostnames get https:// so they are not treated as site-relative paths. */
+function normalizeExternalUrl(url) {
+  if (!url || typeof url !== 'string') return url;
+  const trimmed = url.trim();
+  if (!trimmed) return trimmed;
+  if (/^https?:\/\//i.test(trimmed)) return trimmed;
+  return `https://${trimmed}`;
+}
+
 module.exports = {
   checkAddressIsVisible,
   formatPracticeAreasForDisplay,
@@ -198,4 +207,5 @@ module.exports = {
   generateId,
   formatAddress,
   isWixHostedImage,
+  normalizeExternalUrl,
 };