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/03 13:51:40 UTC
[incubator-dlab] branch develop updated: [DLAB-1421]: Added test
functionality for already added endpoint(endpoint list) (#517)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new da297db [DLAB-1421]: Added test functionality for already added endpoint(endpoint list) (#517)
da297db is described below
commit da297db2bd2e64c40dbc7ae3f718bf9faf453fef
Author: Dmytro Gnatyshyn <42...@users.noreply.github.com>
AuthorDate: Fri Jan 3 15:50:36 2020 +0200
[DLAB-1421]: Added test functionality for already added endpoint(endpoint list) (#517)
[DLAB-1421]: Added test functionality for already added endpoint (endpoint list)
---
.../management/endpoints/endpoints.component.html | 22 ++++++++--
.../management/endpoints/endpoints.component.scss | 2 +-
.../management/endpoints/endpoints.component.ts | 49 ++++++++++++++++++----
.../project/project-form/project-form.component.ts | 1 +
.../webapp/src/assets/styles/_dialogs.scss | 4 ++
5 files changed, 66 insertions(+), 12 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html
index 73173cd..c1171dd 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html
@@ -26,7 +26,7 @@
<div class="dialog-content tabs">
<div class="content-box">
<mat-tab-group #tabGroup>
- <mat-tab label="Connect ENDPOINT">
+ <mat-tab label="CONNECT ENDPOINT">
<div class="split">
<form [formGroup]="createEndpointForm" novalidate>
<div class="control-group">
@@ -76,7 +76,14 @@
</div>
</form>
<div class="action-group m-bott-10">
- <button mat-raised-button type="button" [disabled]="!this.createEndpointForm.value.url || !createEndpointForm.valid" class="butt action" (click)="getEndpoinConnectionStatus()">Test Endpoint</button>
+ <button mat-raised-button
+ type="button"
+ [disabled]="!this.createEndpointForm.value.url || !createEndpointForm.valid"
+ class="butt action"
+ (click)="getEndpoinConnectionStatus(createEndpointForm.value.url)"
+ >
+ Test
+ </button>
<div class="action-butt">
<button mat-raised-button type="button" class="butt action" (click)="dialogRef.close()">Cancel</button>
<button mat-raised-button type="button" [disabled]="!createEndpointForm.valid"
@@ -95,7 +102,11 @@
<ng-container matColumnDef="url">
<th mat-header-cell *matHeaderCellDef class="url"> Url </th>
- <td mat-cell *matCellDef="let element" matTooltip="{{element.url}}"> {{element.url}} </td>
+ <td mat-cell
+ *matCellDef="let element"
+ >
+ <span matTooltip="{{element.url}}" matTooltipPosition="above">{{element.url}}</span>
+ </td>
</ng-container>
<ng-container matColumnDef="account">
@@ -111,7 +122,10 @@
<ng-container matColumnDef="actions">
<th mat-header-cell *matHeaderCellDef class="actions"></th>
<td mat-cell *matCellDef="let element" class="actions">
- <span (click)="deleteEndpoint(element)">
+ <span (click)="getEndpoinConnectionStatus(element.url)" matTooltip="Test" matTooltipPosition="above">
+ <mat-icon>compare_arrows</mat-icon>
+ </span>
+ <span (click)="deleteEndpoint(element)" matTooltip="Disconnect" matTooltipPosition="above">
<mat-icon>delete_forever</mat-icon>
</span>
</td>
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss
index aaaa19e..5714552 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss
@@ -67,8 +67,8 @@
.actions {
color: #607d8b;
- width: 10%;
text-align: center;
+ width: 14%;
span {
transition: all .5s ease-in-out;
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts
index 6675231..e263edc 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts
@@ -86,10 +86,9 @@ export class EndpointsComponent implements OnInit {
});
}
- public getEndpoinConnectionStatus(){
- const url = this.createEndpointForm.value.url;
+ public getEndpoinConnectionStatus(url){
let getStatus = this.endpointService.getEndpoinConnectionStatus(encodeURIComponent(url));
- this.dialog.open(EndpointTestResultDialogComponent, { data: {url: this.createEndpointForm.value.url, getStatus}, panelClass: 'modal-sm' });
+ this.dialog.open(EndpointTestResultDialogComponent, { data: {url: url, getStatus}, panelClass: 'modal-sm' });
}
private static createResourceList(name: string, resource: Array<any>, nodeStatus: string): Object {
@@ -130,9 +129,41 @@ export class EndpointsComponent implements OnInit {
</div>
<div class="content-box">
<div mat-dialog-content class="content message">
- <p class="dialog-message ellipsis" *ngIf="!response">Connecting to url <span class="strong" matTooltip="{{data.url}}" [matTooltipPosition]="'before'">{{data.url}}</span></p>
- <p class="dialog-message ellipsis" *ngIf="isConnected && response"><i class="material-icons icons-possition active">check_circle</i>Connected to url <span matTooltip="{{data.url}}" [matTooltipPosition]="'before'" class="strong">{{data.url}}</span></p>
- <p class="dialog-message ellipsis" *ngIf="!isConnected && response"><i class="material-icons icons-possition failed">cancel</i>Failed to connect to url <span matTooltip="{{data.url}}" [matTooltipPosition]="'before'" class="strong">{{data.url}}</span></p>
+ <p
+ class="dialog-message ellipsis"
+ *ngIf="!response">
+ Connecting to url
+ <span class="strong"
+ matTooltip="{{data.url}}"
+ [matTooltipPosition]="'above'"
+ >
+ {{cutToLongUrl(data.url)}}
+ </span>
+ </p>
+ <p
+ class="dialog-message ellipsis"
+ *ngIf="isConnected && response">
+ <i class="material-icons icons-possition active">check_circle</i>
+ Connected to url
+ <span matTooltip="{{data.url}}"
+ [matTooltipPosition]="'above'"
+ class="strong"
+ >
+ {{cutToLongUrl(data.url)}}
+ </span>
+ </p>
+ <p class="dialog-message ellipsis"
+ *ngIf="!isConnected && response"
+ >
+ <i class="material-icons icons-possition failed">cancel</i>
+ Failed to connect to url
+ <span matTooltip="{{data.url}}"
+ [matTooltipPosition]="'above'"
+ class="strong"
+ >
+ {{cutToLongUrl(data.url)}}
+ </span>
+ </p>
</div>
<div class="text-center m-top-20 m-bott-10">
<button type="button" class="butt" mat-raised-button (click)="dialogRef.close()">Close</button>
@@ -151,7 +182,7 @@ export class EndpointsComponent implements OnInit {
header a:hover i { color: #35afd5; cursor: pointer; }
label { font-size: 15px; font-weight: 500; font-family: "Open Sans",sans-serif; cursor: pointer; display: flex; align-items: center;}
.progress-bar{ height: 4px;}
- .dialog-message{min-height: 25px; overflow: hidden}
+ .dialog-message{min-height: 25px; overflow: hidden;}
`
]
})
@@ -173,4 +204,8 @@ export class EndpointTestResultDialogComponent {
return;
})
}
+ private cutToLongUrl(url) {
+ return url.length > 25 ? url.slice(0,25) + '...' : url
+ }
+
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
index b89a51f..5eb522a 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
@@ -95,6 +95,7 @@ export class ProjectFormComponent implements OnInit {
}
public reset() {
+ this.stepper.reset();
this.keyLabel = '';
this.initFormModel();
}
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 0128179..e1e6ce6 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
@@ -335,6 +335,10 @@ mat-dialog-container {
}
}
+.mat-step-icon-state-number .mat-step-icon-content{
+ top: 49%;
+}
+
@media screen and (max-width: 1280px) {
.modal-fullscreen {
max-width: 100vw !important;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org