From af5c5a59dc219417cc6a2776391f0d584de7e202 Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Sun, 13 Feb 2022 12:21:37 +0100
Subject: [PATCH] Fix button ordering

Signed-off-by: trivernis <trivernis@protonmail.com>
---
 .../files-tab-sidebar.component.html          |  2 +-
 .../files-tab-sidebar.component.ts            | 22 +++++++++++++++++--
 .../filter-dialog.component.html              |  2 +-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.html b/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.html
index 9a29759..3544659 100644
--- a/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.html
+++ b/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.html
@@ -1,5 +1,5 @@
 <div class="sidebar-inner">
-    <mat-tab-group headerPosition="below">
+    <mat-tab-group (selectedTabChange)="this.onTabChange()" headerPosition="below">
         <mat-tab label="Search">
             <app-file-search (searchEndEvent)="this.onDisplayedFilesChange(); this.searchEndEvent.emit($event);"
                              (searchStartEvent)="this.searchStartEvent.emit($event)"
diff --git a/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts b/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts
index e9d3d5f..32935fd 100644
--- a/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts
+++ b/mediarepo-ui/src/app/components/core/files-tab/files-tab-sidebar/files-tab-sidebar.component.ts
@@ -1,4 +1,14 @@
-import {Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild} from "@angular/core";
+import {
+    ChangeDetectorRef,
+    Component,
+    EventEmitter,
+    Input,
+    OnChanges,
+    OnInit,
+    Output,
+    SimpleChanges,
+    ViewChild
+} from "@angular/core";
 import {Tag} from "../../../../../api/models/Tag";
 import {TagService} from "../../../../services/tag/tag.service";
 import {File} from "../../../../../api/models/File";
@@ -29,7 +39,11 @@ export class FilesTabSidebarComponent implements OnInit, OnChanges {
     public tagsOfSelection: Tag[] = [];
     public tagsLoading = false;
 
-    constructor(private repoService: RepositoryService, private tagService: TagService) {
+    constructor(
+        private changeDetector: ChangeDetectorRef,
+        private repoService: RepositoryService,
+        private tagService: TagService
+    ) {
         this.repoService.selectedRepository.subscribe(
             async (repo) => repo && this.fileSearch && await this.fileSearch.searchForFiles());
         this.tagService.tags.subscribe(t => this.allTags = t);
@@ -79,6 +93,10 @@ export class FilesTabSidebarComponent implements OnInit, OnChanges {
         this.tagsLoading = false;
     }
 
+    public onTabChange(): void {
+        this.changeDetector.markForCheck();
+    }
+
     private async refreshFileSelection() {
         const filteredSelection = this.selectedFiles.filter(
             file => this.files.findIndex(f => f.id === file.id) >= 0);
diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/filter-dialog.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/filter-dialog.component.html
index 1f05c7e..f709fc7 100644
--- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/filter-dialog.component.html
+++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/filter-dialog.component.html
@@ -19,8 +19,8 @@
                       class="filter-input"></app-filter-input>
 </div>
 <div class="dialog-actions" mat-dialog-actions>
-    <button (click)="confirmFilter()" color="primary" mat-flat-button>Filter</button>
     <button (click)="cancelFilter()" color="accent" mat-stroked-button>Cancel</button>
+    <button (click)="confirmFilter()" color="primary" mat-flat-button>Filter</button>
 </div>
 <app-context-menu #contextMenu>
     <button (click)="this.removeSelectedFilters()" mat-menu-item>Remove</button>