abmp-npm 1.1.41 → 1.1.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "1.1.41",
+  "version": "1.1.43",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/pages/Home.js

@@ -33,6 +33,7 @@ const homePageOnReady = async ({
   getCompiledFiltersOptions,
   getNonCompiledFiltersOptions,
   filterProfiles,
+  logMessage,
 }) => {
   const {
     getParamsMapping,
@@ -52,7 +53,7 @@ const homePageOnReady = async ({
     updateUrlParams,
     noSearchCriteria,
     search,
-  } = createHomepageUtils(_$w, filterProfiles);
+  } = createHomepageUtils(_$w, filterProfiles, logMessage);
   detectMobile();
   initPageUI();
   attachEventListeners();
@@ -263,20 +264,26 @@ const homePageOnReady = async ({
   }
 
   async function handleUrlParams() {
+    const renderingEnv = await rendering.env();
     const { isDefaultStateParams, filter: newFilter } = await parseAndValidateQueryParams(
       filter,
       pagination
     );
+    logMessage(`[handleUrlParams][${renderingEnv}] isDefaultStateParams`, isDefaultStateParams);
     filter = newFilter;
+    logMessage(`[handleUrlParams][${renderingEnv}] filter`, JSON.stringify(filter));
     await applyFilterToUI(isDefaultStateParams);
   }
 
   async function applyFilterToUI(isDefaultStateParams) {
+    const renderingEnv = await rendering.env();
+    logMessage(`[applyFilterToUI][${renderingEnv}] isDefaultStateParams`, isDefaultStateParams);
     const setFilterFromParams = async (isInitializeValue = true) => {
       const params = await wixLocation.query();
+      logMessage(`[setFilterFromParams][${renderingEnv}] params`, JSON.stringify(params));
       console.log('params inside setFilterFromParams ', params);
       const paramsMapping = getParamsMapping(filter, pagination);
-      Object.entries(paramsMapping).forEach(async ([param, { setValue, setUI }]) => {
+      for (const [param, { setValue, setUI }] of Object.entries(paramsMapping)) {
         const value = params[param];
         if (value !== undefined && value !== null && value !== '') {
           try {
@@ -300,15 +307,17 @@ const homePageOnReady = async ({
             console.error(`Error setting parameter ${param}:`, error);
           }
         }
-      });
+      }
     };
     await setFilterFromParams(true);
     if (isDefaultStateParams) {
       console.log('default state set for nearby');
+      logMessage(`[applyFilterToUI][${renderingEnv}] default state set for nearby`);
       await Promise.all([fetchFilterData(), nearByHandler(true)]);
       return;
     }
     console.log('not default state');
+    logMessage(`[applyFilterToUI][${renderingEnv}] not default state`);
     const searchPromise =
       filter.searchText && filter.searchText.length > 0
         ? () =>
@@ -329,6 +338,7 @@ const homePageOnReady = async ({
         searchPromise(),
       ]);
     } catch (error) {
+      logMessage(`[applyFilterToUI][${renderingEnv}] failed with error:`, error);
       console.error('[applyFilterToUI] failed with error:', error);
       multiStateBoxSelector.changeState('errorState');
     }
@@ -338,7 +348,11 @@ const homePageOnReady = async ({
    * UPDATE PROFILES BASED ON APPLIED/DEFAULT FILTER
    */
   async function updateResults(timeoutType, preservePagination = false) {
+    const renderingEnv = await rendering.env();
+    logMessage(`[updateResults][${renderingEnv}] timeoutType`, timeoutType);
+    logMessage(`[updateResults][${renderingEnv}] preservePagination`, preservePagination);
     if (debounceTimeout[timeoutType]) {
+      logMessage(`[updateResults][${renderingEnv}] clearing timeout type ${timeoutType}`);
       clearTimeout(debounceTimeout[timeoutType]);
     }
     searchResults = await search({
@@ -349,6 +363,7 @@ const homePageOnReady = async ({
       isSearchingNearby: _$w('#nearBy').checked,
       preservePagination,
     });
+    logMessage(`[updateResults][${renderingEnv}] searchResults`, JSON.stringify(searchResults));
     !preservePagination && (await updateUrlParams(filter, pagination));
     return searchResults;
   }
@@ -408,7 +423,8 @@ const homePageOnReady = async ({
   // NEAR BY FILTER
   async function nearByHandler(preservePagination = false) {
     const isSearchingNearby = _$w('#nearBy').checked;
-
+    const renderingEnv = await rendering.env();
+    logMessage(`[nearByHandler][${renderingEnv}] isSearchingNearby`, isSearchingNearby);
     // 1. Disable nearby input while processing
     _$w('#nearBy').disable();
 
@@ -418,9 +434,10 @@ const homePageOnReady = async ({
     // 3. Do the query
     const { success, filter: newFilter } = await getAndSetUserLocation(isSearchingNearby, filter);
     filter = newFilter;
+    logMessage(`[nearByHandler][${renderingEnv}] filter`, JSON.stringify(filter));
     console.log('filter inside nearByHandler', filter);
-    const renderingEnv = await rendering.env();
     if (!success) {
+      logMessage(`[nearByHandler][${renderingEnv}] failed to get user location`);
       if (renderingEnv !== 'backend') {
         //on Backend environment, geolocation API don't work, so makes no sense to change state for near by
         multiStateBoxSelector.changeState('nearByState');
@@ -434,8 +451,9 @@ const homePageOnReady = async ({
 
     // If location is not selected, change state to "resultsState"
     if (!isSearchingNearby) {
+      logMessage(`[nearByHandler][${renderingEnv}] !isSearchingNearby, is`);
       if (await noSearchCriteria()) {
-        console.log('no search criteria and no near by');
+        logMessage(`[nearByHandler][${renderingEnv}] no search criteria and no near by`);
         multiStateBoxSelector.changeState('noSearchCriteria');
         // 4. Re-enable nearby input
         _$w('#nearBy').enable();
@@ -443,7 +461,7 @@ const homePageOnReady = async ({
       }
       multiStateBoxSelector.changeState('resultsState');
     }
-
+    logMessage(`[nearByHandler][${renderingEnv}] !isSearchingNearby, isSearchingNearby is true`);
     await updateResults('zeroTimeout', preservePagination);
 
     // 4. Re-enable nearby input when done
@@ -461,12 +479,18 @@ const homePageOnReady = async ({
         await withWarmUpData(
           'getCompiledFiltersOptions',
           () => getCompiledFiltersOptions(),
-          console.log
+          logMessage
         );
+      const renderingEnv = await rendering.env();
+      logMessage(`[fetchFilterData][${renderingEnv}] fetched compiled filters`);
       completeStateList = COMPILED_STATE_LIST;
       areasOfPracticesList = COMPILED_AREAS_OF_PRACTICES;
       stateCityMapList = COMPILED_STATE_CITY_MAP;
     } catch (error) {
+      const renderingEnv = await rendering.env();
+      logMessage(
+        `[fetchFilterData][${renderingEnv}] failed to get compiled filters list, falling back to non compiled version with error: ${error}`
+      );
       console.error(
         `Failed to get compiled filters list, falling back to non compiled version with error: ${error}`
       );
@@ -743,7 +767,9 @@ const homePageOnReady = async ({
         await updateResults('filterTimeout');
       }
     } catch (error) {
-      console.error('Error in multiSelectFilter:', error);
+      const renderingEnv = await rendering.env();
+      console.error(`[handleFilterChanged][${renderingEnv}] failed with error:`, error);
+      logMessage(`[handleFilterChanged][${renderingEnv}] failed with error:`, error);
       multiStateBoxSelector.changeState('errorState');
     }
   }

package/public/Utils/homePage.js

@@ -5,7 +5,7 @@ const { DEFAULT_FILTER } = require('../consts.js');
 
 const { debouncedFunction } = require('./sharedUtils.js');
 
-const createHomepageUtils = (_$w, filterProfiles) => {
+const createHomepageUtils = (_$w, filterProfiles, logMessage) => {
   const getFiltersSelectors = filterName => ({
     checkBoxContainerSelector: _$w(`#${filterName}CheckBoxContainer`),
     searchTextInputSelector: _$w(`#${filterName}TextInput`),
@@ -502,6 +502,8 @@ const createHomepageUtils = (_$w, filterProfiles) => {
   }
   async function parseAndValidateQueryParams(filter, pagination) {
     const params = await wixLocation.query();
+    const renderingEnv = await rendering.env();
+    logMessage(`[parseAndValidateQueryParams][${renderingEnv}] params`, JSON.stringify(params));
     const paramsMapping = getParamsMapping(filter, pagination);
     const {
       siteRevision: _siteRevision,
@@ -521,15 +523,31 @@ const createHomepageUtils = (_$w, filterProfiles) => {
       newFilter.longitude !== 0 &&
       !isSearchingNearby
     ) {
+      logMessage(
+        `[parseAndValidateQueryParams][${renderingEnv}] Auto-enable nearby`,
+        JSON.stringify(params)
+      );
       await wixQueryParams.add({ nearby: 'true', page: '1' });
       return { isDefaultStateParams: true, filter: newFilter };
     }
 
     if (isNoParams) {
+      logMessage(
+        `[parseAndValidateQueryParams][${renderingEnv}] isNoParams`,
+        JSON.stringify(params)
+      );
+      // search({
+      //   filter,
+      //   pagination,
+      //   debounceTimeout: 0,
+      //   timeoutType: 'search',
+      //   isSearchingNearby: false,
+      // });
       // Don't search yet - let the caller decide what to do
       // The search will be handled in applyFilterToUI
       return { isDefaultStateParams: true, filter: newFilter };
     }
+    logMessage(`[parseAndValidateQueryParams][${renderingEnv}] continued`, JSON.stringify(params));
     let autoAdjustFilters = false;
     const validatePageValue = value => {
       if (!value || isNaN(Number(value)) || Number(value) < 1 || Number(value) > 10) {
@@ -540,10 +558,18 @@ const createHomepageUtils = (_$w, filterProfiles) => {
     };
     const pageValidationResult = validatePageValue(params.page);
     if (!pageValidationResult.valid) {
+      logMessage(
+        `[parseAndValidateQueryParams][${renderingEnv}] pageValidationResult not valid`,
+        JSON.stringify(params)
+      );
       paramsMapping.page.setValue({ value: pageValidationResult.value });
       autoAdjustFilters = true;
     }
     if (isSearchingNearby) {
+      logMessage(
+        `[parseAndValidateQueryParams][${renderingEnv}] isSearchingNearby`,
+        JSON.stringify(params)
+      );
       //if nearby is true only city,state,zip should be reset, others should be preserved and taken from query params
       const paramsToPreserve = ['practiceAreas', 'searchText', 'page'];
       paramsToPreserve.forEach(paramName => {
@@ -559,6 +585,10 @@ const createHomepageUtils = (_$w, filterProfiles) => {
       autoAdjustFilters = true;
     }
     if (autoAdjustFilters) {
+      logMessage(
+        `[parseAndValidateQueryParams][${renderingEnv}] autoAdjustFilters`,
+        JSON.stringify(params)
+      );
       await updateUrlParams(filter, pagination);
     }
     const isNearbyFilter =
@@ -590,6 +620,8 @@ const createHomepageUtils = (_$w, filterProfiles) => {
     const paramsMapping = getParamsMapping(filter, pagination);
     // Get current query parameters
     const currentParams = await wixLocation.query();
+    const renderingEnv = await rendering.env();
+    logMessage(`[updateUrlParams][${renderingEnv}] currentParams`, JSON.stringify(currentParams));
     // Remove all existing parameters that we manage
     Object.keys(paramsMapping).forEach(async param => {
       if (currentParams[param]) {
@@ -651,6 +683,7 @@ const createHomepageUtils = (_$w, filterProfiles) => {
     preservePagination = false,
   }) {
     const multiStateBoxSelector = _$w('#resultsStateBox');
+    const renderingEnv = await rendering.env();
     const initSearchResultsUI = () => {
       JSON.stringify(filter) === JSON.stringify(DEFAULT_FILTER)
         ? _$w('#resetFilter').hide()
@@ -663,6 +696,10 @@ const createHomepageUtils = (_$w, filterProfiles) => {
     };
     const runSearchAndUpdateUI = async (filter, isSearchingNearby) => {
       if (!isSearchingNearby) {
+        logMessage(
+          `[runSearchAndUpdateUI][${renderingEnv}] !isSearchingNearby, filter`,
+          JSON.stringify(filter)
+        );
         if (
           JSON.stringify({
             ...filter,
@@ -671,11 +708,17 @@ const createHomepageUtils = (_$w, filterProfiles) => {
           }) === JSON.stringify(DEFAULT_FILTER)
         ) {
           multiStateBoxSelector.changeState('noSearchCriteria');
-
+          logMessage(
+            `[runSearchAndUpdateUI][${renderingEnv}] !isSearchingNearby, no search criteria`
+          );
           return [];
         }
       }
-      const renderingEnv = await rendering.env();
+      logMessage(
+        `[runSearchAndUpdateUI][${renderingEnv}] isSearchingNearby is true , filter`,
+        JSON.stringify({ filter })
+      );
+      //Don't run setTimeout on SSR
       const funcPromise =
         renderingEnv === 'backend'
           ? () => filterProfiles({ filter, isSearchingNearby })
@@ -688,6 +731,10 @@ const createHomepageUtils = (_$w, filterProfiles) => {
               });
       const { success, response, error } = await funcPromise();
       if (!success) {
+        logMessage(
+          `[runSearchAndUpdateUI][${renderingEnv}] !isSearchingNearby, failed to get search results`,
+          error
+        );
         _$w('#numberOfResults').text = '';
         console.error('[search] failed with error:', error);
         multiStateBoxSelector.changeState('errorState');
@@ -701,6 +748,10 @@ const createHomepageUtils = (_$w, filterProfiles) => {
             ? `'${filter.searchText}' did not match any search. Please try again.`
             : 'No results found for the selected filters. Please adjust your filters and try again'
         }`;
+        logMessage(
+          `[runSearchAndUpdateUI][${renderingEnv}] !isSearchingNearby, no results found`,
+          JSON.stringify({ filter })
+        );
         multiStateBoxSelector.changeState('noResultsState');
         return [];
       }