This is an automated email from the ASF dual-hosted git repository. ofuks pushed a commit to branch DLAB-1571 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit b190bcaaa1de0b90c09720fdcfcb55df019ec047 Merge: 435d3a1 e266731 Author: Oleh Fuks <olegfuk...@gmail.com> AuthorDate: Sun Mar 29 16:30:15 2020 +0300 Merge branch 'DLAB-1590' into DLAB-1571 # Conflicts: # services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceImpl.java # services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts # services/self-service/src/test/java/com/epam/dlab/backendapi/resources/InfrastructureInfoResourceTest.java .../general/scripts/aws/common_prepare_notebook.py | 6 +- .../scripts/azure/common_prepare_notebook.py | 6 +- .../ProjectAdmin.java} | 20 ++- .../UserRoleService.java => annotation/User.java} | 20 ++- .../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 19 --- .../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 - .../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 11 +- .../com/epam/dlab/backendapi/dao/UserGroupDao.java | 2 - .../epam/dlab/backendapi/dao/UserGroupDaoImpl.java | 5 - .../com/epam/dlab/backendapi/dao/UserRoleDao.java | 4 +- .../epam/dlab/backendapi/dao/UserRoleDaoImpl.java | 20 +-- .../dlab/backendapi/domain/ProjectManagingDTO.java | 16 --- .../interceptor/ProjectAdminInterceptor.java | 74 ++++++++++ .../backendapi/modules/CloudProviderModule.java | 5 + .../backendapi/resources/EnvironmentResource.java | 20 +-- .../resources/InfrastructureInfoResource.java | 4 +- .../dlab/backendapi/resources/ProjectResource.java | 52 +++---- .../backendapi/resources/UserGroupResource.java | 67 +++------ .../backendapi/resources/UserRoleResource.java | 8 +- .../resources/dto/HealthStatusPageDTO.java | 129 +---------------- .../dlab/backendapi/resources/dto/UserRoleDto.java | 2 + .../com/epam/dlab/backendapi/roles/UserRole.java | 13 +- .../com/epam/dlab/backendapi/roles/UserRoles.java | 58 ++++++-- .../backendapi/service/EnvironmentService.java | 8 +- .../service/InfrastructureInfoService.java | 2 +- .../dlab/backendapi/service/ProjectService.java | 13 +- .../dlab/backendapi/service/UserGroupService.java | 12 +- .../dlab/backendapi/service/UserRoleService.java | 3 +- .../backendapi/service/UserRoleServiceImpl.java | 20 ++- .../service/impl/EnvironmentServiceImpl.java | 81 +++++------ .../impl/InfrastructureInfoServiceImpl.java | 21 +-- .../service/impl/ProjectServiceImpl.java | 65 +++------ .../service/impl/UserGroupServiceImpl.java | 86 +++++++----- .../src/main/resources/mongo/aws/mongo_roles.json | 47 +++++++ .../main/resources/mongo/azure/mongo_roles.json | 42 ++++++ .../src/main/resources/mongo/gcp/mongo_roles.json | 46 ++++++ .../management/management.component.ts | 73 +++++----- .../administration/management/management.model.ts | 1 + .../administration/project/project.component.html | 5 +- .../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 | 11 +- .../src/app/core/services/project.service.ts | 27 ---- .../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 ++++- .../src/app/shared/navbar/navbar.component.html | 2 +- .../webapp/src/assets/styles/_dialogs.scss | 1 + .../resources/EnvironmentResourceTest.java | 97 +------------ .../resources/InfrastructureInfoResourceTest.java | 23 +-- .../backendapi/resources/ProjectResourceTest.java | 24 +--- .../resources/UserGroupResourceTest.java | 155 +++++++-------------- .../backendapi/resources/UserRoleResourceTest.java | 11 +- .../service/UserRoleServiceImplTest.java | 42 ++---- .../service/impl/EnvironmentServiceImplTest.java | 71 ---------- .../service/impl/UserGroupServiceImplTest.java | 150 +++++++------------- 62 files changed, 850 insertions(+), 1041 deletions(-) diff --cc services/self-service/src/main/java/com/epam/dlab/backendapi/modules/CloudProviderModule.java index f251b01,2884aa6..8b41baf --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/CloudProviderModule.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/CloudProviderModule.java @@@ -21,8 -21,14 +21,10 @@@ package com.epam.dlab.backendapi.module import com.epam.dlab.backendapi.SelfServiceApplication; import com.epam.dlab.backendapi.annotation.BudgetLimited; + import com.epam.dlab.backendapi.annotation.ProjectAdmin; import com.epam.dlab.backendapi.conf.SelfServiceApplicationConfiguration; -import com.epam.dlab.backendapi.dao.BillingDAO; -import com.epam.dlab.backendapi.dao.aws.AwsBillingDAO; -import com.epam.dlab.backendapi.dao.azure.AzureBillingDAO; -import com.epam.dlab.backendapi.dao.gcp.GcpBillingDao; import com.epam.dlab.backendapi.interceptor.BudgetLimitInterceptor; + import com.epam.dlab.backendapi.interceptor.ProjectAdminInterceptor; import com.epam.dlab.backendapi.resources.BillingResource; import com.epam.dlab.backendapi.resources.aws.ComputationalResourceAws; import com.epam.dlab.backendapi.resources.azure.ComputationalResourceAzure; diff --cc services/self-service/src/main/java/com/epam/dlab/backendapi/service/InfrastructureInfoService.java index a385925,fc3bd9d..ffb3531 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/InfrastructureInfoService.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/InfrastructureInfoService.java @@@ -27,9 -27,9 +27,9 @@@ import com.epam.dlab.dto.Infrastructure import java.util.List; public interface InfrastructureInfoService { - List<ProjectInfrastructureInfo> getUserResources(String user); + List<ProjectInfrastructureInfo> getUserResources(UserInfo user); - HealthStatusPageDTO getHeathStatus(UserInfo user, boolean fullReport, boolean isAdmin); + HealthStatusPageDTO getHeathStatus(UserInfo user, boolean fullReport); InfrastructureMetaInfoDTO getInfrastructureMetaInfo(); } diff --cc services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceImpl.java index 3f86c29,cbb006b..16de358 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceImpl.java @@@ -26,9 -26,10 +26,11 @@@ import com.epam.dlab.backendapi.dao.Env import com.epam.dlab.backendapi.dao.ExploratoryDAO; import com.epam.dlab.backendapi.domain.EndpointDTO; import com.epam.dlab.backendapi.domain.ProjectEndpointDTO; + import com.epam.dlab.backendapi.resources.dto.HealthStatusEnum; import com.epam.dlab.backendapi.resources.dto.HealthStatusPageDTO; import com.epam.dlab.backendapi.resources.dto.ProjectInfrastructureInfo; +import com.epam.dlab.backendapi.service.BillingService; + import com.epam.dlab.backendapi.roles.UserRoles; import com.epam.dlab.backendapi.service.EndpointService; import com.epam.dlab.backendapi.service.InfrastructureInfoService; import com.epam.dlab.backendapi.service.ProjectService; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org