Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign

# Conflicts:
#	frontend/package-lock.json
#	frontend/src/app/_elements/folder/folder.component.ts
#	frontend/src/app/_elements/form-model/form-model.component.html

1 files changed, 13 insertions, 18 deletions

diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index 39412826..d8a3f037 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -10,6 +10,7 @@ import Experiment from 'src/app/_data/Experiment';
 import { ExperimentsService } from 'src/app/_services/experiments.service';
 import { PredictorsService } from 'src/app/_services/predictors.service';
 import { SignalRService } from 'src/app/_services/signal-r.service';
+import { FormModelComponent } from '../form-model/form-model.component';
 
 @Component({
   selector: 'app-folder',
@@ -18,15 +19,16 @@ import { SignalRService } from 'src/app/_services/signal-r.service';
 })
 export class FolderComponent implements AfterViewInit {
 
-  @ViewChild(FormDatasetComponent) formDataset?: FormDatasetComponent;
+  @ViewChild(FormDatasetComponent) formDataset!: FormDatasetComponent;
+  @ViewChild(FormModelComponent) formModel!: FormModelComponent;
 
   @Input() folderName: string = 'Moji podaci';
   @Input() files!: FolderFile[]
 
-  newFile!: Dataset | Model;
+  newFile?: Dataset | Model;
 
   @Input() type: FolderType = FolderType.Dataset;
-  @Input() forExperiment?: Experiment;
+  @Input() forExperiment!: Experiment;
   @Input() startingTab: TabType = TabType.MyDatasets;
 
   newFileSelected: boolean = true;
@@ -43,12 +45,11 @@ export class FolderComponent implements AfterViewInit {
   searchTerm: string = '';
 
   constructor(private datasetsService: DatasetsService, private experimentsService: ExperimentsService, private modelsService: ModelsService, private predictorsService: PredictorsService, private signalRService: SignalRService) {
-    //PLACEHOLDER
-    this.forExperiment = new Experiment();
-    this.forExperiment.inputColumns = ['kolona1', 'kol2', '???', 'test'];
+    this.tabsToShow.forEach(tab => this.folders[tab] = []);
 
-    this.folders[TabType.File] = [];
-    this.folders[TabType.NewFile] = [];
+    this.files = [];
+    this.filteredFiles = []
+    this.selectTab(this.startingTab);
   }
 
   ngAfterViewInit(): void {
@@ -64,11 +65,11 @@ export class FolderComponent implements AfterViewInit {
     }
   }
 
-  _initialized = false;
-
   displayFile() {
     if (this.type == FolderType.Dataset)
-      this.formDataset!.dataset = <Dataset>this.fileToDisplay;
+      this.formDataset.dataset = <Dataset>this.fileToDisplay;
+    else if (this.type == FolderType.Model)
+      this.formModel.newModel = <Model>this.fileToDisplay;
   }
 
   hoverOverFile(i: number) {
@@ -150,12 +151,7 @@ export class FolderComponent implements AfterViewInit {
       this.folders[TabType.MyExperiments] = experiments;
     });
 
-    if (!this._initialized) {
-      this.selectTab(this.startingTab);
-      this._initialized = true;
-    }
-    else
-      this.searchTermsChanged();
+    this.searchTermsChanged();
   }
 
   saveNewFile() {
@@ -240,7 +236,6 @@ export class FolderComponent implements AfterViewInit {
 
   selectTab(tab: TabType) {
     if (tab == TabType.NewFile) {
-
       this.selectNewFile();
     }