You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/03/25 12:04:27 UTC
[incubator-dlab] branch DLAB-1590 updated (b9dc738 -> 3befbd18)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DLAB-1590
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from b9dc738 [DLAB-1590] Admin per project
add 5e03cd4 [DLAB-1647]: Action for notebook depend on edge node status. (#669)
add 0e3d531 [DLAB-1648]: Conveyed all resources which will be terminated during edge deletion (#670)
add bf0e539 [DLAB-1657]: added endpoint name to notebook image name
add 0f5b520 [DLAB-1657]: formatted code
add c5fb923 Merge pull request #671 from apache/DLAB-1657
add 658dfef [Dlab 1661]: Grouped Compute/Notebook shapes by clouds (#673)
add 239eb05 [DLAB-1654]: Made modal windows static if user is not assigned to a project (#674)
new e7ab0d7 Merge branch 'DLAB-1590' of github.com:apache/incubator-dlab into DLAB-1590
new 3befbd18 Deleted requests which was not used
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../general/scripts/aws/common_prepare_notebook.py | 6 +-
.../scripts/azure/common_prepare_notebook.py | 6 +-
.../epam/dlab/backendapi/dao/UserRoleDaoImpl.java | 2 +
.../dlab/backendapi/resources/dto/UserRoleDto.java | 2 +
.../src/main/resources/mongo/aws/mongo_roles.json | 28 +++++++++
.../main/resources/mongo/azure/mongo_roles.json | 23 +++++++
.../src/main/resources/mongo/gcp/mongo_roles.json | 26 ++++++++
.../management/management.component.ts | 73 +++++++++++-----------
.../administration/project/project.component.html | 3 +-
.../administration/project/project.component.ts | 37 ++++++++++-
.../app/administration/roles/roles.component.ts | 9 +--
.../services/applicationServiceFacade.service.ts | 16 -----
.../src/app/core/services/healthStatus.service.ts | 9 ---
.../src/app/core/services/project.service.ts | 27 --------
.../src/app/reporting/reporting.component.ts | 1 -
.../ami-create-dialog.component.html | 4 +-
.../resources-grid/resources-grid.component.html | 6 +-
.../resources-grid/resources-grid.component.ts | 10 ++-
.../src/app/resources/resources.component.html | 2 +-
.../multi-level-select-dropdown.component.html | 26 +++++++-
.../multi-level-select-dropdown.component.scss | 4 +-
.../multi-level-select-dropdown.component.ts | 39 +++++++++++-
.../notification-dialog.component.ts | 36 ++++++++++-
.../webapp/src/assets/styles/_dialogs.scss | 1 +
24 files changed, 279 insertions(+), 117 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: Deleted requests which was not used
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1590
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 3befbd18f32ec5b8c7a52defb4b921dcf71e4258
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Wed Mar 25 14:03:19 2020 +0200
Deleted requests which was not used
---
.../administration/management/management.component.ts | 3 +--
.../core/services/applicationServiceFacade.service.ts | 10 ----------
.../src/app/core/services/healthStatus.service.ts | 9 ---------
.../webapp/src/app/core/services/project.service.ts | 18 ------------------
4 files changed, 1 insertion(+), 39 deletions(-)
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 477b872..87e554d 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
@@ -96,10 +96,9 @@ export class ManagementComponent implements OnInit {
}
openManageEnvironmentDialog() {
- this.projectService.getProjectsManagingList().subscribe(projectsList => {
+ this.projectService.getProjectsList().subscribe(projectsList => {
this.getTotalBudgetData().subscribe(total => {
this.dialogRef = this.dialog.open(ManageEnvironmentComponent, { data: { projectsList, total }, panelClass: 'modal-sm' });
- // this.dialogRef.componentInstance.manageEnv.subscribe((data) => this.manageEnvironment(data));
this.dialogRef.afterClosed().subscribe(result => result && this.setBudgetLimits(result));
}, () => this.toastr.error('Failed users list loading!', 'Oops!'));
});
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 121188e..75d2087 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
@@ -418,16 +418,6 @@ export class ApplicationServiceFacade {
null);
}
- public buildManageEnvironment(action, data): Observable<any> {
- return this.buildRequest(HTTPMethod.POST,
- this.requestRegistry.Item(ApplicationServiceFacade.ENV) + action,
- data,
- {
- observe: 'response',
- headers: { 'Content-Type': 'text/plain' }
- });
- }
-
public buildGetAllEnvironmentData(): Observable<any> {
return this.buildRequest(HTTPMethod.GET,
this.requestRegistry.Item(ApplicationServiceFacade.FULL_ACTIVE_LIST),
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/healthStatus.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/healthStatus.service.ts
index d593d08..531e8b7 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/healthStatus.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/healthStatus.service.ts
@@ -136,15 +136,6 @@ export class HealthStatusService {
catchError(ErrorUtils.handleServiceError));
}
- public manageEnvironment(act, data): Observable<Response | {}> {
- const action = `/${act}`;
- return this.applicationServiceFacade
- .buildManageEnvironment(action, data)
- .pipe(
- map(response => response),
- catchError(ErrorUtils.handleServiceError));
- }
-
public getSsnMonitorData(): Observable<{}> {
return this.applicationServiceFacade
.buildGetSsnMonitorData()
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 0bb54b5..ccf93f8 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
@@ -52,15 +52,6 @@ export class ProjectService {
catchError(ErrorUtils.handleServiceError));
}
- public getProjectsManagingList(): Observable<{}> {
- const params = '/managing';
- return this.applicationServiceFacade
- .buildGetUserProjectsList(params)
- .pipe(
- map(response => response),
- catchError(ErrorUtils.handleServiceError));
- }
-
public getUserProjectsList(isActive?): Observable<{}> {
const params = isActive ? '/me?active=true' : '';
return this.applicationServiceFacade
@@ -79,15 +70,6 @@ export class ProjectService {
catchError(ErrorUtils.handleServiceError));
}
- public stopProjectAction(data): Observable<{}> {
- const url = `/managing/stop/${data}`;
- return this.applicationServiceFacade
- .buildToggleProjectStatus(url, data)
- .pipe(
- map(response => response),
- catchError(ErrorUtils.handleServiceError));
- }
-
public updateProjectsBudget(data): Observable<{}> {
const url = '/budget';
return this.applicationServiceFacade
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: Merge branch 'DLAB-1590' of
github.com:apache/incubator-dlab into DLAB-1590
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1590
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit e7ab0d7dbf7771ea2ee9ec532d8929da2fa5a9c7
Merge: 239eb05 b9dc738
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Wed Mar 25 13:40:36 2020 +0200
Merge branch 'DLAB-1590' of github.com:apache/incubator-dlab into DLAB-1590
.../ProjectAdmin.java} | 21 ++--
.../User.java} | 21 ++--
.../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 19 ---
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 -
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 11 +-
.../dlab/backendapi/domain/ProjectManagingDTO.java | 16 ---
.../interceptor/ProjectAdminInterceptor.java | 74 ++++++++++++
.../backendapi/modules/AwsSelfServiceModule.java | 83 -------------
.../backendapi/modules/AzureSelfServiceModule.java | 81 -------------
.../backendapi/modules/CloudProviderModule.java | 5 +
.../backendapi/modules/GcpSelfServiceModule.java | 84 --------------
.../dlab/backendapi/modules/ModuleFactory.java | 13 ---
.../backendapi/resources/EnvironmentResource.java | 2 +-
.../resources/InfrastructureInfoResource.java | 11 +-
.../dlab/backendapi/resources/ProjectResource.java | 52 +++------
.../resources/dto/HealthStatusPageDTO.java | 129 +--------------------
.../com/epam/dlab/backendapi/roles/UserRole.java | 13 +--
.../com/epam/dlab/backendapi/roles/UserRoles.java | 58 ++++++---
.../backendapi/service/EnvironmentService.java | 6 +-
.../service/InfrastructureInfoService.java | 2 +-
.../dlab/backendapi/service/ProjectService.java | 13 +--
.../service/impl/EnvironmentServiceImpl.java | 13 +--
.../impl/InfrastructureInfoServiceImpl.java | 22 ++--
.../service/impl/ProjectServiceImpl.java | 65 +++--------
.../service/impl/UserGroupServiceImpl.java | 6 +-
.../src/main/resources/mongo/gcp/mongo_roles.json | 17 +++
.../resources/EnvironmentResourceTest.java | 8 +-
.../resources/InfrastructureInfoResourceTest.java | 34 ++++--
.../backendapi/resources/ProjectResourceTest.java | 24 ++--
.../service/impl/EnvironmentServiceImplTest.java | 24 ----
.../service/impl/UserGroupServiceImplTest.java | 13 ++-
31 files changed, 284 insertions(+), 658 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org