diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index d2975bc4a..aa140d8c4 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -163,12 +163,7 @@ export function HttpLoaderFactory(httpClient: HttpClient) { component: ProjectOverviewScreenComponent, canActivate: [CompositeRouteGuard], data: { - routeGuards: [ - AuthGuard, - RedRoleGuard, - ProjectMemberGuard, - AppStateGuard - ] + routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard] } }, { diff --git a/apps/red-ui/src/app/common/initials-avatar/initials-avatar.component.scss b/apps/red-ui/src/app/common/initials-avatar/initials-avatar.component.scss index d7424a376..9388ce641 100644 --- a/apps/red-ui/src/app/common/initials-avatar/initials-avatar.component.scss +++ b/apps/red-ui/src/app/common/initials-avatar/initials-avatar.component.scss @@ -1,5 +1,6 @@ @import '../../../assets/styles/red-variables'; .flex-row { + width: fit-content; gap: 12px; } diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html index 19929d5eb..626b61059 100644 --- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html +++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html @@ -11,6 +11,11 @@ *ngIf="appStateService.fileNotUpToDateWithDictionary()" class="pill" translate="project-overview.new-rule.label" + > +  {{ appStateService.activeFile.filename }} diff --git a/apps/red-ui/src/app/screens/file/model/file-status.wrapper.ts b/apps/red-ui/src/app/screens/file/model/file-status.wrapper.ts index 15b1a53c2..9b97c7c61 100644 --- a/apps/red-ui/src/app/screens/file/model/file-status.wrapper.ts +++ b/apps/red-ui/src/app/screens/file/model/file-status.wrapper.ts @@ -94,6 +94,10 @@ export class FileStatusWrapper { return this.status === 'APPROVED' || this.status === 'UNDER_APPROVAL'; } + get isUnassigned() { + return this.status === 'UNASSIGNED'; + } + get canApprove() { return this.status === 'UNDER_REVIEW' || this.status === 'UNDER_APPROVAL'; } diff --git a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html index 40dbacb45..882d6c9b8 100644 --- a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html +++ b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html @@ -191,13 +191,11 @@ | translate " [matTooltipPosition]="'above'" + *ngIf="appStateService.isManagerAndOwner(pw.project) && pw.hasFiles" > - - +
+ +
@@ -40,7 +51,7 @@
+
diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html index bbd7ff889..b196f3a9c 100644 --- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html +++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html @@ -237,7 +237,9 @@ (click)="openDeleteFileDialog($event, fileStatus)" *ngIf=" userService.isManager(user) || - appStateService.isActiveProjectOwnerAndManager + appStateService.isActiveProjectOwnerAndManager || + fileStatus.isUnassigned || + fileStatus.isError " [matTooltip]="'project-overview.delete.action' | translate" [matTooltipPosition]="'above'" @@ -254,6 +256,7 @@ : 'report.unavailable-single' ) | translate " + *ngIf="appStateService.isActiveProjectOwnerAndManager" [matTooltipPosition]="'above'" >