abmp-npm 2.0.78 → 2.0.79

package/package.json

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

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);
 }