diff --git a/apps/red-ui/src/app/modules/projects/components/needs-work-badge/needs-work-badge.component.html b/apps/red-ui/src/app/modules/projects/components/needs-work-badge/needs-work-badge.component.html index cf20d8dea..336d34881 100644 --- a/apps/red-ui/src/app/modules/projects/components/needs-work-badge/needs-work-badge.component.html +++ b/apps/red-ui/src/app/modules/projects/components/needs-work-badge/needs-work-badge.component.html @@ -5,4 +5,5 @@ + diff --git a/apps/red-ui/src/app/modules/projects/components/needs-work-badge/needs-work-badge.component.scss b/apps/red-ui/src/app/modules/projects/components/needs-work-badge/needs-work-badge.component.scss index a69d6a7f5..37dc214e1 100644 --- a/apps/red-ui/src/app/modules/projects/components/needs-work-badge/needs-work-badge.component.scss +++ b/apps/red-ui/src/app/modules/projects/components/needs-work-badge/needs-work-badge.component.scss @@ -1,3 +1,5 @@ +@import '/apps/red-ui/src/assets/styles/red-variables'; + .needs-work { display: flex; flex-direction: row; @@ -7,4 +9,10 @@ > *:not(:last-child) { margin-right: 4px; } + + mat-icon { + width: 16px; + height: 16px; + fill-opacity: 0.6; + } } diff --git a/apps/red-ui/src/app/modules/projects/components/needs-work-badge/needs-work-badge.component.ts b/apps/red-ui/src/app/modules/projects/components/needs-work-badge/needs-work-badge.component.ts index 2556f9806..96ab7a372 100644 --- a/apps/red-ui/src/app/modules/projects/components/needs-work-badge/needs-work-badge.component.ts +++ b/apps/red-ui/src/app/modules/projects/components/needs-work-badge/needs-work-badge.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { AppStateService } from '../../../../state/app-state.service'; import { PermissionsService } from '../../../../services/permissions.service'; import { FileStatusWrapper } from '../../../../models/file/file-status.wrapper'; @@ -9,18 +9,16 @@ import { ProjectWrapper } from '../../../../state/model/project.wrapper'; templateUrl: './needs-work-badge.component.html', styleUrls: ['./needs-work-badge.component.scss'] }) -export class NeedsWorkBadgeComponent implements OnInit { +export class NeedsWorkBadgeComponent { @Input() needsWorkInput: FileStatusWrapper | ProjectWrapper; - constructor(public appStateService: AppStateService, public permissionsService: PermissionsService) {} - - ngOnInit(): void {} + constructor(private readonly _appStateService: AppStateService, private readonly _permissionsService: PermissionsService) {} reanalysisRequired() { if (this.needsWorkInput instanceof ProjectWrapper) { - return this.permissionsService.projectReanalysisRequired(this.needsWorkInput); + return this._permissionsService.projectReanalysisRequired(this.needsWorkInput); } else { - return this.permissionsService.fileRequiresReanalysis(this.needsWorkInput); + return this._permissionsService.fileRequiresReanalysis(this.needsWorkInput); } } @@ -56,12 +54,16 @@ export class NeedsWorkBadgeComponent implements OnInit { return this.needsWorkInput instanceof FileStatusWrapper && this.needsWorkInput.hasUpdates; } + get hasAnnotationComments(): boolean { + return this.needsWorkInput instanceof FileStatusWrapper && (this.needsWorkInput).hasAnnotationComments; + } + private _getDictionaryColor(type: string) { let ruleSetId = null; if (this.needsWorkInput instanceof ProjectWrapper) { ruleSetId = this.needsWorkInput.ruleSetId; } - return this.appStateService.getDictionaryColor(type, ruleSetId); + return this._appStateService.getDictionaryColor(type, ruleSetId); } }