diff --git a/src/frontend/apps/impress/src/__tests__/pages.test.tsx b/src/frontend/apps/impress/src/__tests__/pages.test.tsx index 60d1e1ea..40a91550 100644 --- a/src/frontend/apps/impress/src/__tests__/pages.test.tsx +++ b/src/frontend/apps/impress/src/__tests__/pages.test.tsx @@ -5,7 +5,7 @@ import { AppWrapper } from '@/tests/utils'; import Page from '../pages'; -jest.mock('next/navigation', () => ({ +jest.mock('next/router', () => ({ useRouter() { return { push: jest.fn(), diff --git a/src/frontend/apps/impress/src/features/docs/doc-editor/components/DocEditor.tsx b/src/frontend/apps/impress/src/features/docs/doc-editor/components/DocEditor.tsx index b40e26e7..a664eb35 100644 --- a/src/frontend/apps/impress/src/features/docs/doc-editor/components/DocEditor.tsx +++ b/src/frontend/apps/impress/src/features/docs/doc-editor/components/DocEditor.tsx @@ -1,5 +1,4 @@ import { Alert, Loader, VariantType } from '@openfun/cunningham-react'; -import { useRouter as useNavigate } from 'next/navigation'; import { useRouter } from 'next/router'; import React, { useEffect } from 'react'; import { useTranslation } from 'react-i18next'; @@ -100,7 +99,7 @@ export const DocVersionEditor = ({ doc, versionId }: DocVersionEditorProps) => { }); const { createProvider, providers } = useDocStore(); - const navigate = useNavigate(); + const { replace } = useRouter(); useEffect(() => { if (!version?.id) { @@ -115,7 +114,7 @@ export const DocVersionEditor = ({ doc, versionId }: DocVersionEditorProps) => { if (isError && error) { if (error.status === 404) { - navigate.replace(`/404`); + void replace(`/404`); return null; } diff --git a/src/frontend/apps/impress/src/features/docs/doc-management/components/ModalRemoveDoc.tsx b/src/frontend/apps/impress/src/features/docs/doc-management/components/ModalRemoveDoc.tsx index 39963bd1..f2600b3c 100644 --- a/src/frontend/apps/impress/src/features/docs/doc-management/components/ModalRemoveDoc.tsx +++ b/src/frontend/apps/impress/src/features/docs/doc-management/components/ModalRemoveDoc.tsx @@ -7,7 +7,7 @@ import { useToastProvider, } from '@openfun/cunningham-react'; import { t } from 'i18next'; -import { useRouter } from 'next/navigation'; +import { useRouter } from 'next/router'; import { Box, Text, TextErrors } from '@/components'; import useCunninghamTheme from '@/cunningham/useCunninghamTheme'; @@ -24,7 +24,7 @@ interface ModalRemoveDocProps { export const ModalRemoveDoc = ({ onClose, doc }: ModalRemoveDocProps) => { const { colorsTokens } = useCunninghamTheme(); const { toast } = useToastProvider(); - const router = useRouter(); + const { push } = useRouter(); const { mutate: removeDoc, @@ -35,7 +35,7 @@ export const ModalRemoveDoc = ({ onClose, doc }: ModalRemoveDocProps) => { toast(t('The document has been deleted.'), VariantType.SUCCESS, { duration: 4000, }); - router.push('/'); + void push('/'); }, }); diff --git a/src/frontend/apps/impress/src/features/docs/doc-versioning/components/ModalVersion.tsx b/src/frontend/apps/impress/src/features/docs/doc-versioning/components/ModalVersion.tsx index 97f3fb43..c1046176 100644 --- a/src/frontend/apps/impress/src/features/docs/doc-versioning/components/ModalVersion.tsx +++ b/src/frontend/apps/impress/src/features/docs/doc-versioning/components/ModalVersion.tsx @@ -7,7 +7,7 @@ import { useToastProvider, } from '@openfun/cunningham-react'; import { t } from 'i18next'; -import { useRouter } from 'next/navigation'; +import { useRouter } from 'next/router'; import * as Y from 'yjs'; import { Box, Text } from '@/components'; @@ -31,14 +31,14 @@ export const ModalVersion = ({ versionId, }: ModalVersionProps) => { const { toast } = useToastProvider(); - const router = useRouter(); + const { push } = useRouter(); const { providers } = useDocStore(); const { mutate: updateDoc } = useUpdateDoc({ listInvalideQueries: [KEY_LIST_DOC_VERSIONS], onSuccess: () => { const onDisplaySuccess = () => { toast(t('Version restored successfully'), VariantType.SUCCESS); - router.push(`/docs/${docId}`); + void push(`/docs/${docId}`); }; if (!providers?.[docId] || !providers?.[versionId]) { diff --git a/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGridContainer.tsx b/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGridContainer.tsx index e4238842..282c3e83 100644 --- a/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGridContainer.tsx +++ b/src/frontend/apps/impress/src/features/docs/docs-grid/components/DocsGridContainer.tsx @@ -1,5 +1,5 @@ import { Button } from '@openfun/cunningham-react'; -import { useRouter } from 'next/navigation'; +import { useRouter } from 'next/router'; import React from 'react'; import { useTranslation } from 'react-i18next'; @@ -12,12 +12,12 @@ import { DocsGrid } from './DocsGrid'; export const DocsGridContainer = () => { const { t } = useTranslation(); const { untitledDocument } = useTrans(); - const router = useRouter(); + const { push } = useRouter(); const { isMobile } = useResponsiveStore(); const { mutate: createDoc } = useCreateDoc({ onSuccess: (doc) => { - router.push(`/docs/${doc.id}`); + void push(`/docs/${doc.id}`); }, }); diff --git a/src/frontend/apps/impress/src/features/docs/members/members-list/components/MemberItem.tsx b/src/frontend/apps/impress/src/features/docs/members/members-list/components/MemberItem.tsx index 34fc476d..a5c2eca5 100644 --- a/src/frontend/apps/impress/src/features/docs/members/members-list/components/MemberItem.tsx +++ b/src/frontend/apps/impress/src/features/docs/members/members-list/components/MemberItem.tsx @@ -5,7 +5,7 @@ import { VariantType, useToastProvider, } from '@openfun/cunningham-react'; -import { useRouter } from 'next/navigation'; +import { useRouter } from 'next/router'; import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; @@ -35,7 +35,7 @@ export const MemberItem = ({ const { isSmallMobile, screenWidth } = useResponsiveStore(); const [localRole, setLocalRole] = useState(role); const { toast } = useToastProvider(); - const router = useRouter(); + const { push } = useRouter(); const { mutate: updateDocAccess, error: errorUpdate } = useUpdateDocAccess({ onSuccess: () => { toast(t('The role has been updated'), VariantType.SUCCESS, { @@ -55,7 +55,7 @@ export const MemberItem = ({ ); if (isMyself) { - router.push('/'); + void push('/'); } }, }); diff --git a/src/frontend/apps/impress/src/pages/docs/[id]/index.tsx b/src/frontend/apps/impress/src/pages/docs/[id]/index.tsx index 24eda8b7..7ea5fd50 100644 --- a/src/frontend/apps/impress/src/pages/docs/[id]/index.tsx +++ b/src/frontend/apps/impress/src/pages/docs/[id]/index.tsx @@ -1,7 +1,6 @@ import { Loader } from '@openfun/cunningham-react'; import { useQueryClient } from '@tanstack/react-query'; import Head from 'next/head'; -import { useRouter as useNavigate } from 'next/navigation'; import { useRouter } from 'next/router'; import { useEffect, useState } from 'react'; @@ -46,7 +45,7 @@ const DocPage = ({ id }: DocProps) => { const { setCurrentDoc, createProvider, providers } = useDocStore(); const { setBroadcastProvider, addTask } = useBroadcastStore(); const queryClient = useQueryClient(); - const navigate = useNavigate(); + const { replace } = useRouter(); const provider = providers?.[id]; useEffect(() => { @@ -101,7 +100,7 @@ const DocPage = ({ id }: DocProps) => { if (isError && error) { if (error.status === 404) { - navigate.replace(`/404`); + void replace(`/404`); return null; }