Feat: Use AvatarUpload to replace the avatar settings on the dataset and search pages #3221 (#9785)

### What problem does this PR solve?

Feat: Use AvatarUpload to replace the avatar settings on the dataset and
search pages #3221
### Type of change


- [x] New Feature (non-breaking change which adds functionality)

web/src/components/avatar-upload.tsx

@@ -1,13 +1,20 @@
 import { transformFile2Base64 } from '@/utils/file-util';
 import { Pencil, Upload } from 'lucide-react';
-import { ChangeEventHandler, useCallback, useEffect, useState } from 'react';
+import {
+  ChangeEventHandler,
+  forwardRef,
+  useCallback,
+  useEffect,
+  useState,
+} from 'react';
 import { useTranslation } from 'react-i18next';
 import { Avatar, AvatarFallback, AvatarImage } from './ui/avatar';
 import { Input } from './ui/input';
 
 type AvatarUploadProps = { value?: string; onChange?: (value: string) => void };
 
-export function AvatarUpload({ value, onChange }: AvatarUploadProps) {
+export const AvatarUpload = forwardRef<HTMLInputElement, AvatarUploadProps>(
+  function AvatarUpload({ value, onChange }, ref) {
     const { t } = useTranslation();
     const [avatarBase64Str, setAvatarBase64Str] = useState(''); // Avatar Image base64
 
@@ -61,6 +68,7 @@ export function AvatarUpload({ value, onChange }: AvatarUploadProps) {
             accept="image/*"
             className="absolute top-0 left-0 w-full h-full opacity-0 cursor-pointer"
             onChange={handleChange}
+            ref={ref}
           />
         </div>
         <div className="margin-1 text-muted-foreground">
@@ -68,4 +76,5 @@ export function AvatarUpload({ value, onChange }: AvatarUploadProps) {
         </div>
       </div>
     );
-}
+  },
+);

web/src/hooks/use-knowledge-request.ts

@@ -1,4 +1,5 @@
 import { useHandleFilterSubmit } from '@/components/list-filter-bar/use-handle-filter-submit';
+import message from '@/components/ui/message';
 import {
   IKnowledge,
   IKnowledgeGraph,
@@ -13,7 +14,6 @@ import kbService, {
 } from '@/services/knowledge-service';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { useDebounce } from 'ahooks';
-import { message } from 'antd';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useParams, useSearchParams } from 'umi';
 import {

web/src/pages/dataset/setting/chunk-method-form.tsx

@@ -4,7 +4,7 @@ import { useFormContext, useWatch } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
 import { DocumentParserType } from '@/constants/knowledge';
-import { useUpdateKnowledge } from '@/hooks/knowledge-hooks';
+import { useUpdateKnowledge } from '@/hooks/use-knowledge-request';
 import { useMemo } from 'react';
 import { useParams } from 'umi';
 import { AudioConfiguration } from './configuration/audio';

web/src/pages/dataset/setting/general-form.tsx

@@ -1,7 +1,7 @@
+import { AvatarUpload } from '@/components/avatar-upload';
 import { FormContainer } from '@/components/form-container';
 import { SelectWithSearch } from '@/components/originui/select-with-search';
 import { RAGFlowFormItem } from '@/components/ragflow-form';
-import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
 import { Button, ButtonLoading } from '@/components/ui/button';
 import {
   FormControl,
@@ -12,10 +12,8 @@ import {
 } from '@/components/ui/form';
 import { Input } from '@/components/ui/input';
 import { PermissionRole } from '@/constants/permission';
-import { useUpdateKnowledge } from '@/hooks/knowledge-hooks';
+import { useUpdateKnowledge } from '@/hooks/use-knowledge-request';
-import { transformFile2Base64 } from '@/utils/file-util';
+import { useMemo } from 'react';
-import { Pencil, Upload } from 'lucide-react';
-import { useEffect, useMemo, useState } from 'react';
 import { useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'umi';
@@ -23,8 +21,6 @@ import { useParams } from 'umi';
 export function GeneralForm() {
   const form = useFormContext();
   const { t } = useTranslation();
-  const [avatarFile, setAvatarFile] = useState<File | null>(null);
-  const [avatarBase64Str, setAvatarBase64Str] = useState(''); // Avatar Image base64
 
   const { saveKnowledgeConfiguration, loading: submitLoading } =
     useUpdateKnowledge();
@@ -43,26 +39,6 @@ export function GeneralForm() {
     }));
   }, [t]);
 
-  // init avatar file if it exists in defaultValues
-  useEffect(() => {
-    if (!avatarFile) {
-      let avatarList = defaultValues['avatar'];
-      if (avatarList && avatarList.length > 0) {
-        setAvatarBase64Str(avatarList[0].thumbUrl);
-      }
-    }
-  }, [avatarFile, defaultValues]);
-
-  // input[type=file] on change event, get img base64
-  useEffect(() => {
-    if (avatarFile) {
-      (async () => {
-        // make use of img compression transformFile2Base64
-        setAvatarBase64Str(await transformFile2Base64(avatarFile));
-      })();
-    }
-  }, [avatarFile]);
-
   return (
     <>
       <FormContainer className="space-y-10 p-10">
@@ -90,62 +66,14 @@ export function GeneralForm() {
         <FormField
           control={form.control}
           name="avatar"
-          render={() => (
+          render={({ field }) => (
             <FormItem className="items-center space-y-0">
               <div className="flex">
                 <FormLabel className="text-sm text-muted-foreground whitespace-nowrap w-1/4">
                   {t('setting.avatar')}
                 </FormLabel>
                 <FormControl className="w-3/4">
-                  <div className="flex justify-start items-end space-x-2">
+                  <AvatarUpload {...field}></AvatarUpload>
-                    <div className="relative group">
-                      {!avatarBase64Str ? (
-                        <div className="w-[64px] h-[64px] grid place-content-center border border-dashed	rounded-md">
-                          <div className="flex flex-col items-center">
-                            <Upload />
-                            <p>{t('common.upload')}</p>
-                          </div>
-                        </div>
-                      ) : (
-                        <div className="w-[64px] h-[64px] relative grid place-content-center">
-                          <Avatar className="w-[64px] h-[64px] rounded-md">
-                            <AvatarImage
-                              className=" block"
-                              src={avatarBase64Str}
-                              alt=""
-                            />
-                            <AvatarFallback></AvatarFallback>
-                          </Avatar>
-                          <div className="absolute inset-0 bg-[#000]/20 group-hover:bg-[#000]/60">
-                            <Pencil
-                              size={20}
-                              className="absolute right-2 bottom-0 opacity-50 hidden group-hover:block"
-                            />
-                          </div>
-                        </div>
-                      )}
-                      <Input
-                        placeholder=""
-                        // {...field}
-                        type="file"
-                        title=""
-                        accept="image/*"
-                        className="absolute top-0 left-0 w-full h-full opacity-0 cursor-pointer"
-                        onChange={(ev) => {
-                          const file = ev.target?.files?.[0];
-                          if (
-                            /\.(jpg|jpeg|png|webp|bmp)$/i.test(file?.name ?? '')
-                          ) {
-                            setAvatarFile(file!);
-                          }
-                          ev.target.value = '';
-                        }}
-                      />
-                    </div>
-                    <div className="margin-1 text-muted-foreground">
-                      {t('knowledgeConfiguration.photoTip')}
-                    </div>
-                  </div>
                 </FormControl>
               </div>
               <div className="flex pt-1">
@@ -209,8 +137,8 @@ export function GeneralForm() {
           onClick={() => {
             (async () => {
               let isValidate = await form.trigger('name');
-              const { name, description, permission } = form.getValues();
+              const { name, description, permission, avatar } =
-              const avatar = avatarBase64Str;
+                form.getValues();
 
               if (isValidate) {
                 saveKnowledgeConfiguration({

web/src/pages/dataset/setting/hooks.ts

@@ -2,46 +2,15 @@ import { LlmModelType } from '@/constants/knowledge';
 import { useSetModalState } from '@/hooks/common-hooks';
 
 import { useSelectLlmOptionsByModelType } from '@/hooks/llm-hooks';
-import { useNavigateToDataset } from '@/hooks/route-hook';
+import { useFetchKnowledgeBaseConfiguration } from '@/hooks/use-knowledge-request';
-import {
-  useFetchKnowledgeBaseConfiguration,
-  useUpdateKnowledge,
-} from '@/hooks/use-knowledge-request';
 import { useSelectParserList } from '@/hooks/user-setting-hooks';
-import {
-  getBase64FromUploadFileList,
-  getUploadFileListFromBase64,
-} from '@/utils/file-util';
 import { useIsFetching } from '@tanstack/react-query';
-import { Form, UploadFile } from 'antd';
-import { FormInstance } from 'antd/lib';
 import { pick } from 'lodash';
 import { useCallback, useEffect, useState } from 'react';
 import { UseFormReturn } from 'react-hook-form';
 import { z } from 'zod';
 import { formSchema } from './form-schema';
 
-export const useSubmitKnowledgeConfiguration = (form: FormInstance) => {
-  const { saveKnowledgeConfiguration, loading } = useUpdateKnowledge();
-  const navigateToDataset = useNavigateToDataset();
-
-  const submitKnowledgeConfiguration = useCallback(async () => {
-    const values = await form.validateFields();
-    const avatar = await getBase64FromUploadFileList(values.avatar);
-    saveKnowledgeConfiguration({
-      ...values,
-      avatar,
-    });
-    navigateToDataset();
-  }, [saveKnowledgeConfiguration, form, navigateToDataset]);
-
-  return {
-    submitKnowledgeConfiguration,
-    submitLoading: loading,
-    navigateToDataset,
-  };
-};
-
 // The value that does not need to be displayed in the analysis method Select
 const HiddenFields = ['email', 'picture', 'audio'];
 
@@ -67,11 +36,6 @@ export const useFetchKnowledgeConfigurationOnMount = (
   const { data: knowledgeDetails } = useFetchKnowledgeBaseConfiguration();
 
   useEffect(() => {
-    const fileList: UploadFile[] = getUploadFileListFromBase64(
-      knowledgeDetails.avatar,
-    );
-
-    console.log('🚀 ~ useEffect ~ fileList:', fileList, knowledgeDetails);
     const parser_config = {
       ...form.formState?.defaultValues?.parser_config,
       ...knowledgeDetails.parser_config,
@@ -86,12 +50,10 @@ export const useFetchKnowledgeConfigurationOnMount = (
         'language',
         'parser_config',
         'pagerank',
+        'avatar',
       ]),
     };
-    form.reset({
+    form.reset(formValues);
-      ...formValues,
-      avatar: fileList,
-    });
   }, [form, knowledgeDetails]);
 
   return knowledgeDetails;
@@ -100,17 +62,6 @@ export const useFetchKnowledgeConfigurationOnMount = (
 export const useSelectKnowledgeDetailsLoading = () =>
   useIsFetching({ queryKey: ['fetchKnowledgeDetail'] }) > 0;
 
-export const useHandleChunkMethodChange = () => {
-  const [form] = Form.useForm();
-  const chunkMethod = Form.useWatch('parser_id', form);
-
-  useEffect(() => {
-    console.log('🚀 ~ useHandleChunkMethodChange ~ chunkMethod:', chunkMethod);
-  }, [chunkMethod]);
-
-  return { form, chunkMethod };
-};
-
 export const useRenameKnowledgeTag = () => {
   const [tag, setTag] = useState<string>('');
   const {

web/src/pages/next-search/search-setting.tsx

@@ -1,11 +1,11 @@
 // src/pages/next-search/search-setting.tsx
 
+import { AvatarUpload } from '@/components/avatar-upload';
 import {
   MetadataFilter,
   MetadataFilterSchema,
 } from '@/components/metadata-filter';
 import { Input } from '@/components/originui/input';
-import { RAGFlowAvatar } from '@/components/ragflow-avatar';
 import { Button } from '@/components/ui/button';
 import { SingleFormSlider } from '@/components/ui/dual-range-slider';
 import {
@@ -31,9 +31,8 @@ import {
 import { useFetchTenantInfo } from '@/hooks/user-setting-hooks';
 import { IKnowledge } from '@/interfaces/database/knowledge';
 import { cn } from '@/lib/utils';
-import { transformFile2Base64 } from '@/utils/file-util';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { Pencil, Upload, X } from 'lucide-react';
+import { X } from 'lucide-react';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useForm, useWatch } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
@@ -110,8 +109,6 @@ const SearchSetting: React.FC<SearchSettingProps> = ({
     resolver: zodResolver(SearchSettingFormSchema),
   });
 
-  const [avatarFile, setAvatarFile] = useState<File | null>(null);
-  const [avatarBase64Str, setAvatarBase64Str] = useState(''); // Avatar Image base64
   const [datasetList, setDatasetList] = useState<MultiSelectOptionType[]>([]);
   const [datasetSelectEmbdId, setDatasetSelectEmbdId] = useState('');
   const { t } = useTranslation();
@@ -174,19 +171,7 @@ const SearchSetting: React.FC<SearchSettingProps> = ({
       setWidth0('w-[440px]');
     }
   }, [open]);
-  useEffect(() => {
+
-    if (!avatarFile) {
-      setAvatarBase64Str(data?.avatar);
-    }
-  }, [avatarFile, data?.avatar]);
-  useEffect(() => {
-    if (avatarFile) {
-      (async () => {
-        // make use of img compression transformFile2Base64
-        setAvatarBase64Str(await transformFile2Base64(avatarFile));
-      })();
-    }
-  }, [avatarFile]);
   const { list: datasetListOrigin } = useFetchKnowledgeList();
 
   useEffect(() => {
@@ -273,7 +258,6 @@ const SearchSetting: React.FC<SearchSettingProps> = ({
           llm_setting: { ...llmSetting },
         },
         tenant_id: systemSetting.tenant_id,
-        avatar: avatarBase64Str,
       });
       setOpen(false);
     } catch (error) {
@@ -337,59 +321,11 @@ const SearchSetting: React.FC<SearchSettingProps> = ({
             <FormField
               control={formMethods.control}
               name="avatar"
-              render={() => (
+              render={({ field }) => (
                 <FormItem>
                   <FormLabel>{t('search.avatar')}</FormLabel>
                   <FormControl>
-                    <div className="relative group flex items-end gap-2">
+                    <AvatarUpload {...field}></AvatarUpload>
-                      <div>
-                        {!avatarBase64Str ? (
-                          <div className="w-[64px] h-[64px] grid place-content-center border border-dashed	rounded-md">
-                            <div className="flex flex-col items-center">
-                              <Upload />
-                              <p>{t('common.upload')}</p>
-                            </div>
-                          </div>
-                        ) : (
-                          <div className="w-[64px] h-[64px] relative grid place-content-center">
-                            <RAGFlowAvatar
-                              avatar={avatarBase64Str}
-                              name={data.name}
-                              className="w-[64px] h-[64px] rounded-md block"
-                            />
-                            <div className="absolute inset-0 bg-[#000]/20 group-hover:bg-[#000]/60">
-                              <Pencil
-                                size={20}
-                                className="absolute right-2 bottom-0 opacity-50 hidden group-hover:block"
-                              />
-                            </div>
-                          </div>
-                        )}
-                        <input
-                          placeholder=""
-                          // {...field}
-                          type="file"
-                          title=""
-                          accept="image/*"
-                          className="absolute w-[64px] top-0 left-0 h-full opacity-0 cursor-pointer"
-                          onChange={(ev) => {
-                            const file = ev.target?.files?.[0];
-                            if (
-                              /\.(jpg|jpeg|png|webp|bmp)$/i.test(
-                                file?.name ?? '',
-                              )
-                            ) {
-                              setAvatarFile(file!);
-                            }
-                            ev.target.value = '';
-                          }}
-                        />
-                      </div>
-
-                      <div className="margin-1 text-muted-foreground">
-                        {t('knowledgeConfiguration.photoTip')}
-                      </div>
-                    </div>
                   </FormControl>
                   <FormMessage />
                 </FormItem>