diff --git a/starsky/starsky/clientapp/src/components/organisms/menu-detail-view/menu-detail-view.spec.tsx b/starsky/starsky/clientapp/src/components/organisms/menu-detail-view/menu-detail-view.spec.tsx index 407e95d28..d0d59d89e 100644 --- a/starsky/starsky/clientapp/src/components/organisms/menu-detail-view/menu-detail-view.spec.tsx +++ b/starsky/starsky/clientapp/src/components/organisms/menu-detail-view/menu-detail-view.spec.tsx @@ -838,7 +838,7 @@ describe("MenuDetailView", () => { expect(trashIncl).toBeTruthy(); - expect(trashIncl?.textContent).toBe("Including: jpg, arw"); + expect(trashIncl?.textContent).toBe("Including: arw, jpg"); act(() => { component.unmount(); diff --git a/starsky/starsky/clientapp/src/shared/comma-seperated-filelist/comma-seperated-filelist.spec.ts b/starsky/starsky/clientapp/src/shared/comma-seperated-filelist/comma-seperated-filelist.spec.ts index a6a7d0684..c70efdd5a 100644 --- a/starsky/starsky/clientapp/src/shared/comma-seperated-filelist/comma-seperated-filelist.spec.ts +++ b/starsky/starsky/clientapp/src/shared/comma-seperated-filelist/comma-seperated-filelist.spec.ts @@ -15,17 +15,17 @@ describe("CommaSeperatedFileList", () => { test("should return comma-separated last parts after dot for multiple inputs", () => { const result = comma.CommaSpaceLastDot(["example.test", "another.example", "final.test"]); - expect(result).toBe("test, example, test"); + expect(result).toBe("example, test"); }); test("should handle inputs without dots", () => { const result = comma.CommaSpaceLastDot(["example", "another", "final"]); - expect(result).toBe("example, without extension, final"); + expect(result).toBe("without extension"); }); test("should handle mixed inputs with and without dots", () => { const result = comma.CommaSpaceLastDot(["example.test", "another", "final.test"]); - expect(result).toBe("test, without extension, test"); + expect(result).toBe("test, without extension"); }); test("should handle mixed inputs with and without dots", () => { @@ -34,6 +34,6 @@ describe("CommaSeperatedFileList", () => { "/collection/20241106_155823_DSC00339", "final.test" ]); - expect(result).toBe("test, without extension, test"); + expect(result).toBe("test, without extension"); }); }); diff --git a/starsky/starsky/clientapp/src/shared/comma-seperated-filelist/comma-seperated-filelist.ts b/starsky/starsky/clientapp/src/shared/comma-seperated-filelist/comma-seperated-filelist.ts index e676c12f6..48c428a38 100644 --- a/starsky/starsky/clientapp/src/shared/comma-seperated-filelist/comma-seperated-filelist.ts +++ b/starsky/starsky/clientapp/src/shared/comma-seperated-filelist/comma-seperated-filelist.ts @@ -8,7 +8,6 @@ export class CommaSeperatedFileList { } else { uniqueExtensions.add(messageNoExtensionItem ? messageNoExtensionItem : "without extension"); } - uniqueExtensions.add(fileExtension); } return Array.from(uniqueExtensions).sort(); } @@ -16,7 +15,9 @@ export class CommaSeperatedFileList { public CommaSpaceLastDot(inputs: string[], messageNoExtensionItem?: string): string { let output = ""; const uniqueExtensionsArray = this.GetUniqueExtensions(inputs, messageNoExtensionItem); + for (let index = 0; index < uniqueExtensionsArray.length; index++) { + output += uniqueExtensionsArray[index]; if (index !== uniqueExtensionsArray.length - 1) { output += ", "; }