From 628d1d92add5bdd82e812da00dbc6dc88755a9de Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 27 Nov 2021 13:02:25 +0100 Subject: [PATCH] Add tag editing to import tab and remove name editing Signed-off-by: trivernis --- .../files-tab-sidebar/files-tab-sidebar.component.html | 2 +- .../import-tab-sidebar/import-tab-sidebar.component.html | 3 +++ .../import-tab-sidebar/import-tab-sidebar.component.ts | 3 ++- .../components/core/import-tab/import-tab.component.html | 4 ++-- .../components/core/import-tab/import-tab.component.ts | 5 +++++ .../shared/sidebar/file-edit/file-edit.component.html | 9 +++------ .../shared/sidebar/file-edit/file-edit.component.scss | 9 ++++++++- 7 files changed, 24 insertions(+), 11 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 2d02289..37ad35c 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 @@ -24,7 +24,7 @@ - + diff --git a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.html b/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.html index 069b7f7..56bd5fd 100644 --- a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.html +++ b/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.html @@ -3,5 +3,8 @@ + + + diff --git a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.ts b/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.ts index 6391e1f..af49e8f 100644 --- a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.ts +++ b/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.ts @@ -1,4 +1,4 @@ -import {Component, EventEmitter, Output} from "@angular/core"; +import {Component, EventEmitter, Input, Output} from "@angular/core"; import {File} from "../../../../models/File"; @Component({ @@ -8,6 +8,7 @@ import {File} from "../../../../models/File"; }) export class ImportTabSidebarComponent { + @Input() selectedFiles: File[] = []; @Output() fileImported = new EventEmitter(); @Output() importFinished = new EventEmitter(); diff --git a/mediarepo-ui/src/app/components/core/import-tab/import-tab.component.html b/mediarepo-ui/src/app/components/core/import-tab/import-tab.component.html index 6fcb2a2..ce69129 100644 --- a/mediarepo-ui/src/app/components/core/import-tab/import-tab.component.html +++ b/mediarepo-ui/src/app/components/core/import-tab/import-tab.component.html @@ -1,9 +1,9 @@ - - + diff --git a/mediarepo-ui/src/app/components/core/import-tab/import-tab.component.ts b/mediarepo-ui/src/app/components/core/import-tab/import-tab.component.ts index 5c71fee..fd49bc7 100644 --- a/mediarepo-ui/src/app/components/core/import-tab/import-tab.component.ts +++ b/mediarepo-ui/src/app/components/core/import-tab/import-tab.component.ts @@ -9,6 +9,7 @@ import {File} from "../../../models/File"; export class ImportTabComponent { public files: File[] = []; + public selectedFiles: File[] = []; constructor() { } @@ -32,4 +33,8 @@ export class ImportTabComponent { public refreshFileView() { this.files = [...this.files]; } + + public onFileSelect(files: File[]) { + this.selectedFiles = files; + } } diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-edit/file-edit.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-edit/file-edit.component.html index 9c982c3..b14f90d 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-edit/file-edit.component.html +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-edit/file-edit.component.html @@ -1,10 +1,7 @@
-