Code Review
/
portal
/
ric-dashboard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Adjust CSS and HTML for main container
[portal/ric-dashboard.git]
/
webapp-frontend
/
src
/
app
/
catalog
/
catalog.component.ts
diff --git
a/webapp-frontend/src/app/catalog/catalog.component.ts
b/webapp-frontend/src/app/catalog/catalog.component.ts
index
fd28f0a
..
04b8380
100644
(file)
--- a/
webapp-frontend/src/app/catalog/catalog.component.ts
+++ b/
webapp-frontend/src/app/catalog/catalog.component.ts
@@
-17,65
+17,46
@@
* limitations under the License.
* ========================LICENSE_END===================================
*/
* limitations under the License.
* ========================LICENSE_END===================================
*/
-import { Component, OnInit } from '@angular/core';
-import { LocalDataSource } from 'ng2-smart-table';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { MatSort } from '@angular/material/sort';
+import { ErrorDialogService } from '../services/ui/error-dialog.service';
import { XappMgrService } from '../services/xapp-mgr/xapp-mgr.service';
import { XappMgrService } from '../services/xapp-mgr/xapp-mgr.service';
-import { ConfirmDialogService } from './../services/ui/confirm-dialog.service'
-import { NotificationService } from './../services/ui/notification.service'
-import {
XMXapp } from '../interfaces/xapp-mgr.types
';
+import { ConfirmDialogService } from './../services/ui/confirm-dialog.service'
;
+import { NotificationService } from './../services/ui/notification.service'
;
+import {
CatalogDataSource } from './catalog.datasource
';
@Component({
selector: 'app-catalog',
templateUrl: './catalog.component.html',
@Component({
selector: 'app-catalog',
templateUrl: './catalog.component.html',
- styleUrls: ['./catalog.component.css']
+ styleUrls: ['./catalog.component.css']
,
})
export class CatalogComponent implements OnInit{
})
export class CatalogComponent implements OnInit{
- settings = {
- hideSubHeader: true,
- actions: {
- columnTitle: 'Actions',
- add: false,
- edit: false,
- delete: false,
- custom: [
- { name: 'deployxApp', title: 'Deploy' },
- ],
- position: 'right'
-
- },
- columns: {
- name: {
- title: 'xApp Name',
- type: 'string',
- },
- version: {
- title: 'xApp Version',
- type: 'string',
- },
- status: {
- title: 'Status',
- type: 'string',
- },
- },
- };
-
- source: LocalDataSource = new LocalDataSource();
+ displayedColumns: string[] = ['name', 'version', 'status', 'action'];
+ dataSource: CatalogDataSource;
+ @ViewChild(MatSort) sort: MatSort;
constructor(
private xappMgrSvc: XappMgrService,
private confirmDialogService: ConfirmDialogService,
constructor(
private xappMgrSvc: XappMgrService,
private confirmDialogService: ConfirmDialogService,
+ private errorService: ErrorDialogService,
private notification: NotificationService) { }
ngOnInit() {
private notification: NotificationService) { }
ngOnInit() {
- this.xappMgrSvc.getAll().subscribe((xapps: XMXapp[]) => this.source.load(xapps));
+ this.dataSource = new CatalogDataSource(this.xappMgrSvc, this.sort );
+ this.dataSource.loadTable();
+ }
+
+ onConfigurexApp(name: string): void {
+ const aboutError = 'Not implemented yet';
+ this.errorService.displayError(aboutError);
}
}
- onDeployxApp(
event
): void {
+ onDeployxApp(
name: string
): void {
this.confirmDialogService.openConfirmDialog('Are you sure you want to deploy this xApp?')
.afterClosed().subscribe(res => {
if (res) {
this.confirmDialogService.openConfirmDialog('Are you sure you want to deploy this xApp?')
.afterClosed().subscribe(res => {
if (res) {
- this.xappMgrSvc.deployXapp(
event.data.
name).subscribe(
+ this.xappMgrSvc.deployXapp(name).subscribe(
response => {
switch (response.status) {
case 200:
response => {
switch (response.status) {
case 200: