X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dashboard%2Fwebapp-frontend%2Fsrc%2Fapp%2Fcatalog%2Fcatalog.component.ts;h=bab515a7369d3fde8cb6064bf0c6b5b135e0f4b0;hb=8139455dc6a9db3958ececed5a54f5dc3541d429;hp=ad90b361037e7760b296dcb35a0107c1af72d057;hpb=64a5e9470799236f0af4ce2df98f77c94eb1bed3;p=portal%2Fric-dashboard.git

diff --git a/dashboard/webapp-frontend/src/app/catalog/catalog.component.ts b/dashboard/webapp-frontend/src/app/catalog/catalog.component.ts
index ad90b361..bab515a7 100644
--- a/dashboard/webapp-frontend/src/app/catalog/catalog.component.ts
+++ b/dashboard/webapp-frontend/src/app/catalog/catalog.component.ts
@@ -17,21 +17,20 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { MatSort } from '@angular/material/sort';
 import { Subscription } from 'rxjs';
-import { finalize } from 'rxjs/operators';
+import { XMXapp } from '../interfaces/app-mgr.types';
 import { RicInstance } from '../interfaces/dashboard.types';
-import { XMDeployableApp } from '../interfaces/app-mgr.types';
 import { AppMgrService } from '../services/app-mgr/app-mgr.service';
 import { InstanceSelectorService } from '../services/instance-selector/instance-selector.service';
-import { LoadingDialogService } from '../services/ui/loading-dialog.service';
-import { UiService } from '../services/ui/ui.service';
-import { AppConfigurationComponent } from './../app-configuration/app-configuration.component';
 import { ConfirmDialogService } from '../services/ui/confirm-dialog.service';
+import { LoadingDialogService } from '../services/ui/loading-dialog.service';
 import { NotificationService } from '../services/ui/notification.service';
+import { UiService } from '../services/ui/ui.service';
+import { DeployDialogComponent } from '../ui/deploy-dialog/deploy-dialog.component';
+import { OnboardComponent } from './../onboard/onboard.component';
 import { CatalogDataSource } from './catalog.datasource';
 
 @Component({
@@ -52,9 +51,7 @@ export class CatalogComponent implements OnInit, OnDestroy {
 
   constructor(
     private appMgrService: AppMgrService,
-    private confirmDialogService: ConfirmDialogService,
     private dialog: MatDialog,
-    private loadingDialogService: LoadingDialogService,
     private notificationService: NotificationService,
     public instanceSelectorService: InstanceSelectorService,
     public ui: UiService) { }
@@ -77,52 +74,45 @@ export class CatalogComponent implements OnInit, OnDestroy {
     this.instanceChange.unsubscribe();
   }
 
-  onConfigureApp(xapp: XMDeployableApp): void {
+  onDeployApp(app: XMXapp): void {
     if (this.darkMode) {
       this.panelClass = 'dark-theme';
     } else {
       this.panelClass = '';
     }
-    const dialogRef = this.dialog.open(AppConfigurationComponent, {
+    const dialogRef = this.dialog.open(DeployDialogComponent, {
       panelClass: this.panelClass,
-      width: '40%',
-      maxHeight: '500px',
+      width: '400px',
+      maxHeight: '1000px',
       position: {
         top: '10%'
       },
       data: {
-        xapp: xapp,
+        xappName: app.name,
         instanceKey: this.instanceKey
       }
 
     });
   }
 
-  onDeployApp(app: XMDeployableApp): void {
-    this.confirmDialogService.openConfirmDialog('Deploy application ' + app.name + '?')
-      .afterClosed().subscribe((res: boolean) => {
-        if (res) {
-          this.loadingDialogService.startLoading('Deploying ' + app.name);
-          this.appMgrService.deployXapp(this.instanceKey, app.name)
-            .pipe(
-              finalize(() => this.loadingDialogService.stopLoading())
-            )
-            .subscribe(
-              (response: HttpResponse<Object>) => {
-                this.notificationService.success('App deploy succeeded!');
-              },
-              ((her: HttpErrorResponse) => {
-                // the error field should have an ErrorTransport object
-                let msg = her.message;
-                if (her.error && her.error.message) {
-                  msg = her.error.message;
-                }
-                this.notificationService.warn('App deploy failed: ' + msg);
-              })
-            );
-        }
+  onboard(): void {
+    if (this.darkMode) {
+      this.panelClass = 'dark-theme';
+    } else {
+      this.panelClass = '';
+    }
+    const dialogRef = this.dialog.open(OnboardComponent, {
+      panelClass: this.panelClass,
+      width: '400px',
+      maxHeight: '1000px',
+      position: {
+        top: '10%'
+      },
+      data: {
+        instanceKey: this.instanceKey
       }
-      );
+
+    });
   }
 
 }