This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1305
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1305 by this push:
new 167e9ec [DLAB-1305]: prevent actions and spark configuration for
JupyterLab template
167e9ec is described below
commit 167e9ec0786610bcab105806834d85cac181b8f1
Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com>
AuthorDate: Wed Dec 4 14:18:02 2019 +0200
[DLAB-1305]: prevent actions and spark configuration for JupyterLab template
---
.../computational/cluster-details/cluster-details.component.html | 7 +++++--
.../create-environment/create-environment.component.html | 2 +-
.../exploratory/detail-dialog/detail-dialog.component.html | 2 +-
.../exploratory/detail-dialog/detail-dialog.component.scss | 6 ++++--
.../src/app/resources/resources-grid/resources-grid.component.html | 7 ++++---
.../src/main/resources/webapp/src/assets/styles/_dialogs.scss | 2 +-
.../src/main/resources/webapp/src/assets/styles/_variables.scss | 2 +-
7 files changed, 17 insertions(+), 11 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
index f80b44f..7436d0b 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
@@ -106,8 +106,11 @@
</div>
</div>
- <div class="checkbox-group"
- *ngIf="resource.image === 'docker.dlab-dataengine' &&
resource.status === 'running' && environment.image !== 'docker.dlab-zeppelin'
&& environment.image === 'docker.dlab-superset'">
+ <div class="checkbox-group" *ngIf="resource.image ===
'docker.dlab-dataengine'
+ && resource.status === 'running'
+ && environment.image !== 'docker.dlab-zeppelin'
+ && environment.image === 'docker.dlab-superset'
+ && environment.image !== 'docker.dlab-jupyterlab'">
<label>
<input #configurationNode type="checkbox"
(change)="selectConfiguration()" /> Cluster configurations
</label>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
index ebe7b24..0606e54 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
@@ -152,7 +152,7 @@
<div *ngIf="currentTemplate">
<div class="checkbox-group"
- *ngIf="currentTemplate?.image !== 'docker.dlab-zeppelin' &&
currentTemplate?.image !== 'docker.dlab-superset'">
+ *ngIf="currentTemplate?.image !== 'docker.dlab-zeppelin' &&
currentTemplate?.image !== 'docker.dlab-superset' && currentTemplate?.image !==
'docker.dlab-jupyterlab'">
<label>
<input #configurationNode type="checkbox"
(change)="selectConfiguration()" /> Spark configurations
</label>
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 537aba1..2aaa4b5 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
@@ -95,7 +95,7 @@
</div>
<div class="checkbox-group" *ngIf="notebook.image !==
'docker.dlab-zeppelin'; else not_support"
- [hidden]="notebook.status !== 'running' || notebook.image ===
'docker.dlab-superset'">
+ [hidden]="notebook.status !== 'running' || notebook.image ===
'docker.dlab-superset' || notebook.image === 'docker.dlab-jupyterlab'">
<label>
<input #configurationNode type="checkbox"
(change)="selectConfiguration()" /> Cluster configurations
</label>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
index 4919ce4..2849ce0 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
@@ -17,6 +17,8 @@
* under the License.
*/
+@import '_variables.scss';
+
.scroll-box {
max-height: 65vh;
overflow-y: auto;
@@ -32,7 +34,7 @@
white-space: nowrap;
padding-left: 7px;
font-weight: 600;
- color: #577289;
+ color: $blue-grey-color;
}
}
}
@@ -83,5 +85,5 @@
.bucket-info {
padding-left: 7px;
font-weight: 600;
- color: #455c74;
+ color: $blue-grey-color;
}
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 27df81b..e3b5fa5 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
@@ -182,7 +182,7 @@
</div>
</li>
<li (click)="exploratoryAction(element, 'deploy')"
- *ngIf="element.status === 'running' && element.image !==
'docker.dlab-superset'">
+ *ngIf="element.status === 'running' && element.image !==
'docker.dlab-superset' && element.image !== 'docker.dlab-jupyterlab'">
<i class="material-icons">memory</i>
<span>Add compute</span>
</li>
@@ -193,11 +193,12 @@
</li>
</div>
<li (click)="exploratoryAction(element, 'ami')"
- *ngIf="element.status === 'running' &&
DICTIONARY.cloud_provider !== 'gcp' && element.image !==
'docker.dlab-superset'">
+ *ngIf="element.status === 'running' &&
DICTIONARY.cloud_provider !== 'gcp' && element.image !== 'docker.dlab-superset'
&& element.image !== 'docker.dlab-jupyterlab'">
<i class="material-icons">view_module</i>
<span>Create {{ DICTIONARY.image }}</span>
</li>
- <li (click)="exploratoryAction(element, 'install')"
*ngIf="element.image !== 'docker.dlab-superset'">
+ <li (click)="exploratoryAction(element, 'install')"
+ *ngIf="element.image !== 'docker.dlab-superset' &&
element.image !== 'docker.dlab-jupyterlab'">
<i class="material-icons">developer_board</i>
<span>Manage libraries</span>
</li>
diff --git
a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
index 4ba6167..34d7c45 100644
---
a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
+++
b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
@@ -322,7 +322,7 @@ mat-dialog-container {
.strong {
font-weight: 600;
- color: $middle-grey-color;
+ color: $blue-grey-color;
}
.flex {
diff --git
a/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss
b/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss
index b761c27..ebfdfb1 100644
---
a/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss
+++
b/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss
@@ -21,5 +21,5 @@ $modal-text-color: #718aa5;
$modal-header-color: #f6fafe;
$brand-color: #4ab8dc;
-$middle-grey-color: #607d8b;
+$blue-grey-color: #718ba6;
$dark-grey-color: #455c74;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
