Fixed project terminating
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
index 216d79c..d0ab9dc 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
@@ -162,11 +162,11 @@
if (action === 'stop') {
this.dialog.open(ConfirmationDialogComponent, {
- data: { notebook: environment, type: type, manageAction: this.isAdmin }, panelClass: 'modal-md'
+ data: { notebook: environment, type: type, manageAction: true }, panelClass: 'modal-md'
}).afterClosed().subscribe(() => this.buildGrid());
} else if (action === 'terminate') {
this.dialog.open(ConfirmationDialogComponent, {
- data: { notebook: environment, type: ConfirmationDialogType.TerminateExploratory, manageAction: this.isAdmin }, panelClass: 'modal-md'
+ data: { notebook: environment, type: ConfirmationDialogType.TerminateExploratory, manageAction: true }, panelClass: 'modal-md'
}).afterClosed().subscribe(() => this.buildGrid());
} else if (action === 'run') {
this.healthStatusService.runEdgeNode().subscribe(() => {
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
index d9b855e..d7442de 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
@@ -122,12 +122,12 @@
private toggleStatusRequest(data, action) {
if ( action === 'terminate') {
- const projectsResources = this.resources
- .filter(resource => resource.project === data.project_name )[0].exploratory
- .filter(expl => expl.status !== 'terminated' && expl.status !== 'terminating' && expl.status !== 'failed');
+ const projectsResources = this.resources.filter(resource => resource.project === data.project_name );
+ const activeProjectsResources = projectsResources.length ? projectsResources[0].exploratory
+ .filter(expl => expl.status !== 'terminated' && expl.status !== 'terminating' && expl.status !== 'failed') : [];
let termResources = [];
data.endpoint.forEach(v => {
- termResources = [...termResources, ...projectsResources.filter(resource => resource.endpoint === v)];
+ termResources = [...termResources, ...activeProjectsResources.filter(resource => resource.endpoint === v)];
});
this.dialog.open(NotificationDialogComponent, { data: {
