From c4055a383be08814e7c745d72597e93f2b8b5df4 Mon Sep 17 00:00:00 2001 From: tea artist Date: Thu, 30 May 2024 18:15:34 +0800 Subject: [PATCH 1/2] chore: add page error log --- apps/nestjs-backend/package.json | 2 -- .../mail-sender/mail-sender.service.ts | 25 +++++++++++-------- .../src/pages/base/[baseId]/[tableId].tsx | 3 ++- .../base/[baseId]/[tableId]/[viewId].tsx | 5 ++-- .../pages/base/[baseId]/[tableId]/design.tsx | 5 ++-- 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/apps/nestjs-backend/package.json b/apps/nestjs-backend/package.json index 69b678814..9e0b6623e 100644 --- a/apps/nestjs-backend/package.json +++ b/apps/nestjs-backend/package.json @@ -155,8 +155,6 @@ "keyv": "4.5.4", "knex": "3.1.0", "lodash": "4.17.21", - "markdown-it": "14.1.0", - "markdown-it-sanitizer": "0.4.3", "mime-types": "2.1.35", "minio": "7.1.3", "ms": "2.1.3", diff --git a/apps/nestjs-backend/src/features/mail-sender/mail-sender.service.ts b/apps/nestjs-backend/src/features/mail-sender/mail-sender.service.ts index 96e2c7d69..17d17de8c 100644 --- a/apps/nestjs-backend/src/features/mail-sender/mail-sender.service.ts +++ b/apps/nestjs-backend/src/features/mail-sender/mail-sender.service.ts @@ -14,16 +14,21 @@ export class MailSenderService { @BaseConfig() private readonly baseConfig: IBaseConfig ) {} - async sendMail(mailOptions: ISendMailOptions): Promise { - return this.mailService - .sendMail(mailOptions) - .then(() => true) - .catch((reason) => { - if (reason) { - this.logger.error(`Mail sending failed: ${reason.message}`, reason.stack); - } - return false; - }); + async sendMail( + mailOptions: ISendMailOptions, + extra?: { shouldThrow?: boolean } + ): Promise { + const sender = this.mailService.sendMail(mailOptions).then(() => true); + if (extra?.shouldThrow) { + return sender; + } + + return sender.catch((reason) => { + if (reason) { + this.logger.error(`Mail sending failed: ${reason.message}`, reason.stack); + } + return false; + }); } inviteEmailOptions(info: { name: string; email: string; spaceName: string; inviteUrl: string }) { diff --git a/apps/nextjs-app/src/pages/base/[baseId]/[tableId].tsx b/apps/nextjs-app/src/pages/base/[baseId]/[tableId].tsx index c193990aa..700b7f291 100644 --- a/apps/nextjs-app/src/pages/base/[baseId]/[tableId].tsx +++ b/apps/nextjs-app/src/pages/base/[baseId]/[tableId].tsx @@ -20,11 +20,12 @@ export const getServerSideProps: GetServerSideProps = withAuthSSR(async (context }; } catch (e) { const error = e as IHttpError; - if (error.status !== 401) { + if (error.status < 500) { return { notFound: true, }; } + console.error(error); throw error; } }); diff --git a/apps/nextjs-app/src/pages/base/[baseId]/[tableId]/[viewId].tsx b/apps/nextjs-app/src/pages/base/[baseId]/[tableId]/[viewId].tsx index 496f6df9b..dba290d69 100644 --- a/apps/nextjs-app/src/pages/base/[baseId]/[tableId]/[viewId].tsx +++ b/apps/nextjs-app/src/pages/base/[baseId]/[tableId]/[viewId].tsx @@ -65,17 +65,16 @@ export const getServerSideProps = withAuthSSR(async (context, ss }; } return { - err: '', notFound: true, }; } catch (e) { const error = e as IHttpError; - if (error.status !== 401) { + if (error.status < 500) { return { - err: '', notFound: true, }; } + console.error(error); throw error; } }); diff --git a/apps/nextjs-app/src/pages/base/[baseId]/[tableId]/design.tsx b/apps/nextjs-app/src/pages/base/[baseId]/[tableId]/design.tsx index 29882560e..0b6d01ded 100644 --- a/apps/nextjs-app/src/pages/base/[baseId]/[tableId]/design.tsx +++ b/apps/nextjs-app/src/pages/base/[baseId]/[tableId]/design.tsx @@ -28,17 +28,16 @@ export const getServerSideProps = withAuthSSR(async (context, }; } return { - err: '', notFound: true, }; } catch (e) { const error = e as IHttpError; - if (error.status !== 401) { + if (error.status < 500) { return { - err: '', notFound: true, }; } + console.error(error); throw error; } }); From 293f0850527e5d3a176b4b4f47c37a482a4de513 Mon Sep 17 00:00:00 2001 From: tea artist Date: Thu, 30 May 2024 18:16:52 +0800 Subject: [PATCH 2/2] chore: install --- pnpm-lock.yaml | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9d2576831..8466bb226 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -207,12 +207,6 @@ importers: lodash: specifier: 4.17.21 version: 4.17.21 - markdown-it: - specifier: 14.1.0 - version: 14.1.0 - markdown-it-sanitizer: - specifier: 0.4.3 - version: 0.4.3 mime-types: specifier: 2.1.35 version: 2.1.35 @@ -18022,22 +18016,6 @@ packages: object-visit: 1.0.1 dev: true - /markdown-it-sanitizer@0.4.3: - resolution: {integrity: sha512-0Q2ua8+oDN7/3r5UXMnbVq8C+LRfT2pzVKA+h4nXTLEMBFQDwp7qJZOe7DkBa79C7V2cSBXJyScxJ7vYs9kE2w==} - dev: false - - /markdown-it@14.1.0: - resolution: {integrity: sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==} - hasBin: true - dependencies: - argparse: 2.0.1 - entities: 4.5.0 - linkify-it: 5.0.0 - mdurl: 2.0.0 - punycode.js: 2.3.1 - uc.micro: 2.1.0 - dev: false - /markdown-table@3.0.3: resolution: {integrity: sha512-Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw==} dev: false @@ -18284,10 +18262,6 @@ packages: resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==} dev: true - /mdurl@2.0.0: - resolution: {integrity: sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==} - dev: false - /media-typer@0.3.0: resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==} engines: {node: '>= 0.6'} @@ -22104,11 +22078,6 @@ packages: pump: 2.0.1 dev: true - /punycode.js@2.3.1: - resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==} - engines: {node: '>=6'} - dev: false - /punycode@1.4.1: resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==} dev: true