abmp-npm 2.0.74 → 2.0.76

package/package.json

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

package/pages/Home.js

@@ -3,12 +3,18 @@ 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 {
+  ADDRESS_STATUS_TYPES,
+  DEFAULT_FILTER,
+  DROPDOWN_OPTIONS,
+  LIGHTBOX_NAMES,
+} = require('../public/consts.js');
 const { createHomepageUtils } = require('../public/Utils/homePage.js');
 const {
   getMainAddress,
-  formatPracticeAreasForDisplay,
+  findMainAddress,
   checkAddressIsVisible,
+  formatPracticeAreasForDisplay,
   isWixHostedImage,
   normalizeExternalUrl,
 } = require('../public/Utils/sharedUtils.js');
@@ -30,6 +36,28 @@ const pagination = {
 let searchResults = [];
 let isMobile = false;
 
+const isMappable = addr =>
+  addr?.addressStatus === ADDRESS_STATUS_TYPES.FULL_ADDRESS && addr.latitude && addr.longitude;
+
+// The button is only offered when the member has at least one mappable address, which is
+// the same condition as before the lightbox was introduced. When that address is not the
+// primary one we still show the button but withhold the link, so the click opens the
+// lightbox instead of sending the visitor to a secondary address in another city.
+const getDirectionsTarget = itemData => {
+  const addresses = Array.isArray(itemData?.addresses) ? itemData.addresses : [];
+  const showButton = checkAddressIsVisible(addresses).some(isMappable);
+  if (!showButton) {
+    return { showButton: false, mapsLink: null };
+  }
+  const mainAddr = findMainAddress(itemData?.addressDisplayOption, addresses);
+  return {
+    showButton: true,
+    mapsLink: isMappable(mainAddr)
+      ? `https://maps.google.com/?q=${mainAddr.latitude},${mainAddr.longitude}`
+      : null,
+  };
+};
+
 const homePageOnReady = async ({
   _$w,
   getCompiledFiltersOptions,
@@ -181,6 +209,16 @@ const homePageOnReady = async ({
       await updateResults('zeroTimeout');
     });
     const baseUrl = await wixLocation.baseUrl();
+    _$w('#showMaps').onClick(event => {
+      const member = searchResults.find(result => result._id === event.context.itemId);
+      if (!member) {
+        return;
+      }
+      const { showButton, mapsLink } = getDirectionsTarget(member);
+      if (showButton && !mapsLink) {
+        wixWindow.openLightbox(LIGHTBOX_NAMES.CONTACT_FOR_LOCATION, member);
+      }
+    });
     _$w('#profileRepeater').onItemReady(($item, itemData) => {
       // 1) safely default to arrays
       const addresses = Array.isArray(itemData.addresses) ? itemData.addresses : [];
@@ -225,23 +263,24 @@ const homePageOnReady = async ({
         $item('#milesAwayText').text = '';
       }
 
-      // 7) "Show maps" button enabled only if there's a full address with valid coordinates
-      const visible = checkAddressIsVisible(addresses);
-      const fullAddressWithValidCoords = visible.find(
-        addr =>
-          addr.addressStatus === ADDRESS_STATUS_TYPES.FULL_ADDRESS &&
-          addr.latitude &&
-          addr.longitude
-      );
+      // 7) "Show maps" button. Links to the primary address when it is a full address;
+      // otherwise it stays visible and the page-level onClick opens a lightbox.
+      const { showButton, mapsLink } = getDirectionsTarget(itemData);
 
-      if (fullAddressWithValidCoords) {
+      if (!showButton) {
+        $item('#showMaps').hide();
+      } else {
         $item('#showMaps').enable();
         $item('#showMaps').show();
-        const { latitude, longitude } = fullAddressWithValidCoords;
-        $item('#showMaps').link = `https://maps.google.com/?q=${latitude},${longitude}`;
-        $item('#showMaps').target = '_blank';
-      } else {
-        $item('#showMaps').hide();
+
+        if (mapsLink) {
+          $item('#showMaps').link = mapsLink;
+          $item('#showMaps').target = '_blank';
+        } else {
+          // Clear any link left over from a recycled repeater item, otherwise the
+          // button would still navigate to the previous member's address.
+          $item('#showMaps').link = undefined;
+        }
       }
 
       // 8) Phone / contact form

package/pages/contactForLocation.js

@@ -0,0 +1,28 @@
+const { location: wixLocation } = require('@wix/site-location');
+const { lightbox } = require('@wix/site-window');
+
+const { PAGES_PATHS } = require('../public/consts.js');
+
+/**
+ * Shown from the directory when a member's primary address is not a full address,
+ * so "Directions" cannot be offered. Sends the visitor to the member's profile
+ * page rather than opening the contact form.
+ */
+async function contactForLocationOnReady({ $w: _$w }) {
+  const member = await lightbox.getContext();
+  const profilePath = member?.url;
+
+  if (!profilePath) {
+    _$w('#contact').hide();
+    return;
+  }
+
+  _$w('#contact').onClick(async () => {
+    await lightbox.close();
+    wixLocation.to(`/${PAGES_PATHS.PROFILE}/${profilePath}`);
+  });
+}
+
+module.exports = {
+  contactForLocationOnReady,
+};

package/pages/index.js

@@ -9,4 +9,5 @@ module.exports = {
   ...require('./deleteConfirm.js'),
   ...require('./SaveAlerts.js'),
   ...require('./LearnMore.js'),
+  ...require('./contactForLocation.js'),
 };

package/public/consts.js

@@ -85,6 +85,7 @@ const LIGHTBOX_NAMES = {
   SELECT_BANNER_IMAGES: 'Select Banner Images',
   CONTACT_US: 'Contact Us',
   MAIN_ADDRESS_ERROR: 'mainAddressError',
+  CONTACT_FOR_LOCATION: 'contactForLocation',
 };
 
 const FREE_WEBSITE_TEXT_STATES = {