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 bf19c2512..a75a79525 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -40,6 +40,7 @@ import { AddEditDossierAttributeDialogComponent } from './dialogs/add-edit-dossi import { DossierAttributesListingScreenComponent } from './screens/dossier-attributes-listing/dossier-attributes-listing-screen.component'; import { TrashScreenComponent } from './screens/trash/trash-screen.component'; import { AuditService } from './services/audit.service'; +import { DigitalSignatureService } from './services/digital-signature.service'; const dialogs = [ AddEditDossierTemplateDialogComponent, @@ -89,7 +90,7 @@ const components = [ @NgModule({ declarations: [...components], - providers: [AdminDialogService, AuditService], + providers: [AdminDialogService, AuditService, DigitalSignatureService], imports: [CommonModule, SharedModule, AdminRoutingModule, NgxChartsModule, ColorPickerModule, MonacoEditorModule], }) export class AdminModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts index e9b27de0e..728224faa 100644 --- a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts @@ -1,11 +1,12 @@ import { Component, OnDestroy } from '@angular/core'; -import { DigitalSignature, DigitalSignatureControllerService } from '@redaction/red-ui-http'; +import { DigitalSignature } from '@redaction/red-ui-http'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { lastIndexOfEnd } from '@utils/functions'; import { AutoUnsubscribe, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { RouterHistoryService } from '@services/router-history.service'; +import { DigitalSignatureService } from '../../services/digital-signature.service'; @Component({ selector: 'redaction-digital-signature-screen', @@ -27,7 +28,7 @@ export class DigitalSignatureScreenComponent extends AutoUnsubscribe implements private readonly _userService: UserService, private readonly _loadingService: LoadingService, readonly routerHistoryService: RouterHistoryService, - private readonly _digitalSignatureControllerService: DigitalSignatureControllerService, + private readonly _digitalSignatureService: DigitalSignatureService, ) { super(); this.loadDigitalSignatureAndInitializeForm(); @@ -45,8 +46,8 @@ export class DigitalSignatureScreenComponent extends AutoUnsubscribe implements digitalSignature.password = digitalSignature.keySecret; const observable = this.digitalSignatureExists - ? this._digitalSignatureControllerService.updateDigitalSignature(digitalSignature) - : this._digitalSignatureControllerService.saveDigitalSignature(digitalSignature); + ? this._digitalSignatureService.update(digitalSignature) + : this._digitalSignatureService.save(digitalSignature); this.addSubscription = observable.subscribe( () => { @@ -64,7 +65,7 @@ export class DigitalSignatureScreenComponent extends AutoUnsubscribe implements } removeDigitalSignature() { - this.addSubscription = this._digitalSignatureControllerService.deleteDigitalSignature().subscribe( + this.addSubscription = this._digitalSignatureService.delete().subscribe( () => { this.loadDigitalSignatureAndInitializeForm(); this._toaster.success(_('digital-signature-screen.action.delete-success')); @@ -88,8 +89,8 @@ export class DigitalSignatureScreenComponent extends AutoUnsubscribe implements loadDigitalSignatureAndInitializeForm() { this._loadingService.start(); - this.addSubscription = this._digitalSignatureControllerService - .getDigitalSignature() + this.addSubscription = this._digitalSignatureService + .getSignature() .subscribe( digitalSignature => { this.digitalSignatureExists = true; diff --git a/apps/red-ui/src/app/modules/admin/services/digital-signature.service.ts b/apps/red-ui/src/app/modules/admin/services/digital-signature.service.ts new file mode 100644 index 000000000..d1e86db45 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/services/digital-signature.service.ts @@ -0,0 +1,29 @@ +import { Injectable, Injector } from '@angular/core'; +import { GenericService, RequiredParam, Validate } from '@iqser/common-ui'; +import { DigitalSignature, DigitalSignatureViewModel } from '@redaction/red-ui-http'; +import { Observable } from 'rxjs'; + +@Injectable() +export class DigitalSignatureService extends GenericService { + constructor(protected readonly _injector: Injector) { + super(_injector, 'digital-signature'); + } + + @Validate() + update(@RequiredParam() body: DigitalSignatureViewModel): Observable { + return this._put(body); + } + + @Validate() + save(@RequiredParam() body: DigitalSignature): Observable { + return this._post(body); + } + + delete(): Observable { + return super.delete({}); + } + + getSignature(): Observable { + return super.getAll(); + } +} diff --git a/libs/red-ui-http/src/lib/api.module.ts b/libs/red-ui-http/src/lib/api.module.ts index a384322cd..39d87e01a 100644 --- a/libs/red-ui-http/src/lib/api.module.ts +++ b/libs/red-ui-http/src/lib/api.module.ts @@ -1,8 +1,6 @@ import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core'; import { Configuration } from './configuration'; import { HttpClient } from '@angular/common/http'; - -import { DigitalSignatureControllerService } from './api/digitalSignatureController.service'; import { DossierAttributesControllerService } from './api/dossierAttributesController.service'; import { DownloadControllerService } from './api/downloadController.service'; import { FileManagementControllerService } from './api/fileManagementController.service'; @@ -29,7 +27,6 @@ import { StatusReportControllerService } from './api/statusReportController.serv declarations: [], exports: [], providers: [ - DigitalSignatureControllerService, DossierAttributesControllerService, DownloadControllerService, FileManagementControllerService,