From 7596a7de5fb4147e43809b5546295f4e02b4e4da Mon Sep 17 00:00:00 2001
From: Shijun Sun <30999793+AllForNothing@users.noreply.github.com>
Date: Wed, 18 May 2022 14:48:06 +0800
Subject: [PATCH] Improve accessory component (#16869)

Signed-off-by: AllForNothing <sshijun@vmware.com>
---
 .../artifact-list-tab.component.html                | 13 ++++++++++++-
 .../sub-accessories/sub-accessories.component.ts    |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html
index c10b67114..fff8634f1 100644
--- a/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html
+++ b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html
@@ -314,7 +314,18 @@
                     <div class="cell">
                         {{artifact.pull_time === availableTime ? "" : (artifact.pull_time| harborDatetime: 'short')}}</div>
                 </clr-dg-cell>
-                <sub-accessories (deleteAccessory)="deleteAccessory($event)" [projectName]="projectName" [repositoryName]="repoName" *ngIf="artifact?.accessories?.length" [total]="artifact?.accessoryNumber" [accessories]="artifact?.accessories" [clrIfExpanded]="false" ngProjectAs="clr-dg-row-detail"></sub-accessories>
+                <ng-container
+                        ngProjectAs="clr-dg-row-detail"
+                        *ngIf="artifact?.accessories?.length">
+                    <sub-accessories
+                            (deleteAccessory)="deleteAccessory($event)"
+                            [projectName]="projectName"
+                            [repositoryName]="repoName"
+                            [artifactDigest]="artifact?.digest"
+                            [total]="artifact?.accessoryNumber"
+                            [accessories]="artifact?.accessories"
+                            *clrIfExpanded></sub-accessories>
+                </ng-container>
             </clr-dg-row>
             <clr-dg-footer>
                 <clr-dg-pagination #pagination [clrDgTotalItems]="totalCount" [(clrDgPage)]="currentPage" [clrDgPageSize]="pageSize">
diff --git a/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/sub-accessories/sub-accessories.component.ts b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/sub-accessories/sub-accessories.component.ts
index 048eef4a3..aed570d46 100644
--- a/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/sub-accessories/sub-accessories.component.ts
+++ b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/sub-accessories/sub-accessories.component.ts
@@ -93,7 +93,7 @@ export class SubAccessoriesComponent implements OnInit {
             projectName: this.projectName,
             repositoryName: dbEncodeURIComponent(this.repositoryName),
             reference: this.artifactDigest,
-            page: 1,
+            page: this.currentPage,
             pageSize: ACCESSORY_PAGE_SIZE
         };
         this.newArtifactService.listAccessories(listTagParams)