abmp-npm 10.0.50 → 10.0.52

package/backend/jobs.js

@@ -82,20 +82,6 @@ async function scheduleFixPrimaryAddressForMembersTask() {
   }
 }
 
-async function scheduleFixPrimaryAddressVisibilityForMembersTask() {
-  try {
-    console.log('scheduleFixPrimaryAddressVisibilityForMembers started!');
-    return await taskManager().schedule({
-      name: TASKS_NAMES.scheduleFixPrimaryAddressVisibilityForMembers,
-      data: {},
-      type: 'scheduled',
-    });
-  } catch (error) {
-    console.error(`Failed to scheduleFixPrimaryAddressVisibilityForMembers: ${error.message}`);
-    throw new Error(`Failed to scheduleFixPrimaryAddressVisibilityForMembers: ${error.message}`);
-  }
-}
-
 async function updateSiteMapS3() {
   try {
     return await taskManager().schedule({
@@ -114,5 +100,4 @@ module.exports = {
   updateSiteMapS3,
   scheduleCreateContactsFromMembersTask,
   scheduleFixPrimaryAddressForMembersTask,
-  scheduleFixPrimaryAddressVisibilityForMembersTask,
 };

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

@@ -1,6 +1,6 @@
 const { taskManager } = require('psdev-task-manager');
 
-const { COLLECTIONS, ADDRESS_STATUS_TYPES } = require('../../public/consts');
+const { COLLECTIONS } = require('../../public/consts');
 const { wixData } = require('../elevated-modules');
 const { bulkSaveMembers, getMembersByIds } = require('../members-data-methods');
 const { chunkArray, queryAllItems } = require('../utils');
@@ -16,22 +16,6 @@ const hasPrimaryAddress = addressDisplayOption =>
   Array.isArray(addressDisplayOption) &&
   addressDisplayOption.some(option => option?.isMain === true);
 
-const getPrimaryAddressKey = addressDisplayOption =>
-  Array.isArray(addressDisplayOption)
-    ? addressDisplayOption.find(option => option?.isMain === true)?.key
-    : null;
-
-const needsPrimaryAddressVisibilityFix = (address, index) => {
-  if (!address) {
-    return false;
-  }
-  const status = address?.addressStatus;
-  if (index === 0 && status === ADDRESS_STATUS_TYPES.DONT_SHOW) {
-    return true;
-  }
-  return !status || status === ADDRESS_STATUS_TYPES.DONT_SHOW;
-};
-
 /**
  * Schedules tasks to fix members with multiple addresses and no primary address.
  */
@@ -221,204 +205,7 @@ async function fixPrimaryAddressChunk(data) {
   }
 }
 
-/**
- * Schedules tasks to fix primary address visibility when missing or DONT_SHOW.
- */
-async function scheduleFixPrimaryAddressVisibilityForMembers() {
-  console.log('=== Scheduling Fix Primary Address Visibility Tasks ===');
-
-  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;
-      }
-      const primaryKey = getPrimaryAddressKey(member.addressDisplayOption);
-      if (!primaryKey) {
-        return false;
-      }
-      const addressIndex = addresses.findIndex(address => getAddressKey(address, 0) === primaryKey);
-      if (addressIndex === -1) {
-        return false;
-      }
-      return needsPrimaryAddressVisibilityFix(addresses[addressIndex], addressIndex);
-    });
-
-    const memberIds = [
-      ...new Set(
-        membersToFix
-          .map(member => Number(member.memberId))
-          .filter(memberId => Number.isFinite(memberId) && memberId > 0)
-      ),
-    ];
-    console.log(`Members with primary address visibility issues: ${memberIds.length}`);
-
-    if (memberIds.length === 0) {
-      console.log('No members need primary address visibility fixes');
-      return {
-        success: true,
-        message: 'No members need primary address visibility fixes',
-        totalMembers: 0,
-        tasksScheduled: 0,
-      };
-    }
-
-    const chunks = chunkArray(memberIds, CHUNK_SIZE);
-    for (let i = 0; i < chunks.length; i++) {
-      const chunk = chunks[i];
-      const task = {
-        name: TASKS_NAMES.fixPrimaryAddressVisibilityChunk,
-        data: {
-          memberIds: chunk,
-          chunkIndex: i,
-          totalChunks: chunks.length,
-        },
-        type: 'scheduled',
-      };
-      await taskManager().schedule(task);
-      console.log(`Scheduled task ${i + 1}/${chunks.length} (${chunk.length} members)`);
-    }
-
-    const result = {
-      success: true,
-      message: `Scheduled ${chunks.length} tasks for ${memberIds.length} members`,
-      totalMembers: memberIds.length,
-      tasksScheduled: chunks.length,
-    };
-
-    console.log('=== Scheduling Complete ===');
-    console.log(`Sample memberIds: ${memberIds.slice(0, 10).join(', ')}`);
-    console.log(JSON.stringify(result, null, 2));
-
-    return result;
-  } catch (error) {
-    console.error('Error scheduling primary address visibility fix:', error);
-    throw error;
-  }
-}
-
-/**
- * Processes a chunk of members and fixes primary address visibility when missing or DONT_SHOW.
- */
-async function fixPrimaryAddressVisibilityChunk(data) {
-  const { memberIds, chunkIndex, totalChunks } = data;
-  console.log(
-    `Processing primary address visibility chunk ${chunkIndex + 1}/${totalChunks} (${memberIds.length} members)`
-  );
-
-  const result = {
-    successful: 0,
-    failed: 0,
-    skipped: 0,
-    errors: [],
-    skippedIds: [],
-    failedIds: [],
-  };
-  const skippedNoPrimary = [];
-  const skippedNoAddressMatch = [];
-  const updatedIds = [];
-
-  try {
-    const members = await getMembersByIds(memberIds);
-    console.log(`Loaded ${members.length} members for this chunk`);
-    const membersToUpdate = [];
-
-    members.forEach(member => {
-      const addresses = Array.isArray(member.addresses) ? member.addresses : [];
-      const primaryKey = getPrimaryAddressKey(member.addressDisplayOption);
-      if (!primaryKey) {
-        result.skipped++;
-        result.skippedIds.push(member.memberId);
-        if (skippedNoPrimary.length < 20) {
-          skippedNoPrimary.push(member.memberId);
-        }
-        return;
-      }
-
-      const addressIndex = addresses.findIndex(address => getAddressKey(address, 0) === primaryKey);
-      if (addressIndex === -1) {
-        result.skipped++;
-        result.skippedIds.push(member.memberId);
-        if (skippedNoAddressMatch.length < 20) {
-          skippedNoAddressMatch.push(member.memberId);
-        }
-        return;
-      }
-
-      const targetAddress = addresses[addressIndex];
-      if (!needsPrimaryAddressVisibilityFix(targetAddress, addressIndex)) {
-        result.skipped++;
-        result.skippedIds.push(member.memberId);
-        return;
-      }
-
-      const updatedAddresses = addresses.map((address, index) => {
-        if (index !== addressIndex) {
-          return address;
-        }
-        return {
-          ...address,
-          addressStatus: ADDRESS_STATUS_TYPES.STATE_CITY_ZIP,
-        };
-      });
-
-      membersToUpdate.push({
-        ...member,
-        addresses: updatedAddresses,
-      });
-      if (updatedIds.length < 20) {
-        updatedIds.push(member.memberId);
-      }
-    });
-
-    if (membersToUpdate.length === 0) {
-      console.log('No members need updating in this batch');
-      return result;
-    }
-
-    try {
-      await bulkSaveMembers(membersToUpdate);
-      result.successful += membersToUpdate.length;
-      console.log(`✅ Successfully updated ${membersToUpdate.length} members`);
-      if (updatedIds.length > 0) {
-        console.log(`Updated memberIds (sample): ${updatedIds.join(', ')}`);
-      }
-    } catch (error) {
-      console.error('❌ Error bulk saving members:', error);
-      result.failed += membersToUpdate.length;
-      result.failedIds.push(...membersToUpdate.map(member => member.memberId));
-      result.errors.push({
-        error: error.message,
-        memberCount: membersToUpdate.length,
-      });
-    }
-
-    if (skippedNoPrimary.length > 0) {
-      console.log(`Skipped (no primary address) sample: ${skippedNoPrimary.join(', ')}`);
-    }
-    if (skippedNoAddressMatch.length > 0) {
-      console.log(
-        `Skipped (primary address not found) sample: ${skippedNoAddressMatch.join(', ')}`
-      );
-    }
-
-    return result;
-  } catch (error) {
-    console.error(`Error processing primary address visibility chunk ${chunkIndex}:`, error);
-    throw error;
-  }
-}
-
 module.exports = {
   scheduleFixPrimaryAddressForMembers,
   fixPrimaryAddressChunk,
-  scheduleFixPrimaryAddressVisibilityForMembers,
-  fixPrimaryAddressVisibilityChunk,
 };

package/backend/tasks/consts.js

@@ -20,8 +20,6 @@ const TASKS_NAMES = {
   createContactsFromMembers: 'createContactsFromMembers',
   scheduleFixPrimaryAddressForMembers: 'scheduleFixPrimaryAddressForMembers',
   fixPrimaryAddressChunk: 'fixPrimaryAddressChunk',
-  scheduleFixPrimaryAddressVisibilityForMembers: 'scheduleFixPrimaryAddressVisibilityForMembers',
-  fixPrimaryAddressVisibilityChunk: 'fixPrimaryAddressVisibilityChunk',
 };
 
 module.exports = {

package/backend/tasks/tasks-configs.js

@@ -7,8 +7,6 @@ const {
 const {
   scheduleFixPrimaryAddressForMembers,
   fixPrimaryAddressChunk,
-  scheduleFixPrimaryAddressVisibilityForMembers,
-  fixPrimaryAddressVisibilityChunk,
 } = require('./address-primary-methods');
 const { TASKS_NAMES } = require('./consts');
 const {
@@ -189,20 +187,6 @@ const TASKS = {
     shouldSkipCheck: () => false,
     estimatedDurationSec: 80,
   },
-  [TASKS_NAMES.scheduleFixPrimaryAddressVisibilityForMembers]: {
-    name: TASKS_NAMES.scheduleFixPrimaryAddressVisibilityForMembers,
-    getIdentifier: () => 'SHOULD_NEVER_SKIP',
-    process: scheduleFixPrimaryAddressVisibilityForMembers,
-    shouldSkipCheck: () => false,
-    estimatedDurationSec: 80,
-  },
-  [TASKS_NAMES.fixPrimaryAddressVisibilityChunk]: {
-    name: TASKS_NAMES.fixPrimaryAddressVisibilityChunk,
-    getIdentifier: task => task.data,
-    process: fixPrimaryAddressVisibilityChunk,
-    shouldSkipCheck: () => false,
-    estimatedDurationSec: 80,
-  },
 };
 
 module.exports = { TASKS };

package/package.json

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

package/public/Utils/homePage.js

@@ -1,11 +1,24 @@
 const { location: wixLocation, queryParams: wixQueryParams } = require('@wix/site-location');
 const { window: wixWindow, rendering } = require('@wix/site-window');
 
-const { DEFAULT_FILTER } = require('../consts.js');
+const { DEFAULT_FILTER, DEBOUNCE_DELAY } = require('../consts.js');
 
-const { debouncedFunction } = require('./sharedUtils.js');
+function generateSearchId() {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
+    const r = (Math.random() * 16) | 0;
+    const v = c === 'x' ? r : (r & 0x3) | 0x8;
+    return v.toString(16);
+  });
+}
 
 const createHomepageUtils = (_$w, filterProfiles) => {
+  let currentSearchId = null;
+  let searchDebounceTimer = null;
+  let lastSearchFilter = null;
+  let lastSearchIsSearchingNearby = false;
+  let lastSearchPreservePagination = false;
+  let pendingSearchResolve = null;
+
   const getFiltersSelectors = filterName => ({
     checkBoxContainerSelector: _$w(`#${filterName}CheckBoxContainer`),
     searchTextInputSelector: _$w(`#${filterName}TextInput`),
@@ -662,6 +675,7 @@ const createHomepageUtils = (_$w, filterProfiles) => {
   }) {
     const multiStateBoxSelector = _$w('#resultsStateBox');
     const renderingEnv = await rendering.env();
+
     const initSearchResultsUI = () => {
       JSON.stringify(filter) === JSON.stringify(DEFAULT_FILTER)
         ? _$w('#resetFilter').hide()
@@ -672,11 +686,12 @@ const createHomepageUtils = (_$w, filterProfiles) => {
       _$w('#profileRepeater').data = [];
       console.log({ filter });
     };
-    const runSearchAndUpdateUI = async (filter, isSearchingNearby) => {
-      if (!isSearchingNearby) {
+
+    const runSearchAndUpdateUI = async (filterToUse, isSearchingNearbyToUse, preservePaginationToUse) => {
+      if (!isSearchingNearbyToUse) {
         if (
           JSON.stringify({
-            ...filter,
+            ...filterToUse,
             latitude: 0,
             longitude: 0,
           }) === JSON.stringify(DEFAULT_FILTER)
@@ -685,38 +700,29 @@ const createHomepageUtils = (_$w, filterProfiles) => {
           return [];
         }
       }
-      const nonDebouncedFilterProfiles = async () => {
-        try {
-          const result = await filterProfiles({ filter, isSearchingNearby });
-          return { success: true, response: result };
-        } catch (error) {
-          return { success: false, error };
-        }
-      };
-      //Don't run setTimeout on SSR
-      const funcPromise =
-        renderingEnv === 'backend'
-          ? () => nonDebouncedFilterProfiles()
-          : () =>
-              debouncedFunction({
-                func: filterProfiles,
-                debounceTimeout,
-                timeoutType,
-                args: { filter, isSearchingNearby },
-              });
-      const { success, response, error } = await funcPromise();
-      if (!success) {
+      const thisSearchId = generateSearchId();
+      currentSearchId = thisSearchId;
+
+      let result;
+      try {
+        result = await filterProfiles({ filter: filterToUse, isSearchingNearby: isSearchingNearbyToUse });
+      } catch (error) {
+        if (thisSearchId !== currentSearchId) return [];
         _$w('#numberOfResults').text = '';
         console.error('[search] failed with error:', error);
         multiStateBoxSelector.changeState('errorState');
         return [];
       }
+
+      if (thisSearchId !== currentSearchId) return [];
+
+      const response = result;
       const totalCount = response.items.length;
       if (!totalCount) {
         _$w('#numberOfResults').text = 'Showing 0 results';
         _$w('#noResultsMessage').text = `${
-          filter.searchText && filter.searchText.length > 0
-            ? `'${filter.searchText}' did not match any search. Please try again.`
+          filterToUse.searchText && filterToUse.searchText.length > 0
+            ? `'${filterToUse.searchText}' did not match any search. Please try again.`
             : 'No results found for the selected filters. Please adjust your filters and try again'
         }`;
         multiStateBoxSelector.changeState('noResultsState');
@@ -726,7 +732,7 @@ const createHomepageUtils = (_$w, filterProfiles) => {
       handleNumberOfResults(pagination, totalCount);
       _$w('#showingResult').show();
 
-      if (!preservePagination || pagination.currentPage >= pagination.totalPages) {
+      if (!preservePaginationToUse || pagination.currentPage >= pagination.totalPages) {
         pagination.currentPage = 0;
       }
       pagination.totalPages = Math.ceil(totalCount / pagination.pageSize);
@@ -734,8 +740,46 @@ const createHomepageUtils = (_$w, filterProfiles) => {
       multiStateBoxSelector.changeState('resultsState');
       return response.items;
     };
+
+    // Always show loading as soon as user changes input
     initSearchResultsUI();
-    return await runSearchAndUpdateUI(filter, isSearchingNearby);
+
+    // SSR: run immediately, no debounce
+    if (renderingEnv === 'backend') {
+      return await runSearchAndUpdateUI(filter, isSearchingNearby, preservePagination);
+    }
+
+    // Client: debounce the API call; loading is already shown above.
+    // Snapshot the filter so rapid clicks / URL sync can't mutate it before the debounced run.
+    lastSearchFilter = JSON.parse(JSON.stringify(filter));
+    lastSearchIsSearchingNearby = isSearchingNearby;
+    lastSearchPreservePagination = preservePagination;
+
+    if (pendingSearchResolve) {
+      pendingSearchResolve([]);
+      pendingSearchResolve = null;
+    }
+
+    if (searchDebounceTimer) {
+      clearTimeout(searchDebounceTimer);
+      searchDebounceTimer = null;
+    }
+
+    const delay = DEBOUNCE_DELAY[timeoutType] ?? 300;
+    return new Promise(resolve => {
+      pendingSearchResolve = resolve;
+      searchDebounceTimer = setTimeout(async () => {
+        searchDebounceTimer = null;
+        const filterToUse = lastSearchFilter;
+        const isSearchingNearbyToUse = lastSearchIsSearchingNearby;
+        const preservePaginationToUse = lastSearchPreservePagination;
+        const items = await runSearchAndUpdateUI(filterToUse, isSearchingNearbyToUse, preservePaginationToUse);
+        if (pendingSearchResolve) {
+          pendingSearchResolve(items);
+          pendingSearchResolve = null;
+        }
+      }, delay);
+    });
   }
 
   return {