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/12/04 10:56:58 UTC
[incubator-dlab] 01/02: [DLAB-1305]: prevent actions for superset
template
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
commit c8300ef2d986058c4f4ff8f277ce0071227b2772
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Dec 4 12:07:59 2019 +0200
[DLAB-1305]: prevent actions for superset template
---
.../cluster-details/cluster-details.component.html | 2 +-
.../detail-dialog/detail-dialog.component.html | 23 +++++++++++-----------
.../resources-grid/resources-grid.component.html | 10 ++++------
3 files changed, 16 insertions(+), 19 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 453061c..f80b44f 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
@@ -107,7 +107,7 @@
</div>
<div class="checkbox-group"
- *ngIf="resource.image === 'docker.dlab-dataengine' && resource.status === 'running' && environment.image !== 'docker.dlab-zeppelin'">
+ *ngIf="resource.image === 'docker.dlab-dataengine' && resource.status === 'running' && environment.image !== 'docker.dlab-zeppelin' && environment.image === 'docker.dlab-superset'">
<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.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
index 96c4f91..537aba1 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
@@ -48,25 +48,23 @@
<div class="links_block">
<p *ngFor="let item of notebook.url">
<span class="description">{{item.description}}: </span>
- <a
- class="ellipsis"
- matTooltip="{{item.url}}"
- matTooltipPosition="above"
- href="{{item.url}}"
- target="_blank"
- >
+ <a class="ellipsis" matTooltip="{{item.url}}" matTooltipPosition="above" href="{{item.url}}"
+ target="_blank">
{{item.url}}
</a>
</p>
</div>
- <p class="flex" *ngIf="notebook.username">Node User: <span class="strong">{{ notebook.username }}</span></p>
- <p class="flex" *ngIf="notebook.password">Password: <span class="strong">{{ notebook.password }}</span></p>
+ <p class="flex" *ngIf="notebook.username">Node User: <span
+ class="strong">{{ notebook.username }}</span></p>
+ <p class="flex" *ngIf="notebook.password">Password: <span
+ class="strong">{{ notebook.password }}</span></p>
<p class="m-top-30">{{ DICTIONARY.personal_storage }}: </p>
<div class="links_block">
<p *ngIf="DICTIONARY.cloud_provider === 'azure' && notebook.account_name">{{ DICTIONARY.account }}
<span class="bucket-info">{{ notebook.account_name}}</span></p>
- <p *ngIf="notebook.bucket_name">{{ DICTIONARY.container }} <span class="bucket-info">{{ notebook.bucket_name }}</span></p>
+ <p *ngIf="notebook.bucket_name">{{ DICTIONARY.container }} <span
+ class="bucket-info">{{ notebook.bucket_name }}</span></p>
</div>
<p>{{ DICTIONARY.collaboration_storage }}: </p>
<div class="links_block">
@@ -82,7 +80,8 @@
<div class="links_block">
<p>Data Lake Store Account: <span class="bucket-info">{{ notebook.datalake_name }}</span></p>
<p>Personal folder: <span class="bucket-info">{{ notebook.datalake_directory }}</span></p>
- <p>Collaboration folder: <span class="bucket-info">{{ notebook.datalake_shared_directory }}</span></p>
+ <p>Collaboration folder: <span class="bucket-info">{{ notebook.datalake_shared_directory }}</span>
+ </p>
</div>
</div>
@@ -96,7 +95,7 @@
</div>
<div class="checkbox-group" *ngIf="notebook.image !== 'docker.dlab-zeppelin'; else not_support"
- [hidden]="notebook.status !== 'running'">
+ [hidden]="notebook.status !== 'running' || notebook.image === 'docker.dlab-superset'">
<label>
<input #configurationNode type="checkbox" (change)="selectConfiguration()" /> Cluster configurations
</label>
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 f7c7cd8..27df81b 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
@@ -181,10 +181,8 @@
<span>Terminate</span>
</div>
</li>
- <li (click)="exploratoryAction(element, 'deploy')" *ngIf="element.status != 'stopping'
- && element.status !== 'stopped'
- && element.status !== 'starting'
- && element.status !== 'creating image'">
+ <li (click)="exploratoryAction(element, 'deploy')"
+ *ngIf="element.status === 'running' && element.image !== 'docker.dlab-superset'">
<i class="material-icons">memory</i>
<span>Add compute</span>
</li>
@@ -195,11 +193,11 @@
</li>
</div>
<li (click)="exploratoryAction(element, 'ami')"
- *ngIf="element.status === 'running' && DICTIONARY.cloud_provider !== 'gcp'">
+ *ngIf="element.status === 'running' && DICTIONARY.cloud_provider !== 'gcp' && element.image !== 'docker.dlab-superset'">
<i class="material-icons">view_module</i>
<span>Create {{ DICTIONARY.image }}</span>
</li>
- <li (click)="exploratoryAction(element, 'install')">
+ <li (click)="exploratoryAction(element, 'install')" *ngIf="element.image !== 'docker.dlab-superset'">
<i class="material-icons">developer_board</i>
<span>Manage libraries</span>
</li>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org