This is an automated email from the ASF dual-hosted git repository. dyankiv pushed a commit to branch DATALAB-2645 in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 06a206c671c4c4806142c4ef63df1298267aa25e Merge: 1ae6687cd 1ec1f989e Author: Denys Yankiv <[email protected]> AuthorDate: Fri Aug 12 14:07:21 2022 +0300 Merge branch 'develop' into DATALAB-2645 README.md | 352 + USER_GUIDE.md | 91 +- billing_page.png | Bin 0 -> 40016 bytes doc/administration_section.png | Bin 0 -> 4551 bytes doc/audit_page.png | Bin 108511 -> 260974 bytes doc/billing_page.png | Bin 61673 -> 40016 bytes doc/bucket_button.png | Bin 79495 -> 219991 bytes doc/configuration_page.png | Bin 51645 -> 181994 bytes doc/configuration_page1.png | Bin 58301 -> 231139 bytes doc/configuration_page_prov.png | Bin 85053 -> 275773 bytes doc/configuration_page_restart.png | Bin 86813 -> 307966 bytes doc/environment_management.png | Bin 79766 -> 226589 bytes doc/image_action_menu.png | Bin 0 -> 3542 bytes doc/images_main.png | Bin 0 -> 77357 bytes doc/jupyter_kernel.png | Bin 191741 -> 130238 bytes doc/library_magic_usage.png | Bin 0 -> 11245 bytes doc/main_page.png | Bin 53433 -> 186860 bytes doc/main_page_filter.png | Bin 93763 -> 236408 bytes doc/upload_or_generate_user_key.png | Bin 56577 -> 52499 bytes doc/user.png | Bin 0 -> 1114 bytes doc/user_information.png | Bin 0 -> 9318 bytes .../scripts/deploy_datalab.py | 4 +- .../src/base/scripts/create_ssh_user.py | 2 +- .../scripts/configure_deep_learning_node.py | 5 +- .../templates/locations/jupyter-gpu.conf} | 26 +- .../src/general/conf/datalab.ini | 22 +- .../files/aws/deeplearning_description.json | 6 +- .../src/general/files/aws/jupyter_description.json | 4 +- .../general/files/aws/jupyterlab_description.json | 4 +- .../src/general/files/aws/rstudio_description.json | 4 +- .../src/general/files/aws/ssn_policy.json | 161 +- .../files/aws/tensor-jupyterlab_description.json | 4 +- .../general/files/azure/jupyter_description.json | 4 +- .../files/azure/jupyterlab_description.json | 4 +- .../general/files/azure/rstudio_description.json | 4 +- .../src/general/files/gcp/jupyter-gpu_Dockerfile | 54 + .../general/files/gcp/jupyter-gpu_description.json | 18 + .../src/general/files/gcp/jupyter_description.json | 4 +- .../general/files/gcp/jupyterlab_description.json | 4 +- .../src/general/files/gcp/rstudio_description.json | 4 +- .../general/files/gcp/superset_description.json | 2 +- .../src/general/lib/aws/meta_lib.py | 4 +- .../src/general/lib/azure/actions_lib.py | 99 +- .../src/general/lib/azure/meta_lib.py | 2 + .../src/general/lib/os/debian/notebook_lib.py | 65 +- .../src/general/lib/os/debian/ssn_lib.py | 16 +- .../src/general/lib/os/fab.py | 83 +- .../scripts/aws/common_create_notebook_image.py | 9 +- .../aws/common_notebook_configure_dataengine.py | 4 +- .../general/scripts/aws/common_prepare_notebook.py | 11 +- .../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 | 8 +- .../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_instance.py | 3 + .../scripts/azure/common_create_notebook_image.py | 2 +- .../scripts/azure/common_prepare_notebook.py | 4 +- .../general/scripts/azure/jupyterlab_configure.py | 6 +- .../src/general/scripts/azure/ssn_configure.py | 7 +- .../src/general/scripts/azure/ssn_terminate.py | 20 +- .../scripts/gcp/common_create_notebook_image.py | 2 +- .../general/scripts/gcp/common_prepare_notebook.py | 10 +- .../src/general/scripts/gcp/dataengine_prepare.py | 4 +- .../general/scripts/gcp/jupyter-gpu_configure.py | 322 + .../src/general/scripts/gcp/ssn_configure.py | 8 +- .../scripts/gcp/ssn_terminate_gcp_resources.py | 21 +- .../general/scripts/os/get_list_available_pkgs.py | 61 +- .../src/general/scripts/os/superset_start.py | 4 +- .../templates/gcp/dataengine-service_cluster.json | 1 + .../templates/os/debian/superset-notebook.service | 2 +- .../src/jupyter-gpu/fabfile.py | 255 + .../scripts/configure_jupyter-gpu_node.py | 159 + .../src/jupyterlab/Dockerfile_jupyterlab | 10 +- .../templates/locations/jupyter-gpu.conf} | 26 +- .../src/ssn/files/aws/mongo_roles.json | 2 +- .../src/ssn/files/gcp/mongo_roles.json | 30 + .../src/ssn/scripts/configure_billing.py | 5 + .../src/ssn/scripts/configure_ui.py | 3 +- .../src/ssn/scripts/docker_build.py | 7 +- .../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/bucket.tf | 8 +- .../terraform/aws/endpoint/main/network.tf | 12 +- .../terraform/aws/endpoint/main/variables.tf | 7 +- .../terraform/azure/endpoint/main/instance.tf | 6 +- .../terraform/azure/endpoint/main/network.tf | 3 +- .../terraform/azure/endpoint/main/sg.tf | 76 +- .../terraform/azure/endpoint/main/variables.tf | 7 +- .../terraform/bin/datalab.py | 29 +- .../terraform/bin/deploy/billing_app_aws.yml | 2 +- .../terraform/bin/deploy/billing_azure.yml | 2 +- .../terraform/bin/deploy/billing_gcp.yml | 2 +- .../terraform/bin/deploy/endpoint_fab.py | 19 +- .../terraform/gcp/endpoint/main/bucket.tf | 1 + .../terraform/gcp/endpoint/main/iam.tf | 2 + .../terraform/gcp/endpoint/main/network.tf | 4 +- .../terraform/gcp/endpoint/main/variables.tf | 12 +- .../terraform/gcp/endpoint/provisioning.py | 2 + .../terraform/gcp/modules/common/iam.tf | 2 + .../terraform/gcp/modules/common/variables.tf | 4 +- package-lock.json | 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 | 5 + .../core/commands/CommandExecutorMock.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 +- .../com/epam/datalab/backendapi/dao/AuditDAO.java | 4 + .../epam/datalab/backendapi/dao/AuditDAOImpl.java | 41 +- .../backendapi/dao/ImageExploratoryDAO.java | 7 +- .../backendapi/dao/ImageExploratoryDAOImpl.java | 42 +- .../epam/datalab/backendapi/dao/UserRoleDAO.java | 2 + .../datalab/backendapi/dao/UserRoleDAOImpl.java | 5 + .../datalab/backendapi/dao/UserSettingsDAO.java | 21 + .../datalab/backendapi/domain/AuditReport.java | 24 + .../AuditReportLine.java} | 28 +- .../backendapi/domain/NotebookTemplate.java | 11 +- .../backendapi/resources/AuditResource.java | 21 + .../backendapi/resources/EnvironmentResource.java | 15 + .../resources/ImageExploratoryResource.java | 32 +- .../resources/callback/ProjectCallback.java | 3 +- .../backendapi/resources/dto/AuditFilter.java | 52 + .../dto/ExploratoryImageCreateFormAdminDTO.java | 24 + .../dto/{ImageInfoRecord.java => ImageFilter.java} | 28 +- ...ageInfoRecord.java => ImageFilterFormData.java} | 27 +- .../backendapi/resources/dto/ImageInfoRecord.java | 19 + ...Record.java => ImageProjectGroupsShareDTO.java} | 12 +- ...geInfoRecord.java => ImageUserPermissions.java} | 14 +- .../{ImageInfoRecord.java => ImagesPageInfo.java} | 33 +- .../resources/dto/ProjectImagesInfo.java} | 24 +- .../backendapi/resources/dto/UserRoleDTO.java | 6 +- .../epam/datalab/backendapi/roles/RoleType.java | 1 + .../datalab/backendapi/service/AuditService.java | 8 + .../backendapi/service/EnvironmentService.java | 2 + .../service/ImageExploratoryService.java | 19 +- .../backendapi/service/impl/AuditServiceImpl.java | 31 +- .../service/impl/EnvironmentServiceImpl.java | 26 +- .../service/impl/ExploratoryServiceImpl.java | 8 +- .../service/impl/ImageExploratoryServiceImpl.java | 242 +- .../service/impl/LibraryServiceImpl.java | 4 +- .../epam/datalab/backendapi/util/AuditUtils.java | 81 + .../epam/datalab/backendapi/util/BillingUtils.java | 2 +- .../src/main/resources/mongo/aws/mongo_roles.json | 2 +- .../src/main/resources/mongo/gcp/mongo_roles.json | 36 + .../main/resources/mongo/general/mongo_roles.json | 25 + .../src/main/resources/webapp/angular.json | 29 +- .../src/main/resources/webapp/package-lock.json | 22672 ++++++++++++++++--- .../src/main/resources/webapp/package.json | 36 +- .../configuration/configuration.component.html | 119 +- .../configuration/configuration.component.ts | 12 +- .../management/endpoints/endpoints.component.ts | 16 +- .../management-grid/management-grid.component.html | 221 +- .../management-grid/management-grid.component.ts | 47 +- .../management/management.component.html | 44 +- .../management/management.component.ts | 87 +- .../administration/management/management.model.ts | 14 +- .../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} | 13 +- .../project/project.model.ts} | 30 +- .../app/administration/roles/roles.component.html | 73 +- .../app/administration/roles/roles.component.ts | 45 +- .../resources/webapp/src/app/app.routing.module.ts | 53 +- .../resources/webapp/src/app/core/core.module.ts | 7 +- ...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/models/index.ts | 2 + .../webapp/src/app/core/models/statusTypes.enum.ts | 4 +- .../{pipes/index.ts => models/templates-name.ts} | 9 +- .../convert-action-type.pipe.ts | 28 +- .../resources/webapp/src/app/core/pipes/index.ts | 2 + .../is-element-available-pipe}/index.ts | 13 +- .../is-element-available.pipe.ts} | 18 +- .../library-name-normalize}/index.ts | 13 +- .../library-name-normalize.pipe.ts} | 29 +- .../normalize-dropdown-multi-value}/index.ts | 14 +- .../normalize-dropdown-multi-value.pipe.ts} | 36 +- .../pipes/truncate-text-pipe/truncate-text.pipe.ts | 8 +- .../src/app/core/services/appRouting.service.ts | 2 +- .../services/applicationServiceFacade.service.ts | 40 +- .../app/core/services/image-page-resolve.guard.ts | 24 + .../webapp/src/app/core/services/index.ts | 2 + .../services/managementEnvironments.service.ts | 6 +- .../app/core/services/user-images-page.service.ts | 59 + .../src/app/core/services/userResource.service.ts | 15 +- .../{pipes/index.ts => util/capitalize-util.ts} | 10 +- .../case-insensitive-sort-util.ts} | 8 +- .../index.ts => util/check-endpoint-list-util.ts} | 14 +- .../webapp/src/app/core/util/checkUtils.ts | 2 +- .../webapp/src/app/core/util/helpUtils.ts | 13 +- .../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 +- .../reporting-grid/reporting-grid.component.html | 2 +- .../reporting-grid/reporting-grid.component.ts | 15 +- .../bucket-browser/bucket-browser.component.ts | 17 +- .../ami-create-dialog.component.html | 16 +- .../ami-create-dialog.component.ts | 32 +- .../create-environment.component.html | 149 +- .../create-environment.component.ts | 42 +- .../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} | 53 +- .../image-detail-dialog.component.ts | 86 + .../image-detail-dialog.module.ts} | 27 +- .../library-info-modal.component.html | 31 + .../library-info-modal.component.scss} | 11 +- .../library-info-modal.component.ts} | 29 +- .../library-info-modal.module.ts} | 19 +- .../page-filter/page-filter.component.html | 214 + .../page-filter/page-filter.component.scss | 67 + .../page-filter/page-filter.component.ts | 147 + .../exploratory/page-filter/page-filter.config.ts} | 16 +- .../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 | 351 + .../src/app/resources/images/images.component.scss | 261 + .../src/app/resources/images/images.component.ts | 271 + .../src/app/resources/images/images.config.ts | 121 + .../src/app/resources/images/images.model.ts | 94 + .../src/app/resources/images/images.service.ts | 234 + .../webapp/src/app/resources/images/index.ts | 2 + .../resources-grid/resources-grid.component.html | 132 +- .../resources-grid/resources-grid.component.scss | 1 - .../resources-grid/resources-grid.component.ts | 71 +- .../resources-grid/resources-grid.model.ts | 7 - .../src/app/resources/resources.component.html | 28 +- .../src/app/resources/resources.component.ts | 2 +- .../webapp/src/app/resources/resources.module.ts | 23 +- .../src/app/shared/bubble/bubble.component.ts | 29 +- .../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 | 121 +- .../src/app/shared/navbar/navbar.component.ts | 29 +- .../webapp/src/app/shared/navbar/navbar.config.ts | 25 +- .../webapp/src/app/shared/time-picker/index.ts | 2 +- .../src/app/shared/time-picker/ticker.component.ts | 8 +- .../src/main/resources/webapp/src/styles.scss | 10 + .../backendapi/resources/AuditResourceTest.java | 53 +- .../resources/ImageExploratoryResourceTest.java | 29 +- .../service/impl/AuditServiceImplTest.java | 76 +- .../service/impl/BillingServiceImplTest.java | 29 +- .../impl/ImageExploratoryServiceImplTest.java | 26 +- 275 files changed, 25993 insertions(+), 5545 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
