From f12098f313e22faeb01fdd6f7333f2189b5df63d Mon Sep 17 00:00:00 2001 From: Pranav C Date: Fri, 17 May 2024 06:33:09 +0000 Subject: [PATCH 1/2] fix: expect undefined/null values --- packages/nocodb/src/utils/emailUtils.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/nocodb/src/utils/emailUtils.ts b/packages/nocodb/src/utils/emailUtils.ts index bc42407cde..0d63395d4b 100644 --- a/packages/nocodb/src/utils/emailUtils.ts +++ b/packages/nocodb/src/utils/emailUtils.ts @@ -8,8 +8,8 @@ const encode = (str: string) => { // a method to sanitise content and avoid any link/url injection in email content and html encode special chars // for example: example.com to be converted as example.com -export const sanitiseEmailContent = (content: string) => { +export const sanitiseEmailContent = (content?: string) => { return content - .replace(/[<>&;?#,'"$]+/g, encode) - .replace(/\.|\/\/:/g, '$&'); + ?.replace(/[<>&;?#,'"$]+/g, encode) + ?.replace(/\.|\/\/:/g, '$&'); }; From bcbc4db75b3b5c8cb48c5867840c3e5335530da4 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Fri, 17 May 2024 12:27:22 +0530 Subject: [PATCH 2/2] chore: skip litestream Dockerfile update since it no longer exist Signed-off-by: Pranav C --- scripts/upgradeNcGui.js | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgradeNcGui.js b/scripts/upgradeNcGui.js index 4e03f7b0fd..a4ce398d11 100644 --- a/scripts/upgradeNcGui.js +++ b/scripts/upgradeNcGui.js @@ -36,7 +36,6 @@ if (process.env.targetEnv === 'DEV') { // replace nc-lib-gui by nc-lib-gui-daily if it is nightly build / pr release const filePaths = [ path.join(__dirname, '..', 'packages', 'nocodb', 'Dockerfile'), - path.join(__dirname, '..', 'packages', 'nocodb', 'litestream', 'Dockerfile'), path.join(__dirname, '..', 'packages', 'nocodb', 'package.json'), path.join(__dirname, '..', 'packages', 'nocodb', 'src', 'Noco.ts'), path.join(__dirname, '..', 'packages', 'nocodb', 'src', 'nocobuild.ts'),