1FF · IlievaDayana · Dec 14, 2023 · Dec 5, 2023 · Dec 12, 2023
diff --git a/__tests__/components/AppBase/index.spec.jsx b/__tests__/components/AppBase/index.spec.jsx
@@ -90,7 +90,6 @@ describe('AppBase, chat-history event and execute properly', () => {
     const { chat } = root.store.getState();
     expect(localStorage.getItem(LINK_CLICKED_KEY)).toBeTruthy();
     expect(document.querySelector).toHaveBeenCalledWith('#chatbot-container');
-    expect(nodeElem.remove).toHaveBeenCalled();
     expect(chat.closed).toBeTruthy();
   });
 
@@ -221,6 +220,53 @@ describe('AppBase, streaming events execute properly', () => {
   });
 });
 
+describe('Close button closes chat', () => {
+  const href = 'https://example.com/?utm_chat=default';
+  const search = '?utm_chat=default';
+
+  beforeEach(async () => {
+    const mockLocation = {
+      href,
+      search,
+    };
+
+    Object.defineProperty(window, 'location', {
+      value: mockLocation,
+      writable: true,
+      enumerable: true,
+    });
+    await localSetup();
+  });
+
+  afterEach(localTearDown);
+
+  test('chat.closed is true after close button is clicked', async () => {
+    // Arrange
+    expect(window.location.search).toContain('?utm_chat=default');
+
+    const nodeElem = { remove: jest.fn() };
+    const querySelectorSpy = jest.spyOn(document, 'querySelector');
+    const ioCloseSpy = jest.spyOn(io.connect(), 'close');
+    spies.push(querySelectorSpy, ioCloseSpy);
+    querySelectorSpy.mockImplementation(() => nodeElem);
+
+    // Act
+    act(dispatchSocketChange);
+    const closeButton = root.container.querySelector('[data-e2e="chat-close-btn"]');
+    fireEvent.click(closeButton);
+
+    // Assert
+    setTimeout(() => {
+      const { chat } = root.store.getState();
+      expect(chat.closed).toBeTruthy();
+      expect(querySelectorSpy).toHaveBeenCalledWith('#chatbot-container');
+      expect(nodeElem.remove).toHaveBeenCalled();
+      expect(window.location.search).not.toContain(search);
+      expect(ioCloseSpy).toHaveBeenCalled();
+    }, 501);
+  });
+});
+
 function dispatchSocketChange(history = defaultHistory) {
   serverSocket.emit('connect');
   serverSocket.emit(events.chatHistory, { history, errors: [], region: 'frankfurt' });
@@ -236,12 +282,11 @@ function dispatchStreaming(chunks) {
 async function localSetup() {
   localStorage.setItem('__pd', JSON.stringify(pd));
   spies.push(jest.spyOn(intent.core, 'emit'));
-
   const intentOnSpy = jest.spyOn(intent.core, 'on');
   spies.push(intentOnSpy);
   intentOnSpy.mockReturnValue(() => true);
   await waitFor(() => {
-    root = renderWithProviders(<AppBase config={ initialConfig } />);
+    root = renderWithProviders(<div id="chatbot-container"><AppBase config={ initialConfig } /></div>);
   });
 }
 

diff --git a/dist/index.es.js b/dist/index.es.js
diff --git a/dist/index.es.js.map b/dist/index.es.js.map
diff --git a/dist/index.umd.js b/dist/index.umd.js
diff --git a/dist/index.umd.js.map b/dist/index.umd.js.map
diff --git a/index.html b/index.html
@@ -23,8 +23,8 @@
 </head>
 
 <body class="tw--grid tw--w-full tw--h-screen">
-  <div id="root" class="tw--grid tw--self-stretch tw--justify-self-stretch"></div>
+  <div id="chatbot-container" class="tw--grid tw--self-stretch tw--justify-self-stretch"></div>
   <script type="module" src="index.js"></script>
 </body>
 
-</html>
+</html>
diff --git a/index.js b/index.js
@@ -14,7 +14,7 @@ document.addEventListener('DOMContentLoaded', () => {
   // eslint-disable-next-line no-unused-expressions
   !localStorage.getItem('__cid') && localStorage.setItem('__cid', id);
 
-  ReactBotClient({ root: document.querySelector('#root'), initialConfig: getChatConfig(id) });
+  ReactBotClient({ root: document.querySelector('#chatbot-container'), initialConfig: getChatConfig(id) });
   // example implementation from the plugin user side
   intent.core.on(intent.type.email, (data) => {
     // MOCKERIES FOR TESTING PURPOSES

diff --git a/src/chatMocks.js b/src/chatMocks.js
@@ -56,7 +56,8 @@ export const initialConfig = {
       mealButton: 'Create your meal plan',
       error: 'Oops something went wrong.',
       tm505: 'Please enter valid email address',
-    }
+    },
+    closeVisible: true,
   },
 };
 

diff --git a/src/components/Button/variants.js b/src/components/Button/variants.js
@@ -19,7 +19,7 @@ export const basic = /*tw*/ tv({
 
 export const icon = /*tw*/ tv({
   slots: {
-    base: 'tw--flex-1 tw--text-[inherit]',
+    base: 'tw--text-[inherit]',
   },
   variants: {
     theme: {

diff --git a/src/components/Layout/head.jsx b/src/components/Layout/head.jsx
@@ -1,16 +1,58 @@
-import { useAppSelector } from '@/hooks';
+import { useAppDispatch, useAppSelector } from '@/hooks';
 
 import { Profile } from '@/components/Profile';
 import { getConfig } from '@/store/slices/config';
+import { IconBtn } from '@/components/Button';
+import { customEvents } from '@/config/analytics';
+import { track } from '@/services/tracking';
+import { getMeta } from '@/store/slices/meta';
+import { setClosed } from '@/store/slices/chat';
 import { layoutHead as variant } from './variants';
 
 export const LayoutHead = () => {
-  const { themeId: theme } = useAppSelector(getConfig);
+  const { themeId: theme, closeVisible } = useAppSelector(getConfig);
+  const dispatch = useAppDispatch();
+  const { cid, systemType, marketing } = useAppSelector(getMeta);
   const { base } = variant({ theme });
 
+  const onClick = (e) => {
+    e.currentTarget.disabled = true;
+    track({
+      eventType: customEvents.closeClicked,
+      systemType,
+      utmParams: marketing.lastUtmParams,
+      customerUuid: cid,
+    });
+    setTimeout(() => {
+      dispatch(setClosed());
+    }, 500);
+  };
+
   return (
     <div className={ base() }>
       <Profile />
+      { closeVisible && (
+        <IconBtn e2e="chat-close-btn" onClick={ onClick }>
+          <svg
+            height="24px" viewBox="0 0 24 24"
+            width="24px"
+          >
+            <g
+              stroke="currentColor" strokeLinecap="round"
+              strokeWidth="2"
+            >
+              <line
+                x1="6" x2="18"
+                y1="6" y2="18"
+              />
+              <line
+                x1="6" x2="18"
+                y1="18" y2="6"
+              />
+            </g>
+          </svg>
+        </IconBtn>
+      ) }
     </div>
   );
 };

diff --git a/src/components/Layout/variants.js b/src/components/Layout/variants.js
@@ -25,7 +25,7 @@ export const layoutBase = /*tw*/ tv({
 
 export const layoutHead = /*tw*/ tv({
   slots: {
-    base: 'tw--flex tw--px-5 tw--py-[11px] tw--shadow-[-1px_2px_5px_0]',
+    base: 'tw--flex tw--px-5 tw--py-[11px] tw--shadow-[-1px_2px_5px_0] tw--justify-between',
   },
   variants: {
     theme: {

diff --git a/src/config/analytics.js b/src/config/analytics.js
@@ -32,6 +32,7 @@ export const customEvents = {
   emailExist: 'EmailExist',
   priceSeen: 'PriceSeen',
   buttonClick: 'ButtonClick',
+  closeClicked: 'CloseClicked',
 };
 
 export const baseEventsArr = getKeys(baseEvents);

diff --git a/src/config/index.js b/src/config/index.js
@@ -74,11 +74,13 @@ export const chat = (id) => ({
       mealButton: 'Create your meal plan',
       error: 'Oops something went wrong.',
       tm505: 'Please enter valid email address',
-    }
+    },
+    closeVisible: true
   },
 });
 
-export const paymentData = { amount: '29.90',
+export const paymentData = {
+  amount: '29.90',
   amountInUSD: 29.9,
   frequency: 1,
   frequencyInMonths: 1,

diff --git a/src/middleware/socket.js b/src/middleware/socket.js
@@ -75,7 +75,8 @@ const chatMiddleware = store => next => action => {
     if (socket && socket.connected && message.trim() !== '') {
       socket.volatile.emit(
         events.chat,
-        { role: roles.user,
+        {
+          role: roles.user,
           message,
           term: getQueryParam(window.location.search, 'utm_chat'),
           user_id: meta.cid,
@@ -127,10 +128,16 @@ const chatMiddleware = store => next => action => {
   }
 
   if (setClosed.match(action)) {
-    document.querySelector('#chatbot-container')?.remove();
-    document.body.classList?.remove('scroll-stop');
+    const chatBotContainer = document.querySelector('#chatbot-container');
+    if (document.body && chatBotContainer) {
+      chatBotContainer.innerHTML = '';
+      document.body.classList.remove('scroll-stop');
+    }
+    const currentLocation = new URL(window.location.href);
+    currentLocation.search = '';
     localStorage.setItem(CHAT_FINISHED_TIMESTAMP, new Date().getTime());
-    socket.close();
+    window.location = currentLocation.toString();
+    if (socket) socket.close();
   }
 
   if (setTypingTimeoutExpired.match(action) && action.payload) {

diff --git a/src/store/slices/config.js b/src/store/slices/config.js
@@ -10,6 +10,7 @@ const configSlice = createSlice({
       state.translations = { ...initialState.translations, ...payload.translations };
       state.themeId = payload.themeId;
       state.chatUrl = payload.chatUrl;
+      state.closeVisible = payload.closeVisible;
     },
     resetConfig(state) {
       state.aiProfile = initialState.aiProfile;