From 2fbc26bb36c79c9b86a8eb9818b85b1c52a16159 Mon Sep 17 00:00:00 2001
From: Danijel Anđelković <adanijel99@gmail.com>
Date: Tue, 3 May 2022 21:24:20 +0200
Subject: Ispravio bug gde se graf nije prikazivao dok se strane ne resize-uje.

---
 .../src/app/_elements/folder/folder.component.html |  2 +-
 .../src/app/_elements/folder/folder.component.ts   | 35 ++++++++--------------
 2 files changed, 14 insertions(+), 23 deletions(-)

(limited to 'frontend/src/app/_elements/folder')

diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index e77f837e..113db616 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -66,7 +66,7 @@
                         <mat-icon>zoom_out_map</mat-icon>
                     </button>
                 </div>
-                <app-form-model [forExperiment]="forExperiment" [model]="fileToDisplay" [ngClass]="{'form-hidden': type != FolderType.Model}"></app-form-model>
+                <app-form-model [ngClass]="{'form-hidden': type != FolderType.Model}"></app-form-model>
                 <app-form-dataset [ngClass]="{'form-hidden': type != FolderType.Dataset}"></app-form-dataset>
             </div>
             <div [ngClass]="{'form-hidden' : !listView}" class="list-view">
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index e0336ded..e92ea468 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -9,6 +9,7 @@ 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';
+import { FormModelComponent } from '../form-model/form-model.component';
 
 @Component({
   selector: 'app-folder',
@@ -17,18 +18,16 @@ import { PredictorsService } from 'src/app/_services/predictors.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;
@@ -45,24 +44,22 @@ export class FolderComponent implements AfterViewInit {
   searchTerm: string = '';
 
   constructor(private datasetsService: DatasetsService, private experimentsService: ExperimentsService, private modelsService: ModelsService, private predictorsService: PredictorsService) {
-    //PLACEHOLDER
-    this.forExperiment = new Experiment();
-    this.forExperiment.inputColumns = ['kolona1', 'kol2', '???', 'test'];
-
-    this.folders[TabType.File] = [];
-    this.folders[TabType.NewFile] = [];
+    this.tabsToShow.forEach(tab => this.folders[tab] = []);
 
+    this.files = [];
+    this.filteredFiles = []
+    this.selectTab(this.startingTab);
   }
 
   ngAfterViewInit(): void {
     this.refreshFiles();
   }
 
-  _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) {
@@ -142,12 +139,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() {
@@ -232,7 +224,6 @@ export class FolderComponent implements AfterViewInit {
 
   selectTab(tab: TabType) {
     if (tab == TabType.NewFile) {
-
       this.selectNewFile();
     }
 
-- 
cgit v1.2.3