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

4 files changed, 66 insertions, 18 deletions

diff --git a/frontend/src/app/_elements/column-table/column-table.component.ts b/frontend/src/app/_elements/column-table/column-table.component.ts
index 4b10401d..8398f7ef 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.ts
+++ b/frontend/src/app/_elements/column-table/column-table.component.ts
@@ -15,6 +15,7 @@ import Shared from 'src/app/Shared';
 import { PieChartComponent } from '../_charts/pie-chart/pie-chart.component';
 import { BoxPlotComponent } from '../_charts/box-plot/box-plot.component';
 import { ActivatedRoute } from '@angular/router';
+import { UpdateExperimentDialogComponent } from 'src/app/_modals/update-experiment-dialog/update-experiment-dialog.component';
 
 @Component({
   selector: 'app-column-table',
@@ -365,11 +366,20 @@ export class ColumnTableComponent implements AfterViewInit {
   }
 
   openUpdateExperimentDialog() {
-    this.experimentService.updateExperiment(this.experiment).subscribe((response) => {
-      Object.assign(this.experiment, response);
+    const dialogRef = this.dialog.open(UpdateExperimentDialogComponent, {
+      width: '350px',
+      data: { experiment: this.experiment }
+    });
+    dialogRef.afterClosed().subscribe(experiment => {
+      if (experiment == undefined)
+        return;
+      if (this.experiment._id != experiment._id)
+        Shared.openDialog("Novi eksperiment", "Uspešno ste sačuvali novi eksperiment. Nastavite rad na njemu.");
+      else
+        Shared.openDialog("Izmena eksperimenta", "Uspešno ste izmenili podatke o eksperimentu.");
+      Object.assign(this.experiment, experiment);
       this.experiment._columnsSelected = true;
       this.experimentChanged.emit();
-      Shared.openDialog("Izmena eksperimenta", "Uspešno ste izmenili podatke o eksperimentu.");
     });
   }
 
diff --git a/frontend/src/app/_elements/folder/folder.component.css b/frontend/src/app/_elements/folder/folder.component.css
index 682fc645..810ad05d 100644
--- a/frontend/src/app/_elements/folder/folder.component.css
+++ b/frontend/src/app/_elements/folder/folder.component.css
@@ -184,9 +184,13 @@
 }
 
 .file-bottom-buttons {
-    position: absolute;
-    bottom: 5px;
-    right: 4%;
+    position: relative;
+    position: relative;
+    top:-36px
+    
+}
+.file-bottom-buttons-helper{
+    position: relative;
     display: flex;
     flex-direction: row-reverse;
 }
@@ -196,6 +200,7 @@
     color: var(--offwhite);
     border-radius: 4px;
     border: 1px solid var(--ns-primary);
+    background-color: var(--ns-bg-dark-50);
     margin: 5px;
     padding: 5px;
     cursor: pointer;
diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index 52f19753..afb6085d 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -58,17 +58,6 @@
         <!--{{fileToDisplay ? fileToDisplay.name : 'No file selected.'}} {{selectedFileIndex}} {{hoveringOverFileIndex}}-->
         <div class="folder-inside bg-blur">
             <div class="file-content" [ngClass]="{'form-hidden' : listView}">
-                <div class="file-bottom-buttons" *ngIf="selectedTab != TabType.NewFile">
-                    <button *ngIf="this.selectedFile && selectedTab == TabType.File && privacy != Privacy.Public" class="btn-clear file-button" (click)="deleteFile(this.selectedFile, $event)">
-                        <mat-icon matTooltip="Obriši" matTooltipPosition="right">delete</mat-icon>
-                    </button>
-                    <button *ngIf="this.selectedFile && selectedTab==TabType.File && FolderType.Dataset==this.type" class="btn-clear file-button" (click)="downloadFile(this.selectedFile,$event)" style="display: inline-block;">
-                        <mat-icon matTooltip="Preuzmi" matTooltipPosition="before">download</mat-icon>
-                    </button>
-                    <!-- <button class="btn-clear file-button">
-                        <mat-icon>zoom_out_map</mat-icon>
-                    </button> -->
-                </div>
                 <app-form-model [ngClass]="{'form-hidden': type != FolderType.Model}" [forExperiment]="forExperiment" [hideProblemType]="(forExperiment ? true : false)" [forProblemType]="(forExperiment ? forExperiment.type : ProblemType.Regression)" (editEvent)="onFileChange()"></app-form-model>
                 <app-form-dataset [ngClass]="{'form-hidden': type != FolderType.Dataset}" [forExperiment]="forExperiment" (editEvent)="onFileChange()"></app-form-dataset>
             </div>
@@ -160,4 +149,20 @@
             </button>
         </ng-container>
     </div>
+    <div [ngSwitch]="newFileSelected" *ngIf="!listView">
+        <div class="file-bottom-buttons" *ngIf="selectedTab != TabType.NewFile">
+            <div class="file-bottom-buttons-helper">
+            <button *ngIf="this.selectedFile && selectedTab == TabType.File && privacy != Privacy.Public" class="btn-clear file-button" (click)="deleteFile(this.selectedFile, $event)">
+                <mat-icon matTooltip="Obriši" matTooltipPosition="right">delete</mat-icon>
+            </button>
+            <button *ngIf="this.selectedFile && selectedTab==TabType.File && FolderType.Dataset==this.type" class="btn-clear file-button" (click)="downloadFile(this.selectedFile,$event)" style="display: inline-block;">
+                <mat-icon matTooltip="Preuzmi" matTooltipPosition="before">download</mat-icon>
+            </button>
+        </div>
+            <!-- <button class="btn-clear file-button">
+                <mat-icon>zoom_out_map</mat-icon>
+            </button> -->
+        </div>
+    </div>
+    
 </div>
\ No newline at end of file
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index c9252caa..93ef9043 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -336,22 +336,41 @@ export class FolderComponent implements AfterViewInit {
       case FolderType.Dataset:
         const dataset = <Dataset>file;
         Shared.openYesNoDialog("Obriši izvor podataka", "Eksperimenti i trenirani modeli nad ovim izvorom podataka će takođe biti obrisani, da li ste sigurni da želite da obrišete izvor: " + dataset.name + "?", () => {
+          if(this.selectedTab==TabType.MyDatasets){
           this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1);
           this.files.splice(this.files.indexOf(file), 1);
+          }
           this.loadingAction = true;
           this.datasetsService.deleteDataset(dataset).subscribe((response) => {
             this.loadingAction = false;
+            if(this.selectedTab==TabType.File){
+              this.refreshDatasets(null);
+              this.selectedFile=undefined!;
+              setTimeout(() => {
+                this.selectTab(TabType.MyDatasets);
+              });
+            }
+
           });
         })
         break;
       case FolderType.Model:
         const model = <Model>file;
         Shared.openYesNoDialog("Obriši konfiguraciju neuronske mreže", "Trenirani modeli za ovu konfiguraciju će takođe biti obrisani, da li ste sigurni da želite da obrišete konfiguraciju: " + model.name + "?", () => {
+          if(this.selectedTab==TabType.MyModels){
           this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1);
           this.files.splice(this.files.indexOf(file), 1);
+          }
           this.loadingAction = true;
           this.modelsService.deleteModel(<Model>file).subscribe((response) => {
             this.loadingAction = false;
+            if(this.selectedTab==TabType.File){
+              this.refreshModels(null);
+              this.selectedFile=undefined!;
+              setTimeout(() => {
+                this.selectTab(TabType.MyModels);
+              });
+            }
           });
         })
 
@@ -370,11 +389,20 @@ export class FolderComponent implements AfterViewInit {
         } else {
           const experiment = <Experiment>file;
           Shared.openYesNoDialog("Obriši eksperiment", "Trenirani modeli za ovaj eksperiment će takođe biti obrisani, da li ste sigurni da želite da obrišete eksperiment: " + experiment.name + "?", () => {
+            if(this.selectedTab==TabType.MyExperiments){
             this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1);
             this.files.splice(this.files.indexOf(file), 1);
+            }
             this.loadingAction = true;
             this.experimentsService.deleteExperiment(experiment).subscribe((response) => {
-              this.loadingAction = false;
+            this.loadingAction = false;
+            if(this.selectedTab==TabType.File){
+              this.refreshExperiments();
+              this.selectedFile=undefined!;
+              setTimeout(() => {
+                this.selectTab(TabType.MyExperiments);
+              });
+            }
             });
           });
         }