abmp-npm 1.1.83 → 1.1.85

package/backend/consts.js

@@ -1,4 +1,5 @@
 const PAC_API_URL = 'https://members.abmp.com/eweb/api/Wix';
+const BACKUP_API_URL = 'https://psdevteamenterpris.wixstudio.com/abmp-backup/_functions';
 const SSO_TOKEN_AUTH_API_URL = 'https://members.professionalassistcorp.com/';
 
 /**
@@ -40,4 +41,5 @@ module.exports = {
   COMPILED_FILTERS_FIELDS,
   MEMBERSHIPS_TYPES,
   SSO_TOKEN_AUTH_API_URL,
+  BACKUP_API_URL,
 };

package/backend/daily-pull/utils.js

@@ -84,7 +84,7 @@ const validateCoreMemberData = inputMemberData => {
   return true;
 };
 
-const containsNonEnglish = str => /[^a-zA-Z0-9]/.test(str); // if it contains any non-english characters, test1 is allowed, but any others are not
+const containsNonEnglish = str => /[^a-zA-Z0-9-]/.test(str); // if it contains any non-english characters or invalid URL chars, test1 is allowed, hyphens are allowed
 
 /**
  * Creates a full name from first and last name components

package/backend/dev-only-methods.js

@@ -0,0 +1,18 @@
+const { ensureUniqueUrlsInBatch } = require('./daily-pull/bulk-process-methods');
+const { wixData } = require('./elevated-modules');
+const { bulkSaveMembers } = require('./members-data-methods');
+const { queryAllItems } = require('./utils');
+
+async function deduplicateURls(collectionName, duplicateUrlsList) {
+  const query = await wixData.query(collectionName).hasSome('url', duplicateUrlsList).limit(1000);
+  const membersWithSameUrl = await queryAllItems(query);
+
+  console.log({ membersWithSameUrl });
+  const membersWithUniqueUrls = await ensureUniqueUrlsInBatch(membersWithSameUrl);
+  console.log({ membersWithUniqueUrls });
+  const deduplicatedUrls = membersWithUniqueUrls.map(m => m.url);
+  console.log({ deduplicatedUrls });
+  return await bulkSaveMembers(membersWithUniqueUrls, collectionName);
+}
+
+module.exports = { deduplicateURls };

package/backend/index.js

@@ -13,4 +13,5 @@ module.exports = {
   ...require('./login'),
   ...require('./data-hooks'),
   ...require('./http-functions'),
+  ...require('./dev-only-methods'),
 };

package/backend/members-data-methods.js

@@ -61,9 +61,10 @@ async function createContactAndMemberIfNew(memberData) {
 
 /** Performs bulk save operation for member data
  * @param { Array } memberDataList - Array of member data objects to save
+ * @param { string } [collectionName] - The collection name to save the members to (default: COLLECTIONS.MEMBERS_DATA)
  * @returns { Promise < Object >} - Bulk save operation result
  */
-async function bulkSaveMembers(memberDataList) {
+async function bulkSaveMembers(memberDataList, collectionName = COLLECTIONS.MEMBERS_DATA) {
   if (!Array.isArray(memberDataList) || memberDataList.length === 0) {
     throw new Error('Invalid member data list provided for bulk save');
   }
@@ -71,9 +72,7 @@ async function bulkSaveMembers(memberDataList) {
   try {
     // bulkSave all with batches of 1000 items as this is the Velo limit for bulkSave
     const batches = chunkArray(memberDataList, 1000);
-    return await Promise.all(
-      batches.map(batch => wixData.bulkSave(COLLECTIONS.MEMBERS_DATA, batch))
-    );
+    return await Promise.all(batches.map(batch => wixData.bulkSave(collectionName, batch)));
   } catch (error) {
     console.error('Error bulk saving members:', error);
     throw new Error(`Bulk save failed: ${error.message}`);
@@ -133,7 +132,9 @@ async function getMemberBySlug({
     }
     query = query.limit(1000);
     const searchResult = await searchAllItems(query);
-    const membersList = searchResult.filter(item => item.url && item.url.includes(slug)); //replacement for contains
+    const membersList = searchResult.filter(
+      item => item.url && item.url.toLowerCase().includes(slug.toLowerCase())
+    ); //replacement for contains - case insensitive
     let matchingMembers = membersList.filter(
       item => item.url && item.url.toLowerCase() === slug.toLowerCase()
     );
@@ -270,23 +271,13 @@ async function urlExists(url, excludeMemberId) {
   if (!url) return false;
 
   try {
-    let query = wixData
-      .query(COLLECTIONS.MEMBERS_DATA)
-      .contains('url', url)
-      .ne('action', MEMBER_ACTIONS.DROP); //TODO: change it to wix search
-
-    if (excludeMemberId) {
-      query = query.ne('memberId', excludeMemberId);
-    }
-
-    const { items } = await query.find();
-
-    // Case-insensitive comparison
-    const matchingMembers = items.filter(
-      item => item.url && item.url.toLowerCase() === url.toLowerCase()
-    );
-
-    return matchingMembers.length > 0;
+    const member = await getMemberBySlug({
+      slug: url,
+      excludeDropped: false,
+      excludeSearchedMember: true,
+      memberId: excludeMemberId,
+    });
+    return member !== null;
   } catch (error) {
     console.error('Error checking URL existence:', error);
     return false;

package/backend/routers/utils.js

@@ -1,7 +1,7 @@
 const { getMainAddress } = require('../../public/Utils/sharedUtils');
 const { getMemberBySlug } = require('../members-data-methods');
 const {
-  getAddressesByStatus,
+  getMoreAddressesToDisplay,
   formatDateToMonthYear,
   hasStudentMembership,
   isPAC_STAFF,
@@ -48,7 +48,10 @@ function transformMemberToProfileData(member, siteAssociation) {
     ?.map(val => val.license)
     .filter(Boolean)
     .join(', ');
-  const processedAddresses = getAddressesByStatus(member.addresses, member.addressDisplayOption);
+  const moreAddressesToDisplay = getMoreAddressesToDisplay(
+    member.addresses,
+    member.addressDisplayOption
+  );
 
   const memberships = member.memberships || [];
   const siteAssociationMembership = memberships.find(m => m.association === siteAssociation);
@@ -67,7 +70,7 @@ function transformMemberToProfileData(member, siteAssociation) {
     mainAddress,
     testimonials: member.testimonial || [],
     licenceNo,
-    processedAddresses,
+    moreAddressesToDisplay,
     memberSince:
       (member.showABMP &&
         siteAssociationMembership &&

package/backend/tasks/tasks-configs.js

@@ -89,7 +89,7 @@ const TASKS = {
     getIdentifier: () => 'SHOULD_NEVER_SKIP',
     process: updateSiteMapS3,
     shouldSkipCheck: () => false,
-    estimatedDurationSec: 70,
+    estimatedDurationSec: 90,
   },
   [TASKS_NAMES.scheduleContactFormEmailMigration]: {
     name: TASKS_NAMES.scheduleContactFormEmailMigration,

package/backend/utils.js

@@ -4,7 +4,7 @@ const { site } = require('@wix/urls');
 const { encode } = require('ngeohash');
 
 const { COLLECTIONS, ADDRESS_STATUS_TYPES } = require('../public/consts');
-const { formatAddress, generateId } = require('../public/Utils/sharedUtils');
+const { formatAddress, generateId, findMainAddress } = require('../public/Utils/sharedUtils');
 
 const { CONFIG_KEYS, GEO_HASH_PRECISION, MEMBERSHIPS_TYPES } = require('./consts');
 const { wixData } = require('./elevated-modules');
@@ -91,16 +91,17 @@ function getAddressDisplayOptions(member) {
   }
   return displayOptions;
 }
-function getAddressesByStatus(addresses = [], addressDisplayOption = []) {
+function getMoreAddressesToDisplay(addresses = [], addressDisplayOption = []) {
   const visible = addresses.filter(addr => addr.addressStatus !== ADDRESS_STATUS_TYPES.DONT_SHOW);
   if (visible.length < 2) {
     return [];
   }
-  const opts = Array.isArray(addressDisplayOption) ? addressDisplayOption : [];
-  const mainOpt = opts.find(o => o.isMain);
-  const mainKey = mainOpt ? mainOpt.key : visible[0].key; // fallback to the first visible if none marked
-  return visible
-    .filter(addr => addr?.key !== mainKey)
+  const mainAddress = findMainAddress(addressDisplayOption, addresses);
+  const remainingAddressesToFormat = mainAddress
+    ? visible.filter(addr => addr?.key !== mainAddress.key)
+    : visible;
+
+  return remainingAddressesToFormat
     .map(addr => {
       const addressString = formatAddress(addr);
       return addressString ? { _id: generateId(), address: addressString } : null;
@@ -214,7 +215,7 @@ module.exports = {
   getSiteBaseUrl,
   encodeXml,
   formatDateOnly,
-  getAddressesByStatus,
+  getMoreAddressesToDisplay,
   isPAC_STAFF,
   searchAllItems,
 };

package/dev-only-scripts/find-duplicate-urls.js

@@ -0,0 +1,201 @@
+const fs = require('fs');
+const path = require('path');
+
+const csv = require('csv-parser');
+
+/**
+ * Finds duplicate URLs in a CSV file and generates a JSON report
+ * Usage: node scripts/find-duplicate-urls.js <path-to-csv-file>
+ */
+function findDuplicateUrls(csvFilePath) {
+  // Validate command-line argument
+  if (!csvFilePath) {
+    console.error('Error: CSV file path is required');
+    console.error('Usage: node scripts/find-duplicate-urls.js <path-to-csv-file>');
+    process.exit(1);
+  }
+
+  // Validate file exists and is readable
+  if (!fs.existsSync(csvFilePath)) {
+    console.error(`Error: File not found: ${csvFilePath}`);
+    process.exit(1);
+  }
+
+  const urlMap = new Map(); // url -> [memberId1, memberId2, ...]
+  let totalMembers = 0;
+  let rowNumber = 0;
+  let headersValidated = false;
+  let headers = null;
+  let urlColumnName = null;
+  let memberIdColumnName = null;
+
+  return new Promise((resolve, reject) => {
+    fs.createReadStream(csvFilePath)
+      .pipe(csv())
+      .on('headers', receivedHeaders => {
+        headers = receivedHeaders;
+        // Validate required columns exist - normalize by removing quotes, trimming, and lowercasing
+        const normalizedHeaders = headers.map(h => {
+          let normalized = String(h).trim();
+          // Remove all quotes (single and double) from the string
+          normalized = normalized.replace(/["']/g, '');
+          return normalized.toLowerCase().trim();
+        });
+
+        // Find the actual column names for url and memberId
+        const urlIndex = normalizedHeaders.indexOf('url');
+        const memberIdIndex = normalizedHeaders.indexOf('memberid');
+
+        if (urlIndex === -1 || memberIdIndex === -1) {
+          console.error('Error: CSV must contain "url" and "memberId" columns (case-insensitive)');
+          console.error(`Found columns: ${headers.join(', ')}`);
+          console.error(`Normalized columns: ${normalizedHeaders.join(', ')}`);
+          process.exit(1);
+        }
+
+        // Store the actual column names (with original casing/quotes)
+        urlColumnName = headers[urlIndex];
+        memberIdColumnName = headers[memberIdIndex];
+        headersValidated = true;
+      })
+      .on('data', row => {
+        // Validate headers on first data row if headers event didn't fire
+        if (!headersValidated) {
+          headers = Object.keys(row);
+          // Normalize by removing quotes, trimming, and lowercasing
+          const normalizedHeaders = headers.map(h => {
+            let normalized = String(h).trim();
+            // Remove all quotes (single and double) from the string
+            normalized = normalized.replace(/["']/g, '');
+            return normalized.toLowerCase().trim();
+          });
+
+          const urlIndex = normalizedHeaders.indexOf('url');
+          const memberIdIndex = normalizedHeaders.indexOf('memberid');
+
+          if (urlIndex === -1 || memberIdIndex === -1) {
+            console.error(
+              'Error: CSV must contain "url" and "memberId" columns (case-insensitive)'
+            );
+            console.error(`Found columns: ${headers.join(', ')}`);
+            console.error(`Normalized columns: ${normalizedHeaders.join(', ')}`);
+            process.exit(1);
+          }
+
+          // Store the actual column names
+          urlColumnName = headers[urlIndex];
+          memberIdColumnName = headers[memberIdIndex];
+          headersValidated = true;
+        }
+
+        rowNumber++;
+        totalMembers++;
+
+        // Get URL and memberId using the actual column names from headers
+        const url = row[urlColumnName];
+        const memberId = row[memberIdColumnName];
+
+        // Skip rows with missing URL or memberId
+        if (!url || !memberId) {
+          console.warn(
+            `Warning: Row ${rowNumber} skipped - missing url or memberId (url: ${url}, memberId: ${memberId})`
+          );
+          return;
+        }
+
+        const trimmedUrl = url.trim();
+        const trimmedMemberId = memberId.trim();
+
+        // Track URL occurrences
+        if (!urlMap.has(trimmedUrl)) {
+          urlMap.set(trimmedUrl, []);
+        }
+        urlMap.get(trimmedUrl).push(trimmedMemberId);
+      })
+      .on('error', error => {
+        console.error('Error reading CSV file:', error.message);
+        reject(error);
+      })
+      .on('end', () => {
+        if (!headersValidated) {
+          console.error('Error: Could not read CSV headers');
+          process.exit(1);
+        }
+
+        // Find duplicates (URLs with count > 1)
+        const duplicateUrls = [];
+        let totalDuplicates = 0;
+
+        for (const [url, memberIds] of urlMap.entries()) {
+          if (memberIds.length > 1) {
+            duplicateUrls.push({
+              url: url,
+              count: memberIds.length,
+              memberIds: memberIds,
+            });
+            totalDuplicates += memberIds.length;
+          }
+        }
+
+        // Sort by count (descending) then by URL (ascending)
+        duplicateUrls.sort((a, b) => {
+          if (b.count !== a.count) {
+            return b.count - a.count;
+          }
+          return a.url.localeCompare(b.url);
+        });
+
+        const totalUniqueUrls = urlMap.size;
+        const uniqueDuplicateUrls = duplicateUrls.length;
+
+        // Create a simple list of duplicated URLs (just the URL strings)
+        const duplicatedUrlsList = duplicateUrls.map(item => item.url);
+
+        // Generate report
+        const report = {
+          totalMembers: totalMembers,
+          totalUniqueUrls: totalUniqueUrls,
+          duplicateUrls: duplicateUrls,
+          duplicatedUrlsList: duplicatedUrlsList,
+          summary: {
+            totalDuplicates: totalDuplicates,
+            uniqueDuplicateUrls: uniqueDuplicateUrls,
+          },
+        };
+
+        // Generate output filename
+        const csvDir = path.dirname(csvFilePath);
+        const csvBasename = path.basename(csvFilePath, path.extname(csvFilePath));
+        const outputPath = path.join(csvDir, `${csvBasename}-duplicate-urls-report.json`);
+
+        // Write JSON report
+        fs.writeFileSync(outputPath, JSON.stringify(report, null, 2), 'utf8');
+
+        console.log('\n=== Duplicate URL Report ===');
+        console.log(`Total members processed: ${totalMembers}`);
+        console.log(`Total unique URLs: ${totalUniqueUrls}`);
+        console.log(`Unique URLs with duplicates: ${uniqueDuplicateUrls}`);
+        console.log(`Total duplicate entries: ${totalDuplicates}`);
+        console.log(`\nReport saved to: ${outputPath}`);
+        console.log(`\nTop 10 most duplicated URLs:`);
+        duplicateUrls.slice(0, 10).forEach((item, index) => {
+          console.log(
+            `  ${index + 1}. "${item.url}" - appears ${item.count} times (memberIds: ${item.memberIds.join(', ')})`
+          );
+        });
+
+        resolve(report);
+      });
+  });
+}
+
+// Run if executed directly
+if (require.main === module) {
+  const csvFilePath = process.argv[2];
+  findDuplicateUrls(csvFilePath).catch(error => {
+    console.error('Fatal error:', error.message);
+    process.exit(1);
+  });
+}
+
+module.exports = { findDuplicateUrls };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "1.1.83",
+  "version": "1.1.85",
   "main": "index.js",
   "scripts": {
     "check-cycles": "madge --circular .",
@@ -9,7 +9,8 @@
     "lint:fix": "eslint . --fix",
     "format": "prettier --write \"**/*.{js,json,md}\"",
     "format:check": "prettier --check \"**/*.{js,json,md}\"",
-    "prepare": "husky"
+    "prepare": "husky",
+    "find-duplicates": "node dev-only-scripts/find-duplicate-urls.js"
   },
   "author": "",
   "license": "ISC",
@@ -30,7 +31,7 @@
   "dependencies": {
     "@wix/automations": "^1.0.261",
     "@wix/crm": "^1.0.1061",
-    "@wix/data": "^1.0.303",
+    "@wix/data": "^1.0.349",
     "@wix/essentials": "^0.1.28",
     "@wix/identity": "^1.0.178",
     "@wix/media": "^1.0.213",
@@ -46,6 +47,7 @@
     "crypto": "^1.0.1",
     "jwt-js-decode": "^1.9.0",
     "lodash": "^4.17.21",
+    "csv-parser": "^3.0.0",
     "ngeohash": "^0.6.3",
     "phone": "^3.1.67",
     "psdev-task-manager": "1.1.7",

package/pages/Profile.js

@@ -52,16 +52,16 @@ async function profileOnReady({ $w: _$w }) {
         profileData.mainAddress
       );
     } else {
-      collapseElements(['#locationContainer', '#location1Container', '#locationContainer2']);
+      deleteElements(['#locationContainer', '#location1Container', '#locationContainer2']);
     }
 
     setupAdditionalAddresses();
   }
 
   function setupAdditionalAddresses() {
-    _$w('#moreAdressesRepeater').data = profileData.processedAddresses;
+    _$w('#moreAdressesRepeater').data = profileData.moreAddressesToDisplay;
 
-    if (profileData.processedAddresses.length > 0) {
+    if (profileData.moreAddressesToDisplay.length > 0) {
       _$w('#moreLocationButton').expand();
       _$w('#addressTitle').collapse();
     }
@@ -98,7 +98,7 @@ async function profileOnReady({ $w: _$w }) {
     if (profileData.memberSince) {
       _$w('#sinceYearText').text = profileData.memberSince;
     } else {
-      _$w('#memberSinceBox').collapse();
+      _$w('#memberSinceBox').delete();
     }
   }
 
@@ -106,7 +106,7 @@ async function profileOnReady({ $w: _$w }) {
     if (profileData.shouldHaveStudentBadge) {
       _$w('#studentContainer, #studentContainerMobile').expand();
     } else {
-      _$w('#studentContainer, #studentContainerMobile').collapse();
+      _$w('#studentContainer, #studentContainerMobile').delete();
     }
   }
 
@@ -114,7 +114,7 @@ async function profileOnReady({ $w: _$w }) {
     if (profileData.logoImage) {
       _$w('#logoImage').src = profileData.logoImage;
     } else {
-      _$w('#logoImage').collapse();
+      _$w('#logoImage').delete();
     }
 
     if (profileData.profileImage) {
@@ -131,7 +131,7 @@ async function profileOnReady({ $w: _$w }) {
         profileData.fullName
       );
     } else {
-      collapseElements(['#fullNameText', '#fullNameText2', '#fullNameTextFoter']);
+      deleteElements(['#fullNameText', '#fullNameText2', '#fullNameTextFoter']);
     }
   }
 
@@ -149,7 +149,7 @@ async function profileOnReady({ $w: _$w }) {
         wixWindow.openLightbox(LIGHTBOX_NAMES.CONTACT_US, profileData)
       );
     } else {
-      _$w('#contactButton').collapse();
+      _$w('#contactButton').delete();
     }
   }
 
@@ -157,7 +157,7 @@ async function profileOnReady({ $w: _$w }) {
     if (profileData.bookingUrl) {
       _$w('#bookNowButton').link = profileData.bookingUrl;
     } else {
-      _$w('#bookNowButton').collapse();
+      _$w('#bookNowButton').delete();
     }
   }
 
@@ -172,7 +172,7 @@ async function profileOnReady({ $w: _$w }) {
       _$w('#phoneText').html = getPhoneHTML(_$w('#phoneText'));
       _$w('#phoneText2').html = getPhoneHTML(_$w('#phoneText2'));
     } else {
-      collapseElements(['#phoneContainer', '#phoneContainer2']);
+      deleteElements(['#phoneContainer', '#phoneContainer2']);
     }
   }
 
@@ -180,7 +180,7 @@ async function profileOnReady({ $w: _$w }) {
     if (profileData.licenceNo) {
       _$w('#licenceNoText').text = profileData.licenceNo;
     } else {
-      _$w('#licensesContainer').collapse();
+      _$w('#licensesContainer').delete();
     }
   }
 
@@ -194,7 +194,7 @@ async function profileOnReady({ $w: _$w }) {
     if (profileData.aboutService) {
       _$w('#aboutYouText').html = profileData.aboutService;
     } else {
-      _$w('#aboutSection').collapse();
+      _$w('#aboutSection').delete();
     }
   }
 
@@ -203,7 +203,7 @@ async function profileOnReady({ $w: _$w }) {
       _$w('#businessName').text = profileData.businessName;
       _$w('#businessName').expand();
     } else {
-      _$w('#businessName').collapse();
+      _$w('#businessName').delete();
     }
   }
 
@@ -213,13 +213,13 @@ async function profileOnReady({ $w: _$w }) {
     if (areasText) {
       _$w('#areaOfPracticesText').text = areasText;
     } else {
-      _$w('#areaOfPracticesText').collapse();
+      _$w('#areaOfPracticesText').delete();
     }
 
     if (Array.isArray(profileData.areasOfPractices) && profileData.areasOfPractices.length > 0) {
       populateRepeater(profileData.areasOfPractices, '#areaOfPracticesRepeater', '#practiceText');
     } else {
-      _$w('#servicesSection').collapse();
+      _$w('#servicesSection').delete();
     }
   }
 
@@ -229,16 +229,16 @@ async function profileOnReady({ $w: _$w }) {
     }
 
     if (!profileData.gallery?.length) {
-      _$w('#gallerySection').collapse();
+      _$w('#gallerySection').delete();
     } else {
       _$w('#gallery').items = profileData.gallery;
-      _$w('#gallerySection').expand();
+      _$w('#gallerySection').restore();
     }
   }
 
   function bindTestimonialsData() {
     if (!profileData.testimonials?.length) {
-      _$w('#testimonialsSection').collapse();
+      _$w('#testimonialsSection').delete();
     }
   }
 
@@ -267,7 +267,7 @@ async function profileOnReady({ $w: _$w }) {
       setupTestimonialsPagination(profileData.testimonials);
       _$w('#testimonialsSection').expand();
     } else {
-      _$w('#testimonialsSection').collapse();
+      _$w('#testimonialsSection').delete();
     }
   }
 
@@ -283,9 +283,9 @@ async function profileOnReady({ $w: _$w }) {
     });
   }
 
-  function collapseElements(elementIds) {
+  function deleteElements(elementIds) {
     elementIds.forEach(id => {
-      _$w(id).collapse();
+      _$w(id).delete();
     });
   }
 

package/pages/personalDetails.js

@@ -1106,6 +1106,7 @@ async function personalDetailsOnReady({
         });
         _$w('#profileLink').text = newProfileLink;
         _$w('#profileLink').link = newProfileLink;
+        _$w('#urlWebsiteText').text = newProfileLink;
 
         _$w(SLUG_FLAGS.VALID).collapse();
         _$w(SLUG_FLAGS.INVALID).collapse();
@@ -1858,8 +1859,15 @@ async function personalDetailsOnReady({
         itemMemberObj.toShowPhone = null;
       }
 
+      if (itemMemberObj.phones) {
+        itemMemberObj.phones = itemMemberObj.phones.filter(
+          phone => phone !== phoneToRemove.phoneNumber
+        );
+      }
+
       const updatedData = currentData.filter(item => item._id !== phoneId);
       renderPhonesList(updatedData);
+      checkFormChanges(FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING);
     }
   }