chore: modify the file filter structure

kubeagi · Nov 22, 2023 · fb4cee5 · fb4cee5
1 parent 6e8fb85
commit fb4cee5
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/graphql-server/go-server/graph/generated/generated.go b/graphql-server/go-server/graph/generated/generated.go
diff --git a/graphql-server/go-server/graph/generated/models_gen.go b/graphql-server/go-server/graph/generated/models_gen.go
diff --git a/graphql-server/go-server/graph/schema/versioned_dataset.graphqls b/graphql-server/go-server/graph/schema/versioned_dataset.graphqls
@@ -72,13 +72,13 @@ type F {
 """
 input FileFilter {
     """根据关键词搜索文件，strings.Container(fileName, keyword)"""
-    keyword: String!
+    keyword: String
 
     """页"""
-    page: Int!
+    page: Int
 
     """页内容数量"""
-    pageSize: Int!
+    pageSize: Int
 
     """根据文件名字或者更新时间排序, file, time"""
     sortBy: String

diff --git a/graphql-server/go-server/pkg/versioneddataset/versioned_dataset.go b/graphql-server/go-server/pkg/versioneddataset/versioned_dataset.go
@@ -100,10 +100,14 @@ func VersionFiles(ctx context.Context, c dynamic.Interface, input *generated.Ver
 	if err != nil {
 		return nil, err
 	}
+	keyword := ""
+	if filter != nil && filter.Keyword != nil {
+		keyword = *filter.Keyword
+	}
 	objectInfoList := minioutils.ListObjectCompleteInfo(ctx, input.Namespace, prefix, minioClient, -1)
 	result := make([]generated.PageNode, 0)
 	for _, obj := range objectInfoList {
-		if filter.Keyword != "" && strings.Contains(obj.Key, filter.Keyword) {
+		if keyword != "" && strings.Contains(obj.Key, keyword) {
 			result = append(result, generated.F{
 				Path:     obj.Key,
 				FileType: obj.ContentType,
@@ -113,11 +117,11 @@ func VersionFiles(ctx context.Context, c dynamic.Interface, input *generated.Ver
 		}
 	}
 	page, size := 1, 10
-	if filter.Page > 0 {
-		page = filter.Page
+	if filter != nil && filter.Page != nil && *filter.Page > 0 {
+		page = *filter.Page
 	}
-	if filter.PageSize > 0 {
-		size = filter.PageSize
+	if filter != nil && filter.PageSize != nil && *filter.PageSize > 0 {
+		size = *filter.PageSize
 	}
 
 	total := len(result)