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:48:16 UTC
[incubator-dlab] branch DLAB-1421 updated: [DLAB-1421]: Small fixes
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1421
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1421 by this push:
new 9689cfc [DLAB-1421]: Small fixes
9689cfc is described below
commit 9689cfcaac4856b2a6641e63723d5551b65c9bd7
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Jan 3 15:47:59 2020 +0200
[DLAB-1421]: Small fixes
---
.../management/endpoints/endpoints.component.html | 17 +++++++--
.../management/endpoints/endpoints.component.ts | 40 +++++++++++++++++++---
2 files changed, 50 insertions(+), 7 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 5ced457..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
@@ -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(createEndpointForm.value.url)">Test</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"> <span matTooltip="{{element.url}}" matTooltipPosition="above">{{element.url}}</span> </td>
+ <td mat-cell
+ *matCellDef="let element"
+ >
+ <span matTooltip="{{element.url}}" matTooltipPosition="above">{{element.url}}</span>
+ </td>
</ng-container>
<ng-container matColumnDef="account">
@@ -114,7 +125,7 @@
<span (click)="getEndpoinConnectionStatus(element.url)" matTooltip="Test" matTooltipPosition="above">
<mat-icon>compare_arrows</mat-icon>
</span>
- <span (click)="deleteEndpoint(element)" matTooltip="Disconect" matTooltipPosition="above">
+ <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.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts
index c4412e6..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
@@ -129,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]="'above'">{{catToLongUrl(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'" [matTooltipClass]="'lefttop'" class="strong">{{catToLongUrl(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">{{catToLongUrl(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>
@@ -172,7 +204,7 @@ export class EndpointTestResultDialogComponent {
return;
})
}
- private catToLongUrl(url) {
+ private cutToLongUrl(url) {
return url.length > 25 ? url.slice(0,25) + '...' : url
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org