Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

refactor(saved-query): replace the batch update with MoveMySavedQueries (#21179)

Danny Xu1bbb5d64f35e
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index 50e51fc600..c87d339a09 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -5769,47 +5769,6 @@ paths:
schema:
$ref: '#/components/schemas/bytebase.v1.SearchQueryHistoriesResponse'
deprecated: true
- /bytebase.v1.SavedQueryService/BatchUpdateSavedQueries:
- post:
- tags:
- - bytebase.v1.SavedQueryService
- summary: BatchUpdateSavedQueries
- description: |-
- Re-file saved queries into a folder in bulk; the update mask supports
- `folder` only. An EDITOR binding does not carry re-filing, so matched
- saved queries the caller cannot re-file are skipped rather than rejected,
- and the response counts what actually changed.
- Permissions required: creator, or bb.savedQueries.manage
- operationId: bytebase.v1.SavedQueryService.BatchUpdateSavedQueries
- parameters:
- - name: Connect-Protocol-Version
- in: header
- required: true
- schema:
- $ref: '#/components/schemas/connect-protocol-version'
- - name: Connect-Timeout-Ms
- in: header
- schema:
- $ref: '#/components/schemas/connect-timeout-header'
- requestBody:
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/bytebase.v1.BatchUpdateSavedQueriesRequest'
- required: true
- responses:
- default:
- description: Error
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/connect.error'
- "200":
- description: Success
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/bytebase.v1.BatchUpdateSavedQueriesResponse'
/bytebase.v1.SavedQueryService/CreateSavedQuery:
post:
tags:
@@ -6010,6 +5969,49 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/bytebase.v1.ListSavedQueriesResponse'
+ /bytebase.v1.SavedQueryService/MoveMySavedQueries:
+ post:
+ tags:
+ - bytebase.v1.SavedQueryService
+ summary: |-
+ Move the caller's own saved queries into a folder, named individually or a
+ whole folder at a time. Moving a folder carries its descendants, so renaming "a/b" to
+ "a/c" also moves "a/b/deep" -- one call, not one per path.
+ description: |-
+ Filing is personal organization, so only the creator's own move: a folder
+ is that person's tree, and neither a binding nor the admin backstop
+ reaches into it. The response counts what moved.
+ Permissions required: creator
+ operationId: bytebase.v1.SavedQueryService.MoveMySavedQueries
+ parameters:
+ - name: Connect-Protocol-Version
+ in: header
+ required: true
+ schema:
+ $ref: '#/components/schemas/connect-protocol-version'
+ - name: Connect-Timeout-Ms
+ in: header
+ schema:
+ $ref: '#/components/schemas/connect-timeout-header'
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/bytebase.v1.MoveMySavedQueriesRequest'
+ required: true
+ responses:
+ default:
+ description: Error
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/connect.error'
+ "200":
+ description: Success
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/bytebase.v1.MoveMySavedQueriesResponse'
/bytebase.v1.SavedQueryService/SearchSavedQueries:
post:
tags:
@@ -6146,11 +6148,11 @@ paths:
- bytebase.v1.SavedQueryService
summary: UpdateSavedQuery
description: |-
- Update a saved query. `title`, `content`, and `database` need write
- access; `folder` is creator/admin only, because filing is organization
- rather than editing. `database` must belong to the saved query's own
- project. An unreadable saved query returns NotFound; a VIEWER who cannot
- write gets PermissionDenied.
+ Update a saved query. `title`, `content`, and `database` need write access;
+ `folder` is creator/admin only, because filing is organization rather than
+ editing. `database` must belong to the saved query's own project. An
+ unreadable saved query returns NotFound; a VIEWER who cannot write gets
+ PermissionDenied.
Permissions required: creator, an EDITOR binding, or bb.savedQueries.manage
operationId: bytebase.v1.SavedQueryService.UpdateSavedQuery
parameters:
@@ -6188,10 +6190,11 @@ paths:
- bytebase.v1.SavedQueryService
summary: UpdateSavedQueryStar
description: |-
- Star or unstar a saved query for the caller. A star is a per-user marker:
- invisible to everyone else and granting nothing. Read access is the gate
- only so unreadable saved queries stay unprobeable.
- Permissions required: creator, a VIEWER or EDITOR binding, or bb.savedQueries.manage
+ Star or unstar a saved query for the caller. Stars are personal: yours are
+ invisible to everyone else and grant nothing. You can star any saved query
+ you created or have been granted access to; anything else answers
+ NotFound, so names stay unprobeable.
+ Permissions required: creator, or a VIEWER or EDITOR binding
operationId: bytebase.v1.SavedQueryService.UpdateSavedQueryStar
parameters:
- name: Connect-Protocol-Version
@@ -9383,47 +9386,6 @@ components:
type: object
title: BatchUpdateIssuesStatusResponse
additionalProperties: false
- bytebase.v1.BatchUpdateSavedQueriesRequest:
- type: object
- properties:
- parent:
- type: string
- title: parent
- description: 'Format: projects/{project}'
- filter:
- type: string
- title: filter
- description: |-
- Select the saved queries to update, in CEL. See
- https://github.com/google/cel-spec
-
- Supported fields:
- - name: the saved query name. Supports "==" and "in [...]".
- - creator: the creator in "users/{email}" format. Supports "==" and "!=".
- - starred: whether the caller starred it. Supports "==".
- - folder: the exact folder path. Supports "==".
- savedQuery:
- title: saved_query
- description: The values to apply to every matched saved query.
- $ref: '#/components/schemas/bytebase.v1.SavedQuery'
- updateMask:
- title: update_mask
- description: 'Fields to update. Supported: `folder`.'
- $ref: '#/components/schemas/google.protobuf.FieldMask'
- title: BatchUpdateSavedQueriesRequest
- additionalProperties: false
- bytebase.v1.BatchUpdateSavedQueriesResponse:
- type: object
- properties:
- updatedCount:
- type: integer
- title: updated_count
- format: int32
- description: |-
- How many saved queries were updated, which may be fewer than the filter
- matched.
- title: BatchUpdateSavedQueriesResponse
- additionalProperties: false
bytebase.v1.BillingInterval:
type: string
title: BillingInterval
@@ -15208,6 +15170,45 @@ components:
title: MaterializedViewMetadata
additionalProperties: false
description: MaterializedViewMetadata is the metadata for materialized views.
+ bytebase.v1.MoveMySavedQueriesRequest:
+ type: object
+ properties:
+ parent:
+ type: string
+ title: parent
+ description: 'Format: projects/{project}'
+ names:
+ type: array
+ items:
+ type: string
+ title: names
+ description: |-
+ The saved queries to move. Set this or `source_folder`, not both.
+ Format: projects/{project}/savedQueries/{savedQuery}
+ sourceFolder:
+ type: string
+ title: source_folder
+ maxLength: 256
+ description: |-
+ Move everything filed under this path, descendants included, e.g. "a/b".
+ Set this or `names`, not both.
+ targetFolder:
+ type: string
+ title: target_folder
+ maxLength: 256
+ description: Where they land. A path like "a/b/c"; empty unfiles them.
+ title: MoveMySavedQueriesRequest
+ additionalProperties: false
+ bytebase.v1.MoveMySavedQueriesResponse:
+ type: object
+ properties:
+ movedCount:
+ type: integer
+ title: moved_count
+ format: int32
+ description: How many moved. Fewer than were named when some are not the caller's.
+ title: MoveMySavedQueriesResponse
+ additionalProperties: false
bytebase.v1.OAuth2AuthStyle:
type: string
title: OAuth2AuthStyle
diff --git a/backend/api/v1/acl_test.go b/backend/api/v1/acl_test.go
index 152c0adf48..6741f20fa1 100644
--- a/backend/api/v1/acl_test.go
+++ b/backend/api/v1/acl_test.go
@@ -517,13 +517,12 @@ func TestGetResourceFromRequest(t *testing.T) {
want: []string{"projects/hello/savedQueries/sq1"},
},
{
- // The batch branch picks `parent` up only because it carries a
- // resource_reference, and this request has no `requests` list to
- // fall back on; it then repeats via the single-request path,
- // which the audit parent dedup collapses to one row.
- request: &v1pb.BatchUpdateSavedQueriesRequest{Parent: "projects/hello"},
- method: "/bytebase.v1.SavedQueryService/BatchUpdateSavedQueries",
- want: []string{"projects/hello", "projects/hello"},
+ // Not a Batch* method, so `parent` resolves through the
+ // single-request path -- which still needs its resource_reference,
+ // or the audit row would file under the workspace.
+ request: &v1pb.MoveMySavedQueriesRequest{Parent: "projects/hello"},
+ method: "/bytebase.v1.SavedQueryService/MoveMySavedQueries",
+ want: []string{"projects/hello"},
},
}
diff --git a/backend/api/v1/audit.go b/backend/api/v1/audit.go
index ff8f4e55b1..f3c5c5418a 100644
--- a/backend/api/v1/audit.go
+++ b/backend/api/v1/audit.go
@@ -587,10 +587,7 @@ func getRequestString(request any) (string, error) {
r = proto.CloneOf(r)
r.SavedQuery = redactSavedQuery(r.SavedQuery)
return r
- case *v1pb.BatchUpdateSavedQueriesRequest:
- r = proto.CloneOf(r)
- r.SavedQuery = redactSavedQuery(r.SavedQuery)
- return r
+
case *v1pb.CreateInstanceRequest:
r = proto.CloneOf(r)
r.Instance = redactInstance(r.Instance)
diff --git a/backend/api/v1/saved_query_service.go b/backend/api/v1/saved_query_service.go
index 36757ec626..721262558f 100644
--- a/backend/api/v1/saved_query_service.go
+++ b/backend/api/v1/saved_query_service.go
@@ -505,9 +505,9 @@ func (s *SavedQueryService) DeleteSavedQuery(
return connect.NewResponse(&emptypb.Empty{}), nil
}
-// UpdateSavedQueryStar stars or unstars a saved query for the caller. A
-// star is always the caller's own per-user marker; the gate is read access
-// to the saved query being starred.
+// UpdateSavedQueryStar stars or unstars a saved query for the caller. Stars
+// are personal: you can star anything you created or were granted, and your
+// stars are invisible to everyone else.
func (s *SavedQueryService) UpdateSavedQueryStar(
ctx context.Context,
req *connect.Request[v1pb.UpdateSavedQueryStarRequest],
@@ -526,7 +526,10 @@ func (s *SavedQueryService) UpdateSavedQueryStar(
if err != nil {
return nil, err
}
- if !access.canRead() {
+ // NotFound rather than PermissionDenied: the star surface only concerns
+ // saved queries you can use, and answering "exists, but not yours" would
+ // make names probeable.
+ if !access.canStar() {
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("cannot find the saved query"))
}
@@ -547,39 +550,24 @@ func (s *SavedQueryService) UpdateSavedQueryStar(
return connect.NewResponse(convertToAPISavedQuery(savedQuery)), nil
}
-// BatchUpdateSavedQueries re-files the matched saved queries into a folder.
-// Only rows the caller may re-file are updated: their own, or any in scope
-// for admins.
-func (s *SavedQueryService) BatchUpdateSavedQueries(
+// MoveMySavedQueries files saved queries, named individually or a folder at a
+// time. Creator-only: filing is personal organization, so the store scopes
+// every move to the caller's own rows and anything else is simply not
+// selected.
+func (s *SavedQueryService) MoveMySavedQueries(
ctx context.Context,
- req *connect.Request[v1pb.BatchUpdateSavedQueriesRequest],
-) (*connect.Response[v1pb.BatchUpdateSavedQueriesResponse], error) {
+ req *connect.Request[v1pb.MoveMySavedQueriesRequest],
+) (*connect.Response[v1pb.MoveMySavedQueriesResponse], error) {
request := req.Msg
- if request.SavedQuery == nil {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("saved_query cannot be empty"))
- }
- if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("update mask cannot be empty"))
- }
- for _, path := range request.UpdateMask.Paths {
- if path != "folder" {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid update mask path %q; only \"folder\" is supported", path))
- }
- }
-
- // Normalize before any work: a folder the filter could never match must
- // not be written to a single row.
- folder, err := store.NormalizeSavedQueryFolder(request.SavedQuery.Folder)
- if err != nil {
- return nil, connect.NewError(connect.CodeInvalidArgument, err)
- }
-
projectID, err := common.GetProjectID(request.Parent)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
if projectID == "-" {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("projects/- is not supported for batch update saved queries"))
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf(`projects/- is not supported`))
+ }
+ if (len(request.Names) == 0) == (request.SourceFolder == "") {
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("set either names or source_folder, not both"))
}
user, ok := GetUserFromContext(ctx)
@@ -587,54 +575,52 @@ func (s *SavedQueryService) BatchUpdateSavedQueries(
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
}
- accessMembers, err := s.iamManager.PrincipalMembers(ctx, common.GetWorkspaceIDFromContext(ctx), user)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to resolve principals: %v", err))
- }
-
- filterQ, err := store.GetSearchSavedQueryFilter(ctx, s.store, user.Email, accessMembers, request.Filter, false /* allowTitleContains */)
+ target, err := store.NormalizeSavedQueryFolder(request.TargetFolder)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- savedQueryList, err := s.store.ListSavedQueries(ctx, &store.FindSavedQueryMessage{
- ProjectIDs: []string{projectID},
- PrincipalEmail: user.Email,
- FilterQ: filterQ,
- })
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to list saved queries: %v", err))
- }
- var savedQueryIDs []string
- for _, savedQuery := range savedQueryList {
- access, err := s.savedQueryAccess(ctx, savedQuery)
+ var moved int
+ if request.SourceFolder != "" {
+ source, err := store.NormalizeSavedQueryFolder(request.SourceFolder)
if err != nil {
- return nil, err
+ return nil, connect.NewError(connect.CodeInvalidArgument, err)
+ }
+ if source == "" {
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("source_folder cannot be empty"))
+ }
+ if source == target {
+ return connect.NewResponse(&v1pb.MoveMySavedQueriesResponse{}), nil
}
- // Re-filing is creator/admin only, and matched rows the caller may not
- // re-file are skipped rather than failing the batch — so the response
- // count is what changed, not what matched.
- if !access.canManage() {
- continue
+ if strings.HasPrefix(target, source+"/") {
+ // "a/b" into "a/b/c" would rewrite the rows it just moved.
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("cannot move a folder into itself"))
+ }
+ moved, err = s.store.MoveSavedQueryFolder(ctx, projectID, user.Email, source, target)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to move folder: %v", err))
+ }
+ } else {
+ resourceIDs := make([]string, 0, len(request.Names))
+ for _, name := range request.Names {
+ nameProject, savedQueryID, err := common.GetProjectIDSavedQueryID(name)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInvalidArgument, err)
+ }
+ if nameProject != projectID {
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("saved query %q is not in %q", name, request.Parent))
+ }
+ resourceIDs = append(resourceIDs, savedQueryID)
+ }
+ moved, err = s.store.MoveSavedQueries(ctx, projectID, user.Email, resourceIDs, target)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to move saved queries: %v", err))
}
- savedQueryIDs = append(savedQueryIDs, savedQuery.ResourceID)
}
- updated, err := s.store.BatchUpdateSavedQueryFolder(ctx, savedQueryIDs, folder)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to batch update saved queries: %v", err))
- }
- return connect.NewResponse(&v1pb.BatchUpdateSavedQueriesResponse{
- UpdatedCount: int32(updated),
- }), nil
+ return connect.NewResponse(&v1pb.MoveMySavedQueriesResponse{MovedCount: int32(moved)}), nil
}
-// checkDiscoverSavedQueries gates the per-project discovery surfaces
-// (Search, folder list): bb.savedQueries.search, with bb.savedQueries.manage
-// as the admin backstop that must be able to enumerate what it manages.
-// checkProjectWide re-checks an IAM-gated permission, rejecting bindings whose
-// condition scopes resources. The generic interceptor cannot express this: it
-// evaluates request.time and passes the residual condition through.
func (s *SavedQueryService) checkProjectWide(ctx context.Context, user *store.UserMessage, p permission.Permission, projectIDs ...string) error {
ok, err := s.iamManager.CheckProjectWidePermission(ctx, p, user, common.GetWorkspaceIDFromContext(ctx), projectIDs...)
if err != nil {
@@ -926,6 +912,12 @@ func (a savedQueryAccess) canWrite() bool {
return a.isCreator || a.isAdmin || a.level >= storepb.SavedQueryBinding_EDITOR
}
+// canStar covers starring, which is personal: you can star any saved query you
+// created or were granted access to, and your stars are yours alone.
+func (a savedQueryAccess) canStar() bool {
+ return a.isCreator || a.level >= storepb.SavedQueryBinding_VIEWER
+}
+
// canManage covers sharing, deleting, and re-filing: a binding never confers
// any of them, so sharing a saved query for editing cannot cost its owner the
// saved query.
diff --git a/backend/generated-go/v1/saved_query_service.pb.go b/backend/generated-go/v1/saved_query_service.pb.go
index 064acfa096..d1668b78ba 100644
--- a/backend/generated-go/v1/saved_query_service.pb.go
+++ b/backend/generated-go/v1/saved_query_service.pb.go
@@ -529,41 +529,36 @@ func (x *UpdateSavedQueryStarRequest) GetStarred() bool {
return false
}
-type BatchUpdateSavedQueriesRequest struct {
+type MoveMySavedQueriesRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
// Format: projects/{project}
Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
- // Select the saved queries to update, in CEL. See
- // https://github.com/google/cel-spec
- //
- // Supported fields:
- // - name: the saved query name. Supports "==" and "in [...]".
- // - creator: the creator in "users/{email}" format. Supports "==" and "!=".
- // - starred: whether the caller starred it. Supports "==".
- // - folder: the exact folder path. Supports "==".
- Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
- // The values to apply to every matched saved query.
- SavedQuery *SavedQuery `protobuf:"bytes,3,opt,name=saved_query,json=savedQuery,proto3" json:"saved_query,omitempty"`
- // Fields to update. Supported: `folder`.
- UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+ // The saved queries to move. Set this or `source_folder`, not both.
+ // Format: projects/{project}/savedQueries/{savedQuery}
+ Names []string `protobuf:"bytes,2,rep,name=names,proto3" json:"names,omitempty"`
+ // Move everything filed under this path, descendants included, e.g. "a/b".
+ // Set this or `names`, not both.
+ SourceFolder string `protobuf:"bytes,3,opt,name=source_folder,json=sourceFolder,proto3" json:"source_folder,omitempty"`
+ // Where they land. A path like "a/b/c"; empty unfiles them.
+ TargetFolder string `protobuf:"bytes,4,opt,name=target_folder,json=targetFolder,proto3" json:"target_folder,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
-func (x *BatchUpdateSavedQueriesRequest) Reset() {
- *x = BatchUpdateSavedQueriesRequest{}
+func (x *MoveMySavedQueriesRequest) Reset() {
+ *x = MoveMySavedQueriesRequest{}
mi := &file_v1_saved_query_service_proto_msgTypes[8]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
-func (x *BatchUpdateSavedQueriesRequest) String() string {
+func (x *MoveMySavedQueriesRequest) String() string {
return protoimpl.X.MessageStringOf(x)
}
-func (*BatchUpdateSavedQueriesRequest) ProtoMessage() {}
+func (*MoveMySavedQueriesRequest) ProtoMessage() {}
-func (x *BatchUpdateSavedQueriesRequest) ProtoReflect() protoreflect.Message {
+func (x *MoveMySavedQueriesRequest) ProtoReflect() protoreflect.Message {
mi := &file_v1_saved_query_service_proto_msgTypes[8]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -575,62 +570,61 @@ func (x *BatchUpdateSavedQueriesRequest) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x)
}
-// Deprecated: Use BatchUpdateSavedQueriesRequest.ProtoReflect.Descriptor instead.
-func (*BatchUpdateSavedQueriesRequest) Descriptor() ([]byte, []int) {
+// Deprecated: Use MoveMySavedQueriesRequest.ProtoReflect.Descriptor instead.
+func (*MoveMySavedQueriesRequest) Descriptor() ([]byte, []int) {
return file_v1_saved_query_service_proto_rawDescGZIP(), []int{8}
}
-func (x *BatchUpdateSavedQueriesRequest) GetParent() string {
+func (x *MoveMySavedQueriesRequest) GetParent() string {
if x != nil {
return x.Parent
}
return ""
}
-func (x *BatchUpdateSavedQueriesRequest) GetFilter() string {
+func (x *MoveMySavedQueriesRequest) GetNames() []string {
if x != nil {
- return x.Filter
+ return x.Names
}
- return ""
+ return nil
}
-func (x *BatchUpdateSavedQueriesRequest) GetSavedQuery() *SavedQuery {
+func (x *MoveMySavedQueriesRequest) GetSourceFolder() string {
if x != nil {
- return x.SavedQuery
+ return x.SourceFolder
}
- return nil
+ return ""
}
-func (x *BatchUpdateSavedQueriesRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
+func (x *MoveMySavedQueriesRequest) GetTargetFolder() string {
if x != nil {
- return x.UpdateMask
+ return x.TargetFolder
}
- return nil
+ return ""
}
-type BatchUpdateSavedQueriesResponse struct {
+type MoveMySavedQueriesResponse struct {
state protoimpl.MessageState `protogen:"open.v1"`
- // How many saved queries were updated, which may be fewer than the filter
- // matched.
- UpdatedCount int32 `protobuf:"varint,1,opt,name=updated_count,json=updatedCount,proto3" json:"updated_count,omitempty"`
+ // How many moved. Fewer than were named when some are not the caller's.
+ MovedCount int32 `protobuf:"varint,1,opt,name=moved_count,json=movedCount,proto3" json:"moved_count,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
-func (x *BatchUpdateSavedQueriesResponse) Reset() {
- *x = BatchUpdateSavedQueriesResponse{}
+func (x *MoveMySavedQueriesResponse) Reset() {
+ *x = MoveMySavedQueriesResponse{}
mi := &file_v1_saved_query_service_proto_msgTypes[9]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
-func (x *BatchUpdateSavedQueriesResponse) String() string {
+func (x *MoveMySavedQueriesResponse) String() string {
return protoimpl.X.MessageStringOf(x)
}
-func (*BatchUpdateSavedQueriesResponse) ProtoMessage() {}
+func (*MoveMySavedQueriesResponse) ProtoMessage() {}
-func (x *BatchUpdateSavedQueriesResponse) ProtoReflect() protoreflect.Message {
+func (x *MoveMySavedQueriesResponse) ProtoReflect() protoreflect.Message {
mi := &file_v1_saved_query_service_proto_msgTypes[9]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -642,14 +636,14 @@ func (x *BatchUpdateSavedQueriesResponse) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x)
}
-// Deprecated: Use BatchUpdateSavedQueriesResponse.ProtoReflect.Descriptor instead.
-func (*BatchUpdateSavedQueriesResponse) Descriptor() ([]byte, []int) {
+// Deprecated: Use MoveMySavedQueriesResponse.ProtoReflect.Descriptor instead.
+func (*MoveMySavedQueriesResponse) Descriptor() ([]byte, []int) {
return file_v1_saved_query_service_proto_rawDescGZIP(), []int{9}
}
-func (x *BatchUpdateSavedQueriesResponse) GetUpdatedCount() int32 {
+func (x *MoveMySavedQueriesResponse) GetMovedCount() int32 {
if x != nil {
- return x.UpdatedCount
+ return x.MovedCount
}
return 0
}
@@ -1252,17 +1246,16 @@ const file_v1_saved_query_service_proto_rawDesc = "" +
"updateMask\"P\n" +
"\x1bUpdateSavedQueryStarRequest\x12\x17\n" +
"\x04name\x18\x01 \x01(\tB\x03\xe0A\x02R\x04name\x12\x18\n" +
- "\astarred\x18\x02 \x01(\bR\astarred\"\xef\x01\n" +
- "\x1eBatchUpdateSavedQueriesRequest\x124\n" +
+ "\astarred\x18\x02 \x01(\bR\astarred\"\xc5\x01\n" +
+ "\x19MoveMySavedQueriesRequest\x124\n" +
"\x06parent\x18\x01 \x01(\tB\x1c\xe0A\x02\xfaA\x16\n" +
- "\x14bytebase.com/ProjectR\x06parent\x12\x16\n" +
- "\x06filter\x18\x02 \x01(\tR\x06filter\x12=\n" +
- "\vsaved_query\x18\x03 \x01(\v2\x17.bytebase.v1.SavedQueryB\x03\xe0A\x02R\n" +
- "savedQuery\x12@\n" +
- "\vupdate_mask\x18\x04 \x01(\v2\x1a.google.protobuf.FieldMaskB\x03\xe0A\x02R\n" +
- "updateMask\"F\n" +
- "\x1fBatchUpdateSavedQueriesResponse\x12#\n" +
- "\rupdated_count\x18\x01 \x01(\x05R\fupdatedCount\"Y\n" +
+ "\x14bytebase.com/ProjectR\x06parent\x12\x14\n" +
+ "\x05names\x18\x02 \x03(\tR\x05names\x12-\n" +
+ "\rsource_folder\x18\x03 \x01(\tB\b\xbaH\x05r\x03\x18\x80\x02R\fsourceFolder\x12-\n" +
+ "\rtarget_folder\x18\x04 \x01(\tB\b\xbaH\x05r\x03\x18\x80\x02R\ftargetFolder\"=\n" +
+ "\x1aMoveMySavedQueriesResponse\x12\x1f\n" +
+ "\vmoved_count\x18\x01 \x01(\x05R\n" +
+ "movedCount\"Y\n" +
"\x1aGetSavedQueryPolicyRequest\x12;\n" +
"\bresource\x18\x01 \x01(\tB\x1f\xe0A\x02\xfaA\x19\n" +
"\x17bytebase.com/SavedQueryR\bresource\"\x95\x01\n" +
@@ -1311,7 +1304,7 @@ const file_v1_saved_query_service_proto_rawDesc = "" +
"\astarred\x18\v \x01(\bB\x03\xe0A\x03R\astarred\x12 \n" +
"\x06folder\x18\r \x01(\tB\b\xbaH\x05r\x03\x18\x80\x02R\x06folder:K\xeaAH\n" +
"\x17bytebase.com/SavedQuery\x12-projects/{project}/savedQueries/{saved_query}J\x04\b\n" +
- "\x10\vJ\x04\b\f\x10\r2\xbe\x0f\n" +
+ "\x10\vJ\x04\b\f\x10\r2\xa0\x0f\n" +
"\x11SavedQueryService\x12\xc3\x01\n" +
"\x10CreateSavedQuery\x12$.bytebase.v1.CreateSavedQueryRequest\x1a\x17.bytebase.v1.SavedQuery\"p\xdaA\x12parent,saved_query\x8a\xea0\x16bb.savedQueries.create\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x023:\vsaved_query\"$/v1/{parent=projects/*}/savedQueries\x12\x84\x01\n" +
"\rGetSavedQuery\x12!.bytebase.v1.GetSavedQueryRequest\x1a\x17.bytebase.v1.SavedQuery\"7\xdaA\x04name\x90\xea0\x02\x82\xd3\xe4\x93\x02&\x12$/v1/{name=projects/*/savedQueries/*}\x12\xb2\x01\n" +
@@ -1319,8 +1312,8 @@ const file_v1_saved_query_service_proto_rawDesc = "" +
"\x12SearchSavedQueries\x12&.bytebase.v1.SearchSavedQueriesRequest\x1a'.bytebase.v1.SearchSavedQueriesResponse\"C\xdaA\x06parent\x90\xea0\x02\x82\xd3\xe4\x93\x020:\x01*\"+/v1/{parent=projects/*}/savedQueries:search\x12\xc0\x01\n" +
"\x17SearchSavedQueryFolders\x12+.bytebase.v1.SearchSavedQueryFoldersRequest\x1a,.bytebase.v1.SearchSavedQueryFoldersResponse\"J\xdaA\x06parent\x90\xea0\x02\x82\xd3\xe4\x93\x027:\x01*\"2/v1/{parent=projects/*}/savedQueries:searchFolders\x12\xba\x01\n" +
"\x10UpdateSavedQuery\x12$.bytebase.v1.UpdateSavedQueryRequest\x1a\x17.bytebase.v1.SavedQuery\"g\xdaA\x17saved_query,update_mask\x90\xea0\x02\x98\xea0\x01\x82\xd3\xe4\x93\x02?:\vsaved_query20/v1/{saved_query.name=projects/*/savedQueries/*}\x12\xa8\x01\n" +
- "\x14UpdateSavedQueryStar\x12(.bytebase.v1.UpdateSavedQueryStarRequest\x1a\x17.bytebase.v1.SavedQuery\"M\xdaA\fname,starred\x90\xea0\x02\x82\xd3\xe4\x93\x024:\x01*\"//v1/{name=projects/*/savedQueries/*}:updateStar\x12\xda\x01\n" +
- "\x17BatchUpdateSavedQueries\x12+.bytebase.v1.BatchUpdateSavedQueriesRequest\x1a,.bytebase.v1.BatchUpdateSavedQueriesResponse\"d\xdaA\x1eparent,saved_query,update_mask\x90\xea0\x02\x98\xea0\x01\x82\xd3\xe4\x93\x025:\x01*\"0/v1/{parent=projects/*}/savedQueries:batchUpdate\x12\x8d\x01\n" +
+ "\x14UpdateSavedQueryStar\x12(.bytebase.v1.UpdateSavedQueryStarRequest\x1a\x17.bytebase.v1.SavedQuery\"M\xdaA\fname,starred\x90\xea0\x02\x82\xd3\xe4\x93\x024:\x01*\"//v1/{name=projects/*/savedQueries/*}:updateStar\x12\xbc\x01\n" +
+ "\x12MoveMySavedQueries\x12&.bytebase.v1.MoveMySavedQueriesRequest\x1a'.bytebase.v1.MoveMySavedQueriesResponse\"U\xdaA\x14parent,target_folder\x90\xea0\x02\x98\xea0\x01\x82\xd3\xe4\x93\x020:\x01*\"+/v1/{parent=projects/*}/savedQueries:moveMy\x12\x8d\x01\n" +
"\x10DeleteSavedQuery\x12$.bytebase.v1.DeleteSavedQueryRequest\x1a\x16.google.protobuf.Empty\";\xdaA\x04name\x90\xea0\x02\x98\xea0\x01\x82\xd3\xe4\x93\x02&*$/v1/{name=projects/*/savedQueries/*}\x12\xa8\x01\n" +
"\x13GetSavedQueryPolicy\x12'.bytebase.v1.GetSavedQueryPolicyRequest\x1a\x1d.bytebase.v1.SavedQueryPolicy\"I\xdaA\bresource\x90\xea0\x02\x82\xd3\xe4\x93\x024\x122/v1/{resource=projects/*/savedQueries/*}:getPolicy\x12\xb6\x01\n" +
"\x13SetSavedQueryPolicy\x12'.bytebase.v1.SetSavedQueryPolicyRequest\x1a\x1d.bytebase.v1.SavedQueryPolicy\"W\xdaA\x0fresource,policy\x90\xea0\x02\x98\xea0\x01\x82\xd3\xe4\x93\x027:\x01*\"2/v1/{resource=projects/*/savedQueries/*}:setPolicyB\xac\x01\n" +
@@ -1350,8 +1343,8 @@ var file_v1_saved_query_service_proto_goTypes = []any{
(*SearchSavedQueryFoldersResponse)(nil), // 6: bytebase.v1.SearchSavedQueryFoldersResponse
(*UpdateSavedQueryRequest)(nil), // 7: bytebase.v1.UpdateSavedQueryRequest
(*UpdateSavedQueryStarRequest)(nil), // 8: bytebase.v1.UpdateSavedQueryStarRequest
- (*BatchUpdateSavedQueriesRequest)(nil), // 9: bytebase.v1.BatchUpdateSavedQueriesRequest
- (*BatchUpdateSavedQueriesResponse)(nil), // 10: bytebase.v1.BatchUpdateSavedQueriesResponse
+ (*MoveMySavedQueriesRequest)(nil), // 9: bytebase.v1.MoveMySavedQueriesRequest
+ (*MoveMySavedQueriesResponse)(nil), // 10: bytebase.v1.MoveMySavedQueriesResponse
(*GetSavedQueryPolicyRequest)(nil), // 11: bytebase.v1.GetSavedQueryPolicyRequest
(*SetSavedQueryPolicyRequest)(nil), // 12: bytebase.v1.SetSavedQueryPolicyRequest
(*SavedQueryPolicy)(nil), // 13: bytebase.v1.SavedQueryPolicy
@@ -1369,41 +1362,39 @@ var file_v1_saved_query_service_proto_depIdxs = []int32{
18, // 1: bytebase.v1.ListSavedQueriesResponse.saved_queries:type_name -> bytebase.v1.SavedQuery
18, // 2: bytebase.v1.UpdateSavedQueryRequest.saved_query:type_name -> bytebase.v1.SavedQuery
19, // 3: bytebase.v1.UpdateSavedQueryRequest.update_mask:type_name -> google.protobuf.FieldMask
- 18, // 4: bytebase.v1.BatchUpdateSavedQueriesRequest.saved_query:type_name -> bytebase.v1.SavedQuery
- 19, // 5: bytebase.v1.BatchUpdateSavedQueriesRequest.update_mask:type_name -> google.protobuf.FieldMask
- 13, // 6: bytebase.v1.SetSavedQueryPolicyRequest.policy:type_name -> bytebase.v1.SavedQueryPolicy
- 14, // 7: bytebase.v1.SavedQueryPolicy.bindings:type_name -> bytebase.v1.SavedQueryBinding
- 0, // 8: bytebase.v1.SavedQueryBinding.level:type_name -> bytebase.v1.SavedQueryBinding.Level
- 18, // 9: bytebase.v1.SearchSavedQueriesResponse.saved_queries:type_name -> bytebase.v1.SavedQuery
- 20, // 10: bytebase.v1.SavedQuery.create_time:type_name -> google.protobuf.Timestamp
- 20, // 11: bytebase.v1.SavedQuery.update_time:type_name -> google.protobuf.Timestamp
- 1, // 12: bytebase.v1.SavedQueryService.CreateSavedQuery:input_type -> bytebase.v1.CreateSavedQueryRequest
- 2, // 13: bytebase.v1.SavedQueryService.GetSavedQuery:input_type -> bytebase.v1.GetSavedQueryRequest
- 3, // 14: bytebase.v1.SavedQueryService.ListSavedQueries:input_type -> bytebase.v1.ListSavedQueriesRequest
- 16, // 15: bytebase.v1.SavedQueryService.SearchSavedQueries:input_type -> bytebase.v1.SearchSavedQueriesRequest
- 5, // 16: bytebase.v1.SavedQueryService.SearchSavedQueryFolders:input_type -> bytebase.v1.SearchSavedQueryFoldersRequest
- 7, // 17: bytebase.v1.SavedQueryService.UpdateSavedQuery:input_type -> bytebase.v1.UpdateSavedQueryRequest
- 8, // 18: bytebase.v1.SavedQueryService.UpdateSavedQueryStar:input_type -> bytebase.v1.UpdateSavedQueryStarRequest
- 9, // 19: bytebase.v1.SavedQueryService.BatchUpdateSavedQueries:input_type -> bytebase.v1.BatchUpdateSavedQueriesRequest
- 15, // 20: bytebase.v1.SavedQueryService.DeleteSavedQuery:input_type -> bytebase.v1.DeleteSavedQueryRequest
- 11, // 21: bytebase.v1.SavedQueryService.GetSavedQueryPolicy:input_type -> bytebase.v1.GetSavedQueryPolicyRequest
- 12, // 22: bytebase.v1.SavedQueryService.SetSavedQueryPolicy:input_type -> bytebase.v1.SetSavedQueryPolicyRequest
- 18, // 23: bytebase.v1.SavedQueryService.CreateSavedQuery:output_type -> bytebase.v1.SavedQuery
- 18, // 24: bytebase.v1.SavedQueryService.GetSavedQuery:output_type -> bytebase.v1.SavedQuery
- 4, // 25: bytebase.v1.SavedQueryService.ListSavedQueries:output_type -> bytebase.v1.ListSavedQueriesResponse
- 17, // 26: bytebase.v1.SavedQueryService.SearchSavedQueries:output_type -> bytebase.v1.SearchSavedQueriesResponse
- 6, // 27: bytebase.v1.SavedQueryService.SearchSavedQueryFolders:output_type -> bytebase.v1.SearchSavedQueryFoldersResponse
- 18, // 28: bytebase.v1.SavedQueryService.UpdateSavedQuery:output_type -> bytebase.v1.SavedQuery
- 18, // 29: bytebase.v1.SavedQueryService.UpdateSavedQueryStar:output_type -> bytebase.v1.SavedQuery
- 10, // 30: bytebase.v1.SavedQueryService.BatchUpdateSavedQueries:output_type -> bytebase.v1.BatchUpdateSavedQueriesResponse
- 21, // 31: bytebase.v1.SavedQueryService.DeleteSavedQuery:output_type -> google.protobuf.Empty
- 13, // 32: bytebase.v1.SavedQueryService.GetSavedQueryPolicy:output_type -> bytebase.v1.SavedQueryPolicy
- 13, // 33: bytebase.v1.SavedQueryService.SetSavedQueryPolicy:output_type -> bytebase.v1.SavedQueryPolicy
- 23, // [23:34] is the sub-list for method output_type
- 12, // [12:23] is the sub-list for method input_type
- 12, // [12:12] is the sub-list for extension type_name
- 12, // [12:12] is the sub-list for extension extendee
- 0, // [0:12] is the sub-list for field type_name
+ 13, // 4: bytebase.v1.SetSavedQueryPolicyRequest.policy:type_name -> bytebase.v1.SavedQueryPolicy
+ 14, // 5: bytebase.v1.SavedQueryPolicy.bindings:type_name -> bytebase.v1.SavedQueryBinding
+ 0, // 6: bytebase.v1.SavedQueryBinding.level:type_name -> bytebase.v1.SavedQueryBinding.Level
+ 18, // 7: bytebase.v1.SearchSavedQueriesResponse.saved_queries:type_name -> bytebase.v1.SavedQuery
+ 20, // 8: bytebase.v1.SavedQuery.create_time:type_name -> google.protobuf.Timestamp
+ 20, // 9: bytebase.v1.SavedQuery.update_time:type_name -> google.protobuf.Timestamp
+ 1, // 10: bytebase.v1.SavedQueryService.CreateSavedQuery:input_type -> bytebase.v1.CreateSavedQueryRequest
+ 2, // 11: bytebase.v1.SavedQueryService.GetSavedQuery:input_type -> bytebase.v1.GetSavedQueryRequest
+ 3, // 12: bytebase.v1.SavedQueryService.ListSavedQueries:input_type -> bytebase.v1.ListSavedQueriesRequest
+ 16, // 13: bytebase.v1.SavedQueryService.SearchSavedQueries:input_type -> bytebase.v1.SearchSavedQueriesRequest
+ 5, // 14: bytebase.v1.SavedQueryService.SearchSavedQueryFolders:input_type -> bytebase.v1.SearchSavedQueryFoldersRequest
+ 7, // 15: bytebase.v1.SavedQueryService.UpdateSavedQuery:input_type -> bytebase.v1.UpdateSavedQueryRequest
+ 8, // 16: bytebase.v1.SavedQueryService.UpdateSavedQueryStar:input_type -> bytebase.v1.UpdateSavedQueryStarRequest
+ 9, // 17: bytebase.v1.SavedQueryService.MoveMySavedQueries:input_type -> bytebase.v1.MoveMySavedQueriesRequest
+ 15, // 18: bytebase.v1.SavedQueryService.DeleteSavedQuery:input_type -> bytebase.v1.DeleteSavedQueryRequest
+ 11, // 19: bytebase.v1.SavedQueryService.GetSavedQueryPolicy:input_type -> bytebase.v1.GetSavedQueryPolicyRequest
+ 12, // 20: bytebase.v1.SavedQueryService.SetSavedQueryPolicy:input_type -> bytebase.v1.SetSavedQueryPolicyRequest
+ 18, // 21: bytebase.v1.SavedQueryService.CreateSavedQuery:output_type -> bytebase.v1.SavedQuery
+ 18, // 22: bytebase.v1.SavedQueryService.GetSavedQuery:output_type -> bytebase.v1.SavedQuery
+ 4, // 23: bytebase.v1.SavedQueryService.ListSavedQueries:output_type -> bytebase.v1.ListSavedQueriesResponse
+ 17, // 24: bytebase.v1.SavedQueryService.SearchSavedQueries:output_type -> bytebase.v1.SearchSavedQueriesResponse
+ 6, // 25: bytebase.v1.SavedQueryService.SearchSavedQueryFolders:output_type -> bytebase.v1.SearchSavedQueryFoldersResponse
+ 18, // 26: bytebase.v1.SavedQueryService.UpdateSavedQuery:output_type -> bytebase.v1.SavedQuery
+ 18, // 27: bytebase.v1.SavedQueryService.UpdateSavedQueryStar:output_type -> bytebase.v1.SavedQuery
+ 10, // 28: bytebase.v1.SavedQueryService.MoveMySavedQueries:output_type -> bytebase.v1.MoveMySavedQueriesResponse
+ 21, // 29: bytebase.v1.SavedQueryService.DeleteSavedQuery:output_type -> google.protobuf.Empty
+ 13, // 30: bytebase.v1.SavedQueryService.GetSavedQueryPolicy:output_type -> bytebase.v1.SavedQueryPolicy
+ 13, // 31: bytebase.v1.SavedQueryService.SetSavedQueryPolicy:output_type -> bytebase.v1.SavedQueryPolicy
+ 21, // [21:32] is the sub-list for method output_type
+ 10, // [10:21] is the sub-list for method input_type
+ 10, // [10:10] is the sub-list for extension type_name
+ 10, // [10:10] is the sub-list for extension extendee
+ 0, // [0:10] is the sub-list for field type_name
}
func init() { file_v1_saved_query_service_proto_init() }
diff --git a/backend/generated-go/v1/saved_query_service.pb.gw.go b/backend/generated-go/v1/saved_query_service.pb.gw.go
index 03732a6a7a..30e066afe9 100644
--- a/backend/generated-go/v1/saved_query_service.pb.gw.go
+++ b/backend/generated-go/v1/saved_query_service.pb.gw.go
@@ -388,9 +388,9 @@ func local_request_SavedQueryService_UpdateSavedQueryStar_0(ctx context.Context,
return msg, metadata, err
}
-func request_SavedQueryService_BatchUpdateSavedQueries_0(ctx context.Context, marshaler runtime.Marshaler, client SavedQueryServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+func request_SavedQueryService_MoveMySavedQueries_0(ctx context.Context, marshaler runtime.Marshaler, client SavedQueryServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
var (
- protoReq BatchUpdateSavedQueriesRequest
+ protoReq MoveMySavedQueriesRequest
metadata runtime.ServerMetadata
err error
)
@@ -408,13 +408,13 @@ func request_SavedQueryService_BatchUpdateSavedQueries_0(ctx context.Context, ma
if req.Body != nil {
_, _ = io.Copy(io.Discard, req.Body)
}
- msg, err := client.BatchUpdateSavedQueries(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+ msg, err := client.MoveMySavedQueries(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
return msg, metadata, err
}
-func local_request_SavedQueryService_BatchUpdateSavedQueries_0(ctx context.Context, marshaler runtime.Marshaler, server SavedQueryServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+func local_request_SavedQueryService_MoveMySavedQueries_0(ctx context.Context, marshaler runtime.Marshaler, server SavedQueryServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
var (
- protoReq BatchUpdateSavedQueriesRequest
+ protoReq MoveMySavedQueriesRequest
metadata runtime.ServerMetadata
err error
)
@@ -429,7 +429,7 @@ func local_request_SavedQueryService_BatchUpdateSavedQueries_0(ctx context.Conte
if err != nil {
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)
}
- msg, err := server.BatchUpdateSavedQueries(ctx, &protoReq)
+ msg, err := server.MoveMySavedQueries(ctx, &protoReq)
return msg, metadata, err
}
@@ -702,25 +702,25 @@ func RegisterSavedQueryServiceHandlerServer(ctx context.Context, mux *runtime.Se
}
forward_SavedQueryService_UpdateSavedQueryStar_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
- mux.Handle(http.MethodPost, pattern_SavedQueryService_BatchUpdateSavedQueries_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+ mux.Handle(http.MethodPost, pattern_SavedQueryService_MoveMySavedQueries_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
var stream runtime.ServerTransportStream
ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.SavedQueryService/BatchUpdateSavedQueries", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/savedQueries:batchUpdate"))
+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.SavedQueryService/MoveMySavedQueries", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/savedQueries:moveMy"))
if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
}
- resp, md, err := local_request_SavedQueryService_BatchUpdateSavedQueries_0(annotatedContext, inboundMarshaler, server, req, pathParams)
+ resp, md, err := local_request_SavedQueryService_MoveMySavedQueries_0(annotatedContext, inboundMarshaler, server, req, pathParams)
md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
if err != nil {
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
return
}
- forward_SavedQueryService_BatchUpdateSavedQueries_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ forward_SavedQueryService_MoveMySavedQueries_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
mux.Handle(http.MethodDelete, pattern_SavedQueryService_DeleteSavedQuery_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
ctx, cancel := context.WithCancel(req.Context())
@@ -941,22 +941,22 @@ func RegisterSavedQueryServiceHandlerClient(ctx context.Context, mux *runtime.Se
}
forward_SavedQueryService_UpdateSavedQueryStar_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
- mux.Handle(http.MethodPost, pattern_SavedQueryService_BatchUpdateSavedQueries_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+ mux.Handle(http.MethodPost, pattern_SavedQueryService_MoveMySavedQueries_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
- annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.SavedQueryService/BatchUpdateSavedQueries", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/savedQueries:batchUpdate"))
+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.SavedQueryService/MoveMySavedQueries", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/savedQueries:moveMy"))
if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
}
- resp, md, err := request_SavedQueryService_BatchUpdateSavedQueries_0(annotatedContext, inboundMarshaler, client, req, pathParams)
+ resp, md, err := request_SavedQueryService_MoveMySavedQueries_0(annotatedContext, inboundMarshaler, client, req, pathParams)
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
if err != nil {
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
return
}
- forward_SavedQueryService_BatchUpdateSavedQueries_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ forward_SavedQueryService_MoveMySavedQueries_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
mux.Handle(http.MethodDelete, pattern_SavedQueryService_DeleteSavedQuery_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
ctx, cancel := context.WithCancel(req.Context())
@@ -1020,7 +1020,7 @@ var (
pattern_SavedQueryService_SearchSavedQueryFolders_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "savedQueries"}, "searchFolders"))
pattern_SavedQueryService_UpdateSavedQuery_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "savedQueries", "saved_query.name"}, ""))
pattern_SavedQueryService_UpdateSavedQueryStar_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "savedQueries", "name"}, "updateStar"))
- pattern_SavedQueryService_BatchUpdateSavedQueries_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "savedQueries"}, "batchUpdate"))
+ pattern_SavedQueryService_MoveMySavedQueries_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "savedQueries"}, "moveMy"))
pattern_SavedQueryService_DeleteSavedQuery_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "savedQueries", "name"}, ""))
pattern_SavedQueryService_GetSavedQueryPolicy_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "savedQueries", "resource"}, "getPolicy"))
pattern_SavedQueryService_SetSavedQueryPolicy_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "savedQueries", "resource"}, "setPolicy"))
@@ -1034,7 +1034,7 @@ var (
forward_SavedQueryService_SearchSavedQueryFolders_0 = runtime.ForwardResponseMessage
forward_SavedQueryService_UpdateSavedQuery_0 = runtime.ForwardResponseMessage
forward_SavedQueryService_UpdateSavedQueryStar_0 = runtime.ForwardResponseMessage
- forward_SavedQueryService_BatchUpdateSavedQueries_0 = runtime.ForwardResponseMessage
+ forward_SavedQueryService_MoveMySavedQueries_0 = runtime.ForwardResponseMessage
forward_SavedQueryService_DeleteSavedQuery_0 = runtime.ForwardResponseMessage
forward_SavedQueryService_GetSavedQueryPolicy_0 = runtime.ForwardResponseMessage
forward_SavedQueryService_SetSavedQueryPolicy_0 = runtime.ForwardResponseMessage
diff --git a/backend/generated-go/v1/saved_query_service_equal.pb.go b/backend/generated-go/v1/saved_query_service_equal.pb.go
index 32c3ee1804..41680b7221 100644
--- a/backend/generated-go/v1/saved_query_service_equal.pb.go
+++ b/backend/generated-go/v1/saved_query_service_equal.pb.go
@@ -150,7 +150,7 @@ func (x *UpdateSavedQueryStarRequest) Equal(y *UpdateSavedQueryStarRequest) bool
return true
}
-func (x *BatchUpdateSavedQueriesRequest) Equal(y *BatchUpdateSavedQueriesRequest) bool {
+func (x *MoveMySavedQueriesRequest) Equal(y *MoveMySavedQueriesRequest) bool {
if x == y {
return true
}
@@ -160,30 +160,31 @@ func (x *BatchUpdateSavedQueriesRequest) Equal(y *BatchUpdateSavedQueriesRequest
if x.Parent != y.Parent {
return false
}
- if x.Filter != y.Filter {
+ if len(x.Names) != len(y.Names) {
return false
}
- if !x.SavedQuery.Equal(y.SavedQuery) {
- return false
+ for i := 0; i < len(x.Names); i++ {
+ if x.Names[i] != y.Names[i] {
+ return false
+ }
}
- if equal, ok := interface{}(x.UpdateMask).(interface {
- Equal(*fieldmaskpb.FieldMask) bool
- }); !ok || !equal.Equal(y.UpdateMask) {
+ if x.SourceFolder != y.SourceFolder {
return false
- } else if !proto.Equal(x.UpdateMask, y.UpdateMask) {
+ }
+ if x.TargetFolder != y.TargetFolder {
return false
}
return true
}
-func (x *BatchUpdateSavedQueriesResponse) Equal(y *BatchUpdateSavedQueriesResponse) bool {
+func (x *MoveMySavedQueriesResponse) Equal(y *MoveMySavedQueriesResponse) bool {
if x == y {
return true
}
if x == nil || y == nil {
return x == nil && y == nil
}
- if x.UpdatedCount != y.UpdatedCount {
+ if x.MovedCount != y.MovedCount {
return false
}
return true
diff --git a/backend/generated-go/v1/saved_query_service_grpc.pb.go b/backend/generated-go/v1/saved_query_service_grpc.pb.go
index 234afad852..c171627628 100644
--- a/backend/generated-go/v1/saved_query_service_grpc.pb.go
+++ b/backend/generated-go/v1/saved_query_service_grpc.pb.go
@@ -27,7 +27,7 @@ const (
SavedQueryService_SearchSavedQueryFolders_FullMethodName = "/bytebase.v1.SavedQueryService/SearchSavedQueryFolders"
SavedQueryService_UpdateSavedQuery_FullMethodName = "/bytebase.v1.SavedQueryService/UpdateSavedQuery"
SavedQueryService_UpdateSavedQueryStar_FullMethodName = "/bytebase.v1.SavedQueryService/UpdateSavedQueryStar"
- SavedQueryService_BatchUpdateSavedQueries_FullMethodName = "/bytebase.v1.SavedQueryService/BatchUpdateSavedQueries"
+ SavedQueryService_MoveMySavedQueries_FullMethodName = "/bytebase.v1.SavedQueryService/MoveMySavedQueries"
SavedQueryService_DeleteSavedQuery_FullMethodName = "/bytebase.v1.SavedQueryService/DeleteSavedQuery"
SavedQueryService_GetSavedQueryPolicy_FullMethodName = "/bytebase.v1.SavedQueryService/GetSavedQueryPolicy"
SavedQueryService_SetSavedQueryPolicy_FullMethodName = "/bytebase.v1.SavedQueryService/SetSavedQueryPolicy"
@@ -85,24 +85,28 @@ type SavedQueryServiceClient interface {
// from the ones reaching you through a grant (`shared == true`).
// Permissions required: bb.savedQueries.search on the project
SearchSavedQueryFolders(ctx context.Context, in *SearchSavedQueryFoldersRequest, opts ...grpc.CallOption) (*SearchSavedQueryFoldersResponse, error)
- // Update a saved query. `title`, `content`, and `database` need write
- // access; `folder` is creator/admin only, because filing is organization
- // rather than editing. `database` must belong to the saved query's own
- // project. An unreadable saved query returns NotFound; a VIEWER who cannot
- // write gets PermissionDenied.
+ // Update a saved query. `title`, `content`, and `database` need write access;
+ // `folder` is creator/admin only, because filing is organization rather than
+ // editing. `database` must belong to the saved query's own project. An
+ // unreadable saved query returns NotFound; a VIEWER who cannot write gets
+ // PermissionDenied.
// Permissions required: creator, an EDITOR binding, or bb.savedQueries.manage
UpdateSavedQuery(ctx context.Context, in *UpdateSavedQueryRequest, opts ...grpc.CallOption) (*SavedQuery, error)
- // Star or unstar a saved query for the caller. A star is a per-user marker:
- // invisible to everyone else and granting nothing. Read access is the gate
- // only so unreadable saved queries stay unprobeable.
- // Permissions required: creator, a VIEWER or EDITOR binding, or bb.savedQueries.manage
+ // Star or unstar a saved query for the caller. Stars are personal: yours are
+ // invisible to everyone else and grant nothing. You can star any saved query
+ // you created or have been granted access to; anything else answers
+ // NotFound, so names stay unprobeable.
+ // Permissions required: creator, or a VIEWER or EDITOR binding
UpdateSavedQueryStar(ctx context.Context, in *UpdateSavedQueryStarRequest, opts ...grpc.CallOption) (*SavedQuery, error)
- // Re-file saved queries into a folder in bulk; the update mask supports
- // `folder` only. An EDITOR binding does not carry re-filing, so matched
- // saved queries the caller cannot re-file are skipped rather than rejected,
- // and the response counts what actually changed.
- // Permissions required: creator, or bb.savedQueries.manage
- BatchUpdateSavedQueries(ctx context.Context, in *BatchUpdateSavedQueriesRequest, opts ...grpc.CallOption) (*BatchUpdateSavedQueriesResponse, error)
+ // Move the caller's own saved queries into a folder, named individually or a
+ // whole folder at a time. Moving a folder carries its descendants, so renaming "a/b" to
+ // "a/c" also moves "a/b/deep" -- one call, not one per path.
+ //
+ // Filing is personal organization, so only the creator's own move: a folder
+ // is that person's tree, and neither a binding nor the admin backstop
+ // reaches into it. The response counts what moved.
+ // Permissions required: creator
+ MoveMySavedQueries(ctx context.Context, in *MoveMySavedQueriesRequest, opts ...grpc.CallOption) (*MoveMySavedQueriesResponse, error)
// Delete a saved query and every user's stars on it. An EDITOR binding never
// carries deletion. An unreadable saved query returns NotFound; a grantee
// who can read but not delete gets PermissionDenied.
@@ -200,10 +204,10 @@ func (c *savedQueryServiceClient) UpdateSavedQueryStar(ctx context.Context, in *
return out, nil
}
-func (c *savedQueryServiceClient) BatchUpdateSavedQueries(ctx context.Context, in *BatchUpdateSavedQueriesRequest, opts ...grpc.CallOption) (*BatchUpdateSavedQueriesResponse, error) {
+func (c *savedQueryServiceClient) MoveMySavedQueries(ctx context.Context, in *MoveMySavedQueriesRequest, opts ...grpc.CallOption) (*MoveMySavedQueriesResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
- out := new(BatchUpdateSavedQueriesResponse)
- err := c.cc.Invoke(ctx, SavedQueryService_BatchUpdateSavedQueries_FullMethodName, in, out, cOpts...)
+ out := new(MoveMySavedQueriesResponse)
+ err := c.cc.Invoke(ctx, SavedQueryService_MoveMySavedQueries_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
@@ -292,24 +296,28 @@ type SavedQueryServiceServer interface {
// from the ones reaching you through a grant (`shared == true`).
// Permissions required: bb.savedQueries.search on the project
SearchSavedQueryFolders(context.Context, *SearchSavedQueryFoldersRequest) (*SearchSavedQueryFoldersResponse, error)
- // Update a saved query. `title`, `content`, and `database` need write
- // access; `folder` is creator/admin only, because filing is organization
- // rather than editing. `database` must belong to the saved query's own
- // project. An unreadable saved query returns NotFound; a VIEWER who cannot
- // write gets PermissionDenied.
+ // Update a saved query. `title`, `content`, and `database` need write access;
+ // `folder` is creator/admin only, because filing is organization rather than
+ // editing. `database` must belong to the saved query's own project. An
+ // unreadable saved query returns NotFound; a VIEWER who cannot write gets
+ // PermissionDenied.
// Permissions required: creator, an EDITOR binding, or bb.savedQueries.manage
UpdateSavedQuery(context.Context, *UpdateSavedQueryRequest) (*SavedQuery, error)
- // Star or unstar a saved query for the caller. A star is a per-user marker:
- // invisible to everyone else and granting nothing. Read access is the gate
- // only so unreadable saved queries stay unprobeable.
- // Permissions required: creator, a VIEWER or EDITOR binding, or bb.savedQueries.manage
+ // Star or unstar a saved query for the caller. Stars are personal: yours are
+ // invisible to everyone else and grant nothing. You can star any saved query
+ // you created or have been granted access to; anything else answers
+ // NotFound, so names stay unprobeable.
+ // Permissions required: creator, or a VIEWER or EDITOR binding
UpdateSavedQueryStar(context.Context, *UpdateSavedQueryStarRequest) (*SavedQuery, error)
- // Re-file saved queries into a folder in bulk; the update mask supports
- // `folder` only. An EDITOR binding does not carry re-filing, so matched
- // saved queries the caller cannot re-file are skipped rather than rejected,
- // and the response counts what actually changed.
- // Permissions required: creator, or bb.savedQueries.manage
- BatchUpdateSavedQueries(context.Context, *BatchUpdateSavedQueriesRequest) (*BatchUpdateSavedQueriesResponse, error)
+ // Move the caller's own saved queries into a folder, named individually or a
+ // whole folder at a time. Moving a folder carries its descendants, so renaming "a/b" to
+ // "a/c" also moves "a/b/deep" -- one call, not one per path.
+ //
+ // Filing is personal organization, so only the creator's own move: a folder
+ // is that person's tree, and neither a binding nor the admin backstop
+ // reaches into it. The response counts what moved.
+ // Permissions required: creator
+ MoveMySavedQueries(context.Context, *MoveMySavedQueriesRequest) (*MoveMySavedQueriesResponse, error)
// Delete a saved query and every user's stars on it. An EDITOR binding never
// carries deletion. An unreadable saved query returns NotFound; a grantee
// who can read but not delete gets PermissionDenied.
@@ -358,8 +366,8 @@ func (UnimplementedSavedQueryServiceServer) UpdateSavedQuery(context.Context, *U
func (UnimplementedSavedQueryServiceServer) UpdateSavedQueryStar(context.Context, *UpdateSavedQueryStarRequest) (*SavedQuery, error) {
return nil, status.Error(codes.Unimplemented, "method UpdateSavedQueryStar not implemented")
}
-func (UnimplementedSavedQueryServiceServer) BatchUpdateSavedQueries(context.Context, *BatchUpdateSavedQueriesRequest) (*BatchUpdateSavedQueriesResponse, error) {
- return nil, status.Error(codes.Unimplemented, "method BatchUpdateSavedQueries not implemented")
+func (UnimplementedSavedQueryServiceServer) MoveMySavedQueries(context.Context, *MoveMySavedQueriesRequest) (*MoveMySavedQueriesResponse, error) {
+ return nil, status.Error(codes.Unimplemented, "method MoveMySavedQueries not implemented")
}
func (UnimplementedSavedQueryServiceServer) DeleteSavedQuery(context.Context, *DeleteSavedQueryRequest) (*emptypb.Empty, error) {
return nil, status.Error(codes.Unimplemented, "method DeleteSavedQuery not implemented")
@@ -517,20 +525,20 @@ func _SavedQueryService_UpdateSavedQueryStar_Handler(srv interface{}, ctx contex
return interceptor(ctx, in, info, handler)
}
-func _SavedQueryService_BatchUpdateSavedQueries_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
- in := new(BatchUpdateSavedQueriesRequest)
+func _SavedQueryService_MoveMySavedQueries_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(MoveMySavedQueriesRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
- return srv.(SavedQueryServiceServer).BatchUpdateSavedQueries(ctx, in)
+ return srv.(SavedQueryServiceServer).MoveMySavedQueries(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
- FullMethod: SavedQueryService_BatchUpdateSavedQueries_FullMethodName,
+ FullMethod: SavedQueryService_MoveMySavedQueries_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
- return srv.(SavedQueryServiceServer).BatchUpdateSavedQueries(ctx, req.(*BatchUpdateSavedQueriesRequest))
+ return srv.(SavedQueryServiceServer).MoveMySavedQueries(ctx, req.(*MoveMySavedQueriesRequest))
}
return interceptor(ctx, in, info, handler)
}
@@ -625,8 +633,8 @@ var SavedQueryService_ServiceDesc = grpc.ServiceDesc{
Handler: _SavedQueryService_UpdateSavedQueryStar_Handler,
},
{
- MethodName: "BatchUpdateSavedQueries",
- Handler: _SavedQueryService_BatchUpdateSavedQueries_Handler,
+ MethodName: "MoveMySavedQueries",
+ Handler: _SavedQueryService_MoveMySavedQueries_Handler,
},
{
MethodName: "DeleteSavedQuery",
diff --git a/backend/generated-go/v1/v1connect/saved_query_service.connect.go b/backend/generated-go/v1/v1connect/saved_query_service.connect.go
index cbd3e5dc81..e0c4a6c551 100644
--- a/backend/generated-go/v1/v1connect/saved_query_service.connect.go
+++ b/backend/generated-go/v1/v1connect/saved_query_service.connect.go
@@ -55,9 +55,9 @@ const (
// SavedQueryServiceUpdateSavedQueryStarProcedure is the fully-qualified name of the
// SavedQueryService's UpdateSavedQueryStar RPC.
SavedQueryServiceUpdateSavedQueryStarProcedure = "/bytebase.v1.SavedQueryService/UpdateSavedQueryStar"
- // SavedQueryServiceBatchUpdateSavedQueriesProcedure is the fully-qualified name of the
- // SavedQueryService's BatchUpdateSavedQueries RPC.
- SavedQueryServiceBatchUpdateSavedQueriesProcedure = "/bytebase.v1.SavedQueryService/BatchUpdateSavedQueries"
+ // SavedQueryServiceMoveMySavedQueriesProcedure is the fully-qualified name of the
+ // SavedQueryService's MoveMySavedQueries RPC.
+ SavedQueryServiceMoveMySavedQueriesProcedure = "/bytebase.v1.SavedQueryService/MoveMySavedQueries"
// SavedQueryServiceDeleteSavedQueryProcedure is the fully-qualified name of the SavedQueryService's
// DeleteSavedQuery RPC.
SavedQueryServiceDeleteSavedQueryProcedure = "/bytebase.v1.SavedQueryService/DeleteSavedQuery"
@@ -108,24 +108,28 @@ type SavedQueryServiceClient interface {
// from the ones reaching you through a grant (`shared == true`).
// Permissions required: bb.savedQueries.search on the project
SearchSavedQueryFolders(context.Context, *connect.Request[v1.SearchSavedQueryFoldersRequest]) (*connect.Response[v1.SearchSavedQueryFoldersResponse], error)
- // Update a saved query. `title`, `content`, and `database` need write
- // access; `folder` is creator/admin only, because filing is organization
- // rather than editing. `database` must belong to the saved query's own
- // project. An unreadable saved query returns NotFound; a VIEWER who cannot
- // write gets PermissionDenied.
+ // Update a saved query. `title`, `content`, and `database` need write access;
+ // `folder` is creator/admin only, because filing is organization rather than
+ // editing. `database` must belong to the saved query's own project. An
+ // unreadable saved query returns NotFound; a VIEWER who cannot write gets
+ // PermissionDenied.
// Permissions required: creator, an EDITOR binding, or bb.savedQueries.manage
UpdateSavedQuery(context.Context, *connect.Request[v1.UpdateSavedQueryRequest]) (*connect.Response[v1.SavedQuery], error)
- // Star or unstar a saved query for the caller. A star is a per-user marker:
- // invisible to everyone else and granting nothing. Read access is the gate
- // only so unreadable saved queries stay unprobeable.
- // Permissions required: creator, a VIEWER or EDITOR binding, or bb.savedQueries.manage
+ // Star or unstar a saved query for the caller. Stars are personal: yours are
+ // invisible to everyone else and grant nothing. You can star any saved query
+ // you created or have been granted access to; anything else answers
+ // NotFound, so names stay unprobeable.
+ // Permissions required: creator, or a VIEWER or EDITOR binding
UpdateSavedQueryStar(context.Context, *connect.Request[v1.UpdateSavedQueryStarRequest]) (*connect.Response[v1.SavedQuery], error)
- // Re-file saved queries into a folder in bulk; the update mask supports
- // `folder` only. An EDITOR binding does not carry re-filing, so matched
- // saved queries the caller cannot re-file are skipped rather than rejected,
- // and the response counts what actually changed.
- // Permissions required: creator, or bb.savedQueries.manage
- BatchUpdateSavedQueries(context.Context, *connect.Request[v1.BatchUpdateSavedQueriesRequest]) (*connect.Response[v1.BatchUpdateSavedQueriesResponse], error)
+ // Move the caller's own saved queries into a folder, named individually or a
+ // whole folder at a time. Moving a folder carries its descendants, so renaming "a/b" to
+ // "a/c" also moves "a/b/deep" -- one call, not one per path.
+ //
+ // Filing is personal organization, so only the creator's own move: a folder
+ // is that person's tree, and neither a binding nor the admin backstop
+ // reaches into it. The response counts what moved.
+ // Permissions required: creator
+ MoveMySavedQueries(context.Context, *connect.Request[v1.MoveMySavedQueriesRequest]) (*connect.Response[v1.MoveMySavedQueriesResponse], error)
// Delete a saved query and every user's stars on it. An EDITOR binding never
// carries deletion. An unreadable saved query returns NotFound; a grantee
// who can read but not delete gets PermissionDenied.
@@ -198,10 +202,10 @@ func NewSavedQueryServiceClient(httpClient connect.HTTPClient, baseURL string, o
connect.WithSchema(savedQueryServiceMethods.ByName("UpdateSavedQueryStar")),
connect.WithClientOptions(opts...),
),
- batchUpdateSavedQueries: connect.NewClient[v1.BatchUpdateSavedQueriesRequest, v1.BatchUpdateSavedQueriesResponse](
+ moveMySavedQueries: connect.NewClient[v1.MoveMySavedQueriesRequest, v1.MoveMySavedQueriesResponse](
httpClient,
- baseURL+SavedQueryServiceBatchUpdateSavedQueriesProcedure,
- connect.WithSchema(savedQueryServiceMethods.ByName("BatchUpdateSavedQueries")),
+ baseURL+SavedQueryServiceMoveMySavedQueriesProcedure,
+ connect.WithSchema(savedQueryServiceMethods.ByName("MoveMySavedQueries")),
connect.WithClientOptions(opts...),
),
deleteSavedQuery: connect.NewClient[v1.DeleteSavedQueryRequest, emptypb.Empty](
@@ -234,7 +238,7 @@ type savedQueryServiceClient struct {
searchSavedQueryFolders *connect.Client[v1.SearchSavedQueryFoldersRequest, v1.SearchSavedQueryFoldersResponse]
updateSavedQuery *connect.Client[v1.UpdateSavedQueryRequest, v1.SavedQuery]
updateSavedQueryStar *connect.Client[v1.UpdateSavedQueryStarRequest, v1.SavedQuery]
- batchUpdateSavedQueries *connect.Client[v1.BatchUpdateSavedQueriesRequest, v1.BatchUpdateSavedQueriesResponse]
+ moveMySavedQueries *connect.Client[v1.MoveMySavedQueriesRequest, v1.MoveMySavedQueriesResponse]
deleteSavedQuery *connect.Client[v1.DeleteSavedQueryRequest, emptypb.Empty]
getSavedQueryPolicy *connect.Client[v1.GetSavedQueryPolicyRequest, v1.SavedQueryPolicy]
setSavedQueryPolicy *connect.Client[v1.SetSavedQueryPolicyRequest, v1.SavedQueryPolicy]
@@ -275,9 +279,9 @@ func (c *savedQueryServiceClient) UpdateSavedQueryStar(ctx context.Context, req
return c.updateSavedQueryStar.CallUnary(ctx, req)
}
-// BatchUpdateSavedQueries calls bytebase.v1.SavedQueryService.BatchUpdateSavedQueries.
-func (c *savedQueryServiceClient) BatchUpdateSavedQueries(ctx context.Context, req *connect.Request[v1.BatchUpdateSavedQueriesRequest]) (*connect.Response[v1.BatchUpdateSavedQueriesResponse], error) {
- return c.batchUpdateSavedQueries.CallUnary(ctx, req)
+// MoveMySavedQueries calls bytebase.v1.SavedQueryService.MoveMySavedQueries.
+func (c *savedQueryServiceClient) MoveMySavedQueries(ctx context.Context, req *connect.Request[v1.MoveMySavedQueriesRequest]) (*connect.Response[v1.MoveMySavedQueriesResponse], error) {
+ return c.moveMySavedQueries.CallUnary(ctx, req)
}
// DeleteSavedQuery calls bytebase.v1.SavedQueryService.DeleteSavedQuery.
@@ -334,24 +338,28 @@ type SavedQueryServiceHandler interface {
// from the ones reaching you through a grant (`shared == true`).
// Permissions required: bb.savedQueries.search on the project
SearchSavedQueryFolders(context.Context, *connect.Request[v1.SearchSavedQueryFoldersRequest]) (*connect.Response[v1.SearchSavedQueryFoldersResponse], error)
- // Update a saved query. `title`, `content`, and `database` need write
- // access; `folder` is creator/admin only, because filing is organization
- // rather than editing. `database` must belong to the saved query's own
- // project. An unreadable saved query returns NotFound; a VIEWER who cannot
- // write gets PermissionDenied.
+ // Update a saved query. `title`, `content`, and `database` need write access;
+ // `folder` is creator/admin only, because filing is organization rather than
+ // editing. `database` must belong to the saved query's own project. An
+ // unreadable saved query returns NotFound; a VIEWER who cannot write gets
+ // PermissionDenied.
// Permissions required: creator, an EDITOR binding, or bb.savedQueries.manage
UpdateSavedQuery(context.Context, *connect.Request[v1.UpdateSavedQueryRequest]) (*connect.Response[v1.SavedQuery], error)
- // Star or unstar a saved query for the caller. A star is a per-user marker:
- // invisible to everyone else and granting nothing. Read access is the gate
- // only so unreadable saved queries stay unprobeable.
- // Permissions required: creator, a VIEWER or EDITOR binding, or bb.savedQueries.manage
+ // Star or unstar a saved query for the caller. Stars are personal: yours are
+ // invisible to everyone else and grant nothing. You can star any saved query
+ // you created or have been granted access to; anything else answers
+ // NotFound, so names stay unprobeable.
+ // Permissions required: creator, or a VIEWER or EDITOR binding
UpdateSavedQueryStar(context.Context, *connect.Request[v1.UpdateSavedQueryStarRequest]) (*connect.Response[v1.SavedQuery], error)
- // Re-file saved queries into a folder in bulk; the update mask supports
- // `folder` only. An EDITOR binding does not carry re-filing, so matched
- // saved queries the caller cannot re-file are skipped rather than rejected,
- // and the response counts what actually changed.
- // Permissions required: creator, or bb.savedQueries.manage
- BatchUpdateSavedQueries(context.Context, *connect.Request[v1.BatchUpdateSavedQueriesRequest]) (*connect.Response[v1.BatchUpdateSavedQueriesResponse], error)
+ // Move the caller's own saved queries into a folder, named individually or a
+ // whole folder at a time. Moving a folder carries its descendants, so renaming "a/b" to
+ // "a/c" also moves "a/b/deep" -- one call, not one per path.
+ //
+ // Filing is personal organization, so only the creator's own move: a folder
+ // is that person's tree, and neither a binding nor the admin backstop
+ // reaches into it. The response counts what moved.
+ // Permissions required: creator
+ MoveMySavedQueries(context.Context, *connect.Request[v1.MoveMySavedQueriesRequest]) (*connect.Response[v1.MoveMySavedQueriesResponse], error)
// Delete a saved query and every user's stars on it. An EDITOR binding never
// carries deletion. An unreadable saved query returns NotFound; a grantee
// who can read but not delete gets PermissionDenied.
@@ -420,10 +428,10 @@ func NewSavedQueryServiceHandler(svc SavedQueryServiceHandler, opts ...connect.H
connect.WithSchema(savedQueryServiceMethods.ByName("UpdateSavedQueryStar")),
connect.WithHandlerOptions(opts...),
)
- savedQueryServiceBatchUpdateSavedQueriesHandler := connect.NewUnaryHandler(
- SavedQueryServiceBatchUpdateSavedQueriesProcedure,
- svc.BatchUpdateSavedQueries,
- connect.WithSchema(savedQueryServiceMethods.ByName("BatchUpdateSavedQueries")),
+ savedQueryServiceMoveMySavedQueriesHandler := connect.NewUnaryHandler(
+ SavedQueryServiceMoveMySavedQueriesProcedure,
+ svc.MoveMySavedQueries,
+ connect.WithSchema(savedQueryServiceMethods.ByName("MoveMySavedQueries")),
connect.WithHandlerOptions(opts...),
)
savedQueryServiceDeleteSavedQueryHandler := connect.NewUnaryHandler(
@@ -460,8 +468,8 @@ func NewSavedQueryServiceHandler(svc SavedQueryServiceHandler, opts ...connect.H
savedQueryServiceUpdateSavedQueryHandler.ServeHTTP(w, r)
case SavedQueryServiceUpdateSavedQueryStarProcedure:
savedQueryServiceUpdateSavedQueryStarHandler.ServeHTTP(w, r)
- case SavedQueryServiceBatchUpdateSavedQueriesProcedure:
- savedQueryServiceBatchUpdateSavedQueriesHandler.ServeHTTP(w, r)
+ case SavedQueryServiceMoveMySavedQueriesProcedure:
+ savedQueryServiceMoveMySavedQueriesHandler.ServeHTTP(w, r)
case SavedQueryServiceDeleteSavedQueryProcedure:
savedQueryServiceDeleteSavedQueryHandler.ServeHTTP(w, r)
case SavedQueryServiceGetSavedQueryPolicyProcedure:
@@ -505,8 +513,8 @@ func (UnimplementedSavedQueryServiceHandler) UpdateSavedQueryStar(context.Contex
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.SavedQueryService.UpdateSavedQueryStar is not implemented"))
}
-func (UnimplementedSavedQueryServiceHandler) BatchUpdateSavedQueries(context.Context, *connect.Request[v1.BatchUpdateSavedQueriesRequest]) (*connect.Response[v1.BatchUpdateSavedQueriesResponse], error) {
- return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.SavedQueryService.BatchUpdateSavedQueries is not implemented"))
+func (UnimplementedSavedQueryServiceHandler) MoveMySavedQueries(context.Context, *connect.Request[v1.MoveMySavedQueriesRequest]) (*connect.Response[v1.MoveMySavedQueriesResponse], error) {
+ return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.SavedQueryService.MoveMySavedQueries is not implemented"))
}
func (UnimplementedSavedQueryServiceHandler) DeleteSavedQuery(context.Context, *connect.Request[v1.DeleteSavedQueryRequest]) (*connect.Response[emptypb.Empty], error) {
diff --git a/backend/store/saved_query.go b/backend/store/saved_query.go
index c760c39629..dc20b209fd 100644
--- a/backend/store/saved_query.go
+++ b/backend/store/saved_query.go
@@ -536,56 +536,67 @@ func (s *Store) SetSavedQueryStar(ctx context.Context, savedQueryResourceID, pri
// The rows are locked in full primary-key order (resource_id) before the
// update, so two overlapping batches can never lock in opposing orders; a
// row deleted mid-batch simply updates zero rows.
-func (s *Store) BatchUpdateSavedQueryFolder(ctx context.Context, resourceIDs []string, folder string) (int, error) {
+// MoveSavedQueries files the named saved queries, restricted to one creator:
+// filing is personal organization, so rows belonging to anyone else are not
+// selected and the count reports what actually moved.
+//
+// The CTE takes every row lock in primary-key order before the update touches
+// anything -- the store's batch rule, so two overlapping moves serialize
+// instead of deadlocking -- and one statement needs no explicit transaction.
+func (s *Store) MoveSavedQueries(ctx context.Context, projectID, creator string, resourceIDs []string, folder string) (int, error) {
if len(resourceIDs) == 0 {
return 0, nil
}
-
- tx, err := s.GetDB().BeginTx(ctx, nil)
+ result, err := s.GetDB().ExecContext(ctx, `
+ WITH locked AS (
+ SELECT resource_id FROM saved_query
+ WHERE resource_id = ANY($1) AND project = $2 AND creator = $3
+ ORDER BY resource_id
+ FOR UPDATE
+ )
+ UPDATE saved_query SET folder = $4, updated_at = now()
+ WHERE resource_id IN (SELECT resource_id FROM locked)
+ `, resourceIDs, projectID, creator, folder)
if err != nil {
- return 0, errors.Wrap(err, "failed to begin transaction")
+ return 0, errors.Wrap(err, "failed to move saved queries")
}
- defer tx.Rollback()
-
- rows, err := tx.QueryContext(ctx, `
- SELECT resource_id
- FROM saved_query
- WHERE resource_id = ANY($1)
- ORDER BY resource_id
- FOR UPDATE
- `, resourceIDs)
+ moved, err := result.RowsAffected()
if err != nil {
- return 0, errors.Wrap(err, "failed to lock saved queries")
- }
- defer rows.Close()
- var locked []string
- for rows.Next() {
- var id string
- if err := rows.Scan(&id); err != nil {
- return 0, err
- }
- locked = append(locked, id)
+ return 0, errors.Wrap(err, "failed to count moved saved queries")
}
- if err := rows.Err(); err != nil {
- return 0, err
- }
- // Free the cursor before the UPDATE below: statements on the same
- // transaction cannot interleave with an open one.
- rows.Close()
+ return int(moved), nil
+}
- if len(locked) > 0 {
- if _, err := tx.ExecContext(ctx, `
- UPDATE saved_query
- SET folder = $1, updated_at = now()
- WHERE resource_id = ANY($2)
- `, folder, locked); err != nil {
- return 0, errors.Wrap(err, "failed to update folders")
- }
+// MoveSavedQueryFolder rewrites the folder prefix for one creator's saved
+// queries: moving "a/b" to "a/c" also moves "a/b/deep" to "a/c/deep". The
+// suffix keeps each descendant's own tail, and ltrim drops the separator when
+// the target is empty so a row is unfiled rather than left at "/deep".
+//
+// Locks in primary-key order like MoveSavedQueries, for the same reason.
+func (s *Store) MoveSavedQueryFolder(ctx context.Context, projectID, creator, source, target string) (int, error) {
+ if source == "" {
+ return 0, errors.New("source folder cannot be empty")
+ }
+ result, err := s.GetDB().ExecContext(ctx, `
+ WITH locked AS (
+ SELECT resource_id FROM saved_query
+ WHERE project = $1 AND creator = $2 AND (folder = $3 OR folder LIKE $4)
+ ORDER BY resource_id
+ FOR UPDATE
+ )
+ UPDATE saved_query
+ SET folder = ltrim($5 || substring(folder from length($3) + 1), '/'),
+ updated_at = now()
+ WHERE resource_id IN (SELECT resource_id FROM locked)
+ `, projectID, creator, source, escapeLikePattern(source)+"/%", target)
+ if err != nil {
+ return 0, errors.Wrap(err, "failed to move saved query folder")
}
- if err := tx.Commit(); err != nil {
- return 0, errors.Wrap(err, "failed to commit transaction")
+ moved, err := result.RowsAffected()
+ if err != nil {
+ return 0, errors.Wrap(err, "failed to count moved saved queries")
}
- return len(locked), nil
+ return int(moved), nil
}
// ListSavedQueryFolderPaths returns the distinct folder paths of the saved
diff --git a/backend/store/saved_query_lock_order_test.go b/backend/store/saved_query_lock_order_test.go
index 3adb20367e..fa198bd9c6 100644
--- a/backend/store/saved_query_lock_order_test.go
+++ b/backend/store/saved_query_lock_order_test.go
@@ -322,7 +322,7 @@ func TestSavedQueryBatchFolderMovesLockOrder(t *testing.T) {
// the first instead of deadlocking.
firstResult := make(chan error, 1)
go func() {
- _, err := fixture.store.BatchUpdateSavedQueryFolder(fixture.ctx,
+ _, err := fixture.store.MoveSavedQueries(fixture.ctx, "default", "[email protected]",
[]string{"saved-query-a", "saved-query-b"}, "one")
firstResult <- err
}()
@@ -331,7 +331,7 @@ func TestSavedQueryBatchFolderMovesLockOrder(t *testing.T) {
secondResult := make(chan error, 1)
go func() {
- _, err := fixture.store.BatchUpdateSavedQueryFolder(fixture.ctx,
+ _, err := fixture.store.MoveSavedQueries(fixture.ctx, "default", "[email protected]",
[]string{"saved-query-b", "saved-query-a"}, "two")
secondResult <- err
}()
@@ -479,3 +479,98 @@ func TestSavedQuerySetBindingsAndDeleteProjectLockOrder(t *testing.T) {
requireGone(t, fixture)
})
}
+
+// A prefix move locks every row under the folder, so two moves whose paths
+// overlap contend on the same rows -- "a" covers "a/child". Both take their
+// locks in primary-key order through the CTE, so the second serializes behind
+// the first in either acquisition order rather than deadlocking, and the
+// terminal folders are exact: whichever commits first decides what the other
+// still matches.
+func TestSavedQueryFolderPrefixMovesLockOrder(t *testing.T) {
+ const seedSQL = `
+ INSERT INTO saved_query (resource_id, creator, project, name, statement, folder) VALUES
+ ('saved-query-a', '[email protected]', 'default', 'A', '', 'a'),
+ ('saved-query-b', '[email protected]', 'default', 'B', '', 'a/child');
+ `
+
+ folders := func(t *testing.T, fixture *projectDeletionLockOrderFixture) map[string]string {
+ t.Helper()
+ rows, err := fixture.db.QueryContext(fixture.ctx,
+ "SELECT resource_id, folder FROM saved_query ORDER BY resource_id")
+ require.NoError(t, err)
+ defer rows.Close()
+ got := map[string]string{}
+ for rows.Next() {
+ var id, folder string
+ require.NoError(t, rows.Scan(&id, &folder))
+ got[id] = folder
+ }
+ require.NoError(t, rows.Err())
+ return got
+ }
+
+ t.Run("parent first", func(t *testing.T) {
+ fixture := newProjectDeletionLockOrderFixture(t, seedSQL)
+ const barrierID = 9961
+ barrier := newMaintenanceLockBarrier(fixture.ctx, t, fixture.db, barrierID)
+ installMaintenanceLockBarrier(t, fixture.db, barrierID,
+ "AFTER UPDATE OF folder ON saved_query FOR EACH ROW")
+
+ parentResult := make(chan error, 1)
+ go func() {
+ _, err := fixture.store.MoveSavedQueryFolder(fixture.ctx, "default", "[email protected]", "a", "x")
+ parentResult <- err
+ }()
+ waitForMaintenanceBarrier(fixture.ctx, t, fixture.db, barrierID)
+ parentPID := maintenanceBarrierWaitingPID(fixture.ctx, t, fixture.db, barrierID)
+
+ childResult := make(chan error, 1)
+ go func() {
+ _, err := fixture.store.MoveSavedQueryFolder(fixture.ctx, "default", "[email protected]", "a/child", "y")
+ childResult <- err
+ }()
+ waitForBackendBlockedByPID(fixture.ctx, t, fixture.db, parentPID)
+ barrier.release(t)
+
+ requireMaintenanceResult(t, parentResult)
+ requireMaintenanceResult(t, childResult)
+ // The parent move carried the child with it, so "a/child" no longer
+ // exists for the second move to find.
+ require.Equal(t, map[string]string{
+ "saved-query-a": "x",
+ "saved-query-b": "x/child",
+ }, folders(t, fixture))
+ })
+
+ t.Run("child first", func(t *testing.T) {
+ fixture := newProjectDeletionLockOrderFixture(t, seedSQL)
+ const barrierID = 9962
+ barrier := newMaintenanceLockBarrier(fixture.ctx, t, fixture.db, barrierID)
+ installMaintenanceLockBarrier(t, fixture.db, barrierID,
+ "AFTER UPDATE OF folder ON saved_query FOR EACH ROW")
+
+ childResult := make(chan error, 1)
+ go func() {
+ _, err := fixture.store.MoveSavedQueryFolder(fixture.ctx, "default", "[email protected]", "a/child", "y")
+ childResult <- err
+ }()
+ waitForMaintenanceBarrier(fixture.ctx, t, fixture.db, barrierID)
+ childPID := maintenanceBarrierWaitingPID(fixture.ctx, t, fixture.db, barrierID)
+
+ parentResult := make(chan error, 1)
+ go func() {
+ _, err := fixture.store.MoveSavedQueryFolder(fixture.ctx, "default", "[email protected]", "a", "x")
+ parentResult <- err
+ }()
+ waitForBackendBlockedByPID(fixture.ctx, t, fixture.db, childPID)
+ barrier.release(t)
+
+ requireMaintenanceResult(t, childResult)
+ requireMaintenanceResult(t, parentResult)
+ // The child left the subtree first, so the parent move only found "a".
+ require.Equal(t, map[string]string{
+ "saved-query-a": "x",
+ "saved-query-b": "y",
+ }, folders(t, fixture))
+ })
+}
diff --git a/backend/tests/saved_query_test.go b/backend/tests/saved_query_test.go
index e3b69d458a..b430e46cb4 100644
--- a/backend/tests/saved_query_test.go
+++ b/backend/tests/saved_query_test.go
@@ -322,7 +322,7 @@ func TestSearchSavedQueriesFilterByTitle(t *testing.T) {
a.Error(err)
}
-func TestBatchUpdateSavedQueriesFilterByFolder(t *testing.T) {
+func TestMoveSavedQueries(t *testing.T) {
t.Parallel()
a := require.New(t)
ctx := context.Background()
@@ -351,88 +351,75 @@ func TestBatchUpdateSavedQueriesFilterByFolder(t *testing.T) {
a.NoError(err)
return savedQueryNames(resp.Msg.SavedQueries)
}
+ move := func(request *v1pb.MoveMySavedQueriesRequest) (int32, error) {
+ request.Parent = ctl.project.Name
+ resp, err := ctl.savedQueryServiceClient.MoveMySavedQueries(ctx, connect.NewRequest(request))
+ if err != nil {
+ return 0, err
+ }
+ return resp.Msg.MovedCount, nil
+ }
directSavedQuery := createSavedQuery("old-direct", "old")
childSavedQuery := createSavedQuery("old-child", "old/child")
otherSavedQuery := createSavedQuery("other", "other")
- directResp, err := ctl.savedQueryServiceClient.BatchUpdateSavedQueries(ctx, connect.NewRequest(&v1pb.BatchUpdateSavedQueriesRequest{
- Parent: ctl.project.Name,
- Filter: `folder == "old"`,
- SavedQuery: &v1pb.SavedQuery{Folder: "new"},
- UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"folder"}},
- }))
- a.NoError(err)
- a.Equal(int32(1), directResp.Msg.UpdatedCount)
-
- childResp, err := ctl.savedQueryServiceClient.BatchUpdateSavedQueries(ctx, connect.NewRequest(&v1pb.BatchUpdateSavedQueriesRequest{
- Parent: ctl.project.Name,
- Filter: `folder == "old/child"`,
- SavedQuery: &v1pb.SavedQuery{Folder: "new/child"},
- UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"folder"}},
- }))
+ // Moving a folder carries its descendants: one call, not one per path.
+ moved, err := move(&v1pb.MoveMySavedQueriesRequest{SourceFolder: "old", TargetFolder: "new"})
a.NoError(err)
- a.Equal(int32(1), childResp.Msg.UpdatedCount)
-
+ a.Equal(int32(2), moved)
a.ElementsMatch([]string{directSavedQuery.Name}, searchByFolder("new"))
a.ElementsMatch([]string{childSavedQuery.Name}, searchByFolder("new/child"))
a.ElementsMatch([]string{otherSavedQuery.Name}, searchByFolder("other"))
a.Empty(searchByFolder("old"))
a.Empty(searchByFolder("old/child"))
- starResp, err := ctl.savedQueryServiceClient.UpdateSavedQueryStar(ctx, connect.NewRequest(&v1pb.UpdateSavedQueryStarRequest{
- Name: directSavedQuery.Name,
- Starred: true,
- }))
- a.NoError(err)
- a.True(starResp.Msg.Starred)
- starredResp, err := ctl.savedQueryServiceClient.SearchSavedQueries(ctx, connect.NewRequest(&v1pb.SearchSavedQueriesRequest{
- Parent: ctl.project.Name,
- Filter: `folder == "new" && starred == true`,
- }))
- a.NoError(err)
- a.ElementsMatch([]string{directSavedQuery.Name}, savedQueryNames(starredResp.Msg.SavedQueries))
-
- unstarResp, err := ctl.savedQueryServiceClient.UpdateSavedQueryStar(ctx, connect.NewRequest(&v1pb.UpdateSavedQueryStarRequest{
- Name: directSavedQuery.Name,
- Starred: false,
- }))
- a.NoError(err)
- a.False(unstarResp.Msg.Starred)
-
- nameResp, err := ctl.savedQueryServiceClient.BatchUpdateSavedQueries(ctx, connect.NewRequest(&v1pb.BatchUpdateSavedQueriesRequest{
- Parent: ctl.project.Name,
- Filter: fmt.Sprintf(`name in [%q,%q]`, directSavedQuery.Name, childSavedQuery.Name),
- SavedQuery: &v1pb.SavedQuery{Folder: "selected"},
- UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"folder"}},
- }))
+ // Naming saved queries moves exactly those, descendants irrelevant.
+ moved, err = move(&v1pb.MoveMySavedQueriesRequest{
+ Names: []string{directSavedQuery.Name, childSavedQuery.Name},
+ TargetFolder: "selected",
+ })
a.NoError(err)
- a.Equal(int32(2), nameResp.Msg.UpdatedCount)
+ a.Equal(int32(2), moved)
a.ElementsMatch([]string{directSavedQuery.Name, childSavedQuery.Name}, searchByFolder("selected"))
a.ElementsMatch([]string{otherSavedQuery.Name}, searchByFolder("other"))
- // Batch moves normalize like every other write path, so a folder sent
- // with boundary slashes still lands where `folder == "boxed"` finds it.
- slashResp, err := ctl.savedQueryServiceClient.BatchUpdateSavedQueries(ctx, connect.NewRequest(&v1pb.BatchUpdateSavedQueriesRequest{
- Parent: ctl.project.Name,
- Filter: `folder == "selected"`,
- SavedQuery: &v1pb.SavedQuery{Folder: "/boxed/"},
- UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"folder"}},
- }))
+ // Folders normalize like every other write path, so boundary slashes still
+ // land where `folder == "boxed"` finds them.
+ moved, err = move(&v1pb.MoveMySavedQueriesRequest{SourceFolder: "selected", TargetFolder: "/boxed/"})
a.NoError(err)
- a.Equal(int32(2), slashResp.Msg.UpdatedCount)
+ a.Equal(int32(2), moved)
a.ElementsMatch([]string{directSavedQuery.Name, childSavedQuery.Name}, searchByFolder("boxed"))
- // A path the filter could never match is rejected, not written.
- _, err = ctl.savedQueryServiceClient.BatchUpdateSavedQueries(ctx, connect.NewRequest(&v1pb.BatchUpdateSavedQueriesRequest{
- Parent: ctl.project.Name,
- Filter: `folder == "boxed"`,
- SavedQuery: &v1pb.SavedQuery{Folder: "bad//path"},
- UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"folder"}},
- }))
+ // An unfilable path is rejected, not written.
+ _, err = move(&v1pb.MoveMySavedQueriesRequest{SourceFolder: "boxed", TargetFolder: "bad//path"})
a.Error(err)
a.Equal(connect.CodeInvalidArgument, connect.CodeOf(err))
a.ElementsMatch([]string{directSavedQuery.Name, childSavedQuery.Name}, searchByFolder("boxed"))
+
+ // Exactly one of names / source_folder.
+ _, err = move(&v1pb.MoveMySavedQueriesRequest{TargetFolder: "x"})
+ a.Error(err)
+ a.Equal(connect.CodeInvalidArgument, connect.CodeOf(err))
+ _, err = move(&v1pb.MoveMySavedQueriesRequest{
+ Names: []string{directSavedQuery.Name},
+ SourceFolder: "boxed",
+ TargetFolder: "x",
+ })
+ a.Error(err)
+ a.Equal(connect.CodeInvalidArgument, connect.CodeOf(err))
+
+ // A folder cannot swallow itself.
+ _, err = move(&v1pb.MoveMySavedQueriesRequest{SourceFolder: "boxed", TargetFolder: "boxed/inner"})
+ a.Error(err)
+ a.Equal(connect.CodeInvalidArgument, connect.CodeOf(err))
+
+ // Unfiling: an empty target drops the prefix rather than leaving "/tail".
+ moved, err = move(&v1pb.MoveMySavedQueriesRequest{SourceFolder: "boxed", TargetFolder: ""})
+ a.NoError(err)
+ a.Equal(int32(2), moved)
+ a.Empty(searchByFolder("boxed"))
+ a.ElementsMatch([]string{directSavedQuery.Name, childSavedQuery.Name}, searchByFolder(""))
}
func TestSearchSavedQueryFoldersReturnsCallerFolders(t *testing.T) {
diff --git a/docs/design/saved-queries-model.md b/docs/design/saved-queries-model.md
index 5102063faa..8cf47a2d09 100644
--- a/docs/design/saved-queries-model.md
+++ b/docs/design/saved-queries-model.md
@@ -179,9 +179,13 @@ Alternatives the rejected options.
simplicity: no extra tier, no orphan-guard machinery; the admin backstop
and fork-a-copy cover the departed-creator case.
5. **Admin (`manage`) reads private.** Peer parity (`dataform.admin`,
- Databricks workspace admins), and what makes incident response and
- orphan cleanup possible. The real tradeoff: admins can read private
- drafts, and reads are not audited — the audit log records changes, not
+ Databricks workspace admins), and what makes incident response and orphan
+ cleanup possible. Two things sit outside it: **starring**, which is
+ personal — you star what you created or were granted, and your stars are
+ yours alone — and the bulk **`MoveMySavedQueries`**, caller-scoped by name,
+ though a single `UpdateSavedQuery` still lets an admin re-file one saved
+ query. The real
+ tradeoff: admins can read private drafts, and reads are not audited — the audit log records changes, not
lookups (see API and authorization: Audit events). The control on admin
access is therefore who holds `manage` (never a default member role),
not an after-the-fact read trail; an admin *write* to someone else's
@@ -260,6 +264,8 @@ create(u, P) = u holds bb.savedQueries.create on P
discover(u, P) = u holds bb.savedQueries.search on P -- gates Search, not content
read(s, u) = admin(u, s.project) OR u == s.creator OR grant(s, u) >= VIEWER
write(s, u) = admin(u, s.project) OR u == s.creator OR grant(s, u) >= EDITOR
+star(s, u) = u == s.creator OR grant(s, u) >= VIEWER -- personal, own or shared
+move(s, u) = u == s.creator -- MoveMySavedQueries
share(s, u) = admin(u, s.project) OR u == s.creator
delete(s, u) = admin(u, s.project) OR u == s.creator
```
@@ -271,7 +277,7 @@ delete(s, u) = admin(u, s.project) OR u == s.creator
| `bb.savedQueries.create` | Create saved queries in the project |
| `bb.savedQueries.search` | Discover: Search and the folder list, results still filtered to `read(s,u)` |
| `bb.savedQueries.list` | Audit: enumerate in scope, read-only, ignoring bindings |
-| `bb.savedQueries.manage` | Admin: read/write/re-share/delete anything in scope, private included |
+| `bb.savedQueries.manage` | Admin backstop: read, write, re-file, re-share, and delete anything in scope, private included. Not star |
There is no `get` permission — bindings decide reads, so `bb.worksheets.get`
is dropped rather than renamed. `search` is dedicated rather than riding on
@@ -445,7 +451,7 @@ express. Every object method is a CUSTOM per-row predicate.
| `GetSavedQueryPolicy` | CUSTOM | `read(s,u)`; NotFound when unreadable | policy only; unaudited |
| `SetSavedQueryPolicy` | CUSTOM | `share(s,u)` + etag CAS | policy only; audited |
| `UpdateSavedQueryStar` | CUSTOM | `read(s,u)` — star any readable query | — ; unaudited |
-| `BatchUpdateSavedQueries` | CUSTOM | rows the caller may re-file (creator; admin: any); mask limited to `folder` | count only; audited |
+| `MoveMySavedQueries` | CUSTOM | the caller's own rows only, by name or by folder (descendants included) | count only; audited |
| `SearchSavedQueryFolders` | CUSTOM | `discover` → folder paths of readable rows, same access clause as Search | paths only; unaudited |
Duplicate and fork need no RPC: read what you can already see, then
@@ -480,7 +486,7 @@ Today's `WorksheetService` carries no `bytebase.v1.audit` annotations at all,
though sheet and database services do. This design closes that gap under one
invariant: **the audit log records changes, not lookups.** Every RPC that
mutates a saved query or its policy is annotated — `CreateSavedQuery`,
-`UpdateSavedQuery`, `BatchUpdateSavedQueries`, `DeleteSavedQuery`,
+`UpdateSavedQuery`, `MoveMySavedQueries`, `DeleteSavedQuery`,
`SetSavedQueryPolicy` — and no read RPC is. That keeps the annotation set
derivable from the method rather than from who the caller happened to be, and
draws the same line as the rest of the v1 API.
@@ -672,7 +678,7 @@ lock-ordering):
uses for `project`. Its inserted key is novel, so it never contends with
purge's existing-child locks — no cross-order deadlock.
- **Batch folder moves lock rows in primary-key order.**
- `BatchUpdateSavedQueries` only *updates* existing `saved_query` rows (no
+ `MoveMySavedQueries` only *updates* existing `saved_query` rows (no
new child), but "existing" is not enough on its own: two overlapping
batches could grab their target rows in different scan orders and
deadlock. So it locks its selected rows in full primary-key order
@@ -703,7 +709,7 @@ delete) before mutating. Required before
implementation: deterministic real-PostgreSQL regression tests for **both**
acquisition orders of each contending pair — create↔purge,
first-star↔purge, delete↔star-toggle, delete↔purge over a query with
-multiple stars, and two overlapping `BatchUpdateSavedQueries` with
+multiple stars, and two overlapping `MoveMySavedQueries` with
intersecting, reverse-ordered targets — asserting the terminal outcomes — project (or query) deleted, no orphaned
saved query or star, and **no** FK failure or deadlock (`40P01`) in either
direction (absence of `40P01` alone is insufficient).
@@ -751,7 +757,7 @@ deferred.
Storage follows the semantic: the location is the `saved_query.folder`
**path column on the object** ("a/b/c", '' = unfiled), set via
`UpdateSavedQuery` (creator/admin only — re-filing is organization, not
- editing), bulk rename/move via `BatchUpdateSavedQueries`. Folders never
+ editing), bulk rename/move via `MoveMySavedQueries`. Folders never
grant access; a folder is a path on rows, so empty folders cannot exist.
Today's per-user organizer re-foldering (everyone re-files everything) is
dropped as the outlier. A query shared with you appears in
diff --git a/frontend/src/modules/sql-editor/components/SheetTree.tsx b/frontend/src/modules/sql-editor/components/SheetTree.tsx
index 99cdbebf11..38f4158d5f 100644
--- a/frontend/src/modules/sql-editor/components/SheetTree.tsx
+++ b/frontend/src/modules/sql-editor/components/SheetTree.tsx
@@ -1611,13 +1611,16 @@ export function SheetTree({
: "[&_[role=treeitem]]:overflow-hidden"
)}
onMove={handleMove}
+ // Dragging re-files, and only your own saved queries can be re-filed,
+ // so the Shared tree is browse-only rather than accepting a drop the
+ // server declines.
disableDrag={
- view === "draft" || !!editingNode || multiSelectMode
+ view !== "my" || !!editingNode || multiSelectMode
? true
: ({ data }) => !!data.loadMore
}
disableDrop={
- view === "draft" || !!editingNode || multiSelectMode
+ view !== "my" || !!editingNode || multiSelectMode
? true
: ({ parentNode: p, dragNodes }) =>
!!p?.data.data.savedQuery ||
diff --git a/frontend/src/modules/sql-editor/components/useDropdown.ts b/frontend/src/modules/sql-editor/components/useDropdown.ts
index d2e3018169..333be53d2c 100644
--- a/frontend/src/modules/sql-editor/components/useDropdown.ts
+++ b/frontend/src/modules/sql-editor/components/useDropdown.ts
@@ -135,7 +135,11 @@ export function useDropdown(
});
}
} else {
- if (allowCreateNew) {
+ // Folder structure is the creator's own: MoveMySavedQueries only moves
+ // rows you created, so offering to rename, delete, or add folders in the
+ // Shared tree would accept a gesture the server declines.
+ const canOrganize = viewMode === "my";
+ if (allowCreateNew && canOrganize) {
items.push({
key: "add-folder",
label: t("sql-editor.tab.context-menu.actions.add-folder"),
@@ -155,7 +159,7 @@ export function useDropdown(
});
}
}
- if (currentNode.editable) {
+ if (currentNode.editable && canOrganize) {
items.push(
{
key: "rename",
diff --git a/frontend/src/modules/sql-editor/model/Sheet/context.test.tsx b/frontend/src/modules/sql-editor/model/Sheet/context.test.tsx
index d2cd58b28f..9a83fead97 100644
--- a/frontend/src/modules/sql-editor/model/Sheet/context.test.tsx
+++ b/frontend/src/modules/sql-editor/model/Sheet/context.test.tsx
@@ -21,7 +21,7 @@ type AppState = {
searchSavedQueryFolders: ReturnType<typeof vi.fn>;
fetchSavedQueryList: ReturnType<typeof vi.fn>;
updateSavedQueryStar: ReturnType<typeof vi.fn>;
- batchUpdateSavedQueryFolder: ReturnType<typeof vi.fn>;
+ moveMySavedQueries: ReturnType<typeof vi.fn>;
};
const mocks = vi.hoisted(() => {
@@ -77,7 +77,7 @@ const mocks = vi.hoisted(() => {
return { savedQueries: [savedQuery], nextPageToken: "next-page" };
}),
updateSavedQueryStar: vi.fn(),
- batchUpdateSavedQueryFolder: vi.fn(async () => 0),
+ moveMySavedQueries: vi.fn(async () => 0),
patchSavedQueryFolderInCache: vi.fn(),
};
},
@@ -922,13 +922,16 @@ describe("sheet context", () => {
]);
});
- expect(
- mocks.getAppState().batchUpdateSavedQueryFolder
- ).toHaveBeenCalledTimes(1);
- expect(mocks.getAppState().batchUpdateSavedQueryFolder).toHaveBeenCalledWith(
+ expect(mocks.getAppState().moveMySavedQueries).toHaveBeenCalledTimes(1);
+ expect(mocks.getAppState().moveMySavedQueries).toHaveBeenCalledWith(
"projects/proj1",
- 'name in ["projects/proj1/savedQueries/1","projects/proj1/savedQueries/2"]',
- "target"
+ {
+ names: [
+ "projects/proj1/savedQueries/1",
+ "projects/proj1/savedQueries/2",
+ ],
+ targetFolder: "target",
+ }
);
// The batch RPC answers with a count, so the moved rows are mirrored into
// the cache — otherwise the tree rebuild snaps them back to the old folder.
@@ -1031,21 +1034,12 @@ describe("sheet context", () => {
]);
});
- expect(
- mocks.getAppState().batchUpdateSavedQueryFolder
- ).toHaveBeenNthCalledWith(
- 1,
- "projects/proj1",
- 'creator == "users/[email protected]" && folder == "old/child"',
- "new/child"
- );
- expect(
- mocks.getAppState().batchUpdateSavedQueryFolder
- ).toHaveBeenNthCalledWith(
- 2,
+ // The server moves descendants with the folder, so only the top-level move
+ // is sent -- "old/child" would otherwise be rewritten twice.
+ expect(mocks.getAppState().moveMySavedQueries).toHaveBeenCalledTimes(1);
+ expect(mocks.getAppState().moveMySavedQueries).toHaveBeenCalledWith(
"projects/proj1",
- 'creator == "users/[email protected]" && folder == "old"',
- "new"
+ { sourceFolder: "old", targetFolder: "new" }
);
});
});
diff --git a/frontend/src/modules/sql-editor/model/Sheet/context.ts b/frontend/src/modules/sql-editor/model/Sheet/context.ts
index ee7f55fc18..dfd2e45925 100644
--- a/frontend/src/modules/sql-editor/model/Sheet/context.ts
+++ b/frontend/src/modules/sql-editor/model/Sheet/context.ts
@@ -1249,8 +1249,12 @@ const batchUpdateSavedQueryFolders = async (
string,
{ parent: string; folders: string[]; names: string[] }
>();
+ const currentUserName = `users/${useAppStore.getState().currentUser?.email}`;
for (const savedQuery of savedQueries) {
const current = useAppStore.getState().getSavedQueryByName(savedQuery.name);
+ // Only the creator's own rows move. Sending somebody else's would come
+ // back with nothing moved while the cache patch below claimed otherwise.
+ if (current && current.creator !== currentUserName) continue;
const view = current ? viewForSavedQuery(current) : undefined;
if (current && (view === "my" || view === "shared")) {
addAffectedFolderKey(
@@ -1284,15 +1288,10 @@ const batchUpdateSavedQueryFolders = async (
await Promise.all(
requests.map(async (request) => {
const folder = request.folders.join("/");
- await useAppStore
- .getState()
- .batchUpdateSavedQueryFolder(
- request.parent,
- `name in [${request.names
- .map((name) => '"' + escapeCELStringLiteral(name) + '"')
- .join(",")}]`,
- folder
- );
+ await useAppStore.getState().moveMySavedQueries(request.parent, {
+ names: request.names,
+ targetFolder: folder,
+ });
useAppStore
.getState()
.patchSavedQueryFolderInCache(request.names, folder);
@@ -1308,33 +1307,76 @@ const batchUpdateSavedQueryFolderPaths = async (
view: SheetViewMode,
updates: SavedQueryFolderPathUpdate[]
): Promise<void> => {
- if (view !== "my" && view !== "shared") return;
+ // Only the caller's own tree can be re-filed: MoveMySavedQueries scopes to
+ // creator, so running this for the Shared view would move nothing while the
+ // cache patch below claimed otherwise, leaving a phantom move on screen
+ // until the next refetch.
+ if (view !== "my") return;
if (updates.length === 0) return;
const project = getSQLEditorEditorState().project;
- const sortedUpdates = [...updates].sort(
+ // Deepest first, so a nested source still matches rows an ancestor move has
+ // not yet rewritten.
+ const sorted = [...updates].sort(
(a, b) => b.sourceFolder.length - a.sourceFolder.length
);
- for (const update of sortedUpdates) {
+ // The server rewrites a folder's prefix, carrying descendants with it, so a
+ // nested update is redundant only when that rewrite already produces its
+ // target: "old" -> "new" implies "old/child" -> "new/child". Flattening does
+ // not qualify -- "old" -> "" would leave "old/child" at "child" rather than
+ // at the root -- so those updates still have to be sent.
+ const impliedTarget = (
+ ancestor: SavedQueryFolderPathUpdate,
+ update: SavedQueryFolderPathUpdate
+ ) =>
+ (
+ ancestor.targetFolder.join("/") +
+ update.sourceFolder
+ .join("/")
+ .slice(ancestor.sourceFolder.join("/").length)
+ ).replace(/^\/+/, "");
+ const needed = sorted.filter(
+ (update) =>
+ !sorted.some(
+ (ancestor) =>
+ ancestor !== update &&
+ isSubFolder({
+ parent: ancestor.sourceFolder.join("/"),
+ path: update.sourceFolder.join("/"),
+ dig: true,
+ }) &&
+ update.targetFolder.join("/") === impliedTarget(ancestor, update)
+ )
+ );
+ for (const update of needed) {
const source = update.sourceFolder.join("/");
const target = update.targetFolder.join("/");
- // Cached rows are named before the move so the tree can be rebuilt
- // without waiting for a refetch; rows outside the cache move server-side
- // and arrive with the new folder on their next page.
- const movedNames = cachedSavedQueriesForView(view)
- .filter((savedQuery) => savedQuery.folder === source)
- .map((savedQuery) => savedQuery.name);
- await useAppStore
- .getState()
- .batchUpdateSavedQueryFolder(
- project,
- sheetFilterForView(
- view,
- [`folder == "${escapeCELStringLiteral(source)}"`],
- false
- ),
- target
- );
- useAppStore.getState().patchSavedQueryFolderInCache(movedNames, target);
+ // Cached rows are re-filed locally so the tree can rebuild without waiting
+ // for a refetch; rows outside the cache move server-side and arrive with
+ // the new folder on their next page.
+ const moved = cachedSavedQueriesForView(view)
+ .filter(
+ (savedQuery) =>
+ savedQuery.folder === source ||
+ savedQuery.folder.startsWith(source + "/")
+ )
+ .map((savedQuery) => ({
+ name: savedQuery.name,
+ folder: target + savedQuery.folder.slice(source.length),
+ }));
+ await useAppStore.getState().moveMySavedQueries(project, {
+ sourceFolder: source,
+ targetFolder: target,
+ });
+ // One patch per destination: a flat move lands every row in the same
+ // folder, while a subtree move keeps each descendant's own tail.
+ const byFolder = new Map<string, string[]>();
+ for (const savedQuery of moved) {
+ const folder = savedQuery.folder.replace(/^\/+/, "");
+ byFolder.set(folder, [...(byFolder.get(folder) ?? []), savedQuery.name]);
+ }
+ for (const [folder, names] of byFolder) {
+ useAppStore.getState().patchSavedQueryFolderInCache(names, folder);
+ }
}
};
diff --git a/frontend/src/stores/app/savedQuery.ts b/frontend/src/stores/app/savedQuery.ts
index 5727667e2b..ed3da2736f 100644
--- a/frontend/src/stores/app/savedQuery.ts
+++ b/frontend/src/stores/app/savedQuery.ts
@@ -6,11 +6,11 @@ import { silentContextKey } from "@/api/context-key";
import { UNKNOWN_ID } from "@/types";
import type { SavedQuery } from "@/types/proto-es/v1/saved_query_service_pb";
import {
- BatchUpdateSavedQueriesRequestSchema,
CreateSavedQueryRequestSchema,
DeleteSavedQueryRequestSchema,
GetSavedQueryPolicyRequestSchema,
GetSavedQueryRequestSchema,
+ MoveMySavedQueriesRequestSchema,
SavedQueryBinding_Level,
SavedQuerySchema,
SearchSavedQueriesRequestSchema,
@@ -246,17 +246,16 @@ export const createSavedQuerySlice: AppSliceCreator<SavedQuerySlice> = (
}
},
- batchUpdateSavedQueryFolder: async (parent, filter, folder) => {
- const response =
- await savedQueryServiceClientConnect.batchUpdateSavedQueries(
- createProto(BatchUpdateSavedQueriesRequestSchema, {
- parent,
- filter,
- savedQuery: createProto(SavedQuerySchema, { folder }),
- updateMask: { paths: ["folder"] },
- })
- );
- return response.updatedCount;
+ moveMySavedQueries: async (parent, params) => {
+ const response = await savedQueryServiceClientConnect.moveMySavedQueries(
+ createProto(MoveMySavedQueriesRequestSchema, {
+ parent,
+ names: params.names,
+ sourceFolder: params.sourceFolder,
+ targetFolder: params.targetFolder,
+ })
+ );
+ return response.movedCount;
},
patchSavedQueryFolderInCache: (names, folder) => {
diff --git a/frontend/src/stores/app/types.ts b/frontend/src/stores/app/types.ts
index 5d7fa95778..d761e9d448 100644
--- a/frontend/src/stores/app/types.ts
+++ b/frontend/src/stores/app/types.ts
@@ -651,10 +651,19 @@ export type SavedQuerySlice = {
) => Promise<SavedQuery | undefined>;
deleteSavedQueryByName: (name: string) => Promise<void>;
updateSavedQueryStar: (name: string, starred: boolean) => Promise<void>;
- batchUpdateSavedQueryFolder: (
+ /**
+ * Move saved queries into a folder: either `names` (specific saved queries)
+ * or `sourceFolder` (that folder and its descendants), never both. Only the
+ * caller's own saved queries move, so the returned count can be smaller than
+ * what was named.
+ */
+ moveMySavedQueries: (
parent: string,
- filter: string,
- folder: string
+ params: {
+ names?: string[];
+ sourceFolder?: string;
+ targetFolder: string;
+ }
) => Promise<number>;
/**
* Mirror a completed server-side folder move onto the cached rows. The
diff --git a/frontend/src/types/proto-es/v1/saved_query_service_pb.d.ts b/frontend/src/types/proto-es/v1/saved_query_service_pb.d.ts
index 47b572815a..65f7acf630 100644
--- a/frontend/src/types/proto-es/v1/saved_query_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/saved_query_service_pb.d.ts
@@ -228,9 +228,9 @@ export declare type UpdateSavedQueryStarRequest = Message<"bytebase.v1.UpdateSav
export declare const UpdateSavedQueryStarRequestSchema: GenMessage<UpdateSavedQueryStarRequest>;
/**
- * @generated from message bytebase.v1.BatchUpdateSavedQueriesRequest
+ * @generated from message bytebase.v1.MoveMySavedQueriesRequest
*/
-export declare type BatchUpdateSavedQueriesRequest = Message<"bytebase.v1.BatchUpdateSavedQueriesRequest"> & {
+export declare type MoveMySavedQueriesRequest = Message<"bytebase.v1.MoveMySavedQueriesRequest"> & {
/**
* Format: projects/{project}
*
@@ -239,58 +239,52 @@ export declare type BatchUpdateSavedQueriesRequest = Message<"bytebase.v1.BatchU
parent: string;
/**
- * Select the saved queries to update, in CEL. See
- * https://github.com/google/cel-spec
- *
- * Supported fields:
- * - name: the saved query name. Supports "==" and "in [...]".
- * - creator: the creator in "users/{email}" format. Supports "==" and "!=".
- * - starred: whether the caller starred it. Supports "==".
- * - folder: the exact folder path. Supports "==".
+ * The saved queries to move. Set this or `source_folder`, not both.
+ * Format: projects/{project}/savedQueries/{savedQuery}
*
- * @generated from field: string filter = 2;
+ * @generated from field: repeated string names = 2;
*/
- filter: string;
+ names: string[];
/**
- * The values to apply to every matched saved query.
+ * Move everything filed under this path, descendants included, e.g. "a/b".
+ * Set this or `names`, not both.
*
- * @generated from field: bytebase.v1.SavedQuery saved_query = 3;
+ * @generated from field: string source_folder = 3;
*/
- savedQuery?: SavedQuery | undefined;
+ sourceFolder: string;
/**
- * Fields to update. Supported: `folder`.
+ * Where they land. A path like "a/b/c"; empty unfiles them.
*
- * @generated from field: google.protobuf.FieldMask update_mask = 4;
+ * @generated from field: string target_folder = 4;
*/
- updateMask?: FieldMask | undefined;
+ targetFolder: string;
};
/**
- * Describes the message bytebase.v1.BatchUpdateSavedQueriesRequest.
- * Use `create(BatchUpdateSavedQueriesRequestSchema)` to create a new message.
+ * Describes the message bytebase.v1.MoveMySavedQueriesRequest.
+ * Use `create(MoveMySavedQueriesRequestSchema)` to create a new message.
*/
-export declare const BatchUpdateSavedQueriesRequestSchema: GenMessage<BatchUpdateSavedQueriesRequest>;
+export declare const MoveMySavedQueriesRequestSchema: GenMessage<MoveMySavedQueriesRequest>;
/**
- * @generated from message bytebase.v1.BatchUpdateSavedQueriesResponse
+ * @generated from message bytebase.v1.MoveMySavedQueriesResponse
*/
-export declare type BatchUpdateSavedQueriesResponse = Message<"bytebase.v1.BatchUpdateSavedQueriesResponse"> & {
+export declare type MoveMySavedQueriesResponse = Message<"bytebase.v1.MoveMySavedQueriesResponse"> & {
/**
- * How many saved queries were updated, which may be fewer than the filter
- * matched.
+ * How many moved. Fewer than were named when some are not the caller's.
*
- * @generated from field: int32 updated_count = 1;
+ * @generated from field: int32 moved_count = 1;
*/
- updatedCount: number;
+ movedCount: number;
};
/**
- * Describes the message bytebase.v1.BatchUpdateSavedQueriesResponse.
- * Use `create(BatchUpdateSavedQueriesResponseSchema)` to create a new message.
+ * Describes the message bytebase.v1.MoveMySavedQueriesResponse.
+ * Use `create(MoveMySavedQueriesResponseSchema)` to create a new message.
*/
-export declare const BatchUpdateSavedQueriesResponseSchema: GenMessage<BatchUpdateSavedQueriesResponse>;
+export declare const MoveMySavedQueriesResponseSchema: GenMessage<MoveMySavedQueriesResponse>;
/**
* @generated from message bytebase.v1.GetSavedQueryPolicyRequest
@@ -729,11 +723,11 @@ export declare const SavedQueryService: GenService<{
output: typeof SearchSavedQueryFoldersResponseSchema;
},
/**
- * Update a saved query. `title`, `content`, and `database` need write
- * access; `folder` is creator/admin only, because filing is organization
- * rather than editing. `database` must belong to the saved query's own
- * project. An unreadable saved query returns NotFound; a VIEWER who cannot
- * write gets PermissionDenied.
+ * Update a saved query. `title`, `content`, and `database` need write access;
+ * `folder` is creator/admin only, because filing is organization rather than
+ * editing. `database` must belong to the saved query's own project. An
+ * unreadable saved query returns NotFound; a VIEWER who cannot write gets
+ * PermissionDenied.
* Permissions required: creator, an EDITOR binding, or bb.savedQueries.manage
*
* @generated from rpc bytebase.v1.SavedQueryService.UpdateSavedQuery
@@ -744,10 +738,11 @@ export declare const SavedQueryService: GenService<{
output: typeof SavedQuerySchema;
},
/**
- * Star or unstar a saved query for the caller. A star is a per-user marker:
- * invisible to everyone else and granting nothing. Read access is the gate
- * only so unreadable saved queries stay unprobeable.
- * Permissions required: creator, a VIEWER or EDITOR binding, or bb.savedQueries.manage
+ * Star or unstar a saved query for the caller. Stars are personal: yours are
+ * invisible to everyone else and grant nothing. You can star any saved query
+ * you created or have been granted access to; anything else answers
+ * NotFound, so names stay unprobeable.
+ * Permissions required: creator, or a VIEWER or EDITOR binding
*
* @generated from rpc bytebase.v1.SavedQueryService.UpdateSavedQueryStar
*/
@@ -757,18 +752,21 @@ export declare const SavedQueryService: GenService<{
output: typeof SavedQuerySchema;
},
/**
- * Re-file saved queries into a folder in bulk; the update mask supports
- * `folder` only. An EDITOR binding does not carry re-filing, so matched
- * saved queries the caller cannot re-file are skipped rather than rejected,
- * and the response counts what actually changed.
- * Permissions required: creator, or bb.savedQueries.manage
+ * Move the caller's own saved queries into a folder, named individually or a
+ * whole folder at a time. Moving a folder carries its descendants, so renaming "a/b" to
+ * "a/c" also moves "a/b/deep" -- one call, not one per path.
+ *
+ * Filing is personal organization, so only the creator's own move: a folder
+ * is that person's tree, and neither a binding nor the admin backstop
+ * reaches into it. The response counts what moved.
+ * Permissions required: creator
*
- * @generated from rpc bytebase.v1.SavedQueryService.BatchUpdateSavedQueries
+ * @generated from rpc bytebase.v1.SavedQueryService.MoveMySavedQueries
*/
- batchUpdateSavedQueries: {
+ moveMySavedQueries: {
methodKind: "unary";
- input: typeof BatchUpdateSavedQueriesRequestSchema;
- output: typeof BatchUpdateSavedQueriesResponseSchema;
+ input: typeof MoveMySavedQueriesRequestSchema;
+ output: typeof MoveMySavedQueriesResponseSchema;
},
/**
* Delete a saved query and every user's stars on it. An EDITOR binding never
diff --git a/frontend/src/types/proto-es/v1/saved_query_service_pb.js b/frontend/src/types/proto-es/v1/saved_query_service_pb.js
index f78675fed0..5e16634297 100644
--- a/frontend/src/types/proto-es/v1/saved_query_service_pb.js
+++ b/frontend/src/types/proto-es/v1/saved_query_service_pb.js
@@ -15,7 +15,7 @@ import { file_v1_annotation } from "./annotation_pb";
* Describes the file v1/saved_query_service.proto.
*/
export const file_v1_saved_query_service = /*@__PURE__*/
- fileDesc("Chx2MS9zYXZlZF9xdWVyeV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJ6ChdDcmVhdGVTYXZlZFF1ZXJ5UmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSMQoLc2F2ZWRfcXVlcnkYAiABKAsyFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5QgPgQQIiKQoUR2V0U2F2ZWRRdWVyeVJlcXVlc3QSEQoEbmFtZRgBIAEoCUID4EECIn4KF0xpc3RTYXZlZFF1ZXJpZXNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIOCgZmaWx0ZXIYAiABKAkSEQoJcGFnZV9zaXplGAMgASgFEhIKCnBhZ2VfdG9rZW4YBCABKAkiYwoYTGlzdFNhdmVkUXVlcmllc1Jlc3BvbnNlEi4KDXNhdmVkX3F1ZXJpZXMYASADKAsyFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5EhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJeCh5TZWFyY2hTYXZlZFF1ZXJ5Rm9sZGVyc1JlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0Eg4KBmZpbHRlchgCIAEoCSIyCh9TZWFyY2hTYXZlZFF1ZXJ5Rm9sZGVyc1Jlc3BvbnNlEg8KB2ZvbGRlcnMYASADKAkifQoXVXBkYXRlU2F2ZWRRdWVyeVJlcXVlc3QSMQoLc2F2ZWRfcXVlcnkYASABKAsyFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5QgPgQQISLwoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrIkEKG1VwZGF0ZVNhdmVkUXVlcnlTdGFyUmVxdWVzdBIRCgRuYW1lGAEgASgJQgPgQQISDwoHc3RhcnJlZBgCIAEoCCLHAQoeQmF0Y2hVcGRhdGVTYXZlZFF1ZXJpZXNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIOCgZmaWx0ZXIYAiABKAkSMQoLc2F2ZWRfcXVlcnkYAyABKAsyFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5QgPgQQISNAoLdXBkYXRlX21hc2sYBCABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrQgPgQQIiOAofQmF0Y2hVcGRhdGVTYXZlZFF1ZXJpZXNSZXNwb25zZRIVCg11cGRhdGVkX2NvdW50GAEgASgFIk8KGkdldFNhdmVkUXVlcnlQb2xpY3lSZXF1ZXN0EjEKCHJlc291cmNlGAEgASgJQh/gQQL6QRkKF2J5dGViYXNlLmNvbS9TYXZlZFF1ZXJ5IoMBChpTZXRTYXZlZFF1ZXJ5UG9saWN5UmVxdWVzdBIxCghyZXNvdXJjZRgBIAEoCUIf4EEC+kEZChdieXRlYmFzZS5jb20vU2F2ZWRRdWVyeRIyCgZwb2xpY3kYAiABKAsyHS5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5UG9saWN5QgPgQQIiUgoQU2F2ZWRRdWVyeVBvbGljeRIwCghiaW5kaW5ncxgBIAMoCzIeLmJ5dGViYXNlLnYxLlNhdmVkUXVlcnlCaW5kaW5nEgwKBGV0YWcYAiABKAkiowEKEVNhdmVkUXVlcnlCaW5kaW5nEjgKBWxldmVsGAEgASgOMiQuYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeUJpbmRpbmcuTGV2ZWxCA+BBAhIcCgdtZW1iZXJzGAIgAygJQgvgQQK6SAWSAQIIASI2CgVMZXZlbBIVChFMRVZFTF9VTlNQRUNJRklFRBAAEgoKBlZJRVdFUhABEgoKBkVESVRPUhACIkgKF0RlbGV0ZVNhdmVkUXVlcnlSZXF1ZXN0Ei0KBG5hbWUYASABKAlCH+BBAvpBGQoXYnl0ZWJhc2UuY29tL1NhdmVkUXVlcnkigAEKGVNlYXJjaFNhdmVkUXVlcmllc1JlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0Eg4KBmZpbHRlchgCIAEoCRIRCglwYWdlX3NpemUYAyABKAUSEgoKcGFnZV90b2tlbhgEIAEoCSJlChpTZWFyY2hTYXZlZFF1ZXJpZXNSZXNwb25zZRIuCg1zYXZlZF9xdWVyaWVzGAEgAygLMhcuYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeRIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkiogMKClNhdmVkUXVlcnkSFAoEbmFtZRgBIAEoCUIG4EEC4EEFEhQKB3Byb2plY3QYAiABKAlCA+BBAxIQCghkYXRhYmFzZRgDIAEoCRIaCgV0aXRsZRgEIAEoCUIL4EECukgFcgMYyAESFAoHY3JlYXRvchgFIAEoCUID4EEDEjQKC2NyZWF0ZV90aW1lGAYgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEjQKC3VwZGF0ZV90aW1lGAcgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEhQKB2NvbnRlbnQYCCABKAxCA+BBAhIZCgxjb250ZW50X3NpemUYCSABKANCA+BBAxIUCgdzdGFycmVkGAsgASgIQgPgQQMSGAoGZm9sZGVyGA0gASgJQgi6SAVyAxiAAjpL6kFIChdieXRlYmFzZS5jb20vU2F2ZWRRdWVyeRItcHJvamVjdHMve3Byb2plY3R9L3NhdmVkUXVlcmllcy97c2F2ZWRfcXVlcnl9SgQIChALSgQIDBANMr4PChFTYXZlZFF1ZXJ5U2VydmljZRLDAQoQQ3JlYXRlU2F2ZWRRdWVyeRIkLmJ5dGViYXNlLnYxLkNyZWF0ZVNhdmVkUXVlcnlSZXF1ZXN0GhcuYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeSJw2kEScGFyZW50LHNhdmVkX3F1ZXJ5iuowFmJiLnNhdmVkUXVlcmllcy5jcmVhdGWQ6jABmOowAYLT5JMCMzoLc2F2ZWRfcXVlcnkiJC92MS97cGFyZW50PXByb2plY3RzLyp9L3NhdmVkUXVlcmllcxKEAQoNR2V0U2F2ZWRRdWVyeRIhLmJ5dGViYXNlLnYxLkdldFNhdmVkUXVlcnlSZXF1ZXN0GhcuYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeSI32kEEbmFtZZDqMAKC0+STAiYSJC92MS97bmFtZT1wcm9qZWN0cy8qL3NhdmVkUXVlcmllcy8qfRKyAQoQTGlzdFNhdmVkUXVlcmllcxIkLmJ5dGViYXNlLnYxLkxpc3RTYXZlZFF1ZXJpZXNSZXF1ZXN0GiUuYnl0ZWJhc2UudjEuTGlzdFNhdmVkUXVlcmllc1Jlc3BvbnNlIlHaQQZwYXJlbnSK6jAUYmIuc2F2ZWRRdWVyaWVzLmxpc3SQ6jABgtPkkwImEiQvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9zYXZlZFF1ZXJpZXMSqgEKElNlYXJjaFNhdmVkUXVlcmllcxImLmJ5dGViYXNlLnYxLlNlYXJjaFNhdmVkUXVlcmllc1JlcXVlc3QaJy5ieXRlYmFzZS52MS5TZWFyY2hTYXZlZFF1ZXJpZXNSZXNwb25zZSJD2kEGcGFyZW50kOowAoLT5JMCMDoBKiIrL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vc2F2ZWRRdWVyaWVzOnNlYXJjaBLAAQoXU2VhcmNoU2F2ZWRRdWVyeUZvbGRlcnMSKy5ieXRlYmFzZS52MS5TZWFyY2hTYXZlZFF1ZXJ5Rm9sZGVyc1JlcXVlc3QaLC5ieXRlYmFzZS52MS5TZWFyY2hTYXZlZFF1ZXJ5Rm9sZGVyc1Jlc3BvbnNlIkraQQZwYXJlbnSQ6jACgtPkkwI3OgEqIjIvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9zYXZlZFF1ZXJpZXM6c2VhcmNoRm9sZGVycxK6AQoQVXBkYXRlU2F2ZWRRdWVyeRIkLmJ5dGViYXNlLnYxLlVwZGF0ZVNhdmVkUXVlcnlSZXF1ZXN0GhcuYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeSJn2kEXc2F2ZWRfcXVlcnksdXBkYXRlX21hc2uQ6jACmOowAYLT5JMCPzoLc2F2ZWRfcXVlcnkyMC92MS97c2F2ZWRfcXVlcnkubmFtZT1wcm9qZWN0cy8qL3NhdmVkUXVlcmllcy8qfRKoAQoUVXBkYXRlU2F2ZWRRdWVyeVN0YXISKC5ieXRlYmFzZS52MS5VcGRhdGVTYXZlZFF1ZXJ5U3RhclJlcXVlc3QaFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5Ik3aQQxuYW1lLHN0YXJyZWSQ6jACgtPkkwI0OgEqIi8vdjEve25hbWU9cHJvamVjdHMvKi9zYXZlZFF1ZXJpZXMvKn06dXBkYXRlU3RhchLaAQoXQmF0Y2hVcGRhdGVTYXZlZFF1ZXJpZXMSKy5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZVNhdmVkUXVlcmllc1JlcXVlc3QaLC5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZVNhdmVkUXVlcmllc1Jlc3BvbnNlImTaQR5wYXJlbnQsc2F2ZWRfcXVlcnksdXBkYXRlX21hc2uQ6jACmOowAYLT5JMCNToBKiIwL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vc2F2ZWRRdWVyaWVzOmJhdGNoVXBkYXRlEo0BChBEZWxldGVTYXZlZFF1ZXJ5EiQuYnl0ZWJhc2UudjEuRGVsZXRlU2F2ZWRRdWVyeVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiO9pBBG5hbWWQ6jACmOowAYLT5JMCJiokL3YxL3tuYW1lPXByb2plY3RzLyovc2F2ZWRRdWVyaWVzLyp9EqgBChNHZXRTYXZlZFF1ZXJ5UG9saWN5EicuYnl0ZWJhc2UudjEuR2V0U2F2ZWRRdWVyeVBvbGljeVJlcXVlc3QaHS5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5UG9saWN5IknaQQhyZXNvdXJjZZDqMAKC0+STAjQSMi92MS97cmVzb3VyY2U9cHJvamVjdHMvKi9zYXZlZFF1ZXJpZXMvKn06Z2V0UG9saWN5ErYBChNTZXRTYXZlZFF1ZXJ5UG9saWN5EicuYnl0ZWJhc2UudjEuU2V0U2F2ZWRRdWVyeVBvbGljeVJlcXVlc3QaHS5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5UG9saWN5IlfaQQ9yZXNvdXJjZSxwb2xpY3mQ6jACmOowAYLT5JMCNzoBKiIyL3YxL3tyZXNvdXJjZT1wcm9qZWN0cy8qL3NhdmVkUXVlcmllcy8qfTpzZXRQb2xpY3lCrAEKD2NvbS5ieXRlYmFzZS52MUIWU2F2ZWRRdWVyeVNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_v1_annotation]);
+ fileDesc("Chx2MS9zYXZlZF9xdWVyeV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJ6ChdDcmVhdGVTYXZlZFF1ZXJ5UmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSMQoLc2F2ZWRfcXVlcnkYAiABKAsyFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5QgPgQQIiKQoUR2V0U2F2ZWRRdWVyeVJlcXVlc3QSEQoEbmFtZRgBIAEoCUID4EECIn4KF0xpc3RTYXZlZFF1ZXJpZXNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIOCgZmaWx0ZXIYAiABKAkSEQoJcGFnZV9zaXplGAMgASgFEhIKCnBhZ2VfdG9rZW4YBCABKAkiYwoYTGlzdFNhdmVkUXVlcmllc1Jlc3BvbnNlEi4KDXNhdmVkX3F1ZXJpZXMYASADKAsyFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5EhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJeCh5TZWFyY2hTYXZlZFF1ZXJ5Rm9sZGVyc1JlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0Eg4KBmZpbHRlchgCIAEoCSIyCh9TZWFyY2hTYXZlZFF1ZXJ5Rm9sZGVyc1Jlc3BvbnNlEg8KB2ZvbGRlcnMYASADKAkifQoXVXBkYXRlU2F2ZWRRdWVyeVJlcXVlc3QSMQoLc2F2ZWRfcXVlcnkYASABKAsyFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5QgPgQQISLwoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrIkEKG1VwZGF0ZVNhdmVkUXVlcnlTdGFyUmVxdWVzdBIRCgRuYW1lGAEgASgJQgPgQQISDwoHc3RhcnJlZBgCIAEoCCKaAQoZTW92ZU15U2F2ZWRRdWVyaWVzUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSDQoFbmFtZXMYAiADKAkSHwoNc291cmNlX2ZvbGRlchgDIAEoCUIIukgFcgMYgAISHwoNdGFyZ2V0X2ZvbGRlchgEIAEoCUIIukgFcgMYgAIiMQoaTW92ZU15U2F2ZWRRdWVyaWVzUmVzcG9uc2USEwoLbW92ZWRfY291bnQYASABKAUiTwoaR2V0U2F2ZWRRdWVyeVBvbGljeVJlcXVlc3QSMQoIcmVzb3VyY2UYASABKAlCH+BBAvpBGQoXYnl0ZWJhc2UuY29tL1NhdmVkUXVlcnkigwEKGlNldFNhdmVkUXVlcnlQb2xpY3lSZXF1ZXN0EjEKCHJlc291cmNlGAEgASgJQh/gQQL6QRkKF2J5dGViYXNlLmNvbS9TYXZlZFF1ZXJ5EjIKBnBvbGljeRgCIAEoCzIdLmJ5dGViYXNlLnYxLlNhdmVkUXVlcnlQb2xpY3lCA+BBAiJSChBTYXZlZFF1ZXJ5UG9saWN5EjAKCGJpbmRpbmdzGAEgAygLMh4uYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeUJpbmRpbmcSDAoEZXRhZxgCIAEoCSKjAQoRU2F2ZWRRdWVyeUJpbmRpbmcSOAoFbGV2ZWwYASABKA4yJC5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5QmluZGluZy5MZXZlbEID4EECEhwKB21lbWJlcnMYAiADKAlCC+BBArpIBZIBAggBIjYKBUxldmVsEhUKEUxFVkVMX1VOU1BFQ0lGSUVEEAASCgoGVklFV0VSEAESCgoGRURJVE9SEAIiSAoXRGVsZXRlU2F2ZWRRdWVyeVJlcXVlc3QSLQoEbmFtZRgBIAEoCUIf4EEC+kEZChdieXRlYmFzZS5jb20vU2F2ZWRRdWVyeSKAAQoZU2VhcmNoU2F2ZWRRdWVyaWVzUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSDgoGZmlsdGVyGAIgASgJEhEKCXBhZ2Vfc2l6ZRgDIAEoBRISCgpwYWdlX3Rva2VuGAQgASgJImUKGlNlYXJjaFNhdmVkUXVlcmllc1Jlc3BvbnNlEi4KDXNhdmVkX3F1ZXJpZXMYASADKAsyFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5EhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSKiAwoKU2F2ZWRRdWVyeRIUCgRuYW1lGAEgASgJQgbgQQLgQQUSFAoHcHJvamVjdBgCIAEoCUID4EEDEhAKCGRhdGFiYXNlGAMgASgJEhoKBXRpdGxlGAQgASgJQgvgQQK6SAVyAxjIARIUCgdjcmVhdG9yGAUgASgJQgPgQQMSNAoLY3JlYXRlX3RpbWUYBiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSNAoLdXBkYXRlX3RpbWUYByABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSFAoHY29udGVudBgIIAEoDEID4EECEhkKDGNvbnRlbnRfc2l6ZRgJIAEoA0ID4EEDEhQKB3N0YXJyZWQYCyABKAhCA+BBAxIYCgZmb2xkZXIYDSABKAlCCLpIBXIDGIACOkvqQUgKF2J5dGViYXNlLmNvbS9TYXZlZFF1ZXJ5Ei1wcm9qZWN0cy97cHJvamVjdH0vc2F2ZWRRdWVyaWVzL3tzYXZlZF9xdWVyeX1KBAgKEAtKBAgMEA0yoA8KEVNhdmVkUXVlcnlTZXJ2aWNlEsMBChBDcmVhdGVTYXZlZFF1ZXJ5EiQuYnl0ZWJhc2UudjEuQ3JlYXRlU2F2ZWRRdWVyeVJlcXVlc3QaFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5InDaQRJwYXJlbnQsc2F2ZWRfcXVlcnmK6jAWYmIuc2F2ZWRRdWVyaWVzLmNyZWF0ZZDqMAGY6jABgtPkkwIzOgtzYXZlZF9xdWVyeSIkL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vc2F2ZWRRdWVyaWVzEoQBCg1HZXRTYXZlZFF1ZXJ5EiEuYnl0ZWJhc2UudjEuR2V0U2F2ZWRRdWVyeVJlcXVlc3QaFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5IjfaQQRuYW1lkOowAoLT5JMCJhIkL3YxL3tuYW1lPXByb2plY3RzLyovc2F2ZWRRdWVyaWVzLyp9ErIBChBMaXN0U2F2ZWRRdWVyaWVzEiQuYnl0ZWJhc2UudjEuTGlzdFNhdmVkUXVlcmllc1JlcXVlc3QaJS5ieXRlYmFzZS52MS5MaXN0U2F2ZWRRdWVyaWVzUmVzcG9uc2UiUdpBBnBhcmVudIrqMBRiYi5zYXZlZFF1ZXJpZXMubGlzdJDqMAGC0+STAiYSJC92MS97cGFyZW50PXByb2plY3RzLyp9L3NhdmVkUXVlcmllcxKqAQoSU2VhcmNoU2F2ZWRRdWVyaWVzEiYuYnl0ZWJhc2UudjEuU2VhcmNoU2F2ZWRRdWVyaWVzUmVxdWVzdBonLmJ5dGViYXNlLnYxLlNlYXJjaFNhdmVkUXVlcmllc1Jlc3BvbnNlIkPaQQZwYXJlbnSQ6jACgtPkkwIwOgEqIisvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9zYXZlZFF1ZXJpZXM6c2VhcmNoEsABChdTZWFyY2hTYXZlZFF1ZXJ5Rm9sZGVycxIrLmJ5dGViYXNlLnYxLlNlYXJjaFNhdmVkUXVlcnlGb2xkZXJzUmVxdWVzdBosLmJ5dGViYXNlLnYxLlNlYXJjaFNhdmVkUXVlcnlGb2xkZXJzUmVzcG9uc2UiStpBBnBhcmVudJDqMAKC0+STAjc6ASoiMi92MS97cGFyZW50PXByb2plY3RzLyp9L3NhdmVkUXVlcmllczpzZWFyY2hGb2xkZXJzEroBChBVcGRhdGVTYXZlZFF1ZXJ5EiQuYnl0ZWJhc2UudjEuVXBkYXRlU2F2ZWRRdWVyeVJlcXVlc3QaFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5ImfaQRdzYXZlZF9xdWVyeSx1cGRhdGVfbWFza5DqMAKY6jABgtPkkwI/OgtzYXZlZF9xdWVyeTIwL3YxL3tzYXZlZF9xdWVyeS5uYW1lPXByb2plY3RzLyovc2F2ZWRRdWVyaWVzLyp9EqgBChRVcGRhdGVTYXZlZFF1ZXJ5U3RhchIoLmJ5dGViYXNlLnYxLlVwZGF0ZVNhdmVkUXVlcnlTdGFyUmVxdWVzdBoXLmJ5dGViYXNlLnYxLlNhdmVkUXVlcnkiTdpBDG5hbWUsc3RhcnJlZJDqMAKC0+STAjQ6ASoiLy92MS97bmFtZT1wcm9qZWN0cy8qL3NhdmVkUXVlcmllcy8qfTp1cGRhdGVTdGFyErwBChJNb3ZlTXlTYXZlZFF1ZXJpZXMSJi5ieXRlYmFzZS52MS5Nb3ZlTXlTYXZlZFF1ZXJpZXNSZXF1ZXN0GicuYnl0ZWJhc2UudjEuTW92ZU15U2F2ZWRRdWVyaWVzUmVzcG9uc2UiVdpBFHBhcmVudCx0YXJnZXRfZm9sZGVykOowApjqMAGC0+STAjA6ASoiKy92MS97cGFyZW50PXByb2plY3RzLyp9L3NhdmVkUXVlcmllczptb3ZlTXkSjQEKEERlbGV0ZVNhdmVkUXVlcnkSJC5ieXRlYmFzZS52MS5EZWxldGVTYXZlZFF1ZXJ5UmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSI72kEEbmFtZZDqMAKY6jABgtPkkwImKiQvdjEve25hbWU9cHJvamVjdHMvKi9zYXZlZFF1ZXJpZXMvKn0SqAEKE0dldFNhdmVkUXVlcnlQb2xpY3kSJy5ieXRlYmFzZS52MS5HZXRTYXZlZFF1ZXJ5UG9saWN5UmVxdWVzdBodLmJ5dGViYXNlLnYxLlNhdmVkUXVlcnlQb2xpY3kiSdpBCHJlc291cmNlkOowAoLT5JMCNBIyL3YxL3tyZXNvdXJjZT1wcm9qZWN0cy8qL3NhdmVkUXVlcmllcy8qfTpnZXRQb2xpY3kStgEKE1NldFNhdmVkUXVlcnlQb2xpY3kSJy5ieXRlYmFzZS52MS5TZXRTYXZlZFF1ZXJ5UG9saWN5UmVxdWVzdBodLmJ5dGViYXNlLnYxLlNhdmVkUXVlcnlQb2xpY3kiV9pBD3Jlc291cmNlLHBvbGljeZDqMAKY6jABgtPkkwI3OgEqIjIvdjEve3Jlc291cmNlPXByb2plY3RzLyovc2F2ZWRRdWVyaWVzLyp9OnNldFBvbGljeUKsAQoPY29tLmJ5dGViYXNlLnYxQhZTYXZlZFF1ZXJ5U2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_v1_annotation]);
/**
* Describes the message bytebase.v1.CreateSavedQueryRequest.
@@ -74,17 +74,17 @@ export const UpdateSavedQueryStarRequestSchema = /*@__PURE__*/
messageDesc(file_v1_saved_query_service, 7);
/**
- * Describes the message bytebase.v1.BatchUpdateSavedQueriesRequest.
- * Use `create(BatchUpdateSavedQueriesRequestSchema)` to create a new message.
+ * Describes the message bytebase.v1.MoveMySavedQueriesRequest.
+ * Use `create(MoveMySavedQueriesRequestSchema)` to create a new message.
*/
-export const BatchUpdateSavedQueriesRequestSchema = /*@__PURE__*/
+export const MoveMySavedQueriesRequestSchema = /*@__PURE__*/
messageDesc(file_v1_saved_query_service, 8);
/**
- * Describes the message bytebase.v1.BatchUpdateSavedQueriesResponse.
- * Use `create(BatchUpdateSavedQueriesResponseSchema)` to create a new message.
+ * Describes the message bytebase.v1.MoveMySavedQueriesResponse.
+ * Use `create(MoveMySavedQueriesResponseSchema)` to create a new message.
*/
-export const BatchUpdateSavedQueriesResponseSchema = /*@__PURE__*/
+export const MoveMySavedQueriesResponseSchema = /*@__PURE__*/
messageDesc(file_v1_saved_query_service, 9);
/**
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index 45a1ab9875..7c5f3195b2 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -13839,11 +13839,11 @@ paths:
- SavedQueryService
summary: UpdateSavedQuery
description: |-
- Update a saved query. `title`, `content`, and `database` need write
- access; `folder` is creator/admin only, because filing is organization
- rather than editing. `database` must belong to the saved query's own
- project. An unreadable saved query returns NotFound; a VIEWER who cannot
- write gets PermissionDenied.
+ Update a saved query. `title`, `content`, and `database` need write access;
+ `folder` is creator/admin only, because filing is organization rather than
+ editing. `database` must belong to the saved query's own project. An
+ unreadable saved query returns NotFound; a VIEWER who cannot write gets
+ PermissionDenied.
Permissions required: creator, an EDITOR binding, or bb.savedQueries.manage
operationId: SavedQueryService_UpdateSavedQuery
parameters:
@@ -14167,10 +14167,11 @@ paths:
- SavedQueryService
summary: UpdateSavedQueryStar
description: |-
- Star or unstar a saved query for the caller. A star is a per-user marker:
- invisible to everyone else and granting nothing. Read access is the gate
- only so unreadable saved queries stay unprobeable.
- Permissions required: creator, a VIEWER or EDITOR binding, or bb.savedQueries.manage
+ Star or unstar a saved query for the caller. Stars are personal: yours are
+ invisible to everyone else and grant nothing. You can star any saved query
+ you created or have been granted access to; anything else answers
+ NotFound, so names stay unprobeable.
+ Permissions required: creator, or a VIEWER or EDITOR binding
operationId: SavedQueryService_UpdateSavedQueryStar
parameters:
- name: project
@@ -14205,18 +14206,20 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/bytebase.v1.SavedQuery'
- /v1/projects/{project}/savedQueries:batchUpdate:
+ /v1/projects/{project}/savedQueries:moveMy:
post:
tags:
- SavedQueryService
- summary: BatchUpdateSavedQueries
- description: |-
- Re-file saved queries into a folder in bulk; the update mask supports
- `folder` only. An EDITOR binding does not carry re-filing, so matched
- saved queries the caller cannot re-file are skipped rather than rejected,
- and the response counts what actually changed.
- Permissions required: creator, or bb.savedQueries.manage
- operationId: SavedQueryService_BatchUpdateSavedQueries
+ summary: |-
+ Move the caller's own saved queries into a folder, named individually or a
+ whole folder at a time. Moving a folder carries its descendants, so renaming "a/b" to
+ "a/c" also moves "a/b/deep" -- one call, not one per path.
+ description: |-
+ Filing is personal organization, so only the creator's own move: a folder
+ is that person's tree, and neither a binding nor the admin backstop
+ reaches into it. The response counts what moved.
+ Permissions required: creator
+ operationId: SavedQueryService_MoveMySavedQueries
parameters:
- name: project
in: path
@@ -14230,30 +14233,27 @@ paths:
schema:
type: object
properties:
- filter:
+ names:
+ type: array
+ items:
+ type: string
+ title: names
+ description: |-
+ The saved queries to move. Set this or `source_folder`, not both.
+ Format: projects/{project}/savedQueries/{savedQuery}
+ sourceFolder:
type: string
- title: filter
+ title: source_folder
+ maxLength: 256
description: |-
- Select the saved queries to update, in CEL. See
- https://github.com/google/cel-spec
-
- Supported fields:
- - name: the saved query name. Supports "==" and "in [...]".
- - creator: the creator in "users/{email}" format. Supports "==" and "!=".
- - starred: whether the caller starred it. Supports "==".
- - folder: the exact folder path. Supports "==".
- savedQuery:
- title: saved_query
- description: The values to apply to every matched saved query.
- $ref: '#/components/schemas/bytebase.v1.SavedQuery'
- updateMask:
- title: update_mask
- description: 'Fields to update. Supported: `folder`.'
- $ref: '#/components/schemas/google.protobuf.FieldMask'
- title: BatchUpdateSavedQueriesRequest
- required:
- - savedQuery
- - updateMask
+ Move everything filed under this path, descendants included, e.g. "a/b".
+ Set this or `names`, not both.
+ targetFolder:
+ type: string
+ title: target_folder
+ maxLength: 256
+ description: Where they land. A path like "a/b/c"; empty unfiles them.
+ title: MoveMySavedQueriesRequest
additionalProperties: false
required: true
responses:
@@ -14262,7 +14262,7 @@ paths:
content:
application/json:
schema:
- $ref: '#/components/schemas/bytebase.v1.BatchUpdateSavedQueriesResponse'
+ $ref: '#/components/schemas/bytebase.v1.MoveMySavedQueriesResponse'
/v1/projects/{project}/savedQueries:search:
post:
tags:
@@ -20128,51 +20128,6 @@ components:
type: object
title: BatchUpdateIssuesStatusResponse
additionalProperties: false
- bytebase.v1.BatchUpdateSavedQueriesRequest:
- type: object
- properties:
- parent:
- type: string
- title: parent
- description: 'Format: projects/{project}'
- filter:
- type: string
- title: filter
- description: |-
- Select the saved queries to update, in CEL. See
- https://github.com/google/cel-spec
-
- Supported fields:
- - name: the saved query name. Supports "==" and "in [...]".
- - creator: the creator in "users/{email}" format. Supports "==" and "!=".
- - starred: whether the caller starred it. Supports "==".
- - folder: the exact folder path. Supports "==".
- savedQuery:
- title: saved_query
- description: The values to apply to every matched saved query.
- $ref: '#/components/schemas/bytebase.v1.SavedQuery'
- updateMask:
- title: update_mask
- description: 'Fields to update. Supported: `folder`.'
- $ref: '#/components/schemas/google.protobuf.FieldMask'
- title: BatchUpdateSavedQueriesRequest
- required:
- - parent
- - savedQuery
- - updateMask
- additionalProperties: false
- bytebase.v1.BatchUpdateSavedQueriesResponse:
- type: object
- properties:
- updatedCount:
- type: integer
- title: updated_count
- format: int32
- description: |-
- How many saved queries were updated, which may be fewer than the filter
- matched.
- title: BatchUpdateSavedQueriesResponse
- additionalProperties: false
bytebase.v1.BillingInterval:
type: string
title: BillingInterval
@@ -26222,6 +26177,47 @@ components:
title: MaterializedViewMetadata
additionalProperties: false
description: MaterializedViewMetadata is the metadata for materialized views.
+ bytebase.v1.MoveMySavedQueriesRequest:
+ type: object
+ properties:
+ parent:
+ type: string
+ title: parent
+ description: 'Format: projects/{project}'
+ names:
+ type: array
+ items:
+ type: string
+ title: names
+ description: |-
+ The saved queries to move. Set this or `source_folder`, not both.
+ Format: projects/{project}/savedQueries/{savedQuery}
+ sourceFolder:
+ type: string
+ title: source_folder
+ maxLength: 256
+ description: |-
+ Move everything filed under this path, descendants included, e.g. "a/b".
+ Set this or `names`, not both.
+ targetFolder:
+ type: string
+ title: target_folder
+ maxLength: 256
+ description: Where they land. A path like "a/b/c"; empty unfiles them.
+ title: MoveMySavedQueriesRequest
+ required:
+ - parent
+ additionalProperties: false
+ bytebase.v1.MoveMySavedQueriesResponse:
+ type: object
+ properties:
+ movedCount:
+ type: integer
+ title: moved_count
+ format: int32
+ description: How many moved. Fewer than were named when some are not the caller's.
+ title: MoveMySavedQueriesResponse
+ additionalProperties: false
bytebase.v1.OAuth2AuthStyle:
type: string
title: OAuth2AuthStyle
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 351615add5..a2162db619 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -679,14 +679,14 @@
- [RoleService](#bytebase-v1-RoleService)
- [v1/saved_query_service.proto](#v1_saved_query_service-proto)
- - [BatchUpdateSavedQueriesRequest](#bytebase-v1-BatchUpdateSavedQueriesRequest)
- - [BatchUpdateSavedQueriesResponse](#bytebase-v1-BatchUpdateSavedQueriesResponse)
- [CreateSavedQueryRequest](#bytebase-v1-CreateSavedQueryRequest)
- [DeleteSavedQueryRequest](#bytebase-v1-DeleteSavedQueryRequest)
- [GetSavedQueryPolicyRequest](#bytebase-v1-GetSavedQueryPolicyRequest)
- [GetSavedQueryRequest](#bytebase-v1-GetSavedQueryRequest)
- [ListSavedQueriesRequest](#bytebase-v1-ListSavedQueriesRequest)
- [ListSavedQueriesResponse](#bytebase-v1-ListSavedQueriesResponse)
+ - [MoveMySavedQueriesRequest](#bytebase-v1-MoveMySavedQueriesRequest)
+ - [MoveMySavedQueriesResponse](#bytebase-v1-MoveMySavedQueriesResponse)
- [SavedQuery](#bytebase-v1-SavedQuery)
- [SavedQueryBinding](#bytebase-v1-SavedQueryBinding)
- [SavedQueryPolicy](#bytebase-v1-SavedQueryPolicy)
@@ -11050,41 +11050,6 @@ RoleService manages workspace roles and permissions.
-<a name="bytebase-v1-BatchUpdateSavedQueriesRequest"></a>
-
-### BatchUpdateSavedQueriesRequest
-
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| parent | [string](#string) | | Format: projects/{project} |
-| filter | [string](#string) | | Select the saved queries to update, in CEL. See https://github.com/google/cel-spec
-
-Supported fields: - name: the saved query name. Supports &#34;==&#34; and &#34;in [...]&#34;. - creator: the creator in &#34;users/{email}&#34; format. Supports &#34;==&#34; and &#34;!=&#34;. - starred: whether the caller starred it. Supports &#34;==&#34;. - folder: the exact folder path. Supports &#34;==&#34;. |
-| saved_query | [SavedQuery](#bytebase-v1-SavedQuery) | | The values to apply to every matched saved query. |
-| update_mask | [google.protobuf.FieldMask](#google-protobuf-FieldMask) | | Fields to update. Supported: `folder`. |
-
-
-
-
-
-
-<a name="bytebase-v1-BatchUpdateSavedQueriesResponse"></a>
-
-### BatchUpdateSavedQueriesResponse
-
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| updated_count | [int32](#int32) | | How many saved queries were updated, which may be fewer than the filter matched. |
-
-
-
-
-
-
<a name="bytebase-v1-CreateSavedQueryRequest"></a>
### CreateSavedQueryRequest
@@ -11184,6 +11149,39 @@ For example: creator == &#34;users/[email protected]&#34; |
+<a name="bytebase-v1-MoveMySavedQueriesRequest"></a>
+
+### MoveMySavedQueriesRequest
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| parent | [string](#string) | | Format: projects/{project} |
+| names | [string](#string) | repeated | The saved queries to move. Set this or `source_folder`, not both. Format: projects/{project}/savedQueries/{savedQuery} |
+| source_folder | [string](#string) | | Move everything filed under this path, descendants included, e.g. &#34;a/b&#34;. Set this or `names`, not both. |
+| target_folder | [string](#string) | | Where they land. A path like &#34;a/b/c&#34;; empty unfiles them. |
+
+
+
+
+
+
+<a name="bytebase-v1-MoveMySavedQueriesResponse"></a>
+
+### MoveMySavedQueriesResponse
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| moved_count | [int32](#int32) | | How many moved. Fewer than were named when some are not the caller&#39;s. |
+
+
+
+
+
+
<a name="bytebase-v1-SavedQuery"></a>
### SavedQuery
@@ -11413,8 +11411,10 @@ Caller-scoped, always: the caller&#39;s own saved queries plus those a binding s
A path is returned when at least one readable saved query sits in it — including one somebody else filed and shared, since a client seeds its folder tree from here and cannot expand into a folder it never learns about. Use the filter to split your own folders (`creator == &#34;users/me&#34;`) from the ones reaching you through a grant (`shared == true`). Permissions required: bb.savedQueries.search on the project |
| UpdateSavedQuery | [UpdateSavedQueryRequest](#bytebase-v1-UpdateSavedQueryRequest) | [SavedQuery](#bytebase-v1-SavedQuery) | Update a saved query. `title`, `content`, and `database` need write access; `folder` is creator/admin only, because filing is organization rather than editing. `database` must belong to the saved query&#39;s own project. An unreadable saved query returns NotFound; a VIEWER who cannot write gets PermissionDenied. Permissions required: creator, an EDITOR binding, or bb.savedQueries.manage |
-| UpdateSavedQueryStar | [UpdateSavedQueryStarRequest](#bytebase-v1-UpdateSavedQueryStarRequest) | [SavedQuery](#bytebase-v1-SavedQuery) | Star or unstar a saved query for the caller. A star is a per-user marker: invisible to everyone else and granting nothing. Read access is the gate only so unreadable saved queries stay unprobeable. Permissions required: creator, a VIEWER or EDITOR binding, or bb.savedQueries.manage |
-| BatchUpdateSavedQueries | [BatchUpdateSavedQueriesRequest](#bytebase-v1-BatchUpdateSavedQueriesRequest) | [BatchUpdateSavedQueriesResponse](#bytebase-v1-BatchUpdateSavedQueriesResponse) | Re-file saved queries into a folder in bulk; the update mask supports `folder` only. An EDITOR binding does not carry re-filing, so matched saved queries the caller cannot re-file are skipped rather than rejected, and the response counts what actually changed. Permissions required: creator, or bb.savedQueries.manage |
+| UpdateSavedQueryStar | [UpdateSavedQueryStarRequest](#bytebase-v1-UpdateSavedQueryStarRequest) | [SavedQuery](#bytebase-v1-SavedQuery) | Star or unstar a saved query for the caller. Stars are personal: yours are invisible to everyone else and grant nothing. You can star any saved query you created or have been granted access to; anything else answers NotFound, so names stay unprobeable. Permissions required: creator, or a VIEWER or EDITOR binding |
+| MoveMySavedQueries | [MoveMySavedQueriesRequest](#bytebase-v1-MoveMySavedQueriesRequest) | [MoveMySavedQueriesResponse](#bytebase-v1-MoveMySavedQueriesResponse) | Move the caller&#39;s own saved queries into a folder, named individually or a whole folder at a time. Moving a folder carries its descendants, so renaming &#34;a/b&#34; to &#34;a/c&#34; also moves &#34;a/b/deep&#34; -- one call, not one per path.
+
+Filing is personal organization, so only the creator&#39;s own move: a folder is that person&#39;s tree, and neither a binding nor the admin backstop reaches into it. The response counts what moved. Permissions required: creator |
| DeleteSavedQuery | [DeleteSavedQueryRequest](#bytebase-v1-DeleteSavedQueryRequest) | [.google.protobuf.Empty](#google-protobuf-Empty) | Delete a saved query and every user&#39;s stars on it. An EDITOR binding never carries deletion. An unreadable saved query returns NotFound; a grantee who can read but not delete gets PermissionDenied. Permissions required: creator, or bb.savedQueries.manage |
| GetSavedQueryPolicy | [GetSavedQueryPolicyRequest](#bytebase-v1-GetSavedQueryPolicyRequest) | [SavedQueryPolicy](#bytebase-v1-SavedQueryPolicy) | Get a saved query&#39;s sharing policy: who it is shared with, at what level.
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index 25c6f60932..c6dce8a5af 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -2760,14 +2760,6 @@
<a href="#v1%2fsaved_query_service.proto">v1/saved_query_service.proto</a>
<ul>
- <li>
- <a href="#bytebase.v1.BatchUpdateSavedQueriesRequest"><span class="badge">M</span>BatchUpdateSavedQueriesRequest</a>
- </li>
-
- <li>
- <a href="#bytebase.v1.BatchUpdateSavedQueriesResponse"><span class="badge">M</span>BatchUpdateSavedQueriesResponse</a>
- </li>
-
<li>
<a href="#bytebase.v1.CreateSavedQueryRequest"><span class="badge">M</span>CreateSavedQueryRequest</a>
</li>
@@ -2792,6 +2784,14 @@
<a href="#bytebase.v1.ListSavedQueriesResponse"><span class="badge">M</span>ListSavedQueriesResponse</a>
</li>
+ <li>
+ <a href="#bytebase.v1.MoveMySavedQueriesRequest"><span class="badge">M</span>MoveMySavedQueriesRequest</a>
+ </li>
+
+ <li>
+ <a href="#bytebase.v1.MoveMySavedQueriesResponse"><span class="badge">M</span>MoveMySavedQueriesResponse</a>
+ </li>
+
<li>
<a href="#bytebase.v1.SavedQuery"><span class="badge">M</span>SavedQuery</a>
</li>
@@ -31607,83 +31607,6 @@ Permissions required: bb.roles.delete</p></td>
<p></p>
- <h3 id="bytebase.v1.BatchUpdateSavedQueriesRequest">BatchUpdateSavedQueriesRequest</h3>
- <p></p>
-
-
- <table class="field-table">
- <thead>
- <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
- </thead>
- <tbody>
-
- <tr>
- <td>parent</td>
- <td><a href="#string">string</a></td>
- <td></td>
- <td><p>Format: projects/{project} </p></td>
- </tr>
-
- <tr>
- <td>filter</td>
- <td><a href="#string">string</a></td>
- <td></td>
- <td><p>Select the saved queries to update, in CEL. See
-https://github.com/google/cel-spec
-
-Supported fields:
-- name: the saved query name. Supports &#34;==&#34; and &#34;in [...]&#34;.
-- creator: the creator in &#34;users/{email}&#34; format. Supports &#34;==&#34; and &#34;!=&#34;.
-- starred: whether the caller starred it. Supports &#34;==&#34;.
-- folder: the exact folder path. Supports &#34;==&#34;. </p></td>
- </tr>
-
- <tr>
- <td>saved_query</td>
- <td><a href="#bytebase.v1.SavedQuery">SavedQuery</a></td>
- <td></td>
- <td><p>The values to apply to every matched saved query. </p></td>
- </tr>
-
- <tr>
- <td>update_mask</td>
- <td><a href="#google.protobuf.FieldMask">google.protobuf.FieldMask</a></td>
- <td></td>
- <td><p>Fields to update. Supported: `folder`. </p></td>
- </tr>
-
- </tbody>
- </table>
-
-
-
-
-
- <h3 id="bytebase.v1.BatchUpdateSavedQueriesResponse">BatchUpdateSavedQueriesResponse</h3>
- <p></p>
-
-
- <table class="field-table">
- <thead>
- <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
- </thead>
- <tbody>
-
- <tr>
- <td>updated_count</td>
- <td><a href="#int32">int32</a></td>
- <td></td>
- <td><p>How many saved queries were updated, which may be fewer than the filter
-matched. </p></td>
- </tr>
-
- </tbody>
- </table>
-
-
-
-
-
<h3 id="bytebase.v1.CreateSavedQueryRequest">CreateSavedQueryRequest</h3>
<p></p>
@@ -31876,6 +31799,77 @@ on the last page. </p></td>
+ <h3 id="bytebase.v1.MoveMySavedQueriesRequest">MoveMySavedQueriesRequest</h3>
+ <p></p>
+
+
+ <table class="field-table">
+ <thead>
+ <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+ </thead>
+ <tbody>
+
+ <tr>
+ <td>parent</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>Format: projects/{project} </p></td>
+ </tr>
+
+ <tr>
+ <td>names</td>
+ <td><a href="#string">string</a></td>
+ <td>repeated</td>
+ <td><p>The saved queries to move. Set this or `source_folder`, not both.
+Format: projects/{project}/savedQueries/{savedQuery} </p></td>
+ </tr>
+
+ <tr>
+ <td>source_folder</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>Move everything filed under this path, descendants included, e.g. &#34;a/b&#34;.
+Set this or `names`, not both. </p></td>
+ </tr>
+
+ <tr>
+ <td>target_folder</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>Where they land. A path like &#34;a/b/c&#34;; empty unfiles them. </p></td>
+ </tr>
+
+ </tbody>
+ </table>
+
+
+
+
+
+ <h3 id="bytebase.v1.MoveMySavedQueriesResponse">MoveMySavedQueriesResponse</h3>
+ <p></p>
+
+
+ <table class="field-table">
+ <thead>
+ <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+ </thead>
+ <tbody>
+
+ <tr>
+ <td>moved_count</td>
+ <td><a href="#int32">int32</a></td>
+ <td></td>
+ <td><p>How many moved. Fewer than were named when some are not the caller&#39;s. </p></td>
+ </tr>
+
+ </tbody>
+ </table>
+
+
+
+
+
<h3 id="bytebase.v1.SavedQuery">SavedQuery</h3>
<p></p>
@@ -32420,11 +32414,11 @@ Permissions required: bb.savedQueries.search on the project</p></td>
<td>UpdateSavedQuery</td>
<td><a href="#bytebase.v1.UpdateSavedQueryRequest">UpdateSavedQueryRequest</a></td>
<td><a href="#bytebase.v1.SavedQuery">SavedQuery</a></td>
- <td><p>Update a saved query. `title`, `content`, and `database` need write
-access; `folder` is creator/admin only, because filing is organization
-rather than editing. `database` must belong to the saved query&#39;s own
-project. An unreadable saved query returns NotFound; a VIEWER who cannot
-write gets PermissionDenied.
+ <td><p>Update a saved query. `title`, `content`, and `database` need write access;
+`folder` is creator/admin only, because filing is organization rather than
+editing. `database` must belong to the saved query&#39;s own project. An
+unreadable saved query returns NotFound; a VIEWER who cannot write gets
+PermissionDenied.
Permissions required: creator, an EDITOR binding, or bb.savedQueries.manage</p></td>
</tr>
@@ -32432,21 +32426,25 @@ Permissions required: creator, an EDITOR binding, or bb.savedQueries.manage</p><
<td>UpdateSavedQueryStar</td>
<td><a href="#bytebase.v1.UpdateSavedQueryStarRequest">UpdateSavedQueryStarRequest</a></td>
<td><a href="#bytebase.v1.SavedQuery">SavedQuery</a></td>
- <td><p>Star or unstar a saved query for the caller. A star is a per-user marker:
-invisible to everyone else and granting nothing. Read access is the gate
-only so unreadable saved queries stay unprobeable.
-Permissions required: creator, a VIEWER or EDITOR binding, or bb.savedQueries.manage</p></td>
+ <td><p>Star or unstar a saved query for the caller. Stars are personal: yours are
+invisible to everyone else and grant nothing. You can star any saved query
+you created or have been granted access to; anything else answers
+NotFound, so names stay unprobeable.
+Permissions required: creator, or a VIEWER or EDITOR binding</p></td>
</tr>
<tr>
- <td>BatchUpdateSavedQueries</td>
- <td><a href="#bytebase.v1.BatchUpdateSavedQueriesRequest">BatchUpdateSavedQueriesRequest</a></td>
- <td><a href="#bytebase.v1.BatchUpdateSavedQueriesResponse">BatchUpdateSavedQueriesResponse</a></td>
- <td><p>Re-file saved queries into a folder in bulk; the update mask supports
-`folder` only. An EDITOR binding does not carry re-filing, so matched
-saved queries the caller cannot re-file are skipped rather than rejected,
-and the response counts what actually changed.
-Permissions required: creator, or bb.savedQueries.manage</p></td>
+ <td>MoveMySavedQueries</td>
+ <td><a href="#bytebase.v1.MoveMySavedQueriesRequest">MoveMySavedQueriesRequest</a></td>
+ <td><a href="#bytebase.v1.MoveMySavedQueriesResponse">MoveMySavedQueriesResponse</a></td>
+ <td><p>Move the caller&#39;s own saved queries into a folder, named individually or a
+whole folder at a time. Moving a folder carries its descendants, so renaming &#34;a/b&#34; to
+&#34;a/c&#34; also moves &#34;a/b/deep&#34; -- one call, not one per path.
+
+Filing is personal organization, so only the creator&#39;s own move: a folder
+is that person&#39;s tree, and neither a binding nor the admin backstop
+reaches into it. The response counts what moved.
+Permissions required: creator</p></td>
</tr>
<tr>
@@ -32572,9 +32570,9 @@ Permissions required: creator, or bb.savedQueries.manage</p></td>
<tr>
- <td>BatchUpdateSavedQueries</td>
+ <td>MoveMySavedQueries</td>
<td>POST</td>
- <td>/v1/{parent=projects/*}/savedQueries:batchUpdate</td>
+ <td>/v1/{parent=projects/*}/savedQueries:moveMy</td>
<td>*</td>
</tr>
diff --git a/proto/v1/v1/saved_query_service.proto b/proto/v1/v1/saved_query_service.proto
index a9501163c7..69cbec27ec 100644
--- a/proto/v1/v1/saved_query_service.proto
+++ b/proto/v1/v1/saved_query_service.proto
@@ -99,11 +99,11 @@ service SavedQueryService {
option (bytebase.v1.auth_method) = CUSTOM;
}
- // Update a saved query. `title`, `content`, and `database` need write
- // access; `folder` is creator/admin only, because filing is organization
- // rather than editing. `database` must belong to the saved query's own
- // project. An unreadable saved query returns NotFound; a VIEWER who cannot
- // write gets PermissionDenied.
+ // Update a saved query. `title`, `content`, and `database` need write access;
+ // `folder` is creator/admin only, because filing is organization rather than
+ // editing. `database` must belong to the saved query's own project. An
+ // unreadable saved query returns NotFound; a VIEWER who cannot write gets
+ // PermissionDenied.
// Permissions required: creator, an EDITOR binding, or bb.savedQueries.manage
rpc UpdateSavedQuery(UpdateSavedQueryRequest) returns (SavedQuery) {
option (google.api.http) = {
@@ -115,10 +115,11 @@ service SavedQueryService {
option (bytebase.v1.audit) = true;
}
- // Star or unstar a saved query for the caller. A star is a per-user marker:
- // invisible to everyone else and granting nothing. Read access is the gate
- // only so unreadable saved queries stay unprobeable.
- // Permissions required: creator, a VIEWER or EDITOR binding, or bb.savedQueries.manage
+ // Star or unstar a saved query for the caller. Stars are personal: yours are
+ // invisible to everyone else and grant nothing. You can star any saved query
+ // you created or have been granted access to; anything else answers
+ // NotFound, so names stay unprobeable.
+ // Permissions required: creator, or a VIEWER or EDITOR binding
rpc UpdateSavedQueryStar(UpdateSavedQueryStarRequest) returns (SavedQuery) {
option (google.api.http) = {
post: "/v1/{name=projects/*/savedQueries/*}:updateStar"
@@ -128,17 +129,20 @@ service SavedQueryService {
option (bytebase.v1.auth_method) = CUSTOM;
}
- // Re-file saved queries into a folder in bulk; the update mask supports
- // `folder` only. An EDITOR binding does not carry re-filing, so matched
- // saved queries the caller cannot re-file are skipped rather than rejected,
- // and the response counts what actually changed.
- // Permissions required: creator, or bb.savedQueries.manage
- rpc BatchUpdateSavedQueries(BatchUpdateSavedQueriesRequest) returns (BatchUpdateSavedQueriesResponse) {
+ // Move the caller's own saved queries into a folder, named individually or a
+ // whole folder at a time. Moving a folder carries its descendants, so renaming "a/b" to
+ // "a/c" also moves "a/b/deep" -- one call, not one per path.
+ //
+ // Filing is personal organization, so only the creator's own move: a folder
+ // is that person's tree, and neither a binding nor the admin backstop
+ // reaches into it. The response counts what moved.
+ // Permissions required: creator
+ rpc MoveMySavedQueries(MoveMySavedQueriesRequest) returns (MoveMySavedQueriesResponse) {
option (google.api.http) = {
- post: "/v1/{parent=projects/*}/savedQueries:batchUpdate"
+ post: "/v1/{parent=projects/*}/savedQueries:moveMy"
body: "*"
};
- option (google.api.method_signature) = "parent,saved_query,update_mask";
+ option (google.api.method_signature) = "parent,target_folder";
option (bytebase.v1.auth_method) = CUSTOM;
option (bytebase.v1.audit) = true;
}
@@ -271,34 +275,28 @@ message UpdateSavedQueryStarRequest {
bool starred = 2;
}
-message BatchUpdateSavedQueriesRequest {
+message MoveMySavedQueriesRequest {
// Format: projects/{project}
string parent = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {type: "bytebase.com/Project"}
];
- // Select the saved queries to update, in CEL. See
- // https://github.com/google/cel-spec
- //
- // Supported fields:
- // - name: the saved query name. Supports "==" and "in [...]".
- // - creator: the creator in "users/{email}" format. Supports "==" and "!=".
- // - starred: whether the caller starred it. Supports "==".
- // - folder: the exact folder path. Supports "==".
- string filter = 2;
+ // The saved queries to move. Set this or `source_folder`, not both.
+ // Format: projects/{project}/savedQueries/{savedQuery}
+ repeated string names = 2;
- // The values to apply to every matched saved query.
- SavedQuery saved_query = 3 [(google.api.field_behavior) = REQUIRED];
+ // Move everything filed under this path, descendants included, e.g. "a/b".
+ // Set this or `names`, not both.
+ string source_folder = 3 [(buf.validate.field).string.max_len = 256];
- // Fields to update. Supported: `folder`.
- google.protobuf.FieldMask update_mask = 4 [(google.api.field_behavior) = REQUIRED];
+ // Where they land. A path like "a/b/c"; empty unfiles them.
+ string target_folder = 4 [(buf.validate.field).string.max_len = 256];
}
-message BatchUpdateSavedQueriesResponse {
- // How many saved queries were updated, which may be fewer than the filter
- // matched.
- int32 updated_count = 1;
+message MoveMySavedQueriesResponse {
+ // How many moved. Fewer than were named when some are not the caller's.
+ int32 moved_count = 1;
}
message GetSavedQueryPolicyRequest {