mirror of
https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git
synced 2025-08-12 18:19:11 +08:00
fix: enhance chunk list management with new invalidation keys and imp… (#12396)
ok
This commit is contained in:
parent
147d578922
commit
34519de3b7
@ -32,6 +32,9 @@ import Checkbox from '@/app/components/base/checkbox'
|
|||||||
import {
|
import {
|
||||||
useChildSegmentList,
|
useChildSegmentList,
|
||||||
useChildSegmentListKey,
|
useChildSegmentListKey,
|
||||||
|
useChunkListAllKey,
|
||||||
|
useChunkListDisabledKey,
|
||||||
|
useChunkListEnabledKey,
|
||||||
useDeleteChildSegment,
|
useDeleteChildSegment,
|
||||||
useDeleteSegment,
|
useDeleteSegment,
|
||||||
useDisableSegment,
|
useDisableSegment,
|
||||||
@ -156,18 +159,18 @@ const Completed: FC<ICompletedProps> = ({
|
|||||||
page: isFullDocMode ? 1 : currentPage,
|
page: isFullDocMode ? 1 : currentPage,
|
||||||
limit: isFullDocMode ? 10 : limit,
|
limit: isFullDocMode ? 10 : limit,
|
||||||
keyword: isFullDocMode ? '' : searchValue,
|
keyword: isFullDocMode ? '' : searchValue,
|
||||||
enabled: selectedStatus === 'all' ? 'all' : !!selectedStatus,
|
enabled: selectedStatus,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
currentPage === 0,
|
|
||||||
)
|
)
|
||||||
const invalidSegmentList = useInvalid(useSegmentListKey)
|
const invalidSegmentList = useInvalid(useSegmentListKey)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (segmentListData) {
|
if (segmentListData) {
|
||||||
setSegments(segmentListData.data || [])
|
setSegments(segmentListData.data || [])
|
||||||
if (segmentListData.total_pages < currentPage)
|
const totalPages = segmentListData.total_pages
|
||||||
setCurrentPage(segmentListData.total_pages)
|
if (totalPages < currentPage)
|
||||||
|
setCurrentPage(totalPages === 0 ? 1 : totalPages)
|
||||||
}
|
}
|
||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
}, [segmentListData])
|
}, [segmentListData])
|
||||||
@ -185,12 +188,12 @@ const Completed: FC<ICompletedProps> = ({
|
|||||||
documentId,
|
documentId,
|
||||||
segmentId: segments[0]?.id || '',
|
segmentId: segments[0]?.id || '',
|
||||||
params: {
|
params: {
|
||||||
page: currentPage,
|
page: currentPage === 0 ? 1 : currentPage,
|
||||||
limit,
|
limit,
|
||||||
keyword: searchValue,
|
keyword: searchValue,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
!isFullDocMode || segments.length === 0 || currentPage === 0,
|
!isFullDocMode || segments.length === 0,
|
||||||
)
|
)
|
||||||
const invalidChildSegmentList = useInvalid(useChildSegmentListKey)
|
const invalidChildSegmentList = useInvalid(useChildSegmentListKey)
|
||||||
|
|
||||||
@ -204,21 +207,20 @@ const Completed: FC<ICompletedProps> = ({
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (childChunkListData) {
|
if (childChunkListData) {
|
||||||
setChildSegments(childChunkListData.data || [])
|
setChildSegments(childChunkListData.data || [])
|
||||||
if (childChunkListData.total_pages < currentPage)
|
const totalPages = childChunkListData.total_pages
|
||||||
setCurrentPage(childChunkListData.total_pages)
|
if (totalPages < currentPage)
|
||||||
|
setCurrentPage(totalPages === 0 ? 1 : totalPages)
|
||||||
}
|
}
|
||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
}, [childChunkListData])
|
}, [childChunkListData])
|
||||||
|
|
||||||
const resetList = useCallback(() => {
|
const resetList = useCallback(() => {
|
||||||
setSegments([])
|
|
||||||
setSelectedSegmentIds([])
|
setSelectedSegmentIds([])
|
||||||
invalidSegmentList()
|
invalidSegmentList()
|
||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
const resetChildList = useCallback(() => {
|
const resetChildList = useCallback(() => {
|
||||||
setChildSegments([])
|
|
||||||
invalidChildSegmentList()
|
invalidChildSegmentList()
|
||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
}, [])
|
}, [])
|
||||||
@ -244,6 +246,20 @@ const Completed: FC<ICompletedProps> = ({
|
|||||||
|
|
||||||
const { mutateAsync: enableSegment } = useEnableSegment()
|
const { mutateAsync: enableSegment } = useEnableSegment()
|
||||||
const { mutateAsync: disableSegment } = useDisableSegment()
|
const { mutateAsync: disableSegment } = useDisableSegment()
|
||||||
|
const invalidChunkListAll = useInvalid(useChunkListAllKey)
|
||||||
|
const invalidChunkListEnabled = useInvalid(useChunkListEnabledKey)
|
||||||
|
const invalidChunkListDisabled = useInvalid(useChunkListDisabledKey)
|
||||||
|
|
||||||
|
const refreshChunkListWithStatusChanged = () => {
|
||||||
|
switch (selectedStatus) {
|
||||||
|
case 'all':
|
||||||
|
invalidChunkListDisabled()
|
||||||
|
invalidChunkListEnabled()
|
||||||
|
break
|
||||||
|
default:
|
||||||
|
invalidSegmentList()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const onChangeSwitch = useCallback(async (enable: boolean, segId?: string) => {
|
const onChangeSwitch = useCallback(async (enable: boolean, segId?: string) => {
|
||||||
const operationApi = enable ? enableSegment : disableSegment
|
const operationApi = enable ? enableSegment : disableSegment
|
||||||
@ -255,6 +271,7 @@ const Completed: FC<ICompletedProps> = ({
|
|||||||
seg.enabled = enable
|
seg.enabled = enable
|
||||||
}
|
}
|
||||||
setSegments([...segments])
|
setSegments([...segments])
|
||||||
|
refreshChunkListWithStatusChanged()
|
||||||
},
|
},
|
||||||
onError: () => {
|
onError: () => {
|
||||||
notify({ type: 'error', message: t('common.actionMsg.modifiedUnsuccessfully') })
|
notify({ type: 'error', message: t('common.actionMsg.modifiedUnsuccessfully') })
|
||||||
@ -281,6 +298,23 @@ const Completed: FC<ICompletedProps> = ({
|
|||||||
|
|
||||||
const { mutateAsync: updateSegment } = useUpdateSegment()
|
const { mutateAsync: updateSegment } = useUpdateSegment()
|
||||||
|
|
||||||
|
const refreshChunkListDataWithDetailChanged = () => {
|
||||||
|
switch (selectedStatus) {
|
||||||
|
case 'all':
|
||||||
|
invalidChunkListDisabled()
|
||||||
|
invalidChunkListEnabled()
|
||||||
|
break
|
||||||
|
case true:
|
||||||
|
invalidChunkListAll()
|
||||||
|
invalidChunkListDisabled()
|
||||||
|
break
|
||||||
|
case false:
|
||||||
|
invalidChunkListAll()
|
||||||
|
invalidChunkListEnabled()
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const handleUpdateSegment = useCallback(async (
|
const handleUpdateSegment = useCallback(async (
|
||||||
segmentId: string,
|
segmentId: string,
|
||||||
question: string,
|
question: string,
|
||||||
@ -330,6 +364,7 @@ const Completed: FC<ICompletedProps> = ({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
setSegments([...segments])
|
setSegments([...segments])
|
||||||
|
refreshChunkListDataWithDetailChanged()
|
||||||
eventEmitter?.emit('update-segment-success')
|
eventEmitter?.emit('update-segment-success')
|
||||||
},
|
},
|
||||||
onSettled() {
|
onSettled() {
|
||||||
@ -442,6 +477,7 @@ const Completed: FC<ICompletedProps> = ({
|
|||||||
seg.child_chunks?.push(newChildChunk!)
|
seg.child_chunks?.push(newChildChunk!)
|
||||||
}
|
}
|
||||||
setSegments([...segments])
|
setSegments([...segments])
|
||||||
|
refreshChunkListDataWithDetailChanged()
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
resetChildList()
|
resetChildList()
|
||||||
@ -506,17 +542,10 @@ const Completed: FC<ICompletedProps> = ({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
setSegments([...segments])
|
setSegments([...segments])
|
||||||
|
refreshChunkListDataWithDetailChanged()
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
for (const childSeg of childSegments) {
|
resetChildList()
|
||||||
if (childSeg.id === childChunkId) {
|
|
||||||
childSeg.content = res.data.content
|
|
||||||
childSeg.type = res.data.type
|
|
||||||
childSeg.word_count = res.data.word_count
|
|
||||||
childSeg.updated_at = res.data.updated_at
|
|
||||||
}
|
|
||||||
}
|
|
||||||
setChildSegments([...childSegments])
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onSettled: () => {
|
onSettled: () => {
|
||||||
@ -554,12 +583,13 @@ const Completed: FC<ICompletedProps> = ({
|
|||||||
<SimpleSelect
|
<SimpleSelect
|
||||||
onSelect={onChangeStatus}
|
onSelect={onChangeStatus}
|
||||||
items={statusList.current}
|
items={statusList.current}
|
||||||
defaultValue={'all'}
|
defaultValue={selectedStatus === 'all' ? 'all' : selectedStatus ? 1 : 0}
|
||||||
className={s.select}
|
className={s.select}
|
||||||
wrapperClassName='h-fit mr-2'
|
wrapperClassName='h-fit mr-2'
|
||||||
optionWrapClassName='w-[160px]'
|
optionWrapClassName='w-[160px]'
|
||||||
optionClassName='p-0'
|
optionClassName='p-0'
|
||||||
renderOption={({ item, selected }) => <StatusItem item={item} selected={selected} />}
|
renderOption={({ item, selected }) => <StatusItem item={item} selected={selected} />}
|
||||||
|
notClearable
|
||||||
/>
|
/>
|
||||||
<Input
|
<Input
|
||||||
showLeftIcon
|
showLeftIcon
|
||||||
|
@ -14,6 +14,9 @@ import type {
|
|||||||
const NAME_SPACE = 'segment'
|
const NAME_SPACE = 'segment'
|
||||||
|
|
||||||
export const useSegmentListKey = [NAME_SPACE, 'chunkList']
|
export const useSegmentListKey = [NAME_SPACE, 'chunkList']
|
||||||
|
export const useChunkListEnabledKey = [NAME_SPACE, 'chunkList', { enabled: true }]
|
||||||
|
export const useChunkListDisabledKey = [NAME_SPACE, 'chunkList', { enabled: false }]
|
||||||
|
export const useChunkListAllKey = [NAME_SPACE, 'chunkList', { enabled: 'all' }]
|
||||||
|
|
||||||
export const useSegmentList = (
|
export const useSegmentList = (
|
||||||
payload: {
|
payload: {
|
||||||
@ -23,7 +26,7 @@ export const useSegmentList = (
|
|||||||
page: number
|
page: number
|
||||||
limit: number
|
limit: number
|
||||||
keyword: string
|
keyword: string
|
||||||
enabled: boolean | 'all'
|
enabled: boolean | 'all' | ''
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
disable?: boolean,
|
disable?: boolean,
|
||||||
@ -31,7 +34,7 @@ export const useSegmentList = (
|
|||||||
const { datasetId, documentId, params } = payload
|
const { datasetId, documentId, params } = payload
|
||||||
const { page, limit, keyword, enabled } = params
|
const { page, limit, keyword, enabled } = params
|
||||||
return useQuery<SegmentsResponse>({
|
return useQuery<SegmentsResponse>({
|
||||||
queryKey: [...useSegmentListKey, datasetId, documentId, page, limit, keyword, enabled],
|
queryKey: [...useSegmentListKey, { datasetId, documentId, page, limit, keyword, enabled }],
|
||||||
queryFn: () => {
|
queryFn: () => {
|
||||||
return get<SegmentsResponse>(`/datasets/${datasetId}/documents/${documentId}/segments`, { params })
|
return get<SegmentsResponse>(`/datasets/${datasetId}/documents/${documentId}/segments`, { params })
|
||||||
},
|
},
|
||||||
@ -110,7 +113,7 @@ export const useChildSegmentList = (
|
|||||||
const { datasetId, documentId, segmentId, params } = payload
|
const { datasetId, documentId, segmentId, params } = payload
|
||||||
const { page, limit, keyword } = params
|
const { page, limit, keyword } = params
|
||||||
return useQuery({
|
return useQuery({
|
||||||
queryKey: [...useChildSegmentListKey, datasetId, documentId, segmentId, page, limit, keyword],
|
queryKey: [...useChildSegmentListKey, { datasetId, documentId, segmentId, page, limit, keyword }],
|
||||||
queryFn: () => {
|
queryFn: () => {
|
||||||
return get<ChildSegmentsResponse>(`/datasets/${datasetId}/documents/${documentId}/segments/${segmentId}/child_chunks`, { params })
|
return get<ChildSegmentsResponse>(`/datasets/${datasetId}/documents/${documentId}/segments/${segmentId}/child_chunks`, { params })
|
||||||
},
|
},
|
||||||
|
@ -1,13 +1,15 @@
|
|||||||
import {
|
import {
|
||||||
|
type QueryKey,
|
||||||
useQueryClient,
|
useQueryClient,
|
||||||
} from '@tanstack/react-query'
|
} from '@tanstack/react-query'
|
||||||
|
|
||||||
export const useInvalid = (key: string[]) => {
|
export const useInvalid = (key: QueryKey) => {
|
||||||
const queryClient = useQueryClient()
|
const queryClient = useQueryClient()
|
||||||
return () => {
|
return () => {
|
||||||
queryClient.invalidateQueries(
|
queryClient.invalidateQueries(
|
||||||
{
|
{
|
||||||
queryKey: key,
|
queryKey: key,
|
||||||
})
|
},
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user