2 files changed, 16 insertions, 4 deletions
diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html
index 4b75c929..39304469 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.html
+++ b/frontend/src/app/_pages/experiment/experiment.component.html
@@ -27,12 +27,12 @@
     <div #stepsContainer class="steps-container">
         <div #steps id="step_1" class="step-content">
             <div class="step-content-inside">
-                <app-folder #folderDataset [type]="FolderType.Dataset" [forExperiment]="experiment" [startingTab]="TabType.NewFile" [tabsToShow]="[TabType.MyDatasets, TabType.PublicDatasets]" (okPressed)="goToPage(1)"></app-folder>
+                <app-folder #folderDataset [type]="FolderType.Dataset" [forExperiment]="experiment" [startingTab]="TabType.NewFile" [tabsToShow]="[TabType.MyDatasets, TabType.PublicDatasets]" (okPressed)="goToPage(1)" (selectedFileChanged)="setDataset($event)"></app-folder>
             </div>
         </div>
         <div #steps id="step_2" class="step-content">
             <div class="step-content-inside">
-                <app-column-table (okPressed)="goToPage(2)" (columnTableChanged)="columnTableChangedEvent()" [experiment]="experiment"></app-column-table>
+                <app-column-table (okPressed)="goToPage(2)" (columnTableChanged)="columnTableChangedEvent()" [experiment]="experiment" [dataset]="dataset"></app-column-table>
             </div>
         </div>
         <div #steps id="step_3" class="step-content">
diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts
index a767767d..28552664 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.ts
+++ b/frontend/src/app/_pages/experiment/experiment.component.ts
@@ -2,12 +2,14 @@ import { AfterViewInit, Component, ElementRef, ViewChild, ViewChildren, Input }
 import { StepperSelectionEvent } from '@angular/cdk/stepper';
 import { MatStepper } from '@angular/material/stepper';
 import Shared from 'src/app/Shared';
-import { FolderType } from 'src/app/_data/FolderFile';
+import { FolderFile, FolderType } from 'src/app/_data/FolderFile';
 import { FolderComponent, TabType } from 'src/app/_elements/folder/folder.component';
 import Experiment from 'src/app/_data/Experiment';
 import { ExperimentsService } from 'src/app/_services/experiments.service';
 import { ModelsService } from 'src/app/_services/models.service';
 import Model from 'src/app/_data/Model';
+import Dataset from 'src/app/_data/Dataset';
+import { ColumnTableComponent } from 'src/app/_elements/column-table/column-table.component';
 
 @Component({
   selector: 'app-experiment',
@@ -21,9 +23,12 @@ export class ExperimentComponent implements AfterViewInit {
   @ViewChildren('steps') steps!: ElementRef[];
 
   event: number = 0;
-  @Input() experiment: Experiment;
+  experiment: Experiment;
+  dataset?: Dataset;
   @ViewChild("folderDataset") folderDataset!: FolderComponent;
   @ViewChild("folderModel") folderModel!: FolderComponent;
+  @ViewChild(ColumnTableComponent) columnTable!: ColumnTableComponent;
+
 
   constructor(private experimentsService: ExperimentsService, private modelsService: ModelsService) {
     this.experiment = new Experiment("exp1");
@@ -118,4 +123,11 @@ export class ExperimentComponent implements AfterViewInit {
     console.log("promenio se column-table");
   }
 
+  setDataset(dataset: FolderFile) {
+    const d = <Dataset>dataset;
+    this.experiment.datasetId = d._id;
+    this.dataset = d;
+
+    this.columnTable.loadDataset(this.dataset);
+  }
 }