fix: Handle missing dataset avatars and improve routing

This commit is contained in:
twwu 2025-09-10 10:51:48 +08:00
parent 65780e96ca
commit 9fdaa14c8d
4 changed files with 56 additions and 23 deletions

View File

@ -1,5 +1,5 @@
import cn from '@/utils/classnames'
import React, { useMemo } from 'react'
import React, { useCallback, useMemo, useState } from 'react'
type CredentialIconProps = {
avatar_url?: string
@ -21,10 +21,15 @@ export const CredentialIcon: React.FC<CredentialIconProps> = ({
size = 20,
className = '',
}) => {
const [showAvatar, setShowAvatar] = useState(!!avatar_url)
const firstLetter = useMemo(() => name.charAt(0).toUpperCase(), [name])
const bgColor = useMemo(() => ICON_BG_COLORS[firstLetter.charCodeAt(0) % ICON_BG_COLORS.length], [firstLetter])
if (avatar_url && avatar_url !== 'default') {
const onImgLoadError = useCallback(() => {
setShowAvatar(false)
}, [])
if (avatar_url && avatar_url !== 'default' && showAvatar) {
return (
<div
className='flex shrink-0 items-center justify-center overflow-hidden rounded-md border border-divider-regular'
@ -35,6 +40,7 @@ export const CredentialIcon: React.FC<CredentialIconProps> = ({
width={size}
height={size}
className={cn('shrink-0 object-contain', className)}
onError={onImgLoadError}
/>
</div>
)

View File

@ -1,6 +1,6 @@
'use client'
import { useCallback } from 'react'
import { useCallback, useMemo } from 'react'
import { useTranslation } from 'react-i18next'
import { useParams, useRouter } from 'next/navigation'
import {
@ -28,6 +28,49 @@ const DatasetNav = () => {
})
const datasetItems = flatten(datasetList?.pages.map(datasetData => datasetData.data))
const curNav = useMemo(() => {
if (!currentDataset) return
return {
id: currentDataset.id,
name: currentDataset.name,
icon: currentDataset.icon_info.icon,
icon_type: currentDataset.icon_info.icon_type,
icon_background: currentDataset.icon_info.icon_background,
icon_url: currentDataset.icon_info.icon_url,
} as Omit<NavItem, 'link'>
}, [currentDataset?.id, currentDataset?.name, currentDataset?.icon_info])
const navigationItems = useMemo(() => {
return datasetItems.map((dataset) => {
const isPipelineUnpublished = dataset.runtime_mode === 'rag_pipeline' && !dataset.is_published
const internalLink = isPipelineUnpublished
? `/datasets/${dataset.id}/pipeline`
: `/datasets/${dataset.id}/documents`
const link = dataset.provider === 'external'
? `/datasets/${dataset.id}/hitTesting`
: internalLink
return {
id: dataset.id,
name: dataset.name,
link,
icon: dataset.icon_info.icon,
icon_type: dataset.icon_info.icon_type,
icon_background: dataset.icon_info.icon_background,
icon_url: dataset.icon_info.icon_url,
}
}) as NavItem[]
}, [datasetItems])
const createRouter = useMemo(() => {
const runtimeMode = currentDataset?.runtime_mode
if (runtimeMode === 'rag_pipeline')
return `${basePath}/datasets/create-from-pipeline`
else if (runtimeMode === 'general')
return `${basePath}/datasets/create`
else
return `${basePath}/datasets/create`
}, [currentDataset?.runtime_mode])
const handleLoadMore = useCallback(() => {
if (hasNextPage)
fetchNextPage()
@ -41,25 +84,10 @@ const DatasetNav = () => {
text={t('common.menus.datasets')}
activeSegment='datasets'
link='/datasets'
curNav={currentDataset && {
id: currentDataset.id,
name: currentDataset.name,
icon: currentDataset.icon_info.icon,
icon_type: currentDataset.icon_info.icon_type,
icon_background: currentDataset.icon_info.icon_background,
icon_url: currentDataset.icon_info.icon_url,
} as Omit<NavItem, 'link'>}
navigationItems={datasetItems.map(dataset => ({
id: dataset.id,
name: dataset.name,
link: dataset.provider === 'external' ? `/datasets/${dataset.id}/hitTesting` : `/datasets/${dataset.id}/documents`,
icon: dataset.icon_info.icon,
icon_type: dataset.icon_info.icon_type,
icon_background: dataset.icon_info.icon_background,
icon_url: dataset.icon_info.icon_url,
})) as NavItem[]}
curNav={curNav}
navigationItems={navigationItems}
createText={t('common.menus.newDataset')}
onCreate={() => router.push(`${basePath}/datasets/create`)}
onCreate={() => router.push(createRouter)}
onLoadMore={handleLoadMore}
/>
)

View File

@ -42,7 +42,6 @@ const Nav = ({
useEffect(() => {
if (pathname === link)
setLinkLastSearchParams(searchParams.toString())
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [pathname, searchParams])
return (

View File

@ -403,7 +403,7 @@ export type SimpleDocumentDetail = InitialDocumentDetail & {
}
}
doc_metadata?: MetadataItemWithValue[]
created_from: string
created_from: 'rag-pipeline' | 'web'
}
export type DocumentListResponse = {