Ispravljen bag: kad se izmeni dataset, refreshuje se 2. korak na eksperiment strani. Dodata ruta kako bi se eksperiment iz kolekcije otvorio na eksperiment strani. Sredjivanje otvaranja - pocetak

8 files changed, 60 insertions, 14 deletions

diff --git a/frontend/src/app/_elements/column-table/column-table.component.html b/frontend/src/app/_elements/column-table/column-table.component.html
index 3256ffee..8af56c43 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.html
+++ b/frontend/src/app/_elements/column-table/column-table.component.html
@@ -45,10 +45,10 @@
                     </tbody>
                 </table>
                 <div class="mb-3">
-                    <button mat-button  (click)="goBack()"><mat-icon>keyboard_arrow_left</mat-icon></button>
+                    <button mat-button (click)="goBack()"><mat-icon>keyboard_arrow_left</mat-icon></button>
                     <div style="display: inline;">{{(this.begin/10)+1}}</div>
                     <button mat-button (click)="goForward()"><mat-icon>keyboard_arrow_right</mat-icon></button>
-                
+
                 </div>
             </div>
 
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 a3469d90..7c2f8cef 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.ts
+++ b/frontend/src/app/_elements/column-table/column-table.component.ts
@@ -41,14 +41,12 @@ export class ColumnTableComponent implements AfterViewInit {
   columnsChecked: boolean[] = []; //niz svih kolona
   loaded: boolean = false;
 
-
   begin:number=0;
   step:number=10;
 
 
 
   constructor(private datasetService: DatasetsService, private experimentService: ExperimentsService, public csvParseService: CsvParseService, public dialog: MatDialog) {
-    //ovo mi nece trebati jer primam dataset iz druge komponente
   }
   resetPagging(){
     this.begin=0;
@@ -98,6 +96,7 @@ export class ColumnTableComponent implements AfterViewInit {
     this.dataset = dataset;
     this.setColumnTypeInitial();
 
+    this.columnsChecked = [];
     this.dataset.columnInfo.forEach(column => {
       this.columnsChecked.push(true);
     });
diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index db4f28f0..84946697 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -78,12 +78,12 @@
                         <div class="mx-2 hover-show" *ngIf="selectedTab !== TabType.PublicDatasets && selectedTab !== TabType.PublicModels">
                             <button class="btn-clear file-button" (click)="deleteFile(file, $event)">
                                 <mat-icon>delete</mat-icon>
-                            </button>   
+                            </button>
                         </div>
                         <div class="mx-2 hover-show" *ngIf="selectedTab == TabType.PublicDatasets || selectedTab == TabType.PublicModels">
-                            <button  class="btn-clear file-button" (click)="addFile(file, $event)">
+                            <button class="btn-clear file-button" (click)="addFile(file, $event)">
                                 <mat-icon>note_add</mat-icon>
-                            </button>   
+                            </button>
                         </div>
                     </div>
                     <div *ngIf="type == FolderType.Experiment" class="list-view">
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index d26ac999..4e2209a0 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -105,7 +105,7 @@ export class FolderComponent implements AfterViewInit {
     this.selectedFile = file;
     this.fileToDisplay = file;
     if (this.type == FolderType.Experiment && file) {
-      this.router.navigate(['/experiment'/*, file._id*/])
+      this.router.navigate(['/experiment/', file._id]);
     }
     this.newFileSelected = false;
     this.listView = false;
@@ -116,6 +116,12 @@ export class FolderComponent implements AfterViewInit {
     if (this.type == FolderType.Dataset)
       this.formDataset.loadExisting();
   }
+  /*
+  goToExperimentPage(file: FolderFile) {
+    console.log(<Experiment>file);
+    //this.router.navigate(['/experiment/', this.experiment._id]);
+  }
+  */
 
   createNewFile() {
     if (this.type == FolderType.Dataset) {
diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts
index abf4b697..62ef9257 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.ts
+++ b/frontend/src/app/_pages/experiment/experiment.component.ts
@@ -1,4 +1,4 @@
-import { AfterViewInit, Component, ElementRef, ViewChild, ViewChildren, Input } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, ViewChild, ViewChildren, Input, OnInit } from '@angular/core';
 import { StepperSelectionEvent } from '@angular/cdk/stepper';
 import { MatStepper } from '@angular/material/stepper';
 import Shared from 'src/app/Shared';
@@ -12,13 +12,15 @@ import Dataset from 'src/app/_data/Dataset';
 import { ColumnTableComponent } from 'src/app/_elements/column-table/column-table.component';
 import { SignalRService } from 'src/app/_services/signal-r.service';
 import { MetricViewComponent } from 'src/app/_elements/metric-view/metric-view.component';
+import { ActivatedRoute, Router } from '@angular/router';
+import { DatasetsService } from 'src/app/_services/datasets.service';
 
 @Component({
   selector: 'app-experiment',
   templateUrl: './experiment.component.html',
   styleUrls: ['./experiment.component.css']
 })
-export class ExperimentComponent implements AfterViewInit {
+export class ExperimentComponent implements AfterViewInit, OnInit {
 
   @ViewChild(MatStepper) stepper!: MatStepper;
   @ViewChild('stepsContainer') stepsContainer!: ElementRef;
@@ -32,9 +34,36 @@ export class ExperimentComponent implements AfterViewInit {
   @ViewChild("folderModel") folderModel!: FolderComponent;
   @ViewChild("metricView") metricView!: MetricViewComponent;
 
-  constructor(private experimentsService: ExperimentsService, private modelsService: ModelsService, private signalRService: SignalRService) {
+  constructor(private experimentsService: ExperimentsService, private modelsService: ModelsService, private datasetsService: DatasetsService, private signalRService: SignalRService, private route: ActivatedRoute) {
     this.experiment = new Experiment("exp1");
   }
+  ngOnInit(): void {
+    this.route.queryParams.subscribe(params => {
+      let experimentId = this.route.snapshot.paramMap.get("id");
+      console.log("EXPID u exp.comp:", experimentId);
+      if (experimentId == null)
+        return;
+
+      this.experimentsService.getExperimentById(experimentId).subscribe((response) => {
+        this.experiment = response;
+        console.log(this.experiment); //OTKUD MI NAME
+        this.datasetsService.getDatasetById(this.experiment.datasetId).subscribe((response: Dataset) => {
+          this.dataset = response;
+          console.log("EXP u exp.comp:", this.experiment);
+          console.log("DATASET u exp.comp:", this.dataset);
+          this.folderDataset.forExperiment = this.experiment;
+          this.folderDataset.fileToDisplay = <FolderFile>this.experiment;
+          this.folderDataset.selectFile();
+          this.columnTable.experiment = this.experiment;
+          this.columnTable.dataset = this.dataset;
+          //this.columnTable.loadDataset(this.dataset);
+          
+          //this.setDataset();
+          //this.experimentChangedEvent();
+        });
+      });
+    });
+  }
 
   /*updateExperiment(){
 
@@ -151,13 +180,18 @@ export class ExperimentComponent implements AfterViewInit {
     this.folderModel.updateExperiment();
   }
 
-  setDataset(dataset: FolderFile) {
+  setDataset(dataset: FolderFile | null) {
+    if (dataset == null) {
+      this.columnTable.loaded = false;
+      this.dataset = undefined;
+      this.experiment.datasetId = '';
+      return;
+    }
     const d = <Dataset>dataset;
     this.experiment.datasetId = d._id;
     this.dataset = d;
 
     this.columnTable.loadDataset(this.dataset);
-    
   }
 
   modelToTrain?: Model;
diff --git a/frontend/src/app/_services/datasets.service.ts b/frontend/src/app/_services/datasets.service.ts
index 1b961442..11a6ee5e 100644
--- a/frontend/src/app/_services/datasets.service.ts
+++ b/frontend/src/app/_services/datasets.service.ts
@@ -40,6 +40,9 @@ export class DatasetsService {
   getDatasetFilePartial(fileId: any, startRow: number, rowNum: number): Observable<any> {
     return this.http.get(`${Configuration.settings.apiURL}/file/csvRead/${fileId}/${startRow}/${rowNum}`, { headers: this.authService.authHeader(), responseType: 'text' });
   }
+  getDatasetById(datasetId: string): Observable<Dataset> {
+    return this.http.get<Dataset>(`${Configuration.settings.apiURL}/dataset/${datasetId}`, { headers: this.authService.authHeader() });
+  }
 
   editDataset(dataset: Dataset): Observable<Dataset> {
     return this.http.put<Dataset>(`${Configuration.settings.apiURL}/dataset/` + dataset._id, dataset, { headers: this.authService.authHeader() });
diff --git a/frontend/src/app/_services/experiments.service.ts b/frontend/src/app/_services/experiments.service.ts
index 29569fca..f4473c8c 100644
--- a/frontend/src/app/_services/experiments.service.ts
+++ b/frontend/src/app/_services/experiments.service.ts
@@ -20,6 +20,10 @@ export class ExperimentsService {
     return this.http.get<Experiment[]>(`${Configuration.settings.apiURL}/experiment/getmyexperiments`, { headers: this.authService.authHeader() });
   }
 
+  getExperimentById(id: string): Observable<Experiment> {
+    return this.http.get<Experiment>(`${Configuration.settings.apiURL}/experiment/get/${id}`, { headers: this.authService.authHeader() });
+  }
+
   updateExperiment(experiment: Experiment): Observable<Experiment> {
     return this.http.put<Experiment>(`${Configuration.settings.apiURL}/experiment/` + experiment._id, experiment, { headers: this.authService.authHeader() });
   }
diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
index f5f1ccae..9f8c623d 100644
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -12,11 +12,11 @@ import { TestComponent } from './_pages/test/test.component';
 
 const routes: Routes = [
   { path: '', component: HomeComponent, data: { title: 'Početna strana' } },
+  { path: 'experiment/:id', component: ExperimentComponent, data: { title: 'Eksperiment' } },
   { path: 'experiment', component: ExperimentComponent, data: { title: 'Eksperiment' } },
   { path: 'archive', component: ArchiveComponent, data: { title: 'Arhiva' } },
   { path: 'profile', component: ProfileComponent, canActivate: [AuthGuardService], data: { title: 'Profil' } },
   { path: 'playground', component: PlaygroundComponent, data: { title: 'Zabava' } },
-  { path: 'sonja', component: ColumnTableComponent },
   { path: 'test', component: TestComponent, data: { title: 'Test' } }
 ];