Skip to content

Commit

Permalink
Merge pull request #1001 from utin-francis-peter/latest-srcdoc-as-active
Browse files Browse the repository at this point in the history
Fix: Set Uploaded/Trained/Latest Source Doc as Selected/Active Source Doc
  • Loading branch information
dartpain committed Jun 20, 2024
2 parents e47e751 + 9606e3f commit ec5363e
Show file tree
Hide file tree
Showing 4 changed files with 173 additions and 127 deletions.
27 changes: 19 additions & 8 deletions frontend/src/Navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,15 @@ import {
selectConversationId,
selectModalStateDeleteConv,
setModalStateDeleteConv,
setSourceDocs,
} from './preferences/preferenceSlice';
import {
setConversation,
updateConversationId,
} from './conversation/conversationSlice';
import { useMediaQuery, useOutsideAlerter } from './hooks';
import Upload from './upload/Upload';
import { Doc, getConversations } from './preferences/preferenceApi';
import { Doc, getConversations, getDocs } from './preferences/preferenceApi';
import SelectDocsModal from './preferences/SelectDocsModal';
import ConversationTile from './conversation/ConversationTile';
import { useDarkTheme } from './hooks';
Expand Down Expand Up @@ -124,19 +125,29 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
.catch((error) => console.error(error));
};

const handleDeleteClick = (index: number, doc: Doc) => {
const docPath = 'indexes/' + 'local' + '/' + doc.name;
const handleDeleteClick = (doc: Doc) => {
const docPath = `indexes/local/${doc.name}`;

fetch(`${apiHost}/api/delete_old?path=${docPath}`, {
method: 'GET',
})
.then(() => {
// remove the image element from the DOM
const imageElement = document.querySelector(
`#img-${index}`,
) as HTMLElement;
const parentElement = imageElement.parentNode as HTMLElement;
parentElement.parentNode?.removeChild(parentElement);
// const imageElement = document.querySelector(
// `#img-${index}`,
// ) as HTMLElement;
// const parentElement = imageElement.parentNode as HTMLElement;
// parentElement.parentNode?.removeChild(parentElement);

return getDocs();
})
.then((updatedDocs) => {
dispatch(setSourceDocs(updatedDocs));
dispatch(
setSelectedDocs(
updatedDocs?.find((doc) => doc.name.toLowerCase() === 'default'),
),
);
})
.catch((error) => console.error(error));
};
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/SourceDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function SourceDropdown({
id={`img-${index}`}
onClick={(event) => {
event.stopPropagation();
handleDeleteClick(index, option);
handleDeleteClick(option);
}}
/>
)}
Expand Down
207 changes: 103 additions & 104 deletions frontend/src/locale/zh.json
Original file line number Diff line number Diff line change
@@ -1,109 +1,108 @@
{
"language": "普通话",
"chat": "聊天",
"chats": "聊天",
"newChat": "新聊天",
"myPlan": "我的计划",
"about": "关于",
"inputPlaceholder": "在这里输入您的消息...",
"tagline": "DocsGPT 使用 GenAI, 请使用来源审核关键信息.",
"sourceDocs": "来源文档",
"none": "",
"cancel":"取消",
"demo": [
{
"header": "了解 DocsGPT",
"query": "DocsGPT 是什么"
},
{
"header": "总结文档",
"query": "总结当前情况"
},
{
"header": "编写代码",
"query": "为 /api/answer API 请求编写代码"
},
{
"header": "学习帮助",
"query": "为背景写出潜在问题"
}
],
"settings": {
"label": "设置",
"general": {
"label": "",
"selectTheme": "选择主题",
"light": "浅色",
"dark": "暗色",
"selectLanguage": "选择语言",
"chunks": "每个查询处理的块",
"prompt": "提示",
"deleteAllLabel": "删除所有对话",
"deleteAllBtn": "删除所有",
"addNew": "添加新的",
"convHistory":"对话历史",
"none":"",
"low":"",
"medium":"",
"high":"",
"unlimited":"无限",
"default":"默认"
},
"documents": {
"label": "文件",
"name": "文件名称",
"date": "向量日期",
"type": "类型",
"tokenUsage": "令牌使用"
},
"apiKeys": {
"label": "API 密钥",
"name": "名称",
"key": "API 密钥",
"sourceDoc": "源文档",
"createNew": "创建新的"
}
"language": "普通话",
"chat": "聊天",
"chats": "聊天",
"newChat": "新聊天",
"myPlan": "我的计划",
"about": "关于",
"inputPlaceholder": "在这里输入您的消息...",
"tagline": "DocsGPT 使用 GenAI, 请使用来源审核关键信息.",
"sourceDocs": "来源文档",
"none": "",
"cancel": "取消",
"demo": [
{
"header": "了解 DocsGPT",
"query": "DocsGPT 是什么"
},
{
"header": "总结文档",
"query": "总结当前情况"
},
{
"header": "编写代码",
"query": "为 /api/answer API 请求编写代码"
},
{
"header": "学习帮助",
"query": "为背景写出潜在问题"
}
],
"settings": {
"label": "设置",
"general": {
"label": "",
"selectTheme": "选择主题",
"light": "浅色",
"dark": "暗色",
"selectLanguage": "选择语言",
"chunks": "每个查询处理的块",
"prompt": "提示",
"deleteAllLabel": "删除所有对话",
"deleteAllBtn": "删除所有",
"addNew": "添加新的",
"convHistory": "对话历史",
"none": "",
"low": "",
"medium": "",
"high": "",
"unlimited": "无限",
"default": "默认"
},
"modals": {
"uploadDoc": {
"label": "上传新文档资料",
"file": "从文件",
"remote": "远程",
"name": "名称",
"choose": "选择文件",
"info": "请上传 .pdf, .txt, .rst, .docx, .md, .zip 文件,限 25MB",
"uploadedFiles": "已上传文件",
"cancel": "取消",
"train": "训练",
"link": "链接",
"urlLink": "URL 链接",
"reddit": {
"id": "客户端 ID",
"secret": "客户端密钥",
"agent": "用户代理",
"searchQueries": "搜索查询",
"numberOfPosts": "帖子数量"
}
},
"createAPIKey": {
"label": "创建新的 API 密钥",
"apiKeyName": "API 密钥名称",
"chunks": "每个查询处理的块",
"prompt": "选择活动提示",
"sourceDoc": "源文档",
"create": "创建"
},
"saveKey": {
"note": "请保存您的密钥",
"disclaimer": "这是您的密钥唯一一次展示机会。",
"copy": "复制",
"copied": "已复制",
"confirm": "我已保存密钥"
},
"deleteConv": {
"confirm": "您确定要删除所有对话吗?",
"delete": "删除"
"documents": {
"label": "文件",
"name": "文件名称",
"date": "向量日期",
"type": "类型",
"tokenUsage": "令牌使用"
},
"apiKeys": {
"label": "API 密钥",
"name": "名称",
"key": "API 密钥",
"sourceDoc": "源文档",
"createNew": "创建新的"
}
},
"modals": {
"uploadDoc": {
"label": "上传新文档资料",
"file": "从文件",
"remote": "远程",
"name": "名称",
"choose": "选择文件",
"info": "请上传 .pdf, .txt, .rst, .docx, .md, .zip 文件,限 25MB",
"uploadedFiles": "已上传文件",
"cancel": "取消",
"train": "训练",
"link": "链接",
"urlLink": "URL 链接",
"reddit": {
"id": "客户端 ID",
"secret": "客户端密钥",
"agent": "用户代理",
"searchQueries": "搜索查询",
"numberOfPosts": "帖子数量"
}
},
"createAPIKey": {
"label": "创建新的 API 密钥",
"apiKeyName": "API 密钥名称",
"chunks": "每个查询处理的块",
"prompt": "选择活动提示",
"sourceDoc": "源文档",
"create": "创建"
},
"saveKey": {
"note": "请保存您的密钥",
"disclaimer": "这是您的密钥唯一一次展示机会。",
"copy": "复制",
"copied": "已复制",
"confirm": "我已保存密钥"
},
"deleteConv": {
"confirm": "您确定要删除所有对话吗?",
"delete": "删除"
}
}
}
Loading

0 comments on commit ec5363e

Please sign in to comment.