From bc39614ac476cbbb34bf925ba9024b2764673414 Mon Sep 17 00:00:00 2001 From: Arthur Bullet Date: Thu, 30 Jan 2025 11:29:37 +0100 Subject: [PATCH] feat(pci.ai.tools): last dashboard pr comment and notebook link fixes Signed-off-by: Arthur Bullet --- .../hooks/api/ai/notebook/useDeleteNotebook.hook.tsx | 2 +- .../apps/pci-ai-notebooks/src/lib/notebookHelper.ts | 7 ++++++- .../datastore/_components/AddDatastore.modal.tsx | 2 +- .../privateDocker/_components/AddDocker.modal.tsx | 2 +- .../pages/dashboard/git/_components/AddGit.modal.tsx | 2 +- .../dashboard/tokens/_components/AddToken.modal.tsx | 2 +- .../[notebookId]/dashboard/delete/Delete.modal.tsx | 2 +- .../src/pages/notebooks/create/Create.spec.tsx | 2 +- .../create/_components/OrderFunnel.component.tsx | 10 +++++++++- .../apps/pci-ai-notebooks/src/routes/routes.tsx | 6 +++--- 10 files changed, 25 insertions(+), 12 deletions(-) diff --git a/packages/manager/apps/pci-ai-notebooks/src/hooks/api/ai/notebook/useDeleteNotebook.hook.tsx b/packages/manager/apps/pci-ai-notebooks/src/hooks/api/ai/notebook/useDeleteNotebook.hook.tsx index 0cc4a714f5e5..7af9b142c32c 100644 --- a/packages/manager/apps/pci-ai-notebooks/src/hooks/api/ai/notebook/useDeleteNotebook.hook.tsx +++ b/packages/manager/apps/pci-ai-notebooks/src/hooks/api/ai/notebook/useDeleteNotebook.hook.tsx @@ -22,7 +22,7 @@ export function useDeleteNotebook({ onSuccess: () => { // Invalidate notebooks list query to get the latest data queryClient.invalidateQueries({ - queryKey: [projectId, 'ai/notebook', { exact: true }], + queryKey: [projectId, 'ai/notebook'], }); onDeleteSuccess(); }, diff --git a/packages/manager/apps/pci-ai-notebooks/src/lib/notebookHelper.ts b/packages/manager/apps/pci-ai-notebooks/src/lib/notebookHelper.ts index 2dd3ff9768d5..723e6198c4d3 100644 --- a/packages/manager/apps/pci-ai-notebooks/src/lib/notebookHelper.ts +++ b/packages/manager/apps/pci-ai-notebooks/src/lib/notebookHelper.ts @@ -9,7 +9,12 @@ export function isRunningNotebook(currentState: ai.notebook.NotebookStateEnum) { } export function isStoppedNotebook(currentState: ai.notebook.NotebookStateEnum) { - return currentState === ai.notebook.NotebookStateEnum.STOPPED; + return ( + currentState === ai.notebook.NotebookStateEnum.STOPPED || + currentState === ai.notebook.NotebookStateEnum.ERROR || + currentState === ai.notebook.NotebookStateEnum.FAILED || + currentState === ai.notebook.NotebookStateEnum.SYNC_FAILED + ); } export function isDeletingNotebook( diff --git a/packages/manager/apps/pci-ai-notebooks/src/pages/dashboard/datastore/_components/AddDatastore.modal.tsx b/packages/manager/apps/pci-ai-notebooks/src/pages/dashboard/datastore/_components/AddDatastore.modal.tsx index f408ab718cea..a624cf0fd39a 100644 --- a/packages/manager/apps/pci-ai-notebooks/src/pages/dashboard/datastore/_components/AddDatastore.modal.tsx +++ b/packages/manager/apps/pci-ai-notebooks/src/pages/dashboard/datastore/_components/AddDatastore.modal.tsx @@ -151,7 +151,7 @@ const AddDatastore = () => { - {regionsQuery.data.map((region) => ( + {regionsQuery.data?.map((region) => ( {tRegions(`region_${region.id}`)} diff --git a/packages/manager/apps/pci-ai-notebooks/src/pages/dashboard/docker/_components/privateDocker/_components/AddDocker.modal.tsx b/packages/manager/apps/pci-ai-notebooks/src/pages/dashboard/docker/_components/privateDocker/_components/AddDocker.modal.tsx index 9bfc6dc1ff18..7a91003cdd20 100644 --- a/packages/manager/apps/pci-ai-notebooks/src/pages/dashboard/docker/_components/privateDocker/_components/AddDocker.modal.tsx +++ b/packages/manager/apps/pci-ai-notebooks/src/pages/dashboard/docker/_components/privateDocker/_components/AddDocker.modal.tsx @@ -101,7 +101,7 @@ const AddDocker = () => { - {regionQuery.data.map((region) => ( + {regionQuery.data?.map((region) => ( {tRegions(`region_${region.id}`)} diff --git a/packages/manager/apps/pci-ai-notebooks/src/pages/dashboard/git/_components/AddGit.modal.tsx b/packages/manager/apps/pci-ai-notebooks/src/pages/dashboard/git/_components/AddGit.modal.tsx index c271bf00dbd3..9c3720ef0672 100644 --- a/packages/manager/apps/pci-ai-notebooks/src/pages/dashboard/git/_components/AddGit.modal.tsx +++ b/packages/manager/apps/pci-ai-notebooks/src/pages/dashboard/git/_components/AddGit.modal.tsx @@ -158,7 +158,7 @@ const AddGit = () => { - {regionsQuery.data.map((region) => ( + {regionsQuery.data?.map((region) => ( {tRegions(`region_${region.id}`)} diff --git a/packages/manager/apps/pci-ai-notebooks/src/pages/dashboard/tokens/_components/AddToken.modal.tsx b/packages/manager/apps/pci-ai-notebooks/src/pages/dashboard/tokens/_components/AddToken.modal.tsx index df4d3abb1f34..890aa59c9107 100644 --- a/packages/manager/apps/pci-ai-notebooks/src/pages/dashboard/tokens/_components/AddToken.modal.tsx +++ b/packages/manager/apps/pci-ai-notebooks/src/pages/dashboard/tokens/_components/AddToken.modal.tsx @@ -255,7 +255,7 @@ const AddToken = () => { - {regionsQuery.data.map((region) => ( + {regionsQuery.data?.map((region) => ( {tRegions(`region_${region.id}`)} diff --git a/packages/manager/apps/pci-ai-notebooks/src/pages/notebooks/[notebookId]/dashboard/delete/Delete.modal.tsx b/packages/manager/apps/pci-ai-notebooks/src/pages/notebooks/[notebookId]/dashboard/delete/Delete.modal.tsx index 406b97e2b709..54309b522dee 100644 --- a/packages/manager/apps/pci-ai-notebooks/src/pages/notebooks/[notebookId]/dashboard/delete/Delete.modal.tsx +++ b/packages/manager/apps/pci-ai-notebooks/src/pages/notebooks/[notebookId]/dashboard/delete/Delete.modal.tsx @@ -8,7 +8,7 @@ const DeleteNotebookModal = () => { const notebookQuery = useGetNotebook(projectId, notebookId); return ( navigate('../..')} + onSuccess={() => navigate('../../notebooks')} notebook={notebookQuery.data} /> ); diff --git a/packages/manager/apps/pci-ai-notebooks/src/pages/notebooks/create/Create.spec.tsx b/packages/manager/apps/pci-ai-notebooks/src/pages/notebooks/create/Create.spec.tsx index 39f0e3e31efd..f71d39f99048 100644 --- a/packages/manager/apps/pci-ai-notebooks/src/pages/notebooks/create/Create.spec.tsx +++ b/packages/manager/apps/pci-ai-notebooks/src/pages/notebooks/create/Create.spec.tsx @@ -264,6 +264,6 @@ describe('Order funnel page', () => { await waitFor(() => { expect(notebookApi.addNotebook).toHaveBeenCalled(); }); - expect(mockedUsedNavigate).toHaveBeenCalledWith('../undefined'); + expect(mockedUsedNavigate).toHaveBeenCalledWith('../notebooks/undefined'); }); }); diff --git a/packages/manager/apps/pci-ai-notebooks/src/pages/notebooks/create/_components/OrderFunnel.component.tsx b/packages/manager/apps/pci-ai-notebooks/src/pages/notebooks/create/_components/OrderFunnel.component.tsx index 962dcb474649..346d3811802d 100644 --- a/packages/manager/apps/pci-ai-notebooks/src/pages/notebooks/create/_components/OrderFunnel.component.tsx +++ b/packages/manager/apps/pci-ai-notebooks/src/pages/notebooks/create/_components/OrderFunnel.component.tsx @@ -60,6 +60,7 @@ import A from '@/components/links/A.component'; import { useLocale } from '@/hooks/useLocale'; import OvhLink from '@/components/links/OvhLink.component'; import { GUIDES, getGuideUrl } from '@/configuration/guide'; +import Link from '@/components/links/Link.component'; interface OrderFunnelProps { regions: ai.capabilities.Region[]; @@ -111,7 +112,7 @@ const OrderFunnel = ({ title: t('successCreatingNotebookTitle'), description: t('successCreatingNotebookDescription'), }); - navigate(`../${notebook.id}`); + navigate(`../notebooks/${notebook.id}`); }, }); @@ -442,6 +443,13 @@ const OrderFunnel = ({

{t('fieldVolumeDescription1')}{' '} + + {t('fieldVolumeDashboardLink')} + + fl import('@/pages/notebooks/start/Start.modal'), ), }, { - path: 'notebooks/stop/:notebookId', + path: 'stop/:notebookId', id: 'notebooks.stop', ...lazyRouteConfig(() => import('@/pages/notebooks/stop/Stop.modal'), ), }, { - path: 'notebooks/delete/:notebookId', + path: 'delete/:notebookId', id: 'notebooks.delete', ...lazyRouteConfig(() => import('@/pages/notebooks/delete/Delete.modal'),