This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 397c9f33b186fd8f3b58c973f87649be4f1782fb
Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com>
AuthorDate: Thu May 30 13:29:28 2019 +0300
[DLAB-631]: added tabs with endpoints list
---
.../management/endpoints/endpoints.component.html | 80 +++++++++++++++++-----
.../management/endpoints/endpoints.component.scss | 42 ++++++++++++
2 files changed, 104 insertions(+), 18 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 c6c663b..99404fc 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
@@ -18,20 +18,24 @@
-->
- <div class="ami-dialog" id="dialog-box">
- <header class="dialog-header">
- <h4 class="modal-title">Create endpoint</h4>
- <button type="button" class="close"
(click)="dialogRef.close()">×</button>
- </header>
- <div class="dialog-content">
- <div class="content-box">
+<div class="endpoints-dialog" id="dialog-box">
+ <header class="dialog-header">
+ <h4 class="modal-title">Create endpoint</h4>
+ <button type="button" class="close"
(click)="dialogRef.close()">×</button>
+ </header>
+ <div class="dialog-content tabs">
+ <div class="content-box">
+ <mat-tab-group>
+ <mat-tab label="CREATE ENDPOINT">
<form [formGroup]="createEndpointForm" novalidate>
<div class="control-group">
<label class="label">Name</label>
<div class="control">
<input type="text" formControlName="name" placeholder="Enter
endpoint name">
- <span class="error"
*ngIf="!createEndpointForm?.controls.name.valid &&
createEndpointForm.controls.name.touched">
- Endpoint name can only contain letters, numbers, hyphens
and '_' but can not end with special characters
+ <span class="error"
+ *ngIf="!createEndpointForm?.controls.name.valid &&
createEndpointForm.controls.name.touched">
+ Endpoint name can only contain letters, numbers, hyphens and
'_' but can not end with special
+ characters
</span>
</div>
</div>
@@ -39,8 +43,10 @@
<label class="label">Endpoint url</label>
<div class="control">
<input type="text" formControlName="url" placeholder="Enter
endpoint url">
- <span class="error"
*ngIf="!createEndpointForm?.controls.url.valid &&
createEndpointForm.controls.url.touched">
- Endpoint url can only contain letters, numbers, hyphens
and '_' but can not end with special characters
+ <span class="error"
+ *ngIf="!createEndpointForm?.controls.url.valid &&
createEndpointForm.controls.url.touched">
+ Endpoint url can only contain letters, numbers, hyphens and
'_' but can not end with special
+ characters
</span>
</div>
</div>
@@ -48,16 +54,54 @@
<label class="label">Account</label>
<div class="control">
<input type="text" formControlName="account"
placeholder="Enter account">
- <span class="error"
*ngIf="!createEndpointForm?.controls.account.valid &&
createEndpointForm.controls.account.touched">
- Endpoint url can only contain letters, numbers, hyphens
and '_' but can not end with special characters
+ <span class="error"
+ *ngIf="!createEndpointForm?.controls.account.valid &&
createEndpointForm.controls.account.touched">
+ Endpoint account can only contain letters, numbers, hyphens
and '_' but can not end with special
+ characters
</span>
</div>
</div>
</form>
- <div class="text-center m-top-30 m-bott-10">
+ <div class="action-group">
<button mat-raised-button type="button" class="butt action"
(click)="dialogRef.close()">Cancel</button>
- <button mat-raised-button type="button"
[disabled]="!createEndpointForm.valid"
(click)="assignChanges(createEndpointForm.value)" class="butt butt-success
action">Create</button>
+ <button mat-raised-button type="button"
[disabled]="!createEndpointForm.valid"
+ (click)="assignChanges(createEndpointForm.value)" class="butt
butt-success action">Create</button>
</div>
- </div>
- </div>
- </div>
\ No newline at end of file
+ </mat-tab>
+ <mat-tab label="ENDPOINTS LIST">
+ <div class="endpoints">
+ <table mat-table [dataSource]="endpoints" class="endpoints-table"
+ *ngIf="endpoints?.length">
+ <ng-container matColumnDef="name">
+ <th mat-header-cell *matHeaderCellDef class="name"> Endpoint
name </th>
+ <td mat-cell *matCellDef="let element"> {{element.name}} </td>
+ </ng-container>
+
+ <ng-container matColumnDef="url">
+ <th mat-header-cell *matHeaderCellDef class="url"> Url </th>
+ <td mat-cell *matCellDef="let element"> {{element.url}} </td>
+ </ng-container>
+
+ <ng-container matColumnDef="account">
+ <th mat-header-cell *matHeaderCellDef class="account"> Account
</th>
+ <td mat-cell *matCellDef="let element"> {{element.account}}
</td>
+ </ng-container>
+
+ <ng-container matColumnDef="actions">
+ <th mat-header-cell *matHeaderCellDef class="actions"></th>
+ <td mat-cell *matCellDef="let element" class="actions">
+ <span (click)="deleteEndpoint(element)">
+ <mat-icon>delete_forever</mat-icon>
+ </span>
+ </td>
+ </ng-container>
+
+ <tr mat-header-row *matHeaderRowDef="displayedColumns; sticky:
true"></tr>
+ <tr mat-row *matRowDef="let row; columns:
displayedColumns;"></tr>
+ </table>
+ </div>
+ </mat-tab>
+ </mat-tab-group>
+ </div>
+ </div>
+</div>
\ No newline at end of file
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 510f082..9a49606 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
@@ -17,3 +17,45 @@
* under the License.
*/
+.content-box {
+ padding: 10px 30px 30px;
+ height: 380px;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ form {
+ padding: 20px 10px;
+ .control-group {
+ .error {
+ position: absolute;
+ right: 0;
+ bottom: 5px;
+ }
+ }
+ }
+ .action-group {
+ text-align: center;
+ }
+ .endpoints {
+ height: 265px;
+ table {
+ width: 100%;
+ .actions {
+ color: #607d8b;
+ width: 10%;
+ text-align: center;
+ span {
+ transition: all .5s ease-in-out;
+ cursor: pointer;
+ .mat-icon {
+ font-size: 18px;
+ padding-top: 5px;
+ }
+ &:hover {
+ color: darken(#607d8b, 10%);
+ }
+ }
+ }
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
