Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

some filter fixes

Browse Source
This commit is contained in:
Timo Bejan 2020-10-30 15:54:52 +02:00
parent 3936c70226
commit 59f5a884b9
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
View File

@ -100,7 +100,7 @@
<mat-icon svgIcon="red:arrow-down"></mat-icon>
</button>
<div class="dot" *ngIf="hasActiveFilters"></div>
<mat-menu #filterMenu="matMenu" xPosition="before">
<mat-menu #filterMenu="matMenu" xPosition="before" (closed)="applyFilters()">
<div class="filter-menu-header">
<div
class="all-caps-label"
@ -110,19 +110,13 @@
<div
class="all-caps-label primary pointer"
translate="file-preview.filter-menu.all.label"
(click)="
setAllFilters(filters, true);
applyFilters();
$event.stopPropagation()
"
(click)="setAllFilters(filters, true); $event.stopPropagation()"
></div>
<div
class="all-caps-label primary pointer"
translate="file-preview.filter-menu.none.label"
(click)="
setAllFilters(filters, false);
applyFilters();
$event.stopPropagation()
setAllFilters(filters, false); $event.stopPropagation()
"
></div>
</div>
@ -174,7 +168,6 @@
>
<mat-checkbox
[(ngModel)]="filters[key][subkey]"
(change)="applyFilters()"
color="primary"
>
<redaction-annotation-icon

2
apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
View File

@ -295,8 +295,6 @@ export class FilePreviewScreenComponent implements OnInit {
}
}
}
this.applyFilters();
}
public isChecked(key: string): boolean {

2
apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts
View File

@ -280,7 +280,7 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy {
}
public canOpenFile(fileStatus: FileStatus): boolean {
// TODO check correct condition for this
return !this.isError(fileStatus) && (fileStatus.status === 'PROCESSING' || true);
return !this.isError(fileStatus) && !this.isProcessing(fileStatus);
}
public toggleSortByAddedOn() {