feat: sync api collection will refresh title;perf: invite link ux (#4237)

* update queue

* feat: sync api collection will refresh title

* sync collection

* remove lock

* perf: invite link ux

packages/web/common/zustand/index.ts

@@ -0,0 +1,8 @@
+import zustandNpm from 'zustand';
+
+export * from 'zustand';
+export * from 'zustand/middleware';
+export * from 'zustand/middleware/immer';
+
+export * from 'zustand';
+export default zustandNpm;

packages/web/hooks/useCopyData.tsx

@@ -3,6 +3,11 @@ import { useToast } from './useToast';
 import { useCallback } from 'react';
 import { hasHttps } from '../common/system/utils';
 import { isProduction } from '@fastgpt/global/common/system/constants';
+import MyModal from '../components/common/MyModal';
+import React from 'react';
+import { Box, ModalBody } from '@chakra-ui/react';
+import Tag from '../components/common/Tag';
+import { useCommonStore } from '../store/useCommonStore';
 
 /**
  * copy text data
@@ -10,49 +15,27 @@ import { isProduction } from '@fastgpt/global/common/system/constants';
 export const useCopyData = () => {
   const { t } = useTranslation();
   const { toast } = useToast();
+  const { setCopyContent } = useCommonStore();
 
   const copyData = useCallback(
-    async (
-      data: string,
-      title: string | null = t('common:common.Copy Successful'),
-      duration = 1000
-    ) => {
+    async (data: string, title = t('common:common.Copy Successful'), duration = 1000) => {
       data = data.trim();
 
       try {
         if ((hasHttps() || !isProduction) && navigator.clipboard) {
           await navigator.clipboard.writeText(data);
+          if (title) {
+            toast({
+              title,
+              status: 'success',
+              duration
+            });
+          }
         } else {
           throw new Error('');
         }
       } catch (error) {
-        // console.log(error);
-
-        const textarea = document.createElement('textarea');
-        textarea.value = data;
-        textarea.style.position = 'absolute';
-        textarea.style.opacity = '0';
-        document.body.appendChild(textarea);
-
-        textarea.select();
-        const res = document.execCommand('copy');
-        document.body.removeChild(textarea);
-
-        if (!res) {
-          return toast({
-            title: t('common:common.Copy_failed'),
-            status: 'error',
-            duration
-          });
-        }
-      }
-
-      if (title) {
-        toast({
-          title,
-          status: 'success',
-          duration
-        });
+        setCopyContent(data);
       }
     },
     [t, toast]
@@ -62,3 +45,29 @@ export const useCopyData = () => {
     copyData
   };
 };
+
+export const ManualCopyModal = () => {
+  const { t } = useTranslation();
+  const { copyContent, setCopyContent } = useCommonStore();
+
+  return (
+    <MyModal
+      isOpen={!!copyContent}
+      iconSrc="copy"
+      iconColor="primary.600"
+      title={t('common:common.Copy')}
+      maxW={['90vw', '500px']}
+      w={'100%'}
+      onClose={() => setCopyContent(undefined)}
+    >
+      <ModalBody>
+        <Tag w={'100%'} colorSchema="blue">
+          {t('common:can_copy_content_tip')}
+        </Tag>
+        <Box mt={3} borderRadius={'md'} p={3} border={'base'} userSelect={'all'}>
+          {copyContent}
+        </Box>
+      </ModalBody>
+    </MyModal>
+  );
+};

packages/web/i18n/en/account_team.json

@@ -21,7 +21,7 @@
   "edit_member_tip": "username",
   "edit_info": "Edit information",
   "edit_org_info": "Edit organization information",
-  "expires": "Expiration",
+  "expires": "Expiration time",
   "forbid_hint": "After forbidden, this invitation link will become invalid. This action is irreversible. Are you sure you want to deactivate?",
   "forbid_success": "Forbid success",
   "forbidden": "Forbidden",
@@ -62,4 +62,4 @@
   "user_team_leave_team": "Leave the team",
   "user_team_leave_team_failed": "Failure to leave the team",
   "waiting": "To be accepted"
-}
+}

packages/web/i18n/en/common.json

@@ -37,6 +37,7 @@
   "add_new_param": "Add new param",
   "app.templateMarket.templateTags.Writing": "Writing",
   "back": "Back",
+  "can_copy_content_tip": "It is not possible to copy automatically using the browser, please manually copy the following content",
   "chose_condition": "Choose Condition",
   "chosen": "Chosen",
   "classification": "Classification",
@@ -128,7 +129,6 @@
   "common.Continue_Adding": "Continue adding",
   "common.Copy": "Copy",
   "common.Copy Successful": "Copied Successfully",
-  "common.Copy_failed": "Copy Failed, Please Copy Manually",
   "common.Create Failed": "Creation Failed",
   "common.Create Success": "Created Successfully",
   "common.Create Time": "Creation Time",
@@ -645,11 +645,11 @@
   "core.dataset.training.Auto mode": "Auto index",
   "core.dataset.training.Auto mode Tip": "Increase the semantic richness of data blocks by generating related questions and summaries through sub-indexes and calling models, making it more conducive to retrieval. Requires more storage space and increases AI call times.",
   "core.dataset.training.Chunk mode": "Chunk",
-  "core.dataset.training.Full": "Estimated Over 5 Minutes",
+  "core.dataset.training.Full": "It is expected to be more than 20 minutes",
   "core.dataset.training.Leisure": "Idle",
   "core.dataset.training.QA mode": "QA",
   "core.dataset.training.Vector queue": "Index Queue",
-  "core.dataset.training.Waiting": "Estimated 5 Minutes",
+  "core.dataset.training.Waiting": "Estimated 20 minutes",
   "core.dataset.training.Website Sync": "Website Sync",
   "core.dataset.training.tag": "Queue Status",
   "core.dataset.website.Base Url": "Base URL",

packages/web/i18n/en/dataset.json

@@ -5,6 +5,7 @@
   "api_url": "API Url",
   "auto_indexes": "Automatically generate supplementary indexes",
   "auto_indexes_tips": "Additional index generation is performed through large models to improve semantic richness and improve retrieval accuracy.",
+  "auto_training_queue": "Enhanced index queueing",
   "chunk_max_tokens": "max_tokens",
   "close_auto_sync": "Are you sure you want to turn off automatic sync?",
   "collection.Create update time": "Creation/Update Time",
@@ -56,6 +57,7 @@
   "ideal_chunk_length_tips": "Segment according to the end symbol and combine multiple segments into one block. This value determines the estimated size of the block, if there is any fluctuation.",
   "image_auto_parse": "Automatic image indexing",
   "image_auto_parse_tips": "Call VLM to automatically label the pictures in the document and generate additional search indexes",
+  "image_training_queue": "Queue of image processing",
   "import.Auto mode Estimated Price Tips": "The text understanding model needs to be called, which requires more points: {{price}} points/1K tokens",
   "import.Embedding Estimated Price Tips": "Only use the index model and consume a small amount of AI points: {{price}} points/1K tokens",
   "import_confirm": "Confirm upload",

packages/web/i18n/zh-CN/account_team.json

@@ -24,7 +24,7 @@
   "edit_member_tip": "用户名",
   "edit_info": "编辑信息",
   "edit_org_info": "编辑部门信息",
-  "expires": "有效期",
+  "expires": "过期时间",
   "export_members": "导出成员",
   "forbid_hint": "停用后，该邀请链接将失效。 该操作不可撤销，是否确认停用？",
   "forbid_success": "停用成功",
@@ -78,4 +78,4 @@
   "user_team_leave_team": "离开团队",
   "user_team_leave_team_failed": "离开团队失败",
   "waiting": "待接受"
-}
+}

packages/web/i18n/zh-CN/common.json

@@ -41,6 +41,7 @@
   "app.templateMarket.templateTags.Web_search": "联网搜索",
   "app.templateMarket.templateTags.Writing": "文本创作",
   "back": "返回",
+  "can_copy_content_tip": "无法使用浏览器自动复制，请手动复制下面内容",
   "chose_condition": "选择条件",
   "chosen": "已选",
   "classification": "分类",
@@ -132,7 +133,6 @@
   "common.Continue_Adding": "继续添加",
   "common.Copy": "复制",
   "common.Copy Successful": "复制成功",
-  "common.Copy_failed": "复制失败，请手动复制",
   "common.Create Failed": "创建异常",
   "common.Create Success": "创建成功",
   "common.Create Time": "创建时间",
@@ -648,11 +648,11 @@
   "core.dataset.training.Auto mode": "补充索引",
   "core.dataset.training.Auto mode Tip": "通过子索引以及调用模型生成相关问题与摘要，来增加数据块的语义丰富度，更利于检索。需要消耗更多的存储空间和增加 AI 调用次数。",
   "core.dataset.training.Chunk mode": "直接分块",
-  "core.dataset.training.Full": "预计 5 分钟以上",
+  "core.dataset.training.Full": "预计 20 分钟以上",
   "core.dataset.training.Leisure": "空闲",
   "core.dataset.training.QA mode": "问答对提取",
   "core.dataset.training.Vector queue": "索引排队",
-  "core.dataset.training.Waiting": "预计 5 分钟",
+  "core.dataset.training.Waiting": "预计 20 分钟",
   "core.dataset.training.Website Sync": "Web 站点同步",
   "core.dataset.training.tag": "排队情况",
   "core.dataset.website.Base Url": "根地址",

packages/web/i18n/zh-CN/dataset.json

@@ -5,6 +5,7 @@
   "api_url": "接口地址",
   "auto_indexes": "自动生成补充索引",
   "auto_indexes_tips": "通过大模型进行额外索引生成，提高语义丰富度，提高检索的精度。",
+  "auto_training_queue": "增强索引排队",
   "chunk_max_tokens": "分块上限",
   "close_auto_sync": "确认关闭自动同步功能？",
   "collection.Create update time": "创建/更新时间",
@@ -56,6 +57,7 @@
   "ideal_chunk_length_tips": "按结束符号进行分段，并将多个分段组成一个分块，该值决定了分块的预估大小，如果会有上下浮动。",
   "image_auto_parse": "图片自动索引",
   "image_auto_parse_tips": "调用 VLM 自动标注文档里的图片，并生成额外的检索索引",
+  "image_training_queue": "图片处理排队",
   "import.Auto mode Estimated Price Tips": "需调用文本理解模型，需要消耗较多AI 积分：{{price}} 积分/1K tokens",
   "import.Embedding Estimated Price Tips": "仅使用索引模型，消耗少量 AI 积分：{{price}} 积分/1K tokens",
   "import_confirm": "确认上传",

packages/web/i18n/zh-Hant/account_team.json

@@ -21,7 +21,7 @@
   "edit_member_tip": "使用者名稱",
   "edit_info": "編輯訊息",
   "edit_org_info": "編輯部門資訊",
-  "expires": "有效期",
+  "expires": "過期時間",
   "forbid_hint": "停用後，該邀請連結將失效。 該操作不可撤銷，是否確認停用？",
   "forbid_success": "停用成功",
   "forbidden": "停用",
@@ -62,4 +62,4 @@
   "user_team_leave_team": "離開團隊",
   "user_team_leave_team_failed": "離開團隊失敗",
   "waiting": "待接受"
-}
+}

packages/web/i18n/zh-Hant/common.json

@@ -37,6 +37,7 @@
   "add_new_param": "新增參數",
   "app.templateMarket.templateTags.Writing": "文字創作",
   "back": "返回",
+  "can_copy_content_tip": "無法使用瀏覽器自動複製，請手動複製下面內容",
   "chose_condition": "選擇條件",
   "chosen": "已選擇",
   "classification": "分類",
@@ -127,7 +128,6 @@
   "common.Continue_Adding": "繼續新增",
   "common.Copy": "複製",
   "common.Copy Successful": "複製成功",
-  "common.Copy_failed": "複製失敗，請手動複製",
   "common.Create Failed": "建立失敗",
   "common.Create Success": "建立成功",
   "common.Create Time": "建立時間",
@@ -644,11 +644,11 @@
   "core.dataset.training.Auto mode": "補充索引",
   "core.dataset.training.Auto mode Tip": "透過子索引以及呼叫模型產生相關問題與摘要，來增加資料區塊的語意豐富度，更有利於檢索。需要消耗更多的儲存空間並增加 AI 呼叫次數。",
   "core.dataset.training.Chunk mode": "直接分块",
-  "core.dataset.training.Full": "預計超過 5 分鐘",
+  "core.dataset.training.Full": "預計 20 分鐘以上",
   "core.dataset.training.Leisure": "閒置",
   "core.dataset.training.QA mode": "問答對提取",
   "core.dataset.training.Vector queue": "索引排隊中",
-  "core.dataset.training.Waiting": "預計 5 分鐘",
+  "core.dataset.training.Waiting": "預計 20 分鐘",
   "core.dataset.training.Website Sync": "網站同步",
   "core.dataset.training.tag": "排隊狀況",
   "core.dataset.website.Base Url": "根網址",

packages/web/i18n/zh-Hant/dataset.json

@@ -5,6 +5,7 @@
   "api_url": "介面位址",
   "auto_indexes": "自動生成補充索引",
   "auto_indexes_tips": "通過大模型進行額外索引生成，提高語義豐富度，提高檢索的精度。",
+  "auto_training_queue": "增強索引排隊",
   "chunk_max_tokens": "分塊上限",
   "close_auto_sync": "確認關閉自動同步功能？",
   "collection.Create update time": "建立／更新時間",
@@ -56,6 +57,7 @@
   "ideal_chunk_length_tips": "依結束符號進行分段，並將多個分段組成一個分塊，此值決定了分塊的預估大小，可能會有上下浮動。",
   "image_auto_parse": "圖片自動索引",
   "image_auto_parse_tips": "調用 VLM 自動標註文檔裡的圖片，並生成額外的檢索索引",
+  "image_training_queue": "圖片處理排隊",
   "import.Auto mode Estimated Price Tips": "需呼叫文字理解模型，將消耗較多 AI 點數：{{price}} 點數 / 1K tokens",
   "import.Embedding Estimated Price Tips": "僅使用索引模型，消耗少量 AI 點數：{{price}} 點數 / 1K tokens",
   "import_confirm": "確認上傳",

packages/web/package.json

@@ -34,7 +34,8 @@
     "react-hook-form": "7.43.1",
     "react-i18next": "14.1.2",
     "react-photo-view": "^1.2.6",
-    "use-context-selector": "^1.4.4"
+    "use-context-selector": "^1.4.4",
+    "zustand": "^4.3.5"
   },
   "devDependencies": {
     "@types/js-cookie": "^3.0.5",

packages/web/store/useCommonStore.ts

@@ -0,0 +1,25 @@
+import { create, devtools, persist, immer } from '../common/zustand';
+
+type State = {
+  copyContent?: string;
+  setCopyContent: (val?: string) => void;
+};
+
+export const useCommonStore = create<State>()(
+  devtools(
+    persist(
+      immer((set, get) => ({
+        copyContent: undefined,
+        setCopyContent(val) {
+          set((state) => {
+            state.copyContent = val;
+          });
+        }
+      })),
+      {
+        name: 'commonStore',
+        partialize: (state) => ({})
+      }
+    )
+  )
+);