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

1 files changed, 16 insertions, 2 deletions

diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index 93ef9043..177ea403 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -42,7 +42,7 @@ export class FolderComponent implements AfterViewInit {
   hoveringOverFileIndex: number = -1;
 
   fileToDisplay?: FolderFile;
-
+  saveDisabled:boolean=false;
   @Output() selectedFileChanged: EventEmitter<FolderFile> = new EventEmitter();
   @Output() fileFromRoute: EventEmitter<FolderFile> = new EventEmitter();
   @Output() okPressed: EventEmitter<string> = new EventEmitter();
@@ -172,7 +172,9 @@ export class FolderComponent implements AfterViewInit {
     if (!this._initialized) {
       this.files = this.folders[this.startingTab];
       this.filteredFiles = [];
-      this.selectTab(this.startingTab);
+      setTimeout(()=>{
+        this.selectTab(this.startingTab);
+      });
       this._initialized = true;
     }
   }
@@ -229,12 +231,15 @@ export class FolderComponent implements AfterViewInit {
           })
           /* ------------------------------------------------ */
           this.searchTermsChanged();
+          if(this.selectedTab==TabType.MyExperiments)
+            this.selectTab(TabType.MyExperiments);
         })
       });
     });
   }
 
   saveNewFile() {
+    this.saveDisabled=true;
     this.loadingAction = true;
     switch (this.type) {
       case FolderType.Dataset:
@@ -261,6 +266,7 @@ export class FolderComponent implements AfterViewInit {
         });
         break;
     }
+    this.saveDisabled=false;
   }
 
   predictorsForExp: { [expId: string]: Predictor[] } = {}
@@ -350,6 +356,10 @@ export class FolderComponent implements AfterViewInit {
                 this.selectTab(TabType.MyDatasets);
               });
             }
+            if(this.archive)
+            {
+              this.refreshExperiments();
+            }
 
           });
         })
@@ -371,6 +381,10 @@ export class FolderComponent implements AfterViewInit {
                 this.selectTab(TabType.MyModels);
               });
             }
+            if(this.archive)
+            {
+              this.refreshExperiments();
+            }
           });
         })