diff --git a/client/src/components/Input/AdjustToneButton.jsx b/client/src/components/Input/AdjustToneButton.jsx
index e9153a0c72..a89e787451 100644
--- a/client/src/components/Input/AdjustToneButton.jsx
+++ b/client/src/components/Input/AdjustToneButton.jsx
@@ -1,13 +1,13 @@
import React from 'react';
export default function AdjustButton({ onClick }) {
- const clickHandler = (e) => {
+ const clickHandler = e => {
e.preventDefault();
onClick();
};
return (
diff --git a/client/src/components/Input/BingStyles.jsx b/client/src/components/Input/BingStyles.jsx
index 440107ce11..369d7237b9 100644
--- a/client/src/components/Input/BingStyles.jsx
+++ b/client/src/components/Input/BingStyles.jsx
@@ -1,36 +1,38 @@
import React, { useState, useEffect, forwardRef } from 'react';
import { Tabs, TabsList, TabsTrigger } from '../ui/Tabs.tsx';
-import { useDispatch, useSelector } from 'react-redux';
-import { setConversation } from '~/store/convoSlice';
+import { useRecoilValue, useRecoilState } from 'recoil';
+// import { setConversation } from '~/store/convoSlice';
+
+import store from '~/store';
function BingStyles(props, ref) {
- const dispatch = useDispatch();
const [value, setValue] = useState('fast');
- const { model } = useSelector((state) => state.submit);
- const { conversationId } = useSelector((state) => state.convo);
- const { messages } = useSelector((state) => state.messages);
+
+ const [conversation, setConversation] = useRecoilState(store.conversation) || {};
+ const { model, conversationId } = conversation;
+ const messages = useRecoilValue(store.messages);
const isBing = model === 'bingai' || model === 'sydney';
useEffect(() => {
- if (model === 'bingai' && !conversationId || model === 'sydney') {
- dispatch(setConversation({ toneStyle: value }));
+ if ((model === 'bingai' && !conversationId) || model === 'sydney') {
+ setConversation(prevState => ({ ...prevState, toneStyle: value }));
}
- }, [conversationId, model, value, dispatch]);
+ }, [conversationId, model, value]);
- const show = isBing && ((!conversationId || messages?.length === 0) || props.show);
+ const show = isBing && (!conversationId || messages?.length === 0 || props.show);
const defaultClasses = 'p-2 rounded-md font-normal bg-white/[.60] dark:bg-gray-700 text-black';
const defaultSelected = defaultClasses + 'font-medium data-[state=active]:text-white';
- const selectedClass = (val) => val + '-tab ' + defaultSelected;
+ const selectedClass = val => val + '-tab ' + defaultSelected;
const changeHandler = value => {
setValue(value);
- dispatch(setConversation({ toneStyle: value }));
+ setConversation(prevState => ({ ...prevState, toneStyle: value }));
};
return (
diff --git a/client/src/components/Input/index.jsx b/client/src/components/Input/index.jsx
index 6332aa7654..359767aad0 100644
--- a/client/src/components/Input/index.jsx
+++ b/client/src/components/Input/index.jsx
@@ -1,19 +1,14 @@
import React, { useEffect, useRef, useState } from 'react';
import { useRecoilValue, useRecoilState } from 'recoil';
-// import { SSE } from '~/utils/sse';
import SubmitButton from './SubmitButton';
-// import AdjustToneButton from './AdjustToneButton';
-// import BingStyles from './BingStyles';
+import AdjustToneButton from './AdjustToneButton';
+import BingStyles from './BingStyles';
import ModelMenu from './Models/ModelMenu';
import Footer from './Footer';
import TextareaAutosize from 'react-textarea-autosize';
import createPayload from '~/utils/createPayload';
import RegenerateIcon from '../svg/RegenerateIcon';
import StopGeneratingIcon from '../svg/StopGeneratingIcon';
-// import { setConversation, setError, refreshConversation } from '~/store/convoSlice';
-// import { setMessages } from '~/store/messageSlice';
-// import { setSubmitState, toggleCursor } from '~/store/submitSlice';
-// import { setText } from '~/store/textSlice';
import { useMessageHandler } from '../../utils/handleSubmit';
import store from '~/store';
@@ -62,258 +57,11 @@ export default function TextChat() {
return () => resizeObserver.disconnect();
}, [inputRef]);
- // const messageHandler = (data, currentState, currentMsg) => {
- // const { messages, message, sender, isRegenerate } = currentState;
-
- // if (isRegenerate)
- // dispatch(
- // setMessages([
- // ...messages,
- // {
- // sender,
- // text: data,
- // parentMessageId: message?.overrideParentMessageId,
- // messageId: message?.overrideParentMessageId + '_',
- // submitting: true
- // }
- // ])
- // );
- // else
- // dispatch(
- // setMessages([
- // ...messages,
- // currentMsg,
- // {
- // sender,
- // text: data,
- // parentMessageId: currentMsg?.messageId,
- // messageId: currentMsg?.messageId + '_',
- // submitting: true
- // }
- // ])
- // );
- // };
-
- // const cancelHandler = (data, currentState, currentMsg) => {
- // const { messages, message, sender, isRegenerate } = currentState;
-
- // if (isRegenerate)
- // dispatch(
- // setMessages([
- // ...messages,
- // {
- // sender,
- // text: data,
- // parentMessageId: message?.overrideParentMessageId,
- // messageId: message?.overrideParentMessageId + '_',
- // cancelled: true
- // }
- // ])
- // );
- // else
- // dispatch(
- // setMessages([
- // ...messages,
- // currentMsg,
- // {
- // sender,
- // text: data,
- // parentMessageId: currentMsg?.messageId,
- // messageId: currentMsg?.messageId + '_',
- // cancelled: true
- // }
- // ])
- // );
- // };
-
- // const createdHandler = (data, currentState, currentMsg) => {
- // const { conversationId } = currentMsg;
- // dispatch(
- // setConversation({
- // conversationId,
- // latestMessage: null
- // })
- // );
- // };
-
- // const convoHandler = (data, currentState) => {
- // const { requestMessage, responseMessage } = data;
- // const { messages, message, isCustomModel, isRegenerate } = currentState;
- // const { model, chatGptLabel, promptPrefix } = message;
- // if (isRegenerate) dispatch(setMessages([...messages, responseMessage]));
- // else dispatch(setMessages([...messages, requestMessage, responseMessage]));
- // dispatch(setSubmitState(false));
-
- // const isBing = model === 'bingai' || model === 'sydney';
-
- // // refresh title
- // if (requestMessage.parentMessageId == '00000000-0000-0000-0000-000000000000') {
- // setTimeout(() => {
- // dispatch(refreshConversation());
- // }, 2000);
-
- // // in case it takes too long.
- // setTimeout(() => {
- // dispatch(refreshConversation());
- // }, 5000);
- // }
-
- // if (!isBing && convo.conversationId === null && convo.parentMessageId === null) {
- // const { title } = data;
- // const { conversationId, messageId } = responseMessage;
- // dispatch(
- // setConversation({
- // title,
- // conversationId,
- // parentMessageId: messageId,
- // jailbreakConversationId: null,
- // conversationSignature: null,
- // clientId: null,
- // invocationId: null,
- // chatGptLabel: model === isCustomModel ? chatGptLabel : null,
- // promptPrefix: model === isCustomModel ? promptPrefix : null,
- // latestMessage: null
- // })
- // );
- // } else if (model === 'bingai') {
- // console.log('Bing data:', data);
- // const { title } = data;
- // const { conversationSignature, clientId, conversationId, invocationId, parentMessageId } =
- // responseMessage;
- // dispatch(
- // setConversation({
- // title,
- // parentMessageId,
- // conversationSignature,
- // clientId,
- // conversationId,
- // invocationId,
- // latestMessage: null
- // })
- // );
- // } else if (model === 'sydney') {
- // const { title } = data;
- // const {
- // jailbreakConversationId,
- // parentMessageId,
- // conversationSignature,
- // clientId,
- // conversationId,
- // invocationId
- // } = responseMessage;
- // dispatch(
- // setConversation({
- // title,
- // jailbreakConversationId,
- // parentMessageId,
- // conversationSignature,
- // clientId,
- // conversationId,
- // invocationId,
- // latestMessage: null
- // })
- // );
- // }
- // };
-
- // const errorHandler = (data, currentState, currentMsg) => {
- // const { messages, message } = currentState;
- // console.log('Error:', data);
- // const errorResponse = {
- // ...data,
- // error: true,
- // parentMessageId: currentMsg?.messageId
- // };
- // dispatch(setSubmitState(false));
- // dispatch(setMessages([...messages, currentMsg, errorResponse]));
- // dispatch(setText(message?.text));
- // dispatch(setError(true));
- // return;
- // };
const submitMessage = () => {
ask({ text });
setText('');
};
- // useEffect(() => {
- // inputRef.current?.focus();
- // if (Object.keys(submission).length === 0) {
- // return;
- // }
-
- // const currentState = submission;
-
- // let currentMsg = { ...currentState.message };
- // let latestResponseText = '';
-
- // const { server, payload } = createPayload(submission);
- // const onMessage = e => {
- // if (stopStream) {
- // return;
- // }
-
- // const data = JSON.parse(e.data);
-
- // if (data.final) {
- // convoHandler(data, currentState);
- // dispatch(toggleCursor());
- // console.log('final', data);
- // }
- // if (data.created) {
- // currentMsg = data.message;
- // createdHandler(data, currentState, currentMsg);
- // } else {
- // let text = data.text || data.response;
- // if (data.initial) {
- // dispatch(toggleCursor());
- // }
- // if (data.message) {
- // latestResponseText = text;
- // messageHandler(text, currentState, currentMsg);
- // }
- // // console.log('dataStream', data);
- // }
- // };
-
- // const events = new SSE(server, {
- // payload: JSON.stringify(payload),
- // headers: { 'Content-Type': 'application/json' }
- // });
-
- // events.onopen = function () {
- // console.log('connection is opened');
- // };
-
- // events.onmessage = onMessage;
-
- // events.oncancel = () => {
- // dispatch(toggleCursor(true));
- // cancelHandler(latestResponseText, currentState, currentMsg);
- // };
-
- // events.onerror = function (e) {
- // console.log('error in opening conn.');
- // events.close();
-
- // const data = JSON.parse(e.data);
- // dispatch(toggleCursor(true));
- // errorHandler(data, currentState, currentMsg);
- // };
-
- // events.stream();
-
- // return () => {
- // events.removeEventListener('message', onMessage);
- // dispatch(toggleCursor(true));
- // const isCancelled = events.readyState <= 1;
- // events.close();
- // if (isCancelled) {
- // const e = new Event('cancel');
- // events.dispatchEvent(e);
- // }
- // };
- // }, [submission]);
-
const handleRegenerate = () => {
if (latestMessage && !latestMessage?.isCreatedByUser) regenerate(latestMessage);
};
@@ -389,10 +137,10 @@ export default function TextChat() {
diff --git a/client/src/components/Messages/Message.jsx b/client/src/components/Messages/Message.jsx
index e0389179f6..7d61a110dd 100644
--- a/client/src/components/Messages/Message.jsx
+++ b/client/src/components/Messages/Message.jsx
@@ -83,7 +83,7 @@ export default function Message({
if (message.bg && searchResult) {
props.className = message.bg.split('hover')[0];
- props.titleClass = message.bg.split(props.className)[1] + ' cursor-pointer';
+ props.titleclass = message.bg.split(props.className)[1] + ' cursor-pointer';
}
const resubmitMessage = () => {
@@ -144,7 +144,7 @@ export default function Message({
{searchResult && (
diff --git a/client/src/store/conversation.js b/client/src/store/conversation.js
index 07a16e5f18..9e1c0f080e 100644
--- a/client/src/store/conversation.js
+++ b/client/src/store/conversation.js
@@ -42,7 +42,9 @@ const messages = atom({
const messagesTree = selector({
key: 'messagesTree',
get: ({ get }) => {
- return buildTree(get(messages));
+ const _messages = get(messages);
+ const groupAll = _messages?.[0]?.searchResult;
+ return buildTree(_messages, groupAll);
}
});