Code Review
/
src
/
xds
/
xds-agent.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Added Supervision/Monitoring support
[src/xds/xds-agent.git]
/
webapp
/
src
/
app
/
pages
/
sdks
/
sdk-management
/
sdk-management.component.ts
diff --git
a/webapp/src/app/pages/sdks/sdk-management/sdk-management.component.ts
b/webapp/src/app/pages/sdks/sdk-management/sdk-management.component.ts
index
c885238
..
6e9b81b
100644
(file)
--- a/
webapp/src/app/pages/sdks/sdk-management/sdk-management.component.ts
+++ b/
webapp/src/app/pages/sdks/sdk-management/sdk-management.component.ts
@@
-1,6
+1,6
@@
/**
* @license
/**
* @license
-* Copyright (C) 2017 "IoT.bzh"
+* Copyright (C) 2017
-2018
"IoT.bzh"
* Author Sebastien Douheret <sebastien@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Author Sebastien Douheret <sebastien@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-24,7
+24,7
@@
import { ConfirmModalComponent, EType } from '../../confirm/confirm-modal/confir
import { SdkInstallComponent } from './sdk-install.component';
import { AlertService } from '../../../@core-xds/services/alert.service';
import { SdkInstallComponent } from './sdk-install.component';
import { AlertService } from '../../../@core-xds/services/alert.service';
-import { SdkService, ISdk } from '../../../@core-xds/services/sdk.service';
+import { SdkService, ISdk
, StatusType
} from '../../../@core-xds/services/sdk.service';
import { ISdkMessage } from '../../../@core-xds/services/xdsagent.service';
interface ISdkMgt extends ISdk {
import { ISdkMessage } from '../../../@core-xds/services/xdsagent.service';
interface ISdkMgt extends ISdk {
@@
-90,7
+90,7
@@
export class SdkManagementComponent implements OnInit {
this.sdks = [];
sdks.forEach(s => {
// only display not installed SDK
this.sdks = [];
sdks.forEach(s => {
// only display not installed SDK
- if (s.status !==
'Not Installed'
) {
+ if (s.status !==
StatusType.NOT_INSTALLED
) {
return;
}
profMap[s.profile] = s.profile;
return;
}
profMap[s.profile] = s.profile;
@@
-141,15
+141,20
@@
export class SdkManagementComponent implements OnInit {
modal.result.then(res => {
if (res === 'yes') {
modal.result.then(res => {
if (res === 'yes') {
- // Request installation
- this.sdkSvr.install(sdk).subscribe(r => { }, err => this.alert.error(err));
-
const modalInstall = this.modalService.open(SdkInstallComponent, {
size: 'lg',
backdrop: 'static',
container: 'nb-layout',
});
modalInstall.componentInstance.sdk = sdk;
const modalInstall = this.modalService.open(SdkInstallComponent, {
size: 'lg',
backdrop: 'static',
container: 'nb-layout',
});
modalInstall.componentInstance.sdk = sdk;
+
+ // Request installation
+ this.sdkSvr.install(sdk).subscribe(
+ r => { },
+ err => {
+ modalInstall.dismiss('SDK install failure');
+ this.alert.error(err);
+ });
}
});
}
});