From 3f495b2d22cecde341843f3cddfb719a1ea726a2 Mon Sep 17 00:00:00 2001 From: balibabu Date: Fri, 26 Jul 2024 10:23:51 +0800 Subject: [PATCH] fix: Remove kAModel #1306 (#1713) ### What problem does this PR solve? fix: Remove kAModel #1306 ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue) --- web/src/hooks/knowledge-hooks.ts | 18 +++++++++++ .../components/knowledge-sidebar/index.tsx | 12 ++++--- web/src/pages/add-knowledge/model.ts | 32 ------------------- web/typings.d.ts | 2 -- 4 files changed, 25 insertions(+), 39 deletions(-) delete mode 100644 web/src/pages/add-knowledge/model.ts diff --git a/web/src/hooks/knowledge-hooks.ts b/web/src/hooks/knowledge-hooks.ts index b3ba12c46..318f31bf9 100644 --- a/web/src/hooks/knowledge-hooks.ts +++ b/web/src/hooks/knowledge-hooks.ts @@ -236,4 +236,22 @@ export const useTestChunkRetrieval = () => { return testChunk; }; + +export const useTestNextChunkRetrieval = () => { + const { + data, + isPending: loading, + mutateAsync, + } = useMutation({ + mutationKey: ['testChunk'], + mutationFn: async (canvasIds: string[]) => { + const { data } = await kbService.retrieval_test({ canvasIds }); + if (data.retcode === 0) { + } + return data?.data ?? []; + }, + }); + + return { data, loading, testChunk: mutateAsync }; +}; //#endregion diff --git a/web/src/pages/add-knowledge/components/knowledge-sidebar/index.tsx b/web/src/pages/add-knowledge/components/knowledge-sidebar/index.tsx index 07cf18452..2947a0849 100644 --- a/web/src/pages/add-knowledge/components/knowledge-sidebar/index.tsx +++ b/web/src/pages/add-knowledge/components/knowledge-sidebar/index.tsx @@ -2,22 +2,24 @@ import { ReactComponent as ConfigurationIcon } from '@/assets/svg/knowledge-conf import { ReactComponent as DatasetIcon } from '@/assets/svg/knowledge-dataset.svg'; import { ReactComponent as TestingIcon } from '@/assets/svg/knowledge-testing.svg'; import { useFetchKnowledgeBaseConfiguration } from '@/hooks/knowledge-hooks'; -import { useSecondPathName } from '@/hooks/route-hook'; +import { + useGetKnowledgeSearchParams, + useSecondPathName, +} from '@/hooks/route-hook'; import { getWidth } from '@/utils'; import { Avatar, Menu, MenuProps, Space } from 'antd'; import classNames from 'classnames'; import { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { useNavigate, useSelector } from 'umi'; +import { useNavigate } from 'umi'; import { KnowledgeRouteKey } from '../../constant'; import styles from './index.less'; const KnowledgeSidebar = () => { - const kAModel = useSelector((state: any) => state.kAModel); - const { id } = kAModel; let navigate = useNavigate(); const activeKey = useSecondPathName(); + const { knowledgeId } = useGetKnowledgeSearchParams(); const [windowWidth, setWindowWidth] = useState(getWidth()); const [collapsed, setCollapsed] = useState(false); @@ -25,7 +27,7 @@ const KnowledgeSidebar = () => { const { data: knowledgeDetails } = useFetchKnowledgeBaseConfiguration(); const handleSelect: MenuProps['onSelect'] = (e) => { - navigate(`/knowledge/${e.key}?id=${id}`); + navigate(`/knowledge/${e.key}?id=${knowledgeId}`); }; type MenuItem = Required['items'][number]; diff --git a/web/src/pages/add-knowledge/model.ts b/web/src/pages/add-knowledge/model.ts deleted file mode 100644 index 637e309a4..000000000 --- a/web/src/pages/add-knowledge/model.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { DvaModel } from 'umi'; -export interface kAModelState { - isShowPSwModal: boolean; - tenantIfo: any; - id: string; - doc_id: string; -} - -const model: DvaModel = { - namespace: 'kAModel', - state: { - isShowPSwModal: false, - tenantIfo: {}, - id: '', - doc_id: '', - }, - reducers: { - updateState(state, { payload }) { - return { - ...state, - ...payload, - }; - }, - }, - subscriptions: { - setup({ dispatch, history }) { - history.listen((location) => {}); - }, - }, - effects: {}, -}; -export default model; diff --git a/web/typings.d.ts b/web/typings.d.ts index 57901b101..84f4c7993 100644 --- a/web/typings.d.ts +++ b/web/typings.d.ts @@ -1,7 +1,6 @@ import { ChunkModelState } from '@/pages/add-knowledge/components/knowledge-chunk/model'; import { KFModelState } from '@/pages/add-knowledge/components/knowledge-file/model'; import { TestingModelState } from '@/pages/add-knowledge/components/knowledge-testing/model'; -import { kAModelState } from '@/pages/add-knowledge/model'; import { ChatModelState } from '@/pages/chat/model'; declare module 'lodash'; @@ -14,7 +13,6 @@ function useSelector( export interface RootState { chatModel: ChatModelState; kFModel: KFModelState; - kAModel: kAModelState; chunkModel: ChunkModelState; testingModel: TestingModelState; }