From e929705a765bb301ee122945a884d7a6a3f253ba Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Tue, 17 May 2022 00:36:23 +0300 Subject: [PATCH] RED-3982 - added 'pkcs signature' and 'kms signature' forms --- ...onfigure-certificate-dialog.component.html | 3 ++ ...onfigure-certificate-dialog.component.scss | 5 +++ .../configure-certificate-dialog.component.ts | 11 +++++- ...kms-signature-configuration.component.html | 38 ++++++++++++++++++- ...kms-signature-configuration.component.scss | 8 ++++ .../kms-signature-configuration.component.ts | 21 +++++++++- ...kcs-signature-configuration.component.html | 27 ++++++++++++- ...kcs-signature-configuration.component.scss | 3 ++ .../pkcs-signature-configuration.component.ts | 19 +++++++++- .../admin/services/admin-dialog.service.ts | 2 +- .../edit-dossier-general-info.component.scss | 8 ---- apps/red-ui/src/assets/config/config.json | 4 +- apps/red-ui/src/assets/i18n/de.json | 21 +++++++++- apps/red-ui/src/assets/i18n/en.json | 21 +++++++++- libs/common-ui | 2 +- 15 files changed, 171 insertions(+), 22 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.html index 2811695b0..203eb8b54 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.html @@ -22,6 +22,9 @@ + {{ 'digital-signature-dialog.upload-warning-message' | translate }} + + diff --git a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.scss index 9348c9978..ad58f439f 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.scss +++ b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.scss @@ -33,5 +33,10 @@ .selected { background: rgba(variables.$red-1, 0.1); } + + iqser-upload-file { + padding-top: 24px; + padding-bottom: 24px; + } } } diff --git a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.ts index 881ba41a6..f8f625078 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.ts @@ -2,6 +2,8 @@ import { Component, Injector, ViewChild } from '@angular/core'; import { digitalSignatureDialogTranslations } from '../../translations/digital-signature-dialog-translations'; import { BaseDialogComponent } from '../../../../../../../../libs/common-ui/src'; import { MatDialogRef } from '@angular/material/dialog'; +import { PkcsSignatureConfigurationComponent } from './pkcs-signature-configuration/pkcs-signature-configuration.component'; +import { KmsSignatureConfigurationComponent } from './kms-signature-configuration/kms-signature-configuration.component'; enum CertificateType { PKCS = 'pkcs', @@ -13,8 +15,8 @@ enum CertificateType { styleUrls: ['./configure-certificate-dialog.component.scss'], }) export class ConfigureCertificateDialogComponent extends BaseDialogComponent { - // @ViewChild(EditDossierGeneralInfoComponent) generalInfoComponent: EditDossierGeneralInfoComponent; - // @ViewChild(EditDossierDownloadPackageComponent) downloadPackageComponent: EditDossierDownloadPackageComponent; + @ViewChild(PkcsSignatureConfigurationComponent) pkcsSignatureConfigurationComponent: PkcsSignatureConfigurationComponent; + @ViewChild(KmsSignatureConfigurationComponent) kmsSignatureConfigurationComponent: KmsSignatureConfigurationComponent; readonly certificateType = CertificateType; readonly certificateOptions = Object.values(CertificateType); @@ -29,6 +31,11 @@ export class ConfigureCertificateDialogComponent extends BaseDialogComponent { toggleIsInConfiguration() { this.isInConfiguration = !this.isInConfiguration; + if (this.isInConfiguration && this.selectedOption === CertificateType.KMS) { + this._dialogRef.updateSize('810px'); + } else { + this._dialogRef.updateSize('662px'); + } } save() {} diff --git a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/kms-signature-configuration/kms-signature-configuration.component.html b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/kms-signature-configuration/kms-signature-configuration.component.html index c0ad9c296..79c64fa12 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/kms-signature-configuration/kms-signature-configuration.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/kms-signature-configuration/kms-signature-configuration.component.html @@ -1 +1,37 @@ - +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+
+
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/kms-signature-configuration/kms-signature-configuration.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/kms-signature-configuration/kms-signature-configuration.component.scss index e69de29bb..b566c7e18 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/kms-signature-configuration/kms-signature-configuration.component.scss +++ b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/kms-signature-configuration/kms-signature-configuration.component.scss @@ -0,0 +1,8 @@ +.certificate { + height: 100%; + + textarea { + resize: none; + height: 100%; + } +} diff --git a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/kms-signature-configuration/kms-signature-configuration.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/kms-signature-configuration/kms-signature-configuration.component.ts index 348ee0547..ef66f801e 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/kms-signature-configuration/kms-signature-configuration.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/kms-signature-configuration/kms-signature-configuration.component.ts @@ -1,4 +1,5 @@ -import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @Component({ selector: 'redaction-kms-signature-configuration', @@ -6,4 +7,20 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; styleUrls: ['./kms-signature-configuration.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class KmsSignatureConfigurationComponent {} +export class KmsSignatureConfigurationComponent implements OnInit { + form: FormGroup; + + constructor(private readonly _formBuilder: FormBuilder) {} + + ngOnInit() { + this.form = this._formBuilder.group({ + certificateName: ['', Validators.required], + kmsServiceEndpoint: ['', Validators.required], + kmsRegion: ['', Validators.required], + kmsKeyId: ['', Validators.required], + kmsAccessKey: ['', Validators.required], + kmsSecretKey: ['', Validators.required], + certificate: ['', Validators.required], + }); + } +} diff --git a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/pkcs-signature-configuration/pkcs-signature-configuration.component.html b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/pkcs-signature-configuration/pkcs-signature-configuration.component.html index c0ad9c296..adc6b7c97 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/pkcs-signature-configuration/pkcs-signature-configuration.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/pkcs-signature-configuration/pkcs-signature-configuration.component.html @@ -1 +1,26 @@ - +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/pkcs-signature-configuration/pkcs-signature-configuration.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/pkcs-signature-configuration/pkcs-signature-configuration.component.scss index e69de29bb..2e0c215b3 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/pkcs-signature-configuration/pkcs-signature-configuration.component.scss +++ b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/pkcs-signature-configuration/pkcs-signature-configuration.component.scss @@ -0,0 +1,3 @@ +textarea { + resize: none; +} diff --git a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/pkcs-signature-configuration/pkcs-signature-configuration.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/pkcs-signature-configuration/pkcs-signature-configuration.component.ts index 445735cba..4bddc2b8f 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/pkcs-signature-configuration/pkcs-signature-configuration.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/pkcs-signature-configuration/pkcs-signature-configuration.component.ts @@ -1,4 +1,5 @@ -import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @Component({ selector: 'redaction-pkcs-signature-configuration', @@ -6,4 +7,18 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; styleUrls: ['./pkcs-signature-configuration.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class PkcsSignatureConfigurationComponent {} +export class PkcsSignatureConfigurationComponent implements OnInit { + form: FormGroup; + + constructor(private readonly _formBuilder: FormBuilder) {} + + ngOnInit() { + this.form = this._formBuilder.group({ + certificateName: ['', Validators.required], + password: ['', Validators.required], + contactInfo: [''], + location: [''], + reason: [''], + }); + } +} diff --git a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts index 6451ec696..b3de08e1e 100644 --- a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts +++ b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts @@ -105,7 +105,7 @@ export class AdminDialogService extends DialogService { }, configureCertificate: { component: ConfigureCertificateDialogComponent, - dialogConfig: { disableClose: false }, + dialogConfig: { disableClose: false, maxHeight: '100vh' }, }, }; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss index cadbd6f7a..029a1182d 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss @@ -24,14 +24,6 @@ padding: 0; } -.fields-container { - flex-direction: column; - - &:first-child { - margin-right: 40px; - } -} - redaction-small-chip { margin-right: 8px; } diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index 640de2ce2..a718d12f3 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,7 +1,7 @@ { "ADMIN_CONTACT_NAME": null, "ADMIN_CONTACT_URL": null, - "API_URL": "https://dev-05.iqser.cloud/redaction-gateway-v1", + "API_URL": "https://dev-08.iqser.cloud/redaction-gateway-v1", "APP_NAME": "RedactManager", "AUTO_READ_TIME": 3, "BACKEND_APP_VERSION": "4.4.40", @@ -17,7 +17,7 @@ "MAX_RETRIES_ON_SERVER_ERROR": 3, "OAUTH_CLIENT_ID": "redaction", "OAUTH_IDP_HINT": null, - "OAUTH_URL": "https://dev-05.iqser.cloud/auth/realms/redaction", + "OAUTH_URL": "https://dev-08.iqser.cloud/auth/realms/redaction", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural", "MANUAL_BASE_URL": "https://docs.redactmanager.com/preview" diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 2af73dc3b..bb00a1640 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -662,6 +662,24 @@ "continue": "", "save": "" }, + "forms": { + "kms": { + "certificate-content": "", + "certificate-name": "", + "kms-access-key": "", + "kms-id": "", + "kms-region": "", + "kms-secret-key": "", + "kms-service-endpoint": "" + }, + "pkcs": { + "certificate-name": "", + "contact-information": "", + "location": "", + "password-key": "", + "reason": "" + } + }, "options": { "kms": { "description": "", @@ -676,7 +694,8 @@ "before-configuration": "", "kms": "", "pkcs": "" - } + }, + "upload-warning-message": "" }, "digital-signature-screen": { "action": { diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index df1024ef6..b9f0199ce 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -662,6 +662,24 @@ "continue": "Continue", "save": "Save Configurations" }, + "forms": { + "kms": { + "certificate-content": "Certificate Content", + "certificate-name": "Certificate Name", + "kms-access-key": "KMS Access Key", + "kms-id": "KMS Id", + "kms-region": "KMS Region", + "kms-secret-key": "KMS Secret Key", + "kms-service-endpoint": "KMS Service Endpoint" + }, + "pkcs": { + "certificate-name": "Certificate Name", + "contact-information": "Contact Information", + "location": "Location", + "password-key": "Password Key", + "reason": "Reason" + } + }, "options": { "kms": { "description": "Provide a corresponding PEM file containing the certificate, along with Amazon KMS credentials needed for securing the private key.", @@ -676,7 +694,8 @@ "before-configuration": "Configure Digital Signature Certificate", "kms": "Configure a Certificate with Amazon KMS", "pkcs": "Configure a PKCS#12 Certificate" - } + }, + "upload-warning-message": "To configure the certificate, you first need to upload it." }, "digital-signature-screen": { "action": { diff --git a/libs/common-ui b/libs/common-ui index c695f5c44..f90405572 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit c695f5c4419f4fd8d76946d5a474dccbda0edad2 +Subproject commit f90405572f662bb150950032f726305a616de0dc