From 17b33d81df9c81ecdecf37fa2875f625a8dac628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 21 Oct 2020 20:52:40 +0300 Subject: [PATCH 01/10] Show annotation comment - not very nice --- .../file-preview-screen/file-preview-screen.component.html | 3 +++ 1 file changed, 3 insertions(+) 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 01570fd13..db743ddc3 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 @@ -124,6 +124,9 @@
: {{getDictionary(annotation)}}
: {{annotation.getContents()}}
+
+ : {{ annotation.Mi[0].eC }} +
From c901df26b7fe1180bd436925d5dce32856e0c722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 21 Oct 2020 21:37:36 +0300 Subject: [PATCH 02/10] Center logo in menu bar --- .../base-screen/base-screen.component.html | 12 ++++++------ .../src/assets/styles/red-page-layout.scss | 17 ++++++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/apps/red-ui/src/app/screens/base-screen/base-screen.component.html b/apps/red-ui/src/app/screens/base-screen/base-screen.component.html index a7c27a36d..46735ddb7 100644 --- a/apps/red-ui/src/app/screens/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/screens/base-screen/base-screen.component.html @@ -1,6 +1,6 @@
-
+
@@ -16,29 +16,29 @@ mat-menu-item>{{appStateService.activeFile.filename}}
-
+
- + arrow_right
{{appStateService.activeProject.project.projectName}}
- + arrow_right
{{appStateService.activeFile.filename}}
-
+
-
+
-
+
{{ appStateService.activeFile.filename }}
-
+
+
+ + + + + +
+
- diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts index 2c0464fe4..4b1bda52e 100644 --- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts @@ -1,18 +1,17 @@ import { ChangeDetectorRef, Component, ElementRef, NgZone, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { - AddRedactionRequest, + AddRedactionRequest, FileStatus, FileUploadControllerService, ManualRedactionControllerService, ManualRedactionEntry, - ProjectControllerService, + ProjectControllerService, ReanalysisControllerService, StatusControllerService } from '@redaction/red-ui-http'; import { TranslateService } from '@ngx-translate/core'; import {NotificationService, NotificationType} from '../../../notification/notification.service'; import { MatDialog } from '@angular/material/dialog'; import { AppStateService } from '../../../state/app-state.service'; -import { FileDetailsDialogComponent } from '../../../dialogs/file-details-dialog/file-details-dialog.component'; import { ViewerSyncService } from '../service/viewer-sync.service'; import { Annotations } from '@pdftron/webviewer'; import { PdfViewerComponent } from '../pdf-viewer/pdf-viewer.component'; @@ -27,6 +26,7 @@ import { FileDownloadService } from '../service/file-download.service'; import { saveAs } from 'file-saver'; import { FileType } from '../model/file-type'; import { ConfirmationDialogComponent } from '../../../common/confirmation-dialog/confirmation-dialog.component'; +import { DialogService } from '../../../dialogs/dialog.service'; @Component({ selector: 'redaction-file-preview-screen', @@ -59,12 +59,14 @@ export class FilePreviewScreenComponent implements OnInit { private readonly _notificationService: NotificationService, private readonly _viewerSyncService: ViewerSyncService, private readonly _dialog: MatDialog, + private readonly _dialogService: DialogService, private readonly _router: Router, private readonly _manualRedactionControllerService: ManualRedactionControllerService, private readonly _userService: UserService, private readonly _fileDownloadService: FileDownloadService, private readonly _fileUploadControllerService: FileUploadControllerService, private readonly _projectControllerService: ProjectControllerService, + private readonly _reanalysisControllerService: ReanalysisControllerService, private readonly _filtersService: FiltersService, private ngZone: NgZone) { this._activatedRoute.params.subscribe(params => { @@ -102,12 +104,20 @@ export class FilePreviewScreenComponent implements OnInit { this._viewerSyncService.activateViewer('ANNOTATED'); } - public showDetailsDialog($event: MouseEvent) { + public openFileDetailsDialog($event: MouseEvent) { + this._dialogService.openFileDetailsDialog($event, this.appStateService.activeFile); + } + + public reanalyseFile($event: MouseEvent) { $event.stopPropagation(); - this._dialog.open(FileDetailsDialogComponent, { - width: '600px', - maxWidth: '90vw', - data: this.appStateService.activeFile + this._reanalysisControllerService.reanalyzeFile(this.appStateService.activeProject.project.projectId, this.fileId).subscribe(async () => { + await this.appStateService.reloadActiveProjectFiles(); + }); + } + + public openDeleteFileDialog($event: MouseEvent) { + this._dialogService.openDeleteFileDialog($event, this.projectId, this.fileId, () => { + this._router.navigate([`/ui/projects/${this.projectId}`]); }); } diff --git a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts index 7b06b357e..8bcab7658 100644 --- a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts +++ b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts @@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core'; import { Project, ProjectControllerService } from '@redaction/red-ui-http'; import { MatDialog } from '@angular/material/dialog'; import { AddEditProjectDialogComponent } from '../../dialogs/add-edit-project-dialog/add-edit-project-dialog.component'; -import { ConfirmationDialogComponent } from '../../common/confirmation-dialog/confirmation-dialog.component'; import { TranslateService } from '@ngx-translate/core'; import { NotificationService } from '../../notification/notification.service'; import { AppStateService, ProjectWrapper } from '../../state/app-state.service'; @@ -12,6 +11,7 @@ import { DoughnutChartConfig } from '../../components/simple-doughnut-chart/simp import { SortingOption } from '../../utils/types'; import { groupBy } from '../../utils/functions'; import { AssignOwnerDialogComponent } from '../../dialogs/assign-owner-dialog/assign-owner-dialog.component'; +import { DialogService } from '../../dialogs/dialog.service'; @Component({ selector: 'redaction-project-listing-screen', @@ -30,6 +30,7 @@ export class ProjectListingScreenComponent implements OnInit { constructor( public readonly appStateService: AppStateService, private readonly _userService: UserService, + private readonly _dialogService: DialogService, private readonly _projectControllerService: ProjectControllerService, private readonly _translateService: TranslateService, private readonly _notificationService: NotificationService, @@ -38,6 +39,10 @@ export class ProjectListingScreenComponent implements OnInit { ngOnInit(): void { this.appStateService.reset(); + this._calculateData(); + } + + private _calculateData() { this.projectsChartData = [ { value: this.activeProjects, color: 'ACTIVE', label: 'active' }, { value: this.inactiveProjects, color: 'DELETED', label: 'archived' } @@ -47,7 +52,6 @@ export class ProjectListingScreenComponent implements OnInit { for (const key of Object.keys(groups)) { this.documentsChartData.push({ value: groups[key].length, color: key, label: key }); } - } public get user() { @@ -79,27 +83,25 @@ export class ProjectListingScreenComponent implements OnInit { } public openAddProjectDialog(project?: Project): void { - this._dialog.open(AddEditProjectDialogComponent, { + const dialogRef = this._dialog.open(AddEditProjectDialogComponent, { width: '400px', maxWidth: '90vw', data: project }); - } - - public openDeleteProjectDialog($event: MouseEvent, project: Project) { - $event.stopPropagation(); - const dialogRef = this._dialog.open(ConfirmationDialogComponent, { - width: '400px', - maxWidth: '90vw' - }); dialogRef.afterClosed().subscribe(result => { if (result) { - this.appStateService.deleteProject(project); + this._calculateData(); } }); } + public openDeleteProjectDialog($event: MouseEvent, project: Project) { + this._dialogService.openDeleteProjectDialog($event, project, () => { + this._calculateData(); + }); + } + public openDetailsDialog($event: MouseEvent, project: ProjectWrapper) { $event.stopPropagation(); this._dialog.open(ProjectDetailsDialogComponent, { diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts index 2ab6e3f71..a2e021953 100644 --- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts +++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts @@ -23,6 +23,7 @@ import { SortingOption } from '../../utils/types'; import { DoughnutChartConfig } from '../../components/simple-doughnut-chart/simple-doughnut-chart.component'; import { groupBy } from '../../utils/functions'; import { AssignProjectMembersDialogComponent } from '../../dialogs/assign-project-members-dialog/assign-project-members-dialog.component'; +import { DialogService } from '../../dialogs/dialog.service'; @Component({ @@ -49,6 +50,7 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy { private readonly _translateService: TranslateService, private readonly _notificationService: NotificationService, private readonly _dialog: MatDialog, + private readonly _dialogService: DialogService, private readonly _fileUploadService: FileUploadService, private readonly _uploadStatusOverlayService: UploadStatusOverlayService, private readonly _reanalysisControllerService: ReanalysisControllerService, @@ -109,22 +111,9 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy { } public openDeleteFileDialog($event: MouseEvent, fileStatus: FileStatus) { - $event.stopPropagation(); - const dialogRef = this._dialog.open(ConfirmationDialogComponent, { - width: '400px', - maxWidth: '90vw', - autoFocus: false - }); - - dialogRef.afterClosed().subscribe(result => { - if (result) { - this._fileUploadControllerService.deleteFile(fileStatus.projectId, fileStatus.fileId).subscribe(() => { - this._getFileStatus(); - }, () => { - this._notificationService.showToastNotification(this._translateService.instant('project-overview.delete-file-error.label', fileStatus), null, NotificationType.ERROR); - }); - } - }); + this._dialogService.openDeleteFileDialog($event, fileStatus.projectId, fileStatus.fileId, () => { + this._calculateChartConfig(); + }) } public openDetailsDialog($event: MouseEvent) { @@ -137,28 +126,13 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy { } public openEditProjectDialog($event: MouseEvent) { - $event.stopPropagation(); - this._dialog.open(AddEditProjectDialogComponent, { - width: '400px', - maxWidth: '90vw', - data: this.appStateService.activeProject.project - }); + this._dialogService.openEditProjectDialog($event, this.appStateService.activeProject.project); } public openDeleteProjectDialog($event: MouseEvent) { - $event.stopPropagation(); - const dialogRef = this._dialog.open(ConfirmationDialogComponent, { - width: '400px', - maxWidth: '90vw' - }); - - dialogRef.afterClosed().subscribe(result => { - if (result) { - this.appStateService.deleteProject(this.appStateService.activeProject.project); - this.ngOnDestroy(); - this._router.navigate(['/ui/projects']); - } - }); + this._dialogService.openDeleteProjectDialog($event, this.appStateService.activeProject.project, () => { + this._router.navigate(['/ui/projects']); + }) } public openAssignProjectMembersDialog() { diff --git a/apps/red-ui/src/app/state/app-state.service.ts b/apps/red-ui/src/app/state/app-state.service.ts index 4727a3028..8038dab87 100644 --- a/apps/red-ui/src/app/state/app-state.service.ts +++ b/apps/red-ui/src/app/state/app-state.service.ts @@ -109,6 +109,10 @@ export class AppStateService { return this.allProjects.find(project => project.project.projectId === id); } + public getFileById(projectId: string, fileId: string) { + return this.getProjectById(projectId).files.find(file => file.fileId === fileId); + } + async loadAllProjects() { const projects = await this._projectControllerService.getProjects().toPromise(); if (projects) { @@ -124,7 +128,7 @@ export class AppStateService { async getFiles(projectId: string) { const files = await this._statusControllerService.getProjectStatus(projectId).toPromise(); - const project = this._appState.projects.find(p => p.project.projectId === projectId); + const project = this.getProjectById(projectId); project.files = files; this._computeStats(); return files; @@ -152,7 +156,7 @@ export class AppStateService { } deleteProject(project: Project) { - this._projectControllerService.deleteProject(project.projectId).subscribe(() => { + return this._projectControllerService.deleteProject(project.projectId).toPromise().then(() => { const index = this._appState.projects.findIndex(p => p.project.projectId === project.projectId); this._appState.projects.splice(index, 1); this._appState.projects = [...this._appState.projects]; diff --git a/apps/red-ui/src/assets/icons/general/info.svg b/apps/red-ui/src/assets/icons/general/info.svg index 2a5ae4e0a..731218b6a 100644 --- a/apps/red-ui/src/assets/icons/general/info.svg +++ b/apps/red-ui/src/assets/icons/general/info.svg @@ -1,14 +1,7 @@ - - - - - - - - - + + + info + + + + \ No newline at end of file diff --git a/apps/red-ui/src/assets/styles/red-page-layout.scss b/apps/red-ui/src/assets/styles/red-page-layout.scss index c95cad404..56b3d5d08 100644 --- a/apps/red-ui/src/assets/styles/red-page-layout.scss +++ b/apps/red-ui/src/assets/styles/red-page-layout.scss @@ -119,12 +119,6 @@ html, body { display: block; } -.details-button { - position: fixed !important; - bottom: 20px; - right: 20px; -} - .detail-row { opacity: 1; font-family: Inconsolata, monospace, monospace; From 68039dc36697ef710123381878c9ccb0bb737136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Thu, 22 Oct 2020 00:27:16 +0300 Subject: [PATCH 06/10] Removed all dialogs from project listing --- apps/red-ui/src/app/dialogs/dialog.service.ts | 27 +++++++++- .../project-listing-screen.component.html | 4 +- .../project-listing-screen.component.ts | 49 +++++-------------- 3 files changed, 41 insertions(+), 39 deletions(-) diff --git a/apps/red-ui/src/app/dialogs/dialog.service.ts b/apps/red-ui/src/app/dialogs/dialog.service.ts index 701c3908f..31e6fa6e7 100644 --- a/apps/red-ui/src/app/dialogs/dialog.service.ts +++ b/apps/red-ui/src/app/dialogs/dialog.service.ts @@ -5,8 +5,10 @@ import { FileStatus, FileUploadControllerService, Project } from '@redaction/red import { ConfirmationDialogComponent } from '../common/confirmation-dialog/confirmation-dialog.component'; import { NotificationService, NotificationType } from '../notification/notification.service'; import { TranslateService } from '@ngx-translate/core'; -import { AppStateService } from '../state/app-state.service'; +import { AppStateService, ProjectWrapper } from '../state/app-state.service'; import { AddEditProjectDialogComponent } from './add-edit-project-dialog/add-edit-project-dialog.component'; +import { AssignOwnerDialogComponent } from './assign-owner-dialog/assign-owner-dialog.component'; +import { ProjectDetailsDialogComponent } from './project-details-dialog/project-details-dialog.component'; const dialogConfig = { width: '600px', @@ -75,4 +77,27 @@ export class DialogService { } }); } + + public openAssignProjectOwnerDialog($event: MouseEvent, project: Project) { + $event.stopPropagation(); + this._dialog.open(AssignOwnerDialogComponent, { + ...dialogConfig, + data: { type: 'project', projectId: project.projectId } + }); + } + + public openProjectDetailsDialog($event: MouseEvent, project: ProjectWrapper) { + $event.stopPropagation(); + this._dialog.open(ProjectDetailsDialogComponent, { + ...dialogConfig, + data: project + }); + } + + public openAddProjectDialog(cb?: Function): void { + const dialogRef = this._dialog.open(AddEditProjectDialogComponent, dialogConfig); + dialogRef.afterClosed().subscribe(result => { + if (result && cb) cb(); + }); + } } 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 c90a8fc62..9bbf8a2cd 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 @@ -69,7 +69,7 @@
- @@ -85,7 +85,7 @@ [matTooltip]="'project-listing.delete.action.label'|translate"> - diff --git a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts index 8bcab7658..8c3f463ca 100644 --- a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts +++ b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts @@ -1,16 +1,10 @@ import { Component, OnInit } from '@angular/core'; -import { Project, ProjectControllerService } from '@redaction/red-ui-http'; -import { MatDialog } from '@angular/material/dialog'; -import { AddEditProjectDialogComponent } from '../../dialogs/add-edit-project-dialog/add-edit-project-dialog.component'; -import { TranslateService } from '@ngx-translate/core'; -import { NotificationService } from '../../notification/notification.service'; +import { Project } from '@redaction/red-ui-http'; import { AppStateService, ProjectWrapper } from '../../state/app-state.service'; import { UserService } from '../../user/user.service'; -import { ProjectDetailsDialogComponent } from '../../dialogs/project-details-dialog/project-details-dialog.component'; import { DoughnutChartConfig } from '../../components/simple-doughnut-chart/simple-doughnut-chart.component'; import { SortingOption } from '../../utils/types'; import { groupBy } from '../../utils/functions'; -import { AssignOwnerDialogComponent } from '../../dialogs/assign-owner-dialog/assign-owner-dialog.component'; import { DialogService } from '../../dialogs/dialog.service'; @Component({ @@ -30,11 +24,8 @@ export class ProjectListingScreenComponent implements OnInit { constructor( public readonly appStateService: AppStateService, private readonly _userService: UserService, - private readonly _dialogService: DialogService, - private readonly _projectControllerService: ProjectControllerService, - private readonly _translateService: TranslateService, - private readonly _notificationService: NotificationService, - private readonly _dialog: MatDialog) { + private readonly _dialogService: DialogService + ) { } ngOnInit(): void { @@ -74,6 +65,10 @@ export class ProjectListingScreenComponent implements OnInit { return this.appStateService.allProjects.length - this.activeProjects; } + public getOwnerName(pw: ProjectWrapper) { + return this._userService.getNameForId(pw.project.ownerId); + } + public documentCount(project: ProjectWrapper) { return project.files.length; } @@ -82,17 +77,9 @@ export class ProjectListingScreenComponent implements OnInit { return 1; } - public openAddProjectDialog(project?: Project): void { - const dialogRef = this._dialog.open(AddEditProjectDialogComponent, { - width: '400px', - maxWidth: '90vw', - data: project - }); - - dialogRef.afterClosed().subscribe(result => { - if (result) { - this._calculateData(); - } + public openAddProjectDialog(): void { + this._dialogService.openAddProjectDialog(() => { + this._calculateData(); }); } @@ -102,21 +89,11 @@ export class ProjectListingScreenComponent implements OnInit { }); } - public openDetailsDialog($event: MouseEvent, project: ProjectWrapper) { - $event.stopPropagation(); - this._dialog.open(ProjectDetailsDialogComponent, { - width: '600px', - maxWidth: '90vw', - data: project - }); + public openProjectDetailsDialog($event: MouseEvent, project: ProjectWrapper) { + this._dialogService.openProjectDetailsDialog($event, project); } public openAssignProjectOwnerDialog($event: MouseEvent, project: Project) { - $event.stopPropagation(); - this._dialog.open(AssignOwnerDialogComponent, { - width: '400px', - maxWidth: '90vw', - data: { type: 'project', projectId: project.projectId } - }); + this._dialogService.openAssignProjectOwnerDialog($event, project); } } From a18851275d1ba649a4e65b57f0eab85b87b522a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Thu, 22 Oct 2020 01:10:14 +0300 Subject: [PATCH 07/10] Moved all dialogs into dialog service --- ...assign-project-members-dialog.component.ts | 13 ++- apps/red-ui/src/app/dialogs/dialog.service.ts | 84 ++++++++++++++++-- .../file-preview-screen.component.html | 6 +- .../file-preview-screen.component.scss | 1 + .../file-preview-screen.component.ts | 85 ++++--------------- .../file/pdf-viewer/pdf-viewer.component.ts | 39 ++++----- .../project-listing-screen.component.html | 6 +- .../project-overview-screen.component.ts | 42 ++------- 8 files changed, 129 insertions(+), 147 deletions(-) diff --git a/apps/red-ui/src/app/dialogs/assign-project-members-dialog/assign-project-members-dialog.component.ts b/apps/red-ui/src/app/dialogs/assign-project-members-dialog/assign-project-members-dialog.component.ts index 479db7b09..73be0b81a 100644 --- a/apps/red-ui/src/app/dialogs/assign-project-members-dialog/assign-project-members-dialog.component.ts +++ b/apps/red-ui/src/app/dialogs/assign-project-members-dialog/assign-project-members-dialog.component.ts @@ -1,7 +1,7 @@ import { Component, Inject } from '@angular/core'; import { Project, ProjectControllerService } from '@redaction/red-ui-http'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { AppStateService, ProjectWrapper } from '../../state/app-state.service'; +import { AppStateService } from '../../state/app-state.service'; import { UserService } from '../../user/user.service'; import { MatSelectionListChange } from '@angular/material/list'; import { NotificationService, NotificationType } from '../../notification/notification.service'; @@ -12,25 +12,24 @@ import { NotificationService, NotificationType } from '../../notification/notifi styleUrls: ['./assign-project-members-dialog.component.scss'] }) export class AssignProjectMembersDialogComponent { - private _project: Project; public memberIds: string[]; constructor(private readonly _projectControllerService: ProjectControllerService, private readonly _notificationService: NotificationService, public readonly userService: UserService, private readonly _appStateService: AppStateService, - public dialogRef: MatDialogRef) { - this._loadProject(); + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public _project: Project) { + this._loadMembers(); } - private _loadProject() { - this._project = this._appStateService.activeProject.project; + private _loadMembers() { this.memberIds = [...this._project.memberIds]; } private _reloadProject() { this._appStateService.addOrUpdateProject(this._project).then(() => { - this._loadProject(); + this._loadMembers(); }); } diff --git a/apps/red-ui/src/app/dialogs/dialog.service.ts b/apps/red-ui/src/app/dialogs/dialog.service.ts index 31e6fa6e7..7d0a56300 100644 --- a/apps/red-ui/src/app/dialogs/dialog.service.ts +++ b/apps/red-ui/src/app/dialogs/dialog.service.ts @@ -1,7 +1,13 @@ import { Injectable } from '@angular/core'; import { FileDetailsDialogComponent } from './file-details-dialog/file-details-dialog.component'; import { MatDialog } from '@angular/material/dialog'; -import { FileStatus, FileUploadControllerService, Project } from '@redaction/red-ui-http'; +import { + FileStatus, + FileUploadControllerService, + ManualRedactionControllerService, + ManualRedactionEntry, + Project +} from '@redaction/red-ui-http'; import { ConfirmationDialogComponent } from '../common/confirmation-dialog/confirmation-dialog.component'; import { NotificationService, NotificationType } from '../notification/notification.service'; import { TranslateService } from '@ngx-translate/core'; @@ -9,10 +15,14 @@ import { AppStateService, ProjectWrapper } from '../state/app-state.service'; import { AddEditProjectDialogComponent } from './add-edit-project-dialog/add-edit-project-dialog.component'; import { AssignOwnerDialogComponent } from './assign-owner-dialog/assign-owner-dialog.component'; import { ProjectDetailsDialogComponent } from './project-details-dialog/project-details-dialog.component'; +import { AssignProjectMembersDialogComponent } from './assign-project-members-dialog/assign-project-members-dialog.component'; +import { ManualRedactionDialogComponent } from './manual-redaction-dialog/manual-redaction-dialog.component'; +import { Annotations } from '@pdftron/webviewer'; const dialogConfig = { width: '600px', - maxWidth: '90vw' + maxWidth: '90vw', + autoFocus: false, }; @Injectable({ @@ -24,7 +34,8 @@ export class DialogService { private readonly _translateService: TranslateService, private readonly _appStateService: AppStateService, private readonly _fileUploadControllerService: FileUploadControllerService, - private readonly _notificationService: NotificationService) { + private readonly _notificationService: NotificationService, + private readonly _manualRedactionControllerService: ManualRedactionControllerService) { } @@ -38,11 +49,7 @@ export class DialogService { public openDeleteFileDialog($event: MouseEvent, projectId: string, fileId: string, cb?: Function) { $event.stopPropagation(); - const dialogRef = this._dialog.open(ConfirmationDialogComponent, { - ...dialogConfig, - autoFocus: false - }); - + const dialogRef = this._dialog.open(ConfirmationDialogComponent, dialogConfig); dialogRef.afterClosed().subscribe(result => { if (result) { const file = this._appStateService.getFileById(projectId, fileId); @@ -59,10 +66,59 @@ export class DialogService { }); } + public openManualRedactionDialog($event: ManualRedactionEntry) { + this._dialog.open(ManualRedactionDialogComponent, { + ...dialogConfig, + autoFocus: true, + data: $event + }); + } + + public acceptSuggestionAnnotation($event: MouseEvent, annotation: Annotations.Annotation, projectId: string, fileId: string) { + $event.stopPropagation(); + const dialogRef = this._dialog.open(ConfirmationDialogComponent, dialogConfig); + + const parts = annotation.Id.split(':'); + const annotationId = parts[parts.length - 1]; + + dialogRef.afterClosed().subscribe(result => { + if (result) { + this._manualRedactionControllerService.approveRequest(projectId, fileId, annotationId).subscribe(() => { + this._notificationService.showToastNotification(this._translateService.instant('manual-redaction.confirm-annotation.success.label'), null, NotificationType.SUCCESS); + }, (err) => { + this._notificationService.showToastNotification(this._translateService.instant('manual-redaction.confirm-annotation.failed.label', err), null, NotificationType.ERROR); + }); + } + }); + } + + public suggestRemoveAnnotation($event: MouseEvent, annotation: Annotations.Annotation, projectId: string, fileId: string) { + $event.stopPropagation(); + const dialogRef = this._dialog.open(ConfirmationDialogComponent, { + width: '400px', + maxWidth: '90vw' + }); + + const parts = annotation.Id.split(':'); + const annotationId = parts[parts.length - 1]; + + dialogRef.afterClosed().subscribe(result => { + if (result) { + this._manualRedactionControllerService.undo(projectId, fileId, annotationId).subscribe(ok => { + this._notificationService.showToastNotification(this._translateService.instant('manual-redaction.remove-annotation.success.label'), null, NotificationType.SUCCESS); + }, (err) => { + this._notificationService.showToastNotification(this._translateService.instant('manual-redaction.remove-annotation.failed.label', err), null, NotificationType.ERROR); + }); + } + }); + + } + public openEditProjectDialog($event: MouseEvent, project: Project) { $event.stopPropagation(); this._dialog.open(AddEditProjectDialogComponent, { ...dialogConfig, + autoFocus: true, data: project }); } @@ -95,9 +151,19 @@ export class DialogService { } public openAddProjectDialog(cb?: Function): void { - const dialogRef = this._dialog.open(AddEditProjectDialogComponent, dialogConfig); + const dialogRef = this._dialog.open(AddEditProjectDialogComponent, { + ...dialogConfig, + autoFocus: true, + }); dialogRef.afterClosed().subscribe(result => { if (result && cb) cb(); }); } + + public openAssignProjectMembersDialog(project: Project) { + this._dialog.open(AssignProjectMembersDialogComponent, { + ...dialogConfig, + data: project + }); + } } 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 d217227b9..3a283814e 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 @@ -20,7 +20,7 @@ -
diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.scss b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.scss index 3a51fe906..01f94cbe5 100644 --- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.scss +++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.scss @@ -105,6 +105,7 @@ redaction-pdf-viewer { position: relative; display: flex; gap: 10px; + border-left: 2px solid transparent; redaction-annotation-icon { margin-top: 6px; diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts index 4b1bda52e..474b00579 100644 --- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts @@ -1,22 +1,11 @@ import { ChangeDetectorRef, Component, ElementRef, NgZone, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { - AddRedactionRequest, FileStatus, - FileUploadControllerService, - ManualRedactionControllerService, - ManualRedactionEntry, - ProjectControllerService, ReanalysisControllerService, - StatusControllerService -} from '@redaction/red-ui-http'; -import { TranslateService } from '@ngx-translate/core'; -import {NotificationService, NotificationType} from '../../../notification/notification.service'; -import { MatDialog } from '@angular/material/dialog'; +import { ManualRedactionEntry, ReanalysisControllerService } from '@redaction/red-ui-http'; import { AppStateService } from '../../../state/app-state.service'; import { ViewerSyncService } from '../service/viewer-sync.service'; import { Annotations } from '@pdftron/webviewer'; import { PdfViewerComponent } from '../pdf-viewer/pdf-viewer.component'; import { AnnotationUtils } from '../../../utils/annotation-utils'; -import { ManualRedactionDialogComponent } from '../../../dialogs/manual-redaction-dialog/manual-redaction-dialog.component'; import { UserService } from '../../../user/user.service'; import { debounce } from '../../../utils/debounce'; import scrollIntoView from 'scroll-into-view-if-needed'; @@ -25,7 +14,6 @@ import { FiltersService } from '../service/filters.service'; import { FileDownloadService } from '../service/file-download.service'; import { saveAs } from 'file-saver'; import { FileType } from '../model/file-type'; -import { ConfirmationDialogComponent } from '../../../common/confirmation-dialog/confirmation-dialog.component'; import { DialogService } from '../../../dialogs/dialog.service'; @Component({ @@ -54,18 +42,11 @@ export class FilePreviewScreenComponent implements OnInit { public readonly appStateService: AppStateService, private readonly _changeDetectorRef: ChangeDetectorRef, private readonly _activatedRoute: ActivatedRoute, - private readonly _statusControllerService: StatusControllerService, - private readonly _translateService: TranslateService, - private readonly _notificationService: NotificationService, private readonly _viewerSyncService: ViewerSyncService, - private readonly _dialog: MatDialog, private readonly _dialogService: DialogService, private readonly _router: Router, - private readonly _manualRedactionControllerService: ManualRedactionControllerService, private readonly _userService: UserService, private readonly _fileDownloadService: FileDownloadService, - private readonly _fileUploadControllerService: FileUploadControllerService, - private readonly _projectControllerService: ProjectControllerService, private readonly _reanalysisControllerService: ReanalysisControllerService, private readonly _filtersService: FiltersService, private ngZone: NgZone) { @@ -121,6 +102,12 @@ export class FilePreviewScreenComponent implements OnInit { }); } + public openAssignFileOwnerDialog($event: MouseEvent) { + $event.stopPropagation(); + // TODO + console.log('not implemented yet'); + } + public fileReady(viewer: string) { this._readyViewers.push(viewer); this._changeDetectorRef.detectChanges(); @@ -175,13 +162,9 @@ export class FilePreviewScreenComponent implements OnInit { this._viewerComponent.navigateToPage(pageNumber); } - handleManualAnnotationRequest($event: ManualRedactionEntry) { + public openManualRedactionDialog($event: ManualRedactionEntry) { this.ngZone.run(() => { - this._dialog.open(ManualRedactionDialogComponent, { - width: '600px', - maxWidth: '90vw', - data: $event - }); + this._dialogService.openManualRedactionDialog($event); }); } @@ -223,59 +206,24 @@ export class FilePreviewScreenComponent implements OnInit { } } - getType(annotation: Annotations.Annotation): string { + public getType(annotation: Annotations.Annotation): string { return AnnotationUtils.getType(annotation); } - getDictionary(annotation: Annotations.Annotation): string { + public getDictionary(annotation: Annotations.Annotation): string { return AnnotationUtils.getDictionary(annotation); } - acceptSuggestionAnnotation($event: MouseEvent, annotation: Annotations.Annotation) { - $event.stopPropagation(); + public acceptSuggestionAnnotation($event: MouseEvent, annotation: Annotations.Annotation) { this.ngZone.run(() => { - const dialogRef = this._dialog.open(ConfirmationDialogComponent, { - width: '400px', - maxWidth: '90vw' - }); - - const parts = annotation.Id.split(':'); - const annotationId = parts[parts.length - 1]; - - dialogRef.afterClosed().subscribe(result => { - if (result) { - this._manualRedactionControllerService.approveRequest(this.appStateService.activeProjectId, this.appStateService.activeFile.fileId, annotationId).subscribe(ok => { - this._notificationService.showToastNotification(this._translateService.instant('manual-redaction.confirm-annotation.success.label'), null, NotificationType.SUCCESS); - }, (err) => { - this._notificationService.showToastNotification(this._translateService.instant('manual-redaction.confirm-annotation.failed.label', err), null, NotificationType.ERROR); - }); - } - }); + this._dialogService.acceptSuggestionAnnotation($event, annotation, this.projectId, this.fileId); }); } - suggestRemoveAnnotation($event: MouseEvent, annotation: Annotations.Annotation) { - $event.stopPropagation(); + public suggestRemoveAnnotation($event: MouseEvent, annotation: Annotations.Annotation) { this.ngZone.run(() => { - const dialogRef = this._dialog.open(ConfirmationDialogComponent, { - width: '400px', - maxWidth: '90vw' - }); - - const parts = annotation.Id.split(':'); - const annotationId = parts[parts.length - 1]; - - dialogRef.afterClosed().subscribe(result => { - if (result) { - this._manualRedactionControllerService.undo(this.appStateService.activeProjectId, this.appStateService.activeFile.fileId, annotationId).subscribe(ok => { - this._notificationService.showToastNotification(this._translateService.instant('manual-redaction.remove-annotation.success.label'), null, NotificationType.SUCCESS); - }, (err) => { - this._notificationService.showToastNotification(this._translateService.instant('manual-redaction.remove-annotation.failed.label', err), null, NotificationType.ERROR); - }); - } - }); + this._dialogService.suggestRemoveAnnotation($event, annotation, this.projectId, this.fileId); }); - } public downloadFile(type: FileType | string) { @@ -322,8 +270,7 @@ export class FilePreviewScreenComponent implements OnInit { this.expandedFilters[key] = value; } - isManuallyAddedAnnotation(annotation: Annotations.Annotation) { + public isManuallyAddedAnnotation(annotation: Annotations.Annotation) { return annotation.Id.indexOf('request:') >= 0; } - } diff --git a/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts index 4d8476564..37d024de8 100644 --- a/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts +++ b/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts @@ -9,15 +9,13 @@ import { Output, ViewChild } from '@angular/core'; -import {AppConfigKey, AppConfigService} from '../../../app-config/app-config.service'; -import {FileStatus, ManualRedactionEntry, Rectangle} from '@redaction/red-ui-http'; -import WebViewer, {Annotations, WebViewerInstance} from '@pdftron/webviewer'; -import {TranslateService} from '@ngx-translate/core'; -import {ViewerSyncService} from '../service/viewer-sync.service'; -import {MatDialog} from "@angular/material/dialog"; -import {FileDownloadService} from "../service/file-download.service"; -import {FileType} from "../model/file-type"; -import {AppStateService} from "../../../state/app-state.service"; +import { AppConfigKey, AppConfigService } from '../../../app-config/app-config.service'; +import { FileStatus, ManualRedactionEntry, Rectangle } from '@redaction/red-ui-http'; +import WebViewer, { Annotations, WebViewerInstance } from '@pdftron/webviewer'; +import { TranslateService } from '@ngx-translate/core'; +import { ViewerSyncService } from '../service/viewer-sync.service'; +import { FileDownloadService } from '../service/file-download.service'; +import { FileType } from '../model/file-type'; @Component({ @@ -36,18 +34,15 @@ export class PdfViewerComponent implements OnInit, AfterViewInit, OnDestroy { @Output() manualAnnotationRequested = new EventEmitter(); @Output() pageChanged = new EventEmitter(); - @ViewChild('viewer', {static: true}) viewer: ElementRef; + @ViewChild('viewer', { static: true }) viewer: ElementRef; wvInstance: WebViewerInstance; _fileData: Blob; - constructor( - private readonly _appStateService: AppStateService, - private readonly _viewerSyncService: ViewerSyncService, - private readonly _translateService: TranslateService, - private readonly _fileDownloadService: FileDownloadService, - private readonly _dialog: MatDialog, - private readonly _appConfigService: AppConfigService) { + constructor(private readonly _viewerSyncService: ViewerSyncService, + private readonly _translateService: TranslateService, + private readonly _fileDownloadService: FileDownloadService, + private readonly _appConfigService: AppConfigService) { } ngOnInit() { @@ -61,10 +56,10 @@ export class PdfViewerComponent implements OnInit, AfterViewInit, OnDestroy { ngAfterViewInit(): void { this._fileDownloadService.loadFile(this.fileType, this.fileId, (data) => { - this._fileData = data + this._fileData = data; }, () => this._fileData).subscribe(() => { this._loadViewer(this._fileData); - }) + }); } private _loadViewer(pdfBlob: any) { @@ -98,7 +93,7 @@ export class PdfViewerComponent implements OnInit, AfterViewInit, OnDestroy { }); instance.docViewer.on('documentLoaded', this.wvDocumentLoadedHandler); - instance.loadDocument(pdfBlob, {filename: this.fileStatus ? this.fileStatus.filename : 'document.pdf'}); + instance.loadDocument(pdfBlob, { filename: this.fileStatus ? this.fileStatus.filename : 'document.pdf' }); }); } @@ -128,7 +123,7 @@ export class PdfViewerComponent implements OnInit, AfterViewInit, OnDestroy { onClick: () => { const selectedQuads = this.wvInstance.docViewer.getSelectedTextQuads(); const text = this.wvInstance.docViewer.getSelectedText(); - const entry: ManualRedactionEntry = {positions: []}; + const entry: ManualRedactionEntry = { positions: [] }; for (const key of Object.keys(selectedQuads)) { for (const quad of selectedQuads[key]) { entry.positions.push(this.toPosition(parseInt(key, 10), quad)); @@ -152,7 +147,7 @@ export class PdfViewerComponent implements OnInit, AfterViewInit, OnDestroy { }, height: height, width: selectedQuad.x3 - selectedQuad.x4 - } + }; } private _configureHeader() { 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 9bbf8a2cd..91f87587b 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 @@ -89,9 +89,9 @@ [matTooltip]="'project-listing.report.action.label'|translate"> - - - + + +
-
+
+ +
+
+ + {{ 'project-overview.legend.contains-hints.label' | translate }} +
+
+ + {{ 'project-overview.legend.contains-redactions.label' | translate }} +
+
+ + {{ 'project-overview.legend.contains-suggestions.label' | translate }} +
+
diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.scss b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.scss index 0a91f19ab..8371e7c9b 100644 --- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.scss +++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.scss @@ -41,3 +41,19 @@ gap: 5px; } } + +.legend { + display: flex; + flex-direction: column; + gap: 8px; + + > div { + display: flex; + gap: 8px; + align-items: center; + } +} + +.mt-32 { + margin-top: 32px; +} diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index f5eeaa360..f8eee0c5c 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -372,6 +372,17 @@ }, "no-project": { "label": "Requested project: {{projectId}} does not exist! Back to Project Listing. " + }, + "legend": { + "contains-hints": { + "label": "Contains hints " + }, + "contains-redactions": { + "label": "Contains redactions " + }, + "contains-suggestions": { + "label": "Contains suggestions for redaction " + } } }, "file-preview": { @@ -457,13 +468,12 @@ "label": "Unassigned" } }, - - "assign-file-owner":{ + "assign-file-owner": { "dialog": { "single-user": { "label": "Reviewer" }, - "title":{ + "title": { "label": "Manage File Reviewer" }, "save": { @@ -471,8 +481,7 @@ } } }, - - "assign-project-owner":{ + "assign-project-owner": { "dialog": { "single-user": { "label": "Owner" @@ -480,7 +489,7 @@ "multi-user": { "label": "Members" }, - "title":{ + "title": { "label": "Manage Project Owner and Members" }, "save": { @@ -488,7 +497,6 @@ } } }, - "unassigned": "Unassigned", "under-review": "Under review", "under-approval": "Under approval", From 13802f4082163edec4de000980cab1a1758492a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Thu, 22 Oct 2020 03:03:35 +0300 Subject: [PATCH 10/10] Select files in project overview --- .../project-listing-screen.component.scss | 20 +++++++------ .../project-overview-screen.component.html | 11 ++++++- .../project-overview-screen.component.scss | 29 +++++++++++++++++++ .../project-overview-screen.component.ts | 27 +++++++++++++++++ apps/red-ui/src/assets/styles/red-tables.scss | 2 +- 5 files changed, 78 insertions(+), 11 deletions(-) diff --git a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.scss b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.scss index d542b2092..4465f680e 100644 --- a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.scss +++ b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.scss @@ -11,18 +11,20 @@ .left-container { width: calc(100vw - #{$right-container-width} - 130px); - .table-item:hover { - .stats-bar { - display: none; + .table-item { + &:hover { + .stats-bar { + display: none; + } } - } - .stats-subtitle { - margin-top: 6px; - } + .stats-subtitle { + margin-top: 6px; + } - .stats-bar, .action-buttons { - width: 160px; + .stats-bar, .action-buttons { + width: 160px; + } } } 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 78b8f0c15..e4134cdca 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 @@ -33,9 +33,12 @@
+
+
- {{'project-overview.table-header.title.label'| translate:{length: appStateService.activeProject?.files.length || 0} }} + {{'project-overview.table-header.title.label'| translate:{ length: appStateService.activeProject?.files.length || 0 } }} +
@@ -49,6 +52,7 @@
+
@@ -61,6 +65,11 @@ [class.pointer]="canOpenFile(fileStatus.status)" *ngFor="let fileStatus of appStateService.activeProject.files | sortBy: sortingOption.order:sortingOption.column; trackBy:fileId" [routerLink]="canOpenFile(fileStatus.status) ? ['/ui/projects/'+activeProject.projectId+'/file/'+fileStatus.fileId] : []"> + +
+
{{ fileStatus.filename }}
diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.scss b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.scss index 8371e7c9b..200c9f7f6 100644 --- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.scss +++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.scss @@ -13,6 +13,35 @@ justify-content: flex-end; } +.select-all-container { + display: flex; + gap: 16px; + align-items: center; + + .select-oval { + margin-left: 0; + } +} + +.select-oval { + width: 20px; + height: 20px; + border-radius: 50%; + border: 1px solid $grey-5; + background-color: $white; + padding: 0; + margin-left: 16px; + cursor: pointer; + + &.active { + background-color: $primary; + } + + &.placeholder { + visibility: hidden; + } +} + .table-item { .needs-work { display: flex; diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts index 345a70df3..bb45785a5 100644 --- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts +++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts @@ -21,6 +21,7 @@ import { DialogService } from '../../dialogs/dialog.service'; }) export class ProjectOverviewScreenComponent implements OnInit, OnDestroy { private _fileStatusInterval; + private _selectedFileIds: string[] = []; public sortingOptions: SortingOption[] = [ { label: 'project-overview.sorting.recent.label', order: 'desc', column: 'lastUpdated' }, @@ -101,6 +102,32 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy { } } + public toggleFileSelected($event: MouseEvent, file: FileStatus) { + $event.stopPropagation(); + const idx = this._selectedFileIds.indexOf(file.fileId); + if (idx === -1) { + this._selectedFileIds.push(file.fileId); + } else { + this._selectedFileIds.splice(idx, 1); + } + } + + public toggleSelectAll() { + if (this.areAllFilesSelected()) { + this._selectedFileIds = []; + } else { + this._selectedFileIds = this.appStateService.activeProject.files.map(file => file.fileId); + } + } + + public areAllFilesSelected() { + return this._selectedFileIds.length === this.appStateService.activeProject.files.length; + } + + public isFileSelected(file: FileStatus) { + return this._selectedFileIds.indexOf(file.fileId) !== -1; + } + public openDeleteFileDialog($event: MouseEvent, fileStatus: FileStatus) { this._dialogService.openDeleteFileDialog($event, fileStatus.projectId, fileStatus.fileId, () => { this._calculateChartConfig(); diff --git a/apps/red-ui/src/assets/styles/red-tables.scss b/apps/red-ui/src/assets/styles/red-tables.scss index 6f147f25c..c977794f9 100644 --- a/apps/red-ui/src/assets/styles/red-tables.scss +++ b/apps/red-ui/src/assets/styles/red-tables.scss @@ -19,11 +19,11 @@ .table-col-names { display: flex; text-transform: uppercase; + border-bottom: 1px solid rgba(226, 228, 233, 0.9); > div { padding: 8px 16px; font-weight: 600; - border-bottom: 1px solid rgba(226, 228, 233, 0.9); } }