This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1504 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit b4e68b6f38b07bcd3e34f1941d2314ec1df72583 Author: Dmytro Gnatyshyn <[email protected]> AuthorDate: Tue Feb 4 12:09:19 2020 +0200 [DLAB-1504]: Fixed cluster issues during notebook stopping/termination --- .../webapp/src/app/administration/management/management.model.ts | 4 +++- .../confirmation-dialog/confirmation-dialog.component.html | 2 +- .../modal-dialog/confirmation-dialog/confirmation-dialog.model.ts | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts index 86d553f..4e7a663 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts @@ -27,6 +27,7 @@ export class EnvironmentModel { public ip: string, public type?: string, public project?: string, + public cloud_provider?: string ) { } public static loadEnvironments(data: Array<any>) { @@ -40,6 +41,7 @@ export class EnvironmentModel { value.public_ip, value.resource_type, value.project, + value.cloud_provider )); } } @@ -99,4 +101,4 @@ export class ManagementConfigModel { this.statuses = []; this.resources = []; } -} \ No newline at end of file +} diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.html index 950b773..30155fe 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.html @@ -48,7 +48,7 @@ <div class="status" [ngClass]="{ 'stopped': !confirmationType && resource.image === 'docker.dlab-dataengine', 'terminated': resource.image === 'docker.dlab-dataengine-service' || confirmationType }"> {{ (!confirmationType && resource.image === 'docker.dlab-dataengine') ? 'Stopped' : 'Terminated' }}</div> - <div class="size">{{ resource[DICTIONARY[notebook.cloud_provider][resource.image].master_node_shape] }} </div> + <div class="size">{{ resource[DICTIONARY[notebook.cloud_provider.toLowerCase()][resource.image].master_node_shape] }} </div> </mat-list-item> </div> </mat-list> diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.model.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.model.ts index 5b05247..41c31cc 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.model.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.model.ts @@ -57,10 +57,10 @@ export class ConfirmationDialogModel { public isAliveResources(resources): boolean { if (resources) { for (let i = 0; i < resources.length; i++) { - if (resources[i].status.toLowerCase() != 'failed' - && resources[i].status.toLowerCase() != 'terminated' - && resources[i].status.toLowerCase() != 'terminating' - && resources[i].status.toLowerCase() != 'stopped') + if (resources[i].status.toLowerCase() !== 'failed' + && resources[i].status.toLowerCase() !== 'terminated' + && resources[i].status.toLowerCase() !== 'terminating' + && resources[i].status.toLowerCase() !== 'stopped') return true; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
