zishuo/onepanel
1
0
Fork 0
mirror of https://github.com/onepanelio/onepanel.git synced 2025-10-31 00:36:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: added workspace templates filtering

Browse Source
This commit is contained in:
Andrey Melnikov
2020-09-30 11:58:42 -07:00
parent f31c998349
commit 463a8eea60
6 changed files with 274 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/workspace_template_server.go
View File

@@ -5,7 +5,9 @@ import (
"github.com/onepanelio/core/api"
v1 "github.com/onepanelio/core/pkg"
"github.com/onepanelio/core/pkg/util"
"github.com/onepanelio/core/pkg/util/request"
"github.com/onepanelio/core/pkg/util/request/pagination"
requestSort "github.com/onepanelio/core/pkg/util/request/sort"
"github.com/onepanelio/core/server/auth"
"github.com/onepanelio/core/server/converter"
"google.golang.org/grpc/codes"
@@ -135,8 +137,25 @@ func (s *WorkspaceTemplateServer) ListWorkspaceTemplates(ctx context.Context, re
return nil, err
}
paginator := pagination.NewRequest(req.Page, req.PageSize)
workspaceTemplates, err := client.ListWorkspaceTemplates(req.Namespace, &paginator)
labelFilter, err := v1.LabelsFromString(req.Labels)
if err != nil {
return nil, err
}
reqSort, err := requestSort.New(req.Order)
if err != nil {
return nil, err
}
resourceRequest := &request.Request{
Pagination: pagination.New(req.Page, req.PageSize),
Filter: v1.WorkspaceTemplateFilter{
Labels: labelFilter,
Uid: req.Uid,
},
Sort: reqSort,
}
workspaceTemplates, err := client.ListWorkspaceTemplates(req.Namespace, resourceRequest)
if err != nil {
return nil, err
}
@@ -151,6 +170,7 @@ func (s *WorkspaceTemplateServer) ListWorkspaceTemplates(ctx context.Context, re
return nil, err
}
paginator := resourceRequest.Pagination
return &api.ListWorkspaceTemplatesResponse{
Count: int32(len(apiWorkspaceTemplates)),
WorkspaceTemplates: apiWorkspaceTemplates,