abmp-npm 2.0.44 → 2.0.46

package/backend/jobs.js

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

package/backend/members-data-methods.js

@@ -410,6 +410,7 @@ async function getMembersWithWixUrl() {
     .eq('showWixUrl', true)
     .ne('action', MEMBER_ACTIONS.DROP)
     .ne('memberships.membertype', MEMBERSHIPS_TYPES.PAC_STAFF)
+    .ne('memberships.membertype', MEMBERSHIPS_TYPES.STUDENT)
     .isNotEmpty('url')
     .limit(1000);
   let currentResults = await membersQuery.find();

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/package.json

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

package/pages/Home.js

@@ -366,7 +366,7 @@ const homePageOnReady = async ({
       isSearchingNearby: _$w('#nearBy').checked,
       preservePagination,
     });
-    !preservePagination && (await updateUrlParams(filter, pagination));
+    // URL is updated inside search() with the filter actually used (avoids rapid select/deselect overwriting with live filter)
     return searchResults;
   }
 

package/pages/LoadingPage.js

@@ -1,6 +1,8 @@
+const { location: wixLocationFrontend } = require('@wix/site-location');
+const { local } = require('@wix/site-storage');
 const { window: wixWindow, rendering } = require('@wix/site-window');
 
-const { LIGHTBOX_NAMES } = require('../public/consts');
+const { LIGHTBOX_NAMES, PAGES_PATHS } = require('../public/consts');
 const { checkAndLogin } = require('../public/sso-auth-methods');
 
 async function loadingPageOnReady(authenticateSSOToken) {
@@ -8,9 +10,16 @@ async function loadingPageOnReady(authenticateSSOToken) {
   //This calls needs to triggered on client side, otherwise PAC API will return 401 error
   if (renderingEnv === 'browser') {
     //Need to pass authenticateSSOToken to checkAndLogin so it will run as a web method not a public one.
-    await checkAndLogin(authenticateSSOToken).catch(error => {
-      wixWindow.openLightbox(LIGHTBOX_NAMES.LOGIN_ERROR_ALERT);
+    await checkAndLogin(authenticateSSOToken).catch(async error => {
       console.error(`Something went wrong while logging in: ${error}`);
+      // If we already have a session (memberId), redirect to form instead of showing error.
+      const storedMemberId = await local.getItem('memberId');
+      if (storedMemberId) {
+        const redirectTo = `${PAGES_PATHS.MEMBERS_FORM}?token=${encodeURIComponent(storedMemberId)}`;
+        await wixLocationFrontend.to(`/${redirectTo}`);
+        return;
+      }
+      wixWindow.openLightbox(LIGHTBOX_NAMES.LOGIN_ERROR_ALERT);
     });
   }
 }

package/pages/personalDetails.js

@@ -1556,9 +1556,23 @@ async function personalDetailsOnReady({
       _$w('#mainAddressCheckbox').checked = false;
       checkbox.checked = true;
 
+      // Primary address cannot be hidden: update model and repeater data so UI and save stay in sync
       if (clickedItemData.address.addressStatus === ADDRESS_STATUS_TYPES.DONT_SHOW) {
         updateAddressStatus(clickedItemData._id, ADDRESS_STATUS_TYPES.STATE_CITY_ZIP);
         $item('#addressStatusOptions').value = ADDRESS_STATUS_TYPES.STATE_CITY_ZIP;
+        const currentData = _$w('#addressesList').data || [];
+        const dataWithStatusFixed = currentData.map(item =>
+          item._id === clickedItemData._id
+            ? {
+                ...item,
+                address: {
+                  ...item.address,
+                  addressStatus: ADDRESS_STATUS_TYPES.STATE_CITY_ZIP,
+                },
+              }
+            : item
+        );
+        _$w('#addressesList').data = dataWithStatusFixed;
       }
 
       updateMainAddressSelection(clickedItemData._id);
@@ -1567,7 +1581,7 @@ async function personalDetailsOnReady({
     });
 
     _$w('#addressStatusOptions').onChange(event => {
-      const data = _$w('#addressesList').data;
+      const data = _$w('#addressesList').data || [];
       const clickedItemData = data.find(item => item._id === event.context.itemId);
       const newStatus = event.target.value;
       const $item = _$w.at(event.context);
@@ -1579,6 +1593,15 @@ async function personalDetailsOnReady({
       }
 
       updateAddressStatus(clickedItemData._id, newStatus);
+
+      // Keep repeater data in sync (required for new addresses not yet in itemMemberObj.addresses)
+      const updatedData = data.map(item =>
+        item._id === clickedItemData._id
+          ? { ...item, address: { ...item.address, addressStatus: newStatus } }
+          : item
+      );
+      _$w('#addressesList').data = updatedData;
+
       checkFormChanges(FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING);
     });
 

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`),
@@ -655,13 +668,14 @@ const createHomepageUtils = (_$w, filterProfiles) => {
   async function search({
     filter,
     pagination,
-    debounceTimeout,
+    debounceTimeout: _debounceTimeout,
     timeoutType,
     isSearchingNearby,
     preservePagination = false,
   }) {
     const multiStateBoxSelector = _$w('#resultsStateBox');
     const renderingEnv = await rendering.env();
+
     const initSearchResultsUI = () => {
       JSON.stringify(filter) === JSON.stringify(DEFAULT_FILTER)
         ? _$w('#resetFilter').hide()
@@ -672,70 +686,115 @@ 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)
         ) {
           multiStateBoxSelector.changeState('noSearchCriteria');
+          await updateUrlParams(filterToUse, pagination);
           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');
+        await updateUrlParams(filterToUse, pagination);
         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');
+        await updateUrlParams(filterToUse, pagination);
         return [];
       }
       console.log({ response });
       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);
       paginateSearchResults(response.items, pagination);
       multiStateBoxSelector.changeState('resultsState');
+      await updateUrlParams(filterToUse, pagination);
       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 {

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(', ');
 }