[incubator-dlab] branch develop updated: [DLAB-2007] Get rid of r package for DeepLearning/TensorFlow with Jupyter

[ofuks]

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

ofuks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/develop by this push:
     new 513a502  [DLAB-2007] Get rid of r package for DeepLearning/TensorFlow 
with Jupyter
513a502 is described below

commit 513a502a71167062bc11c7657afc3cda12f7f1c3
Author: Oleh Fuks <olegfuk...@gmail.com>
AuthorDate: Thu Aug 20 15:52:54 2020 +0300

    [DLAB-2007] Get rid of r package for DeepLearning/TensorFlow with Jupyter
---
 .../epam/dlab/backendapi/service/impl/LibraryServiceImpl.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/LibraryServiceImpl.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/LibraryServiceImpl.java
index 852ee74..797d58d 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/LibraryServiceImpl.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/LibraryServiceImpl.java
@@ -179,13 +179,16 @@ public class LibraryServiceImpl implements LibraryService 
{
        public List<String> getExploratoryLibGroups(UserInfo userInfo, String 
projectName, String exploratoryName) {
                UserInstanceDTO userInstanceDTO = 
exploratoryDAO.fetchExploratoryFields(userInfo.getName(), projectName, 
exploratoryName);
                final String templateName = userInstanceDTO.getTemplateName();
-               List<LibraryGroups> groups = new 
ArrayList<>(Arrays.asList(GROUP_PIP3, GROUP_OTHERS, GROUP_R_PKG, GROUP_OS_PKG));
+               List<LibraryGroups> groups = new 
ArrayList<>(Arrays.asList(GROUP_PIP2, GROUP_PIP3, GROUP_OTHERS, GROUP_OS_PKG));
 
-               if (isTemplateGroup(templateName, Stream.of(JUPYTER, ZEPPELIN, 
DEEP_LEARNING, TENSOR))) {
-                       groups.addAll(Arrays.asList(GROUP_PIP2, GROUP_JAVA));
+               if (isTemplateGroup(templateName, Stream.of(JUPYTER, 
ZEPPELIN))) {
+                       groups.addAll(Arrays.asList(GROUP_R_PKG, GROUP_JAVA));
+               }
+               if (isTemplateGroup(templateName, Stream.of(DEEP_LEARNING, 
TENSOR))) {
+                       groups.add(GROUP_JAVA);
                }
                if (isTemplateGroup(templateName, Stream.of(RSTUDIO, 
TENSOR_RSTUDIO))) {
-                       groups.add(GROUP_PIP2);
+                       groups.add(GROUP_R_PKG);
                }
 
                return groups


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org