From 6b5755204811eb4cc5d7db657a7f4b75a2ce76ab Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Mon, 19 Dec 2022 12:55:43 +0200 Subject: [PATCH] RED-5705: use deny directive --- .../base-screen/base-screen.component.html | 4 ++-- ...edit-clone-dossier-template-dialog.component.html | 2 +- ...d-edit-clone-dossier-template-dialog.component.ts | 3 +-- .../add-entity-dialog.component.html | 2 +- .../add-entity-dialog/add-entity-dialog.component.ts | 3 +-- .../screens/entity-info/entity-info.component.html | 3 ++- .../screens/entity-info/entity-info.component.ts | 9 ++------- .../annotation-card/annotation-card.component.html | 6 +++++- .../annotation-card/annotation-card.component.ts | 5 ++--- .../view-switch/view-switch.component.html | 6 +++--- .../components/view-switch/view-switch.component.ts | 3 +-- .../highlight-action-dialog.component.html | 6 ++++-- .../highlight-action-dialog.component.ts | 6 ++---- .../manual-annotation-dialog.component.html | 12 ++++++------ .../manual-annotation-dialog.component.ts | 1 - .../edit-dossier-dialog.component.html | 7 ++++--- .../shared-dossiers/shared-dossiers.module.ts | 2 ++ .../add-dossier-dialog.component.html | 2 +- apps/red-ui/src/assets/config/config.json | 8 ++++---- libs/common-ui | 2 +- 20 files changed, 45 insertions(+), 47 deletions(-) diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html index f2d16cdf0..33bb95d27 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html @@ -1,4 +1,4 @@ - +
@@ -27,7 +27,7 @@ [placeholder]="'search.placeholder' | translate" > - +
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html index 4a5eddefc..2ee20c962 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html @@ -96,8 +96,8 @@ {{ 'add-edit-clone-dossier-template.save' | translate }} diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.ts index b9909149f..4cb0627e8 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.ts @@ -4,7 +4,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { applyIntervalConstraints } from '@utils/date-inputs-utils'; import { downloadTypesTranslations } from '@translations/download-types-translations'; import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service'; -import { BaseDialogComponent, IqserPermissionsService } from '@iqser/common-ui'; +import { BaseDialogComponent } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DossierTemplate, DownloadFileType, IDossierTemplate } from '@red/domain'; import { HttpStatusCode } from '@angular/common/http'; @@ -37,7 +37,6 @@ export class AddEditCloneDossierTemplateDialogComponent extends BaseDialogCompon private _lastValidTo: Dayjs; constructor( - readonly permissionsService: IqserPermissionsService, private readonly _dossierTemplatesService: DossierTemplatesService, protected readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) readonly data: EditCloneTemplateData, diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.html index f10841832..2190c13bd 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.html @@ -16,7 +16,7 @@ - + diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts index 121f7fffc..e2e3b64d0 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Inject, ViewChild } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { AddEditEntityComponent } from '@shared/components/add-edit-entity/add-edit-entity.component'; -import { BaseDialogComponent, IqserPermissionsService } from '@iqser/common-ui'; +import { BaseDialogComponent } from '@iqser/common-ui'; import { ROLES } from '@users/roles'; interface DialogData { @@ -21,7 +21,6 @@ export class AddEntityDialogComponent extends BaseDialogComponent { constructor( protected readonly _dialogRef: MatDialogRef, - readonly permissionsService: IqserPermissionsService, @Inject(MAT_DIALOG_DATA) private readonly _data: DialogData, ) { super(_dialogRef, false); diff --git a/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html index 45bc860fe..e6f9b7d5d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html @@ -23,7 +23,8 @@
- + + diff --git a/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.ts b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.ts index 9a31fe109..e1a26c84a 100644 --- a/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.ts @@ -5,7 +5,7 @@ import { ActivatedRoute } from '@angular/router'; import { getCurrentUser } from '@users/user.service'; import { PermissionsService } from '@services/permissions.service'; import { AddEditEntityComponent } from '@shared/components/add-edit-entity/add-edit-entity.component'; -import { IqserEventTarget, IqserPermissionsService } from '@iqser/common-ui'; +import { IqserEventTarget } from '@iqser/common-ui'; import { Observable } from 'rxjs'; import { ROLES } from '@users/roles'; @@ -22,12 +22,7 @@ export class EntityInfoComponent { readonly roles = ROLES; @ViewChild(AddEditEntityComponent) private readonly _addEditEntityComponent: AddEditEntityComponent; - constructor( - route: ActivatedRoute, - dictionariesMapService: DictionariesMapService, - readonly iqserPermissionsService: IqserPermissionsService, - readonly permissionsService: PermissionsService, - ) { + constructor(route: ActivatedRoute, dictionariesMapService: DictionariesMapService, readonly permissionsService: PermissionsService) { this.dossierTemplateId = route.parent.snapshot.paramMap.get(DOSSIER_TEMPLATE_ID); const entityType = route.parent.snapshot.paramMap.get(ENTITY_TYPE); this.entity$ = dictionariesMapService.watch$(this.dossierTemplateId, entityType); diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.html index 5fbccad00..e83a49bf7 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.html @@ -14,6 +14,7 @@ {{ 'annotation.pending' | translate }} +
{{ annotation.descriptor | translate }} {{ annotation.entity.label }}
-
+ +
: {{ annotation.shortContent }}
+
: {{ annotation.color }}
+
: {{ annotation.width }}x{{ annotation.height }} px
diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.ts index b085567d5..e864ad4ec 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-card/annotation-card.component.ts @@ -3,7 +3,6 @@ import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { MultiSelectService } from '../../services/multi-select.service'; import { annotationTypesTranslations } from '@translations/annotation-types-translations'; import { ROLES } from '@users/roles'; -import { IqserPermissionsService } from '@iqser/common-ui'; @Component({ selector: 'redaction-annotation-card', @@ -13,9 +12,9 @@ import { IqserPermissionsService } from '@iqser/common-ui'; }) export class AnnotationCardComponent { readonly roles = ROLES; - annotationTypesTranslations = annotationTypesTranslations; + readonly annotationTypesTranslations = annotationTypesTranslations; @Input() annotation: AnnotationWrapper; @Input() isSelected = false; - constructor(readonly iqserPermissionsService: IqserPermissionsService, readonly multiSelectService: MultiSelectService) {} + constructor(readonly multiSelectService: MultiSelectService) {} } diff --git a/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html index c22a78e4c..cafc08275 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html @@ -11,7 +11,7 @@
- + @@ -33,8 +33,10 @@ +
- + + diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts index 1b4d4c751..85c2297be 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.ts @@ -2,7 +2,7 @@ import { Component, Inject } from '@angular/core'; import { UntypedFormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { EarmarkOperation, EarmarkOperationPages } from '@red/domain'; -import { BaseDialogComponent, DetailsRadioOption, IqserPermissionsService } from '@iqser/common-ui'; +import { BaseDialogComponent, DetailsRadioOption } from '@iqser/common-ui'; import { EarmarksService } from '@services/files/earmarks.service'; import { firstValueFrom } from 'rxjs'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; @@ -24,9 +24,8 @@ export interface HighlightActionData { }) export class HighlightActionDialogComponent extends BaseDialogComponent { readonly translations = highlightsTranslations; - readonly #operation = this.data.operation; readonly roles = ROLES; - + readonly #operation = this.data.operation; readonly options: DetailsRadioOption[] = [ { label: highlightsTranslations[this.#operation].options[EarmarkOperationPages.THIS_PAGE].label, @@ -41,7 +40,6 @@ export class HighlightActionDialogComponent extends BaseDialogComponent { ]; constructor( - readonly permissionsService: IqserPermissionsService, protected readonly _dialogRef: MatDialogRef, private readonly _textHighlightService: EarmarksService, @Inject(MAT_DIALOG_DATA) readonly data: HighlightActionData, diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html index c5a49d8a1..82f687ff9 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html @@ -16,6 +16,7 @@ tooltipPosition="below" > + + >
@@ -35,8 +35,8 @@ *ngIf="!isFalsePositiveRequest && (isDictionaryRequest || !manualRedactionTypeExists)" class="iqser-input-group required w-450" > - - + + {{ displayedDictionaryLabel }} @@ -51,7 +51,7 @@
-
+
-
+
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts index 6f158fd0c..69fd16aa3 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts @@ -174,7 +174,6 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme if (this.iqserPermissionsService.has(ROLES.getRss)) { const selectedType = this.possibleDictionaries.find(d => d.type === addRedactionRequest.type); - console.log(selectedType.hasDictionary); addRedactionRequest.addToDictionary = selectedType.hasDictionary; } else { addRedactionRequest.addToDictionary = this.isDictionaryRequest && addRedactionRequest.type !== 'dossier_redaction'; diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html index 1f93c215f..fb432c38e 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html @@ -63,17 +63,18 @@ > {{ 'edit-dossier-dialog.actions.save' | translate }} + - + > +
- +
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts b/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts index 2a3a0a41b..1db620217 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts @@ -18,6 +18,7 @@ import { IqserEmptyStatesModule, IqserHelpModeModule, IqserInputsModule, + IqserPermissionsModule, IqserScrollbarModule, IqserSharedModule, IqserUsersModule, @@ -52,6 +53,7 @@ const services = [DossiersDialogService, FileAssignService]; IqserSharedModule, IqserInputsModule, IqserScrollbarModule, + IqserPermissionsModule, ], }) export class SharedDossiersModule {} diff --git a/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html b/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html index e4863a454..baebbdc55 100644 --- a/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html +++ b/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html @@ -109,7 +109,7 @@ icon="red:assign" > - + diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index ef98789d9..f4b69417a 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://syngenta-scm.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", @@ -11,11 +11,11 @@ "MAX_RETRIES_ON_SERVER_ERROR": 3, "OAUTH_CLIENT_ID": "redaction", "OAUTH_IDP_HINT": null, - "OAUTH_URL": "https://syngenta-scm.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", "ANNOTATIONS_THRESHOLD": 1000, - "THEME": "scm", - "BASE_TRANSLATIONS_DIRECTORY": "/assets/i18n/scm/" + "THEME": "redact", + "BASE_TRANSLATIONS_DIRECTORY": "/assets/i18n/redact/" } diff --git a/libs/common-ui b/libs/common-ui index 05d6488bc..a4b9c045c 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 05d6488bc8952d70b81bf9d95bab6d6928d81fad +Subproject commit a4b9c045cd8dae1418bc274d311e6b938d9ddbf5