abmp-npm 2.0.78 → 2.0.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "2.0.78",
+  "version": "2.0.80",
   "main": "index.js",
   "files": [
     "index.js",

package/pages/Home.js

@@ -3,12 +3,12 @@ const { location: wixLocation } = require('@wix/site-location');
 const { window: wixWindow, rendering } = require('@wix/site-window');
 const { withWarmUpData } = require('psdev-utils/frontend');
 
-const { ADDRESS_STATUS_TYPES, DEFAULT_FILTER, DROPDOWN_OPTIONS } = require('../public/consts.js');
+const { DEFAULT_FILTER, DROPDOWN_OPTIONS } = require('../public/consts.js');
 const { createHomepageUtils } = require('../public/Utils/homePage.js');
 const {
   getMainAddress,
+  findMainAddress,
   formatPracticeAreasForDisplay,
-  checkAddressIsVisible,
   isWixHostedImage,
   normalizeExternalUrl,
   buildMapLink,
@@ -226,25 +226,24 @@ const homePageOnReady = async ({
         $item('#milesAwayText').text = '';
       }
 
-      // 7) "Show maps" button shown only when we can actually build a link for it
-      const visible = checkAddressIsVisible(addresses);
-      const fullAddressWithValidCoords = visible.find(
-        addr =>
-          addr.addressStatus === ADDRESS_STATUS_TYPES.FULL_ADDRESS &&
-          addr.latitude &&
-          addr.longitude
-      );
-
-      // Links to the street address rather than the stored coordinates, which are
-      // unreliable for some members. The full-address filter above is what keeps
-      // this safe: members set to state_city_zip or dont_show never reach here, so
-      // a hidden street address is never put in a maps URL.
+      // 7) "Show maps" button - directions to whatever address the member displays.
+      //
+      // Uses the same address as the location text above, so the button always
+      // matches what the member is showing. Members displaying city/state/ZIP get
+      // directions to that, rather than no button at all: their NetForum
+      // coordinates can be miles off (see Monday 12596102059), and the text they
+      // publish is the reliable value.
+      //
+      // Privacy is enforced in buildMapLink, not here - it delegates to
+      // formatAddress, which prints the street line only for full_address, and
+      // returns '' outright for dont_show. findMainAddress also excludes
+      // dont_show. A hidden street address can never reach a maps URL.
       //
-      // Gate on the link rather than on the address. buildMapLink returns '' when
-      // it can build neither an address nor a coordinate link, and it also handles
-      // being passed undefined - so this cannot leave a visible button linking
-      // nowhere, even if the filter above is later relaxed.
-      const mapLink = buildMapLink(fullAddressWithValidCoords);
+      // Gate on the link rather than the address: buildMapLink returns '' when it
+      // can build neither an address nor a coordinate link, and handles being
+      // passed '' or undefined, so the button is never shown linking nowhere.
+      const mapAddress = findMainAddress(itemData.addressDisplayOption, addresses);
+      const mapLink = buildMapLink(mapAddress);
 
       if (mapLink) {
         $item('#showMaps').enable();

package/pages/Profile.js

@@ -6,6 +6,7 @@ const {
   generateId,
   formatPracticeAreasForDisplay,
   isWixHostedImage,
+  normalizeExternalUrl,
 } = require('../public/Utils/sharedUtils');
 
 const TESTIMONIALS_PER_PAGE_CONFIG = {
@@ -159,7 +160,11 @@ async function profileOnReady({ $w: _$w }) {
 
   function bindBookingUrl() {
     if (profileData.bookingUrl) {
-      _$w('#bookNowButton').link = profileData.bookingUrl;
+      // Normalised for the same reason the directory does it (see Home.js): some
+      // stored booking URLs have no protocol, and a bare hostname would be treated
+      // as a path on this site rather than an external link, so the button would
+      // point at abmpmembers.com/<their-domain> and go nowhere.
+      _$w('#bookNowButton').link = normalizeExternalUrl(profileData.bookingUrl);
     } else {
       _$w('#bookNowButton').delete();
     }

package/public/Utils/personalDetailsUtils.js

@@ -12,13 +12,24 @@ function isNotValidUrl(url) {
   // Empty URLs are considered valid (optional field)
   if (!url) return false;
 
-  // URL must start with protocol OR www - handles all TLDs including multi-level and query params
-  // NOTE: the host class is `[\da-z.-]` (digit, letter, dot, hyphen). It previously read
-  // `[da-z.-]`, which - missing the backslash - matched only a literal "d" plus a-z, so any
-  // domain containing a digit was rejected (e.g. https://patty-10439.square.site).
-  // The `i` flag keeps mixed-case hosts valid; domains are case-insensitive.
+  // Handles all TLDs including multi-level, plus paths, query strings and anchors.
+  //
+  // The protocol is OPTIONAL. Members routinely type a bare hostname such as
+  // "patty-10439.square.site", which is what they see in their browser. Requiring
+  // http:// or www. rejected that and blocked the whole Business & Services save.
+  // getContactAndBookingData already runs the value through normalizeExternalUrl on
+  // save, so a bare hostname is stored with https:// prepended - accepting it here
+  // is what lets that happen.
+  //
+  // Dropping the explicit `www.` branch loses nothing: "www.example.com" still
+  // matches as host "www.example" plus TLD ".com".
+  //
+  // The host class is `[\da-z.-]` (digit, letter, dot, hyphen). It once read
+  // `[da-z.-]`, which - missing the backslash - matched only a literal "d" plus a-z,
+  // so any domain containing a digit was rejected. The `i` flag keeps mixed-case
+  // hosts valid; domains are case-insensitive.
   const urlRegex =
-    /^(https?:\/\/|www\.)([\da-z.-]+)\.([a-z.]{2,})([/\w .-]*)*(\?[&\w=.-]*)?(#[&\w=.-]*)?\/?$/i;
+    /^(https?:\/\/)?([\da-z.-]+)\.([a-z.]{2,})([/\w .-]*)*(\?[&\w=.-]*)?(#[&\w=.-]*)?\/?$/i;
 
   return !urlRegex.test(url);
 }

package/public/Utils/sharedUtils.js

@@ -137,6 +137,12 @@ function formatAddress(item) {
 function buildMapLink(address) {
   if (!address) return '';
 
+  // A member set to dont_show has opted out of publishing their location at all.
+  // formatAddress returns '' for them, so without this guard they would fall
+  // through to the coordinate fallback below and have their exact position put
+  // into an outbound maps URL - worse than the street line they chose to hide.
+  if (address.addressStatus === ADDRESS_STATUS_TYPES.DONT_SHOW) return '';
+
   const query = formatAddress(address);
   if (query) {
     return `https://maps.google.com/?q=${encodeURIComponent(query)}`;