From 3ab2e93d32ef352b3e8c793c57aa8d1260334b65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Thu, 3 Jun 2021 14:19:11 +0300 Subject: [PATCH 1/4] RED-1474 --- .../add-dossier-dialog.component.ts | 33 +++++++++++-------- ...edit-dossier-download-package.component.ts | 27 ++++++++------- 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts index 25d79c42c..dafa08281 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts @@ -23,26 +23,31 @@ export class AddDossierDialogComponent { public dialogRef: MatDialogRef ) { this._filterInvalidDossierTemplates(); - this.dossierForm = this._formBuilder.group({ - dossierName: [null, Validators.required], - dossierTemplateId: [null, Validators.required], - downloadFileTypes: [null], - reportTypes: [null, Validators.required], - description: [null], - dueDate: [null] - }); + this.dossierForm = this._formBuilder.group( + { + dossierName: [null, Validators.required], + dossierTemplateId: [null, Validators.required], + downloadFileTypes: [null], + reportTypes: [null], + description: [null], + dueDate: [null] + }, + { + validators: control => + control.value.reportTypes?.length > 0 || + control.value.downloadFileTypes?.length > 0 + ? null + : { downloadPackage: true } + } + ); } get reportTypesLength() { - return this.dossierForm.controls['reportTypes']?.value?.length - ? this.dossierForm.controls['reportTypes'].value.length - : 0; + return this.dossierForm.controls['reportTypes']?.value?.length || 0; } get downloadFileTypesLength() { - return this.dossierForm.controls['downloadFileTypes']?.value?.length - ? this.dossierForm.controls['downloadFileTypes'].value.length - : 0; + return this.dossierForm.controls['downloadFileTypes']?.value?.length || 0; } get disabled() { diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts index 20743d3e2..2bfa9e70d 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { DossierTemplateModel } from '@redaction/red-ui-http'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { FormBuilder, FormGroup } from '@angular/forms'; import { AppStateService } from '../../../../../state/app-state.service'; import { DossierWrapper } from '../../../../../state/model/dossier.wrapper'; import { EditDossierSectionInterface } from '../edit-dossier-section.interface'; @@ -25,15 +25,11 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS ) {} get reportTypesLength() { - return this.dossierForm.controls['reportTypes']?.value?.length - ? this.dossierForm.controls['reportTypes'].value.length - : 0; + return this.dossierForm.controls['reportTypes']?.value?.length || 0; } get downloadFileTypesLength() { - return this.dossierForm.controls['downloadFileTypes']?.value?.length - ? this.dossierForm.controls['downloadFileTypes'].value.length - : 0; + return this.dossierForm.controls['downloadFileTypes']?.value?.length || 0; } get changed() { @@ -62,10 +58,19 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS } ngOnInit() { - this.dossierForm = this._formBuilder.group({ - reportTypes: [this.dossierWrapper.dossier.reportTypes, Validators.required], - downloadFileTypes: [this.dossierWrapper.dossier.downloadFileTypes] - }); + this.dossierForm = this._formBuilder.group( + { + reportTypes: [this.dossierWrapper.dossier.reportTypes], + downloadFileTypes: [this.dossierWrapper.dossier.downloadFileTypes] + }, + { + validators: control => + control.value.reportTypes?.length > 0 || + control.value.downloadFileTypes?.length > 0 + ? null + : { downloadPackage: true } + } + ); } async save() { From f17e6ab03410aab24a1af0257d8b083f65f19957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Thu, 3 Jun 2021 14:23:08 +0300 Subject: [PATCH 2/4] RED-1467 --- .../dossier-overview-screen.component.html | 4 +++- .../buttons/circle-button/circle-button.component.scss | 2 +- .../file-download-btn/file-download-btn.component.html | 2 +- .../buttons/file-download-btn/file-download-btn.component.ts | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.html index b841aba1f..bc2ed7149 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.html @@ -56,6 +56,7 @@ diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.scss b/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.scss index f2b7a4924..57a6e2097 100644 --- a/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.scss @@ -30,7 +30,7 @@ button { } } - &.warn { + &.warn:not([disabled]) { background-color: $yellow-2; &:hover { diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html index 6d4dc37f2..76145c984 100644 --- a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html +++ b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html @@ -1,6 +1,6 @@ + {{ 'add-dossier-dialog.form.watermark' | translate }} + +
@@ -114,7 +115,8 @@ export class AddDossierDialogComponent { dueDate: this.hasDueDate ? this.dossierForm.get('dueDate').value : undefined, dossierTemplateId: this.dossierForm.get('dossierTemplateId').value, downloadFileTypes: this.dossierForm.get('downloadFileTypes').value, - reportTypes: this.dossierForm.get('reportTypes').value + reportTypes: this.dossierForm.get('reportTypes').value, + watermarkEnabled: this.dossierForm.get('watermarkEnabled').value }; } } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html index 79e505ac2..45c01361e 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html @@ -45,6 +45,10 @@ >
+ + {{ 'edit-dossier-dialog.general-info.form.watermark' | translate }} + +
f.status === status); } diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 0687bf90e..be872ceec 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -151,6 +151,7 @@ "label": "Description", "placeholder": "Enter Description" }, + "watermark": "Watermark application on redacted documents", "due-date": "Due Date", "template": "Dossier Template" }, @@ -191,6 +192,7 @@ "label": "Description", "placeholder": "Enter Description" }, + "watermark": "Watermark application on redacted documents", "due-date": "Due Date", "template": "Dossier Template" } From 8d66627dfc72f55672f08959e72c28eade5fc9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Thu, 3 Jun 2021 14:46:51 +0300 Subject: [PATCH 4/4] Fix --- .../dossier-overview-screen.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.html index bc2ed7149..b3aaa9214 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.html @@ -66,7 +66,7 @@ (action)="reanalyseDossier()" *ngIf="permissionsService.displayReanalyseBtn()" [disabled]="areSomeEntitiesSelected" - [tooltipClass]="'small ' + areSomeEntitiesSelected ? '' : 'warn'" + [tooltipClass]="'small ' + (areSomeEntitiesSelected ? '' : 'warn')" [tooltip]="'dossier-overview.new-rule.toast.actions.reanalyse-all'" icon="red:refresh" tooltipPosition="below"