From a660642bbb2db73e52e907934901abeed9635cfd Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Thu, 10 Apr 2025 08:07:11 +0200 Subject: [PATCH] fix: string replacement on all occurances --- .../admin/club/newsletterController.ts | 4 ++-- .../admin/club/protocolController.ts | 2 +- src/helpers/newsletterHelper.ts | 18 +++++++++++------- src/helpers/templateHelper.ts | 6 +++--- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/controller/admin/club/newsletterController.ts b/src/controller/admin/club/newsletterController.ts index 9338732..5399336 100644 --- a/src/controller/admin/club/newsletterController.ts +++ b/src/controller/admin/club/newsletterController.ts @@ -94,7 +94,7 @@ export async function getNewsletterPrintoutsById(req: Request, res: Response): P let newsletter = await NewsletterService.getById(newsletterId); let filesInFolder = FileSystemHelper.getFilesInDirectory( - `newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}` + `newsletter/${newsletter.id}_${newsletter.title.replaceAll(" ", "")}` ); res.json(filesInFolder); @@ -114,7 +114,7 @@ export async function getNewsletterPrintoutByIdAndPrint(req: Request, res: Respo let filepath = FileSystemHelper.formatPath( "newsletter", - `${newsletter.id}_${newsletter.title.replace(" ", "")}`, + `${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`, filename ); diff --git a/src/controller/admin/club/protocolController.ts b/src/controller/admin/club/protocolController.ts index ecae059..98396c8 100644 --- a/src/controller/admin/club/protocolController.ts +++ b/src/controller/admin/club/protocolController.ts @@ -235,7 +235,7 @@ export async function createProtocolPrintoutById(req: Request, res: Response): P year: "numeric", })}`; - let filename = `${new Date().toISOString().split("T")[0]}_${iteration + 1}_Protokoll_${protocol.title.replace( + let filename = `${new Date().toISOString().split("T")[0]}_${iteration + 1}_Protokoll_${protocol.title.replaceAll( /[^a-zA-Z0-9]/g, "" )}`; diff --git a/src/helpers/newsletterHelper.ts b/src/helpers/newsletterHelper.ts index 8c819b2..3104359 100644 --- a/src/helpers/newsletterHelper.ts +++ b/src/helpers/newsletterHelper.ts @@ -191,13 +191,17 @@ export abstract class NewsletterHelper { public static getICSFilePath(newsletter: newsletter) { return FileSystemHelper.formatPath( "newsletter", - `${newsletter.id}_${newsletter.title.replace(" ", "")}`, + `${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`, `events.ics` ); } public static saveIcsToFile(newsletter: newsletter, ics: string) { - FileSystemHelper.writeFile(`newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}`, "events.ics", ics); + FileSystemHelper.writeFile( + `newsletter/${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`, + "events.ics", + ics + ); } public static async sendMails(newsletterId: number) { @@ -264,7 +268,7 @@ export abstract class NewsletterHelper { let config = await NewsletterConfigService.getAll(); FileSystemHelper.clearDirectoryByFiletype( - `newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}`, + `newsletter/${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`, ".pdf" ); @@ -284,8 +288,8 @@ export abstract class NewsletterHelper { await PdfExport.renderFile({ template: "newsletter", title: `Newsletter von ${CLUB_NAME}`, - filename: `${rec.lastname}_${rec.firstname}_${rec.id}`.replace(" ", "-"), - folder: `newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}`, + filename: `${rec.lastname}_${rec.firstname}_${rec.id}`.replaceAll(" ", "-"), + folder: `newsletter/${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`, data: data, }) .then(() => { @@ -313,9 +317,9 @@ export abstract class NewsletterHelper { } await PdfExport.sqashToSingleFile( - `newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}`, + `newsletter/${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`, "allPdfsTogether", - `newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}` + `newsletter/${newsletter.id}_${newsletter.title.replaceAll(" ", "")}` ) .then(() => { this.formatJobEmit( diff --git a/src/helpers/templateHelper.ts b/src/helpers/templateHelper.ts index b8d97f1..2aac38b 100644 --- a/src/helpers/templateHelper.ts +++ b/src/helpers/templateHelper.ts @@ -27,9 +27,9 @@ export abstract class TemplateHelper { } static normalizeTemplate(template: string): string { - template = template.replace(/.*?<\/listend>/g, "{{/each}}"); - template = template.replace(/]*>(WDH Start: )?/g, "{{#each "); - template = template.replace(/<\/liststart>/g, "}}"); + template = template.replaceAll(/.*?<\/listend>/g, "{{/each}}"); + template = template.replaceAll(/]*>(WDH Start: )?/g, "{{#each "); + template = template.replaceAll(/<\/liststart>/g, "}}"); return template; }