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:57 UTC
[incubator-dlab] branch DLAB-1305 created (now a42d403)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch DLAB-1305
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at a42d403 [DLAB-1305]: prevent spark configuration for superset
This branch includes the following new commits:
new c8300ef [DLAB-1305]: prevent actions for superset template
new a42d403 [DLAB-1305]: prevent spark configuration for superset
The 2 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-1305]: prevent spark configuration
for superset
Posted by an...@apache.org.
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 a42d403609efe4fa5a39f12516986fa47b1cffdd
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Dec 4 12:55:48 2019 +0200
[DLAB-1305]: prevent spark configuration for superset
---
.../create-environment.component.html | 32 ++++++++++++----------
.../detail-dialog/detail-dialog.component.scss | 13 +++------
2 files changed, 22 insertions(+), 23 deletions(-)
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 4d09b9f..ebe7b24 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
@@ -30,8 +30,8 @@
<div class="control selector-wrapper">
<mat-form-field>
<mat-label>Select project</mat-label>
- <mat-select formControlName="project" panelClass="create-resources-dialog" >
- <mat-option *ngFor="let project of projects" [value]="project.name" (click)="setEndpoints(project)">
+ <mat-select formControlName="project" panelClass="create-resources-dialog">
+ <mat-option *ngFor="let project of projects" [value]="project.name" (click)="setEndpoints(project)">
{{ project.name }}</mat-option>
<mat-option *ngIf="!projects.length" class="multiple-select ml-10" disabled>Projects list is empty
</mat-option>
@@ -48,7 +48,8 @@
<div class="control selector-wrapper" [ngClass]="{ 'not-active' : !endpoints.length }">
<mat-form-field>
<mat-label>Select endpoint</mat-label>
- <mat-select formControlName="endpoint" disableOptionCentering [disabled]="!endpoints.length" panelClass="create-resources-dialog" >
+ <mat-select formControlName="endpoint" disableOptionCentering [disabled]="!endpoints.length"
+ panelClass="create-resources-dialog">
<mat-option *ngFor="let endpoint of endpoints" [value]="endpoint"
(click)="getTemplates(createExploratoryForm?.controls['project'].value, endpoint)">{{ endpoint }}
</mat-option>
@@ -67,7 +68,8 @@
<div class="control selector-wrapper" [ngClass]="{ 'not-active' : !templates.length }">
<mat-form-field>
<mat-label>Select template</mat-label>
- <mat-select formControlName="version" disableOptionCentering [disabled]="!templates.length" panelClass="create-resources-dialog" >
+ <mat-select formControlName="version" disableOptionCentering [disabled]="!templates.length"
+ panelClass="create-resources-dialog">
<mat-option *ngFor="let template of templates"
[value]="template.exploratory_environment_versions[0].version" (click)="getShapes(template)">
{{ template.exploratory_environment_versions[0].template_name }}
@@ -123,7 +125,8 @@
<div class="control selector-wrapper" [ngClass]="{ 'not-active': !currentTemplate }">
<mat-form-field>
<mat-label>Select {{ DICTIONARY.notebook_instance_size }}</mat-label>
- <mat-select formControlName="shape" disableOptionCentering [disabled]="!currentTemplate" panelClass="create-resources-shapes">
+ <mat-select formControlName="shape" disableOptionCentering [disabled]="!currentTemplate"
+ panelClass="create-resources-shapes">
<mat-optgroup *ngFor="let item of (shapes | keys)" [label]="item.key | underscoreless">
<mat-option *ngFor="let list_item of item.value" [value]="list_item.Type">
<strong class="highlight icon-label">{{ list_item.Size }}</strong> {{ list_item.Type }}
@@ -148,7 +151,8 @@
</div>
<div *ngIf="currentTemplate">
- <div class="checkbox-group" *ngIf="currentTemplate?.image !== 'docker.dlab-zeppelin'; else not_support">
+ <div class="checkbox-group"
+ *ngIf="currentTemplate?.image !== 'docker.dlab-zeppelin' && currentTemplate?.image !== 'docker.dlab-superset'">
<label>
<input #configurationNode type="checkbox" (change)="selectConfiguration()" /> Spark configurations
</label>
@@ -160,14 +164,14 @@
parameters is not in a valid format</span>
</div>
</div>
- <ng-template #not_support>
- <small>Spark default configuration for Apache Zeppelin can not be changed from DLab UI. Currently it can be
- done directly through Apache Zeppelin interpreter menu.
- For more details please refer for Apache Zeppelin <a
- href="https://zeppelin.apache.org/docs/0.8.0/usage/interpreter/overview.html" target="_blank">official
- documentation</a>.
- </small>
- </ng-template>
+
+ <small *ngIf="currentTemplate?.image === 'docker.dlab-zeppelin'">
+ Spark default configuration for Apache Zeppelin can not be changed from DLab UI. Currently it can be
+ done directly through Apache Zeppelin interpreter menu.
+ For more details please refer for Apache Zeppelin <a
+ href="https://zeppelin.apache.org/docs/0.8.0/usage/interpreter/overview.html" target="_blank">official
+ documentation</a>.
+ </small>
</div>
<div class="text-center m-top-30">
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 c8ee3c0..4919ce4 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
@@ -25,14 +25,14 @@
.links_block {
- > p {
+ >p {
display: flex;
.description {
white-space: nowrap;
padding-left: 7px;
font-weight: 600;
- color: #455c74;
+ color: #577289;
}
}
}
@@ -46,6 +46,7 @@
margin: 10px 0;
}
}
+
span {
&.danger_color {
@@ -79,14 +80,8 @@
}
}
-.bucket-info{
+.bucket-info {
padding-left: 7px;
font-weight: 600;
color: #455c74;
}
-
-
-
-
-
-
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: [DLAB-1305]: prevent actions for superset
template
Posted by an...@apache.org.
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