You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/07/10 15:53:16 UTC
[incubator-dlab] 13/19: [DLAB-834]: stop edge node confirmation
fixes
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit b349d54a7d4ccc9bdc30b1970ce9690c4d18549a
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue Jul 9 13:27:57 2019 +0300
[DLAB-834]: stop edge node confirmation fixes
---
.../management/management-grid/management-grid.component.html | 1 -
.../src/app/administration/management/management.component.ts | 7 -------
.../modal-dialog/confirmation-dialog/confirmation-dialog.model.ts | 4 ++--
3 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
index 7933342..ff15225 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
@@ -117,7 +117,6 @@
</ng-container>
<ng-container matColumnDef="placeholder">
<td mat-footer-cell *matFooterCellDef colspan="6" class="info">
- <span *ngIf="loading">LOADING</span>
To start working, please, create new environment
</td>
</ng-container>
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
index abcf6e3..a123e2f 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
@@ -154,18 +154,11 @@ export class ManagementComponent implements OnInit {
});
}
- // private getAllEnvironmentData() {
- // this.manageEnvironmentsService
- // .getAllEnvironmentData()
- // .subscribe((result: Array<EnvironmentModel>) => this.allEnvironmentData = result);
- // }
-
private getEnvironmentHealthStatus() {
this.healthStatusService
.getEnvironmentStatuses()
.subscribe((status: GeneralEnvironmentStatus) => {
this.healthStatus = status;
- // this.healthStatus.admin && this.getAllEnvironmentData();
this.getExploratoryList();
});
}
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 7a8e093..5b05247 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
@@ -61,7 +61,7 @@ export class ConfirmationDialogModel {
&& resources[i].status.toLowerCase() != 'terminated'
&& resources[i].status.toLowerCase() != 'terminating'
&& resources[i].status.toLowerCase() != 'stopped')
- return true;
+ return true;
}
}
@@ -94,7 +94,7 @@ export class ConfirmationDialogModel {
const defaultTerminateMessage = 'Notebook server will be terminated.';
const containRunningResourcesTerminateMessage = 'Notebook server and all computational resources will be terminated.';
- const edgeNodeStopMessage = 'Edge node will be stopped. You will need to start it later to proceed working with DLAB.';
+ const edgeNodeStopMessage = 'Edge node will be stopped. You will need to start it later to proceed working with project.';
switch (confirmationType) {
case ConfirmationDialogType.StopExploratory: {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org