Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'RED-10128' into 'master'

Browse Source 
RED-10128: Incorrect File Extension for Downloaded (Multi-file) Reports

Closes RED-10128

See merge request redactmanager/red-ui!601
This commit is contained in:
Adina Teudan 2024-10-08 16:55:48 +02:00
commit 428f1dd5fb
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.ts
View File

@ -137,7 +137,15 @@ export default class ReportsScreenComponent implements OnInit {
}
#getTemplateFilename(template: IReportTemplate): string {
return `${template.fileName} ${template.multiFileReport ? this.#translateService.instant(_('reports-screen.multi-file-report')) : ''}`.trim();
const extensionIndex = template.fileName.lastIndexOf('.');
const hasExtension = extensionIndex !== -1;
const baseName = hasExtension ? template.fileName.substring(0, extensionIndex) : template.fileName;
const extension = hasExtension ? template.fileName.substring(extensionIndex) : '';
const multiFileSuffix = template.multiFileReport ? ` ${this.#translateService.instant(_('reports-screen.multi-file-report'))}` : '';
return `${baseName}${multiFileSuffix}${extension}`.trim();
}
async #openOverwriteConfirmationDialog(file: File, multiFileReport: boolean): Promise<void> {