You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2021/02/25 10:02:05 UTC

[incubator-datalab] branch DATALAB-2091 updated (7711002 -> 4b97403)

This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a change to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.


    from 7711002  [DATALAB-2091]: changed npm build
     add ac5b271  [DATALAB-2274] added hints for actions description on audit page (#1062)
     add cbbbba3  [DATALAB-2276]: Applied vertical central alignment for grid values at project page (#1063)
     add b1dbf99  [DATALAB-1716] - showed absent values in "Billing report"
     add 17b2779  [DATALAB-2278]: Changed names for services and messages on configuration page (#1064)
     add c946031  [DATALAB-2282]: Fixed SSN deployment error (#1066)
     add 9f018cf  [DATALAB-2260] added hints for values in user column, align question icon on billimg page (#1065)
     add fe326bf  [DATALAB-2280]: Applied central horizontal alignment to confirmation message in bucket browser (#1068)
     add e73b341  [DATALAB-2283]: Fixed SSN deployment fails (#1069)
     add 37aa487  [DATALAB-2286]: specified pbdZMQ version for R 3.4.4
     add cb0bb49  Merge pull request #1070 from apache/DATALAB-2286
     add 749bc98  Merge branch 'develop' of https://github.com/apache/incubator-datalab into develop
     add 6748a70  [DATALAB-2228] - added possibility of change properties on external endpoint
     add 81ef75a  [DATALAB-2228] - added possibility of change properties on external endpoint
     add ead9a79  Addded service layer
     add 5bdd230  [DATALAB-2228] - refactoring
     add d5088ad  [DATALAB-2228] - refactoring
     add ebd071d  [DATALAB-2228] - refactoring
     add 96d6e2e  [DATALAB-2228] - refactoring
     add bc19bbb  [DATALAB-2228] - added GKE support
     add f8a7a5d  Update self-service.yml
     add 92ad6e7  Update ChangePropertiesResource.java
     add fe5caec  [DATALAB-2279] added hints for names on audit and roles pages, applied fixed size of 'Roles' dropdown (#1071)
     add 9ec326c  [DATALAB-2188]: Extended validation for library installation (#1072)
     add 78e8ef7  [DATALAB-2292]: specified rsa version for gcp base image
     add 03773ed  Merge pull request #1073 from apache/DATALAB-2292
     add 3b467e6  [DATALAB-2287] changed scrollbar for some elements (#1074)
     add 85a6f13  [DATALAB-2290]: Added vertical scrollbar for groups on project page (#1075)
     add 9bda6de   [DATALAB-2289]: Enhancement for the dropdown lists (#1076)
     add ba2c23e  [DATALAB-2299]: Fixed conflicts for detail dialogs for Odahu (#1079)
     add a8c62c8  [DATALAB-2287] added scrollbar for dropdowns in notebook creation dialog (#1078)
     add c8b6ca1  [DATALAB-2182]: Refactored UI code (#1018)
     add 745e74b  [DATALAB-2229]: Multiple endpoints support for Configuration page (#1080)
     add 023c628  [DATALAB-2297]: Fixed total sum sell on billing for Firefox (#1081)
     add 30597a8  Merge branch 'develop' into DATALAB-2228
     add a138121  Merge pull request #1083 from apache/DATALAB-2228
     add 3c0fad1  fixed btn bucket browser (#1085)
     add 7cd9561  changed logo for Not found page
     add 9157b2d  Merge pull request #1086 from apache/DATALAB-2300
     add a0b1fc1  [DATALAB-2303] removed vertical line and changed scrollbar in config editor
     add d9fe6bf  Merge pull request #1087 from apache/DATALAB-2303
     new 4b97403  [DATALAB-2091]: merged develop

The 1 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:
 .../src/dataengine/scripts/configure_dataengine.py |   2 +-
 .../src/general/conf/datalab.ini                   |   2 +
 .../src/jupyter/scripts/configure_jupyter_node.py  |   2 +-
 .../scripts/configure_jupyterlab_node.py           |   2 +-
 .../src/rstudio/scripts/configure_rstudio_node.py  |   2 +-
 .../scripts/configure_tensor-rstudio_node.py       |   2 +-
 .../zeppelin/scripts/configure_zeppelin_node.py    |   2 +-
 services/self-service/self-service.yml             |   3 +
 .../conf/SelfServiceApplicationConfiguration.java  |   7 +
 .../datalab/backendapi/domain/BillingReport.java   |   4 +
 .../backendapi/domain/BillingReportLine.java       |   4 +
 .../backendapi/modules/ChangePropertiesConst.java  |  57 ++++
 .../datalab/backendapi/modules/RestartForm.java    |  12 +
 .../backendapi/resources/KeycloakResource.java     |   2 +-
 .../backendapi/resources/OdahuResource.java        |  10 +-
 .../resources/admin/ChangePropertiesResource.java  | 119 ++++++--
 .../datalab/backendapi/resources/dto/YmlDTO.java   |   3 +
 .../CheckInfrastructureStatusScheduler.java        |  13 +-
 .../service/impl/BillingServiceImpl.java           |  65 ++---
 .../service/impl/DynamicChangeProperties.java      | 200 +++++++------
 .../src/main/resources/webapp/angular.json         |   2 +-
 .../configuration/configuration.component.html     | 105 ++++---
 .../configuration/configuration.component.scss     |  16 +-
 .../configuration/configuration.component.ts       |  82 ++++--
 .../src/app/administration/configuration/index.ts  |  24 +-
 .../management/endpoints/endpoints.component.html  |   2 +-
 .../management/endpoints/endpoints.component.scss  |   4 +-
 .../src/app/administration/management/index.ts     |  26 +-
 .../management-grid/management-grid.component.html |  28 +-
 .../management-grid/management-grid.component.scss |   6 +
 .../management-grid/management-grid.component.ts   |  12 +-
 .../create-odahu-cluster.component.ts              |   2 +-
 .../app/administration/odahu/odahu-data.service.ts |   5 +-
 .../odahu/odahu-grid/odahu-grid.component.ts       |   3 +-
 .../app/administration/odahu/odahu.component.ts    |   2 +-
 .../project-form/project-form.component.html       |   4 +-
 .../project-list/project-list.component.html       |  16 +-
 .../project-list/project-list.component.scss       |   8 +-
 .../project/project-list/project-list.component.ts |  37 +--
 .../app/administration/roles/roles.component.html  |  11 +-
 .../app/administration/roles/roles.component.scss  |   7 +-
 .../resources/webapp/src/app/app.routing.module.ts |  10 +-
 .../convert-action-pipe/convert-action.pipe.ts     |   1 +
 .../services/applicationServiceFacade.service.ts   |  26 +-
 .../app/core/services/configutration.service.ts    |  29 +-
 .../webapp/src/app/core/services/index.ts          |   2 +-
 .../src/app/core/services/localization.service.ts  |  10 +-
 .../app/core/services/odahu-deployment.service.ts  |   9 +-
 .../src/app/core/services/progress-bar.service.ts  |   9 +-
 .../webapp/src/app/core/util/checkUtils.ts         |   1 -
 .../compareUtils.ts}                               |  31 +-
 .../audit/audit-grid/audit-grid.component.html     |  23 +-
 .../audit/audit-grid/audit-grid.component.scss     |   4 +-
 .../audit/audit-grid/audit-grid.component.ts       |  24 +-
 .../src/app/reports/audit/audit.component.ts       |  10 +-
 .../reporting-grid/reporting-grid.component.html   |  29 +-
 .../reporting-grid/reporting-grid.component.scss   |  66 ++++-
 .../reporting-grid/reporting-grid.component.ts     |  63 ++--
 .../app/reports/reporting/reporting.component.ts   |   2 +-
 .../bucket-browser/bucket-browser.component.html   |  34 +--
 .../bucket-browser/bucket-browser.component.scss   | 291 ++-----------------
 .../bucket-browser/bucket-browser.component.ts     |  91 +++---
 .../bucket-browser/bucket-browser.module.ts        |   6 +-
 .../bucket-confirmation-dialog.component.html      |  15 +-
 .../bucket-confirmation-dialog.component.scss      |   6 +-
 .../bucket-confirmation-dialog.component.ts        |   2 +-
 .../bucket-browser/bucket-data.service.ts          | 104 +++----
 .../buckets-tree/bucket-tree.component.ts          |   9 +-
 .../folder-tree/folder-tree.component.ts           |   5 -
 .../bucket-browser/upload-window.component.scss    | 196 +++++++++++++
 ...utational-resource-create-dialog.component.html |  10 +-
 .../create-environment.component.html              |   8 +-
 .../detail-dialog/detail-dialog.component.html     |   2 +-
 .../detail-dialog/detail-dialog.component.ts       |   4 +-
 .../install-libraries.component.html               |   4 +-
 .../install-libraries.component.scss               | 318 +++++++--------------
 .../install-libraries.component.ts                 |  41 +--
 .../libraries-info.component.scss                  | 261 +++++++++++++++++
 .../resources-grid/resources-grid.component.html   |  43 +--
 .../resources-grid/resources-grid.component.scss   |  17 +-
 .../resources-grid/resources-grid.component.ts     |  44 +--
 .../resources-grid/resources-grid.model.ts         | 214 ++++++--------
 .../src/app/resources/resources.component.html     |   4 +-
 .../src/app/resources/resources.component.ts       |   4 +-
 .../checkbox/checkbox.component.css}               |   5 +-
 .../checkbox.component.html}                       |   6 +-
 .../checkbox.component.ts}                         |  28 +-
 .../shared/{inform-message => checkbox}/index.ts   |   8 +-
 .../shared/form-controls/dropdowns.component.scss  |   7 +-
 .../webapp/src/app/shared/form-controls/index.ts   |  18 +-
 .../multi-level-select-dropdown.component.html     |  69 +++--
 .../multi-level-select-dropdown.component.scss     |   7 +-
 .../multi-level-select-dropdown.component.ts       |  18 +-
 .../multi-select-dropdown.component.html           |   2 +-
 .../main/resources/webapp/src/app/shared/index.ts  |   1 -
 .../confirmation-dialog.component.html             |  13 +-
 .../modal-dialog/edge-action-dialog/index.ts       |   2 +-
 .../notification-dialog.component.ts               |   2 +-
 .../webapp/src/app/shared/navbar/index.ts          |   4 +-
 .../src/app/shared/navbar/navbar.component.html    |   3 +-
 .../src/app/shared/navbar/navbar.component.ts      |  25 +-
 .../webapp/src/assets/styles/_dialogs.scss         |  18 +-
 .../resources/webapp/src/assets/styles/_theme.scss |  32 ++-
 .../webapp/src/assets/svg/not_found_page.svg       | 234 +++++----------
 .../src/main/resources/webapp/src/styles.scss      |  25 +-
 105 files changed, 1937 insertions(+), 1587 deletions(-)
 create mode 100644 services/self-service/src/main/java/com/epam/datalab/backendapi/modules/ChangePropertiesConst.java
 create mode 100644 services/self-service/src/main/java/com/epam/datalab/backendapi/modules/RestartForm.java
 copy services/self-service/src/main/resources/webapp/src/app/core/{pipes/convert-file-size/convert-file-size.pipe.ts => util/compareUtils.ts} (56%)
 create mode 100644 services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/upload-window.component.scss
 create mode 100644 services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/libraries-info.component.scss
 copy services/self-service/src/main/resources/webapp/src/app/{core/collections/index.ts => shared/checkbox/checkbox.component.css} (94%)
 copy services/self-service/src/main/resources/webapp/src/app/shared/{inform-message/inform-message.component.html => checkbox/checkbox.component.html} (79%)
 copy services/self-service/src/main/resources/webapp/src/app/shared/{inform-message/inform-message.component.ts => checkbox/checkbox.component.ts} (60%)
 copy services/self-service/src/main/resources/webapp/src/app/shared/{inform-message => checkbox}/index.ts (84%)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org


[incubator-datalab] 01/01: [DATALAB-2091]: merged develop

Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git

commit 4b97403f3650c4bfe9a63dad5bca630dd634ad20
Merge: 7711002 d9fe6bf
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Feb 25 12:00:16 2021 +0200

    [DATALAB-2091]: merged develop

 .../src/dataengine/scripts/configure_dataengine.py |   2 +-
 .../src/general/conf/datalab.ini                   |   2 +
 .../src/jupyter/scripts/configure_jupyter_node.py  |   2 +-
 .../scripts/configure_jupyterlab_node.py           |   2 +-
 .../src/rstudio/scripts/configure_rstudio_node.py  |   2 +-
 .../scripts/configure_tensor-rstudio_node.py       |   2 +-
 .../zeppelin/scripts/configure_zeppelin_node.py    |   2 +-
 services/self-service/self-service.yml             |   3 +
 .../conf/SelfServiceApplicationConfiguration.java  |   7 +
 .../datalab/backendapi/domain/BillingReport.java   |   4 +
 .../backendapi/domain/BillingReportLine.java       |   4 +
 .../backendapi/modules/ChangePropertiesConst.java  |  57 ++++
 .../datalab/backendapi/modules/RestartForm.java    |  12 +
 .../backendapi/resources/KeycloakResource.java     |   2 +-
 .../backendapi/resources/OdahuResource.java        |  10 +-
 .../resources/admin/ChangePropertiesResource.java  | 119 ++++++--
 .../datalab/backendapi/resources/dto/YmlDTO.java   |   3 +
 .../CheckInfrastructureStatusScheduler.java        |  13 +-
 .../service/impl/BillingServiceImpl.java           |  65 ++---
 .../service/impl/DynamicChangeProperties.java      | 200 +++++++------
 .../src/main/resources/webapp/angular.json         |   2 +-
 .../configuration/configuration.component.html     | 105 ++++---
 .../configuration/configuration.component.scss     |  16 +-
 .../configuration/configuration.component.ts       |  82 ++++--
 .../src/app/administration/configuration/index.ts  |  24 +-
 .../management/endpoints/endpoints.component.html  |   2 +-
 .../management/endpoints/endpoints.component.scss  |   4 +-
 .../src/app/administration/management/index.ts     |  26 +-
 .../management-grid/management-grid.component.html |  28 +-
 .../management-grid/management-grid.component.scss |   6 +
 .../management-grid/management-grid.component.ts   |  12 +-
 .../create-odahu-cluster.component.ts              |   2 +-
 .../app/administration/odahu/odahu-data.service.ts |   5 +-
 .../odahu/odahu-grid/odahu-grid.component.ts       |   3 +-
 .../app/administration/odahu/odahu.component.ts    |   2 +-
 .../project-form/project-form.component.html       |   4 +-
 .../project-list/project-list.component.html       |  16 +-
 .../project-list/project-list.component.scss       |   8 +-
 .../project/project-list/project-list.component.ts |  37 +--
 .../app/administration/roles/roles.component.html  |  11 +-
 .../app/administration/roles/roles.component.scss  |   7 +-
 .../resources/webapp/src/app/app.routing.module.ts |  10 +-
 .../convert-action-pipe/convert-action.pipe.ts     |   1 +
 .../services/applicationServiceFacade.service.ts   |  26 +-
 .../app/core/services/configutration.service.ts    |  29 +-
 .../webapp/src/app/core/services/index.ts          |   2 +-
 .../src/app/core/services/localization.service.ts  |  10 +-
 .../app/core/services/odahu-deployment.service.ts  |   9 +-
 .../src/app/core/services/progress-bar.service.ts  |   9 +-
 .../webapp/src/app/core/util/checkUtils.ts         |   1 -
 .../compareUtils.ts}                               |  27 +-
 .../audit/audit-grid/audit-grid.component.html     |  23 +-
 .../audit/audit-grid/audit-grid.component.scss     |   4 +-
 .../audit/audit-grid/audit-grid.component.ts       |  24 +-
 .../src/app/reports/audit/audit.component.ts       |  10 +-
 .../reporting-grid/reporting-grid.component.html   |  29 +-
 .../reporting-grid/reporting-grid.component.scss   |  66 ++++-
 .../reporting-grid/reporting-grid.component.ts     |  63 ++--
 .../app/reports/reporting/reporting.component.ts   |   2 +-
 .../bucket-browser/bucket-browser.component.html   |  34 +--
 .../bucket-browser/bucket-browser.component.scss   | 291 ++-----------------
 .../bucket-browser/bucket-browser.component.ts     |  91 +++---
 .../bucket-browser/bucket-browser.module.ts        |   6 +-
 .../bucket-confirmation-dialog.component.html      |  15 +-
 .../bucket-confirmation-dialog.component.scss      |   6 +-
 .../bucket-confirmation-dialog.component.ts        |   2 +-
 .../bucket-browser/bucket-data.service.ts          | 104 +++----
 .../buckets-tree/bucket-tree.component.ts          |   9 +-
 .../folder-tree/folder-tree.component.ts           |   5 -
 .../bucket-browser/upload-window.component.scss    | 196 +++++++++++++
 ...utational-resource-create-dialog.component.html |  10 +-
 .../create-environment.component.html              |   8 +-
 .../detail-dialog/detail-dialog.component.html     |   2 +-
 .../detail-dialog/detail-dialog.component.ts       |   4 +-
 .../install-libraries.component.html               |   4 +-
 .../install-libraries.component.scss               | 318 +++++++--------------
 .../install-libraries.component.ts                 |  41 +--
 .../libraries-info.component.scss                  | 261 +++++++++++++++++
 .../resources-grid/resources-grid.component.html   |  43 +--
 .../resources-grid/resources-grid.component.scss   |  17 +-
 .../resources-grid/resources-grid.component.ts     |  44 +--
 .../resources-grid/resources-grid.model.ts         | 214 ++++++--------
 .../src/app/resources/resources.component.html     |   4 +-
 .../src/app/resources/resources.component.ts       |   4 +-
 .../{index.ts => checkbox/checkbox.component.css}  |   9 +-
 .../app/shared/checkbox/checkbox.component.html    |  23 ++
 .../checkbox/checkbox.component.ts}                |  29 +-
 .../checkbox/index.ts}                             |  26 +-
 .../shared/form-controls/dropdowns.component.scss  |   7 +-
 .../webapp/src/app/shared/form-controls/index.ts   |  18 +-
 .../multi-level-select-dropdown.component.html     |  69 +++--
 .../multi-level-select-dropdown.component.scss     |   7 +-
 .../multi-level-select-dropdown.component.ts       |  18 +-
 .../multi-select-dropdown.component.html           |   2 +-
 .../main/resources/webapp/src/app/shared/index.ts  |   1 -
 .../confirmation-dialog.component.html             |  13 +-
 .../modal-dialog/edge-action-dialog/index.ts       |   2 +-
 .../notification-dialog.component.ts               |   2 +-
 .../webapp/src/app/shared/navbar/index.ts          |   4 +-
 .../src/app/shared/navbar/navbar.component.html    |   3 +-
 .../src/app/shared/navbar/navbar.component.ts      |  25 +-
 .../webapp/src/assets/styles/_dialogs.scss         |  18 +-
 .../resources/webapp/src/assets/styles/_theme.scss |  32 ++-
 .../webapp/src/assets/svg/not_found_page.svg       | 234 +++++----------
 .../src/main/resources/webapp/src/styles.scss      |  25 +-
 105 files changed, 1965 insertions(+), 1595 deletions(-)

diff --cc infrastructure-provisioning/src/general/conf/datalab.ini
index 11eaaf7,8cd67a8..1b2811c
--- a/infrastructure-provisioning/src/general/conf/datalab.ini
+++ b/infrastructure-provisioning/src/general/conf/datalab.ini
@@@ -284,11 -289,15 +284,13 @@@ r_enabled = tru
  tornado_version = 5.1.1
  ipykernel_version = 4.8.2
  ### Version of ungit if previous needed. Use latest as default.
 -ungit_version = 1.4.36
 +ungit_version = 1.5.15
  ### Numpy version
  numpy_version = 1.18.3
 -### Numpy version for python 2
 -numpy2_version = 1.16.6
  ### caTools version for R 3.4.4
  catools_version = 1.17.1.4
+ ### pbdZMQ version for R 3.4.4
+ pbdzmq_version = 0.3-3.1
  ### Apache Ivy version
  ivy_version = 2.4.0
  ### Matplotlib version
diff --cc services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/DynamicChangeProperties.java
index 52c5b69,6ed7d15..d3e320b
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/DynamicChangeProperties.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/DynamicChangeProperties.java
@@@ -1,26 -1,14 +1,33 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + *   http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing,
 + * software distributed under the License is distributed on an
 + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + * KIND, either express or implied.  See the License for the
 + * specific language governing permissions and limitations
 + * under the License.
 + */
 +
  package com.epam.datalab.backendapi.service.impl;
  
- import com.epam.datalab.backendapi.annotation.Audit;
+ import com.epam.datalab.auth.UserInfo;
+ import com.epam.datalab.backendapi.dao.EndpointDAO;
+ import com.epam.datalab.backendapi.domain.EndpointDTO;
+ import com.epam.datalab.backendapi.modules.ChangePropertiesConst;
+ import com.epam.datalab.backendapi.modules.RestartForm;
+ import com.epam.datalab.backendapi.resources.dto.YmlDTO;
  import com.epam.datalab.exceptions.DynamicChangePropertiesException;
+ import com.epam.datalab.exceptions.ResourceNotFoundException;
+ import com.epam.datalab.rest.client.RESTService;
  import lombok.extern.slf4j.Slf4j;
  import org.apache.commons.io.FileUtils;
  
diff --cc services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
index 0133832,935d7de..9f007c7
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
@@@ -107,10 -110,10 +109,10 @@@
                <div class="control selector-wrapper">
                  <mat-form-field>
                    <mat-label>Select instance size</mat-label>
-                   <mat-select formControlName="shape_master" disableOptionCentering>
+                   <mat-select panelClass="scrolling" formControlName="shape_master" disableOptionCentering>
                      <mat-optgroup *ngFor="let item of (selectedImage.computation_resources_shapes | keys)"
                        [label]="item.key | underscoreless">
 -                      <mat-option *ngFor="let list_item of item.value" [value]="list_item.Type">
 +                      <mat-option *ngFor="let list_item of item.value" [value]="list_item.Type" (click)="clearGpuType('master')">
                          <strong class="highlight icon-label">{{ list_item.Size }}</strong> {{ list_item.Type }}
                        </mat-option>
                      </mat-optgroup>
@@@ -128,10 -131,10 +130,10 @@@
                    <div class="control selector-wrapper">
                        <mat-form-field>
                            <mat-label>Select instance size</mat-label>
-                           <mat-select formControlName="shape_slave" disableOptionCentering>
+                           <mat-select panelClass="scrolling" formControlName="shape_slave" disableOptionCentering>
                                <mat-optgroup *ngFor="let item of (selectedImage.computation_resources_shapes | keys)"
                                              [label]="item.key | underscoreless">
 -                                  <mat-option *ngFor="let list_item of item.value" [value]="list_item.Type">
 +                                  <mat-option *ngFor="let list_item of item.value" [value]="list_item.Type" (click)="clearGpuType('slave')">
                                        <strong class="highlight icon-label">{{ list_item.Size }}</strong> {{
                                        list_item.Type }}
                                    </mat-option>
diff --cc services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
index 3045248,206c061..de045f9
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
@@@ -63,8 -67,10 +67,9 @@@ export class InstallLibrariesComponent 
    public isInSelectedList: boolean = false;
    public installingInProgress: boolean = false;
    public libSearch: FormControl = new FormControl();
+ 
    public groupsListMap = {
      'r_pkg': 'R packages',
 -    'pip2': 'Python 2',
      'pip3': 'Python 3',
      'os_pkg': 'Apt/Yum',
      'others': 'Others',
diff --cc services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss
index a25ca85,d9675a7..8e89f63
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss
@@@ -81,18 -81,13 +81,19 @@@ table.resources 
          align-items: center;
  
          &.name-col {
-           padding-right: 5px;
            padding-left: 21px;
-           cursor: pointer;
            overflow: hidden;
+           span{
+             cursor: pointer;
+           }
          }
  
 +        &.shape-col{
 +          align-items: start;
 +          flex-direction: column;
 +          justify-content: center;
 +        }
 +
          &.resources-col {
            overflow: hidden;
          }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org