From b989e02bee6afdd39f9b1029e5bc67e9094741c2 Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Sat, 30 Oct 2021 21:29:05 +0200
Subject: [PATCH] Add cancel to sort dialog and fix backdrop close

Signed-off-by: trivernis <trivernis@protonmail.com>
---
 .../app/components/file-search/file-search.component.ts    | 7 +++++--
 .../file-search/filter-dialog/filter-dialog.component.html | 1 +
 .../file-search/filter-dialog/filter-dialog.component.scss | 7 +++++--
 .../file-search/filter-dialog/filter-dialog.component.ts   | 4 ++++
 4 files changed, 15 insertions(+), 4 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 418167c..761dd1a 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
@@ -114,10 +114,13 @@ export class FileSearchComponent implements AfterViewChecked {
       data: {
         sortEntries,
       },
+      disableClose: true,
     });
     openedDialog.afterClosed().subscribe(async (sortExpression) => {
-      this.sortExpression = sortExpression;
-      await this.searchForFiles();
+      if (sortExpression) {
+        this.sortExpression = sortExpression;
+        await this.searchForFiles();
+      }
     });
   }
 }
diff --git a/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.html b/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.html
index 0c1febe..d5c7153 100644
--- a/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.html
+++ b/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.html
@@ -34,4 +34,5 @@
 </div>
 <div class="dialog-actions" mat-dialog-actions>
   <button mat-flat-button color="primary" (click)="confirmSort()">Sort</button>
+  <button mat-stroked-button color="accent" (click)="cancelSort()">Cancel</button>
 </div>
diff --git a/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.scss b/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.scss
index a66069b..0a45271 100644
--- a/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.scss
+++ b/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.scss
@@ -18,7 +18,10 @@ mat-form-field, .filler {
 }
 
 .dialog-actions {
-  align-items: center;
-  text-align: center;
+  display: flex;
+  flex-direction: row-reverse;
   width: 100%;
+  button {
+    margin-left: 1em;
+  }
 }
diff --git a/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.ts b/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.ts
index 0b4ce10..9cb90e4 100644
--- a/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.ts
+++ b/mediarepo-ui/src/app/components/file-search/filter-dialog/filter-dialog.component.ts
@@ -28,4 +28,8 @@ export class FilterDialogComponent {
   public confirmSort(): void {
     this.dialogRef.close(this.sortEntries);
   }
+
+  public cancelSort(): void {
+    this.dialogRef.close()
+  }
 }