Ispravio gresku pri otvaranju folder komponente sa izabranim novim fajlom.

3 files changed, 29 insertions, 24 deletions

diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index e92ea468..b7a2e5d4 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -28,7 +28,7 @@ export class FolderComponent implements AfterViewInit {
 
   @Input() type: FolderType = FolderType.Dataset;
   @Input() forExperiment!: Experiment;
-  @Input() startingTab: TabType = TabType.MyDatasets;
+  @Input() startingTab!: TabType;
 
   newFileSelected: boolean = true;
 
@@ -45,10 +45,6 @@ export class FolderComponent implements AfterViewInit {
 
   constructor(private datasetsService: DatasetsService, private experimentsService: ExperimentsService, private modelsService: ModelsService, private predictorsService: PredictorsService) {
     this.tabsToShow.forEach(tab => this.folders[tab] = []);
-
-    this.files = [];
-    this.filteredFiles = []
-    this.selectTab(this.startingTab);
   }
 
   ngAfterViewInit(): void {
@@ -109,6 +105,8 @@ export class FolderComponent implements AfterViewInit {
     this.okPressed.emit();
   }
 
+  _initialized: boolean = false;
+
   refreshFiles() {
     this.tabsToShow.forEach(tab => {
       this.folders[tab] = [];
@@ -139,6 +137,13 @@ export class FolderComponent implements AfterViewInit {
       this.folders[TabType.MyExperiments] = experiments;
     });
 
+    if (!this._initialized) {
+      this.files = this.folders[this.startingTab];
+      this.filteredFiles = [];
+      this.selectTab(this.startingTab);
+      this._initialized = true;
+    }
+
     this.searchTermsChanged();
   }
 
@@ -169,6 +174,7 @@ export class FolderComponent implements AfterViewInit {
   filteredFiles: FolderFile[] = [];
 
   searchTermsChanged() {
+    if (!this.files) return;
     this.filteredFiles.length = 0;
     this.filteredFiles.push(...this.files.filter((file) => file.name.toLowerCase().includes(this.searchTerm.toLowerCase())));
     /*if (this.selectedFile) {
@@ -223,19 +229,20 @@ export class FolderComponent implements AfterViewInit {
   hoverTab: TabType = TabType.None;
 
   selectTab(tab: TabType) {
-    if (tab == TabType.NewFile) {
-      this.selectNewFile();
-    }
+    setTimeout(() => {
+      if (tab == TabType.NewFile) {
+        this.selectNewFile();
+      }
 
-    this.listView = this.getListView(tab);
-    this.type = this.getFolderType(tab);
-    this.previousPrivacy = this.privacy;
-    this.privacy = this.getPrivacy(tab);
-    this.selectedTab = tab;
-    this.files = this.folders[tab];
+      this.listView = this.getListView(tab);
+      this.type = this.getFolderType(tab);
+      this.privacy = this.getPrivacy(tab);
+      this.selectedTab = tab;
+      this.files = this.folders[tab];
 
-    if (tab !== TabType.File && tab !== TabType.NewFile)
-      this.searchTermsChanged();
+      if (tab !== TabType.File && tab !== TabType.NewFile)
+        this.searchTermsChanged();
+    });
   }
 
   getListView(tab: TabType) {
@@ -270,15 +277,11 @@ export class FolderComponent implements AfterViewInit {
     }
   }
 
-  previousPrivacy: Privacy = Privacy.Private;
-
   getPrivacy(tab: TabType) {
     switch (tab) {
       case TabType.PublicDatasets:
       case TabType.PublicModels:
         return Privacy.Public;
-      case TabType.None:
-        return this.previousPrivacy;
       default:
         return Privacy.Private;
     }
@@ -286,7 +289,6 @@ export class FolderComponent implements AfterViewInit {
 
   hoverOverTab(tab: TabType) {
     this.listView = this.getListView(tab);
-    this.previousPrivacy = this.privacy;
     this.privacy = this.getPrivacy(tab);
     this.hoverTab = tab;
     if (tab == TabType.None) {
diff --git a/frontend/src/app/_elements/graph/graph.component.css b/frontend/src/app/_elements/graph/graph.component.css
index 361e7249..456a8df1 100644
--- a/frontend/src/app/_elements/graph/graph.component.css
+++ b/frontend/src/app/_elements/graph/graph.component.css
@@ -1,6 +1,5 @@
 .node-text {
     position: absolute;
-    color: transparent;
     width: 100px;
     height: 40px;
     text-align: center;
@@ -12,6 +11,10 @@
     transform: translate(-50%, -50%);
 }
 
-.node-text:hover {
+.node-text:not(.inputs) {
+    color: transparent;
+}
+
+.node-text:not(.inputs):hover {
     color: var(--offwhite);
 }
\ No newline at end of file
diff --git a/frontend/src/app/_elements/graph/graph.component.html b/frontend/src/app/_elements/graph/graph.component.html
index 19e5c14a..3c01bc5e 100644
--- a/frontend/src/app/_elements/graph/graph.component.html
+++ b/frontend/src/app/_elements/graph/graph.component.html
@@ -1,6 +1,6 @@
 <div #graphWrapper class="w-100 position-relative" style="height: 14rem;">
     <ng-container *ngFor="let layer of layers; let i = index">
-        <div class="node-text" *ngFor="let node of layer; let j = index" [style.left.%]="node.x * 99.4" [style.top.%]="node.y * 100">
+        <div [ngClass]="{'inputs': i==0}" class="node-text" *ngFor="let node of layer; let j = index" [style.left.%]="node.x * 99.4" [style.top.%]="node.y * 100">
             {{ i == 0 ? (inputColumns ? inputColumns[j] : 'nepoznato') : (i > 0 && i
             < layers.length - 1 ? model!.layers[i-1].activationFunction : (i==layers.length - 1 ? 'out' : '')) }} </div>
     </ng-container>