This is an automated email from the ASF dual-hosted git repository. ofuks pushed a change to branch DLAB-1571 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 435d3a1 Remote billing 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) add b9dc738 [DLAB-1590] Admin per project add e7ab0d7 Merge branch 'DLAB-1590' of github.com:apache/incubator-dlab into DLAB-1590 add 3befbd18 Deleted requests which was not used add 555a485 Admin per project add e4bcf7c Admin per project add 8fed687 Admin per project add ca73d94 Admin per project add 9729f01 Admin per project add d753b18 [DLAB-1591]: Add parameters for admin per project add a6aa0d2 Merge remote-tracking branch 'origin/DLAB-1590' into DLAB-1590 add bdaf53b Admin per project refactoring add e266731 Admin per project refactoring new b190bca Merge branch 'DLAB-1590' into DLAB-1571 new d96075e Admin per project 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 +- .../dlab/backendapi/annotation/ProjectAdmin.java | 7 +- .../com/epam/dlab/backendapi/annotation/User.java | 7 +- .../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 19 -- .../epam/dlab/backendapi/dao/ExploratoryDAO.java | 4 + .../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 +- .../backendapi/service/ExploratoryService.java | 4 + .../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/BillingServiceImpl.java | 64 ++++--- .../service/impl/EnvironmentServiceImpl.java | 81 ++++---- .../service/impl/ExploratoryServiceImpl.java | 10 + .../impl/InfrastructureInfoServiceImpl.java | 22 ++- .../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 | 206 +++++---------------- .../backendapi/resources/UserRoleResourceTest.java | 11 +- .../service/UserRoleServiceImplTest.java | 42 ++--- .../service/impl/EnvironmentServiceImplTest.java | 71 ------- .../service/impl/UserGroupServiceImplTest.java | 156 +++++----------- 66 files changed, 889 insertions(+), 1116 deletions(-) copy integration-tests/src/test/java/com/epam/dlab/automation/test/libs/TestDescription.java => services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/ProjectAdmin.java (88%) copy integration-tests/src/test/java/com/epam/dlab/automation/test/libs/TestDescription.java => services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/User.java (88%) delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectManagingDTO.java create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/interceptor/ProjectAdminInterceptor.java --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org