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

RED-3982 - fixed some imports

Browse Source
This commit is contained in:
Valentin Mihai 2022-05-23 18:29:05 +03:00
parent be30a62b87
commit 11d0ed1a0f
9 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.ts
View File

@ -1,6 +1,6 @@
import { ChangeDetectorRef, Component, Injector, ViewChild } from '@angular/core';
import { digitalSignatureDialogTranslations } from '../../translations/digital-signature-dialog-translations';
import { BaseDialogComponent, LoadingService, Toaster } from '../../../../../../../../libs/common-ui/src';
import { BaseDialogComponent, LoadingService, Toaster } from '@iqser/common-ui';
import { MatDialogRef } from '@angular/material/dialog';
import { PkcsSignatureConfigurationComponent } from './form/pkcs-signature-configuration/pkcs-signature-configuration.component';
import { KmsSignatureConfigurationComponent } from './form/kms-signature-configuration/kms-signature-configuration.component';

9
apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component.html
View File

@ -1,7 +1,14 @@
<iqser-upload-file accept=".pem" (fileChanged)="addRemoveCertificate($event)"></iqser-upload-file>
<form [formGroup]="form">
<div class="flex">
<div class="flex fields-container">
<div class="flex fields-container" [class.full-width]="!file">
<iqser-upload-file
accept=".p12"
[file]="file"
[readonly]="!!file"
(fileChanged)="addRemoveCertificate($event)"
></iqser-upload-file>
<div class="iqser-input-group required w-300">
<label translate="digital-signature-dialog.forms.kms.certificate-name"></label>
<input formControlName="certificateName" type="text" />

5
apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component.scss
View File

@ -7,6 +7,11 @@
}
}
.full-width {
width: 100%;
margin-right: 0;
}
iqser-upload-file {
display: block;
margin-top: 24px;

7
apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component.ts
View File

@ -1,8 +1,7 @@
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
import { FormBuilder, Validators } from '@angular/forms';
import { BaseSignatureConfigurationComponent } from '../base-signature-configuration-component';
import { IKmsDigitalSignature, IPkcsDigitalSignature } from '../../../../../../../../../../libs/red-domain/src';
import { lastIndexOfEnd } from '../../../../../../utils';
import { IKmsDigitalSignature } from '@red/domain';
import { firstValueFrom } from 'rxjs';
import { DigitalSignatureService } from '../../../../services/digital-signature.service';
@ -34,10 +33,10 @@ export class KmsSignatureConfigurationComponent extends BaseSignatureConfigurati
this.file = this.generateFile(this.digitalSignature?.certificateName, '.pem');
}
async save() {
save() {
const formValue = this.form.getRawValue();
const digitalSignature: IKmsDigitalSignature = { ...formValue };
return await firstValueFrom(this._digitalSignatureService.saveKmsSignature(digitalSignature));
return firstValueFrom(this._digitalSignatureService.saveKmsSignature(digitalSignature));
}
}

10
apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component.html
View File

@ -1,7 +1,13 @@
<iqser-upload-file accept=".p12" [file]="file" [readonly]="!!file" (fileChanged)="addRemoveCertificate($event)"></iqser-upload-file>
<form [formGroup]="form">
<div class="flex">
<div class="flex fields-container">
<div class="flex fields-container" [class.full-width]="!file">
<iqser-upload-file
accept=".p12"
[file]="file"
[readonly]="!!file"
(fileChanged)="addRemoveCertificate($event)"
></iqser-upload-file>
<div class="iqser-input-group required w-300">
<label translate="digital-signature-dialog.forms.pkcs.certificate-name"></label>
<input formControlName="certificateName" type="text" />

5
apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component.scss
View File

@ -2,6 +2,11 @@ textarea {
resize: none;
}
.full-width {
width: 100%;
margin-right: 0;
}
iqser-upload-file {
display: block;
margin-top: 24px;

11
apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component.ts
View File

@ -1,10 +1,8 @@
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { FormBuilder, Validators } from '@angular/forms';
import { BaseSignatureConfigurationComponent } from '../base-signature-configuration-component';
import { lastIndexOfEnd } from '../../../../../../utils';
import { IPkcsDigitalSignature } from '../../../../../../../../../../libs/red-domain/src';
import { IPkcsDigitalSignature } from '@red/domain';
import { firstValueFrom } from 'rxjs';
import { LoadingService } from '../../../../../../../../../../libs/common-ui/src';
import { DigitalSignatureService } from '../../../../services/digital-signature.service';
@Component({
@ -32,12 +30,13 @@ export class PkcsSignatureConfigurationComponent extends BaseSignatureConfigurat
});
this.initialFormValue = this.form.getRawValue();
this.file = this.generateFile(this.digitalSignature?.certificateName, '.p12');
console.log(!this.digitalSignature);
}
async save() {
save() {
const formValue = this.form.getRawValue();
const digitalSignature: IPkcsDigitalSignature = { ...formValue };
return await firstValueFrom(this._digitalSignatureService.saveSignature(digitalSignature));
return firstValueFrom(this._digitalSignatureService.saveSignature(digitalSignature));
}
}

3
apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts
View File

@ -8,8 +8,7 @@ import { firstValueFrom } from 'rxjs';
import { AdminDialogService } from '../../services/admin-dialog.service';
import { PkcsSignatureConfigurationComponent } from '../../dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component';
import { KmsSignatureConfigurationComponent } from '../../dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component';
import { IKmsDigitalSignatureRequest, IPkcsDigitalSignatureRequest } from '../../../../../../../../libs/red-domain/src';
import { HttpStatusCode } from '@angular/common/http';
import { IKmsDigitalSignatureRequest, IPkcsDigitalSignatureRequest } from '@red/domain';
export enum CertificateType {
PKCS = 'pkcs',

1
apps/red-ui/src/app/modules/shared/shared.module.ts
View File

@ -30,7 +30,6 @@ import { FileStatsComponent } from './components/file-stats/file-stats.component
import { FileNameColumnComponent } from '@shared/components/file-name-column/file-name-column.component';
import { DossierNameColumnComponent } from '@shared/components/dossier-name-column/dossier-name-column.component';
import { MAT_DATE_FORMATS } from '@angular/material/core';
import { DragDropFileUploadDirective } from '../../../../../../libs/common-ui/src/lib/upload-file/drag-drop-file-upload.directive';
import { DossiersTypeSwitchComponent } from '@shared/components/dossiers-type-switch/dossiers-type-switch.component';
import { TranslateModule } from '@ngx-translate/core';
import { RouterModule } from '@angular/router';