File upload fix

3 files changed, 24 insertions, 22 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 8465c3d6..913592eb 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
@@ -19,7 +19,7 @@ export class DatasetLoadComponent {
   slice: string = "";
 
   csvRecords: any[] = [];
-  files: any[] = [];
+  files: File[] = [];
   rowsNumber: number = 0;
   colsNumber: number = 0;
 
@@ -33,6 +33,7 @@ export class DatasetLoadComponent {
 
   changeListener($event: any): void {
     this.files = $event.srcElement.files;
+    console.log(this.files);
     this.update();
   }
 
@@ -41,25 +42,25 @@ export class DatasetLoadComponent {
     if (this.files.length < 1)
       return;
 
-    this.ngxCsvParser.parse(this.files[0], { header: false, delimiter: (this.delimiter == "razmak") ? " " : (this.delimiter == "") ? "," : this.delimiter})
-    .pipe().subscribe((result) => {
-
-      console.log('Result', result);
-      if (result.constructor === Array) {
-        this.csvRecords = result;
-        if (this.hasHeader)
-          this.rowsNumber = this.csvRecords.length - 1;
-        else 
-          this.rowsNumber = this.csvRecords.length;
-        this.colsNumber = this.csvRecords[0].length;
-
-        this.dataset.header = this.csvRecords[0];
-
-        this.loaded.emit("loaded");
-      }
-    }, (error: NgxCSVParserError) => {
-      console.log('Error', error);
-    });
+    this.ngxCsvParser.parse(this.files[0], { header: false, delimiter: (this.delimiter == "razmak") ? " " : (this.delimiter == "") ? "," : this.delimiter })
+      .pipe().subscribe((result) => {
+
+        console.log('Result', result);
+        if (result.constructor === Array) {
+          this.csvRecords = result;
+          if (this.hasHeader)
+            this.rowsNumber = this.csvRecords.length - 1;
+          else
+            this.rowsNumber = this.csvRecords.length;
+          this.colsNumber = this.csvRecords[0].length;
+
+          this.dataset.header = this.csvRecords[0];
+
+          this.loaded.emit("loaded");
+        }
+      }, (error: NgxCSVParserError) => {
+        console.log('Error', error);
+      });
   }
 
 }
diff --git a/frontend/src/app/_pages/add-model/add-model.component.ts b/frontend/src/app/_pages/add-model/add-model.component.ts
index 4e315510..76a09782 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.ts
+++ b/frontend/src/app/_pages/add-model/add-model.component.ts
@@ -33,7 +33,7 @@ export class AddModelComponent implements OnInit {
   }
 
   addModel() {
-    this.saveModel(false).subscribe(); //trajno cuvanje
+    this.saveModel(false); //trajno cuvanje
   }
 
   trainModel() {
diff --git a/frontend/src/app/_services/models.service.ts b/frontend/src/app/_services/models.service.ts
index 25a37e3a..e9a5ee18 100644
--- a/frontend/src/app/_services/models.service.ts
+++ b/frontend/src/app/_services/models.service.ts
@@ -23,6 +23,7 @@ export class ModelsService {
     const options = {
       params: params,
       reportProgress: true,
+      headers: this.authService.authHeader()
     };
 
     const req = new HttpRequest('POST', `${API_SETTINGS.apiURL}/file/csv`, formData, options);
@@ -30,7 +31,7 @@ export class ModelsService {
   }
 
   addModel(model: Model) {
-    return this.http.post(`${API_SETTINGS.apiURL}/model/add`, model, { headers: this.authService.authHeader(), responseType: 'text' });
+    return this.http.post(`${API_SETTINGS.apiURL}/model/add`, model, { headers: this.authService.authHeader() });
   }
   addDataset(dataset: Dataset) {
     return this.http.post(`${API_SETTINGS.apiURL}/dataset/add`, dataset, { headers: this.authService.authHeader(), responseType: 'text' });