From 6ec0f0e180c117dd1f82f7c1ced6d98e55084beb Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Wed, 14 Dec 2022 12:43:15 +0200 Subject: [PATCH] RED-3800 Audit Info Dialog --- apps/red-ui/src/app/modules/admin/admin.module.ts | 7 ++----- .../admin/screens/audit/audit-screen.component.html | 2 -- .../modules/admin/services/admin-dialog.service.ts | 4 ++-- apps/red-ui/src/app/services/files/rss.service.ts | 13 ++++++++++++- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts index 95d6d512c..8a97a350f 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -60,8 +60,7 @@ import { IqserUsersModule, } from '@iqser/common-ui'; import { TranslateModule } from '@ngx-translate/core'; -import { OverlayModule } from '@angular/cdk/overlay'; -import { AuditInfoDialog } from './dialogs/audit-info-dialog/audit-info-dialog.component'; +import { AuditInfoDialogComponent } from './dialogs/audit-info-dialog/audit-info-dialog.component'; const dialogs = [ AddEditCloneDossierTemplateDialogComponent, @@ -77,7 +76,7 @@ const dialogs = [ AddEditDossierStateDialogComponent, ConfirmDeleteDossierStateDialogComponent, ConfigureCertificateDialogComponent, - AuditInfoDialog, + AuditInfoDialogComponent, ]; const screens = [ @@ -133,8 +132,6 @@ const components = [ IqserSharedModule, IqserHelpModeModule, IqserPermissionsModule, - OverlayModule, - HumanizeCamelCasePipe, ], }) export class AdminModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html index cc177e99e..fc571809f 100644 --- a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html @@ -101,8 +101,6 @@ { dialogConfig: { disableClose: false, maxHeight: '100vh' }, }, auditInfo: { - component: AuditInfoDialog, + component: AuditInfoDialogComponent, }, }; diff --git a/apps/red-ui/src/app/services/files/rss.service.ts b/apps/red-ui/src/app/services/files/rss.service.ts index 835f2c36c..a7e6c6a8f 100644 --- a/apps/red-ui/src/app/services/files/rss.service.ts +++ b/apps/red-ui/src/app/services/files/rss.service.ts @@ -22,6 +22,17 @@ export class RssService extends GenericService { ); } + @Validate() + getRSSExportData(@RequiredParam() dossierId: string, @RequiredParam() fileId: string): Observable { + const queryParams: QueryParam[] = []; + queryParams.push({ key: 'fileId', value: fileId }); + + return this._getOne([dossierId], 'rss', queryParams).pipe( + map(data => data.files[0]), + catchError(() => of({} as IRssEntry)), + ); + } + @Validate() override( @RequiredParam() dossierId: string, @@ -41,7 +52,7 @@ export class RssService extends GenericService { } exportJSON(dossierId: string, fileId: string, name: string): Observable { - return this.getRSSData(dossierId, fileId).pipe( + return this.getRSSExportData(dossierId, fileId).pipe( tap(data => { const blob = new Blob([JSON.stringify(data, null, 2)], { type: 'application/json' }); saveAs(blob, name + '.rss.json');