This is an automated email from the ASF dual-hosted git repository. hshpak pushed a commit to branch feat/DATALAB-2881/filter-function-to-Images-page in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 5fb14b67615d577fa62074b399c2e6f45c12bcec Author: Hennadii_Shpak <[email protected]> AuthorDate: Thu Aug 4 12:47:06 2022 +0300 fixed style of filter btn --- .../webapp/src/app/resources/images/images.component.html | 12 ++++++------ .../webapp/src/app/resources/images/images.component.scss | 2 +- .../webapp/src/app/resources/images/images.service.ts | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.html index b782f49a3..e02ecf02a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.html @@ -96,7 +96,7 @@ <button mat-raised-button [disabled]="!(dataSource | async)?.length && !($isFiltered | async)" class="butt filter__btn" (click)="onFilterClick()"> <i class="material-icons" [ngClass]="{'filtered-icon': $isFiltered | async}">filter_list</i> - <span class="filter__btn--name">Filter</span> + <span class="filter__btn--name" [ngClass]="{'filtered-icon': $isFiltered | async}">Filter</span> <button *ngIf="$isFiltered | async" type="button" (click)="onResetFilterClick($event)" class="close__btn">×</button> </button> <div *ngIf="isFilterOpened | async" class="filer__wrapper"> @@ -166,7 +166,7 @@ <ng-container matColumnDef="imageName"> <th mat-header-cell *matHeaderCellDef class="name-col header-cell"> - <span class="label image-label"> + <span class="label image-label" [ngClass]="{'filtered-icon': ($filteredColumnState | async)?.imageName}"> {{tableHeaderCellTitles.imageName}} <button *ngIf="($filteredColumnState | async)?.imageName" @@ -182,7 +182,7 @@ <ng-container matColumnDef="imageStatus"> <th mat-header-cell *matHeaderCellDef class="status-col header-cell"> - <span class="label image-label"> + <span class="label image-label" [ngClass]="{'filtered-icon': ($filteredColumnState | async)?.statuses}"> {{tableHeaderCellTitles.imageStatus}} <button *ngIf="($filteredColumnState | async)?.statuses" @@ -204,7 +204,7 @@ <ng-container matColumnDef="endpoint"> <th mat-header-cell *matHeaderCellDef class="tag-col header-cell"> - <span class="label image-label"> + <span class="label image-label" [ngClass]="{'filtered-icon': ($filteredColumnState | async)?.endpoints}"> {{tableHeaderCellTitles.endpoint}} <button *ngIf="($filteredColumnState | async)?.endpoints" @@ -220,7 +220,7 @@ <ng-container matColumnDef="templateName"> <th mat-header-cell *matHeaderCellDef class="resources-col label-header"> - <span class="label image-label"> + <span class="label image-label" [ngClass]="{'filtered-icon': ($filteredColumnState | async)?.templateNames}"> {{tableHeaderCellTitles.templateName}} <button *ngIf="($filteredColumnState | async)?.templateNames" @@ -236,7 +236,7 @@ <ng-container matColumnDef="sharedStatus"> <th mat-header-cell *matHeaderCellDef class="cost-col label-header"> - <span class="label image-label"> + <span class="label image-label" [ngClass]="{'filtered-icon': ($filteredColumnState | async)?.sharingStatuses}"> {{tableHeaderCellTitles.sharedStatus}} <button *ngIf="($filteredColumnState | async)?.sharingStatuses" diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.scss index e317f2cde..b3895baed 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.scss @@ -246,7 +246,7 @@ table.resources .label-header.settings { } td.mat-cell.image-page__project { - padding-left: 49px; + padding-left: 3.75%; } .filtered-icon { diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.service.ts b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.service.ts index 05dce5415..2c0a30f33 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.service.ts @@ -79,6 +79,7 @@ export class ImagesService { const projectList = this.$$cashedProjectList.getValue(); if (!projectName) { this.updateProjectList(projectList); + this.$$isProjectListEmpty.next(this.isProjectListEmpty(projectList)); } else { const currentProject = projectList.find(({project}) => project === projectName); this.updateProjectList([currentProject]); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
