use XappMgrService to replace Catalog and Control

[portal/ric-dashboard.git] / webapp-frontend / src / app / services / xapp-mgr / xapp-mgr.service.ts

diff --git a/webapp-frontend/src/app/services/catalog/catalog.service.ts b/webapp-frontend/src/app/services/xapp-mgr/xapp-mgr.service.ts
similarity index 72%
rename from webapp-frontend/src/app/services/catalog/catalog.service.ts
rename to webapp-frontend/src/app/services/xapp-mgr/xapp-mgr.service.ts
index 4946f24..daef3e0 100644 (file)
--- a/webapp-frontend/src/app/services/catalog/catalog.service.ts
+++ b/webapp-frontend/src/app/services/xapp-mgr/xapp-mgr.service.ts
@@ -20,22 +20,29 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { XMXappInfo } from '../../interfaces/xapp-mgr.types';
+import { XMXappInfo, XMXapp} from '../../interfaces/xapp-mgr.types';
+
 
 @Injectable()
-export class CatalogService {
+export class XappMgrService {
 
   constructor(private httpClient: HttpClient) {
     // injects to variable httpClient
   }
 
-  getAll() {
-    return this.httpClient.get('api/xappmgr/xapps');
+  private basePath = 'api/xappmgr/xapps';
+
+  getAll(){
+    return this.httpClient.get<XMXapp[]>(this.basePath);
   }
 
   deployXapp(name: string) {
     const xappInfo: XMXappInfo = { xAppName: name };
-    return this.httpClient.post('api/xappmgr/xapps', xappInfo, { observe: 'response' });
+    return this.httpClient.post(this.basePath, xappInfo, { observe: 'response' });
+  }
+
+  undeployXapp(name: string) {
+    return this.httpClient.delete((this.basePath + '/' + name), { observe: 'response' });
   }
 
-}
+}
\ No newline at end of file