feat: support filter stores by kinds

Author: LinuxSuRen

console/atest-ui/src/components/TestSuiteCreationDialog.vue

@@ -25,7 +25,7 @@ function loadStores() {
             'X-Auth': API.getToken()
         }
     }
-    fetch('/api/v1/stores', requestOptions)
+    fetch('/api/v1/stores?kind=store', requestOptions)
         .then(API.DefaultResponseProcess)
         .then(async (d) => {
             stores.value = d.data

console/atest-ui/src/components/TestSuiteImportDialog.vue

@@ -53,7 +53,7 @@ function loadStores() {
             'X-Auth': API.getToken()
         }
     }
-    fetch('/api/v1/stores', requestOptions)
+    fetch('/api/v1/stores?kind=store', requestOptions)
         .then(API.DefaultResponseProcess)
         .then(async (d) => {
             stores.value = d.data

console/atest-ui/src/views/TestingPanel.vue

@@ -166,7 +166,7 @@ function loadStores(lastSuitName?: string, lastCaseName?: string) {
       'X-Auth': API.getToken()
     }
   }
-  fetch('/api/v1/stores', requestOptions)
+  fetch('/api/v1/stores?kind=store', requestOptions)
     .then(API.DefaultResponseProcess)
     .then(async (d) => {
       stores.value = d.data

pkg/server/convert.go

@@ -29,9 +29,11 @@ func ToGRPCStore(store testing.Store) (result *Store) {
 		Name:  store.Name,
 		Owner: store.Owner,
 		Kind: &StoreKind{
-			Name:    store.Kind.Name,
-			Url:     store.Kind.URL,
-			Enabled: store.Kind.Enabled,
+			Name:       store.Kind.Name,
+			Url:        store.Kind.URL,
+			Enabled:    store.Kind.Enabled,
+			Categories: store.Kind.Categories,
+			Link:       store.Kind.Link,
 		},
 		Description: store.Description,
 		Url:         store.URL,
@@ -57,8 +59,10 @@ func ToNormalStore(store *Store) (result testing.Store) {
 	}
 	if store.Kind != nil {
 		result.Kind = testing.StoreKind{
-			Name: store.Kind.Name,
-			URL:  store.Kind.Url,
+			Name:       store.Kind.Name,
+			URL:        store.Kind.Url,
+			Link:       store.Kind.Link,
+			Categories: store.Kind.Categories,
 		}
 	}
 	return

pkg/server/remote_server.go

@@ -1169,17 +1169,28 @@ func (s *server) GetStoreKinds(context.Context, *Empty) (kinds *StoreKinds, err
 		kinds = &StoreKinds{}
 		for _, store := range stores {
 			kinds.Data = append(kinds.Data, &StoreKind{
-				Name:    store.Name,
-				Enabled: true,
-				Url:     store.URL,
-				Link:    store.Link,
-				Params:  convertStoreKindParams(store.Params),
+				Name:         store.Name,
+				Enabled:      true,
+				Url:          store.URL,
+				Link:         store.Link,
+				Params:       convertStoreKindParams(store.Params),
+				Categories:   store.Categories,
+				Dependencies: convertStoreKindDependencies(store.Dependencies),
 			})
 		}
 	}
 	return
 }
 
+func convertStoreKindDependencies(dependencies []testing.StoreKindDependency) (result []*StoreKindDependency) {
+	for _, dependency := range dependencies {
+		result = append(result, &StoreKindDependency{
+			Name: dependency.Name,
+		})
+	}
+	return
+}
+
 func convertStoreKindParams(params []testing.StoreKindParam) (result []*StoreKindParam) {
 	for _, param := range params {
 		result = append(result, &StoreKindParam{
@@ -1192,21 +1203,44 @@ func convertStoreKindParams(params []testing.StoreKindParam) (result []*StoreKin
 	return
 }
 
-func (s *server) GetStores(ctx context.Context, in *Empty) (reply *Stores, err error) {
+func (s *server) GetStores(ctx context.Context, in *SimpleQuery) (reply *Stores, err error) {
 	user := oauth.GetUserFromContext(ctx)
 	storeFactory := testing.NewStoreFactory(s.configDir)
 	var stores []testing.Store
 	var owner string
 	if user != nil {
 		owner = user.Name
 	}
+
+	var kinds *StoreKinds
+	if kinds, err = s.GetStoreKinds(ctx, &Empty{}); err != nil {
+		return
+	}
+
 	if stores, err = storeFactory.GetStoresByOwner(owner); err == nil {
 		reply = &Stores{
 			Data: make([]*Store, 0),
 		}
 		wg := sync.WaitGroup{}
 		mu := sync.Mutex{}
 		for _, item := range stores {
+			skip := false
+			for _, kind := range kinds.Data {
+				if in != nil && in.Kind != "" && !slices.Contains(kind.Categories, in.Kind) {
+					skip = true
+					break
+				}
+
+				if item.Kind.Name == kind.Name {
+					item.Kind.Categories = kind.Categories
+					item.Kind.Link = kind.Link
+					break
+				}
+			}
+			if skip {
+				continue
+			}
+
 			wg.Add(1)
 			go func() {
 				defer wg.Done()
@@ -1231,8 +1265,10 @@ func (s *server) GetStores(ctx context.Context, in *Empty) (reply *Stores, err e
 			return strings.Compare(a.Name, b.Name)
 		})
 		reply.Data = append(reply.Data, &Store{
-			Name:  "local",
-			Kind:  &StoreKind{},
+			Name: "local",
+			Kind: &StoreKind{
+				Categories: []string{"store"},
+			},
 			Ready: true,
 		})
 	}

pkg/server/server.pb.go

@@ -246,7 +246,7 @@ service Runner {
         get: "/api/v1/stores/kinds"
       };
     }
-    rpc GetStores(Empty) returns (Stores) {
+    rpc GetStores(SimpleQuery) returns (Stores) {
       option (google.api.http) = {
         get: "/api/v1/stores"
       };