abmp-npm 10.0.53 → 10.0.55

package/backend/members-data-methods.js

@@ -410,7 +410,8 @@ async function getMembersWithWixUrl() {
     .eq('showWixUrl', true)
     .ne('action', MEMBER_ACTIONS.DROP)
     .ne('memberships.membertype', MEMBERSHIPS_TYPES.PAC_STAFF)
-    .isNotEmpty('url')
+    .ne('memberships.membertype', MEMBERSHIPS_TYPES.STUDENT)
+    //.isNotEmpty('url') - not used because it's not working as expected
     .limit(1000);
   let currentResults = await membersQuery.find();
   let i = 0;
@@ -422,7 +423,9 @@ async function getMembersWithWixUrl() {
     i++;
   }
   console.log('i is ', i);
-  const filtered = allItems.filter(item => typeof item.url === 'string' && !item.url.includes('/'));
+  const filtered = allItems.filter(
+    item => typeof item.url === 'string' && !item.url.includes('/') && item.url !== ''
+  );
   console.log('filtered is ', filtered.length);
   return filtered;
 }

package/backend/routers/methods.js

@@ -47,10 +47,12 @@ const createRoutersHandlers = wixRouterMethods => {
         }
         const profileUrl = `${request.baseUrl}/${PAGES_PATHS.PROFILE}/${profileData.url}`;
         const isPrivateMember = profileData.isPrivateMember;
+        const isStudent = profileData.shouldHaveStudentBadge;
+        const shouldNoIndex = isPrivateMember || isStudent;
         const seoData = {
           title: seoTitle,
           description: description,
-          noIndex: isPrivateMember,
+          noIndex: shouldNoIndex,
           metaTags: [
             {
               name: 'description',
@@ -69,7 +71,7 @@ const createRoutersHandlers = wixRouterMethods => {
             },
             {
               name: 'robots',
-              content: isPrivateMember ? 'noindex, nofollow' : 'index, follow',
+              content: shouldNoIndex ? 'noindex, nofollow' : 'index, follow',
             },
             // Open Graph tags
             {

package/backend/tasks/address-primary-methods.js

@@ -32,7 +32,7 @@ async function scheduleFixPrimaryAddressForMembers() {
 
     const membersToFix = members.filter(member => {
       const addresses = Array.isArray(member.addresses) ? member.addresses : [];
-      if (addresses.length <= 1) {
+      if (addresses.length === 0) {
         return false;
       }
       return !hasPrimaryAddress(member.addressDisplayOption);
@@ -45,7 +45,7 @@ async function scheduleFixPrimaryAddressForMembers() {
           .filter(memberId => Number.isFinite(memberId) && memberId > 0)
       ),
     ];
-    console.log(`Members with multiple addresses and no primary: ${memberIds.length}`);
+    console.log(`Members with addresses and no primary: ${memberIds.length}`);
 
     if (memberIds.length === 0) {
       console.log('No members need primary address fixes');
@@ -109,7 +109,7 @@ async function fixPrimaryAddressChunk(data) {
     skippedIds: [],
     failedIds: [],
   };
-  const skippedNoMultiAddress = [];
+  const skippedNoAddress = [];
   const skippedHasPrimary = [];
   const updatedIds = [];
 
@@ -120,11 +120,11 @@ async function fixPrimaryAddressChunk(data) {
 
     members.forEach(member => {
       const addresses = Array.isArray(member.addresses) ? member.addresses : [];
-      if (addresses.length <= 1) {
+      if (addresses.length === 0) {
         result.skipped++;
         result.skippedIds.push(member.memberId);
-        if (skippedNoMultiAddress.length < 20) {
-          skippedNoMultiAddress.push(member.memberId);
+        if (skippedNoAddress.length < 20) {
+          skippedNoAddress.push(member.memberId);
         }
         return;
       }
@@ -191,8 +191,8 @@ async function fixPrimaryAddressChunk(data) {
       });
     }
 
-    if (skippedNoMultiAddress.length > 0) {
-      console.log(`Skipped (<=1 address) sample: ${skippedNoMultiAddress.join(', ')}`);
+    if (skippedNoAddress.length > 0) {
+      console.log(`Skipped (no addresses) sample: ${skippedNoAddress.join(', ')}`);
     }
     if (skippedHasPrimary.length > 0) {
       console.log(`Skipped (already has primary) sample: ${skippedHasPrimary.join(', ')}`);
@@ -205,7 +205,52 @@ async function fixPrimaryAddressChunk(data) {
   }
 }
 
+/**
+ * Returns count of members with addresses but no primary address.
+ */
+async function countMembersMissingPrimaryAddress() {
+  console.log('=== Counting Members Missing Primary Address ===');
+
+  try {
+    const membersQuery = await wixData
+      .query(COLLECTIONS.MEMBERS_DATA)
+      .isNotEmpty('addresses')
+      .limit(1000);
+    const members = await queryAllItems(membersQuery);
+    console.log(`Fetched ${members.length} members with addresses`);
+
+    const membersToFix = members.filter(member => {
+      const addresses = Array.isArray(member.addresses) ? member.addresses : [];
+      if (addresses.length === 0) {
+        return false;
+      }
+      return !hasPrimaryAddress(member.addressDisplayOption);
+    });
+
+    const memberIds = [
+      ...new Set(
+        membersToFix
+          .map(member => Number(member.memberId))
+          .filter(memberId => Number.isFinite(memberId) && memberId > 0)
+      ),
+    ];
+
+    const result = {
+      success: true,
+      totalMembers: memberIds.length,
+      sampleMemberIds: memberIds.slice(0, 20),
+    };
+
+    console.log(JSON.stringify(result, null, 2));
+    return result;
+  } catch (error) {
+    console.error('Error counting members missing primary address:', error);
+    throw error;
+  }
+}
+
 module.exports = {
   scheduleFixPrimaryAddressForMembers,
   fixPrimaryAddressChunk,
+  countMembersMissingPrimaryAddress,
 };

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

@@ -295,7 +295,7 @@ async function getAWSTokens() {
 }
 
 async function generateSitemapXml(members) {
-  const baseUrl = await getSiteBaseUrl();
+  const baseUrl = (await getSiteBaseUrl()).replace(/\/+$/, '');
   const profilePageUrl = `${baseUrl}/${PAGES_PATHS.PROFILE}`;
   const urls = members
     .map(m => {

package/package.json

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

package/pages/personalDetails.js

@@ -358,8 +358,8 @@ async function personalDetailsOnReady({
   }
 
   function handleOptWebsiteCheckboxEnable(showExistingWebsite) {
-    _$w('#optWebsiteCheckbox').checked = !showExistingWebsite;
     if (showExistingWebsite) {
+      _$w('#optWebsiteCheckbox').checked = false;
       _$w('#optWebsiteCheckbox').customClassList.add('disabled-text');
       _$w('#optWebsiteCheckbox').customClassList.add('disabled-checkbox');
       _$w('#optWebsiteCheckbox').disable();

package/public/Utils/sharedUtils.js

@@ -87,9 +87,11 @@ function findMainAddress(addressDisplayOption = [], addresses = []) {
   return '';
 }
 function formatAddress(item) {
+  if (!item) return '';
   let addressParts = [];
-  const limitedPostalCode = item.postalcode.slice(0, 5); //show only 5 digits to not show full user address
-  switch (item.addressStatus) {
+  const limitedPostalCode = (item.postalcode && String(item.postalcode).slice(0, 5)) || ''; //show only 5 digits to not show full user address
+  const status = item.addressStatus;
+  switch (status) {
     case ADDRESS_STATUS_TYPES.FULL_ADDRESS:
       addressParts = [item.line1, item.line2, item.city, item.state, limitedPostalCode];
       break;
@@ -97,7 +99,10 @@ function formatAddress(item) {
       addressParts = [item.city, item.state, limitedPostalCode];
       break;
     default:
-      return '';
+      if (status === ADDRESS_STATUS_TYPES.DONT_SHOW) return '';
+      // Legacy addresses may have no addressStatus; show city/state/zip by default
+      addressParts = [item.city, item.state, limitedPostalCode];
+      break;
   }
   return addressParts.filter(Boolean).join(', ');
 }