4.6.7 first pr (#726)

projects/app/src/components/ChatBox/FeedbackModal.tsx

@@ -40,8 +40,8 @@ const FeedbackModal = ({
     onSuccess() {
       onSuccess(ref.current?.value || t('core.chat.feedback.No Content'));
     },
-    successToast: t('chat.Feedback Success'),
-    errorToast: t('chat.Feedback Failed')
+    successToast: t('core.chat.Feedback Success'),
+    errorToast: t('core.chat.Feedback Failed')
   });
 
   return (
@@ -49,17 +49,17 @@ const FeedbackModal = ({
       isOpen={true}
       onClose={onClose}
       iconSrc="/imgs/modal/badAnswer.svg"
-      title={t('chat.Feedback Modal')}
+      title={t('core.chat.Feedback Modal')}
     >
       <ModalBody>
-        <Textarea ref={ref} rows={10} placeholder={t('chat.Feedback Modal Tip')} />
+        <Textarea ref={ref} rows={10} placeholder={t('core.chat.Feedback Modal Tip')} />
       </ModalBody>
       <ModalFooter>
         <Button variant={'whiteBase'} mr={2} onClick={onClose}>
           {t('Cancel')}
         </Button>
         <Button isLoading={isLoading} onClick={mutate}>
-          {t('chat.Feedback Submit')}
+          {t('core.chat.Feedback Submit')}
         </Button>
       </ModalFooter>
     </MyModal>

projects/app/src/components/ChatBox/MessageInput.tsx

@@ -8,10 +8,11 @@ import MyIcon from '@fastgpt/web/components/common/Icon';
 import { useRouter } from 'next/router';
 import { useSelectFile } from '@/web/common/file/hooks/useSelectFile';
 import { compressImgFileAndUpload } from '@/web/common/file/controller';
-import { useToast } from '@/web/common/hooks/useToast';
 import { customAlphabet } from 'nanoid';
 import { IMG_BLOCK_KEY } from '@fastgpt/global/core/chat/constants';
 import { addDays } from 'date-fns';
+import { useRequest } from '@/web/common/hooks/useRequest';
+import { MongoImageTypeEnum } from '@fastgpt/global/common/file/image/constants';
 const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz1234567890', 6);
 
 enum FileTypeEnum {
@@ -45,7 +46,6 @@ const MessageInput = ({
   resetInputVal: (val: string) => void;
 }) => {
   const { shareId } = useRouter().query as { shareId?: string };
-  const { toast } = useToast();
   const {
     isSpeaking,
     isTransCription,
@@ -68,17 +68,18 @@ const MessageInput = ({
     maxCount: 10
   });
 
-  const uploadFile = useCallback(
-    async (file: FileItemType) => {
+  const { mutate: uploadFile } = useRequest({
+    mutationFn: async (file: FileItemType) => {
       if (file.type === FileTypeEnum.image) {
         try {
           const src = await compressImgFileAndUpload({
+            type: MongoImageTypeEnum.chatImage,
             file: file.rawFile,
             maxW: 4329,
             maxH: 4329,
             maxSize: 1024 * 1024 * 5,
             // 30 day expired.
-            expiredTime: addDays(new Date(), 30),
+            expiredTime: addDays(new Date(), 7),
             shareId
           });
           setFileList((state) =>
@@ -94,16 +95,13 @@ const MessageInput = ({
         } catch (error) {
           setFileList((state) => state.filter((item) => item.id !== file.id));
           console.log(error);
-
-          toast({
-            status: 'error',
-            title: t('common.Upload File Failed')
-          });
+          return Promise.reject(error);
         }
       }
     },
-    [shareId, t, toast]
-  );
+    errorToast: t('common.Upload File Failed')
+  });
+
   const onSelectFile = useCallback(
     async (files: File[]) => {
       if (!files || files.length === 0) {
@@ -219,7 +217,7 @@ ${images.map((img) => JSON.stringify({ src: img.src })).join('\n')}
           visibility={isSpeaking && isTransCription ? 'visible' : 'hidden'}
         >
           <Spinner size={'sm'} mr={4} />
-          {t('chat.Converting to text')}
+          {t('core.chat.Converting to text')}
         </Flex>
 
         {/* file preview */}

projects/app/src/components/ChatBox/QuoteModal.tsx

@@ -5,7 +5,7 @@ import MyModal from '../MyModal';
 import { useTranslation } from 'next-i18next';
 import type { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type';
 import QuoteItem from '../core/dataset/QuoteItem';
-import { RawSourceText } from '@/pages/dataset/detail/components/InputDataModal';
+import RawSourceBox from '../core/dataset/RawSourceBox';
 
 const QuoteModal = ({
   rawSearch = [],
@@ -46,7 +46,7 @@ const QuoteModal = ({
         title={
           <Box>
             {metadata ? (
-              <RawSourceText {...metadata} canView={false} />
+              <RawSourceBox {...metadata} canView={false} />
             ) : (
               <>{t('core.chat.Quote Amount', { amount: rawSearch.length })}</>
             )}

projects/app/src/components/ChatBox/ReadFeedbackModal.tsx

@@ -19,7 +19,7 @@ const ReadFeedbackModal = ({
       isOpen={true}
       onClose={onClose}
       iconSrc="/imgs/modal/readFeedback.svg"
-      title={t('chat.Feedback Modal')}
+      title={t('core.chat.Feedback Modal')}
     >
       <ModalBody>{content}</ModalBody>
       <ModalFooter>

projects/app/src/components/ChatBox/ResponseTags.tsx

@@ -92,7 +92,7 @@ const ResponseTags = ({
     <>
       {sourceList.length > 0 && (
         <>
-          <ChatBoxDivider icon="core/chat/quoteFill" text={t('chat.Quote')} />
+          <ChatBoxDivider icon="core/chat/quoteFill" text={t('core.chat.Quote')} />
           <Flex alignItems={'center'} flexWrap={'wrap'} gap={2}>
             {sourceList.map((item) => (
               <MyTooltip key={item.collectionId} label={t('core.chat.quote.Read Quote')}>

projects/app/src/components/ChatBox/SelectMarkCollection.tsx

@@ -46,7 +46,7 @@ const SelectMarkCollection = ({
           paths={paths}
           onClose={onClose}
           setParentId={setParentId}
-          tips={t('chat.Select Mark Kb Desc')}
+          tips={t('core.chat.Select Mark Kb Desc')}
         >
           <ModalBody flex={'1 0 0'} overflowY={'auto'}>
             <Grid
@@ -164,19 +164,23 @@ const SelectMarkCollection = ({
         <InputDataModal
           onClose={onClose}
           collectionId={adminMarkData.collectionId}
+          dataId={adminMarkData.dataId}
           defaultValue={{
-            id: adminMarkData.dataId,
             q: adminMarkData.q,
-            a: adminMarkData.a,
-            indexes: [getDefaultIndex({ dataId: `${Date.now()}` })]
+            a: adminMarkData.a
           }}
           onSuccess={(data) => {
-            if (!data.q || !adminMarkData.datasetId || !adminMarkData.collectionId || !data.id) {
+            if (
+              !data.q ||
+              !adminMarkData.datasetId ||
+              !adminMarkData.collectionId ||
+              !data.dataId
+            ) {
               return onClose();
             }
 
             onSuccess({
-              dataId: data.id,
+              dataId: data.dataId,
               datasetId: adminMarkData.datasetId,
               collectionId: adminMarkData.collectionId,
               q: data.q,

projects/app/src/components/ChatBox/index.tsx

@@ -910,14 +910,15 @@ const ChatBox = (
                         )}
                         {/* admin mark content */}
                         {showMarkIcon && item.adminFeedback && (
-                          <Box>
+                          <Box fontSize={'sm'}>
                             <ChatBoxDivider
                               icon="core/app/markLight"
-                              text={t('chat.Admin Mark Content')}
+                              text={t('core.chat.Admin Mark Content')}
                             />
-                            <Box whiteSpace={'pre'}>{`${item.adminFeedback.q || ''}${
-                              item.adminFeedback.a ? `\n${item.adminFeedback.a}` : ''
-                            }`}</Box>
+                            <Box whiteSpace={'pre'}>
+                              <Box color={'black'}>{item.adminFeedback.q}</Box>
+                              <Box color={'myGray.600'}>{item.adminFeedback.a}</Box>
+                            </Box>
                           </Box>
                         )}
                       </Card>
@@ -996,6 +997,7 @@ const ChatBox = (
           setAdminMarkData={(e) => setAdminMarkData({ ...e, chatItemId: adminMarkData.chatItemId })}
           onClose={() => setAdminMarkData(undefined)}
           onSuccess={(adminFeedback) => {
+            console.log(adminMarkData);
             if (!appId || !chatId || !adminMarkData.chatItemId) return;
             updateChatAdminFeedback({
               appId,
@@ -1003,6 +1005,7 @@ const ChatBox = (
               chatItemId: adminMarkData.chatItemId,
               ...adminFeedback
             });
+
             // update dom
             setChatHistory((state) =>
               state.map((chatItem) =>
@@ -1234,7 +1237,7 @@ function ChatController({
       {!!onDelete && (
         <>
           {onRetry && (
-            <MyTooltip label={t('chat.retry')}>
+            <MyTooltip label={t('core.chat.retry')}>
               <MyIcon
                 {...controlIconStyle}
                 name={'common/retryLight'}
@@ -1301,7 +1304,7 @@ function ChatController({
           </MyTooltip>
         ))}
       {!!onMark && (
-        <MyTooltip label={t('chat.Mark')}>
+        <MyTooltip label={t('core.chat.Mark')}>
           <MyIcon
             {...controlIconStyle}
             name={'core/app/markLight'}