1 files changed, 11 insertions, 9 deletions
diff --git a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
index 74640782..be1dc097 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
@@ -61,13 +61,6 @@ export class DatasetLoadComponent implements OnInit {
     //this.resetCbsAndRbs();        //TREBA DA SE DESI
   }
 
-  refreshMyDatasets() {
-    this.datasets.getMyDatasets().subscribe((datasets) => {
-      this.myDatasets = datasets;
-      this.showMyDatasets = true;
-    });
-  }
-
   selectThisDataset(dataset: Dataset) {
     this.selectedDataset = dataset;
     this.selectedDatasetLoaded = false;
@@ -97,10 +90,19 @@ export class DatasetLoadComponent implements OnInit {
     return true;
   }
 
+  refreshMyDatasets(selectedDatasetId: string | null) {
+    this.datasets.getMyDatasets().subscribe((datasets) => {
+      this.myDatasets = datasets.reverse();
+      this.showMyDatasets = true; 
+      this.selectedDataset = this.myDatasets.filter(x => x._id == selectedDatasetId)[0];
+      this.resetSelectedDataset();
+    });
+  }
+
   ngOnInit(): void {
     if (this.signalRService.hubConnection) {
-      this.signalRService.hubConnection.on("NotifyDataset", _ => {
-        this.refreshMyDatasets();
+      this.signalRService.hubConnection.on("NotifyDataset", (dName: string, dId: string) => {
+        this.refreshMyDatasets(dId);
       });
     } else {
       console.warn("Dataset-Load: No connection!");