abmp-npm 1.1.45 → 1.1.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "1.1.45",
+  "version": "1.1.46",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -26,6 +26,7 @@
     "prettier": "^3.3.3"
   },
   "dependencies": {
+    "@hisense-staging/velo-npm": "3.0.24",
     "@wix/automations": "^1.0.261",
     "@wix/crm": "^1.0.1061",
     "@wix/data": "^1.0.303",

package/pages/Home.js

@@ -1,7 +1,7 @@
 //home page code
+const { withWarmUpData } = require('@hisense-staging/velo-npm');
 const { location: wixLocation } = require('@wix/site-location');
 const { window: wixWindow, rendering } = require('@wix/site-window');
-const { withWarmUpData } = require('psdev-utils/frontend');
 
 const { ADDRESS_STATUS_TYPES, DEFAULT_FILTER, DROPDOWN_OPTIONS } = require('../public/consts.js');
 const { createHomepageUtils } = require('../public/Utils/homePage.js');
@@ -77,7 +77,7 @@ const homePageOnReady = async ({
     showFiltersOnDesktop();
   }
 
-  function attachEventListeners() {
+  async function attachEventListeners() {
     /**
      * PAGINATION CODE
      */
@@ -108,8 +108,8 @@ const homePageOnReady = async ({
     _$w('#resetFilter').onClick(resetFilter);
     _$w('#clearButton').onClick(resetFilter);
 
-    _$w('#searchDesktop').onInput(async event => await searchProfilesOnSearchText(event));
-    _$w('#searchTabletMobile').onInput(async event => await searchProfilesOnSearchText(event));
+    _$w('#searchDesktop').onInput(event => searchProfilesOnSearchText(event));
+    _$w('#searchTabletMobile').onInput(event => searchProfilesOnSearchText(event));
     // Use onChange for the switch and onClick for the retry button
     _$w('#nearBy').onChange(() => {
       updateFiltersState();
@@ -179,8 +179,8 @@ const homePageOnReady = async ({
 
       await updateResults('zeroTimeout');
     });
-
-    _$w('#profileRepeater').onItemReady(async ($item, itemData) => {
+    const baseUrl = await wixLocation.baseUrl();
+    _$w('#profileRepeater').onItemReady(($item, itemData) => {
       // 1) safely default to arrays
       const addresses = Array.isArray(itemData.addresses) ? itemData.addresses : [];
       const areasOfPractices = Array.isArray(itemData.areasOfPractices)
@@ -200,7 +200,6 @@ const homePageOnReady = async ({
         if (itemData.showWebsite) {
           $item('#website').link = itemData.website;
         } else {
-          const baseUrl = await wixLocation.baseUrl();
           $item('#website').link = `${baseUrl}/profile/${itemData.url}`;
         }
         $item('#website').target = '_blank';
@@ -265,17 +264,23 @@ 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);
       for (const [param, { setValue, setUI }] of Object.entries(paramsMapping)) {
@@ -307,10 +312,12 @@ const homePageOnReady = async ({
     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
         ? () =>
@@ -331,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');
     }
@@ -340,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({
@@ -351,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;
   }
@@ -410,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();
 
@@ -420,8 +434,10 @@ const homePageOnReady = async ({
     // 3. Do the query
     const { success, filter: newFilter } = await getAndSetUserLocation(isSearchingNearby, filter);
     filter = newFilter;
-    const renderingEnv = await rendering.env();
+    logMessage(`[nearByHandler][${renderingEnv}] filter`, JSON.stringify(filter));
+    console.log('filter inside nearByHandler', filter);
     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');
@@ -435,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();
@@ -444,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
@@ -462,14 +479,20 @@ 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: ${error}`
+        `Failed to get compiled filters list, falling back to non compiled version with error: ${error}`
       );
       const {
         completeStateList: _completeStateList,
@@ -744,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

@@ -511,6 +511,9 @@ const createHomepageUtils = (_$w, filterProfiles, logMessage) => {
       ssrOnly: _ssrOnly,
       ...withoutPreviewParams
     } = params || {};
+    logMessage(
+      `[parseAndValidateQueryParams][${renderingEnv}] nearby: ${params.nearby}, type of nearby: ${typeof params.nearby}`
+    );
     const isSearchingNearby = params.nearby === 'true';
     const isNoParams = !withoutPreviewParams || Object.keys(withoutPreviewParams).length === 0;
     const { success, filter: newFilter } = await getAndSetUserLocation(isSearchingNearby, filter);
@@ -536,13 +539,13 @@ const createHomepageUtils = (_$w, filterProfiles, logMessage) => {
         `[parseAndValidateQueryParams][${renderingEnv}] isNoParams`,
         JSON.stringify(params)
       );
-      search({
-        filter,
-        pagination,
-        debounceTimeout: 0,
-        timeoutType: 'search',
-        isSearchingNearby: false,
-      });
+      // 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 };