2 files changed, 23 insertions, 27 deletions

diff --git a/frontend/src/app/_elements/dataset-load/dataset-load.component.html b/frontend/src/app/_elements/dataset-load/dataset-load.component.html
index 56a3b3c9..f244a882 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.html
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.html
@@ -1,40 +1,34 @@
 <div>
 
-  <!--Sklonjeno ucitavanje novog dataseta i sve opcije u vezi sa tim, premesteno u add-new-dataset-->
+    <!--Sklonjeno ucitavanje novog dataseta i sve opcije u vezi sa tim, premesteno u add-new-dataset-->
 
     <div class="d-flex flex-row justify-content-center align-items-center mt-3 mb-5">
-        <button type="button" id="btnMyDataset" class="btn" (click)="viewMyDatasetsForm()"
-            [ngClass]="{'btnType1': showMyDatasets, 'btnType2': !showMyDatasets}">
+        <button type="button" id="btnMyDataset" class="btn" (click)="viewMyDatasetsForm()" [ngClass]="{'btnType1': showMyDatasets, 'btnType2': !showMyDatasets}">
             Izaberite dataset iz kolekcije
         </button>
         <h3 class="mt-3 mx-3">ili</h3>
-        <button type="button" id="btnNewDataset" class="btn" (click)="viewNewDatasetForm()"
-            [ngClass]="{'btnType1': !showMyDatasets, 'btnType2': showMyDatasets}">
+        <button type="button" id="btnNewDataset" class="btn" (click)="viewNewDatasetForm()" [ngClass]="{'btnType1': !showMyDatasets, 'btnType2': showMyDatasets}">
             Dodajte novi dataset
         </button>
     </div>
 
-  <div class="px-5 my-2">
-      <input *ngIf="showMyDatasets" type="text" class="form-control" placeholder="Pretraga"
-          [(ngModel)]="term">
-  </div>
-  <div class="px-5" *ngIf="showMyDatasets">
+    <div class="px-5 my-2">
+        <input *ngIf="showMyDatasets" type="text" class="form-control" placeholder="Pretraga" [(ngModel)]="term">
+    </div>
+    <div class="px-5" *ngIf="showMyDatasets">
         <div class="overflow-auto" style="max-height: 500px;">
             <ul class="list-group">
-                <li class="list-group-item p-3" *ngFor="let dataset of myDatasets|filter:term"
-                    [ngClass]="{'selectedDatasetClass': this.selectedDataset == dataset}">
-                    <app-item-dataset name="usersDataset" [dataset]="dataset"
-                        (click)="selectThisDataset(dataset);"></app-item-dataset>
+                <li class="list-group-item p-3" *ngFor="let dataset of myDatasets|filter:term" [ngClass]="{'selectedDatasetClass': this.selectedDataset == dataset}">
+                    <app-item-dataset name="usersDataset" [dataset]="dataset" (click)="selectThisDataset(dataset);"></app-item-dataset>
                 </li>
             </ul>
         </div>
         <div class="px-5 mt-5">
             <app-datatable [tableData]="tableData"></app-datatable>
         </div>
-  </div>
+    </div>
 
-  <app-add-new-dataset [style]="(showMyDatasets)?'display:none;visibility:hidden;':''" id="dataset"
-      (newDatasetAdded)="refreshMyDatasets()">
-  </app-add-new-dataset>
+    <app-add-new-dataset [style]="(showMyDatasets)?'display:none;visibility:hidden;':''" id="dataset">
+    </app-add-new-dataset>
 
 </div>
\ No newline at end of file
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 73dbf2d2..b2f8857d 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
@@ -52,13 +52,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;
@@ -88,10 +81,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!");