abmp-npm 2.0.15 → 2.0.17

package/backend/daily-pull/utils.js

@@ -35,7 +35,17 @@ const extractBaseUrl = url => {
   return url;
 };
 const incrementUrlCounter = (existingUrl, baseUrl) => {
-  if (existingUrl && existingUrl === baseUrl) {
+  if (!existingUrl || !baseUrl) {
+    return baseUrl;
+  }
+  // Normalize for comparison (case-insensitive)
+  const normalizedExisting = existingUrl.toLowerCase();
+  const normalizedBase = baseUrl.toLowerCase();
+
+  if (
+    normalizedExisting === normalizedBase ||
+    normalizedExisting.startsWith(`${normalizedBase}-`)
+  ) {
     console.log(
       `Found member with same url ${existingUrl} for baseUrl ${baseUrl}, increasing counter by 1`
     );
@@ -44,6 +54,9 @@ const incrementUrlCounter = (existingUrl, baseUrl) => {
     const lastCounter = isNumeric ? parseInt(lastSegment, 10) : 0;
     return `${baseUrl}-${lastCounter + 1}`;
   }
+
+  // No conflict, return baseUrl with counter 1 to be safe
+  return `${baseUrl}-1`;
 };
 /**
  * Validates core member data requirements

package/backend/members-data-methods.js

@@ -1,10 +1,11 @@
 const { COLLECTIONS } = require('../public/consts');
+const { isWixHostedImage } = require('../public/Utils/sharedUtils');
 
 const { MEMBERSHIPS_TYPES } = require('./consts');
 const { updateMemberContactInfo } = require('./contacts-methods');
 const { MEMBER_ACTIONS } = require('./daily-pull/consts');
 const { wixData } = require('./elevated-modules');
-const { createSiteMember } = require('./members-area-methods');
+const { createSiteMember, getCurrentMember } = require('./members-area-methods');
 const {
   chunkArray,
   normalizeUrlForComparison,
@@ -318,9 +319,9 @@ async function getAllMembersWithExternalImages() {
 
     const allItems = await queryAllItems(membersQuery);
 
-    // Filter for external images (not starting with 'wix:')
+    // Filter for external images (not 'wix hosted images')
     const membersWithExternalImages = allItems.filter(
-      member => member.profileImage && !member.profileImage.startsWith('wix:')
+      member => member.profileImage && !isWixHostedImage(member.profileImage)
     );
 
     return membersWithExternalImages;
@@ -477,6 +478,51 @@ async function getSiteMemberId(data) {
   }
 }
 
+/**
+ * Tracks a button click with member and location info.
+ * @param {Object} params - Parameters
+ * @param {string} params.pageName - Name of the page/popup where button was clicked
+ * @param {string} params.buttonName - Name/ID of the button that was clicked
+ * @returns {Promise<Object>} - Saved record or null if member not found
+ */
+async function trackButtonClick({ pageName, buttonName }) {
+  const wixMember = await getCurrentMember();
+
+  if (!wixMember) {
+    console.warn('[trackButtonClick]: No logged in member found');
+    return null;
+  }
+
+  const dbMember = await getMemberByContactId(wixMember._id);
+
+  if (!dbMember) {
+    console.warn(
+      `[trackButtonClick]: Member not found in MembersDataLatest for contactId: ${wixMember._id}`
+    );
+    return null;
+  }
+
+  const memberName = dbMember.fullName || 'Unknown';
+  const memberId = dbMember.memberId;
+
+  const clickData = {
+    memberName,
+    memberId,
+    pageName,
+    buttonName,
+    clickedAt: new Date(),
+  };
+
+  try {
+    const result = await wixData.insert(COLLECTIONS.BUTTON_CLICKS, clickData);
+    console.log(`Tracked ${buttonName} click on ${pageName} for member ${memberId}`);
+    return result;
+  } catch (error) {
+    console.error(`Error tracking ${buttonName} click:`, error);
+    throw error;
+  }
+}
+
 module.exports = {
   findMemberByWixDataId,
   createContactAndMemberIfNew,
@@ -496,4 +542,5 @@ module.exports = {
   getQAUsers,
   getSiteMemberId,
   checkUrlUniqueness,
+  trackButtonClick,
 };

package/backend/routers/methods.js

@@ -1,4 +1,5 @@
 const { PAGES_PATHS } = require('../../public/consts');
+const { isWixHostedImage } = require('../../public/Utils/sharedUtils');
 //const { fetchAllItemsInParallel } = require('../cms-data-methods'); unused at host site
 const { CONFIG_KEYS } = require('../consts');
 const { getSiteConfigs } = require('../utils');
@@ -27,7 +28,11 @@ const createRoutersHandlers = wixRouterMethods => {
       const defaultProfileImage = siteConfigs[CONFIG_KEYS.DEFAULT_PROFILE_IMAGE];
       const profileData = await getMemberProfileData(slug, siteAssociation);
       if (profileData && profileData.showWixUrl) {
-        const ogImage = profileData.profileImage || profileData.logoImage || siteLogoUrl;
+        const profileImage =
+          profileData.profileImage?.trim() && isWixHostedImage(profileData.profileImage)
+            ? profileData.profileImage
+            : defaultProfileImage;
+        const ogImage = profileImage || profileData.logoImage || siteLogoUrl;
         const seoTitle = generateSEOTitle({
           fullName: profileData.fullName,
           areasOfPractices: profileData.areasOfPractices,

package/backend/tasks/tasks-helpers-methods.js

@@ -1,29 +1,36 @@
 const crypto = require('crypto');
 
+const { auth } = require('@wix/essentials');
 const { files } = require('@wix/media');
 const aws4 = require('aws4');
 const axios = require('axios');
 
+const elevatedGenerateFileUploadUrl = auth.elevate(files.generateFileUploadUrl);
+
 const { PAGES_PATHS } = require('../../public/consts');
+const { isWixHostedImage } = require('../../public/Utils/sharedUtils');
 const { findMemberByWixDataId, updateMember } = require('../members-data-methods');
 const { getSecret, getSiteBaseUrl, encodeXml, formatDateOnly } = require('../utils');
-
 async function getServerlessAuth() {
   const serverlessAuth = await getSecret('serverless_auth');
   return serverlessAuth;
 }
 
 function isValidImageUrl(url) {
+  console.log('url', url);
+  console.log('typeof url', typeof url);
   if (!url || typeof url !== 'string') return false;
 
   // Check for valid URL format
   let parsedUrl;
   try {
     parsedUrl = new URL(url);
+    console.log('parsedUrl', parsedUrl);
   } catch {
     return false;
   }
-
+  console.log('parsedUrl', parsedUrl);
+  console.log('parsedUrl.protocol', parsedUrl.protocol);
   // Only allow HTTP and HTTPS protocols (reject blob:, data:, file:, etc.)
   const validProtocols = ['http:', 'https:'];
   if (!validProtocols.includes(parsedUrl.protocol)) {
@@ -33,10 +40,10 @@ function isValidImageUrl(url) {
   // Extract file extension from URL (handle query parameters)
   const urlPath = url.split('?')[0].toLowerCase();
   const validExtensions = ['.jpg', '.jpeg', '.png', '.gif', '.webp', '.bmp'];
-
+  console.log('urlPath', urlPath);
   // Check if URL ends with valid extension
   const hasValidExtension = validExtensions.some(ext => urlPath.endsWith(ext));
-
+  console.log('hasValidExtension', hasValidExtension);
   // Reject obviously invalid extensions
   const invalidExtensions = [
     '.pdf',
@@ -51,7 +58,7 @@ function isValidImageUrl(url) {
     '_gif',
   ];
   const hasInvalidExtension = invalidExtensions.some(ext => urlPath.includes(ext));
-
+  console.log('hasInvalidExtension', hasInvalidExtension);
   return hasValidExtension && !hasInvalidExtension;
 }
 
@@ -138,20 +145,23 @@ async function updateMemberRichContent(memberId) {
 async function updateMemberProfileImage(memberId) {
   try {
     const member = await findMemberByWixDataId(memberId);
-
+    const trimmedProfileImage = member.profileImage?.trim();
     // Check if member has an external profile image URL
-    if (!member.profileImage || member.profileImage.startsWith('wix:')) {
+    if (!trimmedProfileImage || isWixHostedImage(trimmedProfileImage)) {
       console.log(`Member ${memberId} already has Wix-hosted image or no image`);
       return { success: true, message: 'No update needed' };
     }
 
     // Validate image URL format before attempting download
-    if (!isValidImageUrl(member.profileImage)) {
-      console.log(`Member ${memberId} has invalid image URL format: ${member.profileImage}`);
+    if (!isValidImageUrl(trimmedProfileImage)) {
+      console.log(`Member ${memberId} has invalid image URL format: ${trimmedProfileImage}`);
       return { success: true, message: 'Invalid image URL format - skipped' };
     }
 
-    const response = await axios.get(member.profileImage, {
+    // Encode URL to handle spaces and special characters in the path
+    const encodedImageUrl = encodeURI(trimmedProfileImage);
+
+    const response = await axios.get(encodedImageUrl, {
       responseType: 'arraybuffer',
       headers: {
         'User-Agent':
@@ -208,7 +218,7 @@ async function updateMemberProfileImage(memberId) {
 
     const sanitizedFileName = `profile-${memberId}-${Date.now()}.${extension}`.replace(/\./g, '_');
     const uploadUrl = (
-      await files.generateFileUploadUrl(contentType, {
+      await elevatedGenerateFileUploadUrl(contentType, {
         fileName: sanitizedFileName,
         filePath: 'member-profiles',
       })

package/package.json

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

package/pages/Home.js

@@ -9,6 +9,7 @@ const {
   getMainAddress,
   formatPracticeAreasForDisplay,
   checkAddressIsVisible,
+  isWixHostedImage,
 } = require('../public/Utils/sharedUtils.js');
 
 let filter = JSON.parse(JSON.stringify(DEFAULT_FILTER));
@@ -187,7 +188,7 @@ const homePageOnReady = async ({
         : [];
 
       // 2) Profile image
-      if (itemData.profileImage) {
+      if (itemData.profileImage?.trim() && isWixHostedImage(itemData.profileImage)) {
         $item('#profileImage').src = itemData.profileImage;
       }
 
@@ -216,12 +217,19 @@ const homePageOnReady = async ({
         $item('#milesAwayText').text = '';
       }
 
-      // 7) "Show maps" button enabled only if there's at least one visible address
+      // 7) "Show maps" button enabled only if there's a full address with valid coordinates
       const visible = checkAddressIsVisible(addresses);
-      if (visible.length && visible[0].addressStatus === ADDRESS_STATUS_TYPES.FULL_ADDRESS) {
+      const fullAddressWithValidCoords = visible.find(
+        addr =>
+          addr.addressStatus === ADDRESS_STATUS_TYPES.FULL_ADDRESS &&
+          addr.latitude &&
+          addr.longitude
+      );
+
+      if (fullAddressWithValidCoords) {
         $item('#showMaps').enable();
         $item('#showMaps').show();
-        const { latitude, longitude } = visible[0];
+        const { latitude, longitude } = fullAddressWithValidCoords;
         $item('#showMaps').link = `https://maps.google.com/?q=${latitude},${longitude}`;
         $item('#showMaps').target = '_blank';
       } else {

package/pages/LearnMore.js

@@ -0,0 +1,27 @@
+const PAGE_NAME = 'Learn More';
+const BUTTON_NAME = 'Upgrade Now';
+
+/**
+ * Creates the Learn More popup handler
+ * @param {Object} params - Parameters
+ * @param {Function} params.$w - Wix $w selector
+ * @param {Function} params.trackClick - Backend function to track the click (handles member lookup internally)
+ */
+function learnMoreOnReady({ $w: _$w, trackClick }) {
+  _$w('#learnMoreBtn').onClick(async () => {
+    try {
+      await trackClick({
+        pageName: PAGE_NAME,
+        buttonName: BUTTON_NAME,
+      });
+
+      console.log(`Tracked ${BUTTON_NAME} click on ${PAGE_NAME}`);
+    } catch (error) {
+      console.error('Error tracking button click:', error);
+    }
+  });
+}
+
+module.exports = {
+  learnMoreOnReady,
+};

package/pages/Profile.js

@@ -2,7 +2,11 @@ const { location: wixLocation } = require('@wix/site-location');
 const { window: wixWindow } = require('@wix/site-window');
 
 const { LIGHTBOX_NAMES } = require('../public/consts');
-const { generateId, formatPracticeAreasForDisplay } = require('../public/Utils/sharedUtils');
+const {
+  generateId,
+  formatPracticeAreasForDisplay,
+  isWixHostedImage,
+} = require('../public/Utils/sharedUtils');
 
 const TESTIMONIALS_PER_PAGE_CONFIG = {
   DESKTOP: 4,
@@ -117,7 +121,7 @@ async function profileOnReady({ $w: _$w }) {
       _$w('#logoImage').delete();
     }
 
-    if (profileData.profileImage) {
+    if (profileData.profileImage && isWixHostedImage(profileData.profileImage)) {
       _$w('#profileImage').src = profileData.profileImage;
     } else {
       _$w('#profileImage').src = profileData.defaultProfileImage;

package/pages/index.js

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

package/pages/personalDetails.js

@@ -9,7 +9,7 @@ const {
   LIGHTBOX_NAMES,
 } = require('../public/consts');
 const { handleOnCustomValidation, isNotValidUrl } = require('../public/Utils/personalDetailsUtils');
-const { generateId } = require('../public/Utils/sharedUtils');
+const { generateId, isWixHostedImage } = require('../public/Utils/sharedUtils');
 
 const MAX_PHONES_COUNT = 10;
 const MAX_ADDRESSES_COUNT = 10;
@@ -793,8 +793,14 @@ async function personalDetailsOnReady({
           : null
         : itemMemberObj[key];
 
-      if (imageValue) {
-        _$w(imageSelector).src = imageValue;
+      if (imageValue && imageValue?.trim()) {
+        // Only set profile image if it's Wix-hosted; other images will always be wix url
+        const isProfileImage = imageSelector === '#profileImage';
+        const shouldSetImage = !isProfileImage || isWixHostedImage(imageValue);
+
+        if (shouldSetImage) {
+          _$w(imageSelector).src = imageValue;
+        }
         _$w(nameSelector).text = formatFileName(extractFileName(imageValue));
         _$w(containerSelector).expand();
         uploadedImages[key === 'bannerImages' ? 'bannerImage' : key] = imageValue;

package/public/Utils/sharedUtils.js

@@ -158,6 +158,13 @@ function generateId() {
   return `${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
 }
 
+function isWixHostedImage(imageUrl) {
+  return (
+    imageUrl?.trim() &&
+    (imageUrl?.startsWith('wix:') || imageUrl?.startsWith('https://static.wixstatic.com'))
+  );
+}
+
 module.exports = {
   checkAddressIsVisible,
   formatPracticeAreasForDisplay,
@@ -169,4 +176,5 @@ module.exports = {
   toRadians,
   generateId,
   formatAddress,
+  isWixHostedImage,
 };

package/public/consts.js

@@ -13,6 +13,7 @@ const COLLECTIONS = {
   STATE_CITY_MAP: 'City',
   UPDATED_LOGIN_EMAILS: 'updatedLoginEmails',
   QA_USERS: 'QA_Users', //Make QA users configurable per site
+  BUTTON_CLICKS: 'ButtonClicks',
 };
 
 /**