abmp-npm 2.0.14 → 2.0.16

package/backend/cms-data-methods.js

@@ -8,6 +8,7 @@ const {
   GEO_HASH_PRECISION,
   MAX__MEMBERS_SEARCH_RESULTS,
   WIX_QUERY_MAX_LIMIT,
+  MEMBERSHIPS_TYPES,
 } = require('./consts.js');
 const { wixData } = require('./elevated-modules');
 
@@ -31,6 +32,7 @@ function buildMembersSearchQuery(data) {
         .query(COLLECTIONS.MEMBERS_DATA)
         .ne('optOut', true)
         .ne('action', 'drop')
+        .ne('memberships.membertype', MEMBERSHIPS_TYPES.PAC_STAFF)
         .eq('isVisible', true);
       let filterConfig = [
         {
@@ -105,7 +107,7 @@ function buildMembersSearchQuery(data) {
         query = query.contains('fullName', filter.searchText);
       }
       if (!includeStudents) {
-        query = query.ne('memberships.membertype', 'Student');
+        query = query.ne('memberships.membertype', MEMBERSHIPS_TYPES.STUDENT);
       }
       return query;
     },

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

@@ -4,7 +4,7 @@ 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,
@@ -477,6 +477,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 +541,5 @@ module.exports = {
   getQAUsers,
   getSiteMemberId,
   checkUrlUniqueness,
+  trackButtonClick,
 };

package/backend/tasks/url-migration-methods.js

@@ -9,7 +9,8 @@ const { queryAllItems, chunkArray } = require('../utils');
 const { TASKS_NAMES } = require('./consts');
 
 const COLLECTION_WITH_URLS = 'MembersDataWithUrls';
-const CHUNK_SIZE = 5000; // 5k members per task
+const CHUNK_SIZE = 5000; // 5k members per task for migration
+const GENERATION_CHUNK_SIZE = 1000; // 1k members per task for URL generation
 
 /**
  * Step 1: Migrate existing URLs from backup collection
@@ -201,7 +202,7 @@ async function scheduleGenerateMissingUrls() {
       };
     }
 
-    const chunks = chunkArray(membersToUpdate, CHUNK_SIZE);
+    const chunks = chunkArray(membersToUpdate, GENERATION_CHUNK_SIZE);
 
     for (let i = 0; i < chunks.length; i++) {
       const chunk = chunks[i];
@@ -255,11 +256,25 @@ async function generateUrlsChunk(data) {
   };
 
   try {
-    // Fetch all members at once using hasSome
-    console.log(`Fetching ${memberIds.length} members from database...`);
-    const members = await queryAllItems(
-      wixData.query(COLLECTIONS.MEMBERS_DATA).hasSome('_id', memberIds)
+    // Fetch members in smaller batches to avoid cursor size limits
+    // hasSome with too many IDs creates cursors that exceed Wix's 150KB limit
+    const FETCH_BATCH_SIZE = 200;
+    console.log(
+      `Fetching ${memberIds.length} members from database in batches of ${FETCH_BATCH_SIZE}...`
     );
+
+    const members = [];
+    const idBatches = chunkArray(memberIds, FETCH_BATCH_SIZE);
+
+    for (let i = 0; i < idBatches.length; i++) {
+      const idBatch = idBatches[i];
+      const batchMembers = await queryAllItems(
+        wixData.query(COLLECTIONS.MEMBERS_DATA).hasSome('_id', idBatch)
+      );
+      members.push(...batchMembers);
+      console.log(`Fetched batch ${i + 1}/${idBatches.length}: ${batchMembers.length} members`);
+    }
+
     console.log(`Found ${members.length} members in database`);
 
     // Create a map of _id -> member for quick lookup
@@ -292,7 +307,7 @@ async function generateUrlsChunk(data) {
       try {
         const uniqueUrl = await ensureUniqueUrl({
           url: '',
-          memberId: member._id,
+          memberId: member.memberId,
           fullName: name || '', // Let ensureUniqueUrl handle fallback for empty names
         });
 

package/package.json

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

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/index.js

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

package/pages/personalDetails.js

@@ -1294,6 +1294,7 @@ async function personalDetailsOnReady({
       streetAddress: {
         name: extractStreetName(address.line1),
         number: extractStreetNumber(address.line1),
+        apt: address.line2 || '',
       },
       city: address.city || '',
       subdivision: address.state || '',
@@ -1309,20 +1310,49 @@ async function personalDetailsOnReady({
     if (!addressInputValue) return null;
 
     let line1 = '';
+    let line2 = '';
+
     if (addressInputValue.streetAddress) {
       const number = addressInputValue.streetAddress.number || '';
       const name = addressInputValue.streetAddress.name || '';
       line1 = `${number} ${name}`.trim();
+
+      // Capture apartment/suite/building info from streetAddress.apt (undocumented but exists)
+      if (addressInputValue.streetAddress.apt) {
+        line2 = addressInputValue.streetAddress.apt;
+      }
     }
 
     if (!line1 && addressInputValue.formatted) {
       line1 = addressInputValue.formatted.split(',')[0]?.trim() || '';
     }
 
+    // If line2 is still empty, try to extract building/suite info from formatted address
+    if (!line2 && addressInputValue.formatted) {
+      const formattedParts = addressInputValue.formatted.split(',').map(part => part.trim());
+      // Look for BLDG/STE/APT/UNIT/SUITE info in the formatted parts
+      for (let i = 1; i < formattedParts.length; i++) {
+        const part = formattedParts[i];
+        const lowerPart = part.toLowerCase();
+        if (
+          lowerPart.includes('bldg') ||
+          lowerPart.includes('ste') ||
+          lowerPart.includes('apt') ||
+          lowerPart.includes('unit') ||
+          lowerPart.includes('suite') ||
+          lowerPart.includes('#') ||
+          lowerPart.includes('building')
+        ) {
+          line2 = part;
+          break;
+        }
+      }
+    }
+
     return {
       key: existingAddress?.key || generateId(),
       line1,
-      line2: existingAddress?.line2 || '',
+      line2: line2 || existingAddress?.line2 || '',
       city: addressInputValue.city || '',
       state: addressInputValue.subdivision || '',
       postalcode: addressInputValue.postalCode || '',
@@ -1705,6 +1735,7 @@ async function personalDetailsOnReady({
     const parts = [];
 
     if (addr.line1) parts.push(addr.line1);
+    if (addr.line2) parts.push(addr.line2); // Include building/suite info
     if (addr.city) parts.push(addr.city);
     if (addr.state && addr.postalcode) {
       parts.push(`${addr.state} ${addr.postalcode}`);

package/public/Utils/sharedUtils.js

@@ -91,7 +91,7 @@ function formatAddress(item) {
   const limitedPostalCode = item.postalcode.slice(0, 5); //show only 5 digits to not show full user address
   switch (item.addressStatus) {
     case ADDRESS_STATUS_TYPES.FULL_ADDRESS:
-      addressParts = [item.line1, item.city, item.state, limitedPostalCode];
+      addressParts = [item.line1, item.line2, item.city, item.state, limitedPostalCode];
       break;
     case ADDRESS_STATUS_TYPES.STATE_CITY_ZIP:
       addressParts = [item.city, item.state, limitedPostalCode];

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',
 };
 
 /**