diff --git a/src/app/[locale]/pages/violations/[id]/page.tsx b/src/app/[locale]/pages/file/[id]/page.tsx similarity index 65% rename from src/app/[locale]/pages/violations/[id]/page.tsx rename to src/app/[locale]/pages/file/[id]/page.tsx index c79e6b7..14736cc 100644 --- a/src/app/[locale]/pages/violations/[id]/page.tsx +++ b/src/app/[locale]/pages/file/[id]/page.tsx @@ -1,17 +1,17 @@ // app/files/[id]/page.tsx 'use server' -import ViolationPageTitle from '@/app/ui/violations/file-page/violation-page-title'; -import ViolationPageViolationInfo from '@/app/ui/violations/file-page/violation-page-violation-info'; -import ViolationPpageFileStatistic from '@/app/ui/violations/file-page/violation-page-file-statistic'; -import ViolationPageFileInfo from '@/app/ui/violations/file-page/violation-page-file-info'; -import ViolationPageActions from '@/app/ui/violations/file-page/violation-page-actions'; -import ViolationPageViolationsList from '@/app/ui/violations/file-page/violation-page-violations-list'; -import ViolationPageNote from '@/app/ui/violations/file-page/violation-page-note'; +import FilePageTitle from '@/app/ui/file-page/file-page-title'; +import FilePageViolationInfo from '@/app/ui/file-page/file-page-violation-info'; +import ViolationPpageFileStatistic from '@/app/ui/file-page/file-page-file-statistic'; +import FilePageFileInfo from '@/app/ui/file-page/file-page-file-info'; +import FilePageActions from '@/app/ui/file-page/file-page-actions'; +import FilePageViolationsList from '@/app/ui/file-page/file-page-violations-list'; +import FilePageNote from '@/app/ui/file-page/file-page-note'; import { getFileViolations } from '@/app/actions/violationActions'; import { viewFileInfo } from '@/app/actions/fileEntity'; import { useTranslations } from 'next-intl'; -import ViolationFileNotFound from '@/app/ui/violations/file-page/violation-file-not-found'; +import ViolationFileNotFound from '@/app/ui/file-page/file-page-file-not-found'; type MonitoringStatus = 'NONE' | 'MONITORING_DAILY' | 'MONITORING_WEEKLY' | 'MONITORING_MONTHLY'; type MimeType = 'image' | 'video' | 'audio' | 'document'; @@ -67,23 +67,23 @@ export default async function Page({ return (
- +
- - {/* */} + + {/* */}
- - - {/* */} + + {/* */}
diff --git a/src/app/[locale]/pages/violations/page.tsx b/src/app/[locale]/pages/violations/page.tsx index 99baf38..81256eb 100644 --- a/src/app/[locale]/pages/violations/page.tsx +++ b/src/app/[locale]/pages/violations/page.tsx @@ -14,9 +14,9 @@ export default function Page() { description="monitoring-copyright-infringements-description" /> - +
diff --git a/src/app/actions/searchActions.ts b/src/app/actions/searchActions.ts index 89ec589..965cab8 100644 --- a/src/app/actions/searchActions.ts +++ b/src/app/actions/searchActions.ts @@ -39,8 +39,6 @@ export async function searchUserFiles(fileId: string) { export async function searchGlobalFiles(fileId: string, currentPage: number) { const token = await getSessionData('token'); - console.log('searchGlobalFiles'); - console.log(currentPage); //удалить когда поиск будет нормально работать /* return { @@ -114,13 +112,26 @@ export async function searchGlobalFiles(fileId: string, currentPage: number) { } } catch (error) { + let errorMessage: string = 'error'; + if (error) { + const typedError = error as any; + switch (typedError.message_desc) { + case 'No results found': + errorMessage = 'no-similar-files-title' + break; + default: + errorMessage = 'error' + break; + } + } + return { images: [], page: 0, pageSize: 0, totalPages: 0, totalResults: 0, - error: 'error' + error: errorMessage } } } diff --git a/src/app/ui/dashboard/new/dashboard-user-violations.tsx b/src/app/ui/dashboard/new/dashboard-user-violations.tsx index 8f4d811..a8288f0 100644 --- a/src/app/ui/dashboard/new/dashboard-user-violations.tsx +++ b/src/app/ui/dashboard/new/dashboard-user-violations.tsx @@ -75,7 +75,7 @@ export default function DashboardUserViolations() { >
diff --git a/src/app/ui/violations/file-page/violation-page-actions.tsx b/src/app/ui/file-page/file-page-actions.tsx similarity index 92% rename from src/app/ui/violations/file-page/violation-page-actions.tsx rename to src/app/ui/file-page/file-page-actions.tsx index f4962f0..cca574a 100644 --- a/src/app/ui/violations/file-page/violation-page-actions.tsx +++ b/src/app/ui/file-page/file-page-actions.tsx @@ -1,4 +1,4 @@ -export default function ViolationPageActions() { +export default function FilePageActions() { return (
{t('read-more')} diff --git a/src/app/ui/modal-windows/file-info-modal-window.tsx b/src/app/ui/modal-windows/file-info-modal-window.tsx index 3e85a7a..3d2d7bf 100644 --- a/src/app/ui/modal-windows/file-info-modal-window.tsx +++ b/src/app/ui/modal-windows/file-info-modal-window.tsx @@ -1,7 +1,7 @@ import { convertBytes } from '@/app/lib/convertBytes'; import { formatDate, formatDateTime } from '@/app/lib/formatDate'; import { useTranslations } from 'next-intl'; -import { FileDetails } from '@/app/[locale]/pages/violations/[id]/page'; +import { FileDetails } from '@/app/[locale]/pages/file/[id]/page'; export function FileInfoModalWindow({ fileInfo, setWindowClose, setWindowChildren }: { fileInfo: FileDetails, diff --git a/src/app/ui/payment/payment-tab-tariffs.tsx b/src/app/ui/payment/payment-tab-tariffs.tsx index 1e35931..4d48fe0 100644 --- a/src/app/ui/payment/payment-tab-tariffs.tsx +++ b/src/app/ui/payment/payment-tab-tariffs.tsx @@ -103,7 +103,6 @@ export default function PaymentTabTariffs() { setIsProcessing(false); setErrorMessage(null); } - } function PaymentConfirmationModal() { diff --git a/src/app/ui/search/file-search-panel.tsx b/src/app/ui/search/file-search-panel.tsx index 2ff9ef3..22b084e 100644 --- a/src/app/ui/search/file-search-panel.tsx +++ b/src/app/ui/search/file-search-panel.tsx @@ -124,7 +124,7 @@ export function FileSearchPanel( if (result.error) { throw result.error; } - if (result.images.length) { + if (result.totalResults) { setSearchedGlobalFiles(result.images); setSearchTotalPages(result.totalPages); setSearchCurrentPages(page); @@ -133,7 +133,11 @@ export function FileSearchPanel( setSearchedGlobalFilesShowNull(true); } } catch (error) { - setGlobalSearchErrorMessage('error'); + if (error) { + setGlobalSearchErrorMessage(error as string); + } else { + setGlobalSearchErrorMessage('error'); + } } finally { await queryClient.invalidateQueries({ queryKey: ['userData'] }); await queryClient.invalidateQueries({ queryKey: ['userSearchData'] }); diff --git a/src/app/ui/violations/violations-table.tsx b/src/app/ui/violations/violations-table.tsx index a45ece7..1c0fb97 100644 --- a/src/app/ui/violations/violations-table.tsx +++ b/src/app/ui/violations/violations-table.tsx @@ -253,7 +253,7 @@ export default function ViolationsTable() { */}