2 files changed, 27 insertions, 19 deletions

diff --git a/frontend/src/app/_elements/add-new-dataset/add-new-dataset.component.ts b/frontend/src/app/_elements/add-new-dataset/add-new-dataset.component.ts
index 6087b6a5..7421fbcf 100644
--- a/frontend/src/app/_elements/add-new-dataset/add-new-dataset.component.ts
+++ b/frontend/src/app/_elements/add-new-dataset/add-new-dataset.component.ts
@@ -89,25 +89,25 @@ export class AddNewDatasetComponent {
   }
 
   uploadDataset() {
-        this.modelsService.uploadData(this.files[0]).subscribe((file) => {
-          //console.log('ADD MODEL: STEP 2 - ADD DATASET WITH FILE ID ' + file._id);
-            this.dataset.fileId = file._id;
-            this.dataset.username = shared.username;
-
-            this.datasetsService.addDataset(this.dataset).subscribe((dataset) => {
-             
-              this.newDatasetAdded.emit("added");
-              //this.refreshMyDatasetList(); refreshuj dataset listu u ds-load i selektuj taj ds
-              //this.showMyDatasets = true;
-              //this.selectThisDataset(dataset);
-
-              shared.openDialog("Obaveštenje", "Uspešno ste dodali novi izvor podataka u kolekciju. Molimo sačekajte par trenutaka da se procesira.");
-            }, (error) => {
-              shared.openDialog("Neuspeo pokušaj!", "Dataset sa unetim nazivom već postoji u Vašoj kolekciji. Izmenite naziv ili iskoristite postojeći dataset.");
-            }); //kraj addDataset subscribe
+    if (this.files[0] == undefined) {
+      shared.openDialog("Greška", "Niste izabrali fajl za učitavanje.");
+      return;
+    }
+
+    this.modelsService.uploadData(this.files[0]).subscribe((file) => {
+      //console.log('ADD MODEL: STEP 2 - ADD DATASET WITH FILE ID ' + file._id);
+        this.dataset.fileId = file._id;
+        this.dataset.username = shared.username;
+
+        this.datasetsService.addDataset(this.dataset).subscribe((dataset) => {
+          this.newDatasetAdded.emit("added");
+          shared.openDialog("Obaveštenje", "Uspešno ste dodali novi izvor podataka u kolekciju. Molimo sačekajte par trenutaka da se procesira.");
         }, (error) => {
-          
-        }); //kraj uploadData subscribe
+          shared.openDialog("Neuspeo pokušaj!", "Izvor podataka sa unetim nazivom već postoji u Vašoj kolekciji. Izmenite naziv ili iskoristite postojeći dataset.");
+        }); //kraj addDataset subscribe
+    }, (error) => {
+      
+    }); //kraj uploadData subscribe
   }
 
 }
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 0148ac3a..6a5734e5 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
@@ -51,6 +51,14 @@ export class DatasetLoadComponent {
     //this.resetCbsAndRbs();        //TREBA DA SE DESI
   }
 
+  refreshMyDatasets() {
+    this.datasets.getMyDatasets().subscribe((datasets) => {
+      this.myDatasets = datasets;
+      this.viewMyDatasetsForm();
+      //this.
+    });
+  }
+
   selectThisDataset(dataset: Dataset) {
     this.selectedDataset = dataset;
     this.selectedDatasetLoaded = false;
@@ -66,7 +74,7 @@ export class DatasetLoadComponent {
           else
             break; //nema potrebe dalje
         }*/
-        //console.log(this.datasetFile);
+        console.log(this.datasetFile);
         //this.resetCbsAndRbs();                        //TREBA DA SE DESI
         //this.refreshThreeNullValueRadioOptions();       //TREBA DA SE DESI
         this.selectedDatasetLoaded = true;