From 90953e490ceea8e5256fd564e4d220b2e7da50b3 Mon Sep 17 00:00:00 2001
From: moonrailgun <moonrailgun@gmail.com>
Date: Thu, 19 Sep 2024 23:00:32 +0800
Subject: [PATCH] fix: fix website cannot delete problem #91

---
 src/client/api/model/website.ts               |  9 ------
 src/client/components/CommonList.tsx          |  4 ++-
 .../components/website/WebsiteConfig.tsx      |  8 ++++--
 src/client/components/website/WebsiteInfo.tsx | 14 ++++++++--
 src/server/app.ts                             |  1 -
 src/server/model/workspace.ts                 | 14 ----------
 src/server/router/workspace.ts                | 23 ---------------
 src/server/trpc/routers/website.ts            | 28 +++++++++++++++++++
 8 files changed, 47 insertions(+), 54 deletions(-)
 delete mode 100644 src/server/router/workspace.ts

diff --git a/src/client/api/model/website.ts b/src/client/api/model/website.ts
index cc154cd..ef17b95 100644
--- a/src/client/api/model/website.ts
+++ b/src/client/api/model/website.ts
@@ -4,15 +4,6 @@ import { AppRouterOutput } from '../trpc';
 
 export type WebsiteInfo = NonNullable<AppRouterOutput['website']['info']>;
 
-export async function deleteWorkspaceWebsite(
-  workspaceId: string,
-  websiteId: string
-) {
-  await request.delete(`/api/workspace/${workspaceId}/website/${websiteId}`);
-
-  queryClient.resetQueries(['websites', workspaceId]);
-}
-
 export function refreshWorkspaceWebsites(workspaceId: string) {
   queryClient.refetchQueries(['websites', workspaceId]);
 }
diff --git a/src/client/components/CommonList.tsx b/src/client/components/CommonList.tsx
index 4bdcd17..a9f4457 100644
--- a/src/client/components/CommonList.tsx
+++ b/src/client/components/CommonList.tsx
@@ -100,7 +100,9 @@ export const CommonList: React.FC<CommonListProps> = React.memo((props) => {
                 }}
               >
                 <div className="flex w-full items-center justify-between gap-1">
-                  <div className="font-semibold">{item.title}</div>
+                  <div className="overflow-hidden text-ellipsis font-semibold">
+                    {item.title}
+                  </div>
 
                   {item.number && item.number > 0 && (
                     <span className="opacity-60" title={String(item.number)}>
diff --git a/src/client/components/website/WebsiteConfig.tsx b/src/client/components/website/WebsiteConfig.tsx
index e611b14..c3eefcb 100644
--- a/src/client/components/website/WebsiteConfig.tsx
+++ b/src/client/components/website/WebsiteConfig.tsx
@@ -1,6 +1,5 @@
 import { Form, Input, message } from 'antd';
 import React from 'react';
-import { deleteWorkspaceWebsite } from '../../api/model/website';
 import { useRequest } from '../../hooks/useRequest';
 import { useCurrentWorkspaceId } from '../../store/user';
 import { ErrorTip } from '../ErrorTip';
@@ -38,6 +37,9 @@ export const WebsiteConfig: React.FC<{ websiteId: string }> = React.memo(
       onSuccess: defaultSuccessHandler,
       onError: defaultErrorHandler,
     });
+    const deleteMutation = trpc.website.delete.useMutation({
+      onError: defaultErrorHandler,
+    });
 
     const handleSave = useEvent(
       async (values: { name: string; domain: string; monitorId: string }) => {
@@ -65,7 +67,7 @@ export const WebsiteConfig: React.FC<{ websiteId: string }> = React.memo(
     );
 
     const [, handleDeleteWebsite] = useRequest(async () => {
-      await deleteWorkspaceWebsite(workspaceId, websiteId!);
+      await deleteMutation.mutateAsync({ workspaceId, websiteId });
 
       message.success(t('Delete Success'));
 
@@ -157,7 +159,7 @@ export const WebsiteConfig: React.FC<{ websiteId: string }> = React.memo(
                 <CardContent>
                   <div>
                     <AlertConfirm
-                      title={t('Delete Website')}
+                      title={t('Delete Website') + ' ' + website.name}
                       onConfirm={() => handleDeleteWebsite()}
                     >
                       <Button variant="destructive">
diff --git a/src/client/components/website/WebsiteInfo.tsx b/src/client/components/website/WebsiteInfo.tsx
index d91a296..e1785cc 100644
--- a/src/client/components/website/WebsiteInfo.tsx
+++ b/src/client/components/website/WebsiteInfo.tsx
@@ -1,7 +1,6 @@
 import { Button, Form, Input, message, Popconfirm, Tabs } from 'antd';
 import React from 'react';
 import { useNavigate, useParams } from 'react-router';
-import { deleteWorkspaceWebsite } from '../../api/model/website';
 import { useRequest } from '../../hooks/useRequest';
 import { useCurrentWorkspaceId } from '../../store/user';
 import { ErrorTip } from '../ErrorTip';
@@ -27,6 +26,7 @@ export const WebsiteInfo: React.FC = React.memo(() => {
   }>();
   const navigate = useNavigate();
   const queryClient = useQueryClient();
+  const trpcUtils = trpc.useUtils();
 
   const { data: website, isLoading } = trpc.website.info.useQuery({
     workspaceId,
@@ -40,6 +40,9 @@ export const WebsiteInfo: React.FC = React.memo(() => {
     },
     onError: defaultErrorHandler,
   });
+  const deleteMutation = trpc.website.delete.useMutation({
+    onError: defaultErrorHandler,
+  });
 
   const handleSave = useEvent(
     async (values: { name: string; domain: string; monitorId: string }) => {
@@ -54,7 +57,12 @@ export const WebsiteInfo: React.FC = React.memo(() => {
   );
 
   const [, handleDeleteWebsite] = useRequest(async () => {
-    await deleteWorkspaceWebsite(workspaceId, websiteId!);
+    if (!websiteId) {
+      return;
+    }
+
+    await deleteMutation.mutateAsync({ workspaceId, websiteId });
+    await trpcUtils.website.all.refetch({ workspaceId });
 
     message.success(t('Delete Success'));
 
@@ -139,7 +147,7 @@ export const WebsiteInfo: React.FC = React.memo(() => {
 
           <Tabs.TabPane key={'data'} tab={'Data'}>
             <Popconfirm
-              title={t('Delete Website')}
+              title={t('Delete Website') + ' ' + website.name}
               onConfirm={() => handleDeleteWebsite()}
             >
               <Button type="primary" danger={true}>
diff --git a/src/server/app.ts b/src/server/app.ts
index 37ec314..acb83a8 100644
--- a/src/server/app.ts
+++ b/src/server/app.ts
@@ -50,7 +50,6 @@ app.use(
 app.use('/health', healthRouter);
 app.use('/api/auth/*', ExpressAuth(authConfig));
 app.use('/api/website', websiteRouter);
-app.use('/api/workspace', workspaceRouter);
 app.use('/monitor', monitorRouter);
 app.use('/telemetry', telemetryRouter);
 app.use('/serverStatus', serverStatusRouter);
diff --git a/src/server/model/workspace.ts b/src/server/model/workspace.ts
index 9eaa2b4..749e8a0 100644
--- a/src/server/model/workspace.ts
+++ b/src/server/model/workspace.ts
@@ -47,20 +47,6 @@ export async function getWorkspaceWebsites(workspaceId: string) {
   return workspace?.websites ?? [];
 }
 
-export async function deleteWorkspaceWebsite(
-  workspaceId: string,
-  websiteId: string
-) {
-  const website = await prisma.website.delete({
-    where: {
-      id: websiteId,
-      workspaceId,
-    },
-  });
-
-  return website;
-}
-
 export async function getWorkspaceWebsiteDateRange(websiteId: string) {
   const { params } = await parseWebsiteFilters(websiteId, {
     startDate: new Date(DEFAULT_RESET_DATE),
diff --git a/src/server/router/workspace.ts b/src/server/router/workspace.ts
deleted file mode 100644
index 0e38765..0000000
--- a/src/server/router/workspace.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Router } from 'express';
-import { auth } from '../middleware/auth.js';
-import { param, validate } from '../middleware/validate.js';
-import { workspacePermission } from '../middleware/workspace.js';
-import { deleteWorkspaceWebsite } from '../model/workspace.js';
-import { ROLES } from '@tianji/shared';
-
-export const workspaceRouter = Router();
-
-workspaceRouter.delete(
-  '/:workspaceId/website/:websiteId',
-  validate(param('workspaceId').isString(), param('websiteId').isString()),
-  auth(),
-  workspacePermission([ROLES.owner]),
-  async (req, res) => {
-    const workspaceId = req.params.workspaceId;
-    const websiteId = req.params.websiteId;
-
-    const website = await deleteWorkspaceWebsite(workspaceId, websiteId);
-
-    res.json({ website });
-  }
-);
diff --git a/src/server/trpc/routers/website.ts b/src/server/trpc/routers/website.ts
index 7ccd70e..234af49 100644
--- a/src/server/trpc/routers/website.ts
+++ b/src/server/trpc/routers/website.ts
@@ -522,6 +522,34 @@ export const websiteRouter = router({
 
       return website;
     }),
+  delete: workspaceOwnerProcedure
+    .meta({
+      openapi: {
+        method: 'DELETE',
+        tags: [OPENAPI_TAG.WEBSITE],
+        protect: true,
+        path: `/workspace/{workspaceId}/website/{websiteId}`,
+      },
+    })
+    .input(
+      z.object({
+        websiteId: z.string(),
+      })
+    )
+    .output(websiteInfoSchema)
+    .mutation(async ({ input }) => {
+      const { workspaceId, websiteId } = input;
+
+      const website = await prisma.website.delete({
+        where: {
+          id: websiteId,
+          workspaceId,
+        },
+      });
+
+      return website;
+    }),
+
   updateInfo: workspaceOwnerProcedure
     .meta(
       buildWebsiteOpenapi({