diff --git a/src/app/ui/search/file-search-panel.tsx b/src/app/ui/search/file-search-panel.tsx index b10316f..ec92eef 100644 --- a/src/app/ui/search/file-search-panel.tsx +++ b/src/app/ui/search/file-search-panel.tsx @@ -6,6 +6,7 @@ import { useQueryClient } from '@tanstack/react-query'; import { Pagination } from '@/app/components/Pagination'; import { useTranslations } from 'next-intl'; import { AllowedExtensions } from '@/app/ui/search/section-search-file'; +import { getFileType } from '@/app/lib/getFileType'; export interface SearchItem { url: string, @@ -29,7 +30,11 @@ export interface FileInfo { url: string } -export function FileSearchPanel({ fileId, ref, allowedExtensions }: { fileId: string | null, ref: any, allowedExtensions: AllowedExtensions }) { +export function FileSearchPanel( + { fileId, ref, allowedExtensions, fileType } + : + { fileId: string | null, ref: any, allowedExtensions: AllowedExtensions, fileType: string | null } +) { const [searchedUserFiles, setSearchedUserFiles] = useState([]); const [searchedUserFilesShowNull, setSearchedUserFilesShowNull] = useState(false); const [searchedGlobalFiles, setSearchedGlobalFiles] = useState([]); @@ -63,7 +68,7 @@ export function FileSearchPanel({ fileId, ref, allowedExtensions }: { fileId: st try { let result = await searchUserFiles(fileId); - if (result.content.length) { + if (result.content.length && fileType === 'image') { setSearchedUserFiles(result.content); setShowGlobalSearch(true); handlerSearchGlobalFile(fileId, page); diff --git a/src/app/ui/search/recent-searches.tsx b/src/app/ui/search/recent-searches.tsx index 54e0135..d1ac089 100644 --- a/src/app/ui/search/recent-searches.tsx +++ b/src/app/ui/search/recent-searches.tsx @@ -16,9 +16,9 @@ export function RecentSearches() { document
{userSearchData?.document?.count ? userSearchData?.document?.count : 0} поисков
-
+ {/*
date -
+
*/}
@@ -26,9 +26,6 @@ export function RecentSearches() { image
{userSearchData?.image?.count ? userSearchData?.image?.count : 0} поисков
-
- date -
@@ -36,9 +33,6 @@ export function RecentSearches() { audio
{userSearchData?.audio?.count ? userSearchData?.audio?.count : 0} поисков
-
- date -
@@ -46,9 +40,6 @@ export function RecentSearches() { video
{userSearchData?.video?.count ? userSearchData?.video?.count : 0} поисков
-
- date -
diff --git a/src/app/ui/search/search-stats.tsx b/src/app/ui/search/search-stats.tsx index de936d1..07b4011 100644 --- a/src/app/ui/search/search-stats.tsx +++ b/src/app/ui/search/search-stats.tsx @@ -2,11 +2,16 @@ import { useUserSearchData } from '@/app/hooks/react-query/useUserSearchData'; import { useTranslations } from 'next-intl'; +import { useEffect } from 'react'; export function SearchStats() { const { data: userSearchData, isLoading, isError, error, } = useUserSearchData(); const t = useTranslations('Global'); + useEffect(() => { + console.log(userSearchData); + }, [userSearchData]) + return (
diff --git a/src/app/ui/search/section-search-file.tsx b/src/app/ui/search/section-search-file.tsx index 10875b3..6c2e52f 100644 --- a/src/app/ui/search/section-search-file.tsx +++ b/src/app/ui/search/section-search-file.tsx @@ -45,6 +45,7 @@ export default function SectionSearchFile({ allowedExtensions, maxFileSize }: Se const [isFileUploaded, setIsFileUploaded] = useState(false); const [uploadProgress, setUploadProgress] = useState(0); const [fileId, setFileId] = useState(null); + const [fileType, setFileType] = useState(null); const queryClient = useQueryClient(); const isCancelledRef = useRef(false); @@ -93,6 +94,7 @@ export default function SectionSearchFile({ allowedExtensions, maxFileSize }: Se if (fileId) { await removeUserFile(fileId, 1); setFileId(null); + setFileType(null); } setError(null); @@ -214,6 +216,7 @@ export default function SectionSearchFile({ allowedExtensions, maxFileSize }: Se if (isLastChunk && chunkResponse.fileId) { setFileId(chunkResponse.fileId); + setFileType(fileType); document.cookie = `searchedFileId=${chunkResponse.fileId}` } } @@ -348,7 +351,7 @@ export default function SectionSearchFile({ allowedExtensions, maxFileSize }: Se
{isFileUploaded && ( - + )}
);