From d7e477efb8094f903a98e824c44717bb1f26bd86 Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Sat, 27 Nov 2021 12:56:16 +0100
Subject: [PATCH] Move import sidebar to sidebar module

Signed-off-by: trivernis <trivernis@protonmail.com>
---
 .../src/app/components/core/core.module.ts    |  5 ++--
 .../import-tab-sidebar.component.html         | 16 +-----------
 .../import-tab-sidebar.component.scss         | 23 -----------------
 .../file-import/file-import.component.html    | 15 +++++++++++
 .../file-import/file-import.component.scss    | 22 ++++++++++++++++
 .../file-import/file-import.component.spec.ts | 25 +++++++++++++++++++
 .../file-import/file-import.component.ts      | 16 ++++++++++++
 .../filesystem-import.component.html          |  0
 .../filesystem-import.component.scss          |  0
 .../filesystem-import.component.spec.ts       |  0
 .../filesystem-import.component.ts            |  0
 .../shared/sidebar/sidebar.module.ts          | 11 +++++++-
 12 files changed, 91 insertions(+), 42 deletions(-)
 create mode 100644 mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.html
 create mode 100644 mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.scss
 create mode 100644 mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.spec.ts
 create mode 100644 mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.ts
 rename mediarepo-ui/src/app/components/{core/import-tab/import-tab-sidebar => shared/sidebar/file-import}/filesystem-import/filesystem-import.component.html (100%)
 rename mediarepo-ui/src/app/components/{core/import-tab/import-tab-sidebar => shared/sidebar/file-import}/filesystem-import/filesystem-import.component.scss (100%)
 rename mediarepo-ui/src/app/components/{core/import-tab/import-tab-sidebar => shared/sidebar/file-import}/filesystem-import/filesystem-import.component.spec.ts (100%)
 rename mediarepo-ui/src/app/components/{core/import-tab/import-tab-sidebar => shared/sidebar/file-import}/filesystem-import/filesystem-import.component.ts (100%)

diff --git a/mediarepo-ui/src/app/components/core/core.module.ts b/mediarepo-ui/src/app/components/core/core.module.ts
index 1430513..045ebbb 100644
--- a/mediarepo-ui/src/app/components/core/core.module.ts
+++ b/mediarepo-ui/src/app/components/core/core.module.ts
@@ -6,7 +6,7 @@ import {FilesTabComponent} from "./files-tab/files-tab.component";
 import {FilesTabSidebarComponent} from "./files-tab/files-tab-sidebar/files-tab-sidebar.component";
 import {ImportTabComponent} from "./import-tab/import-tab.component";
 import {ImportTabSidebarComponent} from "./import-tab/import-tab-sidebar/import-tab-sidebar.component";
-import {FilesystemImportComponent} from "./import-tab/import-tab-sidebar/filesystem-import/filesystem-import.component";
+import {FilesystemImportComponent} from "../shared/sidebar/file-import/filesystem-import/filesystem-import.component";
 import {MatButtonModule} from "@angular/material/button";
 import {MatSidenavModule} from "@angular/material/sidenav";
 import {MatProgressBarModule} from "@angular/material/progress-bar";
@@ -43,12 +43,11 @@ import {TagModule} from "../shared/tag/tag.module";
         FilesTabSidebarComponent,
         ImportTabComponent,
         ImportTabSidebarComponent,
-        FilesystemImportComponent,
         RepositoryCardComponent,
         AddRepositoryDialogComponent,
     ],
     exports: [
-        CoreComponent
+        CoreComponent,
     ],
     imports: [
         CommonModule,
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 980e407..069b7f7 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
@@ -1,21 +1,7 @@
 <div class="import-tab-inner">
     <mat-tab-group headerPosition="below">
         <mat-tab label="Import">
-            <div class="import-sidebar-tab-inner" fxLayout="column">
-                <div class="import-type-select-wrapper" fxFlex="6em">
-                    <mat-form-field class="import-type-select">
-                        <mat-label>Import Type</mat-label>
-                        <mat-select value="filesystem">
-                            <mat-option value="filesystem">Filesystem</mat-option>
-                        </mat-select>
-                    </mat-form-field>
-                    <mat-divider></mat-divider>
-                </div>
-                <div class="import-configuration" fxFlex fxFlexFill>
-                    <app-filesystem-import (fileImported)="this.fileImported.emit($event)"
-                                           (importFinished)="importFinished.emit()"></app-filesystem-import>
-                </div>
-            </div>
+            <app-file-import (importFinished)="importFinished.emit($event)" (fileImported)="fileImported.emit($event)"></app-file-import>
         </mat-tab>
     </mat-tab-group>
 </div>
diff --git a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.scss b/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.scss
index 048876d..b6d4f1c 100644
--- a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.scss
+++ b/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/import-tab-sidebar.component.scss
@@ -10,26 +10,3 @@ mat-tab-group, mat-tab {
     height: 100%;
     overflow: hidden;
 }
-
-.import-type-select-wrapper {
-    width: 100%;
-
-    .import-type-select {
-        width: calc(100% - 2em);
-        height: calc(100% - 2em);
-        margin: 1em;
-
-        mat-select {
-            height: 100%;
-        }
-    }
-}
-
-.import-sidebar-tab-inner {
-    width: 100%;
-    height: 100%;
-}
-
-.import-configuration {
-    padding: 1em;
-}
diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.html
new file mode 100644
index 0000000..39a6bad
--- /dev/null
+++ b/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.html
@@ -0,0 +1,15 @@
+<div class="file-import-inner" fxLayout="column">
+    <div class="import-type-select-wrapper" fxFlex="6em">
+        <mat-form-field class="import-type-select">
+            <mat-label>Import Type</mat-label>
+            <mat-select value="filesystem">
+                <mat-option value="filesystem">Filesystem</mat-option>
+            </mat-select>
+        </mat-form-field>
+        <mat-divider></mat-divider>
+    </div>
+    <div class="import-configuration" fxFlex fxFlexFill>
+        <app-filesystem-import (fileImported)="this.fileImported.emit($event)"
+                               (importFinished)="importFinished.emit()"></app-filesystem-import>
+    </div>
+</div>
diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.scss b/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.scss
new file mode 100644
index 0000000..01f4456
--- /dev/null
+++ b/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.scss
@@ -0,0 +1,22 @@
+.import-type-select-wrapper {
+    width: 100%;
+
+    .import-type-select {
+        width: calc(100% - 2em);
+        height: calc(100% - 2em);
+        margin: 1em;
+
+        mat-select {
+            height: 100%;
+        }
+    }
+}
+
+.file-import-inner {
+    width: 100%;
+    height: 100%;
+}
+
+.import-configuration {
+    padding: 1em;
+}
diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.spec.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.spec.ts
new file mode 100644
index 0000000..e28b214
--- /dev/null
+++ b/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FileImportComponent } from './file-import.component';
+
+describe('FileImportComponent', () => {
+  let component: FileImportComponent;
+  let fixture: ComponentFixture<FileImportComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ FileImportComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FileImportComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.ts
new file mode 100644
index 0000000..a6927e4
--- /dev/null
+++ b/mediarepo-ui/src/app/components/shared/sidebar/file-import/file-import.component.ts
@@ -0,0 +1,16 @@
+import {Component, EventEmitter, OnInit, Output} from "@angular/core";
+import {File} from "../../../../models/File";
+
+@Component({
+    selector: "app-file-import",
+    templateUrl: "./file-import.component.html",
+    styleUrls: ["./file-import.component.scss"]
+})
+export class FileImportComponent {
+
+    @Output() fileImported = new EventEmitter<File>();
+    @Output() importFinished = new EventEmitter<void>();
+
+    constructor() {
+    }
+}
diff --git a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/filesystem-import/filesystem-import.component.html b/mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.html
similarity index 100%
rename from mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/filesystem-import/filesystem-import.component.html
rename to mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.html
diff --git a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/filesystem-import/filesystem-import.component.scss b/mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.scss
similarity index 100%
rename from mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/filesystem-import/filesystem-import.component.scss
rename to mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.scss
diff --git a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/filesystem-import/filesystem-import.component.spec.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.spec.ts
similarity index 100%
rename from mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/filesystem-import/filesystem-import.component.spec.ts
rename to mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.spec.ts
diff --git a/mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/filesystem-import/filesystem-import.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.ts
similarity index 100%
rename from mediarepo-ui/src/app/components/core/import-tab/import-tab-sidebar/filesystem-import/filesystem-import.component.ts
rename to mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.ts
diff --git a/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts b/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts
index 5927d6f..f2d08d8 100644
--- a/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts
+++ b/mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts
@@ -21,6 +21,10 @@ import {MatDialogModule} from "@angular/material/dialog";
 import {AppCommonModule} from "../app-common/app-common.module";
 import {DragDropModule} from "@angular/cdk/drag-drop";
 import {TagModule} from "../tag/tag.module";
+import { FileImportComponent } from "./file-import/file-import.component";
+import {FilesystemImportComponent} from "./file-import/filesystem-import/filesystem-import.component";
+import {MatCheckboxModule} from "@angular/material/checkbox";
+import {MatProgressBarModule} from "@angular/material/progress-bar";
 
 
 @NgModule({
@@ -30,10 +34,13 @@ import {TagModule} from "../tag/tag.module";
         TagFilterListItemComponent,
         SortDialogComponent,
         FilterDialogComponent,
+        FileImportComponent,
+        FilesystemImportComponent,
     ],
     exports: [
         FileEditComponent,
-        FileSearchComponent
+        FileSearchComponent,
+        FileImportComponent
     ],
     imports: [
         CommonModule,
@@ -59,6 +66,8 @@ import {TagModule} from "../tag/tag.module";
         AppCommonModule,
         DragDropModule,
         TagModule,
+        MatCheckboxModule,
+        MatProgressBarModule,
     ]
 })
 export class SidebarModule {