From 7dc17a7b94984d24829b6e30ee575e493f2ab787 Mon Sep 17 00:00:00 2001
From: TAMARA JERINIC <tamara.jerinic@gmail.com>
Date: Wed, 25 May 2022 19:54:28 +0200
Subject: Izmenjen logo stranice.

---
 frontend/src/favicon.ico | Bin 948 -> 6614 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'frontend')

diff --git a/frontend/src/favicon.ico b/frontend/src/favicon.ico
index 997406ad..2dbb9ef6 100644
Binary files a/frontend/src/favicon.ico and b/frontend/src/favicon.ico differ
-- 
cgit v1.2.3


From e20385c4adcfc966f33345060f05af9bb41c3c78 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Wed, 25 May 2022 20:37:09 +0200
Subject: Ispravljen bug ukoliko korisnik brzo dvaput klikne da sacuva dataset.
 I onda se dataset dvaput obradjuje i dva se dodaju u kolekciju sa istim
 nazivom.

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

(limited to 'frontend')

diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index afb6085d..54444e95 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -115,7 +115,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 93ef9043..5c8751eb 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();
@@ -235,6 +235,7 @@ export class FolderComponent implements AfterViewInit {
   }
 
   saveNewFile() {
+    this.saveDisabled=true;
     this.loadingAction = true;
     switch (this.type) {
       case FolderType.Dataset:
@@ -261,6 +262,7 @@ export class FolderComponent implements AfterViewInit {
         });
         break;
     }
+    this.saveDisabled=false;
   }
 
   predictorsForExp: { [expId: string]: Predictor[] } = {}
-- 
cgit v1.2.3