refactor: Refactor useDatasourceIcon hook and enhance dataset node rendering with AppIcon component

web/app/components/datasets/documents/create-from-pipeline/data-source-options/hooks.tsx

@@ -1,31 +1,23 @@
-import { useCallback, useMemo, useState } from 'react'
+import { useMemo } from 'react'
 import type { DataSourceNodeType } from '@/app/components/workflow/nodes/data-source/types'
-import type { DataSourceItem } from '@/app/components/workflow/block-selector/types'
 import { basePath } from '@/utils/var'
 import { useDataSourceList } from '@/service/use-pipeline'
-import { useDatasetDetailContextWithSelector } from '@/context/dataset-detail'
-import type { ToolWithProvider } from '@/app/components/workflow/types'
 import { transformDataSourceToTool } from '@/app/components/workflow/block-selector/utils'
 
 export const useDatasourceIcon = (data: DataSourceNodeType) => {
-  const pipelineId = useDatasetDetailContextWithSelector(s => s.dataset?.pipeline_id)
+  const { data: dataSourceListData, isSuccess } = useDataSourceList(true)
-  const [dataSourceList, setDataSourceList] = useState<ToolWithProvider[]>([])
 
-  const handleUpdateDataSourceList = useCallback((dataSourceList: DataSourceItem[]) => {
+  const datasourceIcon = useMemo(() => {
+    if (!isSuccess) return
+    const dataSourceList = [...(dataSourceListData || [])]
     dataSourceList.forEach((item) => {
       const icon = item.declaration.identity.icon
       if (typeof icon == 'string' && !icon.includes(basePath))
         item.declaration.identity.icon = `${basePath}${icon}`
     })
     const formattedDataSourceList = dataSourceList.map(item => transformDataSourceToTool(item))
-    setDataSourceList!(formattedDataSourceList)
+    return formattedDataSourceList?.find(toolWithProvider => toolWithProvider.plugin_id === data.plugin_id)?.icon
-  }, [])
+  }, [data.plugin_id, dataSourceListData, isSuccess])
-
-  useDataSourceList(!!pipelineId, handleUpdateDataSourceList)
-
-  const datasourceIcon = useMemo(() => {
-    return dataSourceList?.find(toolWithProvider => toolWithProvider.plugin_id === data.plugin_id)?.icon
-  }, [data, dataSourceList])
 
   return datasourceIcon
 }

web/app/components/workflow/nodes/knowledge-retrieval/node.tsx

@@ -1,10 +1,10 @@
 import { type FC, useEffect, useState } from 'react'
 import React from 'react'
 import type { KnowledgeRetrievalNodeType } from './types'
-import { Folder } from '@/app/components/base/icons/src/vender/solid/files'
 import type { NodeProps } from '@/app/components/workflow/types'
 import type { DataSet } from '@/models/datasets'
 import { useDatasetsDetailStore } from '../../datasets-detail-store/store'
+import AppIcon from '@/app/components/base/app-icon'
 
 const Node: FC<NodeProps<KnowledgeRetrievalNodeType>> = ({
   data,
@@ -32,11 +32,16 @@ const Node: FC<NodeProps<KnowledgeRetrievalNodeType>> = ({
   return (
     <div className='mb-1 px-3 py-1'>
       <div className='space-y-0.5'>
-        {selectedDatasets.map(({ id, name }) => (
+        {selectedDatasets.map(({ id, name, icon_info }) => (
-          <div key={id} className='flex h-[26px] items-center rounded-md bg-workflow-block-parma-bg  px-1 text-xs font-normal text-gray-700'>
+          <div key={id} className='flex h-[26px] items-center gap-x-1 rounded-md bg-workflow-block-parma-bg px-1'>
-            <div className='mr-1 shrink-0 rounded-md border-[0.5px] border-[#E0EAFF] bg-[#F5F8FF] p-1'>
+            <AppIcon
-              <Folder className='h-3 w-3 text-[#444CE7]' />
+              size='xs'
-            </div>
+              iconType={icon_info.icon_type}
+              icon={icon_info.icon}
+              background={icon_info.icon_type === 'image' ? undefined : icon_info.icon_background}
+              imageUrl={icon_info.icon_type === 'image' ? icon_info.icon_url : undefined}
+              className='shrink-0'
+            />
             <div className='system-xs-regular w-0 grow truncate text-text-secondary'>
               {name}
             </div>