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/03 14:44:10 UTC
[incubator-dlab] 03/04: [DLAB-834]: added stop / start actions to
project service
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 8e861a1a99cabefa476cefda8ddfb2628c3073f6
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Jul 3 17:43:40 2019 +0300
[DLAB-834]: added stop / start actions to project service
---
.../services/applicationServiceFacade.service.ts | 57 +++++++++++++---------
.../src/app/core/services/project.service.ts | 13 ++++-
.../notification-dialog.component.ts | 4 +-
3 files changed, 47 insertions(+), 27 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
index bec6ee9..2cfb52d 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
@@ -95,8 +95,9 @@ export class ApplicationServiceFacade {
return this.buildRequest(RequestMethod.Post,
this.requestRegistry.Item(ApplicationServiceFacade.AUTHORIZE),
body,
- { responseType: 'text',
- headers: { 'Content-Type': 'text/plain'},
+ {
+ responseType: 'text',
+ headers: { 'Content-Type': 'text/plain' },
observe: 'response'
});
}
@@ -112,7 +113,7 @@ export class ApplicationServiceFacade {
return this.buildRequest(RequestMethod.Get,
this.requestRegistry.Item(ApplicationServiceFacade.ACCESS_KEY),
null,
- { observe: 'response'});
+ { observe: 'response' });
}
public buildGenerateAccessKey(): Observable<any> {
@@ -133,8 +134,9 @@ export class ApplicationServiceFacade {
return this.buildRequest(RequestMethod.Post,
this.requestRegistry.Item(ApplicationServiceFacade.ACCESS_KEY),
body,
- { observe: 'response',
- headers: { 'Upload': 'true'}
+ {
+ observe: 'response',
+ headers: { 'Upload': 'true' }
});
}
@@ -142,8 +144,9 @@ export class ApplicationServiceFacade {
return this.buildRequest(RequestMethod.Post,
this.requestRegistry.Item(ApplicationServiceFacade.ACCESS_KEY) + option,
body,
- { observe: 'response',
- headers: { 'Upload': 'true'}
+ {
+ observe: 'response',
+ headers: { 'Upload': 'true' }
});
}
@@ -183,14 +186,14 @@ export class ApplicationServiceFacade {
return this.buildRequest(RequestMethod.Put,
this.requestRegistry.Item(ApplicationServiceFacade.COMPUTATIONAL_RESOURCES_DATAENGINESERVICE),
data,
- { observe: 'response'});
+ { observe: 'response' });
}
public buildCreateComputationalResources_DataengineRequest(data): Observable<any> {
return this.buildRequest(RequestMethod.Put,
this.requestRegistry.Item(ApplicationServiceFacade.COMPUTATIONAL_RESOURCES_DATAENGINE),
data,
- { observe: 'response'});
+ { observe: 'response' });
}
public buildDeleteComputationalResourcesRequest(data): Observable<any> {
@@ -236,21 +239,21 @@ export class ApplicationServiceFacade {
data);
}
- public buildRunEdgeNodeRequest(): Observable<any> {
+ public buildRunEdgeNodeRequest(): Observable<any> {
return this.buildRequest(RequestMethod.Post,
this.requestRegistry.Item(ApplicationServiceFacade.EDGE_NODE_START),
null,
{ responseType: 'text' });
}
- public buildSuspendEdgeNodeRequest(): Observable<any> {
+ public buildSuspendEdgeNodeRequest(): Observable<any> {
return this.buildRequest(RequestMethod.Post,
this.requestRegistry.Item(ApplicationServiceFacade.EDGE_NODE_STOP),
null,
{ responseType: 'text', observe: 'response' });
}
- public buildRecreateEdgeNodeRequest(): Observable<any> {
+ public buildRecreateEdgeNodeRequest(): Observable<any> {
return this.buildRequest(RequestMethod.Post,
this.requestRegistry.Item(ApplicationServiceFacade.EDGE_NODE_RECREATE),
null,
@@ -279,7 +282,7 @@ export class ApplicationServiceFacade {
return this.buildRequest(RequestMethod.Post,
this.requestRegistry.Item(ApplicationServiceFacade.LIB_INSTALL),
data,
- { observe: 'response', responseType: 'text'});
+ { observe: 'response', responseType: 'text' });
}
public buildGetInstalledLibrariesList(data): Observable<any> {
@@ -360,7 +363,7 @@ export class ApplicationServiceFacade {
return this.buildRequest(RequestMethod.Post,
this.requestRegistry.Item(ApplicationServiceFacade.SCHEDULER) + param,
data,
- { observe: 'response'});
+ { observe: 'response' });
}
public buildResetScheduleSettings(data): Observable<any> {
@@ -379,29 +382,31 @@ export class ApplicationServiceFacade {
return this.buildRequest(RequestMethod.Get,
this.requestRegistry.Item(ApplicationServiceFacade.ACTIVE_LIST),
null);
- }
+ }
public buildManageEnvironment(action, data): Observable<any> {
return this.buildRequest(RequestMethod.Post,
this.requestRegistry.Item(ApplicationServiceFacade.ENV) + action,
data,
- { observe: 'response',
- headers: { 'Content-Type': 'text/plain'}
+ {
+ observe: 'response',
+ headers: { 'Content-Type': 'text/plain' }
});
- }
+ }
public buildGetAllEnvironmentData(): Observable<any> {
return this.buildRequest(RequestMethod.Get,
this.requestRegistry.Item(ApplicationServiceFacade.FULL_ACTIVE_LIST),
null);
- }
+ }
public buildEnvironmentManagement(param, data): Observable<any> {
return this.buildRequest(RequestMethod.Post,
this.requestRegistry.Item(ApplicationServiceFacade.ENV) + param,
data,
- { observe: 'response',
- headers: { 'Content-Type': 'text/plain'}
+ {
+ observe: 'response',
+ headers: { 'Content-Type': 'text/plain' }
});
}
@@ -409,7 +414,7 @@ export class ApplicationServiceFacade {
return this.buildRequest(RequestMethod.Put,
this.requestRegistry.Item(ApplicationServiceFacade.BUDGET),
data,
- { observe: 'response'});
+ { observe: 'response' });
}
public buildGetSsnMonitorData(): Observable<any> {
@@ -429,7 +434,7 @@ export class ApplicationServiceFacade {
return this.buildRequest(method,
this.requestRegistry.Item(ApplicationServiceFacade.SETTINGS) + param,
null,
- { observe: 'response'});
+ { observe: 'response' });
}
public buildGetGroupsData(): Observable<any> {
@@ -540,6 +545,12 @@ export class ApplicationServiceFacade {
null);
}
+ public buildToggleProjectStatus(param, data): Observable<any> {
+ return this.buildRequest(RequestMethod.Post,
+ this.requestRegistry.Item(ApplicationServiceFacade.PROJECT) + param,
+ data);
+ }
+
public buildGetEndpointsData(): Observable<any> {
return this.buildRequest(RequestMethod.Get,
this.requestRegistry.Item(ApplicationServiceFacade.ENDPOINT),
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts
index bdb2dc4..3923533 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts
@@ -43,7 +43,7 @@ export class ProjectService {
map(response => response),
catchError(ErrorUtils.handleServiceError));
}
-
+
public getProjectsList(): Observable<{}> {
return this.applicationServiceFacade
.buildGetProjectsList()
@@ -52,7 +52,7 @@ export class ProjectService {
catchError(ErrorUtils.handleServiceError));
}
- public getUserProjectsList(): Observable<{}> {
+ public getUserProjectsList(): Observable<{}> {
return this.applicationServiceFacade
.buildGetUserProjectsList()
.pipe(
@@ -68,4 +68,13 @@ export class ProjectService {
map(response => response),
catchError(ErrorUtils.handleServiceError));
}
+
+ public toggleProjectStatus(data, action): Observable<{}> {
+ const url = `/${action}`;
+ return this.applicationServiceFacade
+ .buildToggleProjectStatus(url, data)
+ .pipe(
+ map(response => response),
+ catchError(ErrorUtils.handleServiceError));
+ }
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
index 6faf871..6469f37 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
@@ -51,7 +51,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
<div *ngIf="data.type === 'confirmation'" class="confirm-dialog">
<p>
<strong class="ellipsis label-name" matTooltip="{{ data.item.name }}" matTooltipPosition="above" [matTooltipDisabled]="data.item.name.length > 35">
- {{ data.item.name }}</strong> will be decommissioned.
+ {{ data.item.name }}</strong> will be {{ data.action || 'decommissioned' }}.
</p>
<p class="m-top-20"><strong>Do you want to proceed?</strong></p>
@@ -81,6 +81,6 @@ export class NotificationDialogComponent {
@Inject(MAT_DIALOG_DATA) public data: any
) {
console.log(data);
-
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org