From 9160346ccca207a06530e290d0083f7c37038465 Mon Sep 17 00:00:00 2001 From: Maximilian Krambach Date: Tue, 12 Feb 2019 15:32:59 +0100 Subject: [PATCH] full text search for media file, some permission checks --- .../mediafile-list.component.html | 6 +- .../mediafile-list.component.ts | 29 ++++++++- .../services/mediafile-filter.service.ts | 64 +++++++++++-------- 3 files changed, 69 insertions(+), 30 deletions(-) diff --git a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html index e38e01280..fdd6306c0 100644 --- a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html +++ b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html @@ -1,5 +1,5 @@ -
+
@@ -170,7 +170,7 @@ Deselect all - diff --git a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.ts b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.ts index 8acea90da..e954657cf 100644 --- a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.ts +++ b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.ts @@ -15,6 +15,7 @@ import { Mediafile } from 'app/shared/models/mediafiles/mediafile'; import { MediafileFilterListService } from '../../services/mediafile-filter.service'; import { MediafilesSortListService } from '../../services/mediafiles-sort-list.service'; import { ViewportService } from 'app/core/ui-services/viewport.service'; +import { OperatorService } from 'app/core/core-services/operator.service'; /** * Lists all the uploaded files. @@ -55,6 +56,13 @@ export class MediafileListComponent extends ListViewBaseComponent */ public fileToEdit: ViewMediafile; + /** + * @returns true if the user can manage media files + */ + public get canEdit(): boolean { + return this.operator.hasPerms('mediafiles.can_manage'); + } + /** * The form to edit Files */ @@ -73,6 +81,9 @@ export class MediafileListComponent extends ListViewBaseComponent * @param mediaManage service to manage media files (setting images as logos) * @param promptService prevent deletion by accident * @param vp viewport Service to check screen size + * @param fitlerService MediaFileFilterService for advanced filtering + * @param sortService MediaFileSortService sort for advanced sorting + * @param operator permission check */ public constructor( titleService: Title, @@ -85,7 +96,8 @@ export class MediafileListComponent extends ListViewBaseComponent private promptService: PromptService, public vp: ViewportService, public filterService: MediafileFilterListService, - public sortService: MediafilesSortListService + public sortService: MediafilesSortListService, + private operator: OperatorService ) { super(titleService, translate, matSnackBar); @@ -123,6 +135,7 @@ export class MediafileListComponent extends ListViewBaseComponent this.mediaManage.getFontActions().subscribe(action => { this.fontActions = action; }); + this.setFulltextFilter(); } /** @@ -291,4 +304,18 @@ export class MediafileListComponent extends ListViewBaseComponent this.editFile = false; } } + + /** + * Overwrites the dataSource's string filter with a case-insensitive search + * in the file name property + */ + private setFulltextFilter(): void { + this.dataSource.filterPredicate = (data, filter) => { + if (!data || !data.title) { + return false; + } + filter = filter ? filter.toLowerCase() : ''; + return data.title.toLowerCase().indexOf(filter) >= 0; + }; + } } diff --git a/client/src/app/site/mediafiles/services/mediafile-filter.service.ts b/client/src/app/site/mediafiles/services/mediafile-filter.service.ts index 0e27f2130..8ed983aad 100644 --- a/client/src/app/site/mediafiles/services/mediafile-filter.service.ts +++ b/client/src/app/site/mediafiles/services/mediafile-filter.service.ts @@ -5,6 +5,7 @@ import { Mediafile } from 'app/shared/models/mediafiles/mediafile'; import { ViewMediafile } from '../models/view-mediafile'; import { StorageService } from 'app/core/core-services/storage.service'; import { MediafileRepositoryService } from 'app/core/repositories/mediafiles/mediafile-repository.service'; +import { OperatorService } from 'app/core/core-services/operator.service'; @Injectable({ providedIn: 'root' @@ -12,33 +13,44 @@ import { MediafileRepositoryService } from 'app/core/repositories/mediafiles/med export class MediafileFilterListService extends BaseFilterListService { protected name = 'Mediafile'; - public filterOptions: OsFilter[] = [ - { - property: 'is_hidden', - label: 'Hidden', - options: [ - { condition: true, label: 'is hidden' }, - { condition: false, label: 'is not hidden', isActive: true } - ] - }, - { - property: 'type', - label: 'Is PDF', - options: [ - { - condition: 'application/pdf', - label: 'Is PDF file' - }, - { - condition: null, - label: 'Is no PDF file' - } - ] - } - ]; + /** + * A filter checking if a file is a pdf or not + */ + public pdfOption: OsFilter = { + property: 'type', + label: 'Is PDF', + options: [ + { + condition: 'application/pdf', + label: 'Is PDF file' + }, + { + condition: null, + label: 'Is no PDF file' + } + ] + }; - public constructor(store: StorageService, repo: MediafileRepositoryService) { + /** + * A filter checking if a file is hidden. Only included if the operator has permission to see hidden files + */ + public hiddenOptions: OsFilter = { + property: 'is_hidden', + label: 'Hidden', + options: [{ condition: true, label: 'is hidden' }, { condition: false, label: 'is not hidden', isActive: true }] + }; + + /** + * Constructor. Sets the filter options according to permissions + * @param store + * @param repo + * @param operator + */ + public constructor(store: StorageService, repo: MediafileRepositoryService, operator: OperatorService) { super(store, repo); - this.updateFilterDefinitions(this.filterOptions); + const filterOptions = operator.hasPerms('mediafiles.can_see_hidden') + ? [this.hiddenOptions, this.pdfOption] + : [this.pdfOption]; + this.updateFilterDefinitions(filterOptions); } }