You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/05/08 13:32:21 UTC

[incubator-dlab] branch DLAB-4 updated (32ff5c1 -> 501c270)

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

ankovalyshyn pushed a change to branch DLAB-4
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.


    from 32ff5c1  [DLAB-4]: added routing to web terminal connection
     add f2f0cdb  DLAB-2 added possibility to use admin key during ssh connection
     add 8492473  DLAB-2 disabled gzip handler for guacamole servlet
     new 7639229  Merge remote-tracking branch 'remotes/origin/feature-DLAB-2' into DLAB-4
     add 107a039  [DLAB-592] Change dataproc and Zeppelin version because of bug in 0.8.1
     add 9d8f298  Merge pull request #117 from apache/DLAB-592
     add 764000d  [DLAB-592] Change Zeppelin version to 0.8.0 in descriptions
     add e42803a  Merge pull request #119 from apache/DLAB-592
     add f0d166f  [DLAB-290]: metadata infolist fixes
     add 87ddd9b  Merge pull request #120 from apache/DLAB-290
     new 3213cf3  Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-4
     new 501c270  [DLAB-4]: added terminal per notebook on actions panel

The 3 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/general/conf/dlab.ini                      |  2 +-
 .../general/files/aws/zeppelin_description.json    |  4 +--
 .../general/files/azure/zeppelin_description.json  |  4 +--
 .../files/gcp/dataengine-service_description.json  |  2 +-
 .../general/files/gcp/zeppelin_description.json    |  4 +--
 .../zeppelin/zeppelin-notebook.json                |  4 +--
 .../ec2_templates/zeppelin/zeppelin-notebook.json  |  4 +--
 .../gcp_templates/zeppelin/zeppelin-notebook.json  |  4 +--
 .../java/com/epam/dlab/rest/contracts/KeyAPI.java  |  3 +-
 .../backendapi/resources/base/KeyResource.java     | 23 ++++++++----
 .../{ReuploadKeyService.java => KeyService.java}   | 29 +++++++++++++--
 services/self-service/self-service.yml             |  2 --
 .../dlab/backendapi/SelfServiceApplication.java    | 19 +++++++++-
 .../service/impl/GuacamoleServiceImpl.java         | 17 +++++----
 .../detail-dialog/detail-dialog.component.html     |  5 ---
 .../resources/exploratory/detail-dialog/index.ts   |  2 --
 .../src/app/resources/resources-grid/index.ts      |  3 +-
 .../resources-grid/resources-grid.component.css    |  8 ++++-
 .../resources-grid/resources-grid.component.html   |  6 ++++
 .../resources-grid/resources-grid.component.ts     |  5 ---
 .../key-upload-dialog.component.ts                 |  2 +-
 .../app/shared/modal-dialog/modal.component.html   | 41 +++++++++++-----------
 .../app/shared/modal-dialog/modal.component.scss   | 17 ---------
 .../notification-dialog.component.ts               |  4 +--
 .../src/app/shared/navbar/navbar.component.html    |  6 ++--
 .../src/app/shared/navbar/navbar.component.scss    |  8 ++++-
 .../webapp/src/assets/styles/_general.scss         | 18 +++++++++-
 .../service/impl/ReuploadKeyServiceImplTest.java   | 10 +++---
 28 files changed, 159 insertions(+), 97 deletions(-)
 rename services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/{ReuploadKeyService.java => KeyService.java} (82%)


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


[incubator-dlab] 03/03: [DLAB-4]: added terminal per notebook on actions panel

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

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

commit 501c270c8116f7f7a0ca99faccfbed4e11009b16
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed May 8 16:32:10 2019 +0300

    [DLAB-4]: added terminal per notebook on actions panel
---
 .../exploratory/detail-dialog/detail-dialog.component.html        | 5 -----
 .../webapp/src/app/resources/exploratory/detail-dialog/index.ts   | 2 --
 .../resources/webapp/src/app/resources/resources-grid/index.ts    | 3 ++-
 .../src/app/resources/resources-grid/resources-grid.component.css | 8 +++++++-
 .../app/resources/resources-grid/resources-grid.component.html    | 6 ++++++
 .../src/app/resources/resources-grid/resources-grid.component.ts  | 5 -----
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
index 8e9373e..4fe8794 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
@@ -118,11 +118,6 @@
               (click)="editClusterConfiguration(configurationForm.value)">Update</button>
           </div>
         </div>
-
-        <div>
-          <label>Terminal: </label>
-          <a target="_blank" [routerLink]="['/terminal',  notebook.ip]" mat-raised-button type="button" class="butt action">Open terminal</a>
-        </div>
       </div>
     </div>
   </modal-content>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/index.ts
index 0a7bcac..1571d71 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/index.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/index.ts
@@ -20,7 +20,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { RouterModule } from '@angular/router';
 import { ModalModule } from '../../../shared';
 import { MaterialModule } from '../../../shared/material.module';
 import { DetailDialogComponent } from './detail-dialog.component';
@@ -34,7 +33,6 @@ export * from './detail-dialog.component';
     ModalModule,
     FormsModule,
     ReactiveFormsModule,
-    RouterModule,
     MaterialModule,
     DirectivesModule
   ],
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts
index b078349..ea94971 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts
@@ -19,7 +19,7 @@
 
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-
+import { RouterModule } from '@angular/router';
 import { MaterialModule } from '../../shared/material.module';
 import { ResourcesGridComponent } from './resources-grid.component';
 import { ComputationalResourcesModule } from '../computational/computational-resources-list';
@@ -36,6 +36,7 @@ import { UnderscorelessPipeModule } from '../../core/pipes/underscoreless-pipe';
 @NgModule({
   imports: [
     CommonModule,
+    RouterModule,
     ComputationalResourcesModule,
     ModalModule,
     ConfirmationDialogModule,
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css
index 6b4682f..ec1d129 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css
@@ -174,6 +174,11 @@
   color: #577289;
   transition: all 0.45s ease-in-out;
 }
+.dashboard_table .list-menu a.navigate {  
+  text-decoration: none;
+  color: #577289;
+  transition: all 0.45s ease-in-out;
+}
 
 .dashboard_table .list-menu li i {
   font-size: 18px;
@@ -181,7 +186,8 @@
   vertical-align: bottom;
 }
 
-.dashboard_table .list-menu li:hover {
+.dashboard_table .list-menu li:hover,
+.dashboard_table .list-menu li:hover a {
   background: none !important;
   color: #36afd5;
 }
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
index 8502953..559cd13 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
@@ -141,6 +141,12 @@
             <i class="material-icons">developer_board</i>
             <span>Manage libraries</span>
           </li>
+          <li (click)="openTerminal(env.ip)">
+            <a target="_blank" [routerLink]="['/terminal',  env.ip]" class="navigate">
+              <i class="material-icons">laptop</i>
+              <span>Open terminal</span>
+            </a>
+          </li>
         </ul>
       </bubble-up>
     </td>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
index c897950..1a5564b 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
@@ -305,9 +305,4 @@ export class ResourcesGridComponent implements OnInit {
       this.createAMI.open({ isFooter: false }, data);
     }
   }
-
-  dropdownPosition($event): void {
-    const contentHeight = document.body.offsetHeight > window.outerHeight ? document.body.offsetHeight : window.outerHeight;
-    this.isOutscreenDropdown = $event.pageY + 285 > contentHeight ? true : false;
-  }
 }


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


[incubator-dlab] 02/03: Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-4

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

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

commit 3213cf3785947c5b4d46f9dc67f5131ad9cfd292
Merge: 7639229 87ddd9b
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed May 8 14:43:40 2019 +0300

    Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-4

 .../src/general/conf/dlab.ini                      |  2 +-
 .../general/files/aws/zeppelin_description.json    |  4 +--
 .../general/files/azure/zeppelin_description.json  |  4 +--
 .../files/gcp/dataengine-service_description.json  |  2 +-
 .../general/files/gcp/zeppelin_description.json    |  4 +--
 .../zeppelin/zeppelin-notebook.json                |  4 +--
 .../ec2_templates/zeppelin/zeppelin-notebook.json  |  4 +--
 .../gcp_templates/zeppelin/zeppelin-notebook.json  |  4 +--
 .../key-upload-dialog.component.ts                 |  2 +-
 .../app/shared/modal-dialog/modal.component.html   | 41 +++++++++++-----------
 .../app/shared/modal-dialog/modal.component.scss   | 17 ---------
 .../notification-dialog.component.ts               |  4 +--
 .../src/app/shared/navbar/navbar.component.html    |  6 ++--
 .../src/app/shared/navbar/navbar.component.scss    |  8 ++++-
 .../webapp/src/assets/styles/_general.scss         | 18 +++++++++-
 15 files changed, 65 insertions(+), 59 deletions(-)


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


[incubator-dlab] 01/03: Merge remote-tracking branch 'remotes/origin/feature-DLAB-2' into DLAB-4

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

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

commit 76392298198ee192c445438b2e5b8795ac7bb546
Merge: 32ff5c1 8492473
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed May 8 14:41:11 2019 +0300

    Merge remote-tracking branch 'remotes/origin/feature-DLAB-2' into DLAB-4

 .../java/com/epam/dlab/rest/contracts/KeyAPI.java  |  3 ++-
 .../backendapi/resources/base/KeyResource.java     | 23 ++++++++++++-----
 .../{ReuploadKeyService.java => KeyService.java}   | 29 +++++++++++++++++++---
 services/self-service/self-service.yml             |  2 --
 .../dlab/backendapi/SelfServiceApplication.java    | 19 +++++++++++++-
 .../service/impl/GuacamoleServiceImpl.java         | 17 ++++++++-----
 .../service/impl/ReuploadKeyServiceImplTest.java   | 10 ++++----
 7 files changed, 79 insertions(+), 24 deletions(-)


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