You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/01/23 09:11:07 UTC
[incubator-dlab] 02/04: [DLAB-1357]: Added legion icon to Resource
page
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1357
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 09efef4056d5e8a60dd3f5e102c6920b70acd875
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Jan 10 12:56:24 2020 +0200
[DLAB-1357]: Added legion icon to Resource page
---
.../detail-dialog/detail-dialog.component.html | 34 ++++++++++++++++++++--
.../detail-dialog/detail-dialog.component.ts | 9 +++++-
.../resources-grid/resources-grid.component.html | 5 ++--
.../resources-grid/resources-grid.component.scss | 5 ++++
.../resources-grid/resources-grid.component.ts | 7 ++++-
5 files changed, 54 insertions(+), 6 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 22802ae..778e5dc 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
@@ -18,11 +18,12 @@
-->
<div class="detail-dialog" id="dialog-box">
- <header class="dialog-header header-white">
+ <header class="dialog-header " [ngClass]="{'header-white': data.notebook}">
+ <h4 *ngIf="data.legion" class="modal-title" >Legion cluster</h4>
<button type="button" class="close" (click)="dialogRef.close()">×</button>
</header>
<div class="dialog-content">
- <div *ngIf="data">
+ <div *ngIf="data.notebook">
<table class="detail-header">
<tr>
<td>{{notebook.template_name}}</td>
@@ -129,5 +130,34 @@
</div>
</div>
</div>
+ <div class="legion-info" *ngIf="data.legion">
+ <div class="content-box">
+ <div class="detail-info" *ngIf="!legion.error_message">
+ <div class="links_block">
+ <p>
+ <span class="description">URL for feedback storage</span>
+ <a class="ellipsis" matTooltip=" http://172.31.48.131:8080/" matTooltipPosition="above" href=" http://172.31.48.131:8080/"
+ target="_blank">
+ http://172.31.48.131:8080/
+ </a>
+ </p>
+ <p>
+ <span class="description">URL for Swagger API registry</span>
+ <a class="ellipsis" matTooltip=" http://172.31.48.131:8080/" matTooltipPosition="above" href=" http://172.31.48.131:8080/"
+ target="_blank">
+ http://172.31.48.131:8080/
+ </a>
+ </p>
+ <p>
+ <span class="description">URL for Grafana</span>
+ <a class="ellipsis" matTooltip=" http://172.31.48.131:8080/" matTooltipPosition="above" href=" http://172.31.48.131:8080/"
+ target="_blank">
+ http://172.31.48.131:8080/
+ </a>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
index fa05b52..5b4eb23 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
@@ -42,6 +42,7 @@ export class DetailDialogComponent implements OnInit {
config: Array<{}> = [];
public configurationForm: FormGroup;
+ private legion: any;
@ViewChild('configurationNode', { static: false }) configuration;
@@ -52,7 +53,13 @@ export class DetailDialogComponent implements OnInit {
public dialogRef: MatDialogRef<DetailDialogComponent>,
public toastr: ToastrService
) {
- this.notebook = data;
+ if(data.notebook){
+ this.notebook = data.notebook;
+ }
+
+ if(data.legion){
+ this.legion = data.legion;
+ }
}
ngOnInit() {
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 78e3977..f5e2bdf 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
@@ -103,8 +103,9 @@
[@detailExpand]="element == expandedElement ? 'expanded' : 'collapsed'" sticky>
<tr *ngFor="let element of element.exploratory; let i = index" class="element-row mat-row">
- <td class="name-col" (click)="printDetailEnvironmentModal(element)">
- <span matTooltip="{{ element.name }}" matTooltipPosition="above">{{ element.name }}</span>
+ <td class="name-col">
+ <span matTooltip="{{ element.name }}" matTooltipPosition="above" (click)="printDetailEnvironmentModal(element)">{{ element.name }}</span>
+ <span (click)="printDetailLegionModal(element)" ><i class="material-icons legion-icon">cloud_circle</i></span>
</td>
<td class="status-col status" ngClass="{{ element.status.toLowerCase() || ''}}">
{{element.status | underscoreless }}
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss
index 682fb7b..16e4d88 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss
@@ -375,3 +375,8 @@ tr.detail-row {
padding: 40px;
text-align: center;
}
+
+.legion-icon{
+ vertical-align: middle;
+ margin-left: 10px;
+}
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 8c49782..43f40bf 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
@@ -159,7 +159,12 @@ export class ResourcesGridComponent implements OnInit {
}
public printDetailEnvironmentModal(data): void {
- this.dialog.open(DetailDialogComponent, { data: data, panelClass: 'modal-lg' })
+ this.dialog.open(DetailDialogComponent, { data: {notebook: data}, panelClass: 'modal-lg' })
+ .afterClosed().subscribe(() => this.buildGrid());
+ }
+
+ public printDetailLegionModal(data): void {
+ this.dialog.open(DetailDialogComponent, { data: {legion: data}, panelClass: 'modal-lg' })
.afterClosed().subscribe(() => this.buildGrid());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org