This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch DLAB-971 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 67d066653cc694f97372c549deca9b0fbf1fe38b Author: Andriana Kovalyshyn <[email protected]> AuthorDate: Wed Aug 7 12:57:44 2019 +0200 [DLAB-971]: added extra check of health status data; filter makr fixes --- .../src/app/resources/resources-grid/resources-grid.component.html | 4 ++-- .../src/app/resources/resources-grid/resources-grid.component.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 c0aa2f6..a714a6e 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 @@ -29,8 +29,8 @@ <span class="label">{{ column.title }}</span> <button mat-icon-button *ngIf="column.filtering" aria-label="More" class="ar" (click)="toggleFilterRow()"> <i class="material-icons"> - <span *ngIf="filtering && filterForm[column.name].length > 0 && collapsedFilterRow">filter_list</span> - <span [hidden]="filtering && filterForm[column.name].length > 0 && collapsedFilterRow">more_vert</span> + <span *ngIf="filtering && filterForm[column.name].length > 0 && !collapsedFilterRow">filter_list</span> + <span [hidden]="filtering && filterForm[column.name].length > 0 && !collapsedFilterRow">more_vert</span> </i> </button> </th> 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 c55c29f..783a639 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 @@ -111,7 +111,7 @@ export class ResourcesGridComponent implements OnInit { this.getDefaultFilterConfiguration(); (this.environments.length) ? this.getUserPreferences() : this.filteredEnvironments = []; - !this.healthStatus.billingEnabled && this.modifyGrid(); + this.healthStatus && !this.healthStatus.billingEnabled && this.modifyGrid(); }); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
