From 476187a8ad22048df8a8d528a83eda0900e7e035 Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Sun, 20 Feb 2022 12:36:26 +0100
Subject: [PATCH 1/7] Fix delete sweep deleting status filters

TG-111 #closed

Signed-off-by: trivernis <trivernis@protonmail.com>
---
 .../shared/sidebar/file-search/file-search.component.ts          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts
index fe88675..4c0fb1c 100644
--- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts
+++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts
@@ -127,6 +127,7 @@ export class FileSearchComponent implements AfterViewChecked, OnInit {
     public async removeAllSearchTags() {
         this.filters = new SearchFilters([]);
         this.state.setTagFilters(this.filters);
+        this.updateStatusFilters();
     }
 
     public async removeFilterExpression(expr: FilterExpression) {

From c3b8304290846369e50e7b07a46ff441a08cdc8e Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Sun, 20 Feb 2022 12:36:26 +0100
Subject: [PATCH 2/7] Fix delete sweep deleting status filters

TG-111 #closed

Signed-off-by: trivernis <trivernis@protonmail.com>
---
 .../shared/sidebar/file-search/file-search.component.ts          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts
index fe88675..4c0fb1c 100644
--- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts
+++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts
@@ -127,6 +127,7 @@ export class FileSearchComponent implements AfterViewChecked, OnInit {
     public async removeAllSearchTags() {
         this.filters = new SearchFilters([]);
         this.state.setTagFilters(this.filters);
+        this.updateStatusFilters();
     }
 
     public async removeFilterExpression(expr: FilterExpression) {

From 79dad3af0be195516edc0287491229ddd671dd6c Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Sun, 20 Feb 2022 12:56:58 +0100
Subject: [PATCH 3/7] Fix filter for date values

TG-110 #ready-for-test

Signed-off-by: trivernis <trivernis@protonmail.com>
---
 mediarepo-ui/src/api/api-types/files.ts       |  6 ++---
 .../src/api/models/FilterQueryBuilder.ts      | 27 +++++++++++++------
 mediarepo-ui/src/app/utils/filter-utils.ts    |  6 ++---
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/mediarepo-ui/src/api/api-types/files.ts b/mediarepo-ui/src/api/api-types/files.ts
index f40d1bb..de453ec 100644
--- a/mediarepo-ui/src/api/api-types/files.ts
+++ b/mediarepo-ui/src/api/api-types/files.ts
@@ -28,9 +28,9 @@ export type PropertyQuery = PropertyQueryStatus
 
 export type PropertyQueryStatus = { Status: FileStatus };
 export type PropertyQueryFileSize = { FileSize: ValueComparator<number> };
-export type PropertyQueryImportedTime = { ImportedTime: ValueComparator<Date> };
-export type PropertyQueryChangedTime = { ChangedTime: ValueComparator<Date> };
-export type PropertyQueryCreatedTime = { CreatedTime: ValueComparator<Date> };
+export type PropertyQueryImportedTime = { ImportedTime: ValueComparator<string> };
+export type PropertyQueryChangedTime = { ChangedTime: ValueComparator<string> };
+export type PropertyQueryCreatedTime = { CreatedTime: ValueComparator<string> };
 export type PropertyQueryTagCount = { TagCount: ValueComparator<number> };
 export type PropertyQueryCd = { Cd: string };
 export type PropertyQueryId = { Id: number };
diff --git a/mediarepo-ui/src/api/models/FilterQueryBuilder.ts b/mediarepo-ui/src/api/models/FilterQueryBuilder.ts
index 95e7827..f9f45dc 100644
--- a/mediarepo-ui/src/api/models/FilterQueryBuilder.ts
+++ b/mediarepo-ui/src/api/models/FilterQueryBuilder.ts
@@ -29,21 +29,21 @@ export class FilterQueryBuilder {
 
     public static importedTime(date: Date, comparator: Comparator, max_date: Date): FilterQuery {
         return filterQuery({
-            ImportedTime: valuesToCompareEnum(date, comparator,
-                max_date
+            ImportedTime: valuesToCompareEnum(formatDate(date)!!, comparator,
+                formatDate(max_date)
             )
         });
     }
 
     public static changedTime(date: Date, comparator: Comparator, max_date: Date): FilterQuery {
         return filterQuery({
-            ChangedTime: valuesToCompareEnum(date, comparator, max_date)
+            ChangedTime: valuesToCompareEnum(formatDate(date)!!, comparator, formatDate(max_date))
         });
     }
 
     public static createdTime(date: Date, comparator: Comparator, max_date: Date): FilterQuery {
         return filterQuery({
-            CreatedTime: valuesToCompareEnum(date, comparator, max_date)
+            CreatedTime: valuesToCompareEnum(formatDate(date)!!, comparator, formatDate(max_date))
         });
     }
 
@@ -150,6 +150,7 @@ export class FilterQueryBuilder {
                     }
                     break;
                 case "ImportedTime":
+                    console.debug(propertyName, rawComparator, compareValue);
                     value = this.parsePropertyValue(compareValue, parseDate);
                     if (value != undefined) {
                         return this.importedTime(value[0], comparator, value[1]);
@@ -263,7 +264,7 @@ function filterQuery(propertyQuery: PropertyQuery): FilterQuery {
     return { Property: propertyQuery };
 }
 
-function valuesToCompareEnum<T>(min_value: T, comparator: Comparator, max_value?: T): ValueComparator<T> {
+function valuesToCompareEnum<T>(min_value: T, comparator: Comparator, max_value: T | undefined): ValueComparator<T> {
     switch (comparator) {
         case "Less":
             return { Less: min_value };
@@ -299,9 +300,9 @@ function parseByteSize(value: string): number | undefined {
     if (number) {
         for (const key of Object.keys(valueMappings)) {
             if (checkUnit(key)) {
-                console.log("key", key, "valueMapping", valueMappings[key]);
+                console.debug("key", key, "valueMapping", valueMappings[key]);
                 number *= valueMappings[key];
-                console.log("number", number);
+                console.debug("number", number);
                 break;
             }
         }
@@ -311,7 +312,7 @@ function parseByteSize(value: string): number | undefined {
 }
 
 function parseDate(value: string): Date | undefined {
-    const date = Date.parse(value);
+    const date = Date.parse(value.toUpperCase());
 
     if (isNaN(date)) {
         return undefined;
@@ -331,3 +332,13 @@ function parseStatus(value: string): FileStatus | undefined {
             return undefined;
     }
 }
+
+function formatDate(date?: Date): string | undefined {
+    if (date) {
+        const pad = (s: number) => s.toString().padStart(2, "0");
+        return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}T${pad(date.getHours())}:${pad(
+            date.getMinutes())}:${pad(
+            date.getSeconds())}`;
+    }
+    return;
+}
diff --git a/mediarepo-ui/src/app/utils/filter-utils.ts b/mediarepo-ui/src/app/utils/filter-utils.ts
index dc2aedc..9264c9b 100644
--- a/mediarepo-ui/src/app/utils/filter-utils.ts
+++ b/mediarepo-ui/src/app/utils/filter-utils.ts
@@ -40,19 +40,19 @@ export function propertyQueryToStringParts(propertyQuery: PropertyQuery): [strin
         return [
             "ImportedTime",
             getComparator(propertyQuery.ImportedTime),
-            getValue(propertyQuery.ImportedTime).toISOString()
+            getValue(propertyQuery.ImportedTime)
         ];
     } else if ("ChangedTime" in propertyQuery) {
         return [
             "ChangedTime",
             getComparator(propertyQuery.ChangedTime),
-            getValue(propertyQuery.ChangedTime).toISOString()
+            getValue(propertyQuery.ChangedTime)
         ];
     } else if ("CreatedTime" in propertyQuery) {
         return [
             "CreatedTime",
             getComparator(propertyQuery.CreatedTime),
-            getValue(propertyQuery.CreatedTime).toISOString()
+            getValue(propertyQuery.CreatedTime)
         ];
     } else if ("TagCount" in propertyQuery) {
         return [

From 71d4287246045209bbdf16e4c4d5a050c039a938 Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Sun, 20 Feb 2022 14:02:33 +0100
Subject: [PATCH 4/7] Fix file status not updating visually

TG-107 #closed

Signed-off-by: trivernis <trivernis@protonmail.com>
---
 mediarepo-ui/src/api/models/File.ts           | 20 ++++++++++++++-----
 .../file-action-base.component.ts             |  4 ++--
 .../file/file-card/file-card.component.html   |  1 -
 .../file/file-card/file-card.component.ts     | 20 -------------------
 .../file-context-menu.component.ts            | 10 +++++-----
 .../file-gallery/file-gallery.component.html  |  5 ++---
 .../file-gallery/file-gallery.component.ts    |  6 ------
 .../file-grid/file-grid.component.html        |  5 ++---
 .../file-grid/file-grid.component.ts          |  6 ------
 .../file-multiview.component.ts               |  2 +-
 .../file-thumbnail.component.html             |  6 +++---
 .../file-thumbnail.component.ts               | 16 +--------------
 12 files changed, 31 insertions(+), 70 deletions(-)

diff --git a/mediarepo-ui/src/api/models/File.ts b/mediarepo-ui/src/api/models/File.ts
index 67f3bd8..d73cfed 100644
--- a/mediarepo-ui/src/api/models/File.ts
+++ b/mediarepo-ui/src/api/models/File.ts
@@ -1,9 +1,14 @@
 import {FileBasicData, FileStatus} from "../api-types/files";
+import {BehaviorSubject, Observable} from "rxjs";
 
 export class File {
+
+    private statusSubject: BehaviorSubject<FileStatus>;
+
     constructor(
         private basicData: FileBasicData,
     ) {
+        this.statusSubject = new BehaviorSubject(basicData.status);
     }
 
     public get rawData(): FileBasicData {
@@ -18,15 +23,20 @@ export class File {
         return this.basicData.cd;
     }
 
-    public get status(): FileStatus {
-        return this.basicData.status;
+    public get status(): Observable<FileStatus> {
+        return this.statusSubject.asObservable();
+    }
+
+    public get mimeType(): string {
+        return this.basicData.mime_type;
     }
 
-    public set status(value: FileStatus) {
+    public setStatus(value: FileStatus) {
         this.basicData.status = value;
+        this.statusSubject.next(value);
     }
 
-    public get mimeType(): string {
-        return this.basicData.mime_type;
+    public getStatus(): FileStatus {
+        return this.basicData.status;
     }
 }
diff --git a/mediarepo-ui/src/app/components/shared/app-base/file-action-base/file-action-base.component.ts b/mediarepo-ui/src/app/components/shared/app-base/file-action-base/file-action-base.component.ts
index e912a41..a43053a 100644
--- a/mediarepo-ui/src/app/components/shared/app-base/file-action-base/file-action-base.component.ts
+++ b/mediarepo-ui/src/app/components/shared/app-base/file-action-base/file-action-base.component.ts
@@ -56,7 +56,7 @@ export class FileActionBaseComponent {
             if (changeConfirmed) {
                 await this.errorBroker.try(async () => {
                     const newFile = await this.fileService.updateFileStatus(files[0].id, status);
-                    files[0].status = newFile.status;
+                    files[0].setStatus(newFile.getStatus());
                 });
             }
         } else {
@@ -72,7 +72,7 @@ export class FileActionBaseComponent {
                     files,
                     (file) => this.errorBroker.try(async () => {
                         const newFile = await this.fileService.updateFileStatus(file.id, status);
-                        file.status = newFile.status;
+                        file.setStatus(newFile.getStatus());
                     })
                 );
             }
diff --git a/mediarepo-ui/src/app/components/shared/file/file-card/file-card.component.html b/mediarepo-ui/src/app/components/shared/file/file-card/file-card.component.html
index 1856588..fc6cf37 100644
--- a/mediarepo-ui/src/app/components/shared/file/file-card/file-card.component.html
+++ b/mediarepo-ui/src/app/components/shared/file/file-card/file-card.component.html
@@ -5,7 +5,6 @@
         <app-file-thumbnail
             (loadEnd)="this.loading = false"
             [class.hidden]="this.loading"
-            [fileChanged]="this.fileChanged"
             [file]="this.entry.data"
             class="entry-image"></app-file-thumbnail>
     </app-busy-indicator>
diff --git a/mediarepo-ui/src/app/components/shared/file/file-card/file-card.component.ts b/mediarepo-ui/src/app/components/shared/file/file-card/file-card.component.ts
index 1936c67..7819289 100644
--- a/mediarepo-ui/src/app/components/shared/file/file-card/file-card.component.ts
+++ b/mediarepo-ui/src/app/components/shared/file/file-card/file-card.component.ts
@@ -13,7 +13,6 @@ import {
 import {File} from "../../../../../api/models/File";
 import {Selectable} from "../../../../models/Selectable";
 import {SchedulingService} from "../../../../services/scheduling/scheduling.service";
-import {BehaviorSubject} from "rxjs";
 
 const LOADING_WORK_KEY = "FILE_THUMBNAIL_LOADING";
 
@@ -26,7 +25,6 @@ const LOADING_WORK_KEY = "FILE_THUMBNAIL_LOADING";
 export class FileCardComponent implements OnInit, OnChanges, OnDestroy {
 
     @Input() public entry!: Selectable<File>;
-    @Input() public fileChanged: BehaviorSubject<void> = new BehaviorSubject<void>(undefined);
     @Output() clickEvent = new EventEmitter<FileCardComponent>();
     @Output() dblClickEvent = new EventEmitter<FileCardComponent>();
 
@@ -47,9 +45,6 @@ export class FileCardComponent implements OnInit, OnChanges, OnDestroy {
             this.cachedId = this.entry.data.id;
             this.loading = true;
         }
-        if (changes["fileChanged"]) {
-            this.fileChanged.subscribe(() => this.changeDetector.markForCheck());
-        }
     }
 
     public ngOnDestroy(): void {
@@ -62,19 +57,4 @@ export class FileCardComponent implements OnInit, OnChanges, OnDestroy {
         console.debug(this.entry.data.id);
         this.clickEvent.emit(this);
     }
-
-    private setImageDelayed() {
-        if (this.workId) {
-            this.schedulingService.cancelWork(LOADING_WORK_KEY, this.workId);
-        }
-        this.loading = true;
-        this.workId = this.schedulingService.addWork(
-            LOADING_WORK_KEY,
-            async () => {
-                await this.schedulingService.delay(0);
-                this.loading = false;
-                this.changeDetector.markForCheck();
-            }
-        );
-    }
 }
diff --git a/mediarepo-ui/src/app/components/shared/file/file-context-menu/file-context-menu.component.ts b/mediarepo-ui/src/app/components/shared/file/file-context-menu/file-context-menu.component.ts
index 90a2151..1b4a3e7 100644
--- a/mediarepo-ui/src/app/components/shared/file/file-context-menu/file-context-menu.component.ts
+++ b/mediarepo-ui/src/app/components/shared/file/file-context-menu/file-context-menu.component.ts
@@ -60,11 +60,11 @@ export class FileContextMenuComponent extends FileActionBaseComponent implements
         this.actionDelete = this.actionArchive = this.actionImported = this.actionRestore = false;
 
         for (const file of this.files) {
-            this.actionDeletePermantently &&= file.status === "Deleted";
-            this.actionDelete ||= file.status !== "Deleted";
-            this.actionArchive ||= file.status !== "Archived" && file.status !== "Deleted";
-            this.actionImported ||= file.status !== "Imported" && file.status !== "Deleted";
-            this.actionRestore ||= file.status === "Deleted";
+            this.actionDeletePermantently &&= file.getStatus() === "Deleted";
+            this.actionDelete ||= file.getStatus() !== "Deleted";
+            this.actionArchive ||= file.getStatus() !== "Archived" && file.getStatus() !== "Deleted";
+            this.actionImported ||= file.getStatus() !== "Imported" && file.getStatus() !== "Deleted";
+            this.actionRestore ||= file.getStatus() === "Deleted";
         }
     }
 }
diff --git a/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery.component.html b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery.component.html
index 281b9bc..ed3abbc 100644
--- a/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery.component.html
+++ b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery.component.html
@@ -24,11 +24,10 @@
         <div #previewStripContainer class="file-preview-strip-container">
             <div *ngFor="let entry of this.previewedEntries; trackBy: trackByFileId" class="file-item">
                 <app-file-card (clickEvent)="onEntrySelect($event.entry)" *ngIf="entry"
-                               [entry]="entry" [fileChanged]="this.fileChanged"></app-file-card>
+                               [entry]="entry"></app-file-card>
             </div>
         </div>
     </div>
 </div>
 <app-file-context-menu #fileContextMenu
-                       (fileDeleted)="this.fileDeleted.emit($event)"
-                       (fileStatusChange)="this.onFileStatusChange()"></app-file-context-menu>
+                       (fileDeleted)="this.fileDeleted.emit($event)"></app-file-context-menu>
diff --git a/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery.component.ts b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery.component.ts
index 963006d..4e93fe8 100644
--- a/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery.component.ts
+++ b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-gallery/file-gallery.component.ts
@@ -19,7 +19,6 @@ import {SafeResourceUrl} from "@angular/platform-browser";
 import {Selectable} from "../../../../../models/Selectable";
 import {TabService} from "../../../../../services/tab/tab.service";
 import {Key} from "w3c-keys";
-import {BehaviorSubject} from "rxjs";
 
 @Component({
     selector: "app-file-gallery",
@@ -43,7 +42,6 @@ export class FileGalleryComponent implements OnChanges, OnInit, AfterViewInit, A
     public entries: Selectable<File>[] = [];
     public selectedFile: Selectable<File> | undefined;
     public fileContentUrl: SafeResourceUrl | undefined;
-    public fileChanged = new BehaviorSubject<void>(undefined);
 
     public selectedIndex = 0;
     public imageViewHeightPercent = 80;
@@ -182,10 +180,6 @@ export class FileGalleryComponent implements OnChanges, OnInit, AfterViewInit, A
         return item?.data.id;
     }
 
-    public onFileStatusChange(): void {
-        this.fileChanged.next();
-    }
-
     public togglePreviewStrip(): void {
         if (this.previewStripVisible) {
             this.imageViewHeightPercent = 100;
diff --git a/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.html b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.html
index 19a4afd..94afd4d 100644
--- a/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.html
+++ b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.html
@@ -14,7 +14,7 @@
                         (contextmenu)="this.selectEntryWhenNotSelected(gridEntry); fileContextMenu.onContextMenu($event, this.getSelectedFiles())"
                         (dblClickEvent)="fileOpen.emit($event.entry.data)"
                         *ngIf="gridEntry"
-                        [entry]="gridEntry" [fileChanged]="this.fileChanged"></app-file-card>
+                        [entry]="gridEntry"></app-file-card>
                     <div *ngIf="!gridEntry" class="empty-grid-entry"></div>
                 </ng-container>
             </div>
@@ -23,8 +23,7 @@
 
 </div>
 <app-file-context-menu #fileContextMenu
-                       (fileDeleted)="this.fileDeleted.emit($event)"
-                       (fileStatusChange)="this.onFileStatusChange()">
+                       (fileDeleted)="this.fileDeleted.emit($event)">
     <button (click)="this.fileOpen.emit(fileContextMenu.files[0])"
             *ngIf="fileContextMenu.files.length === 1"
             content-before=""
diff --git a/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.ts b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.ts
index d9e1f30..90f21bc 100644
--- a/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.ts
+++ b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.ts
@@ -20,7 +20,6 @@ import {TabService} from "../../../../../services/tab/tab.service";
 import {FileService} from "../../../../../services/file/file.service";
 import {Selectable} from "../../../../../models/Selectable";
 import {Key} from "w3c-keys";
-import {BehaviorSubject} from "rxjs";
 import {LoggingService} from "../../../../../services/logging/logging.service";
 
 @Component({
@@ -41,7 +40,6 @@ export class FileGridComponent implements OnChanges, OnInit, AfterViewInit, Afte
     @ViewChild("virtualScrollGrid") virtualScroll!: CdkVirtualScrollViewport;
     @ViewChild("inner") inner!: ElementRef<HTMLDivElement>;
 
-    public fileChanged = new BehaviorSubject<void>(undefined);
     public selectedEntries: Selectable<File>[] = [];
     public partitionedGridEntries: (Selectable<File> | undefined)[][] = [];
 
@@ -195,10 +193,6 @@ export class FileGridComponent implements OnChanges, OnInit, AfterViewInit, Afte
         return item?.data.id;
     }
 
-    public onFileStatusChange(): void {
-        this.fileChanged.next();
-    }
-
     public calculateColumnCount() {
         if (this.inner && this.inner.nativeElement) {
             const width = Math.abs(this.inner.nativeElement.clientWidth);
diff --git a/mediarepo-ui/src/app/components/shared/file/file-multiview/file-multiview.component.ts b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-multiview.component.ts
index 8a69d99..6f1573e 100644
--- a/mediarepo-ui/src/app/components/shared/file/file-multiview/file-multiview.component.ts
+++ b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-multiview.component.ts
@@ -71,7 +71,7 @@ export class FileMultiviewComponent extends FileActionBaseComponent implements A
         let deletePermanently = true;
 
         for (const file of files) {
-            deletePermanently &&= file.status === "Deleted";
+            deletePermanently &&= file.getStatus() === "Deleted";
         }
 
         if (deletePermanently) {
diff --git a/mediarepo-ui/src/app/components/shared/file/file-thumbnail/file-thumbnail.component.html b/mediarepo-ui/src/app/components/shared/file/file-thumbnail/file-thumbnail.component.html
index 7ed00dc..4c53dda 100644
--- a/mediarepo-ui/src/app/components/shared/file/file-thumbnail/file-thumbnail.component.html
+++ b/mediarepo-ui/src/app/components/shared/file/file-thumbnail/file-thumbnail.component.html
@@ -13,7 +13,7 @@
     <ng-icon *ngIf="fileType === 'audio'" name="mat-audiotrack"></ng-icon>
     <ng-icon *ngIf="fileType === 'text'" name="mat-description"></ng-icon>
 </div>
-<div *ngIf="file.status !== 'Archived'" class="file-status-icon">
-    <ng-icon *ngIf="file.status === 'Deleted'" name="mat-auto-delete"></ng-icon>
-    <ng-icon *ngIf="file.status === 'Imported'" name="mat-fiber-new"></ng-icon>
+<div *ngIf="(file.status | async) !== 'Archived'" class="file-status-icon">
+    <ng-icon *ngIf="(file.status | async) === 'Deleted'" name="mat-auto-delete"></ng-icon>
+    <ng-icon *ngIf="(file.status | async) === 'Imported'" name="mat-fiber-new"></ng-icon>
 </div>
diff --git a/mediarepo-ui/src/app/components/shared/file/file-thumbnail/file-thumbnail.component.ts b/mediarepo-ui/src/app/components/shared/file/file-thumbnail/file-thumbnail.component.ts
index 63888b1..af29ef3 100644
--- a/mediarepo-ui/src/app/components/shared/file/file-thumbnail/file-thumbnail.component.ts
+++ b/mediarepo-ui/src/app/components/shared/file/file-thumbnail/file-thumbnail.component.ts
@@ -1,5 +1,4 @@
 import {
-    AfterViewChecked,
     AfterViewInit,
     ChangeDetectionStrategy,
     ChangeDetectorRef,
@@ -14,7 +13,6 @@ import {File} from "../../../../../api/models/File";
 import {FileService} from "../../../../services/file/file.service";
 import {FileHelper} from "../../../../services/file/file.helper";
 import {SafeResourceUrl} from "@angular/platform-browser";
-import {BehaviorSubject} from "rxjs";
 
 @Component({
     selector: "app-file-thumbnail",
@@ -22,10 +20,9 @@ import {BehaviorSubject} from "rxjs";
     styleUrls: ["./file-thumbnail.component.scss"],
     changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class FileThumbnailComponent implements OnChanges, AfterViewInit, AfterViewChecked {
+export class FileThumbnailComponent implements OnChanges, AfterViewInit {
 
     @Input() file!: File;
-    @Input() public fileChanged: BehaviorSubject<void> = new BehaviorSubject<void>(undefined);
     @Output() loadEnd = new EventEmitter<void>();
 
     public thumbUrl: SafeResourceUrl | undefined;
@@ -34,7 +31,6 @@ export class FileThumbnailComponent implements OnChanges, AfterViewInit, AfterVi
     public displayError = false;
 
     private supportedThumbnailTypes = ["image", "video"];
-    private previousStatus = "imported";
 
     constructor(private changeDetector: ChangeDetectorRef, private fileService: FileService) {
     }
@@ -45,13 +41,6 @@ export class FileThumbnailComponent implements OnChanges, AfterViewInit, AfterVi
         }
     }
 
-    public ngAfterViewChecked(): void {
-        if (this.file && this.file.status != this.previousStatus) {
-            this.previousStatus = this.file.status;
-            this.changeDetector.markForCheck();
-        }
-    }
-
     public async ngOnChanges(changes: SimpleChanges) {
         if (changes["file"]) {
             this.thumbUrl = this.fileService.buildThumbnailUrl(this.file,
@@ -61,9 +50,6 @@ export class FileThumbnailComponent implements OnChanges, AfterViewInit, AfterVi
             this.thumbnailSupported = this.getThumbnailSupported();
             this.displayError = false;
         }
-        if (changes["fileChanged"]) {
-            this.fileChanged.subscribe(() => this.changeDetector.markForCheck());
-        }
     }
 
     public onImageLoadError(): void {

From a94cc48a5cab7a95d60edfac965808ccb580b979 Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Sun, 20 Feb 2022 14:08:03 +0100
Subject: [PATCH 5/7] Fix file selection dialog extensions only filtering
 lowercase

TG-108 #closed

Signed-off-by: trivernis <trivernis@protonmail.com>
---
 .../filesystem-import.component.ts            | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.ts
index 59bef6c..bc3a247 100644
--- a/mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.ts
+++ b/mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.ts
@@ -6,6 +6,12 @@ import {DialogFilter} from "@tauri-apps/api/dialog";
 import {FileOsMetadata} from "../../../../../../api/api-types/files";
 import {ImportTabState} from "../../../../../models/state/ImportTabState";
 
+const IMAGE_EXTENSIONS = ["png", "jpg", "jpeg", "webp", "bmp", "gif"];
+const VIDEO_EXTENSIONS = ["mp4", "mkv", "wmv", "avi", "webm"];
+const AUDIO_EXTENSIONS = ["mp3", "ogg", "wav", "flac", "aac"];
+const DOCUMENT_EXTENSIONS = ["pdf", "doc", "docx", "odf"];
+const TEXT_EXTENSIONS = ["txt", "md"];
+
 @Component({
     selector: "app-filesystem-import",
     templateUrl: "./filesystem-import.component.html",
@@ -20,14 +26,11 @@ export class FilesystemImportComponent implements OnInit {
     public files: FileOsMetadata[] = [];
     public importOptions = new AddFileOptions();
     public filters: DialogFilter[] = [
-        {
-            name: "Images",
-            extensions: ["png", "jpg", "jpeg", "webp", "bmp", "gif"]
-        },
-        { name: "Videos", extensions: ["mp4", "mkv", "wmv", "avi", "webm"] },
-        { name: "Audio", extensions: ["mp3", "ogg", "wav", "flac", "aac"] },
-        { name: "Documents", extensions: ["pdf", "doc", "docx", "odf"] },
-        { name: "Text", extensions: ["txt", "md"] },
+        { name: "Images", extensions: [...IMAGE_EXTENSIONS, ...IMAGE_EXTENSIONS.map(e => e.toUpperCase())] },
+        { name: "Videos", extensions: [...VIDEO_EXTENSIONS, ...VIDEO_EXTENSIONS.map(e => e.toUpperCase())] },
+        { name: "Audio", extensions: [...AUDIO_EXTENSIONS, ...AUDIO_EXTENSIONS.map(e => e.toUpperCase())] },
+        { name: "Documents", extensions: [...DOCUMENT_EXTENSIONS, ...DOCUMENT_EXTENSIONS.map(e => e.toUpperCase())] },
+        { name: "Text", extensions: [...TEXT_EXTENSIONS, ...TEXT_EXTENSIONS.map(e => e.toUpperCase())] },
         { name: "All", extensions: ["*"] }
     ];
 

From 179dcf0d4e69fe0761fb701dd098ffb1b12a5997 Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Sun, 20 Feb 2022 14:31:36 +0100
Subject: [PATCH 6/7] Delete orphaned tags

TG-109 #ready-for-test

Signed-off-by: trivernis <trivernis@protonmail.com>
---
 .../mediarepo-logic/src/dao/tag/mappings.rs   | 40 ++++++++++++++++++-
 .../sidebar/tag-edit/tag-edit.component.html  |  2 +-
 .../sidebar/tag-edit/tag-edit.component.ts    | 15 ++++---
 3 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/mediarepo-daemon/mediarepo-logic/src/dao/tag/mappings.rs b/mediarepo-daemon/mediarepo-logic/src/dao/tag/mappings.rs
index ac9f26c..2289c1f 100644
--- a/mediarepo-daemon/mediarepo-logic/src/dao/tag/mappings.rs
+++ b/mediarepo-daemon/mediarepo-logic/src/dao/tag/mappings.rs
@@ -1,9 +1,10 @@
 use sea_orm::prelude::*;
+use sea_orm::sea_query::Query;
 use sea_orm::ActiveValue::Set;
 use sea_orm::{DatabaseTransaction, TransactionTrait};
 
 use mediarepo_core::error::RepoResult;
-use mediarepo_database::entities::content_descriptor_tag;
+use mediarepo_database::entities::{content_descriptor_tag, namespace, tag};
 
 use crate::dao::tag::TagDao;
 
@@ -41,11 +42,15 @@ impl TagDao {
 
     #[tracing::instrument(level = "debug", skip(self))]
     pub async fn remove_mappings(&self, cd_ids: Vec<i64>, tag_ids: Vec<i64>) -> RepoResult<()> {
+        let trx = self.ctx.db.begin().await?;
         content_descriptor_tag::Entity::delete_many()
             .filter(content_descriptor_tag::Column::CdId.is_in(cd_ids))
             .filter(content_descriptor_tag::Column::TagId.is_in(tag_ids))
-            .exec(&self.ctx.db)
+            .exec(&trx)
             .await?;
+        delete_orphans(&trx).await?;
+
+        trx.commit().await?;
 
         Ok(())
     }
@@ -66,3 +71,34 @@ async fn get_existing_mappings(
         .collect();
     Ok(existing_mappings)
 }
+
+/// Deletes orphaned tag entries and namespaces from the database
+async fn delete_orphans(trx: &DatabaseTransaction) -> RepoResult<()> {
+    tag::Entity::delete_many()
+        .filter(
+            tag::Column::Id.not_in_subquery(
+                Query::select()
+                    .column(content_descriptor_tag::Column::TagId)
+                    .from(content_descriptor_tag::Entity)
+                    .group_by_col(content_descriptor_tag::Column::TagId)
+                    .to_owned(),
+            ),
+        )
+        .exec(trx)
+        .await?;
+
+    namespace::Entity::delete_many()
+        .filter(
+            namespace::Column::Id.not_in_subquery(
+                Query::select()
+                    .column(tag::Column::NamespaceId)
+                    .from(tag::Entity)
+                    .group_by_col(tag::Column::NamespaceId)
+                    .to_owned(),
+            ),
+        )
+        .exec(trx)
+        .await?;
+
+    Ok(())
+}
diff --git a/mediarepo-ui/src/app/components/shared/sidebar/tag-edit/tag-edit.component.html b/mediarepo-ui/src/app/components/shared/sidebar/tag-edit/tag-edit.component.html
index b7f2b84..b7cb849 100644
--- a/mediarepo-ui/src/app/components/shared/sidebar/tag-edit/tag-edit.component.html
+++ b/mediarepo-ui/src/app/components/shared/sidebar/tag-edit/tag-edit.component.html
@@ -18,7 +18,7 @@
     <div class="tag-input" fxFlex="200px">
         <div class="tag-input-field">
             <app-tag-input (tagAdded)="this.editTag($event)" [allowInvalid]="true"
-                           [availableTags]="this.allTags"></app-tag-input>
+                           [availableTags]="(this.allTags | async) ?? []"></app-tag-input>
             <button class="add-tag-button" mat-icon-button>
                 <ng-icon *ngIf="editMode === 'Toggle'" name="mat-change-circle"></ng-icon>
                 <ng-icon *ngIf="editMode === 'Add'" name="mat-add-circle"></ng-icon>
diff --git a/mediarepo-ui/src/app/components/shared/sidebar/tag-edit/tag-edit.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/tag-edit/tag-edit.component.ts
index 039a155..2f4522c 100644
--- a/mediarepo-ui/src/app/components/shared/sidebar/tag-edit/tag-edit.component.ts
+++ b/mediarepo-ui/src/app/components/shared/sidebar/tag-edit/tag-edit.component.ts
@@ -16,6 +16,7 @@ import {CdkVirtualScrollViewport} from "@angular/cdk/scrolling";
 import {TagService} from "../../../../services/tag/tag.service";
 import {LoggingService} from "../../../../services/logging/logging.service";
 import {BusyIndicatorComponent} from "../../app-common/busy-indicator/busy-indicator.component";
+import {Observable} from "rxjs";
 
 @Component({
     selector: "app-tag-edit",
@@ -32,7 +33,7 @@ export class TagEditComponent implements AfterViewInit, OnChanges {
     @ViewChild(BusyIndicatorComponent) busyIndicator!: BusyIndicatorComponent;
 
     public tags: Tag[] = [];
-    public allTags: Tag[] = [];
+    public allTags: Observable<Tag[]>;
     public editMode: string = "Toggle";
     private fileTags: { [key: number]: Tag[] } = {};
 
@@ -41,10 +42,10 @@ export class TagEditComponent implements AfterViewInit, OnChanges {
         private logger: LoggingService,
         private tagService: TagService,
     ) {
+        this.allTags = tagService.tags.asObservable();
     }
 
     async ngAfterViewInit() {
-        this.tagService.tags.subscribe(tags => this.allTags = tags);
         await this.tagService.loadTags();
         await this.tagService.loadNamespaces();
         await this.loadFileTags();
@@ -58,12 +59,12 @@ export class TagEditComponent implements AfterViewInit, OnChanges {
 
     public async editTag(tag: string): Promise<void> {
         if (tag.length > 0) {
-            let tagInstance = this.allTags.find(
+            let tagInstance = this.tagService.tags.value.find(
                 t => t.getNormalizedOutput() === tag);
 
             if (!tagInstance) {
                 tagInstance = (await this.tagService.createTags([tag]))[0];
-                this.allTags.push(tagInstance);
+                this.tagService.tags.next([...this.tagService.tags.value, tagInstance]);
             }
             this.changeDetector.markForCheck();
             switch (this.editMode) {
@@ -95,11 +96,13 @@ export class TagEditComponent implements AfterViewInit, OnChanges {
                     file.id,
                     addedTags, removedTags
                 );
+
                 if (addedTags.length > 0) {
                     await this.tagService.loadTags();
-                    await this.tagService.loadNamespaces();
                 }
             }
+            await this.tagService.loadTags();
+            await this.tagService.loadNamespaces();
             this.mapFileTagsToTagList();
             const index = this.tags.indexOf(tag);
             if (index >= 0) {
@@ -142,6 +145,8 @@ export class TagEditComponent implements AfterViewInit, OnChanges {
                     );
                 }
             }
+            await this.tagService.loadTags();
+            await this.tagService.loadNamespaces();
             this.mapFileTagsToTagList();
         });
         this.tagEditEvent.emit(this);

From 18546eaabb8ae003d17219ee8f4a9037e9d84097 Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Sun, 20 Feb 2022 15:05:40 +0100
Subject: [PATCH 7/7] Increment version

Signed-off-by: trivernis <trivernis@protonmail.com>
---
 mediarepo-daemon/Cargo.lock       | 2 +-
 mediarepo-daemon/Cargo.toml       | 2 +-
 mediarepo-ui/package.json         | 2 +-
 mediarepo-ui/src-tauri/Cargo.lock | 2 +-
 mediarepo-ui/src-tauri/Cargo.toml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mediarepo-daemon/Cargo.lock b/mediarepo-daemon/Cargo.lock
index f18bf7e..ce0fcff 100644
--- a/mediarepo-daemon/Cargo.lock
+++ b/mediarepo-daemon/Cargo.lock
@@ -1395,7 +1395,7 @@ dependencies = [
 
 [[package]]
 name = "mediarepo-daemon"
-version = "1.0.0-rc.4"
+version = "1.0.0"
 dependencies = [
  "console-subscriber",
  "glob",
diff --git a/mediarepo-daemon/Cargo.toml b/mediarepo-daemon/Cargo.toml
index 7700298..97df94e 100644
--- a/mediarepo-daemon/Cargo.toml
+++ b/mediarepo-daemon/Cargo.toml
@@ -4,7 +4,7 @@ default-members = ["mediarepo-core", "mediarepo-database", "mediarepo-logic", "m
 
 [package]
 name = "mediarepo-daemon"
-version = "1.0.0-rc.4"
+version = "1.0.0"
 edition = "2018"
 license = "gpl-3"
 repository = "https://github.com/Trivernis/mediarepo-daemon"
diff --git a/mediarepo-ui/package.json b/mediarepo-ui/package.json
index c32a8c9..21c8392 100644
--- a/mediarepo-ui/package.json
+++ b/mediarepo-ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mediarepo-ui",
-    "version": "1.0.0-rc.4",
+    "version": "1.0.0",
     "scripts": {
         "ng": "ng",
         "start": "ng serve",
diff --git a/mediarepo-ui/src-tauri/Cargo.lock b/mediarepo-ui/src-tauri/Cargo.lock
index 25b9158..37eaf8b 100644
--- a/mediarepo-ui/src-tauri/Cargo.lock
+++ b/mediarepo-ui/src-tauri/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0"
 
 [[package]]
 name = "app"
-version = "1.0.0-rc.4"
+version = "1.0.0"
 dependencies = [
  "mediarepo-api",
  "serde",
diff --git a/mediarepo-ui/src-tauri/Cargo.toml b/mediarepo-ui/src-tauri/Cargo.toml
index d5827af..471b3ed 100644
--- a/mediarepo-ui/src-tauri/Cargo.toml
+++ b/mediarepo-ui/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "app"
-version = "1.0.0-rc.4"
+version = "1.0.0"
 description = "The UI for the mediarepo media management tool"
 authors = ["you"]
 license = ""