abmp-npm 2.0.60 → 2.0.61

package/package.json

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

package/pages/Home.js

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

package/pages/personalDetails.js

@@ -2033,14 +2033,29 @@ async function personalDetailsOnReady({
     });
 
     _$w('#showPhoneCheckbox').onChange(event => {
-      const data = _$w('#phoneNumbersList').data;
+      const data = _$w('#phoneNumbersList').data || [];
       const clickedItemData = data.find(item => item._id === event.context.itemId);
-      const $item = _$w.at(event.context);
+      if (!clickedItemData) {
+        return;
+      }
 
-      _$w('#showPhoneCheckbox').checked = false;
-      $item('#showPhoneCheckbox').checked = true;
+      const isChecked = event.target.checked;
+      let updated;
+      if (isChecked) {
+        updated = data.map(item =>
+          item._id === clickedItemData._id
+            ? { ...item, showPhone: true }
+            : { ...item, showPhone: false }
+        );
+        updateShowPhoneSelection(clickedItemData._id, true);
+      } else {
+        updated = data.map(item =>
+          item._id === clickedItemData._id ? { ...item, showPhone: false } : item
+        );
+        updateShowPhoneSelection(clickedItemData._id, false);
+      }
 
-      updateShowPhoneSelection(clickedItemData._id, event.target.checked);
+      renderPhonesList(updated);
       checkFormChanges(FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING);
     });
 
@@ -2168,12 +2183,19 @@ async function personalDetailsOnReady({
     const currentData = _$w('#phoneNumbersList').data || [];
     const selectedItem = currentData.find(item => item._id === phoneId);
 
-    if (selectedItem && selectedItem.phoneNumber) {
-      if (isVisible) {
-        itemMemberObj.toShowPhone = selectedItem.phoneNumber;
-      } else {
-        itemMemberObj.toShowPhone = null;
-      }
+    if (!selectedItem) {
+      return;
+    }
+
+    if (isVisible) {
+      itemMemberObj.toShowPhone = selectedItem.phoneNumber?.trim()
+        ? selectedItem.phoneNumber
+        : null;
+      return;
+    }
+
+    if (selectedItem.phoneNumber) {
+      itemMemberObj.toShowPhone = null;
     }
   }
 

package/public/Utils/homePage.js

@@ -1,7 +1,12 @@
 const { location: wixLocation, queryParams: wixQueryParams } = require('@wix/site-location');
 const { window: wixWindow, rendering } = require('@wix/site-window');
 
-const { DEFAULT_FILTER, DEBOUNCE_DELAY } = require('../consts.js');
+const { DEFAULT_FILTER } = require('../consts.js');
+
+const { debouncedFunction } = require('./sharedUtils.js');
+
+/** Returned when an in-flight search was superseded; do not apply results to UI */
+const STALE_SEARCH_RESPONSE = Symbol('STALE_SEARCH_RESPONSE');
 
 function generateSearchId() {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
@@ -13,11 +18,23 @@ function generateSearchId() {
 
 const createHomepageUtils = (_$w, filterProfiles) => {
   let currentSearchId = null;
-  let searchDebounceTimer = null;
-  let lastSearchFilter = null;
-  let lastSearchIsSearchingNearby = false;
-  let lastSearchPreservePagination = false;
-  let pendingSearchResolve = null;
+
+  async function fetchProfilesWithSearchId(args) {
+    const thisSearchId = generateSearchId();
+    currentSearchId = thisSearchId;
+    try {
+      const response = await filterProfiles(args);
+      if (thisSearchId !== currentSearchId) {
+        return STALE_SEARCH_RESPONSE;
+      }
+      return response;
+    } catch (error) {
+      if (thisSearchId !== currentSearchId) {
+        return STALE_SEARCH_RESPONSE;
+      }
+      throw error;
+    }
+  }
 
   const getFiltersSelectors = filterName => ({
     checkBoxContainerSelector: _$w(`#${filterName}CheckBoxContainer`),
@@ -668,14 +685,13 @@ 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()
@@ -686,115 +702,76 @@ const createHomepageUtils = (_$w, filterProfiles) => {
       _$w('#profileRepeater').data = [];
       console.log({ filter });
     };
-
-    const runSearchAndUpdateUI = async (
-      filterToUse,
-      isSearchingNearbyToUse,
-      preservePaginationToUse
-    ) => {
-      if (!isSearchingNearbyToUse) {
+    const runSearchAndUpdateUI = async (filter, isSearchingNearby) => {
+      if (!isSearchingNearby) {
         if (
           JSON.stringify({
-            ...filterToUse,
+            ...filter,
             latitude: 0,
             longitude: 0,
           }) === JSON.stringify(DEFAULT_FILTER)
         ) {
           multiStateBoxSelector.changeState('noSearchCriteria');
-          await updateUrlParams(filterToUse, pagination);
           return [];
         }
       }
-      const thisSearchId = generateSearchId();
-      currentSearchId = thisSearchId;
-
-      let result;
-      try {
-        result = await filterProfiles({
-          filter: filterToUse,
-          isSearchingNearby: isSearchingNearbyToUse,
-        });
-      } catch (error) {
-        if (thisSearchId !== currentSearchId) return [];
+      const nonDebouncedFilterProfiles = async () => {
+        try {
+          const result = await fetchProfilesWithSearchId({ filter, isSearchingNearby });
+          if (result === STALE_SEARCH_RESPONSE) {
+            return { success: true, response: STALE_SEARCH_RESPONSE };
+          }
+          return { success: true, response: result };
+        } catch (error) {
+          return { success: false, error };
+        }
+      };
+      //Don't run setTimeout on SSR
+      const funcPromise =
+        renderingEnv === 'backend'
+          ? () => nonDebouncedFilterProfiles()
+          : () =>
+              debouncedFunction({
+                func: fetchProfilesWithSearchId,
+                debounceTimeout,
+                timeoutType,
+                args: { filter, isSearchingNearby },
+              });
+      const { success, response, error } = await funcPromise();
+      if (response === STALE_SEARCH_RESPONSE) {
+        return [];
+      }
+      if (!success) {
         _$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 = `${
-          filterToUse.searchText && filterToUse.searchText.length > 0
-            ? `'${filterToUse.searchText}' did not match any search. Please try again.`
+          filter.searchText && filter.searchText.length > 0
+            ? `'${filter.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 (!preservePaginationToUse || pagination.currentPage >= pagination.totalPages) {
+      if (!preservePagination || 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();
-
-    // 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 await runSearchAndUpdateUI(filter, isSearchingNearby);
   }
 
   return {