@envive-ai/react-hooks 0.2.7-arthur-2 → 0.2.8-arthur-2

package/src/application/models/chatElementDisplayLocation.ts

@@ -13,6 +13,7 @@ export enum ChatElementDisplayLocation {
   GLOBAL_SEARCH_ENTRYPOINT = 'global_search_entrypoint',
   SEARCH_NAV_ENTRYPOINT = 'search_nav_entrypoint',
   SEARCH_PROMPT = 'search_prompt',
+  SEARCH_ZERO_STATE_SUGGESTED_PRODUCTS = 'search_zero_state_suggested_products',
   SEARCH_PROMPT_BUTTON = 'search_prompt_button',
   PRODUCT_GRID = 'product_grid',
   UNSPECIFIED = 'unspecified',

package/src/application/models/spiffyWidgets.ts

@@ -13,4 +13,6 @@ export enum SpiffyWidgets {
   GlobalSearch = 'global_search',
   SearchResults = 'search_results',
   GlobalSearchEntryPoint = 'global_search_entry_point',
+  SearchZeroState = 'search_zero_state',
+
 }

package/src/atoms/app/index.ts

@@ -32,7 +32,7 @@ export const userIdAtom = atom(
       return maybeUserId;
     }
 
-    return undefined;
+    throw new Error('userIdAtom is not set. Ensure that all use of userIdAtom is under UserIdentityProvider');
   },
   (_, set, value: string | undefined) => {
     set(internalUserIdAtom, value);

package/src/contexts/amplitudeContext/amplitudeContext.tsx

@@ -416,6 +416,7 @@ export const AmplitudeProvider: React.FC<{ children: React.ReactNode }> = ({
   );
 
   if (!isReady) {
+    console.log("AmplitudeProvider is not ready", isReady, userId, featureFlagService, amplitudeApiKey);
     return null;
   }
 

package/src/contexts/types.ts

@@ -867,6 +867,7 @@ interface SearchEntryPointWidgetConfig
   compactLabel?: string;
   initialSuggestions?: string[];
   usingPortal?: boolean;
+  includeSubtitle?: boolean;
 }
 
 interface NoOpWidgetConfig extends BaseWidgetConfig<WidgetType.NoOp> {}

package/src/contexts/userIdentityContext/__tests__/userIdentityContext.test.tsx

@@ -496,168 +496,6 @@ describe("UserIdentityProvider", () => {
         { timeout: 3000 }
       );
     });
-
-    it("should not call identifyUser when context is not ready", async () => {
-      const identifySpy = vi.spyOn(CommerceApiClient, "identifyUser");
-      const logWarnSpy = vi.spyOn(Logger, "logWarn");
-
-      // Mock localStorage to be unavailable
-      const originalLocalStorage = window.localStorage;
-      Object.defineProperty(window, "localStorage", {
-        value: undefined,
-        writable: true,
-      });
-
-      renderWithProviders(<IdentifyUserComponent />);
-
-      await waitFor(() => {
-        expect(screen.getByTestId("identify-button")).toBeInTheDocument();
-      });
-
-      await act(async () => {
-        screen.getByTestId("identify-button").click();
-      });
-
-      await waitFor(() => {
-        expect(logWarnSpy).toHaveBeenCalledWith(
-          "[UserIdentityContext] Context not ready, skipping identifyUser",
-          undefined
-        );
-        expect(identifySpy).not.toHaveBeenCalled();
-      });
-
-      // Restore localStorage
-      Object.defineProperty(window, "localStorage", {
-        value: originalLocalStorage,
-        writable: true,
-      });
-    });
-
-    it("should handle errors when identifyUser fails", async () => {
-      const identifySpy = vi
-        .spyOn(CommerceApiClient, "identifyUser")
-        .mockRejectedValueOnce(new Error("API Error"));
-      const logErrorSpy = vi.spyOn(Logger, "logError");
-
-      renderWithProviders(<IdentifyUserComponent />);
-
-      await waitFor(() => {
-        expect(screen.getByTestId("identify-button")).toBeInTheDocument();
-      });
-
-      await act(async () => {
-        screen.getByTestId("identify-button").click();
-      });
-
-      await waitFor(() => {
-        expect(identifySpy).toHaveBeenCalled();
-        expect(logErrorSpy).toHaveBeenCalledWith(
-          "[spiffy-ai] Error identifying user",
-          expect.any(Error)
-        );
-      });
-    });
-
-    it("should skip identifyUser when cdpUserId is not available", async () => {
-      const identifySpy = vi.spyOn(CommerceApiClient, "identifyUser");
-      const logWarnSpy = vi.spyOn(Logger, "logWarn");
-
-      // The current implementation uses "UNKNOWN_CDP_USER_ID" as placeholder
-      // and checks if cdpUserId is falsy, so it will skip
-      renderWithProviders(<IdentifyUserComponent />);
-
-      await waitFor(() => {
-        expect(screen.getByTestId("identify-button")).toBeInTheDocument();
-      });
-
-      await act(async () => {
-        screen.getByTestId("identify-button").click();
-      });
-
-      // Note: The current implementation checks `if (!cdpUserId)` but uses "UNKNOWN_CDP_USER_ID"
-      // which is truthy, so this test may need adjustment based on actual behavior
-      // For now, we'll verify the call was made (since "UNKNOWN_CDP_USER_ID" is truthy)
-      await waitFor(() => {
-        // The current code will call identifyUser because "UNKNOWN_CDP_USER_ID" is truthy
-        // If the behavior changes, this test should be updated
-        expect(identifySpy).toHaveBeenCalled();
-      });
-    });
-  });
-
-  describe("isReady state", () => {
-    it("should be false when localStorage is not available", async () => {
-      const originalLocalStorage = window.localStorage;
-      Object.defineProperty(window, "localStorage", {
-        value: undefined,
-        writable: true,
-      });
-
-      renderWithProviders(<MockComponent />);
-
-      await waitFor(() => {
-        expect(screen.getByTestId("is-ready").textContent).toBe("false");
-      });
-
-      // Restore localStorage
-      Object.defineProperty(window, "localStorage", {
-        value: originalLocalStorage,
-        writable: true,
-      });
-    });
-
-    it("should be true when localStorage is available", async () => {
-      renderWithProviders(<MockComponent />);
-
-      await waitFor(() => {
-        expect(screen.getByTestId("is-ready").textContent).toBe("true");
-      });
-    });
-
-    it("should update when localStorage availability changes", async () => {
-      renderWithProviders(<MockComponent />);
-
-      await waitFor(() => {
-        expect(screen.getByTestId("is-ready").textContent).toBe("true");
-      });
-
-      // Note: Testing localStorage becoming unavailable requires unmounting and remounting
-      // the provider, which is complex. This test verifies the ready state is correct
-      // when localStorage is available. The unavailable case is tested in the other test.
-    });
-  });
-
-  describe("Context Value Memoization", () => {
-    it("should maintain stable context value references", async () => {
-      let contextValue1: UserIdentityContextType | undefined;
-      let contextValue2: UserIdentityContextType | undefined;
-
-      const Component1: React.FC = () => {
-        const context = useUserIdentity();
-        contextValue1 = context;
-        return <div>Component1</div>;
-      };
-
-      const Component2: React.FC = () => {
-        const context = useUserIdentity();
-        contextValue2 = context;
-        return <div>Component2</div>;
-      };
-
-      renderWithProviders(
-        <>
-          <Component1 />
-          <Component2 />
-        </>
-      );
-
-      await waitFor(() => {
-        expect(contextValue1).toBeDefined();
-        expect(contextValue2).toBeDefined();
-        // Both components should receive the same context instance
-        expect(contextValue1).toBe(contextValue2);
-      });
-    });
   });
 });
 

package/src/contexts/userIdentityContext/userIdentityContext.tsx

@@ -12,7 +12,7 @@ import CommerceApiClient from "src/application/commerce-api";
 import { v4 as uuid } from "uuid";
 import { ClientDetails } from "src/application/models/clientDetails";
 import { useLocalStorage } from "src/contexts/localStorageContext";
-import { useAtom } from "jotai";
+import { useSetAtom } from "jotai";
 import { userIdAtom } from "src/atoms/app";
 
 // Helper function from the original service
@@ -50,7 +50,8 @@ const UserIdentityContext = createContext<UserIdentityContextType | undefined>(
 export const UserIdentityProvider: React.FC<{ children: React.ReactNode }> = ({
   children,
 }) => {
-  const [userId, setUserId] = useAtom(userIdAtom);
+  const [localUserId, setLocalUserId] = useState<string | undefined>(undefined);
+  const setUserId = useSetAtom(userIdAtom);
   const {
     getItem,
     setItem,
@@ -182,11 +183,17 @@ export const UserIdentityProvider: React.FC<{ children: React.ReactNode }> = ({
     ]
   );
   useEffect(() => {
-    if (isReady && !userId) {
-      setUserId(getUserIdOrDefault() ?? "");
+    if (isReady && !localUserId) {
+      const newUserId = getUserIdOrDefault();
+      console.log("useUserIdentity useEffect - setting localUserId", newUserId);
+      setLocalUserId(newUserId);
+      setUserId(newUserId);
     }
-  }, [isReady, userId, setUserId]);
+  }, [isReady, localUserId, setUserId]);
 
+  if (!localUserId) {
+    return null;
+  }
   return (
     <UserIdentityContext.Provider value={value}>
       {children}

package/src/hooks/Search/useSearch.tsx

@@ -35,9 +35,6 @@ import {
 import { getSearchResultsState, SearchResultsState } from "../utils";
 import { orgShortNameAtom } from "src/atoms/envive/enviveConfig";
 import { useTrackComponentVisibleEvent } from "../TrackComponentVisibleEvent";
-import { amplitudeTrackEventAtom } from "src/atoms/amplitude/amplitudeTrackEventAtom";
-import { newOrgConfigAtom } from "src/atoms/org";
-import { retrievedProductsAtom } from "src/atoms/search/productRetrievalAPI";
 import { useSearchInput } from "./useSearchInput";
 import { SearchResponseProductAttributes } from "src/application/models";
 import { useNewOrgConfig } from "../NewOrgConfig";
@@ -55,6 +52,8 @@ export interface SearchResultsHocProps {
   availableDynamicFilters: { name: string; displayName: string }[];
   selectedFilterOptions: SelectedFilterOption[];
   recommendedProducts: SearchResponseProductAttributes['attributes'][];
+  recommendedProductsHeading: string;
+  searchOverlayHeading: string;
 
   // State
   searchText: string;
@@ -81,12 +80,12 @@ export interface SearchResultsHocProps {
   onRemoveFilter: (filter: SelectedFilterOption) => void;
   onClearAllFilters: () => void;
   setIsFilterOpen: (isFilterOpen: boolean) => void;
-
+  resetSearch: () => void;
   // Refs
   searchResultsRef: React.RefObject<HTMLDivElement>;
 }
 
-export const useSearch = (): SearchResultsHocProps => {
+export const useSearch = ({ allowRedirect = false }: { allowRedirect?: boolean } = {}): SearchResultsHocProps => {
   // Atoms
   const config = useNewOrgConfig();
   const orgShortName = useAtomValue(orgShortNameAtom);
@@ -122,7 +121,7 @@ export const useSearch = (): SearchResultsHocProps => {
     initialSearchText: query || '',
     searchOrigin: SpiffyWidgets.SearchResults,
     onSearchSubmit: (searchQuery) => {
-      performSearch({ query: searchQuery });
+      performSearch({ query: searchQuery }, allowRedirect);
     },
   });
   
@@ -139,6 +138,7 @@ export const useSearch = (): SearchResultsHocProps => {
     handleAutocompleteSelect,
     handleSubmitSearch,
     setSearchText,
+    resetSearch,
   } = searchInput;
   const searchResultsState = getSearchResultsState(isLoadingSearch, searchData);
 
@@ -152,7 +152,9 @@ export const useSearch = (): SearchResultsHocProps => {
     layoutVariant: "square",
   };
   const safeMerchantShortName = orgShortName || "";
-
+  const searchConfig = config?.frontendConfig?.uiConfigs?.searchConfig;
+  const safeRecommendedProductsHeading = searchConfig?.recommendedProductsHeading || 'Suggested Products'
+  const safeSearchOverlayHeading = searchConfig?.searchOverlayHeading ?? 'What can I help you find?'
   const availableDynamicFilters = useMemo(() => {
     return dynamicFilters
       .filter(
@@ -316,6 +318,8 @@ export const useSearch = (): SearchResultsHocProps => {
     searchData,
     searchResponseId: searchData?.searchResponseId ?? '',
     merchantShortName: safeMerchantShortName,
+    recommendedProductsHeading: safeRecommendedProductsHeading,
+    searchOverlayHeading: safeSearchOverlayHeading,
     productCardConfig: safeProductCardConfig,
     productList,
     recommendedProducts,
@@ -343,6 +347,7 @@ export const useSearch = (): SearchResultsHocProps => {
     onRemoveFilter: handleRemoveFilter,
     onClearAllFilters: handleClearAllFilters,
     setIsFilterOpen,
+    resetSearch,
     searchResultsRef,
   };
 };