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

# Conflicts:
#	frontend/src/app/_elements/folder/folder.component.ts

1 files changed, 16 insertions, 4 deletions

diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index b7a2e5d4..1e57fdf1 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -9,6 +9,7 @@ import { FormDatasetComponent } from '../form-dataset/form-dataset.component';
 import Experiment from 'src/app/_data/Experiment';
 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';
 
 @Component({
@@ -43,12 +44,21 @@ export class FolderComponent implements AfterViewInit {
 
   searchTerm: string = '';
 
-  constructor(private datasetsService: DatasetsService, private experimentsService: ExperimentsService, private modelsService: ModelsService, private predictorsService: PredictorsService) {
+  constructor(private datasetsService: DatasetsService, private experimentsService: ExperimentsService, private modelsService: ModelsService, private predictorsService: PredictorsService, private signalRService: SignalRService) {
     this.tabsToShow.forEach(tab => this.folders[tab] = []);
   }
 
   ngAfterViewInit(): void {
-    this.refreshFiles();
+    this.refreshFiles(null);
+
+    if (this.signalRService.hubConnection) {
+      this.signalRService.hubConnection.on("NotifyDataset", (dName: string, dId: string) => {
+        this.refreshFiles(dId);
+
+      });
+    } else {
+      console.warn("Dataset-Load: No connection!");
+    }
   }
 
   displayFile() {
@@ -79,7 +89,6 @@ export class FolderComponent implements AfterViewInit {
     this.fileToDisplay = this.newFile;
     this.newFileSelected = true;
     this.listView = false;
-    this.selectedFileChanged.emit(this.newFile);
     this.displayFile();
   }
 
@@ -107,13 +116,16 @@ export class FolderComponent implements AfterViewInit {
 
   _initialized: boolean = false;
 
-  refreshFiles() {
+  refreshFiles(selectedDatasetId: string | null) {
     this.tabsToShow.forEach(tab => {
       this.folders[tab] = [];
     })
 
     this.datasetsService.getMyDatasets().subscribe((datasets) => {
       this.folders[TabType.MyDatasets] = datasets;
+      if (selectedDatasetId) {
+        this.selectFile(datasets.filter(x => x._id == selectedDatasetId)[0]);
+      }
     });
 
     this.experimentsService.getMyExperiments().subscribe((experiments) => {