From ed8cb15687373246ef74321d41bff6719f524181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Mon, 11 Jul 2022 22:50:13 +0300 Subject: [PATCH] RED-4590: Fixed some sonar cube issues --- apps/red-ui/src/app/app.component.scss | 0 apps/red-ui/src/app/app.component.ts | 1 - .../base-screen/base-screen.component.ts | 2 +- .../dossier-watermark-selector.component.ts | 9 ++-- .../guards/dossier-template-exists.guard.ts | 2 +- .../app/models/file/annotation.permissions.ts | 4 +- .../src/app/models/file/annotation.wrapper.ts | 43 ++++++++++++++----- .../notifications-screen.component.html | 8 ---- .../notifications-screen.component.ts | 16 +------ ...it-dossier-attribute-dialog.component.scss | 0 ...edit-dossier-attribute-dialog.component.ts | 1 - ...clone-dossier-template-dialog.component.ts | 2 +- .../add-edit-user-dialog.component.scss | 0 .../add-edit-user-dialog.component.ts | 1 - .../reset-password.component.scss | 0 .../reset-password.component.ts | 1 - ...butes-configurations-dialog.component.scss | 0 ...ributes-configurations-dialog.component.ts | 1 - .../annotation-actions.component.ts | 3 -- .../pdf-annotation-actions.service.ts | 6 +-- 20 files changed, 43 insertions(+), 57 deletions(-) delete mode 100644 apps/red-ui/src/app/app.component.scss delete mode 100644 apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.scss delete mode 100644 apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/add-edit-user-dialog.component.scss delete mode 100644 apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/reset-password/reset-password.component.scss delete mode 100644 apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.scss diff --git a/apps/red-ui/src/app/app.component.scss b/apps/red-ui/src/app/app.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/red-ui/src/app/app.component.ts b/apps/red-ui/src/app/app.component.ts index 2c7c8b6f4..de4e51a07 100644 --- a/apps/red-ui/src/app/app.component.ts +++ b/apps/red-ui/src/app/app.component.ts @@ -9,7 +9,6 @@ import { UserPreferenceService } from '@services/user-preference.service'; @Component({ selector: 'redaction-root', templateUrl: './app.component.html', - styleUrls: ['./app.component.scss'], }) export class AppComponent { // ViewContainerRef needs to be injected for the color picker to work diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts index 5821b3eeb..bccbbb1eb 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts @@ -103,7 +103,7 @@ export class BaseScreenComponent { return !isDossierOverview; } - trackByName(index: number, item: MenuItem) { + trackByName(_index: number, item: MenuItem) { return item.name; } diff --git a/apps/red-ui/src/app/components/dossier-watermark-selector/dossier-watermark-selector.component.ts b/apps/red-ui/src/app/components/dossier-watermark-selector/dossier-watermark-selector.component.ts index b84a9d792..91d837f6b 100644 --- a/apps/red-ui/src/app/components/dossier-watermark-selector/dossier-watermark-selector.component.ts +++ b/apps/red-ui/src/app/components/dossier-watermark-selector/dossier-watermark-selector.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Observable } from 'rxjs'; import { IWatermark } from '@red/domain'; -import { WatermarkService } from '../../services/entity-services/watermark.service'; +import { WatermarkService } from '@services/entity-services/watermark.service'; import { mapEach, Required } from '@iqser/common-ui'; import { OptionWatermark } from '@components/dossier-watermark-selector/option-watermark.model'; import { map, tap } from 'rxjs/operators'; @@ -27,14 +27,11 @@ export class DossierWatermarkSelectorComponent implements OnInit { @Input() watermarkId: string | null; @Input() previewWatermarkId: string | null; @Output() readonly idsUpdate = new EventEmitter(); - + watermarks$: Observable; + readonly documentTypes = DocumentTypes; #oldWatermarkId: string | null; #oldPreviewWatermarkId: string | null; - watermarks$: Observable; - - readonly documentTypes = DocumentTypes; - constructor(private readonly _watermarkService: WatermarkService) {} ngOnInit(): void { diff --git a/apps/red-ui/src/app/guards/dossier-template-exists.guard.ts b/apps/red-ui/src/app/guards/dossier-template-exists.guard.ts index 16213455f..73a484f8b 100644 --- a/apps/red-ui/src/app/guards/dossier-template-exists.guard.ts +++ b/apps/red-ui/src/app/guards/dossier-template-exists.guard.ts @@ -18,7 +18,7 @@ export class DossierTemplateExistsGuard implements CanActivate { if (dossiersListView) { const dossierTemplateStats = this._dashboardStatsService.find(dossierTemplateId); - if (!dossierTemplateStats || (dossiersListView && dossierTemplateStats.isEmpty)) { + if (!dossierTemplateStats || dossierTemplateStats.isEmpty) { await this._router.navigate(['']); return false; } diff --git a/apps/red-ui/src/app/models/file/annotation.permissions.ts b/apps/red-ui/src/app/models/file/annotation.permissions.ts index 16d53671c..d583408ab 100644 --- a/apps/red-ui/src/app/models/file/annotation.permissions.ts +++ b/apps/red-ui/src/app/models/file/annotation.permissions.ts @@ -1,5 +1,5 @@ import { AnnotationWrapper } from './annotation.wrapper'; -import { Dictionary, User } from '@red/domain'; +import { Dictionary } from '@red/domain'; import { isArray } from 'lodash-es'; export class AnnotationPermissions { @@ -16,7 +16,7 @@ export class AnnotationPermissions { canRecategorizeImage = true; canForceHint = true; - static forUser(isApprover: boolean, user: User, annotations: AnnotationWrapper | AnnotationWrapper[], entities: Dictionary[]) { + static forUser(isApprover: boolean, annotations: AnnotationWrapper | AnnotationWrapper[], entities: Dictionary[]) { if (!isArray(annotations)) { annotations = [annotations]; } diff --git a/apps/red-ui/src/app/models/file/annotation.wrapper.ts b/apps/red-ui/src/app/models/file/annotation.wrapper.ts index 3556cd488..c772b3163 100644 --- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts +++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts @@ -103,7 +103,15 @@ export class AnnotationWrapper implements IListable, Record { } get colorKey(): KeysOf { - return this.isSkipped || this.isIgnoredHint ? 'skippedHexColor' : this.isRecommendation ? 'recommendationHexColor' : 'hexColor'; + if (this.isSkipped || this.isIgnoredHint) { + return 'skippedHexColor'; + } + + if (this.isRecommendation) { + return 'recommendationHexColor'; + } + + return 'hexColor'; } get isSkipped() { @@ -155,13 +163,19 @@ export class AnnotationWrapper implements IListable, Record { } get iconShape(): AnnotationIconType { - return this.isRecommendation - ? 'hexagon' - : this.isHint || this.isIgnoredHint - ? 'circle' - : this.isSuggestion || this.isDeclinedSuggestion - ? 'rhombus' - : 'square'; + if (this.isRecommendation) { + return 'hexagon'; + } + + if (this.isHint || this.isIgnoredHint) { + return 'circle'; + } + + if (this.isSuggestion || this.isDeclinedSuggestion) { + return 'rhombus'; + } + + return 'square'; } get isIgnoredHint() { @@ -446,8 +460,17 @@ export class AnnotationWrapper implements IListable, Record { switch (lastManualChange.annotationStatus) { case LogEntryStatus.APPROVED: return isHintDictionary ? SuperTypes.IgnoredHint : SuperTypes.Skipped; - case LogEntryStatus.DECLINED: - return isHintDictionary ? SuperTypes.Hint : redactionLogEntry.redacted ? SuperTypes.Redaction : SuperTypes.Skipped; + case LogEntryStatus.DECLINED: { + if (isHintDictionary) { + return SuperTypes.Hint; + } + + if (redactionLogEntry.redacted) { + return SuperTypes.Redaction; + } + + return SuperTypes.Skipped; + } case LogEntryStatus.REQUESTED: return SuperTypes.SuggestionRemove; } diff --git a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.html b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.html index 9b03d9358..23ba959b0 100644 --- a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.html +++ b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.html @@ -8,14 +8,6 @@
- - - - - - - -
diff --git a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.ts b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.ts index fc0afab61..20a3ee8fb 100644 --- a/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.ts +++ b/apps/red-ui/src/app/modules/account/screens/notifications/notifications-screen/notifications-screen.component.ts @@ -3,12 +3,7 @@ import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { NotificationPreferencesService } from '../../../services/notification-preferences.service'; import { BaseFormComponent, LoadingService, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { - EmailNotificationScheduleTypesValues, - NotificationCategoriesValues, - NotificationGroupsKeys, - NotificationGroupsValues, -} from '@red/domain'; +import { NotificationCategoriesValues, NotificationGroupsKeys, NotificationGroupsValues } from '@red/domain'; import { firstValueFrom } from 'rxjs'; import { notificationsSettingsTranslations } from '@translations/notifications-settings-translations'; @@ -18,7 +13,6 @@ import { notificationsSettingsTranslations } from '@translations/notifications-s changeDetection: ChangeDetectionStrategy.OnPush, }) export class NotificationsScreenComponent extends BaseFormComponent implements OnInit { - readonly emailNotificationScheduleTypes = EmailNotificationScheduleTypesValues; readonly notificationCategories = NotificationCategoriesValues; readonly notificationGroupsKeys = NotificationGroupsKeys; readonly notificationGroupsValues = NotificationGroupsValues; @@ -42,14 +36,6 @@ export class NotificationsScreenComponent extends BaseFormComponent implements O return this.form.get(`${category}Enabled`).value; } - setEmailNotificationType(type: string) { - this.form.get('emailNotificationType').setValue(type); - } - - getEmailNotificationType() { - return this.form.get('emailNotificationType').value; - } - isPreferenceChecked(category: string, preference: string) { return this.form.get(category).value.includes(preference); } diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts index f4b5fd83f..2d9f34b3a 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component.ts @@ -10,7 +10,6 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @Component({ templateUrl: './add-edit-dossier-attribute-dialog.component.html', - styleUrls: ['./add-edit-dossier-attribute-dialog.component.scss'], }) export class AddEditDossierAttributeDialogComponent extends BaseDialogComponent implements OnDestroy { dossierAttribute: IDossierAttributeConfig = this.data.dossierAttribute; 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 0dd833c18..eaf4edbe9 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 @@ -138,7 +138,7 @@ export class AddEditCloneDossierTemplateDialogComponent extends BaseDialogCompon } if (clonesCount >= 1) { - return `Copy of ${nameOfClonedTemplate} ${clonesCount === 1 ? '(1)' : `(${clonesCount})`}`; + return `Copy of ${nameOfClonedTemplate} (${clonesCount})`; } return `Copy of ${nameOfClonedTemplate}`; } diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/add-edit-user-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/add-edit-user-dialog.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/add-edit-user-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/add-edit-user-dialog.component.ts index 491ae77d3..9d8e12ad2 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/add-edit-user-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/add-edit-user-dialog.component.ts @@ -7,7 +7,6 @@ import { BaseDialogComponent } from '@iqser/common-ui'; @Component({ selector: 'redaction-add-edit-user-dialog', templateUrl: './add-edit-user-dialog.component.html', - styleUrls: ['./add-edit-user-dialog.component.scss'], }) export class AddEditUserDialogComponent extends BaseDialogComponent { resettingPassword = false; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/reset-password/reset-password.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/reset-password/reset-password.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/reset-password/reset-password.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/reset-password/reset-password.component.ts index ad942a7e8..76f730234 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/reset-password/reset-password.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/reset-password/reset-password.component.ts @@ -9,7 +9,6 @@ import { firstValueFrom } from 'rxjs'; @Component({ selector: 'redaction-reset-password', templateUrl: './reset-password.component.html', - styleUrls: ['./reset-password.component.scss'], }) export class ResetPasswordComponent { readonly form = this._getForm(); diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts index a758fcfec..6e2e7f942 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts @@ -7,7 +7,6 @@ import { BaseDialogComponent } from '@iqser/common-ui'; @Component({ templateUrl: './file-attributes-configurations-dialog.component.html', - styleUrls: ['./file-attributes-configurations-dialog.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) export class FileAttributesConfigurationsDialogComponent extends BaseDialogComponent implements OnInit { diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.ts index 7e0a3399c..70b19dbb1 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.ts @@ -3,7 +3,6 @@ import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { PermissionsService } from '@services/permissions.service'; import { AnnotationPermissions } from '@models/file/annotation.permissions'; import { AnnotationActionsService } from '../../services/annotation-actions.service'; -import { UserService } from '@services/user.service'; import { AnnotationReferencesService } from '../../services/annotation-references.service'; import { MultiSelectService } from '../../services/multi-select.service'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; @@ -38,7 +37,6 @@ export class AnnotationActionsComponent implements OnChanges { readonly annotationReferencesService: AnnotationReferencesService, readonly helpModeService: HelpModeService, private readonly _changeRef: ChangeDetectorRef, - private readonly _userService: UserService, private readonly _annotationManager: REDAnnotationManager, private readonly _state: FilePreviewStateService, private readonly _permissionsService: PermissionsService, @@ -120,7 +118,6 @@ export class AnnotationActionsComponent implements OnChanges { const dossier = this._state.dossier; this.annotationPermissions = AnnotationPermissions.forUser( this._permissionsService.isApprover(dossier), - this._userService.currentUser, this.annotations, this._state.dictionaries, ); diff --git a/apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts b/apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts index 83170696b..2e0c5a823 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/pdf-annotation-actions.service.ts @@ -2,8 +2,6 @@ import { inject, Injectable, NgZone } from '@angular/core'; import { AnnotationWrapper } from '../../../models/file/annotation.wrapper'; import { AnnotationPermissions } from '../../../models/file/annotation.permissions'; import { PermissionsService } from '../../../services/permissions.service'; -import { UserService } from '../../../services/user.service'; -import { DictionariesMapService } from '../../../services/entity-services/dictionaries-map.service'; import { FilePreviewStateService } from './file-preview-state.service'; import { TranslateService } from '@ngx-translate/core'; import { AnnotationActionsService } from './annotation-actions.service'; @@ -14,8 +12,6 @@ import { IHeaderElement } from '@red/domain'; @Injectable() export class PdfAnnotationActionsService { readonly #permissionsService = inject(PermissionsService); - readonly #currentUser = inject(UserService).currentUser; - readonly #dictionariesMapService = inject(DictionariesMapService); readonly #state = inject(FilePreviewStateService); readonly #translateService = inject(TranslateService); readonly #ngZone = inject(NgZone); @@ -145,7 +141,7 @@ export class PdfAnnotationActionsService { const dossier = this.#state.dossier; const isApprover = this.#permissionsService.isApprover(dossier); - const permissions = annotations.map(a => AnnotationPermissions.forUser(isApprover, this.#currentUser, a, this.#state.dictionaries)); + const permissions = annotations.map(a => AnnotationPermissions.forUser(isApprover, a, this.#state.dictionaries)); return { canResize: permissions.length === 1 && permissions[0].canResizeAnnotation, canChangeLegalBasis: permissions.reduce((acc, next) => acc && next.canChangeLegalBasis, true),