From 8c35b02c8a2e637f961dec81a91647d45a7b868e Mon Sep 17 00:00:00 2001 From: "shiweisong.ssw" Date: Thu, 29 Jun 2023 18:12:54 +0800 Subject: [PATCH 1/2] feat: set a constant to record the fetch URL --- datacenter/app/datastores/constants.tsx | 1 + .../datastores/documents/chunklist/page.tsx | 5 +++-- datacenter/app/datastores/documents/page.tsx | 19 ++++++++++--------- datacenter/app/datastores/page.tsx | 13 +++++++------ 4 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 datacenter/app/datastores/constants.tsx diff --git a/datacenter/app/datastores/constants.tsx b/datacenter/app/datastores/constants.tsx new file mode 100644 index 000000000..344e4d926 --- /dev/null +++ b/datacenter/app/datastores/constants.tsx @@ -0,0 +1 @@ +export const fetchURL = 'http://30.183.154.125:5000'; diff --git a/datacenter/app/datastores/documents/chunklist/page.tsx b/datacenter/app/datastores/documents/chunklist/page.tsx index e28a8f9f0..c2b745de1 100644 --- a/datacenter/app/datastores/documents/chunklist/page.tsx +++ b/datacenter/app/datastores/documents/chunklist/page.tsx @@ -4,6 +4,7 @@ import { useSearchParams } from 'next/navigation' import React, { useState, useEffect } from 'react' import { Table, Stack } from '@/lib/mui' import { Popover, Pagination } from 'antd' +import { fetchURL } from '@/app/datastores/constants'; const page_size = 20 const ChunkList = () => { @@ -15,7 +16,7 @@ const ChunkList = () => { useEffect(() => { async function fetchChunks() { const res = await fetch( - `http://30.183.154.125:5000/knowledge/${spaceName}/chunk/list`, + `${fetchURL}/knowledge/${spaceName}/chunk/list`, { method: 'POST', headers: { @@ -88,7 +89,7 @@ const ChunkList = () => { total={total} onChange={async (page) => { const res = await fetch( - `http://30.183.154.125:5000/knowledge/${spaceName}/chunk/list`, + `${fetchURL}/knowledge/${spaceName}/chunk/list`, { method: 'POST', headers: { diff --git a/datacenter/app/datastores/documents/page.tsx b/datacenter/app/datastores/documents/page.tsx index 63d001fb7..05cebce7c 100644 --- a/datacenter/app/datastores/documents/page.tsx +++ b/datacenter/app/datastores/documents/page.tsx @@ -18,6 +18,7 @@ import moment from 'moment' import { InboxOutlined } from '@ant-design/icons' import type { UploadProps } from 'antd' import { Upload, Pagination, message } from 'antd' +import { fetchURL } from '@/app/datastores/constants'; const { Dragger } = Upload const Item = styled(Sheet)(({ theme }) => ({ @@ -85,7 +86,7 @@ const Documents = () => { useEffect(() => { async function fetchDocuments() { const res = await fetch( - `http://30.183.154.125:5000/knowledge/${spaceName}/document/list`, + `${fetchURL}/knowledge/${spaceName}/document/list`, { method: 'POST', headers: { @@ -168,7 +169,7 @@ const Documents = () => { size="sm" onClick={async () => { const res = await fetch( - `http://30.183.154.125:5000/knowledge/${spaceName}/document/sync`, + `${fetchURL}/knowledge/${spaceName}/document/sync`, { method: 'POST', headers: { @@ -217,7 +218,7 @@ const Documents = () => { total={total} onChange={async (page) => { const res = await fetch( - `http://30.183.154.125:5000/knowledge/${spaceName}/document/list`, + `${fetchURL}/knowledge/${spaceName}/document/list`, { method: 'POST', headers: { @@ -370,7 +371,7 @@ const Documents = () => { return } const res = await fetch( - `http://30.183.154.125:5000/knowledge/${spaceName}/document/add`, + `${fetchURL}/knowledge/${spaceName}/document/add`, { method: 'POST', headers: { @@ -388,7 +389,7 @@ const Documents = () => { message.success('success') setIsAddDocumentModalShow(false) const res = await fetch( - `http://30.183.154.125:5000/knowledge/${spaceName}/document/list`, + `${fetchURL}/knowledge/${spaceName}/document/list`, { method: 'POST', headers: { @@ -419,7 +420,7 @@ const Documents = () => { formData.append('doc_file', originFileObj) formData.append('doc_type', 'DOCUMENT') const res = await fetch( - `http://30.183.154.125:5000/knowledge/${spaceName}/document/upload`, + `${fetchURL}/knowledge/${spaceName}/document/upload`, { method: 'POST', body: formData @@ -430,7 +431,7 @@ const Documents = () => { message.success('success') setIsAddDocumentModalShow(false) const res = await fetch( - `http://30.183.154.125:5000/knowledge/${spaceName}/document/list`, + `${fetchURL}/knowledge/${spaceName}/document/list`, { method: 'POST', headers: { @@ -457,7 +458,7 @@ const Documents = () => { return } const res = await fetch( - `http://30.183.154.125:5000/knowledge/${spaceName}/document/add`, + `${fetchURL}/knowledge/${spaceName}/document/add`, { method: 'POST', headers: { @@ -476,7 +477,7 @@ const Documents = () => { message.success('success') setIsAddDocumentModalShow(false) const res = await fetch( - `http://30.183.154.125:5000/knowledge/${spaceName}/document/list`, + `${fetchURL}/knowledge/${spaceName}/document/list`, { method: 'POST', headers: { diff --git a/datacenter/app/datastores/page.tsx b/datacenter/app/datastores/page.tsx index 6585ba546..c7d33a067 100644 --- a/datacenter/app/datastores/page.tsx +++ b/datacenter/app/datastores/page.tsx @@ -16,6 +16,7 @@ import { Textarea, styled } from '@/lib/mui' +import { fetchURL } from '@/app/datastores/constants'; const { Dragger } = Upload @@ -83,7 +84,7 @@ const Index = () => { useEffect(() => { async function fetchData() { const res = await fetch( - 'http://30.183.154.125:5000/knowledge/space/list', + `${fetchURL}/knowledge/space/list`, { method: 'POST', headers: { @@ -206,7 +207,7 @@ const Index = () => { return } const res = await fetch( - 'http://30.183.154.125:5000/knowledge/space/add', + `${fetchURL}/knowledge/space/add`, { method: 'POST', headers: { @@ -225,7 +226,7 @@ const Index = () => { message.success('success') setActiveStep(1) const res = await fetch( - 'http://30.183.154.125:5000/knowledge/space/list', + `${fetchURL}/knowledge/space/list`, { method: 'POST', headers: { @@ -342,7 +343,7 @@ const Index = () => { return } const res = await fetch( - `http://30.183.154.125:5000/knowledge/${knowledgeSpaceName}/document/add`, + `${fetchURL}/knowledge/${knowledgeSpaceName}/document/add`, { method: 'POST', headers: { @@ -372,7 +373,7 @@ const Index = () => { formData.append('doc_file', originFileObj) formData.append('doc_type', 'DOCUMENT') const res = await fetch( - `http://30.183.154.125:5000/knowledge/${knowledgeSpaceName}/document/upload`, + `${fetchURL}/knowledge/${knowledgeSpaceName}/document/upload`, { method: 'POST', body: formData @@ -391,7 +392,7 @@ const Index = () => { return } const res = await fetch( - `http://30.183.154.125:5000/knowledge/${knowledgeSpaceName}/document/add`, + `${fetchURL}/knowledge/${knowledgeSpaceName}/document/add`, { method: 'POST', headers: { From ab0586e5b1ae385eceee8519abadfe38c0fc67ef Mon Sep 17 00:00:00 2001 From: "shiweisong.ssw" Date: Thu, 29 Jun 2023 18:36:05 +0800 Subject: [PATCH 2/2] feat: make tr element darker when hover --- datacenter/app/datastores/constants.tsx | 2 +- .../datastores/documents/chunklist/page.tsx | 34 +++++-- datacenter/app/datastores/documents/page.tsx | 63 ++++++++---- datacenter/app/datastores/page.tsx | 96 ++++++++++++------- 4 files changed, 135 insertions(+), 60 deletions(-) diff --git a/datacenter/app/datastores/constants.tsx b/datacenter/app/datastores/constants.tsx index 344e4d926..c5d7f8260 100644 --- a/datacenter/app/datastores/constants.tsx +++ b/datacenter/app/datastores/constants.tsx @@ -1 +1 @@ -export const fetchURL = 'http://30.183.154.125:5000'; +export const fetchBaseURL = 'http://30.183.154.125:5000'; diff --git a/datacenter/app/datastores/documents/chunklist/page.tsx b/datacenter/app/datastores/documents/chunklist/page.tsx index c2b745de1..0a3db6383 100644 --- a/datacenter/app/datastores/documents/chunklist/page.tsx +++ b/datacenter/app/datastores/documents/chunklist/page.tsx @@ -2,12 +2,13 @@ import { useSearchParams } from 'next/navigation' import React, { useState, useEffect } from 'react' -import { Table, Stack } from '@/lib/mui' +import { useColorScheme, Table, Stack } from '@/lib/mui' import { Popover, Pagination } from 'antd' -import { fetchURL } from '@/app/datastores/constants'; +import { fetchBaseURL } from '@/app/datastores/constants' const page_size = 20 const ChunkList = () => { + const { mode } = useColorScheme() const spaceName = useSearchParams().get('spacename') const documentId = useSearchParams().get('documentid') const [total, setTotal] = useState(0) @@ -16,7 +17,7 @@ const ChunkList = () => { useEffect(() => { async function fetchChunks() { const res = await fetch( - `${fetchURL}/knowledge/${spaceName}/chunk/list`, + `${fetchBaseURL}/knowledge/${spaceName}/chunk/list`, { method: 'POST', headers: { @@ -42,7 +43,20 @@ const ChunkList = () => {
{chunkList.length ? ( <> - +
@@ -79,9 +93,13 @@ const ChunkList = () => { ))}
Name
- + { total={total} onChange={async (page) => { const res = await fetch( - `${fetchURL}/knowledge/${spaceName}/chunk/list`, + `${fetchBaseURL}/knowledge/${spaceName}/chunk/list`, { method: 'POST', headers: { diff --git a/datacenter/app/datastores/documents/page.tsx b/datacenter/app/datastores/documents/page.tsx index 05cebce7c..8e14b5d2c 100644 --- a/datacenter/app/datastores/documents/page.tsx +++ b/datacenter/app/datastores/documents/page.tsx @@ -3,6 +3,7 @@ import { useRouter, useSearchParams } from 'next/navigation' import React, { useState, useEffect } from 'react' import { + useColorScheme, Button, Table, Sheet, @@ -18,7 +19,7 @@ import moment from 'moment' import { InboxOutlined } from '@ant-design/icons' import type { UploadProps } from 'antd' import { Upload, Pagination, message } from 'antd' -import { fetchURL } from '@/app/datastores/constants'; +import { fetchBaseURL } from '@/app/datastores/constants' const { Dragger } = Upload const Item = styled(Sheet)(({ theme }) => ({ @@ -49,14 +50,16 @@ const documentTypeList = [ { type: 'file', title: 'Document', - subTitle: 'Upload a document, document type can be PDF, CSV, Text, PowerPoint, Word, Markdown' + subTitle: + 'Upload a document, document type can be PDF, CSV, Text, PowerPoint, Word, Markdown' } ] -const page_size = 20; +const page_size = 20 const Documents = () => { const router = useRouter() const spaceName = useSearchParams().get('name') + const { mode } = useColorScheme() const [isAddDocumentModalShow, setIsAddDocumentModalShow] = useState(false) const [activeStep, setActiveStep] = useState(0) @@ -86,7 +89,7 @@ const Documents = () => { useEffect(() => { async function fetchDocuments() { const res = await fetch( - `${fetchURL}/knowledge/${spaceName}/document/list`, + `${fetchBaseURL}/knowledge/${spaceName}/document/list`, { method: 'POST', headers: { @@ -124,7 +127,20 @@ const Documents = () => { {documents.length ? ( <> - +
@@ -139,11 +155,20 @@ const Documents = () => { {documents.map((row: any) => ( - +
Name
{row.doc_name}{row.doc_type} + + {row.doc_type} + + {row.chunk_size} chunks {moment(row.last_sync).format('YYYY-MM-DD HH:MM:SS')} { size="sm" onClick={async () => { const res = await fetch( - `${fetchURL}/knowledge/${spaceName}/document/sync`, + `${fetchBaseURL}/knowledge/${spaceName}/document/sync`, { method: 'POST', headers: { @@ -208,9 +233,13 @@ const Documents = () => { ))}
- + { total={total} onChange={async (page) => { const res = await fetch( - `${fetchURL}/knowledge/${spaceName}/document/list`, + `${fetchBaseURL}/knowledge/${spaceName}/document/list`, { method: 'POST', headers: { @@ -371,7 +400,7 @@ const Documents = () => { return } const res = await fetch( - `${fetchURL}/knowledge/${spaceName}/document/add`, + `${fetchBaseURL}/knowledge/${spaceName}/document/add`, { method: 'POST', headers: { @@ -389,7 +418,7 @@ const Documents = () => { message.success('success') setIsAddDocumentModalShow(false) const res = await fetch( - `${fetchURL}/knowledge/${spaceName}/document/list`, + `${fetchBaseURL}/knowledge/${spaceName}/document/list`, { method: 'POST', headers: { @@ -420,7 +449,7 @@ const Documents = () => { formData.append('doc_file', originFileObj) formData.append('doc_type', 'DOCUMENT') const res = await fetch( - `${fetchURL}/knowledge/${spaceName}/document/upload`, + `${fetchBaseURL}/knowledge/${spaceName}/document/upload`, { method: 'POST', body: formData @@ -431,7 +460,7 @@ const Documents = () => { message.success('success') setIsAddDocumentModalShow(false) const res = await fetch( - `${fetchURL}/knowledge/${spaceName}/document/list`, + `${fetchBaseURL}/knowledge/${spaceName}/document/list`, { method: 'POST', headers: { @@ -458,7 +487,7 @@ const Documents = () => { return } const res = await fetch( - `${fetchURL}/knowledge/${spaceName}/document/add`, + `${fetchBaseURL}/knowledge/${spaceName}/document/add`, { method: 'POST', headers: { @@ -477,7 +506,7 @@ const Documents = () => { message.success('success') setIsAddDocumentModalShow(false) const res = await fetch( - `${fetchURL}/knowledge/${spaceName}/document/list`, + `${fetchBaseURL}/knowledge/${spaceName}/document/list`, { method: 'POST', headers: { diff --git a/datacenter/app/datastores/page.tsx b/datacenter/app/datastores/page.tsx index c7d33a067..e66c39a1f 100644 --- a/datacenter/app/datastores/page.tsx +++ b/datacenter/app/datastores/page.tsx @@ -6,6 +6,7 @@ import { InboxOutlined } from '@ant-design/icons' import type { UploadProps } from 'antd' import { message, Upload } from 'antd' import { + useColorScheme, Modal, Button, Table, @@ -14,9 +15,10 @@ import { Box, Input, Textarea, + Chip, styled } from '@/lib/mui' -import { fetchURL } from '@/app/datastores/constants'; +import { fetchBaseURL } from '@/app/datastores/constants' const { Dragger } = Upload @@ -50,12 +52,14 @@ const documentTypeList = [ { type: 'file', title: 'Document', - subTitle: 'Upload a document, document type can be PDF, CSV, Text, PowerPoint, Word, Markdown' + subTitle: + 'Upload a document, document type can be PDF, CSV, Text, PowerPoint, Word, Markdown' } ] const Index = () => { const router = useRouter() + const { mode } = useColorScheme() const [activeStep, setActiveStep] = useState(0) const [documentType, setDocumentType] = useState('') const [knowledgeSpaceList, setKnowledgeSpaceList] = useState([]) @@ -83,16 +87,13 @@ const Index = () => { } useEffect(() => { async function fetchData() { - const res = await fetch( - `${fetchURL}/knowledge/space/list`, - { - method: 'POST', - headers: { - 'Content-Type': 'application/json' - }, - body: JSON.stringify({}) - } - ) + const res = await fetch(`${fetchBaseURL}/knowledge/space/list`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify({}) + }) const data = await res.json() if (data.success) { setKnowledgeSpaceList(data.data) @@ -126,7 +127,20 @@ const Index = () => {
{knowledgeSpaceList.length ? ( - +
@@ -140,6 +154,7 @@ const Index = () => { - - + + ))} @@ -206,27 +237,24 @@ const Index = () => { message.error('please input the name') return } - const res = await fetch( - `${fetchURL}/knowledge/space/add`, - { - method: 'POST', - headers: { - 'Content-Type': 'application/json' - }, - body: JSON.stringify({ - name: knowledgeSpaceName, - vector_type: 'Chroma', - owner: 'keting', - desc: 'test1' - }) - } - ) + const res = await fetch(`${fetchBaseURL}/knowledge/space/add`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ + name: knowledgeSpaceName, + vector_type: 'Chroma', + owner: 'keting', + desc: 'test1' + }) + }) const data = await res.json() if (data.success) { message.success('success') setActiveStep(1) const res = await fetch( - `${fetchURL}/knowledge/space/list`, + `${fetchBaseURL}/knowledge/space/list`, { method: 'POST', headers: { @@ -343,7 +371,7 @@ const Index = () => { return } const res = await fetch( - `${fetchURL}/knowledge/${knowledgeSpaceName}/document/add`, + `${fetchBaseURL}/knowledge/${knowledgeSpaceName}/document/add`, { method: 'POST', headers: { @@ -373,7 +401,7 @@ const Index = () => { formData.append('doc_file', originFileObj) formData.append('doc_type', 'DOCUMENT') const res = await fetch( - `${fetchURL}/knowledge/${knowledgeSpaceName}/document/upload`, + `${fetchBaseURL}/knowledge/${knowledgeSpaceName}/document/upload`, { method: 'POST', body: formData @@ -392,7 +420,7 @@ const Index = () => { return } const res = await fetch( - `${fetchURL}/knowledge/${knowledgeSpaceName}/document/add`, + `${fetchBaseURL}/knowledge/${knowledgeSpaceName}/document/add`, { method: 'POST', headers: {
Name { router.push(`/datastores/documents?name=${row.name}`) @@ -149,8 +164,24 @@ const Index = () => { } {row.vector_type}{row.owner} + + {row.vector_type} + + + + {row.owner} + +