From e26c60d67b265dc64dbdafc8844ca9f8fc4a3d09 Mon Sep 17 00:00:00 2001 From: "Patrik J. Braun" Date: Sun, 30 May 2021 00:02:05 +0200 Subject: [PATCH] Add `.saved_searches.pg2conf` popup #45 --- src/frontend/app/app.module.ts | 2 + .../app/ui/albums/albums.component.html | 13 ++-- .../saved-search-popup.component.css | 29 -------- .../saved-search-popup.component.html | 73 +++---------------- .../saved-search-popup.component.ts | 51 +++---------- .../search/search.gallery.component.html | 27 ++++--- .../search/search.gallery.component.ts | 2 +- 7 files changed, 47 insertions(+), 150 deletions(-) diff --git a/src/frontend/app/app.module.ts b/src/frontend/app/app.module.ts index d2d33406..8f9657ad 100644 --- a/src/frontend/app/app.module.ts +++ b/src/frontend/app/app.module.ts @@ -104,6 +104,7 @@ import {AlbumsComponent} from './ui/albums/albums.component'; import {AlbumComponent} from './ui/albums/album/album.component'; import {AlbumsService} from './ui/albums/albums.service'; import {GallerySearchQueryBuilderComponent} from './ui/gallery/search/query-builder/query-bulder.gallery.component'; +import {SavedSearchPopupComponent} from './ui/albums/saved-search-popup/saved-search-popup.component'; @Injectable() @@ -185,6 +186,7 @@ Marker.prototype.options.icon = iconDefault; // Albums AlbumsComponent, AlbumComponent, + SavedSearchPopupComponent, // Gallery GalleryLightboxMediaComponent, GalleryPhotoLoadingComponent, diff --git a/src/frontend/app/ui/albums/albums.component.html b/src/frontend/app/ui/albums/albums.component.html index b5b0a6be..b7a2fb3f 100644 --- a/src/frontend/app/ui/albums/albums.component.html +++ b/src/frontend/app/ui/albums/albums.component.html @@ -38,17 +38,14 @@
-
- -
-
@@ -63,7 +60,11 @@
- + +
-
Add Saved Search
+
Saved Search to .saved_searches.pg2conf
- -
- -
- -
- - -
-
- - - -
- - -
- - -
- + Add this json to a '.saved_searches.pg2conf' file in your gallery: + 
{{[savedSearchDTO] | json}}
+ This saved search will be loaded from file during gallery indexing and it will survive a database reset.
diff --git a/src/frontend/app/ui/albums/saved-search-popup/saved-search-popup.component.ts b/src/frontend/app/ui/albums/saved-search-popup/saved-search-popup.component.ts index 700efffd..e196b704 100644 --- a/src/frontend/app/ui/albums/saved-search-popup/saved-search-popup.component.ts +++ b/src/frontend/app/ui/albums/saved-search-popup/saved-search-popup.component.ts @@ -1,42 +1,21 @@ -import {Component, ElementRef, OnInit, TemplateRef, ViewChild} from '@angular/core'; -import {AlbumsService} from './albums.service'; +import {Component, Input, TemplateRef} from '@angular/core'; import {BsModalService} from 'ngx-bootstrap/modal'; import {BsModalRef} from 'ngx-bootstrap/modal/bs-modal-ref.service'; -import {SearchQueryTypes, TextSearch} from '../../../../common/entities/SearchQueryDTO'; -import {UserRoles} from '../../../../common/entities/UserDTO'; -import {AuthenticationService} from '../../model/network/authentication.service'; +import {SearchQueryDTO} from '../../../../../common/entities/SearchQueryDTO'; @Component({ - selector: 'app-albums', - templateUrl: './albums.component.html', - styleUrls: ['./albums.component.css'] + selector: 'app-saved-search-popup-btn', + templateUrl: './saved-search-popup.component.html', + styleUrls: ['./saved-search-popup.component.css'] }) -export class SavedSearchPopupComponent implements OnInit { - @ViewChild('container', {static: true}) container: ElementRef; - public size: number; - public savedSearch = { - name: '', - searchQuery: {type: SearchQueryTypes.any_text, text: ''} as TextSearch - }; +export class SavedSearchPopupComponent { + @Input() disabled: boolean; + @Input() savedSearchDTO: { name: string, searchQuery: SearchQueryDTO }; private modalRef: BsModalRef; - constructor(public albumsService: AlbumsService, - private modalService: BsModalService, - public authenticationService: AuthenticationService) { - this.albumsService.getAlbums().catch(console.error); + constructor(private modalService: BsModalService) { } - - ngOnInit(): void { - this.updateSize(); - } - - - get CanCreateAlbum(): boolean { - return this.authenticationService.user.getValue().role >= UserRoles.Admin; - } - - public async openModal(template: TemplateRef): Promise { this.modalRef = this.modalService.show(template, {class: 'modal-lg'}); document.body.style.paddingRight = '0px'; @@ -47,18 +26,6 @@ export class SavedSearchPopupComponent implements OnInit { this.modalRef = null; } - async saveSearch(): Promise { - await this.albumsService.addSavedSearch(this.savedSearch.name, this.savedSearch.searchQuery); - this.hideModal(); - } - - private updateSize(): void { - const size = 220 + 5; - // body - container margin - const containerWidth = this.container.nativeElement.clientWidth - 30; - this.size = (containerWidth / Math.round((containerWidth / size))) - 5; - } - } diff --git a/src/frontend/app/ui/gallery/search/search.gallery.component.html b/src/frontend/app/ui/gallery/search/search.gallery.component.html index 10a0e08b..79a22fd8 100644 --- a/src/frontend/app/ui/gallery/search/search.gallery.component.html +++ b/src/frontend/app/ui/gallery/search/search.gallery.component.html @@ -73,17 +73,26 @@
-
- -
+ +
+ + +
+ + diff --git a/src/frontend/app/ui/gallery/search/search.gallery.component.ts b/src/frontend/app/ui/gallery/search/search.gallery.component.ts index 0fcfa666..5ade3f28 100644 --- a/src/frontend/app/ui/gallery/search/search.gallery.component.ts +++ b/src/frontend/app/ui/gallery/search/search.gallery.component.ts @@ -27,7 +27,7 @@ export class GallerySearchComponent implements OnDestroy { mouseOverAutoComplete = false; readonly SearchQueryTypes: typeof SearchQueryTypes; public readonly MetadataSearchQueryTypes: { value: string; key: SearchQueryTypes }[]; - public saveSearchName: string; + public saveSearchName = ''; private searchModalRef: BsModalRef; private readonly subscription: Subscription = null; private saveSearchModalRef: BsModalRef;