From a276a37d3d2ea21df1c88cbe2ee3a6d48e99ddda Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Sat, 30 Oct 2021 14:24:33 +0200
Subject: [PATCH] Fix issue with multiple tags in the search expression

Signed-off-by: trivernis <trivernis@protonmail.com>
---
 .../app/components/file-search/file-search.component.ts    | 7 ++++++-
 .../app/pages/home/search-page/search-page.component.html  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mediarepo-ui/src/app/components/file-search/file-search.component.ts b/mediarepo-ui/src/app/components/file-search/file-search.component.ts
index 3ca84a9..ed2f5ee 100644
--- a/mediarepo-ui/src/app/components/file-search/file-search.component.ts
+++ b/mediarepo-ui/src/app/components/file-search/file-search.component.ts
@@ -50,10 +50,15 @@ export class FileSearchComponent implements AfterViewChecked {
 
   public addSearchTag(tag: string) {
     if (tag.startsWith("-")) {
-      this.searchTags.push(new TagQuery(tag.replace(/^-/g, ''), true));
+      tag = tag.replace(/^-/g, '');
+      this.searchTags.push(new TagQuery(tag, true));
     } else {
       this.searchTags.push(new TagQuery(tag, false));
     }
+    if (this.searchTags.filter(t => t.name === tag).length > 1) {
+      const index = this.searchTags.findIndex(t => t.name === tag);
+      this.searchTags.splice(index, 1);
+    }
   }
 
   async removeAllSearchTags() {
diff --git a/mediarepo-ui/src/app/pages/home/search-page/search-page.component.html b/mediarepo-ui/src/app/pages/home/search-page/search-page.component.html
index f22dc4a..a47c733 100644
--- a/mediarepo-ui/src/app/pages/home/search-page/search-page.component.html
+++ b/mediarepo-ui/src/app/pages/home/search-page/search-page.component.html
@@ -1,5 +1,5 @@
 <mat-drawer-container class="page">
-  <mat-drawer mode="side" opened>
+  <mat-drawer mode="side" opened disableClose>
     <div fxLayout="column" class="drawer-sidebar-inner">
       <div id="file-search-input" fxFlex="150px">
         <app-file-search #filesearch></app-file-search>