Release dashboard image at version 2.1.0

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

diff --git a/dashboard/webapp-frontend/src/app/services/app-mgr/app-mgr.service.ts b/dashboard/webapp-frontend/src/app/services/app-mgr/app-mgr.service.ts
index 5d89ce4..e280e7f 100644 (file)
--- a/dashboard/webapp-frontend/src/app/services/app-mgr/app-mgr.service.ts
+++ b/dashboard/webapp-frontend/src/app/services/app-mgr/app-mgr.service.ts
@@ -45,8 +45,7 @@ export class AppMgrService {
     return this.httpClient.get<XMAllDeployedXapps>(path);
   }
 
-  deployXapp(instanceKey: string, xappName: string): Observable<HttpResponse<Object>> {
-    const xappDescriptor: XMXappDescriptor = { xappName: xappName };
+  deployXapp(instanceKey: string, xappDescriptor: XMXappDescriptor): Observable<HttpResponse<Object>> {
     const path = this.dashboardSvc.buildPath(this.component, instanceKey, this.xappsPath);
     return this.httpClient.post(path, xappDescriptor, { observe: 'response' });
   }
@@ -58,10 +57,10 @@ export class AppMgrService {
 
   getConfig(instanceKey: string): Observable<XMAllXappConfig> {
     // For demo purpose, pull example config from local
-    return this.httpClient.get<XMAllXappConfig>('/assets/mockdata/config.json');
+    //return this.httpClient.get<XMAllXappConfig>('/assets/mockdata/config.json');
     // Once Xapp manager contains layout, should call backend to get xapp config
-    // const path = this.dashboardSvc.buildPath(this.component, instanceKey, 'config');
-    // return this.httpClient.get<any[]>(path);
+    const path = this.dashboardSvc.buildPath(this.component, instanceKey, 'config');
+    return this.httpClient.get<any[]>(path);
   }
 
   putConfig(instanceKey: string, config: XMXappConfig): Observable<HttpResponse<Object>> {