fix: Fix test cases

tjtanjin · Oct 30, 2024 · 663774b · 663774b
1 parent 0e6ebc6
commit 663774b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 36 deletions.
diff --git a/__tests__/hooks/internal/useSettingsInternal.test.ts b/__tests__/hooks/internal/useSettingsInternal.test.ts
@@ -74,8 +74,8 @@ describe("useSettingsInternal", () => {
             result.current.updateSettings({});
         });
 
-        expect(getCombinedConfig).toHaveBeenCalledWith({}, mockSettings);
-        expect(deepClone).toHaveBeenCalledWith(mockSettings);
-        expect(mockSetSettings).toHaveBeenCalledWith(mockSettings);
+        expect(getCombinedConfig).not.toHaveBeenCalledWith({}, mockSettings);
+        expect(deepClone).not.toHaveBeenCalledWith(mockSettings);
+        expect(mockSetSettings).not.toHaveBeenCalledWith(mockSettings);
     });
 });
diff --git a/src/components/ChatBot.tsx b/src/components/ChatBot.tsx
@@ -69,7 +69,7 @@ const ChatBot = ({
 			<ChatBotLoader styleRootRef={styleRootRef} id={finalBotId} flow={finalFlow} settings={finalSettings}
 				styles={finalStyles} themes={finalThemes} plugins={finalPlugins} setConfigLoaded={setConfigLoaded}
 			/>
-			{configLoaded && <ChatBotContainer plugins={plugins} setFinalThemes={setFinalThemes} />}
+			{configLoaded && <ChatBotContainer plugins={plugins} />}
 		</>
 	)
 

diff --git a/src/components/ChatBotContainer.tsx b/src/components/ChatBotContainer.tsx
@@ -1,4 +1,4 @@
-import { Dispatch, MouseEvent, SetStateAction, useMemo } from "react";
+import { MouseEvent, useMemo } from "react";
 
 import ChatBotHeader from "./ChatBotHeader/ChatBotHeader";
 import ChatBotBody from "./ChatBotBody/ChatBotBody";
@@ -16,7 +16,6 @@ import { useBotStatesContext } from "../context/BotStatesContext";
 import { useSettingsContext } from "../context/SettingsContext";
 import { useStylesContext } from "../context/StylesContext";
 import { Plugin } from "../types/Plugin";
-import { Theme } from "../types/Theme";
 
 import "./ChatBotContainer.css";
 
@@ -27,10 +26,8 @@ import "./ChatBotContainer.css";
  */
 const ChatBotContainer = ({
 	plugins,
-	setFinalThemes
 }: {
 	plugins?: Array<Plugin>;
-	setFinalThemes: Dispatch<SetStateAction<Theme | Array<Theme>>>;
 }) => {
 	// handles platform
 	const isDesktop = useIsDesktopInternal();
@@ -62,7 +59,7 @@ const ChatBotContainer = ({
 	useBotEffectsInternal();
 
 	// loads plugins
-	usePluginsInternal(plugins, setFinalThemes);
+	usePluginsInternal(plugins);
 
 	/**
 	 * Retrieves class name for window state.

diff --git a/src/hooks/internal/usePluginsInternal.ts b/src/hooks/internal/usePluginsInternal.ts
@@ -1,5 +1,6 @@
-import { Dispatch, SetStateAction, useEffect } from "react";
+import { Dispatch, SetStateAction, useEffect, useState } from "react";
 
+import { getCombinedConfig } from "../../utils/configParser";
 import { useSettingsInternal } from "./useSettingsInternal";
 import { useStylesInternal } from "./useStylesInternal";
 import { Plugin } from "../../types/Plugin";
@@ -8,8 +9,7 @@ import { Theme } from "../../types/Theme";
 /**
  * Internal custom hook to handle plugins.
  */
-export const usePluginsInternal = (plugins: Array<Plugin> | undefined,
-	setFinalThemes: Dispatch<SetStateAction<Theme | Array<Theme>>>) => {
+export const usePluginsInternal = (plugins: Array<Plugin> | undefined) => {
 
 	const { updateSettings } = useSettingsInternal();
 	const { updateStyles } = useStylesInternal();
@@ -18,33 +18,19 @@ export const usePluginsInternal = (plugins: Array<Plugin> | undefined,
 	const setUpInfo = plugins?.map((pluginHook) => pluginHook());
 
 	useEffect(() => {
+		let pluginSettings = {};
+		let pluginStyles = {};
 		// applies plugin themes, settings and styles if specified
 		setUpInfo?.forEach((setUpInfo) => {
-			if (setUpInfo?.themes) {
-				if (Array.isArray(setUpInfo.themes)) {
-					setFinalThemes(prev => {
-						if (Array.isArray(prev)) {
-							return [...prev, ...setUpInfo.themes as Array<Theme>];
-						} else {
-							return [prev, ...setUpInfo.themes as Array<Theme>];
-						}
-					});
-				} else {
-					setFinalThemes(prev => {
-						if (Array.isArray(prev)) {
-							return [...prev, setUpInfo.themes as Theme];
-						} else {
-							return [prev, setUpInfo.themes as Theme];
-						}
-					});
-				}
+			if (setUpInfo?.settings && Object.keys(setUpInfo?.settings).length !== 0) {
+				pluginSettings = getCombinedConfig(setUpInfo.settings, pluginSettings);
 			}
-			if (setUpInfo?.settings) {
-				updateSettings(setUpInfo.settings);
-			}
-			if (setUpInfo?.styles) {
-				updateStyles(setUpInfo.styles);
+			if (setUpInfo?.styles && Object.keys(setUpInfo?.styles).length !== 0) {
+				pluginStyles = getCombinedConfig(setUpInfo.styles, pluginStyles);
 			}
 		});
+
+		updateSettings(pluginSettings);
+		updateStyles(pluginStyles);
 	}, [plugins])
 };
diff --git a/src/services/ChatHistoryService.tsx b/src/services/ChatHistoryService.tsx
@@ -22,7 +22,7 @@ let historyMessages: Message[] = [];
  * @param messages messages containing current conversation with the bot
  */
 const saveChatHistory = async (messages: Message[]) => {
-	if (historyDisabled) {
+	if (historyDisabled || !storage) {
 		return;
 	}
 
@@ -83,13 +83,19 @@ const getHistoryMessages = () => {
  * @param messages chat history messages to set
  */
 const setHistoryMessages = (messages: Message[]) => {
+	if (!storage) {
+		return;
+	}
 	storage.setItem(historyStorageKey, JSON.stringify(messages));
 }
 
 /**
  * Clears existing history messages.
  */
 const clearHistoryMessages = () => {
+	if (!storage) {
+		return;
+	}
 	storage.removeItem(historyStorageKey);
 }