This is an automated email from the ASF dual-hosted git repository. lfrolov pushed a commit to branch DATALAB-1408 in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 673d9a876b2a4a24bf7be1367a1b4c6d079af82f Merge: 82a329a2f d5e5d035c Author: Leonid Frolov <[email protected]> AuthorDate: Thu Aug 18 10:06:10 2022 +0300 Merge pull request #1676 from apache/DATALAB-2982 Datalab 2982 README.md | 352 +++++++++++++++++ USER_GUIDE.md | 7 + .../src/general/conf/datalab.ini | 8 +- .../src/general/files/aws/jupyter_description.json | 4 +- .../general/files/aws/jupyterlab_description.json | 4 +- .../files/azure/dataengine-service_Dockerfile} | 27 +- .../azure/dataengine-service_description.json | 27 ++ .../general/files/azure/jupyter_description.json | 4 +- .../files/azure/jupyterlab_description.json | 4 +- .../general/files/gcp/jupyter-gpu_description.json | 2 +- .../src/general/files/gcp/jupyter_description.json | 4 +- .../general/files/gcp/jupyterlab_description.json | 4 +- .../general/files/gcp/superset_description.json | 2 +- .../src/general/lib/aws/meta_lib.py | 4 +- .../src/general/lib/os/debian/notebook_lib.py | 4 +- .../src/general/lib/os/debian/ssn_lib.py | 8 +- .../src/general/lib/os/fab.py | 25 +- .../scripts/aws/common_create_notebook_image.py | 2 +- .../aws/common_notebook_configure_dataengine.py | 4 +- .../general/scripts/aws/common_prepare_notebook.py | 7 +- .../scripts/aws/dataengine-service_configure.py | 4 +- .../scripts/aws/dataengine-service_prepare.py | 4 +- .../general/scripts/aws/dataengine_configure.py | 4 +- .../src/general/scripts/aws/dataengine_prepare.py | 4 +- .../src/general/scripts/aws/dataengine_start.py | 4 +- .../src/general/scripts/aws/dataengine_stop.py | 4 +- .../general/scripts/aws/dataengine_terminate.py | 4 +- .../src/general/scripts/aws/jupyter_configure.py | 2 +- .../general/scripts/aws/jupyterlab_configure.py | 2 +- .../src/general/scripts/aws/rstudio_configure.py | 2 +- .../src/general/scripts/aws/ssn_configure.py | 6 +- .../scripts/aws/tensor-jupyterlab_configure.py | 2 +- .../scripts/aws/tensor-rstudio_configure.py | 2 +- .../src/general/scripts/aws/tensor_configure.py | 2 +- .../src/general/scripts/aws/zeppelin_configure.py | 2 +- .../scripts/azure/common_create_notebook_image.py | 2 +- .../scripts/azure/dataengine-service_configure.py | 60 +++ .../scripts/azure/dataengine-service_prepare.py | 4 +- .../scripts/azure/dataengine-service_terminate.py | 99 +++++ .../src/general/scripts/azure/ssn_configure.py | 5 +- .../src/general/scripts/azure/ssn_terminate.py | 20 +- .../scripts/gcp/common_create_notebook_image.py | 2 +- .../src/general/scripts/gcp/ssn_configure.py | 5 +- .../scripts/gcp/ssn_terminate_gcp_resources.py | 21 +- .../general/scripts/os/get_list_available_pkgs.py | 5 +- .../src/general/scripts/os/superset_start.py | 4 +- .../templates/gcp/dataengine-service_cluster.json | 1 + .../templates/os/debian/superset-notebook.service | 2 +- .../src/jupyterlab/Dockerfile_jupyterlab | 10 +- .../src/ssn/scripts/configure_billing.py | 5 + .../src/ssn/scripts/configure_ui.py | 3 +- .../src/superset/templates/docker-compose.yml | 148 +++++-- .../src/superset/templates/docker-init.sh | 58 ++- .../templates/keycloak_security_manager.py | 71 ++++ .../src/superset/templates/requirements-extra.txt | 2 + .../src/superset/templates/superset_config.py | 103 +++-- .../terraform/aws/endpoint/main/instance.tf | 2 +- .../terraform/aws/endpoint/main/network.tf | 17 +- .../terraform/aws/endpoint/main/outputs.tf | 2 +- .../terraform/aws/endpoint/main/variables.tf | 9 + .../terraform/azure/endpoint/main/sg.tf | 76 ++-- .../terraform/azure/endpoint/main/variables.tf | 5 + .../terraform/bin/datalab.py | 7 +- .../terraform/bin/deploy/billing_app_aws.yml | 2 +- .../terraform/bin/deploy/billing_azure.yml | 2 +- .../terraform/bin/deploy/billing_gcp.yml | 2 +- .../terraform/gcp/endpoint/main/network.tf | 4 +- .../terraform/gcp/endpoint/main/variables.tf | 6 +- .../billing-aws/src/main/resources/application.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../billing-gcp/src/main/resources/application.yml | 2 +- .../dto/exploratory/ImageSharingStatus.java | 8 + .../epam/datalab/dto/exploratory/ImageStatus.java | 2 +- .../com/epam/datalab/model/exploratory/Image.java | 1 + .../service/impl/ProjectServiceImpl.java | 2 +- .../mock_response/aws/notebook_create_image.json | 2 +- .../mock_response/azure/notebook_create_image.json | 2 +- .../mock_response/gcp/notebook_create_image.json | 2 +- .../backendapi/dao/ImageExploratoryDAO.java | 7 +- .../backendapi/dao/ImageExploratoryDAOImpl.java | 36 +- .../epam/datalab/backendapi/dao/UserRoleDAO.java | 2 + .../datalab/backendapi/dao/UserRoleDAOImpl.java | 5 + .../datalab/backendapi/dao/UserSettingsDAO.java | 21 + .../backendapi/domain/NotebookTemplate.java | 6 +- .../resources/ImageExploratoryResource.java | 20 +- .../backendapi/resources/dto/ImageFilter.java | 26 +- .../{ImageFilter.java => ImageFilterFormData.java} | 29 +- .../backendapi/resources/dto/ImageInfoRecord.java | 7 +- .../resources/dto/ImageProjectGroupsShareDTO.java} | 19 +- .../resources/dto/ImageUserPermissions.java} | 19 +- ...{ProjectImagesInfo.java => ImagesPageInfo.java} | 9 +- .../resources/dto/ProjectImagesInfo.java | 6 +- .../backendapi/resources/dto/UserRoleDTO.java | 6 +- .../epam/datalab/backendapi/roles/RoleType.java | 1 + .../service/ImageExploratoryService.java | 20 +- .../service/impl/ExploratoryServiceImpl.java | 6 +- .../service/impl/ImageExploratoryServiceImpl.java | 232 +++++++++-- .../main/resources/mongo/general/mongo_roles.json | 25 ++ .../src/main/resources/webapp/package-lock.json | 11 + .../src/main/resources/webapp/package.json | 3 +- .../configuration/configuration.component.ts | 6 +- .../management/endpoints/endpoints.component.ts | 16 +- .../create-odahu-cluster.component.ts | 2 +- .../webapp/src/app/administration/project/index.ts | 8 +- .../administration/project/project-data.service.ts | 2 +- .../project-form/project-form.component.html | 116 +++--- .../project/project-form/project-form.component.ts | 8 +- .../project-list/project-list.component.html | 31 +- .../project-list/project-list.component.scss | 19 +- .../project/project-list/project-list.component.ts | 145 ++++--- .../administration/project/project.component.ts | 29 +- .../project/project.config.ts} | 14 +- .../project/project.model.ts} | 28 +- .../app/administration/roles/roles.component.html | 73 ++-- .../app/administration/roles/roles.component.ts | 4 + .../resources/webapp/src/app/app.routing.module.ts | 15 +- .../resources/webapp/src/app/core/core.module.ts | 2 +- ...click-outside-with-material-select.directive.ts | 25 ++ .../webapp/src/app/core/directives/index.ts | 9 +- .../directives/is-endpoint-active.directive.ts | 60 +++ .../resources/webapp/src/app/core/pipes/index.ts | 3 +- .../index.ts | 8 +- .../is-element-available.pipe.ts} | 13 +- .../index.ts | 8 +- .../library-name-normalize.pipe.ts} | 20 +- .../index.ts | 9 +- .../normalize-dropdown-multi-value.pipe.ts} | 21 +- .../pipes/truncate-text-pipe/truncate-text.pipe.ts | 8 +- .../services/applicationServiceFacade.service.ts | 37 +- .../app/core/services/image-page-resolve.guard.ts | 24 ++ .../webapp/src/app/core/services/index.ts | 1 + .../app/core/services/user-images-page.service.ts | 26 +- .../{pipes/index.ts => util/capitalize-util.ts} | 11 +- .../case-insensitive-sort-util.ts} | 9 +- .../check-endpoint-list-util.ts} | 19 +- .../webapp/src/app/core/util/checkUtils.ts | 2 +- .../resources/webapp/src/app/core/util/index.ts | 3 + .../webapp/src/app/core/util/sortUtils.ts | 2 +- .../audit/audit-grid/audit-grid.component.ts | 42 +- .../create-environment.component.html | 2 +- .../create-environment.component.ts | 17 +- .../detail-dialog/detail-dialog.component.html | 68 ++-- .../detail-dialog/detail-dialog.component.ts | 10 +- .../image-detail-dialog.component.html | 82 ++++ .../image-detail-dialog.component.scss} | 47 ++- .../image-detail-dialog.component.ts | 86 ++++ .../image-detail-dialog.module.ts} | 27 +- .../library-info-modal.component.html | 31 ++ .../library-info-modal.component.scss} | 12 +- .../library-info-modal.component.ts} | 29 +- .../library-info-modal.module.ts} | 16 +- .../page-filter/page-filter.component.html | 214 ++++++++++ .../page-filter/page-filter.component.scss} | 80 ++-- .../page-filter/page-filter.component.ts | 147 +++++++ .../exploratory/page-filter/page-filter.config.ts} | 14 +- .../share-image-dialog.component.html | 41 ++ .../share-image-dialog.component.scss | 45 +++ .../share-image-dialog.component.ts | 52 +++ .../share-image-dialog.module.ts} | 18 +- .../src/app/resources/images/images.component.html | 438 ++++++++++++--------- .../src/app/resources/images/images.component.scss | 174 ++++++++ .../src/app/resources/images/images.component.ts | 221 ++++++++--- .../src/app/resources/images/images.config.ts | 91 ++++- .../src/app/resources/images/images.model.ts | 78 +++- .../src/app/resources/images/images.service.ts | 234 +++++++++++ .../resources-grid/resources-grid.component.scss | 1 - .../resources-grid/resources-grid.component.ts | 2 +- .../webapp/src/app/resources/resources.module.ts | 17 +- .../multi-level-select-dropdown.component.html | 10 +- .../multi-level-select-dropdown.component.ts | 75 ++-- .../confirmation-dialog.component.scss | 36 +- .../notification-dialog.component.ts | 3 +- .../src/app/shared/navbar/navbar.component.html | 4 +- .../src/app/shared/time-picker/ticker.component.ts | 8 +- .../src/main/resources/webapp/src/styles.scss | 9 + .../resources/ImageExploratoryResourceTest.java | 14 +- .../service/impl/BillingServiceImplTest.java | 7 +- .../impl/ImageExploratoryServiceImplTest.java | 12 +- 178 files changed, 4032 insertions(+), 1174 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
