feat: harbor 镜像列表增加分页

Author: zhengkunwang223

internal/api/v1/imagerepo/image_repo.go

@@ -168,13 +168,19 @@ func (h *Handler) ListImages() iris.Handler {
 func (h *Handler) ListImagesByRepo() iris.Handler {
 	return func(ctx *context.Context) {
 		name := ctx.Params().GetString("repo")
-		imageRepos, err := h.imageRepoService.ListImagesByRepo(name, common.DBOptions{})
+		var req RepoConfig
+		if err := ctx.ReadJSON(&req); err != nil {
+			ctx.StatusCode(iris.StatusBadRequest)
+			ctx.Values().Set("message", err.Error())
+			return
+		}
+		res, err := h.imageRepoService.ListImagesByRepo(name, req.Page, req.Limit, req.Search, common.DBOptions{})
 		if err != nil && err != storm.ErrNotFound {
 			ctx.StatusCode(iris.StatusInternalServerError)
 			ctx.Values().Set("message", err.Error())
 			return
 		}
-		ctx.Values().Set("data", imageRepos)
+		ctx.Values().Set("data", res)
 	}
 }
 
@@ -189,5 +195,5 @@ func Install(parent iris.Party) {
 	sp.Put("/:name", handler.UpdateRepo())
 	sp.Get("/cluster/:cluster", handler.ListRepoForCluster())
 	sp.Get("/images/:cluster/:repo", handler.ListImages())
-	sp.Get("/images/:repo", handler.ListImagesByRepo())
+	sp.Post("/images/:repo", handler.ListImagesByRepo())
 }

internal/model/v1/imagerepo/image_repo.go

@@ -19,3 +19,8 @@ type Credential struct {
 	Username string `json:"username"`
 	Password string `json:"password"`
 }
+
+type RepoResponse struct {
+	Items         []string `json:"items"`
+	ContinueToken string   `json:"continueToken"`
+}

internal/service/v1/imagerepo/image_repo.go

@@ -25,7 +25,7 @@ type Service interface {
 	UpdateRepo(name string, repo *V1ImageRepo.ImageRepo, options common.DBOptions) (err error)
 	ListByCluster(cluster string, options common.DBOptions) (result []V1ImageRepo.ImageRepo, err error)
 	ListImages(repo, cluster string, options common.DBOptions) (names []string, err error)
-	ListImagesByRepo(repo string, options common.DBOptions) (names []string, err error)
+	ListImagesByRepo(repo string, page, limit int, search string, options common.DBOptions) (res V1ImageRepo.RepoResponse, err error)
 }
 
 func NewService() Service {
@@ -95,7 +95,7 @@ func (s *service) ListImages(repo, cluster string, options common.DBOptions) (na
 	return
 }
 
-func (s *service) ListImagesByRepo(repo string, options common.DBOptions) (names []string, err error) {
+func (s *service) ListImagesByRepo(repo string, page, limit int, search string, options common.DBOptions) (response V1ImageRepo.RepoResponse, err error) {
 	rp, err1 := s.GetByName(repo, options)
 	if err1 != nil {
 		err = err1
@@ -111,16 +111,22 @@ func (s *service) ListImagesByRepo(repo string, options common.DBOptions) (names
 		Version: rp.Version,
 	})
 	request := repos.RepoRequest{
-		Repo: rp.RepoName,
+		Repo:   rp.RepoName,
+		Page:   page,
+		Limit:  limit,
+		Search: search,
 	}
 	res, err2 := client.ListImages(request)
 	if err2 != nil {
 		err = err2
 		return
 	}
+	var names []string
 	for _, image := range res.Items {
 		names = append(names, rp.DownloadUrl+"/"+image)
 	}
+	response.Items = names
+	response.ContinueToken = res.ContinueToken
 	return
 }
 

pkg/util/imagerepo/repos/harbor.go

@@ -53,14 +53,12 @@ func (c *harborClient) ListRepos(request ProjectRequest) (names []string, err er
 	if request.Name != "" {
 		projectUrl = projectUrl + "&q=name=~" + request.Name
 	}
-	body, _, err1 := c.HttpClient.Get(projectUrl)
-	if err1 != nil {
-		err = err1
+	body, _, err := c.HttpClient.Get(projectUrl)
+	if err != nil {
 		return
 	}
 	var projects []harborBody
-	if err1 = json.Unmarshal(body, &projects); err1 != nil {
-		err = err1
+	if err = json.Unmarshal(body, &projects); err != nil {
 		return
 	}
 	for _, r := range projects {
@@ -71,7 +69,6 @@ func (c *harborClient) ListRepos(request ProjectRequest) (names []string, err er
 
 func (c *harborClient) ListImages(request RepoRequest) (response RepoResponse, err error) {
 	project := request.Repo
-	//计数器
 	startCount := (request.Page - 1) * request.Limit
 
 	if c.Version == "v2" {
@@ -80,6 +77,7 @@ func (c *harborClient) ListImages(request RepoRequest) (response RepoResponse, e
 		limit := 100
 		artifactCount := 0
 		repoArCount := 0
+		artifactStart := 0
 		var repos []harborBody
 		for start {
 			repoUrl := fmt.Sprintf("%s/%s/%s?page=%d&&page_size=%d", getProjectUrl(c.Version), project, repositoryUrl, p, limit)
@@ -93,26 +91,31 @@ func (c *harborClient) ListImages(request RepoRequest) (response RepoResponse, e
 				err = err1
 				return
 			}
+			if len(items) < limit {
+				start = false
+			}
 			for _, v := range items {
 				if v.ArtifactCount == 0 {
 					continue
 				}
+				artifactCount = artifactCount + v.ArtifactCount
 				if artifactCount >= startCount {
 					repoArCount = repoArCount + v.ArtifactCount
-					if repoArCount >= limit {
+					if repoArCount >= request.Limit {
 						start = false
 						break
 					}
 					repos = append(repos, v)
 					continue
 				}
-				if artifactCount+v.ArtifactCount <= startCount {
-					artifactCount = artifactCount + v.ArtifactCount
+				if artifactCount >= startCount {
+					artifactStart = artifactCount - startCount
 				}
 			}
 			p++
 		}
 		repoUrl := fmt.Sprintf("%s/%s/%s", getProjectUrl(c.Version), project, repositoryUrl)
+		var items []string
 		for _, r := range repos {
 			repoName := strings.Replace(r.Name, project+"/", "", -1)
 			body, res, err2 := c.HttpClient.Get(fmt.Sprintf("%s/%s/%s?page=%d&&page_size=%d", repoUrl, repoName, artifactUrl, 1, r.ArtifactCount))
@@ -132,10 +135,23 @@ func (c *harborClient) ListImages(request RepoRequest) (response RepoResponse, e
 			}
 			for _, art := range artifacts {
 				for _, tag := range art.Tags {
-					response.Items = append(response.Items, r.Name+":"+tag.Name)
+					items = append(items, r.Name+":"+tag.Name)
 				}
 			}
 		}
+		artifactEnd := artifactStart + limit
+		if artifactStart+limit > len(items) {
+			artifactEnd = len(items) - 1
+		}
+		if artifactStart > artifactEnd {
+			response.Items = []string{}
+			return
+		}
+		response.Items = items[artifactStart : artifactEnd+1]
+		if len(response.Items) == request.Limit {
+			response.ContinueToken = "continue"
+		}
+
 	} else {
 		result, err1 := c.HttpClient.GetNameResult(getProjectUrl(c.Version))
 		if err1 != nil {

pkg/util/imagerepo/repos/repo_config.go

@@ -17,6 +17,7 @@ type RepoRequest struct {
 	Repo          string `json:"repo"`
 	Page          int    `json:"page"`
 	Limit         int    `json:"limit"`
+	Search        string `json:"search"`
 	ContinueToken string `json:"continueToken"`
 }
 

web/kubepi/src/api/imagerepos.js

@@ -35,6 +35,6 @@ export function listImages(cluster,repo) {
   return get(`${baseUrl}/images/${cluster}/${repo}`)
 }
 
-export function listImagesByRepo(repo){
-  return get(`${baseUrl}/images/${repo}`)
+export function listImagesByRepo(repo,searchRequest){
+  return post(`${baseUrl}/images/${repo}`,searchRequest)
 }

web/kubepi/src/business/imagerepo-management/detail/index.vue

@@ -1,6 +1,5 @@
 <template>
   <layout-content :header="$t('business.image_repos.images')" :back-to="{ name: 'ImageRepos' }">
-
     <el-alert
             :title="tip"
             type="info">
@@ -12,6 +11,11 @@
         </template>
       </el-table-column>
     </complex-table>
+    <div style="float: right">
+      <el-button icon="el-icon-arrow-left" @click="prePage" :disabled="searchRequest.page<=1"></el-button>
+      <span>{{searchRequest.page}}</span>
+      <el-button icon="el-icon-arrow-right" @click="nextPage" :disabled="searchRequest.continueToken===''"></el-button>
+    </div>
   </layout-content>
 </template>
 
@@ -32,13 +36,29 @@ export default {
       loading: false,
       repoObj: {},
       tip: "",
+      searchRequest: {
+        page:1,
+        limit:10,
+        search: "",
+        continueToken: ""
+      }
     }
   },
   methods: {
+    nextPage() {
+      this.searchRequest.page ++
+      this.search()
+    },
+    prePage() {
+      this.searchRequest.page --
+      this.search()
+    },
+
     search () {
       this.loading = true
-      listImagesByRepo(this.repo).then(res => {
-        this.images = res.data
+      listImagesByRepo(this.repo,this.searchRequest).then(res => {
+        this.images = res.data.items
+        this.searchRequest.continueToken = res.data.continueToken
       }).finally(() => {
         this.loading = false
       })