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 61a8e0c6d30d6202c22aea7f25f19634030ab778 Author: Hennadii_Shpak <[email protected]> AuthorDate: Tue Aug 2 22:07:01 2022 +0300 fixed project select element --- .../webapp/src/app/resources/images/images.component.html | 10 +++++----- .../webapp/src/app/resources/images/images.component.ts | 3 --- .../webapp/src/app/resources/images/images.service.ts | 8 ++++++-- 3 files changed, 11 insertions(+), 10 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 064a2e4f8..45d434241 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 @@ -146,7 +146,7 @@ <ng-container matColumnDef="project"> <td mat-cell *matCellDef="let element" [attr.colspan]="8" class="image-page__project"> - {{ element.project }} + {{ element?.project }} </td> </ng-container> @@ -206,11 +206,11 @@ </th> </ng-container> - <!-- ----------------------------------------------------- --> + <!-- -------------------------TABLE BODY---------------------------- --> <ng-container matColumnDef="expandedDetail"> <td mat-cell *matCellDef="let element" class="exploratory" [attr.colspan]="8"> - <tr *ngFor="let element of element.images; let i = index" class="element-row mat-row"> + <tr *ngFor="let element of element?.images; let i = index" class="element-row mat-row"> <td mat-cell class="image-checkbox--wrapper"> <datalab-checkbox (click)="onCheckboxClick(element)" @@ -294,8 +294,8 @@ <tr mat-header-row *matHeaderRowDef="displayedColumns;" class="header-row"></tr> - <tr mat-row [hidden]="!element.images.length" *matRowDef="let element; columns: ['project']" class="element-row"></tr> - <tr mat-row *matRowDef="let row; columns: ['expandedDetail']" class="detail-row"></tr> + <tr mat-row [hidden]="!element?.images.length" *matRowDef="let element; columns: ['project']" class="element-row"></tr> + <tr mat-row [hidden]="!row?.images.length" *matRowDef="let row; columns: ['expandedDetail']" class="detail-row"></tr> <tr [hidden]="!($isProjectListEmpty | async)" mat-footer-row *matFooterRowDef="['placeholder']"></tr> </table> </section> diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.ts index 82de426fa..0a9b1c695 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.ts @@ -120,9 +120,6 @@ export class ImagesComponent implements OnInit, OnDestroy { } onSelectClick(projectName: string = ''): void { - if (!projectName) { - return; - } this.imagesService.getActiveProject(projectName); this.activeProjectName = projectName; } 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 fa11d3ab0..f60ac898f 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 @@ -72,8 +72,12 @@ export class ImagesService { } getActiveProject(projectName: string): void { - const currentProject = this.$$projectList.value.find(({project}) => project === projectName); - this.updateImageList(currentProject.images); + if (!projectName) { + this.updateProjectList(this.$$cashedProjectList.getValue()); + } else { + const currentProject = this.$$cashedProjectList.getValue().find(({project}) => project === projectName); + this.updateProjectList([currentProject]); + } } getProjectNameList(imageList: ProjectModel[]): string[] { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
