3 files changed, 30 insertions, 8 deletions

diff --git a/frontend/src/app/_elements/folder/folder.component.css b/frontend/src/app/_elements/folder/folder.component.css
index 810ad05d..fe21e7b1 100644
--- a/frontend/src/app/_elements/folder/folder.component.css
+++ b/frontend/src/app/_elements/folder/folder.component.css
@@ -1,6 +1,5 @@
 #folder {
     width: 100%;
-    
 }
 
 #tabs {
@@ -186,10 +185,10 @@
 .file-bottom-buttons {
     position: relative;
     position: relative;
-    top:-36px
-    
+    top: -36px
 }
-.file-bottom-buttons-helper{
+
+.file-bottom-buttons-helper {
     position: relative;
     display: flex;
     flex-direction: row-reverse;
@@ -226,4 +225,14 @@
 .highlight-exp {
     /*font-size: 16px;*/
     font-weight: 700;
+}
+
+.text-overflow {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+}
+
+.selected-file-tab {
+    max-width: 230px !important;
 }
\ No newline at end of file
diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index ebee92d2..17ed02f8 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -13,8 +13,8 @@
             <a class="m-1 stretched-link tab-link" (click)="selectTab(tab)" (mouseenter)="hoverOverTab(tab)" (mouseleave)="hoverOverTab(TabType.None)">{{tabTitles[tab]}}</a>
         </div>
 
-        <div class="folder-tab p-1 rounded-top" *ngIf="selectedFile" [style]="'z-index:' + (selectedTab == TabType.File ? 11 : (tabsToShow.length)) + ' ;'" [ngClass]="{'selected-tab' : selectedTab == TabType.File, 'hover-tab' : hoverTab == TabType.File}">
-            <a class="m-1 stretched-link tab-link" (click)="selectTab(TabType.File)" (mouseenter)="hoverOverTab(TabType.File)" (mouseleave)="hoverOverTab(TabType.None)">{{selectedFile.name}}</a>
+        <div class="folder-tab p-1 rounded-top selected-file-tab" *ngIf="selectedFile" [style]="'z-index:' + (selectedTab == TabType.File ? 11 : (tabsToShow.length)) + ' ;'" [ngClass]="{'selected-tab' : selectedTab == TabType.File, 'hover-tab' : hoverTab == TabType.File}">
+            <a class="m-1 stretched-link tab-link text-overflow" (click)="selectTab(TabType.File)" (mouseenter)="hoverOverTab(TabType.File)" (mouseleave)="hoverOverTab(TabType.None)">{{selectedFile.name}}</a>
         </div>
     </div>
     <div id="selected-content" class="rounded-bottom text-offwhite">
@@ -120,7 +120,7 @@
         </div>
     </div>
     <div id="footer" [ngSwitch]="newFileSelected" *ngIf="!listView">
-        <button mat-button (click)="saveNewFile()" class="bottom-button text-offwhite rounded-bottom" *ngSwitchCase="true">
+        <button mat-button (click)="saveNewFile()" class="bottom-button text-offwhite rounded-bottom" [disabled]="saveDisabled" *ngSwitchCase="true">
             <div  class="f-row">
                 <div>Sačuvaj</div>
                 <div class="pt-1">
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index de1dfae9..451f16ef 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -42,6 +42,7 @@ export class FolderComponent implements AfterViewInit {
   selectedFileIndex: number = -1;
   selectedFile?: FolderFile;
   hoveringOverFileIndex: number = -1;
+  saveDisabled: boolean = false;
 
   @Output() selectedFileChanged: EventEmitter<FolderFile> = new EventEmitter();
   @Output() fileFromRoute: EventEmitter<FolderFile> = new EventEmitter();
@@ -183,7 +184,9 @@ export class FolderComponent implements AfterViewInit {
     if (!this._initialized) {
       this.files = this.folders[this.startingTab];
       this.filteredFiles = [];
-      setTimeout(() => this.selectTab(this.startingTab));
+      setTimeout(() => {
+        this.selectTab(this.startingTab);
+      });
       this._initialized = true;
     }
   }
@@ -240,12 +243,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:
@@ -272,6 +278,7 @@ export class FolderComponent implements AfterViewInit {
         });
         break;
     }
+    this.saveDisabled = false;
   }
 
   predictorsForExp: { [expId: string]: Predictor[] } = {}
@@ -380,6 +387,9 @@ export class FolderComponent implements AfterViewInit {
                 this.selectTab(TabType.MyDatasets);
               });
             }
+            if (this.archive) {
+              this.refreshExperiments();
+            }
 
           });
         })
@@ -401,6 +411,9 @@ export class FolderComponent implements AfterViewInit {
                 this.selectTab(TabType.MyModels);
               });
             }
+            if (this.archive) {
+              this.refreshExperiments();
+            }
           });
         })