fix: 404 when view deleted (#1390)

Author: tea-artist

apps/nestjs-backend/src/features/user/last-visit/last-visit.service.ts

@@ -85,6 +85,9 @@ export class LastVisitService {
             orderBy: {
               order: 'asc',
             },
+            where: {
+              deletedTime: null,
+            },
           },
         },
         where: {
@@ -115,6 +118,9 @@ export class LastVisitService {
           orderBy: {
             order: 'asc',
           },
+          where: {
+            deletedTime: null,
+          },
         },
       },
       where: {

apps/nestjs-backend/test/user-last-visit.e2e-spec.ts

@@ -14,7 +14,7 @@ import {
   permanentDeleteTable,
   updateUserLastVisit,
 } from '@teable/openapi';
-import { initApp } from './utils/init-app';
+import { getViews, initApp } from './utils/init-app';
 
 describe('OpenAPI OAuthController (e2e)', () => {
   let app: INestApplication;
@@ -154,4 +154,22 @@ describe('OpenAPI OAuthController (e2e)', () => {
       },
     });
   });
+
+  it('should fallback to default view when delete a view without any visit', async () => {
+    await createView(table1.id, { type: ViewType.Grid, name: 'view2', order: 1 });
+
+    await deleteView(table1.id, table1.views[0].id);
+    const views = await getViews(table1.id);
+
+    const res = await getUserLastVisit({
+      resourceType: LastVisitResourceType.Table,
+      parentResourceId: base.id,
+    });
+
+    expect(res.data).toEqual({
+      resourceId: table1.id,
+      childResourceId: views[0].id,
+      resourceType: LastVisitResourceType.Table,
+    });
+  });
 });

apps/nextjs-app/src/pages/base/[baseId].tsx

@@ -52,24 +52,33 @@ export const getServerSideProps: GetServerSideProps = withEnv(
   ensureLogin(
     withAuthSSR(async (context, ssrApi) => {
       const { baseId } = context.query;
-      const userLastVisit = await ssrApi.getUserLastVisit(
-        LastVisitResourceType.Table,
-        baseId as string
-      );
+      const [userLastVisit, tables] = await Promise.all([
+        ssrApi.getUserLastVisit(LastVisitResourceType.Table, baseId as string),
+        ssrApi.getTables(baseId as string),
+      ]);
+
+      if (tables.length && userLastVisit && userLastVisit.childResourceId) {
+        // if userLastVisit.resourceId has no permission to the tables, redirect to the first table
+        if (tables.find((table) => table.id === userLastVisit.resourceId)) {
+          return {
+            redirect: {
+              destination: `/base/${baseId}/${userLastVisit.resourceId}/${userLastVisit.childResourceId}`,
+              permanent: false,
+            },
+          };
+        }
 
-      if (userLastVisit && userLastVisit.childResourceId) {
         return {
           redirect: {
-            destination: `/base/${baseId}/${userLastVisit.resourceId}/${userLastVisit.childResourceId}`,
+            destination: `/base/${baseId}/${tables[0].id}/${tables[0].defaultViewId}`,
             permanent: false,
           },
         };
       }
 
       const queryClient = new QueryClient();
 
-      const [tables] = await Promise.all([
-        ssrApi.getTables(baseId as string),
+      await Promise.all([
         queryClient.fetchQuery({
           queryKey: ReactQueryKeys.base(baseId as string),
           queryFn: ({ queryKey }) =>