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/28 12:52:40 UTC
[incubator-dlab] branch DLAB-1357 updated: [DLAB-1357]: Small fixes
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
The following commit(s) were added to refs/heads/DLAB-1357 by this push:
new ac3285d [DLAB-1357]: Small fixes
ac3285d is described below
commit ac3285d8123efd053c932f9d7b6565554bc8e849
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Tue Jan 28 14:52:23 2020 +0200
[DLAB-1357]: Small fixes
---
.../create-legion-claster/create-legion-cluster.component.ts | 5 ++++-
.../legion-deployment/legion-deployment.component.ts | 1 +
.../legion-deployment/legion-list/legion-list.component.html | 7 +++----
.../legion-deployment/legion-list/legion-list.component.ts | 1 -
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/create-legion-claster/create-legion-cluster.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/create-legion-claster/create-legion-cluster.component.ts
index c57e902..fecd3af 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/create-legion-claster/create-legion-cluster.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/create-legion-claster/create-legion-cluster.component.ts
@@ -85,6 +85,9 @@ export class CreateLegionClusterComponent implements OnInit {
private createOdahuCluster(value): void{
this.dialogRef.close();
- this.legionDeploymentService.createOdahuNewCluster(value).subscribe();
+ this.legionDeploymentService.createOdahuNewCluster(value).subscribe(val => {
+ this.toastr.success('Odahu cluster creation is processing!', 'Success!');
+ },error => this.toastr.error(error.message || 'Odahu cluster creation failed!', 'Oops!')
+ );
}
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-deployment.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-deployment.component.ts
index 4b4adfe..98c5753 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-deployment.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-deployment.component.ts
@@ -42,6 +42,7 @@ export class LegionDeploymentComponent implements OnInit {
this.dialog.open(CreateLegionClusterComponent, { panelClass: 'modal-lg' })
.afterClosed().subscribe((result) => {
result && this.getEnvironmentHealthStatus();
+ this.refreshGrid();
});
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-list/legion-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-list/legion-list.component.html
index 77f4d54..9929294 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-list/legion-list.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-list/legion-list.component.html
@@ -29,7 +29,7 @@
<ng-container matColumnDef="legion-status">
<th mat-header-cell *matHeaderCellDef class="legion-status"> Legion cluster status </th>
<td mat-cell *matCellDef="let element" class="legion-status">
- <span *ngIf="element && element.name">{{ element.status | titlecase}}</span>
+ <span *ngIf="element && element.name" [ngClass]="element.status.toLowerCase()">{{ element.status | titlecase}}</span>
</td>
<td mat-footer-cell *matFooterCellDef></td>
</ng-container>
@@ -81,15 +81,14 @@
<td mat-footer-cell *matFooterCellDef
[colSpan]="displayedColumns.length"
class="info">
- <span *ngIf="!legionClustersList.length">
- No Odahu clusters </span>
+ <span>No Odahu clusters</span>
</td>
<td mat-footer-cell *matFooterCellDef></td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
- <!--<tr [hidden]="legionClustersList.length" mat-footer-row *matFooterRowDef="['placeholder']"></tr>-->
+ <tr [hidden]="legionClustersList && legionClustersList.length" mat-footer-row *matFooterRowDef="['placeholder']"></tr>
</table>
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-list/legion-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-list/legion-list.component.ts
index 5901f76..e31d67a 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-list/legion-list.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-list/legion-list.component.ts
@@ -22,7 +22,6 @@ export class LegionListComponent implements OnInit {
this.subscriptions.add(this.legionDeploymentDataService._legionClasters.subscribe(
(value) => {
if (value) {
- console.log(value)
this.legionClustersList = value;
this.dataSource = new MatTableDataSource(value);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org