@envive-ai/react-hooks 0.3.32 → 0.3.33

package/src/contexts/newOrgConfigContext/newOrgConfigContext.tsx

@@ -1,8 +1,6 @@
-import React, { ReactNode, createContext, useContext, useMemo } from 'react';
-import { useAtomValue, useSetAtom } from 'jotai';
-import { useUIConfig } from 'src/hooks/GraphQLConfig/useGraphQLConfig';
-import { orgShortNameAtom } from 'src/atoms/envive/enviveConfig';
-import { newOrgConfigAtom } from 'src/atoms/org/newOrgConfigAtom'; // Import newOrgConfigAtom
+import React, { ReactNode, createContext, useContext, useEffect, useMemo } from 'react';
+import { useSetAtom } from 'jotai';
+import { newOrgConfigAtom } from 'src/atoms/org/newOrgConfigAtom';
 import { GraphQlConfigValues } from '../graphqlContext';
 
 export type NewOrgConfigContextType = GraphQlConfigValues & {
@@ -14,32 +12,17 @@ const NewOrgConfigContext = createContext<NewOrgConfigContextType | undefined>(u
 
 interface NewOrgConfigProviderProps {
   children: ReactNode;
-  overrideConfig?: GraphQlConfigValues;
+  config: GraphQlConfigValues;
 }
 
-export const NewOrgConfigProvider: React.FC<NewOrgConfigProviderProps> = ({
-  children,
-  overrideConfig,
-}) => {
-  const orgShortName = useAtomValue(orgShortNameAtom);
+export const NewOrgConfigProvider: React.FC<NewOrgConfigProviderProps> = ({ children, config }) => {
   const setNewOrgConfig = useSetAtom(newOrgConfigAtom);
 
-  const { data: fetchedConfig, loading, error } = useUIConfig();
+  useEffect(() => {
+    setNewOrgConfig(config);
+  }, [config, setNewOrgConfig]);
 
-  const contextValue = useMemo(() => {
-    if (!orgShortName || loading) {
-      return { ...fetchedConfig, loading: true, error: null };
-    }
-
-    if (error) {
-      return { ...fetchedConfig, loading: false, error };
-    }
-
-    const activeConfig = overrideConfig || fetchedConfig;
-
-    setNewOrgConfig(activeConfig);
-    return { ...activeConfig, loading: false, error: null };
-  }, [orgShortName, loading, error, setNewOrgConfig, fetchedConfig, overrideConfig]);
+  const contextValue = useMemo(() => ({ ...config, loading: false, error: null }), [config]);
 
   return (
     <NewOrgConfigContext.Provider value={contextValue}>{children}</NewOrgConfigContext.Provider>

package/src/contexts/typesV3.ts

@@ -11,27 +11,42 @@ import { CustomerServiceType } from '../types/customerService';
 import type { SearchConfig } from './types';
 
 export enum LetterSpacingCSSVar {
-  Tight0 = 'envive-typography-letter-spacing-tight-0',
-  Wide1 = 'envive-typography-letter-spacing-wide-1',
+  T1 = 'envive-typography-letter-spacing-t1',
+  T2 = 'envive-typography-letter-spacing-t2',
+  T3 = 'envive-typography-letter-spacing-t3',
+  H1 = 'envive-typography-letter-spacing-h1',
+  H2 = 'envive-typography-letter-spacing-h2',
+  H3 = 'envive-typography-letter-spacing-h3',
+  B1 = 'envive-typography-letter-spacing-b1',
+  B2 = 'envive-typography-letter-spacing-b2',
+  B3 = 'envive-typography-letter-spacing-b3',
+  B4 = 'envive-typography-letter-spacing-b4',
+  B5 = 'envive-typography-letter-spacing-b5',
+  L1 = 'envive-typography-letter-spacing-l1',
+  L2 = 'envive-typography-letter-spacing-l2',
 }
 
 export enum LineHeightCSSVar {
-  LineHeight124 = 'envive-typography-line-height-124',
-  LineHeight120 = 'envive-typography-line-height-120',
-  LineHeight118 = 'envive-typography-line-height-118',
-  LineHeight116 = 'envive-typography-line-height-116',
-  LineHeight114 = 'envive-typography-line-height-114',
-  LineHeight148 = 'envive-typography-line-height-148',
-  LineHeight140 = 'envive-typography-line-height-140',
-  LineHeight128 = 'envive-typography-line-height-128',
-  LineHeight130 = 'envive-typography-line-height-130',
-  LineHeight133 = 'envive-typography-line-height-133',
+  T1 = 'envive-typography-line-height-t1',
+  T2 = 'envive-typography-line-height-t2',
+  T3 = 'envive-typography-line-height-t3',
+  H1 = 'envive-typography-line-height-h1',
+  H2 = 'envive-typography-line-height-h2',
+  H3 = 'envive-typography-line-height-h3',
+  B1 = 'envive-typography-line-height-b1',
+  B2 = 'envive-typography-line-height-b2',
+  B3 = 'envive-typography-line-height-b3',
+  B4 = 'envive-typography-line-height-b4',
+  B5 = 'envive-typography-line-height-b5',
+  L1 = 'envive-typography-line-height-l1',
+  L2 = 'envive-typography-line-height-l2',
 }
 
 export enum FontWeightCSSVar {
-  RG = 'envive-typography-font-weight-rg',
-  MD = 'envive-typography-font-weight-md',
-  SB = 'envive-typography-font-weight-sb',
+  Title = 'envive-typography-font-weight-title',
+  Header = 'envive-typography-font-weight-header',
+  BodyEmphasis = 'envive-typography-font-weight-body-emphasis',
+  BodyStandard = 'envive-typography-font-weight-body-standard',
 }
 
 export enum FontSizeCSSVar {
@@ -125,27 +140,42 @@ type Typography = {
   };
 
   fontWeight?: {
-    rg: string;
-    md: string;
-    sb: string;
+    title: string;
+    header: string;
+    bodyEmphasis: string;
+    bodyStandard: string;
   };
 
   letterSpacing?: {
-    '0': string;
-    'wide-1': string;
+    t1: string;
+    t2: string;
+    t3: string;
+    h1: string;
+    h2: string;
+    h3: string;
+    b1: string;
+    b2: string;
+    b3: string;
+    b4: string;
+    b5: string;
+    l1: string;
+    l2: string;
   };
 
   lineHeight?: {
-    '124': number;
-    '120': number;
-    '118': number;
-    '116': number;
-    '114': number;
-    '148': number;
-    '140': number;
-    '128': number;
-    '130': number;
-    '133': number;
+    t1: number;
+    t2: number;
+    t3: number;
+    h1: number;
+    h2: number;
+    h3: number;
+    b1: number;
+    b2: number;
+    b3: number;
+    b4: number;
+    b5: number;
+    l1: number;
+    l2: number;
   };
 };
 
@@ -342,6 +372,7 @@ interface ProductCardWidgetV3Config extends BaseWidgetConfig<WidgetTypeV3.Produc
   italicizeHeadline?: boolean;
   fallbackColor?: string;
   imageSrc?: string;
+  mode?: Mode;
 }
 
 interface FullPageSalesAgentWidgetV3Config extends BaseWidgetConfig<WidgetTypeV3.FullPageSalesAgentV3> {

package/src/contexts/userIdentityContext/userIdentityContext.tsx

@@ -11,7 +11,7 @@ import Logger from 'src/application/logging/logger';
 import { useLocalStorage } from 'src/contexts/localStorageContext';
 import { useSetAtom } from 'jotai';
 import { userIdAtom } from 'src/atoms/app';
-import { UserIdentityService } from 'src/services/userIdentityService';
+import { IUserIdentityService } from 'src/services/userIdentityService';
 
 const logger = new Logger('userIdentityContext');
 
@@ -26,7 +26,7 @@ export interface UserIdentityContextType {
 const UserIdentityContext = createContext<UserIdentityContextType | undefined>(undefined);
 
 interface UserIdentityProviderProps {
-  userIdService: UserIdentityService;
+  userIdService: IUserIdentityService;
   children: ReactNode;
 }
 

package/src/hooks/GraphQLConfig/useGraphQLConfig.ts

@@ -1,62 +1,2 @@
-import { useCallback, useEffect, useState } from 'react';
-import { GraphQlConfigValues, useGraphQLClient } from 'src/contexts/graphqlContext/graphqlContext';
-
-export const useColorsAndFrontendConfig = () => {
-  const { getColorsAndFrontendConfig, isReady } = useGraphQLClient();
-  const [data, setData] = useState<GraphQlConfigValues>({});
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState<Error | null>(null);
-
-  const fetchConfig = useCallback(async () => {
-    if (!isReady) return;
-
-    setLoading(true);
-    setError(null);
-
-    try {
-      const result = await getColorsAndFrontendConfig();
-      setData(result);
-    } catch (err) {
-      setError(err instanceof Error ? err : new Error('Unknown error'));
-    } finally {
-      setLoading(false);
-    }
-  }, [getColorsAndFrontendConfig, isReady]);
-
-  useEffect(() => {
-    fetchConfig();
-  }, [fetchConfig]);
-
-  return { data, loading, error, refetch: fetchConfig };
-};
-
-export const useUIConfig = () => {
-  const { getConfig, isReady } = useGraphQLClient();
-  const [data, setData] = useState<GraphQlConfigValues>({});
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState<Error | null>(null);
-
-  const fetchConfig = useCallback(async () => {
-    if (!isReady) return;
-    if (loading) return;
-    if (Object.keys(data).length > 0) return;
-
-    setLoading(true);
-    setError(null);
-
-    try {
-      const result = await getConfig();
-      setData(result);
-    } catch (err) {
-      setError(err instanceof Error ? err : new Error('Unknown error'));
-    } finally {
-      setLoading(false);
-    }
-  }, [data, getConfig, isReady, loading]);
-
-  useEffect(() => {
-    fetchConfig();
-  }, [fetchConfig]);
-
-  return { data, loading, error, refetch: fetchConfig };
-};
+// Hooks moved to EnviveConfigService — stub retained for test mock compatibility
+export const useUIConfig = () => ({ data: {}, loading: false, error: null, refetch: () => {} });

package/src/hooks/Search/__tests__/useSearch.test.tsx

@@ -413,7 +413,7 @@ const TestWrapper: React.FC<{
             <UserIdentityProvider userIdService={testUserIdService}>
               <FeatureFlagServiceProvider featureFlagService={testFeatureFlagService}>
                 <AmplitudeProvider>
-                  <NewOrgConfigProvider>
+                  <NewOrgConfigProvider config={{}}>
                     <SearchProvider>
                       <AtomManipulator
                         searchData={searchData}
@@ -616,7 +616,7 @@ describe('useSearch', () => {
 
       await waitFor(() => {
         const filterButtonText = screen.getByTestId('filter-button-text').textContent;
-        expect(filterButtonText).toContain('Filter & Sort (');
+        expect(filterButtonText).toContain('Filter & Sort');
       });
     });
   });

package/src/services/amplitudeService/__tests__/amplitudeService.test.ts

@@ -323,9 +323,7 @@ describe('AmplitudeService', () => {
     });
 
     it('should send to Google Analytics when alsoSendToGoogleAnalytics is true', async () => {
-      const service = createService({
-        orgGaConfig: { enabled: true },
-      });
+      const service = createService();
 
       const dataLayer: any[] = [];
       Object.defineProperty(global, 'window', {
@@ -358,7 +356,7 @@ describe('AmplitudeService', () => {
       });
     });
 
-    it('should not send to Google Analytics when orgGaConfig is not provided', async () => {
+    it('should not send to Google Analytics when alsoSendToGoogleAnalytics is false', async () => {
       const service = createService();
 
       const dataLayer: any[] = [];
@@ -373,7 +371,7 @@ describe('AmplitudeService', () => {
       await service.trackEvent({
         eventName: SpiffyMetricsEventName.ChatUserMessageInput,
         eventProps: { message: 'test' },
-        alsoSendToGoogleAnalytics: true,
+        alsoSendToGoogleAnalytics: false,
       });
 
       expect(dataLayer).toHaveLength(0);

package/src/services/amplitudeService/amplitudeService.ts

@@ -35,7 +35,6 @@ export interface AmplitudeServiceConfig {
   orgShortName: string;
   orgId: string;
   featureFlagService: FeatureFlagService;
-  orgGaConfig?: unknown;
   show: boolean;
   enviveOn: boolean;
   enabledFeatures?: Record<string, boolean>;
@@ -412,13 +411,16 @@ export class AmplitudeService {
         },
       );
 
-      if (AmplitudeService.isV3EnviveEvent(eventName) && this.config.orgGaConfig) {
+      // TODO: Pull gaEnabled from org config when available. Hardcoded to true for now.
+      const gaEnabled = true;
+
+      if (AmplitudeService.isV3EnviveEvent(eventName) && gaEnabled) {
         const mergedPropsForGA4 = {
           ...this.getDefaultTrackingProps(eventName),
           ...mappedEventProps,
         };
         projectToGA4(eventName as EnviveMetricsEventName, mergedPropsForGA4);
-      } else if (alsoSendToGoogleAnalytics && this.config.orgGaConfig) {
+      } else if (alsoSendToGoogleAnalytics && gaEnabled) {
         logger.logDebug('GA tracking', decoratedEventName);
         if (typeof window !== 'undefined' && window.dataLayer) {
           // eslint-disable-next-line @typescript-eslint/no-explicit-any