2 files changed, 53 insertions, 31 deletions

diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index 3497611e..36f70c97 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -62,8 +62,8 @@
                         <mat-icon>zoom_out_map</mat-icon>
                     </button>
                 </div>
-                <app-form-model [model]="fileToDisplay" [forExperiment]="forExperiment" *ngSwitchCase="FolderType.Model"></app-form-model>
-                <app-form-dataset *ngSwitchCase="FolderType.Dataset"></app-form-dataset>
+                <app-form-model [forExperiment]="forExperiment" [model]="fileToDisplay" *ngSwitchCase="FolderType.Model"></app-form-model>
+                <app-form-dataset *ngSwitchCase="FolderType.Dataset" ></app-form-dataset>
             </div>
             <div *ngSwitchCase="true" class="list-view">
                 <div *ngFor="let file of filteredFiles; let i = index" class="list-item">
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index ecf26355..06b4d893 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -1,11 +1,13 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import Dataset, { ColumnInfo } from 'src/app/_data/Dataset';
-import Experiment from 'src/app/_data/Experiment';
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
+import Dataset from 'src/app/_data/Dataset';
 import { FolderFile, FolderType } from 'src/app/_data/FolderFile';
 import Model from 'src/app/_data/Model';
 import { DatasetsService } from 'src/app/_services/datasets.service';
-import { ExperimentsService } from 'src/app/_services/experiments.service';
+import shared from 'src/app/Shared';
 import { ModelsService } from 'src/app/_services/models.service';
+import { FormDatasetComponent } from '../form-dataset/form-dataset.component';
+import Experiment from 'src/app/_data/Experiment';
+import { ExperimentsService } from 'src/app/_services/experiments.service';
 import { PredictorsService } from 'src/app/_services/predictors.service';
 
 @Component({
@@ -15,6 +17,8 @@ import { PredictorsService } from 'src/app/_services/predictors.service';
 })
 export class FolderComponent implements OnInit {
 
+  @ViewChild(FormDatasetComponent) formDataset?: FormDatasetComponent;
+
   @Input() folderName: string = 'Moji podaci';
 
   @Input() files!: FolderFile[]
@@ -46,31 +50,9 @@ export class FolderComponent implements OnInit {
     this.folders[TabType.File] = [];
     this.folders[TabType.NewFile] = [];
 
-    this.datasetsService.getMyDatasets().subscribe((datasets) => {
-      this.folders[TabType.MyDatasets] = datasets;
-    });
-
-    this.datasetsService.getPublicDatasets().subscribe((datasets) => {
-      this.folders[TabType.PublicDatasets] = datasets;
-    });
-
-    this.modelsService.getMyModels().subscribe((models) => {
-      this.folders[TabType.MyModels] = models;
-    });
+    this.refreshFiles();
 
-    /*this.modelsService.getMyModels().subscribe((models) => {
-      this.folders[TabType.PublicModels] = models;
-    });*/
-    this.folders[TabType.PublicModels] = [];
-
-    this.experimentsService.getMyExperiments().subscribe((experiments) => {
-      this.folders[TabType.MyExperiments] = experiments;
-    });
-
-    this.files = [];
-
-    this.filteredFiles.length = 0;
-    this.filteredFiles.push(...this.files);
+    
   }
 
   ngOnInit(): void {
@@ -81,6 +63,11 @@ export class FolderComponent implements OnInit {
     }
   }
 
+  displayFile(){
+    if(this.type == FolderType.Dataset)
+      this.formDataset!.dataset = <Dataset>this.fileToDisplay;
+  }
+
   hoverOverFile(i: number) {
     this.hoveringOverFileIndex = i;
     if (i != -1) {
@@ -92,6 +79,7 @@ export class FolderComponent implements OnInit {
         this.fileToDisplay = this.files[this.selectedFileIndex];
       }
     }
+    this.displayFile();
   }
 
   selectNewFile() {
@@ -103,6 +91,7 @@ export class FolderComponent implements OnInit {
     this.newFileSelected = true;
     this.listView = false;
     this.selectedFileChanged.emit(this.newFile);
+    this.displayFile();
   }
 
   selectFile(index: number) {
@@ -111,6 +100,7 @@ export class FolderComponent implements OnInit {
     this.newFileSelected = false;
     this.listView = false;
     this.selectedFileChanged.emit(this.selectedFile);
+    this.displayFile();
   }
 
   createNewFile() {
@@ -125,8 +115,40 @@ export class FolderComponent implements OnInit {
     this.okPressed.emit();
   }
 
+  refreshFiles(){
+    this.datasetsService.getMyDatasets().subscribe((datasets) => {
+      this.folders[TabType.MyDatasets] = datasets;
+    });
+
+    this.datasetsService.getPublicDatasets().subscribe((datasets) => {
+      this.folders[TabType.PublicDatasets] = datasets;
+    });
+
+    this.modelsService.getMyModels().subscribe((models) => {
+      this.folders[TabType.MyModels] = models;
+    });
+
+    /*this.modelsService.getMyModels().subscribe((models) => {
+      this.folders[TabType.PublicModels] = models;
+    });*/
+    this.folders[TabType.PublicModels] = [];
+
+    this.experimentsService.getMyExperiments().subscribe((experiments) => {
+      this.folders[TabType.MyExperiments] = experiments;
+    });
+
+    this.files = [];
+
+    this.filteredFiles.length = 0;
+    this.filteredFiles.push(...this.files);
+
+    this.searchTermsChanged();
+
+  }
+
   saveNewFile() {
-    // TODO
+    if(this.type == FolderType.Dataset)
+      this.formDataset!.uploadDataset();
   }
 
   /*calcZIndex(i: number) {