feat: share page support configuration Whether to allow the original …

…view (labring#3194)
c121914yu · Nov 20, 2024 · 6ba751f · 6ba751f
1 parent 7692b92
commit 6ba751f
Show file tree

Hide file tree

Showing 19 changed files with 269 additions and 74 deletions.
diff --git a/docSite/content/zh-cn/docs/development/upgrading/4814.md b/docSite/content/zh-cn/docs/development/upgrading/4814.md
@@ -12,4 +12,5 @@ weight: 810
 1. 
 2. 新增 - 工作流支持进入聊天框/点击开始对话后，自动触发一轮对话。
 3. 新增 - 重写 chatContext，对话测试也会有日志，并且刷新后不会丢失对话。
-4. 优化 - 工作流 ui 细节。
+4. 新增 - 分享链接支持配置是否允许查看原文。
+5. 优化 - 工作流 ui 细节。
diff --git a/packages/global/common/file/type.d.ts b/packages/global/common/file/type.d.ts
@@ -5,4 +5,5 @@ export type FileTokenQuery = {
   teamId: string;
   uid: string; // tmbId/ share uid/ teamChat uid
   fileId: string;
+  customExpireMinutes?: number;
 };
diff --git a/packages/global/core/chat/utils.ts b/packages/global/core/chat/utils.ts
@@ -101,7 +101,7 @@ export const filterPublicNodeResponseData = ({
       for (let key in item) {
         if (key === 'toolDetail' || key === 'pluginDetail') {
           // @ts-ignore
-          obj[key] = filterPublicNodeResponseData({ flowResponses: item[key] });
+          obj[key] = filterPublicNodeResponseData({ flowResponses: item[key], responseDetail });
         } else if (filedList.includes(key)) {
           // @ts-ignore
           obj[key] = item[key];

diff --git a/packages/service/support/permission/controller.ts b/packages/service/support/permission/controller.ts
@@ -413,7 +413,8 @@ export const createFileToken = (data: FileTokenQuery) => {
     return Promise.reject('System unset FILE_TOKEN_KEY');
   }
 
-  const expireMinutes = bucketNameMap[data.bucketName].previewExpireMinutes;
+  const expireMinutes =
+    data.customExpireMinutes ?? bucketNameMap[data.bucketName].previewExpireMinutes;
   const expiredTime = Math.floor(addMinutes(new Date(), expireMinutes).getTime() / 1000);
 
   const key = (process.env.FILE_TOKEN_KEY as string) ?? 'filetoken';

diff --git a/packages/web/hooks/useToast.ts b/packages/web/hooks/useToast.ts
@@ -1,8 +1,10 @@
 import { useToast as uToast, UseToastOptions } from '@chakra-ui/react';
 import { CSSProperties, useCallback } from 'react';
+import { useTranslation } from 'next-i18next';
 
 export const useToast = (props?: UseToastOptions & { containerStyle?: CSSProperties }) => {
   const { containerStyle, ...toastProps } = props || {};
+  const { t } = useTranslation();
 
   const toast = uToast({
     position: 'top',
@@ -17,7 +19,11 @@ export const useToast = (props?: UseToastOptions & { containerStyle?: CSSPropert
   const myToast = useCallback(
     (options?: UseToastOptions) => {
       if (options?.title || options?.description) {
-        toast(options);
+        toast({
+          ...(options.title && { title: t(options.title as any) }),
+          ...(options.description && { description: t(options.description as any) }),
+          ...options
+        });
       }
     },
     [props]

diff --git a/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/ContextModal.tsx b/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/ContextModal.tsx
@@ -19,10 +19,12 @@ const ContextModal = ({ onClose, dataId }: { onClose: () => void; dataId: string
         const flatResData: ChatHistoryItemResType[] =
           res
             ?.map((item) => {
-              if (item.pluginDetail || item.toolDetail) {
-                return [item, ...(item.pluginDetail || []), ...(item.toolDetail || [])];
-              }
-              return item;
+              return [
+                item,
+                ...(item.pluginDetail || []),
+                ...(item.toolDetail || []),
+                ...(item.loopDetail || [])
+              ];
             })
             .flat() || [];
         return flatResData.find(isLLMNode)?.historyPreview || [];

diff --git a/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/QuoteModal.tsx b/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/QuoteModal.tsx
@@ -7,18 +7,22 @@ import type { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/ty
 import QuoteItem from '@/components/core/dataset/QuoteItem';
 import RawSourceBox from '@/components/core/dataset/RawSourceBox';
 import { getWebReqUrl } from '@fastgpt/web/common/system/utils';
+import { useContextSelector } from 'use-context-selector';
+import { ChatBoxContext } from '../Provider';
 
 const QuoteModal = ({
   rawSearch = [],
   onClose,
   canEditDataset,
   showRawSource,
+  chatItemId,
   metadata
 }: {
   rawSearch: SearchDataResponseItemType[];
   onClose: () => void;
   canEditDataset: boolean;
   showRawSource: boolean;
+  chatItemId: string;
   metadata?: {
     collectionId: string;
     sourceId?: string;
@@ -37,6 +41,13 @@ const QuoteModal = ({
     [metadata, rawSearch]
   );
 
+  const RawSourceBoxProps = useContextSelector(ChatBoxContext, (v) => ({
+    appId: v.appId,
+    chatId: v.chatId,
+    chatItemId,
+    ...(v.outLinkAuthData || {})
+  }));
+
   return (
     <>
       <MyModal
@@ -49,7 +60,7 @@ const QuoteModal = ({
         title={
           <Box>
             {metadata ? (
-              <RawSourceBox {...metadata} canView={showRawSource} />
+              <RawSourceBox {...metadata} {...RawSourceBoxProps} canView={showRawSource} />
             ) : (
               <>{t('common:core.chat.Quote Amount', { amount: rawSearch.length })}</>
             )}
@@ -64,6 +75,7 @@ const QuoteModal = ({
             rawSearch={filterResults}
             canEditDataset={canEditDataset}
             canViewSource={showRawSource}
+            chatItemId={chatItemId}
           />
         </ModalBody>
       </MyModal>
@@ -74,16 +86,25 @@ const QuoteModal = ({
 export default QuoteModal;
 
 export const QuoteList = React.memo(function QuoteList({
+  chatItemId,
   rawSearch = [],
   canEditDataset,
   canViewSource
 }: {
+  chatItemId?: string;
   rawSearch: SearchDataResponseItemType[];
   canEditDataset: boolean;
   canViewSource: boolean;
 }) {
   const theme = useTheme();
 
+  const RawSourceBoxProps = useContextSelector(ChatBoxContext, (v) => ({
+    chatItemId,
+    appId: v.appId,
+    chatId: v.chatId,
+    ...(v.outLinkAuthData || {})
+  }));
+
   return (
     <>
       {rawSearch.map((item, i) => (
@@ -101,6 +122,7 @@ export const QuoteList = React.memo(function QuoteList({
             quoteItem={item}
             canViewSource={canViewSource}
             canEditDataset={canEditDataset}
+            {...RawSourceBoxProps}
           />
         </Box>
       ))}

diff --git a/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/ResponseTags.tsx b/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/ResponseTags.tsx
@@ -250,6 +250,7 @@ const ResponseTags = ({
       {!!quoteModalData && (
         <QuoteModal
           {...quoteModalData}
+          chatItemId={historyItem.dataId}
           canEditDataset={notSharePage}
           showRawSource={showRawSource}
           onClose={() => setQuoteModalData(undefined)}

diff --git a/...p/src/components/core/chat/ChatContainer/PluginRunBox/components/RenderResponseDetail.tsx b/...p/src/components/core/chat/ChatContainer/PluginRunBox/components/RenderResponseDetail.tsx
@@ -17,7 +17,7 @@ const RenderResponseDetail = () => {
     <>{t('chat:in_progress')}</>
   ) : (
     <Box flex={'1 0 0'} h={'100%'} overflow={'auto'}>
-      <ResponseBox useMobile={true} response={responseData} />
+      <ResponseBox useMobile={true} response={responseData} dataId={chatRecords?.[1]?.dataId} />
     </Box>
   );
 };

diff --git a/projects/app/src/components/core/chat/components/WholeResponseModal.tsx b/projects/app/src/components/core/chat/components/WholeResponseModal.tsx
@@ -31,10 +31,12 @@ type sideTabItemType = {
 /* Per response value */
 export const WholeResponseContent = ({
   activeModule,
-  hideTabs
+  hideTabs,
+  dataId
 }: {
   activeModule: ChatHistoryItemResType;
   hideTabs?: boolean;
+  dataId?: string;
 }) => {
   const { t } = useTranslation();
 
@@ -231,7 +233,14 @@ export const WholeResponseContent = ({
         {activeModule.quoteList && activeModule.quoteList.length > 0 && (
           <Row
             label={t('common:core.chat.response.module quoteList')}
-            rawDom={<QuoteList canEditDataset canViewSource rawSearch={activeModule.quoteList} />}
+            rawDom={
+              <QuoteList
+                canEditDataset
+                canViewSource
+                chatItemId={dataId}
+                rawSearch={activeModule.quoteList}
+              />
+            }
           />
         )}
       </>
@@ -529,10 +538,12 @@ const SideTabItem = ({
 /* Modal main container */
 export const ResponseBox = React.memo(function ResponseBox({
   response,
+  dataId,
   hideTabs = false,
   useMobile = false
 }: {
   response: ChatHistoryItemResType[];
+  dataId?: string;
   hideTabs?: boolean;
   useMobile?: boolean;
 }) {
@@ -655,7 +666,7 @@ export const ResponseBox = React.memo(function ResponseBox({
             </Box>
           </Box>
           <Box flex={'5 0 0'} w={0} height={'100%'}>
-            <WholeResponseContent activeModule={activeModule} hideTabs={hideTabs} />
+            <WholeResponseContent dataId={dataId} activeModule={activeModule} hideTabs={hideTabs} />
           </Box>
         </Flex>
       ) : (
@@ -715,7 +726,11 @@ export const ResponseBox = React.memo(function ResponseBox({
                 </Box>
               </Flex>
               <Box flex={'1 0 0'}>
-                <WholeResponseContent activeModule={activeModule} hideTabs={hideTabs} />
+                <WholeResponseContent
+                  dataId={dataId}
+                  activeModule={activeModule}
+                  hideTabs={hideTabs}
+                />
               </Box>
             </Flex>
           )}
@@ -754,7 +769,7 @@ const WholeResponseModal = ({ onClose, dataId }: { onClose: () => void; dataId:
       }
     >
       {!!response?.length ? (
-        <ResponseBox response={response} />
+        <ResponseBox response={response} dataId={dataId} />
       ) : (
         <EmptyTip text={t('chat:no_workflow_response')} />
       )}

diff --git a/projects/app/src/components/core/dataset/QuoteItem.tsx b/projects/app/src/components/core/dataset/QuoteItem.tsx
@@ -9,6 +9,7 @@ import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
 import dynamic from 'next/dynamic';
 import MyBox from '@fastgpt/web/components/common/MyBox';
 import { SearchScoreTypeEnum, SearchScoreTypeMap } from '@fastgpt/global/core/dataset/constants';
+import type { readCollectionSourceBody } from '@/pages/api/core/dataset/collection/read';
 
 const InputDataModal = dynamic(() => import('@/pages/dataset/detail/components/InputDataModal'));
 
@@ -45,12 +46,13 @@ const scoreTheme: Record<
 const QuoteItem = ({
   quoteItem,
   canViewSource,
-  canEditDataset
+  canEditDataset,
+  ...RawSourceBoxProps
 }: {
   quoteItem: SearchDataResponseItemType;
   canViewSource?: boolean;
   canEditDataset?: boolean;
-}) => {
+} & Omit<readCollectionSourceBody, 'collectionId'>) => {
   const { t } = useTranslation();
   const [editInputData, setEditInputData] = useState<{ dataId: string; collectionId: string }>();
 
@@ -196,6 +198,7 @@ const QuoteItem = ({
             sourceName={quoteItem.sourceName}
             sourceId={quoteItem.sourceId}
             canView={canViewSource}
+            {...RawSourceBoxProps}
           />
           <Box flex={1} />
           {quoteItem.id && canEditDataset && (

diff --git a/projects/app/src/components/core/dataset/RawSourceBox.tsx b/projects/app/src/components/core/dataset/RawSourceBox.tsx
@@ -6,10 +6,10 @@ import { getCollectionSourceAndOpen } from '@/web/core/dataset/hooks/readCollect
 import { getSourceNameIcon } from '@fastgpt/global/core/dataset/utils';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import { useI18n } from '@/web/context/I18n';
-import { ShareChatAuthProps } from '@fastgpt/global/support/permission/chat';
+import type { readCollectionSourceBody } from '@/pages/api/core/dataset/collection/read';
 
 type Props = BoxProps &
-  ShareChatAuthProps & {
+  readCollectionSourceBody & {
     sourceName?: string;
     collectionId: string;
     sourceId?: string;
@@ -18,11 +18,18 @@ type Props = BoxProps &
 
 const RawSourceBox = ({
   sourceId,
-  collectionId,
   sourceName = '',
   canView = true,
+
+  collectionId,
+  appId,
+  chatId,
+  chatItemId,
   shareId,
   outLinkUid,
+  teamId,
+  teamToken,
+
   ...props
 }: Props) => {
   const { t } = useTranslation();
@@ -33,8 +40,13 @@ const RawSourceBox = ({
   const icon = useMemo(() => getSourceNameIcon({ sourceId, sourceName }), [sourceId, sourceName]);
   const read = getCollectionSourceAndOpen({
     collectionId,
+    appId,
+    chatId,
+    chatItemId,
     shareId,
-    outLinkUid
+    outLinkUid,
+    teamId,
+    teamToken
   });
 
   return (
@@ -56,7 +68,7 @@ const RawSourceBox = ({
           : {})}
         {...props}
       >
-        <MyIcon name={icon as any} w={['16px', '20px']} mr={2} />
+        <MyIcon name={icon as any} w={['1rem', '1.25rem']} mr={2} />
         <Box
           maxW={['200px', '300px']}
           className={props.className ?? 'textEllipsis'}

diff --git a/projects/app/src/global/core/chat/utils.ts b/projects/app/src/global/core/chat/utils.ts
@@ -28,10 +28,12 @@ export function addStatisticalDataToHistoryItem(historyItem: ChatItemType) {
   const flatResData: ChatHistoryItemResType[] =
     historyItem.responseData
       ?.map((item) => {
-        if (item.pluginDetail || item.toolDetail) {
-          return [item, ...(item.pluginDetail || []), ...(item.toolDetail || [])];
-        }
-        return item;
+        return [
+          item,
+          ...(item.pluginDetail || []),
+          ...(item.toolDetail || []),
+          ...(item.loopDetail || [])
+        ];
       })
       .flat() || [];