5 files changed, 22 insertions, 15 deletions
diff --git a/frontend/src/app/_services/auth.service.ts b/frontend/src/app/_services/auth.service.ts
index 92cebe7f..9e3f9f2f 100644
--- a/frontend/src/app/_services/auth.service.ts
+++ b/frontend/src/app/_services/auth.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { EventEmitter, Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { JwtHelperService } from '@auth0/angular-jwt';
 import { CookieService } from 'ngx-cookie-service';
@@ -12,6 +12,8 @@ const jwtHelper = new JwtHelperService();
 })
 export class AuthService {
 
+  public loggedInEvent: EventEmitter<boolean> = new EventEmitter();
+
   shared = shared;
 
   constructor(private http: HttpClient, private cookie: CookieService) { }
@@ -44,6 +46,7 @@ export class AuthService {
 
   enableAutoRefresh() {
     this.lastToken = this.cookie.get('token');
+    clearTimeout(this.refresher);
     let exp = jwtHelper.getTokenExpirationDate(this.lastToken);
     if (!exp) {
       exp = new Date();
@@ -51,6 +54,7 @@ export class AuthService {
     var property = jwtHelper.decodeToken(this.cookie.get('token'));
     var username = property['name'];
     if (username != "") {
+
       this.refresher = setTimeout(() => {
         this.http.post(`${Configuration.settings.apiURL}/auth/renewJwt`, {}, { headers: this.authHeader(), responseType: 'text' }).subscribe((response) => {
           this.authenticate(response);
@@ -79,6 +83,7 @@ export class AuthService {
     }
     this.cookie.set('token', token, exp);
     this.updateUser();
+    this.loggedInEvent.emit(true);
   }
 
   updateUser() {
diff --git a/frontend/src/app/_services/datasets.service.ts b/frontend/src/app/_services/datasets.service.ts
index c3281be6..b2272f0a 100644
--- a/frontend/src/app/_services/datasets.service.ts
+++ b/frontend/src/app/_services/datasets.service.ts
@@ -29,10 +29,10 @@ export class DatasetsService {
   }
 
   editDataset(dataset: Dataset): Observable<Dataset> {
-    return this.http.put<Dataset>(`${Configuration.settings.apiURL}/dataset/`, dataset, { headers: this.authService.authHeader() });
+    return this.http.put<Dataset>(`${Configuration.settings.apiURL}/dataset/` + dataset._id, dataset, { headers: this.authService.authHeader() });
   }
 
   deleteDataset(dataset: Dataset) {
-    return this.http.delete(`${Configuration.settings.apiURL}/dataset/` + dataset.name, { headers: this.authService.authHeader(), responseType: "text" });
+    return this.http.delete(`${Configuration.settings.apiURL}/dataset/` + dataset._id, { headers: this.authService.authHeader(), responseType: "text" });
   }
 }
diff --git a/frontend/src/app/_services/models.service.ts b/frontend/src/app/_services/models.service.ts
index 44383828..1130b12c 100644
--- a/frontend/src/app/_services/models.service.ts
+++ b/frontend/src/app/_services/models.service.ts
@@ -1,6 +1,6 @@
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import Model from '../_data/Model';
+import Model, { ProblemType } from '../_data/Model';
 import { AuthService } from './auth.service';
 import { Observable } from 'rxjs';
 import Dataset from '../_data/Dataset';
@@ -31,20 +31,16 @@ export class ModelsService {
   addModel(model: Model): Observable<any> {
     return this.http.post(`${Configuration.settings.apiURL}/model/add`, model, { headers: this.authService.authHeader() });
   }
-  addDataset(dataset: Dataset): Observable<any> {
-    return this.http.post(`${Configuration.settings.apiURL}/dataset/add`, dataset, { headers: this.authService.authHeader() });
-  }
   trainModel(modelId: string, experimentId: string): Observable<any> {
     return this.http.post(`${Configuration.settings.apiURL}/model/trainmodel`, { ModelId: modelId, ExperimentId: experimentId }, { headers: this.authService.authHeader(), responseType: 'text' });
   }
 
-  getMyDatasets(): Observable<Dataset[]> {
-    return this.http.get<Dataset[]>(`${Configuration.settings.apiURL}/dataset/mydatasets`, { headers: this.authService.authHeader() });
-  }
-
   getMyModels(): Observable<Model[]> {
     return this.http.get<Model[]>(`${Configuration.settings.apiURL}/model/mymodels`, { headers: this.authService.authHeader() });
   }
+  getMyModelsByType(problemType: ProblemType): Observable<Model[]> {
+    return this.http.get<Model[]>(`${Configuration.settings.apiURL}/model/mymodelsbytype/` + problemType, { headers: this.authService.authHeader() });
+  }
 
   editModel(model: Model): Observable<Model> {
     return this.http.put<Model>(`${Configuration.settings.apiURL}/model/`, model, { headers: this.authService.authHeader() });
@@ -53,4 +49,5 @@ export class ModelsService {
   deleteModel(model: Model) {
     return this.http.delete(`${Configuration.settings.apiURL}/model/` + model.name, { headers: this.authService.authHeader(), responseType: "text" });
   }
+  
 }
diff --git a/frontend/src/app/_services/predictors.service.ts b/frontend/src/app/_services/predictors.service.ts
index 9e8383aa..a24ee708 100644
--- a/frontend/src/app/_services/predictors.service.ts
+++ b/frontend/src/app/_services/predictors.service.ts
@@ -24,7 +24,7 @@ export class PredictorsService {
   }
 
   deletePredictor(predictor: Predictor) {
-    return this.http.delete(`${Configuration.settings.apiURL}/predictor/` + predictor.name, { headers: this.authService.authHeader(), responseType: "text" });
+    return this.http.delete(`${Configuration.settings.apiURL}/predictor/` + predictor._id, { headers: this.authService.authHeader(), responseType: "text" });
   }
 
   getMyPredictors(): Observable<Predictor[]> {
diff --git a/frontend/src/app/_services/signal-r.service.ts b/frontend/src/app/_services/signal-r.service.ts
index b279b5ca..6a2e61e9 100644
--- a/frontend/src/app/_services/signal-r.service.ts
+++ b/frontend/src/app/_services/signal-r.service.ts
@@ -16,13 +16,18 @@ export class SignalRService {
       }).build();
 
     this.hubConnection.on("Notify", (message: string) => {
-      console.log(" " + message);
+      //console.log(" " + message);
     });
 
     this.hubConnection
       .start()
-      .then(() => console.log("con Started"))
-      .catch(err => console.log("Error" + err))
+      .then(() => {})
+      .catch(err => {})
   }
+
+  public stopConnection = () => {
+    this.hubConnection?.stop();
+  }
+
   constructor(private cookie: CookieService) { }
 }