aboutsummaryrefslogtreecommitdiff
path: root/frontend/src/app/_elements/folder/folder.component.ts
diff options
context:
space:
mode:
Diffstat (limited to 'frontend/src/app/_elements/folder/folder.component.ts')
-rw-r--r--frontend/src/app/_elements/folder/folder.component.ts13
1 files changed, 10 insertions, 3 deletions
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index be72ebc5..b09cb543 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -11,7 +11,7 @@ import { ExperimentsService } from 'src/app/_services/experiments.service';
import { PredictorsService } from 'src/app/_services/predictors.service';
import { SignalRService } from 'src/app/_services/signal-r.service';
import { FormModelComponent } from '../form-model/form-model.component';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
import Predictor from 'src/app/_data/Predictor';
@Component({
@@ -42,11 +42,12 @@ export class FolderComponent implements AfterViewInit {
fileToDisplay?: FolderFile;
@Output() selectedFileChanged: EventEmitter<FolderFile> = new EventEmitter();
+ @Output() fileFromRoute: EventEmitter<FolderFile> = new EventEmitter();
@Output() okPressed: EventEmitter<string> = new EventEmitter();
searchTerm: string = '';
- constructor(private datasetsService: DatasetsService, private experimentsService: ExperimentsService, private modelsService: ModelsService, private predictorsService: PredictorsService, private signalRService: SignalRService, private router: Router) {
+ constructor(private datasetsService: DatasetsService, private experimentsService: ExperimentsService, private modelsService: ModelsService, private predictorsService: PredictorsService, private signalRService: SignalRService, private router: Router, private route: ActivatedRoute) {
this.tabsToShow.forEach(tab => this.folders[tab] = []);
}
@@ -105,7 +106,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 +117,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) {