Merge branch 'master' of github.com:KubeOperator/kubepi

Author: Aaron3S

internal/api/v1/chart/chart.go

@@ -32,14 +32,16 @@ func (h *Handler) DeleteRepo() iris.Handler {
 
 func (h *Handler) GetChart() iris.Handler {
 	return func(ctx *context.Context) {
-		//name := ctx.Params().GetString("name")
-		//c, err := h.chartService.GetByName(name, common.DBOptions{})
-		//if err != nil {
-		//	ctx.StatusCode(iris.StatusInternalServerError)
-		//	ctx.Values().Set("message", err.Error())
-		//	return
-		//}
-		//ctx.Values().Set("data", &Chart{Chart: *c})
+		name := ctx.Params().GetString("name")
+		cluster := ctx.URLParam("cluster")
+		repo := ctx.URLParam("repo")
+		cs, err := h.chartService.GetCharts(cluster, repo, name)
+		if err != nil {
+			ctx.StatusCode(iris.StatusInternalServerError)
+			ctx.Values().Set("message", err.Error())
+			return
+		}
+		ctx.Values().Set("data", cs)
 	}
 }
 func (h *Handler) UpdateChart() iris.Handler {

internal/api/v1/chart/types.go

@@ -19,3 +19,8 @@ type Chart struct {
 	Icon        string `json:"icon"`
 	Description string `json:"description"`
 }
+
+type Detail struct {
+	Name     string `json:"name"`
+	Versions string `json:"versions"`
+}

internal/model/v1/chart/chart.go

@@ -1,8 +1,15 @@
 package chart
 
+import "helm.sh/helm/v3/pkg/chart"
+
 type RepoCreate struct {
 	Url      string `json:"url"`
 	Name     string `json:"name"`
 	UserName string `json:"userName"`
 	Password string `json:"password"`
 }
+
+type ChArrayResult struct {
+	Versions []string    `json:"versions"`
+	Chart    chart.Chart `json:"chart"`
+}

internal/service/v1/chart/chart.go

@@ -16,6 +16,7 @@ type Service interface {
 	AddRepo(cluster string, create *v1Chart.RepoCreate) error
 	ListCharts(cluster, repo string, num, size int, pattern string) ([]*search.Result, int, error)
 	RemoveRepo(cluster string, name string) error
+	GetCharts(cluster, repo, name string) (*v1Chart.ChArrayResult, error)
 }
 
 func NewService() Service {
@@ -126,3 +127,32 @@ func (c *service) ListCharts(cluster, repo string, num, size int, pattern string
 	result := chartArray[(num-1)*size : end]
 	return result, len(chartArray), nil
 }
+
+func (c *service) GetCharts(cluster, repo, name string) (*v1Chart.ChArrayResult, error) {
+	clu, err := c.clusterService.Get(cluster, common.DBOptions{})
+	if err != nil {
+		return nil, err
+	}
+	helmClient, err := helm.NewClient(&helm.Config{
+		Host:        clu.Spec.Connect.Forward.ApiServer,
+		BearerToken: clu.Spec.Authentication.BearerToken,
+	})
+	if err != nil {
+		return nil, err
+	}
+	allVersionCharts, err := helmClient.GetCharts(repo, name)
+	if err != nil {
+		return nil, err
+	}
+	var result v1Chart.ChArrayResult
+	for _, chart := range allVersionCharts {
+		result.Versions = append(result.Versions, chart.Chart.Version)
+	}
+	lastVersion := allVersionCharts[0].Chart.Metadata.Version
+	chart, err := helmClient.GetChartDetail(repo, allVersionCharts[0].Chart.Name, lastVersion)
+	if err != nil {
+		return nil, err
+	}
+	result.Chart = *chart
+	return &result, nil
+}

pkg/util/helm/helm.go

@@ -9,6 +9,7 @@ import (
 	"gopkg.in/yaml.v3"
 	"helm.sh/helm/v3/cmd/helm/search"
 	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/chart"
 	"helm.sh/helm/v3/pkg/chart/loader"
 	"helm.sh/helm/v3/pkg/cli"
 	"helm.sh/helm/v3/pkg/getter"
@@ -167,6 +168,50 @@ func (c Client) ListCharts(repoName, pattern string) ([]*search.Result, error) {
 	return result, nil
 }
 
+func (c Client) GetCharts(repoName, name string) ([]*search.Result, error) {
+	charts, err := c.ListCharts(repoName, name)
+	if err != nil {
+		return nil, err
+	}
+	var result []*search.Result
+	for _, chart := range charts {
+		if chart.Chart.Name == name {
+			result = append(result, chart)
+		}
+	}
+	return result, nil
+}
+
+func (c Client) GetChartDetail(repoName, name, version string) (*chart.Chart, error) {
+	repos, err := c.ListRepo()
+	if err != nil {
+		return nil, err
+	}
+	var re *repo.Entry
+	for _, r := range repos {
+		if r.Name == repoName {
+			re = r
+		}
+	}
+	if re == nil {
+		return nil, errors.New("get chart detail failed, repo not found")
+	}
+	client := action.NewShow(action.ShowAll)
+	client.Version = version
+	client.RepoURL = re.URL
+	client.Username = re.Username
+	client.Password = re.Password
+	p, err := client.LocateChart(name, c.settings)
+	if err != nil {
+		return nil, err
+	}
+	ct, err := loader.Load(p)
+	if err != nil {
+		return nil, err
+	}
+	return ct, nil
+}
+
 func (c Client) ListRepo() ([]*repo.Entry, error) {
 	settings := GetSettings()
 	var repos []*repo.Entry

web/dashboard/src/api/charts.js

@@ -11,8 +11,8 @@ export function deleteChart (name) {
   return del(`${baseUrl}/${name}`)
 }
 
-export function getChart (name) {
-  return get(`${baseUrl}/${name}`)
+export function getChart (cluster,repo,name) {
+  return get(`${baseUrl}/${name}?cluster=${cluster}&repo=${repo}`)
 }
 
 export function updateChart (name, user) {

web/dashboard/src/business/market-place/chart/detail/index.vue

@@ -0,0 +1,21 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "",
+  components: {},
+  props: {},
+  data () {
+    return {}
+  },
+  methods: {},
+  created () {
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

web/dashboard/src/business/market-place/chart/index.vue

@@ -15,12 +15,12 @@
       </el-row>
       <el-row :gutter="20" v-infinite-scroll="load" :infinite-scroll-disabled="loading || moreLoading">
         <el-col v-for="(d,index) in shows" v-bind:key="index" :xs="8" :sm="8" :lg="6">
-          <div>
-            <el-card :body-style="{padding: '0px'}" class="d-card el-card">
+          <div @click="getChartDetail(d)">
+            <el-card :body-style="{padding: '0px'}" class="d-card el-card" >
               <el-row :gutter="24">
                 <el-col :span="8">
-                  <div style="margin-top: 32px;margin-left: 25px;margin-bottom: 15px">
-                    <el-image :src="d.icon" fit="contain" style="height: 56px;width: 56px;position:relative">
+                  <div style="margin-top: 32px;margin-left: 30px;margin-bottom: 15px">
+                    <el-image :src="d.icon" fit="contain" style="height: 56px;width: 56px;position:relative" @click="getChartDetail(d)">
                       <div slot="error" class="image-slot">
                         <img :src="require('@/assets/apps.svg')"/>
                       </div>
@@ -50,7 +50,7 @@
 
 <script>
 import LayoutContent from "@/components/layout/LayoutContent"
-import {listRepos, searchCharts} from "@/api/charts"
+import {getChart, listRepos, searchCharts} from "@/api/charts"
 
 export default {
   name: "Charts",
@@ -126,6 +126,11 @@ export default {
         total: 0,
       }
       this.currentSlice = 0
+    },
+    getChartDetail(row) {
+      getChart(this.cluster,row.repo,row.name).then(res => {
+        console.log(res.data)
+      })
     }
   },
   created () {