From b9f43449cea5c2d7aacc528f351f7dd6cc5a5b8c Mon Sep 17 00:00:00 2001 From: Hussam Kayed Date: Thu, 19 Dec 2024 22:08:01 +0100 Subject: [PATCH 1/5] EW-830: Changed imported file name if title empty --- .../common-cartridge/import/common-cartridge-file-parser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/server/src/modules/common-cartridge/import/common-cartridge-file-parser.ts b/apps/server/src/modules/common-cartridge/import/common-cartridge-file-parser.ts index 847dfa66f35..444d5294542 100644 --- a/apps/server/src/modules/common-cartridge/import/common-cartridge-file-parser.ts +++ b/apps/server/src/modules/common-cartridge/import/common-cartridge-file-parser.ts @@ -38,7 +38,7 @@ export class CommonCartridgeFileParser { public getTitle(): string | undefined { const title = this.manifestParser.getTitle(); - + if(title === "") return "Importiertes Spaltenboard"; return title; } From b4f9e5d6ec848d60a082bd2a5eaf948e2757a91f Mon Sep 17 00:00:00 2001 From: Hussam Kayed Date: Fri, 20 Dec 2024 09:09:30 +0100 Subject: [PATCH 2/5] EW-830: Removed old logic and change title in imported CC board --- .../common-cartridge/import/common-cartridge-file-parser.ts | 2 +- .../import/common-cartridge-resource-factory.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/server/src/modules/common-cartridge/import/common-cartridge-file-parser.ts b/apps/server/src/modules/common-cartridge/import/common-cartridge-file-parser.ts index 444d5294542..bfa2c53ce62 100644 --- a/apps/server/src/modules/common-cartridge/import/common-cartridge-file-parser.ts +++ b/apps/server/src/modules/common-cartridge/import/common-cartridge-file-parser.ts @@ -38,7 +38,7 @@ export class CommonCartridgeFileParser { public getTitle(): string | undefined { const title = this.manifestParser.getTitle(); - if(title === "") return "Importiertes Spaltenboard"; + return title; } diff --git a/apps/server/src/modules/common-cartridge/import/common-cartridge-resource-factory.ts b/apps/server/src/modules/common-cartridge/import/common-cartridge-resource-factory.ts index b8058b59f95..95f38c0321e 100644 --- a/apps/server/src/modules/common-cartridge/import/common-cartridge-resource-factory.ts +++ b/apps/server/src/modules/common-cartridge/import/common-cartridge-resource-factory.ts @@ -22,7 +22,7 @@ export class CommonCartridgeResourceFactory { } const content = this.archive.readAsText(organization.resourcePath); - const { title } = organization; + const { title } = organization ?? "Importiertes Spaltenboard"; switch (organization.resourceType) { case CommonCartridgeResourceTypeV1P1.WEB_LINK: From a2a5cdc373665bb2fe08251f030ea93fbec05636 Mon Sep 17 00:00:00 2001 From: Hussam Kayed Date: Fri, 20 Dec 2024 11:58:13 +0100 Subject: [PATCH 3/5] EW-830: Changed base name condition and added default name for the column board --- .../learnroom/service/common-cartridge-import.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/server/src/modules/learnroom/service/common-cartridge-import.service.ts b/apps/server/src/modules/learnroom/service/common-cartridge-import.service.ts index c57b7300510..bb1eb30e49a 100644 --- a/apps/server/src/modules/learnroom/service/common-cartridge-import.service.ts +++ b/apps/server/src/modules/learnroom/service/common-cartridge-import.service.ts @@ -56,7 +56,7 @@ export class CommonCartridgeImportService { id: course.id, }, layout: BoardLayout.COLUMNS, - title: boardProps.title || '', + title: boardProps.title === '' ? 'Importiertes Spaltenboard' : boardProps.title, }); await this.boardNodeService.addRoot(columnBoard); From ce4d273d735f3011983e6da356a7ac431202eec7 Mon Sep 17 00:00:00 2001 From: Hussam Kayed Date: Mon, 6 Jan 2025 09:50:55 +0100 Subject: [PATCH 4/5] EW-830: removed piece of faulty logic --- .../import/common-cartridge-resource-factory.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/server/src/modules/common-cartridge/import/common-cartridge-resource-factory.ts b/apps/server/src/modules/common-cartridge/import/common-cartridge-resource-factory.ts index 95f38c0321e..b8058b59f95 100644 --- a/apps/server/src/modules/common-cartridge/import/common-cartridge-resource-factory.ts +++ b/apps/server/src/modules/common-cartridge/import/common-cartridge-resource-factory.ts @@ -22,7 +22,7 @@ export class CommonCartridgeResourceFactory { } const content = this.archive.readAsText(organization.resourcePath); - const { title } = organization ?? "Importiertes Spaltenboard"; + const { title } = organization; switch (organization.resourceType) { case CommonCartridgeResourceTypeV1P1.WEB_LINK: From ad8f733335db044253048d648bf1a15967184294 Mon Sep 17 00:00:00 2001 From: Hussam Kayed Date: Mon, 6 Jan 2025 10:04:58 +0100 Subject: [PATCH 5/5] EW-830: removing blank space --- .../common-cartridge/import/common-cartridge-file-parser.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/server/src/modules/common-cartridge/import/common-cartridge-file-parser.ts b/apps/server/src/modules/common-cartridge/import/common-cartridge-file-parser.ts index bfa2c53ce62..44a1ea7f9a6 100644 --- a/apps/server/src/modules/common-cartridge/import/common-cartridge-file-parser.ts +++ b/apps/server/src/modules/common-cartridge/import/common-cartridge-file-parser.ts @@ -38,7 +38,6 @@ export class CommonCartridgeFileParser { public getTitle(): string | undefined { const title = this.manifestParser.getTitle(); - return title; }