From b8b83fbd03ececd76501892de71ac8f9961a58c9 Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Mon, 28 Mar 2022 19:48:02 +0200
Subject: Datasets.service i models.service odvojeni (bilo je preklapanja
 metoda). U skladu s tim izmenjeni pozivi na pojedinim mestima.

---
 frontend/src/app/_pages/add-model/add-model.component.html |  6 ++++--
 frontend/src/app/_pages/add-model/add-model.component.ts   |  6 +++---
 frontend/src/app/_services/datasets.service.ts             |  6 +++++-
 frontend/src/app/_services/models.service.ts               | 11 ++---------
 4 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'frontend/src/app')

diff --git a/frontend/src/app/_pages/add-model/add-model.component.html b/frontend/src/app/_pages/add-model/add-model.component.html
index 9dde9afe..8d763b00 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.html
+++ b/frontend/src/app/_pages/add-model/add-model.component.html
@@ -40,7 +40,9 @@
                     Dodajte novi dataset
                 </button>
             </div>
-            <input type="text" class="form-control" placeholder="Pretraga" [(ngModel)]="term">
+            <div class="px-5 my-2">
+                <input *ngIf="showMyDatasets" type="text" class="form-control" placeholder="Pretraga" [(ngModel)]="term">
+            </div>
             <div class="px-5">
                 <div *ngIf="showMyDatasets" class="overflow-auto" style="max-height: 500px;">
                     <ul class="list-group">
@@ -93,7 +95,7 @@
                 </div>
 
 
-                <div class="my-2" *ngIf="datasetFile">
+                <div class="mt-5" *ngIf="datasetFile">
                     <h2>Popunjavanje nedostajućih vrednosti:</h2>
                     <div class="form-check">
                         <input type="radio" [(ngModel)]="newModel.nullValues" [value]="NullValueOptions.DeleteRows"
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 37672d0a..78e1255b 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.ts
+++ b/frontend/src/app/_pages/add-model/add-model.component.ts
@@ -53,7 +53,7 @@ export class AddModelComponent implements OnInit {
   constructor(private models: ModelsService, private datasets: DatasetsService, private csv: CsvParseService) {
     this.newModel = new Model();
 
-    this.models.getMyDatasets().subscribe((datasets) => {
+    this.datasets.getMyDatasets().subscribe((datasets) => {
       this.myDatasets = datasets;
     });
   }
@@ -103,7 +103,7 @@ export class AddModelComponent implements OnInit {
             this.datasetLoadComponent.dataset.fileId = file._id;
             this.datasetLoadComponent.dataset.username = shared.username;
 
-            this.models.addDataset(this.datasetLoadComponent.dataset).subscribe((dataset) => {
+            this.datasets.addDataset(this.datasetLoadComponent.dataset).subscribe((dataset) => {
               console.log('ADD MODEL: STEP 3 - ADD MODEL WITH DATASET ID ', dataset._id);
               this.newModel.datasetId = dataset._id;
 
@@ -279,7 +279,7 @@ export class AddModelComponent implements OnInit {
   }
 
   refreshMyDatasetList() {
-    this.models.getMyDatasets().subscribe((datasets) => {
+    this.datasets.getMyDatasets().subscribe((datasets) => {
       this.myDatasets = datasets;
     });
   }
diff --git a/frontend/src/app/_services/datasets.service.ts b/frontend/src/app/_services/datasets.service.ts
index 35ca24e5..0ff63828 100644
--- a/frontend/src/app/_services/datasets.service.ts
+++ b/frontend/src/app/_services/datasets.service.ts
@@ -16,7 +16,11 @@ export class DatasetsService {
     return this.http.get<Dataset[]>(`${API_SETTINGS.apiURL}/dataset/publicdatasets`, { headers: this.authService.authHeader() });
   }
 
-  addDataset(dataset: Dataset): any {
+  getMyDatasets(): Observable<Dataset[]> {
+    return this.http.get<Dataset[]>(`${API_SETTINGS.apiURL}/dataset/mydatasets`, { headers: this.authService.authHeader() });
+  }
+
+  addDataset(dataset: Dataset): Observable<any> {
     return this.http.post(`${API_SETTINGS.apiURL}/dataset/add`, dataset, { headers: this.authService.authHeader() });
   }
 
diff --git a/frontend/src/app/_services/models.service.ts b/frontend/src/app/_services/models.service.ts
index 74253fac..1ec92140 100644
--- a/frontend/src/app/_services/models.service.ts
+++ b/frontend/src/app/_services/models.service.ts
@@ -1,9 +1,8 @@
-import { HttpClient, HttpParams, HttpRequest } from '@angular/common/http';
+import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import Model from '../_data/Model';
 import { AuthService } from './auth.service';
 import { API_SETTINGS } from 'src/config';
-import Dataset from '../_data/Dataset';
 import { Observable } from 'rxjs';
 
 
@@ -32,17 +31,11 @@ export class ModelsService {
   addModel(model: Model): Observable<any> {
     return this.http.post(`${API_SETTINGS.apiURL}/model/add`, model, { headers: this.authService.authHeader() });
   }
-  addDataset(dataset: Dataset): Observable<any> {
-    return this.http.post(`${API_SETTINGS.apiURL}/dataset/add`, dataset, { headers: this.authService.authHeader() });
-  }
+  
   trainModel(modelId: string): Observable<any> {
     return this.http.post(`${API_SETTINGS.apiURL}/model/train`, modelId, { headers: this.authService.authHeader() });
   }
 
-  getMyDatasets(): Observable<Dataset[]> {
-    return this.http.get<Dataset[]>(`${API_SETTINGS.apiURL}/dataset/mydatasets`, { headers: this.authService.authHeader() });
-  }
-  
   getMyModels(): Observable<Model[]> {
     return this.http.get<Model[]>(`${API_SETTINGS.apiURL}/model/mymodels`, { headers: this.authService.authHeader() });
   }
-- 
cgit v1.2.3