Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
feat!: add saved query permissions, folders, and stars (#21169)
Danny Xu7f7610480a47
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yamlindex ec620b7c7c..a7e99ae10b 100644--- a/backend/api/mcp/gen/openapi.yaml+++ b/backend/api/mcp/gen/openapi.yaml@@ -5769,16 +5769,17 @@ paths:schema:$ref: '#/components/schemas/bytebase.v1.SearchQueryHistoriesResponse'deprecated: true- /bytebase.v1.SavedQueryService/BatchUpdateSavedQueryOrganizer:+ /bytebase.v1.SavedQueryService/BatchUpdateSavedQueries:post:tags:- bytebase.v1.SavedQueryService- summary: BatchUpdateSavedQueryOrganizer+ summary: BatchUpdateSavedQueriesdescription: |-- Batch update the organizers of saved queries.- The access is the same as UpdateSavedQuery method.- Permissions required: creator, or workspace bb.worksheets.manage- operationId: bytebase.v1.SavedQueryService.BatchUpdateSavedQueryOrganizer+ Batch re-file saved queries into a folder. The update mask supports+ `folder` only; only rows the caller may re-file are updated (their own,+ or any in scope for admins).+ Permissions required: creator, or bb.savedQueries.manage in scope+ operationId: bytebase.v1.SavedQueryService.BatchUpdateSavedQueriesparameters:- name: Connect-Protocol-Versionin: header@@ -5793,7 +5794,7 @@ paths:content:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.BatchUpdateSavedQueryOrganizerRequest'+ $ref: '#/components/schemas/bytebase.v1.BatchUpdateSavedQueriesRequest'required: trueresponses:default:@@ -5807,15 +5808,16 @@ paths:content:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.BatchUpdateSavedQueryOrganizerResponse'+ $ref: '#/components/schemas/bytebase.v1.BatchUpdateSavedQueriesResponse'/bytebase.v1.SavedQueryService/CreateSavedQuery:post:tags:- bytebase.v1.SavedQueryServicesummary: CreateSavedQuerydescription: |-- Creates a personal saved query used in SQL Editor. Any authenticated user can create their own saved queries.- Permissions required: None (authenticated users only)+ Creates a personal saved query used in SQL Editor. The creator becomes+ the fixed owner.+ Permissions required: bb.savedQueries.create on the parent projectoperationId: bytebase.v1.SavedQueryService.CreateSavedQueryparameters:- name: Connect-Protocol-Version@@ -5852,9 +5854,9 @@ paths:- bytebase.v1.SavedQueryServicesummary: DeleteSavedQuerydescription: |-- Delete a saved query.- The access is the same as UpdateSavedQuery method.- Permissions required: creator, or workspace bb.worksheets.manage+ Delete a saved query. Only the creator (or an admin) can delete.+ Returns NotFound for saved queries the caller cannot read.+ Permissions required: creator, or bb.savedQueries.manage in scopeoperationId: bytebase.v1.SavedQueryService.DeleteSavedQueryparameters:- name: Connect-Protocol-Version@@ -5891,10 +5893,9 @@ paths:- bytebase.v1.SavedQueryServicesummary: GetSavedQuerydescription: |-- Get a saved query by name.- Saved queries are private: only the creator, or a caller holding- bb.worksheets.manage on the workspace, can access one.- Permissions required: creator, or workspace bb.worksheets.manage+ Get a saved query by name. Returns NotFound for saved queries the+ caller cannot read.+ Permissions required: creator, or bb.savedQueries.manage in scopeoperationId: bytebase.v1.SavedQueryService.GetSavedQueryparameters:- name: Connect-Protocol-Version@@ -5931,9 +5932,11 @@ paths:- bytebase.v1.SavedQueryServicesummary: ListSavedQueriesdescription: |-- List saved queries.- This is used for listing saved queries in a project, or across all projects by using `projects/-`.- Permissions required: bb.worksheets.list+ List saved queries: the grant-independent governance surface. Supports+ listing in a project, or across all projects by using `projects/-`, with+ whole statements rather than the previews Search returns — e.g. an+ offboarding review filtering by creator.+ Permissions required: bb.savedQueries.listoperationId: bytebase.v1.SavedQueryService.ListSavedQueriesparameters:- name: Connect-Protocol-Version@@ -5964,15 +5967,16 @@ paths:application/json:schema:$ref: '#/components/schemas/bytebase.v1.ListSavedQueriesResponse'- /bytebase.v1.SavedQueryService/ListSavedQueryFolders:+ /bytebase.v1.SavedQueryService/SearchSavedQueries:post:tags:- bytebase.v1.SavedQueryService- summary: ListSavedQueryFolders+ summary: SearchSavedQueriesdescription: |-- List the caller's saved query folders.- Only folders stored in the caller's saved query organizer are returned.- operationId: bytebase.v1.SavedQueryService.ListSavedQueryFolders+ Search for saved queries in a project: the SQL Editor's hot list path,+ returning only rows the caller can read, with content previews.+ Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the project+ operationId: bytebase.v1.SavedQueryService.SearchSavedQueriesparameters:- name: Connect-Protocol-Versionin: header@@ -5987,7 +5991,7 @@ paths:content:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.ListSavedQueryFoldersRequest'+ $ref: '#/components/schemas/bytebase.v1.SearchSavedQueriesRequest'required: trueresponses:default:@@ -6001,18 +6005,20 @@ paths:content:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.ListSavedQueryFoldersResponse'- /bytebase.v1.SavedQueryService/SearchSavedQueries:+ $ref: '#/components/schemas/bytebase.v1.SearchSavedQueriesResponse'+ /bytebase.v1.SavedQueryService/SearchSavedQueryFolders:post:tags:- bytebase.v1.SavedQueryService- summary: SearchSavedQueries+ summary: SearchSavedQueryFoldersdescription: |-- Search for saved queries.- This is used for finding my saved queries in a project.- The saved query accessibility is the same as GetSavedQuery().- Permissions required: creator, or workspace bb.worksheets.manage- operationId: bytebase.v1.SavedQueryService.SearchSavedQueries+ Search the folder paths of the caller's saved queries in a project.+ Folders are a derived view over the `folder` field rather than a+ resource collection, so this is a custom method on savedQueries and+ shares SearchSavedQueries' caller-scoped semantics — not the+ cross-creator reach of ListSavedQueries.+ Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the project+ operationId: bytebase.v1.SavedQueryService.SearchSavedQueryFoldersparameters:- name: Connect-Protocol-Versionin: header@@ -6027,7 +6033,7 @@ paths:content:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.SearchSavedQueriesRequest'+ $ref: '#/components/schemas/bytebase.v1.SearchSavedQueryFoldersRequest'required: trueresponses:default:@@ -6041,16 +6047,17 @@ paths:content:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.SearchSavedQueriesResponse'+ $ref: '#/components/schemas/bytebase.v1.SearchSavedQueryFoldersResponse'/bytebase.v1.SavedQueryService/UpdateSavedQuery:post:tags:- bytebase.v1.SavedQueryServicesummary: UpdateSavedQuerydescription: |-- Update a saved query.- The access is the same as GetSavedQuery method.- Permissions required: creator, or workspace bb.worksheets.manage+ Update a saved query. `title`, `content`, and `database` require write+ access; `folder` re-files the saved query and is creator/admin only.+ Returns NotFound for saved queries the caller cannot read.+ Permissions required: creator, or bb.savedQueries.manage in scopeoperationId: bytebase.v1.SavedQueryService.UpdateSavedQueryparameters:- name: Connect-Protocol-Version@@ -6081,16 +6088,19 @@ paths:application/json:schema:$ref: '#/components/schemas/bytebase.v1.SavedQuery'- /bytebase.v1.SavedQueryService/UpdateSavedQueryOrganizer:+ /bytebase.v1.SavedQueryService/UpdateSavedQueryStar:post:tags:- bytebase.v1.SavedQueryService- summary: UpdateSavedQueryOrganizer+ summary: UpdateSavedQueryStardescription: |-- Update the organizer of a saved query.- The access is the same as UpdateSavedQuery method.- Permissions required: creator, or workspace bb.worksheets.manage- operationId: bytebase.v1.SavedQueryService.UpdateSavedQueryOrganizer+ Star or unstar a saved query for the caller. A star is always the+ caller's own per-user marker — invisible to others and carrying no+ access. The only requirement is that the caller can read the saved+ query being starred (which also keeps private saved query names+ unprobeable).+ Permissions required: read access to the saved query+ operationId: bytebase.v1.SavedQueryService.UpdateSavedQueryStarparameters:- name: Connect-Protocol-Versionin: header@@ -6105,7 +6115,7 @@ paths:content:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.UpdateSavedQueryOrganizerRequest'+ $ref: '#/components/schemas/bytebase.v1.UpdateSavedQueryStarRequest'required: trueresponses:default:@@ -6119,7 +6129,7 @@ paths:content:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.SavedQueryOrganizer'+ $ref: '#/components/schemas/bytebase.v1.SavedQuery'/bytebase.v1.ServiceAccountService/CreateServiceAccount:post:tags:@@ -9281,14 +9291,14 @@ components:type: objecttitle: BatchUpdateIssuesStatusResponseadditionalProperties: false- bytebase.v1.BatchUpdateSavedQueryOrganizerRequest:+ bytebase.v1.BatchUpdateSavedQueriesRequest:type: objectproperties:parent:type: stringtitle: parentdescription: |-- The parent resource whose saved queries' organizers are updated.+ The parent resource whose saved queries are updated.Format: projects/{project}filter:type: string@@ -9301,35 +9311,29 @@ components:- name: the saved query name in "projects/{project}/savedQueries/{savedQuery}" format, support "==" and "in [xx]" operator.- creator: the saved query creator in "users/{email}" format, support "==" and "!=" operator.- starred: should be "true" or "false", filter starred/unstarred saved queries, support "==" operator.- - folder: the saved query organizer folder path, support exact "==" operator.- organizer:- title: organizer- description: The organizer fields to update.- $ref: '#/components/schemas/bytebase.v1.SavedQueryOrganizer'+ - folder: the saved query folder path, support exact "==" operator.+ savedQuery:+ title: saved_query+ description: The fields to apply to every matched saved query.+ $ref: '#/components/schemas/bytebase.v1.SavedQuery'updateMask:title: update_maskdescription: |-The list of fields to be updated.- Fields are specified relative to the saved query organizer.Only support update the following fields for now:- - `starred`- - `folders`+ - `folder`$ref: '#/components/schemas/google.protobuf.FieldMask'- title: BatchUpdateSavedQueryOrganizerRequest+ title: BatchUpdateSavedQueriesRequestadditionalProperties: false- bytebase.v1.BatchUpdateSavedQueryOrganizerResponse:+ bytebase.v1.BatchUpdateSavedQueriesResponse:type: objectproperties:- savedQueryOrganizers:- type: array- items:- $ref: '#/components/schemas/bytebase.v1.SavedQueryOrganizer'- title: saved_query_organizersupdatedCount:type: integertitle: updated_countformat: int32- title: BatchUpdateSavedQueryOrganizerResponse+ description: The number of saved queries updated.+ title: BatchUpdateSavedQueriesResponseadditionalProperties: falsebytebase.v1.BillingInterval:type: string@@ -14520,28 +14524,6 @@ components:`ListSavedQueries` method to retrieve the next page of saved queries.title: ListSavedQueriesResponseadditionalProperties: false- bytebase.v1.ListSavedQueryFoldersRequest:- type: object- properties:- parent:- type: string- title: parent- description: |-- The parent resource of the saved query folders.- Format: projects/{project}- title: ListSavedQueryFoldersRequest- additionalProperties: false- bytebase.v1.ListSavedQueryFoldersResponse:- type: object- properties:- folders:- type: array- items:- $ref: '#/components/schemas/bytebase.v1.SavedQueryFolder'- title: folders- description: The caller's saved query folders.- title: ListSavedQueryFoldersResponse- additionalProperties: falsebytebase.v1.ListServiceAccountsRequest:type: objectproperties:@@ -17729,7 +17711,8 @@ components:type: stringtitle: creatordescription: |-- The creator of the SavedQuery.+ The creator of the SavedQuery — the fixed owner; ownership does not+ transfer.Format: users/{email}createTime:title: create_time@@ -17758,54 +17741,15 @@ components:type: booleantitle: starreddescription: starred indicates whether the saved query is starred by the current authenticated user.- folders:- type: array- items:- type: string- title: folders- title: SavedQuery- additionalProperties: false- bytebase.v1.SavedQueryFolder:- type: object- properties:- folders:- type: array- items:- type: string- title: folders- description: The folder path segments.- category:- title: category- description: The folder category.- $ref: '#/components/schemas/bytebase.v1.SavedQueryFolder.Category'- title: SavedQueryFolder- additionalProperties: false- bytebase.v1.SavedQueryFolder.Category:- type: string- title: Category- enum:- - CATEGORY_UNSPECIFIED- - MINE- - SHARED- bytebase.v1.SavedQueryOrganizer:- type: object- properties:- savedQuery:+ folder:type: string- title: saved_query+ title: folder+ maxLength: 256description: |-- The name of the saved query.- Format: projects/{project}/savedQueries/{savedQuery}- starred:- type: boolean- title: starred- description: starred means if the saved query is starred.- folders:- type: array- items:- type: string- title: folders- title: SavedQueryOrganizer+ The folder path this saved query lives in, set by its creator (or an+ admin). Empty means unfiled. A saved query lives in exactly one folder;+ a folder is a path on saved queries, e.g. "a/b/c".+ title: SavedQueryadditionalProperties: falsebytebase.v1.SchemaCatalog:type: object@@ -18291,7 +18235,7 @@ components:- title: the saved query title, support "contains" operator.- creator: the saved query creator in "users/{email}" format, support "==" and "!=" operator.- starred: should be "true" or "false", filter starred/unstarred saved queries, support "==" operator.- - folder: the saved query organizer folder path, support "==" operator.+ - folder: the saved query folder path, support "==" operator.For example:creator == "users/{email}"@@ -18335,6 +18279,44 @@ components:`SearchSavedQueries` method to retrieve the next page of saved queries.title: SearchSavedQueriesResponseadditionalProperties: false+ bytebase.v1.SearchSavedQueryFoldersRequest:+ type: object+ properties:+ parent:+ type: string+ title: parent+ description: |-+ The parent resource whose saved query folders are searched.+ Format: projects/{project}+ filter:+ type: string+ title: filter+ description: |-+ To filter the folders by the saved queries they hold. Takes the same+ fields and syntax as `SearchSavedQueries.filter`, except `title`. A+ folder is returned when at least one saved query the caller can read+ matches, so the caller-scoping is the same as SearchSavedQueries: your+ own saved queries, plus everyone's for the admin backstop.++ For example, to split a folder tree into your own and everyone else's:+ creator == "users/{email}"+ creator != "users/{email}"+ title: SearchSavedQueryFoldersRequest+ additionalProperties: false+ bytebase.v1.SearchSavedQueryFoldersResponse:+ type: object+ properties:+ folders:+ type: array+ items:+ type: string+ title: folders+ description: |-+ The caller's folder paths, including every ancestor prefix, sorted.+ A folder is a path on saved queries ("a/b/c"), so empty folders cannot+ exist.+ title: SearchSavedQueryFoldersResponse+ additionalProperties: falsebytebase.v1.SemanticTypeSetting:type: objectproperties:@@ -20646,33 +20628,6 @@ components:In this situation, `update_mask` is ignored.title: UpdateRoleRequestadditionalProperties: false- bytebase.v1.UpdateSavedQueryOrganizerRequest:- type: object- properties:- organizer:- title: organizer- description: |-- The organizer to update.-- The organizer's `saved_query` field is used to identify the saved query.- Format: projects/{project}/savedQueries/{savedQuery}- $ref: '#/components/schemas/bytebase.v1.SavedQueryOrganizer'- updateMask:- title: update_mask- description: |-- The list of fields to be updated.- Fields are specified relative to the saved query organizer.- Only support update the following fields for now:- - `starred`- $ref: '#/components/schemas/google.protobuf.FieldMask'- allowMissing:- type: boolean- title: allow_missing- description: |-- If set to true, and the saved query organizer is not found, a new saved query organizer will be created.- In this situation, `update_mask` is ignored.- title: UpdateSavedQueryOrganizerRequest- additionalProperties: falsebytebase.v1.UpdateSavedQueryRequest:type: objectproperties:@@ -20694,9 +20649,25 @@ components:- `title`- `content`- `database`+ - `folder`$ref: '#/components/schemas/google.protobuf.FieldMask'title: UpdateSavedQueryRequestadditionalProperties: false+ bytebase.v1.UpdateSavedQueryStarRequest:+ type: object+ properties:+ name:+ type: string+ title: name+ description: |-+ The name of the saved query to star or unstar.+ Format: projects/{project}/savedQueries/{savedQuery}+ starred:+ type: boolean+ title: starred+ description: Whether the caller stars the saved query.+ title: UpdateSavedQueryStarRequest+ additionalProperties: falsebytebase.v1.UpdateServiceAccountRequest:type: objectproperties:@@ -22733,8 +22704,12 @@ tags:- name: bytebase.v1.SavedQueryServicedescription: |-SavedQueryService manages saved queries for SQL Editor query development.- Permission IDs still use the legacy `bb.worksheets.*` names; they are- renamed together with the access-model redesign and its role migration.++ A saved query is private to its creator; `bb.savedQueries.manage` is the+ admin backstop that can reach any saved query in scope. Per-object+ VIEWER/EDITOR grants arrive with the access-model redesign, which brings+ its own policy shapes and the GetIamPolicy/SetIamPolicy pair that manages+ them.- name: bytebase.v1.ServiceAccountServicedescription: ServiceAccountService manages service accounts for API integrations.- name: bytebase.v1.SheetServicediff --git a/backend/api/v1/acl_test.go b/backend/api/v1/acl_test.goindex 6efe58b180..882c914d2f 100644--- a/backend/api/v1/acl_test.go+++ b/backend/api/v1/acl_test.go@@ -487,6 +487,27 @@ func TestGetResourceFromRequest(t *testing.T) {method: "/bytebase.v1.PlanService/CancelPlanCheckRun",want: []string{"projects/hello/plans/world/planCheckRun"},},+ {+ // The search parents resolve, so a project that does not exist is+ // answered here rather than by the permission check, which reports+ // a missing project as a plain error.+ request: &v1pb.SearchSavedQueriesRequest{Parent: "projects/hello"},+ method: "/bytebase.v1.SavedQueryService/SearchSavedQueries",+ want: []string{"projects/hello"},+ },+ {+ request: &v1pb.SearchSavedQueryFoldersRequest{Parent: "projects/hello"},+ method: "/bytebase.v1.SavedQueryService/SearchSavedQueryFolders",+ want: []string{"projects/hello"},+ },+ {+ // The wildcard stays a handler-level InvalidArgument: resolution+ // falls back to the workspace instead of hunting for a project+ // named "-".+ request: &v1pb.SearchSavedQueriesRequest{Parent: "projects/-"},+ method: "/bytebase.v1.SavedQueryService/SearchSavedQueries",+ want: []string{"projects/-"},+ },}for _, tt := range tests {diff --git a/backend/api/v1/saved_query_service.go b/backend/api/v1/saved_query_service.goindex 701343c09e..6ca0c0b250 100644--- a/backend/api/v1/saved_query_service.go+++ b/backend/api/v1/saved_query_service.go@@ -35,7 +35,9 @@ func NewSavedQueryService(store *store.Store, iamManager *iam.Manager) *SavedQue}}-// CreateSavedQuery creates a new saved query.+// CreateSavedQuery creates a new saved query. The bb.savedQueries.create+// permission is enforced at the interceptor; the store's insert transaction+// fences against a concurrent project purge (active project required).func (s *SavedQueryService) CreateSavedQuery(ctx context.Context,req *connect.Request[v1pb.CreateSavedQueryRequest],@@ -53,18 +55,27 @@ func (s *SavedQueryService) CreateSavedQuery(if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}++ // Resource resolution returns archived projects (GetProject reports a+ // project regardless of its deleted state), so this is what rejects a+ // create into one. The store's fence covers the window after it.project, err := s.store.GetProject(ctx, &store.FindProjectMessage{Workspace: common.GetWorkspaceIDFromContext(ctx),ResourceID: &projectResourceID,})if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get project with resource id %q, err: %v", projectResourceID, err))+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get project %q", projectResourceID))}- if project == nil {- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project with resource id %q not found", projectResourceID))+ if project == nil || project.Deleted {+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %q not found", projectResourceID))}- if project.Deleted {- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project with resource id %q had deleted", projectResourceID))++ // The interceptor already checked bb.savedQueries.create, but it evaluates+ // conditions with request.time only and passes the rest, so a grant scoped+ // to a slice of databases would satisfy it. A saved query is a project-wide+ // row; re-check the source here and reject those bindings.+ if err := s.checkProjectWide(ctx, user, permission.SavedQueriesCreate, projectResourceID); err != nil {+ return nil, err}database := ""@@ -74,13 +85,19 @@ func (s *SavedQueryService) CreateSavedQuery(return nil, err}}- storeSavedQueryCreate := convertToStoreSavedQueryMessage(project, database, user.Email, request.SavedQuery)- savedQuery, err := s.store.CreateSavedQuery(ctx, storeSavedQueryCreate)+ folder, err := store.NormalizeSavedQueryFolder(request.SavedQuery.Folder)+ if err != nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, err)+ }+ savedQuery, err := s.store.CreateSavedQuery(ctx, convertToStoreSavedQueryMessage(projectResourceID, database, user.Email, folder, request.SavedQuery))if err != nil {+ if common.ErrorCode(err) == common.NotFound {+ // The fence lost to an archive or purge racing this create.+ return nil, connect.NewError(connect.CodeNotFound, errors.Wrapf(err, "project %q not found", projectResourceID))+ }return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create saved query: %v", err))}- v1pbSavedQuery := convertToAPISavedQuery(savedQuery)- return connect.NewResponse(v1pbSavedQuery), nil+ return connect.NewResponse(convertToAPISavedQuery(savedQuery)), nil}// GetSavedQuery returns the requested saved query, cutoff the content if the content is too long and the `raw` flag in request is false.@@ -103,7 +120,9 @@ func (s *SavedQueryService) GetSavedQuery(return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check access with error: %v", err))}if !ok {- return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("cannot access saved query %s", savedQuery.Title))+ // Same answer as a name that does not exist: a saved query the caller+ // cannot read must not be probeable, by existence or by title.+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("cannot find the saved query"))}v1pbSavedQuery := convertToAPISavedQuery(savedQuery)@@ -135,6 +154,12 @@ func (s *SavedQueryService) ListSavedQueries(return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))}+ // Same source re-check as CreateSavedQuery: bb.savedQueries.list reads+ // everyone's content, which a database-scoped grant must not confer.+ if err := s.checkProjectWide(ctx, user, permission.SavedQueriesList, projectIDs...); err != nil {+ return nil, err+ }+offset, err := parseLimitAndOffset(&pageSize{token: request.PageToken,limit: int(request.PageSize),@@ -157,6 +182,11 @@ func (s *SavedQueryService) ListSavedQueries(FilterQ: filterQ,Limit: &limitPlusOne,Offset: &offset.offset,+ // Governance reads are whole-statement reads. Search previews and+ // offers GetSavedQuery for the rest, but a caller holding only+ // bb.savedQueries.list cannot Get another creator's row, so a+ // truncated statement here would have no way back to the full one.+ LoadFull: true,})if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to list saved queries: %v", err))@@ -181,71 +211,69 @@ func (s *SavedQueryService) ListSavedQueries(}), nil}-// ListSavedQueryFolders returns the caller's saved query folders.-func (s *SavedQueryService) ListSavedQueryFolders(+// SearchSavedQueryFolders returns the caller's saved query folder paths in a+// project, including every ancestor prefix.+func (s *SavedQueryService) SearchSavedQueryFolders(ctx context.Context,- req *connect.Request[v1pb.ListSavedQueryFoldersRequest],-) (*connect.Response[v1pb.ListSavedQueryFoldersResponse], error) {+ req *connect.Request[v1pb.SearchSavedQueryFoldersRequest],+) (*connect.Response[v1pb.SearchSavedQueryFoldersResponse], error) {request := req.MsgprojectID, err := common.GetProjectID(request.Parent)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}if projectID == "-" {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.New(`ListSavedQueryFolders does not support parent "projects/-"`))+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.New(`SearchSavedQueryFolders does not support parent "projects/-"`))}user, ok := GetUserFromContext(ctx)if !ok {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))}-- find := &store.FindSavedQueryMessage{- ProjectIDs: []string{projectID},- PrincipalEmail: user.Email,+ if err := s.checkDiscoverSavedQueries(ctx, user, projectID); err != nil {+ return nil, err}- organizerList, err := s.store.ListSavedQueryOrganizers(ctx, find)++ filterQ, err := store.GetSearchSavedQueryFilter(ctx, s.store, user.Email, request.Filter, false /* allowTitleContains */)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to list saved query folders: %v", err))+ return nil, connect.NewError(connect.CodeInvalidArgument, err)}- type savedQueryFolder struct {- folders []string- category v1pb.SavedQueryFolder_Category+ // Folders are derived from rows, so they inherit the rows' read rule.+ // Without the admin backstop the caller only ever sees folders holding+ // their own saved queries, whatever the filter asks for.+ canManage, err := s.iamManager.CheckProjectWidePermission(ctx, permission.SavedQueriesManage, user, common.GetWorkspaceIDFromContext(ctx), projectID)+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))}- folderByKey := make(map[string]savedQueryFolder)- for _, organizer := range organizerList {- var category v1pb.SavedQueryFolder_Category- if organizer.SavedQueryCreator == user.Email {- category = v1pb.SavedQueryFolder_MINE- } else {- category = v1pb.SavedQueryFolder_SHARED- }- for i := range organizer.Payload.Folders {- folders := append([]string(nil), organizer.Payload.Folders[:i+1]...)- key := fmt.Sprintf("%d\x00%s", category, strings.Join(folders, "\x00"))- folderByKey[key] = savedQueryFolder{- folders: folders,- category: category,- }- }+ creator := &user.Email+ if canManage {+ creator = nil}- keys := make([]string, 0, len(folderByKey))- for key := range folderByKey {- keys = append(keys, key)+ paths, err := s.store.ListSavedQueryFolderPaths(ctx, projectID, creator, filterQ)+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to search saved query folders: %v", err))}- slices.Sort(keys)- response := &v1pb.ListSavedQueryFoldersResponse{- Folders: make([]*v1pb.SavedQueryFolder, 0, len(keys)),++ // Expand every ancestor prefix so the tree can render intermediate+ // folders that only exist through their children.+ prefixSet := make(map[string]bool)+ for _, path := range paths {+ segments := strings.Split(path, "/")+ for i := range segments {+ prefixSet[strings.Join(segments[:i+1], "/")] = true+ }}- for _, key := range keys {- response.Folders = append(response.Folders, &v1pb.SavedQueryFolder{- Folders: folderByKey[key].folders,- Category: folderByKey[key].category,- })+ folders := make([]string, 0, len(prefixSet))+ for folder := range prefixSet {+ folders = append(folders, folder)}- return connect.NewResponse(response), nil+ slices.Sort(folders)++ return connect.NewResponse(&v1pb.SearchSavedQueryFoldersResponse{+ Folders: folders,+ }), nil}// SearchSavedQueries returns a list of saved queries based on the search filters.@@ -266,6 +294,9 @@ func (s *SavedQueryService) SearchSavedQueries(if projectID == "-" {return nil, connect.NewError(connect.CodeInvalidArgument, errors.New(`SearchSavedQueries does not support parent "projects/-"`))}+ if err := s.checkDiscoverSavedQueries(ctx, user, projectID); err != nil {+ return nil, err+ }if request.PageSize < 0 {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("page size cannot be negative"))}@@ -358,7 +389,11 @@ func (s *SavedQueryService) UpdateSavedQuery(return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check access with error: %v", err))}if !ok {- return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("cannot write saved query %s", savedQuery.Title))+ // Write access and read access are one predicate today, so failing it+ // means the caller cannot see this row either -- answer as if it were+ // missing. Once per-object grants land, a VIEWER who cannot write gets+ // PermissionDenied here, because they can already see the row.+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("cannot find the saved query"))}savedQueryPatch := &store.PatchSavedQueryMessage{@@ -371,6 +406,12 @@ func (s *SavedQueryService) UpdateSavedQuery(case "content":statement := string(request.SavedQuery.Content)savedQueryPatch.Statement = &statement+ case "folder":+ folder, err := store.NormalizeSavedQueryFolder(request.SavedQuery.Folder)+ if err != nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, err)+ }+ savedQueryPatch.Folder = &foldercase "database":switch request.SavedQuery.Database {case savedQuery.Database:@@ -431,7 +472,11 @@ func (s *SavedQueryService) DeleteSavedQuery(return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check access with error: %v", err))}if !ok {- return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("cannot write saved query %s", savedQuery.Title))+ // Write access and read access are one predicate today, so failing it+ // means the caller cannot see this row either -- answer as if it were+ // missing. Once per-object grants land, a VIEWER who cannot write gets+ // PermissionDenied here, because they can already see the row.+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("cannot find the saved query"))}if err := s.store.DeleteSavedQuery(ctx, savedQuery.ResourceID); err != nil {@@ -441,13 +486,15 @@ func (s *SavedQueryService) DeleteSavedQuery(return connect.NewResponse(&emptypb.Empty{}), nil}-// UpdateSavedQueryOrganizer upsert the saved query organizer.-func (s *SavedQueryService) UpdateSavedQueryOrganizer(+// 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.+func (s *SavedQueryService) UpdateSavedQueryStar(ctx context.Context,- req *connect.Request[v1pb.UpdateSavedQueryOrganizerRequest],-) (*connect.Response[v1pb.SavedQueryOrganizer], error) {+ req *connect.Request[v1pb.UpdateSavedQueryStarRequest],+) (*connect.Response[v1pb.SavedQuery], error) {request := req.Msg- projectID, savedQueryID, err := common.GetProjectIDSavedQueryID(request.Organizer.SavedQuery)+ projectID, savedQueryID, err := common.GetProjectIDSavedQueryID(request.Name)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}@@ -456,60 +503,56 @@ func (s *SavedQueryService) UpdateSavedQueryOrganizer(if err != nil {return nil, err}-ok, err := s.canReadSavedQuery(ctx, savedQuery)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check access with error: %v", err))}if !ok {- return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("cannot access saved query %s", savedQuery.Title))+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("cannot find the saved query"))}user, ok := GetUserFromContext(ctx)if !ok {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))}- savedQueryOrganizerUpsert, err := s.store.GetSavedQueryOrganizer(ctx, savedQuery.ResourceID, user.Email)+ applied, err := s.store.SetSavedQueryStar(ctx, savedQuery.ResourceID, user.Email, request.Starred)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to found saved query organizer with error: %v", err))+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to update star: %v", err))}-- for _, path := range request.UpdateMask.Paths {- switch path {- case "starred":- savedQueryOrganizerUpsert.Payload.Starred = request.Organizer.Starred- case "folders":- savedQueryOrganizerUpsert.Payload.Folders = request.Organizer.Folders- default:- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid update mask path %q", path))- }- }-- organizer, err := s.store.UpsertSavedQueryOrganizer(ctx, savedQueryOrganizerUpsert)- if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to upsert organizer for saved query %s with error: %v", request.Organizer.SavedQuery, err))+ if !applied {+ // Deleted between the read above and the star write.+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("cannot find the saved query"))}- return connect.NewResponse(&v1pb.SavedQueryOrganizer{- SavedQuery: request.Organizer.SavedQuery,- Starred: organizer.Payload.Starred,- Folders: organizer.Payload.Folders,- }), nil+ savedQuery.Starred = request.Starred+ return connect.NewResponse(convertToAPISavedQuery(savedQuery)), nil}-func (s *SavedQueryService) BatchUpdateSavedQueryOrganizer(+// 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(ctx context.Context,- req *connect.Request[v1pb.BatchUpdateSavedQueryOrganizerRequest],-) (*connect.Response[v1pb.BatchUpdateSavedQueryOrganizerResponse], error) {+ req *connect.Request[v1pb.BatchUpdateSavedQueriesRequest],+) (*connect.Response[v1pb.BatchUpdateSavedQueriesResponse], error) {request := req.Msg- if request.Organizer == nil {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("organizer cannot be empty"))+ if request.SavedQuery == nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("saved_query cannot be empty"))}- if request.UpdateMask == nil {+ if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("update mask cannot be empty"))}- if len(request.UpdateMask.Paths) == 0 {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("update mask paths 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)@@ -517,7 +560,7 @@ func (s *SavedQueryService) BatchUpdateSavedQueryOrganizer(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 query organizers"))+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("projects/- is not supported for batch update saved queries"))}user, ok := GetUserFromContext(ctx)@@ -540,49 +583,54 @@ func (s *SavedQueryService) BatchUpdateSavedQueryOrganizer(var savedQueryIDs []stringfor _, savedQuery := range savedQueryList {- ok, err := s.canReadSavedQuery(ctx, savedQuery)+ ok, err := s.canWriteSavedQuery(ctx, savedQuery)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check access with error: %v", err))}if !ok {- slog.Warn("cannot access saved query", slog.String("name", savedQuery.Title))continue}savedQueryIDs = append(savedQueryIDs, savedQuery.ResourceID)}- patch := &store.BatchUpdateSavedQueryOrganizerPatch{- SavedQueryResourceIDs: savedQueryIDs,- Principal: user.Email,- }- for _, path := range request.UpdateMask.Paths {- switch path {- case "starred":- starred := request.Organizer.Starred- patch.Starred = &starred- case "folders":- folders := request.Organizer.Folders- patch.Folders = &folders- default:- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid update mask path %q", path))- }+ 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+}- organizers, err := s.store.BatchUpdateSavedQueryOrganizer(ctx, patch)+// 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 {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to batch update saved query organizers: %v", err))+ return connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err))}- response := &v1pb.BatchUpdateSavedQueryOrganizerResponse{- UpdatedCount: int32(len(organizers)),+ if !ok {+ return connect.NewError(connect.CodePermissionDenied, errors.Errorf("permission denied: %s", p))}- for _, organizer := range organizers {- response.SavedQueryOrganizers = append(response.SavedQueryOrganizers, &v1pb.SavedQueryOrganizer{- SavedQuery: fmt.Sprintf("%s/savedQueries/%s", request.Parent, organizer.SavedQueryResourceID),- Starred: organizer.Payload.Starred,- Folders: organizer.Payload.Folders,- })+ return nil+}++func (s *SavedQueryService) checkDiscoverSavedQueries(ctx context.Context, user *store.UserMessage, projectID string) error {+ workspaceID := common.GetWorkspaceIDFromContext(ctx)+ for _, p := range []permission.Permission{permission.SavedQueriesSearch, permission.SavedQueriesManage} {+ ok, err := s.iamManager.CheckProjectWidePermission(ctx, p, user, workspaceID, projectID)+ if err != nil {+ return connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err))+ }+ if ok {+ return nil+ }}- return connect.NewResponse(response), nil+ return connect.NewError(connect.CodePermissionDenied, errors.Errorf("permission denied: %s", permission.SavedQueriesSearch))}func (s *SavedQueryService) findSavedQuery(ctx context.Context, projectID string, savedQueryID string, loadFull bool) (*store.SavedQueryMessage, error) {@@ -649,7 +697,7 @@ func (s *SavedQueryService) validateSavedQueryDatabase(ctx context.Context, proj// canWriteSavedQuery check if the principal can write the saved query.// Saved queries are private: only the creator, or a caller holding-// "bb.worksheets.manage" on the workspace (the admin backstop), can write.+// "bb.savedQueries.manage" in scope (the admin backstop), can write.func (s *SavedQueryService) canWriteSavedQuery(ctx context.Context, savedQuery *store.SavedQueryMessage) (bool, error) {return s.canAccessSavedQuery(ctx, savedQuery)}@@ -668,7 +716,7 @@ func (s *SavedQueryService) canAccessSavedQuery(ctx context.Context, savedQueryif savedQuery.Creator == user.Email {return true, nil}- ok, err := s.iamManager.CheckPermission(ctx, permission.WorksheetsManage, user, common.GetWorkspaceIDFromContext(ctx))+ ok, err := s.iamManager.CheckProjectWidePermission(ctx, permission.SavedQueriesManage, user, common.GetWorkspaceIDFromContext(ctx), savedQuery.ProjectID)if err != nil {return false, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))}@@ -691,16 +739,17 @@ func convertToAPISavedQuery(savedQuery *store.SavedQueryMessage) *v1pb.SavedQuerContent: []byte(savedQuery.Statement),ContentSize: savedQuery.Size,Starred: savedQuery.Starred,- Folders: savedQuery.Folders,+ Folder: savedQuery.Folder,}}-func convertToStoreSavedQueryMessage(project *store.ProjectMessage, database string, creator string, savedQuery *v1pb.SavedQuery) *store.SavedQueryMessage {+func convertToStoreSavedQueryMessage(projectID string, database string, creator string, folder string, savedQuery *v1pb.SavedQuery) *store.SavedQueryMessage {return &store.SavedQueryMessage{- ProjectID: project.ResourceID,+ ProjectID: projectID,Creator: creator,Title: savedQuery.Title,Statement: string(savedQuery.Content),Database: database,+ Folder: folder,}}diff --git a/backend/common/permission/permission.go b/backend/common/permission/permission.goindex 4e42c0aa4a..95393d8cb9 100644--- a/backend/common/permission/permission.go+++ b/backend/common/permission/permission.go@@ -107,6 +107,10 @@ const (RolloutsCreate Permission = "bb.rollouts.create"RolloutsGet Permission = "bb.rollouts.get"RolloutsList Permission = "bb.rollouts.list"+ SavedQueriesCreate Permission = "bb.savedQueries.create"+ SavedQueriesSearch Permission = "bb.savedQueries.search"+ SavedQueriesList Permission = "bb.savedQueries.list"+ SavedQueriesManage Permission = "bb.savedQueries.manage"ServiceAccountsCreate Permission = "bb.serviceAccounts.create"ServiceAccountsDelete Permission = "bb.serviceAccounts.delete"ServiceAccountsGet Permission = "bb.serviceAccounts.get"@@ -149,9 +153,6 @@ const (WorkloadIdentitiesList Permission = "bb.workloadIdentities.list"WorkloadIdentitiesUndelete Permission = "bb.workloadIdentities.undelete"WorkloadIdentitiesUpdate Permission = "bb.workloadIdentities.update"- WorksheetsGet Permission = "bb.worksheets.get"- WorksheetsList Permission = "bb.worksheets.list"- WorksheetsManage Permission = "bb.worksheets.manage"WorkspacesGetIamPolicy Permission = "bb.workspaces.getIamPolicy"WorkspacesSetIamPolicy Permission = "bb.workspaces.setIamPolicy"WorkspacesUpdate Permission = "bb.workspaces.update"diff --git a/backend/common/permission/permission.yaml b/backend/common/permission/permission.yamlindex 8aeba2cfa9..a3c83ef2bc 100644--- a/backend/common/permission/permission.yaml+++ b/backend/common/permission/permission.yaml@@ -99,6 +99,10 @@ permissions:- bb.rollouts.create- bb.rollouts.get- bb.rollouts.list+ - bb.savedQueries.create+ - bb.savedQueries.search+ - bb.savedQueries.list+ - bb.savedQueries.manage- bb.serviceAccounts.create- bb.serviceAccounts.delete- bb.serviceAccounts.get@@ -130,9 +134,6 @@ permissions:- bb.users.undelete- bb.users.update- bb.users.updateEmail- - bb.worksheets.get- - bb.worksheets.list- - bb.worksheets.manage- bb.workloadIdentities.create- bb.workloadIdentities.delete- bb.workloadIdentities.getdiff --git a/backend/component/iam/condition.go b/backend/component/iam/condition.gonew file mode 100644index 0000000000..d1d0abc69f--- /dev/null+++ b/backend/component/iam/condition.go@@ -0,0 +1,48 @@+package iam++import (+ "github.com/google/cel-go/cel"+ "github.com/pkg/errors"++ "github.com/bytebase/bytebase/backend/common"+)++// conditionScopesResources reports whether a binding condition constrains+// anything beyond expiry -- a database, schema, table, or environment scope.+// The generic permission check binds request.time and lets the rest ride, so+// callers that must not honor a data-slice grant use this to drop the binding+// instead.+//+// The check reads the type-checker's reference map rather than walking the+// syntax tree, so it sees through macros and comprehensions, and it asks+// whether any bound variable other than request.time is referenced rather+// than naming today's resource attributes -- a new attribute is treated as+// scoping from the day it is declared.+func conditionScopesResources(expression string) (bool, error) {+ if expression == "" {+ return false, nil+ }+ e, err := cel.NewEnv(common.IAMPolicyConditionCELAttributes...)+ if err != nil {+ return false, errors.Wrapf(err, "failed to new cel env")+ }+ ast, issues := e.Compile(expression)+ if issues != nil && issues.Err() != nil {+ return false, errors.Wrapf(issues.Err(), "failed to compile expr %q", expression)+ }+ checked, err := cel.AstToCheckedExpr(ast)+ if err != nil {+ return false, errors.Wrapf(err, "failed to check expr %q", expression)+ }+ for _, reference := range checked.GetReferenceMap() {+ // Functions and their overloads are not attributes.+ if len(reference.GetOverloadId()) > 0 {+ continue+ }+ if reference.GetName() == common.CELAttributeRequestTime {+ continue+ }+ return true, nil+ }+ return false, nil+}diff --git a/backend/component/iam/condition_test.go b/backend/component/iam/condition_test.gonew file mode 100644index 0000000000..dda4f2266c--- /dev/null+++ b/backend/component/iam/condition_test.go@@ -0,0 +1,52 @@+package iam++import (+ "testing"++ "github.com/stretchr/testify/require"+)++func TestConditionScopesResources(t *testing.T) {+ testCases := []struct {+ name string+ expression string+ want bool+ wantErr bool+ }{+ {name: "unconditional", expression: "", want: false},+ {+ name: "expiry only",+ expression: `request.time < timestamp("2099-01-01T00:00:00Z")`,+ want: false,+ },+ {name: "database equality", expression: `resource.database == "instances/i/databases/d"`, want: true},+ {name: "database negated", expression: `resource.database != "instances/i/databases/d"`, want: true},+ {name: "database list", expression: `resource.database in ["a", "b"]`, want: true},+ {name: "environment", expression: `resource.environment_id == "prod"`, want: true},+ {name: "schema", expression: `resource.schema_name == "public"`, want: true},+ {name: "table", expression: `resource.table_name.startsWith("audit_")`, want: true},+ {+ name: "scope plus expiry",+ expression: `resource.database == "instances/i/databases/d" && request.time < timestamp("2099-01-01T00:00:00Z")`,+ want: true,+ },+ {+ // A macro hides the reference from a plain syntax-tree walk.+ name: "scope inside a comprehension",+ expression: `["a", "b"].exists(d, d == resource.database)`,+ want: true,+ },+ {name: "not an expression", expression: "this is not cel", wantErr: true},+ }+ for _, tc := range testCases {+ t.Run(tc.name, func(t *testing.T) {+ got, err := conditionScopesResources(tc.expression)+ if tc.wantErr {+ require.Error(t, err)+ return+ }+ require.NoError(t, err)+ require.Equal(t, tc.want, got)+ })+ }+}diff --git a/backend/component/iam/manager.go b/backend/component/iam/manager.goindex 77969e3e7d..26a8a116cc 100644--- a/backend/component/iam/manager.go+++ b/backend/component/iam/manager.go@@ -2,12 +2,14 @@ package iamimport ("context"+ "log/slog""maps""strings""github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"+ "github.com/bytebase/bytebase/backend/common/log""github.com/bytebase/bytebase/backend/common/permission""github.com/bytebase/bytebase/backend/enterprise"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -34,6 +36,20 @@ func NewManager(store *store.Store, licenseService *enterprise.LicenseService, s// CEL on the binding is not considered.// When multiple projects are specified, the user should have permission on every projects.func (m *Manager) CheckPermission(ctx context.Context, p permission.Permission, user *store.UserMessage, workspaceID string, projectIDs ...string) (bool, error) {+ return m.doCheckPermission(ctx, p, user, workspaceID, false /* projectWideOnly */, projectIDs...)+}++// CheckProjectWidePermission is CheckPermission for permissions that a+// resource-scoped grant must not confer. A binding whose condition narrows to+// specific databases, schemas, tables, or environments is skipped entirely,+// so a data-slice grant cannot widen into a project-wide surface. Expiry is+// unaffected: ValidateIAMBinding already drops bindings whose time window has+// closed.+func (m *Manager) CheckProjectWidePermission(ctx context.Context, p permission.Permission, user *store.UserMessage, workspaceID string, projectIDs ...string) (bool, error) {+ return m.doCheckPermission(ctx, p, user, workspaceID, true /* projectWideOnly */, projectIDs...)+}++func (m *Manager) doCheckPermission(ctx context.Context, p permission.Permission, user *store.UserMessage, workspaceID string, projectWideOnly bool, projectIDs ...string) (bool, error) {getPermissions := func(role string) map[permission.Permission]bool {perms, _ := m.GetPermissions(ctx, workspaceID, role)return perms@@ -48,7 +64,7 @@ func (m *Manager) CheckPermission(ctx context.Context, p permission.Permission,return false, err}// In SaaS mode, skip allUsers for workspace-level IAM (members must be explicit).- if ok := check(user, p, policyMessage.Policy, getPermissions, getGroupMembers, m.saas); ok {+ if ok := check(user, p, policyMessage.Policy, getPermissions, getGroupMembers, m.saas, projectWideOnly); ok {return true, nil}@@ -71,7 +87,7 @@ func (m *Manager) CheckPermission(ctx context.Context, p permission.Permission,return false, err}// Project-level: allUsers means "all workspace members", which is safe.- if ok := check(user, p, policyMessage.Policy, getPermissions, getGroupMembers, false); !ok {+ if ok := check(user, p, policyMessage.Policy, getPermissions, getGroupMembers, false, projectWideOnly); !ok {allOK = falsebreak}@@ -104,13 +120,24 @@ func (m *Manager) GetUserGroups(ctx context.Context, workspaceID string, email sreturn m.store.GetUserGroupsSnapshot(ctx, workspaceID, common.FormatUserEmail(email))}-func check(user *store.UserMessage, p permission.Permission, policy *storepb.IamPolicy, getPermissions func(role string) map[permission.Permission]bool, getGroupMembers func(groupName string) map[string]bool, skipAllUsers bool) bool {+func check(user *store.UserMessage, p permission.Permission, policy *storepb.IamPolicy, getPermissions func(role string) map[permission.Permission]bool, getGroupMembers func(groupName string) map[string]bool, skipAllUsers bool, projectWideOnly bool) bool {userName := formatUserNameByType(user)for _, binding := range policy.GetBindings() {if !utils.ValidateIAMBinding(binding) {continue}+ if projectWideOnly {+ scoped, err := conditionScopesResources(binding.Condition.GetExpression())+ if err != nil {+ // An unparsable condition is not a grant.+ slog.Error("failed to inspect binding condition", slog.String("expression", binding.Condition.GetExpression()), log.BBError(err))+ continue+ }+ if scoped {+ continue+ }+ }permissions := getPermissions(binding.GetRole())if permissions == nil {continuediff --git a/backend/component/iam/manager_test.go b/backend/component/iam/manager_test.goindex 08ed5f1eee..cf6e6511bd 100644--- a/backend/component/iam/manager_test.go+++ b/backend/component/iam/manager_test.go@@ -4,6 +4,7 @@ import ("testing""github.com/stretchr/testify/require"+ "google.golang.org/genproto/googleapis/type/expr""github.com/bytebase/bytebase/backend/common""github.com/bytebase/bytebase/backend/common/permission"@@ -109,9 +110,81 @@ func TestCheck(t *testing.T) {}return test.groupMembers[groupName]}- got := check(testUser, test.permission, test.policy, getPermissions, getGroupMembers, false)+ got := check(testUser, test.permission, test.policy, getPermissions, getGroupMembers, false, false /* projectWideOnly */)if got != test.want {require.Equal(t, test.want, got, i)}}}++func TestCheckProjectWideOnlySkipsResourceScopedBindings(t *testing.T) {+ testUser := &store.UserMessage{+ ID: 123,+ Email: "[email protected]",+ Type: storepb.PrincipalType_END_USER,+ }++ rolePermissions := make(map[string]map[permission.Permission]bool)+ for _, role := range store.PredefinedRoles {+ rolePermissions[common.FormatRole(role.ResourceID)] = role.Permissions+ }+ getPermissions := func(role string) map[permission.Permission]bool {+ return rolePermissions[role]+ }+ getGroupMembers := func(string) map[string]bool { return nil }++ policyWithCondition := func(expression string) *storepb.IamPolicy {+ binding := &storepb.Binding{+ Role: "roles/projectOwner",+ Members: []string{"users/[email protected]"},+ }+ if expression != "" {+ binding.Condition = &expr.Expr{Expression: expression}+ }+ return &storepb.IamPolicy{Bindings: []*storepb.Binding{binding}}+ }++ testCases := []struct {+ name string+ expression string+ // A resource-scoped grant must confer nothing project-wide, while the+ // generic check keeps honoring it.+ wantProjectWide bool+ wantGeneric bool+ }{+ {name: "no condition", expression: "", wantProjectWide: true, wantGeneric: true},+ {+ name: "expiry only",+ expression: `request.time < timestamp("2099-01-01T00:00:00Z")`,+ wantProjectWide: true,+ wantGeneric: true,+ },+ {+ name: "database scoped",+ expression: `resource.database == "instances/i/databases/d"`,+ wantProjectWide: false,+ wantGeneric: true,+ },+ {+ name: "environment scoped with expiry",+ expression: `resource.environment_id == "prod" && request.time < timestamp("2099-01-01T00:00:00Z")`,+ wantProjectWide: false,+ wantGeneric: true,+ },+ {+ name: "expired",+ expression: `request.time < timestamp("2000-01-01T00:00:00Z")`,+ wantProjectWide: false,+ wantGeneric: false,+ },+ }+ for _, tc := range testCases {+ t.Run(tc.name, func(t *testing.T) {+ policy := policyWithCondition(tc.expression)+ require.Equal(t, tc.wantProjectWide,+ check(testUser, permission.SavedQueriesManage, policy, getPermissions, getGroupMembers, false, true /* projectWideOnly */))+ require.Equal(t, tc.wantGeneric,+ check(testUser, permission.SavedQueriesManage, policy, getPermissions, getGroupMembers, false, false /* projectWideOnly */))+ })+ }+}diff --git a/backend/generated-go/store/saved_query.pb.go b/backend/generated-go/store/saved_query.pb.goindex b7c14a90c2..9eb2d477b8 100644--- a/backend/generated-go/store/saved_query.pb.go+++ b/backend/generated-go/store/saved_query.pb.go@@ -71,70 +71,13 @@ func (x *SavedQueryPayload) GetDatabase() string {return ""}-type SavedQueryOrganizerPayload struct {- state protoimpl.MessageState `protogen:"open.v1"`- Starred bool `protobuf:"varint,1,opt,name=starred,proto3" json:"starred,omitempty"`- // The folder path for a saved query.- // For example, if the folders is [A, B, C], means the saved query is in the A/B/C subfolder.- Folders []string `protobuf:"bytes,2,rep,name=folders,proto3" json:"folders,omitempty"`- unknownFields protoimpl.UnknownFields- sizeCache protoimpl.SizeCache-}--func (x *SavedQueryOrganizerPayload) Reset() {- *x = SavedQueryOrganizerPayload{}- mi := &file_store_saved_query_proto_msgTypes[1]- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))- ms.StoreMessageInfo(mi)-}--func (x *SavedQueryOrganizerPayload) String() string {- return protoimpl.X.MessageStringOf(x)-}--func (*SavedQueryOrganizerPayload) ProtoMessage() {}--func (x *SavedQueryOrganizerPayload) ProtoReflect() protoreflect.Message {- mi := &file_store_saved_query_proto_msgTypes[1]- if x != nil {- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))- if ms.LoadMessageInfo() == nil {- ms.StoreMessageInfo(mi)- }- return ms- }- return mi.MessageOf(x)-}--// Deprecated: Use SavedQueryOrganizerPayload.ProtoReflect.Descriptor instead.-func (*SavedQueryOrganizerPayload) Descriptor() ([]byte, []int) {- return file_store_saved_query_proto_rawDescGZIP(), []int{1}-}--func (x *SavedQueryOrganizerPayload) GetStarred() bool {- if x != nil {- return x.Starred- }- return false-}--func (x *SavedQueryOrganizerPayload) GetFolders() []string {- if x != nil {- return x.Folders- }- return nil-}-var File_store_saved_query_proto protoreflect.FileDescriptorconst file_store_saved_query_proto_rawDesc = "" +"\n" +"\x17store/saved_query.proto\x12\x0ebytebase.store\"/\n" +"\x11SavedQueryPayload\x12\x1a\n" +- "\bdatabase\x18\x01 \x01(\tR\bdatabase\"P\n" +- "\x1aSavedQueryOrganizerPayload\x12\x18\n" +- "\astarred\x18\x01 \x01(\bR\astarred\x12\x18\n" +- "\afolders\x18\x02 \x03(\tR\afoldersB\x92\x01\n" ++ "\bdatabase\x18\x01 \x01(\tR\bdatabaseB\x92\x01\n" +"\x12com.bytebase.storeB\x0fSavedQueryProtoP\x01Z\x12generated-go/store\xa2\x02\x03BSX\xaa\x02\x0eBytebase.Store\xca\x02\x0eBytebase\\Store\xe2\x02\x1aBytebase\\Store\\GPBMetadata\xea\x02\x0fBytebase::Storeb\x06proto3"var (@@ -149,10 +92,9 @@ func file_store_saved_query_proto_rawDescGZIP() []byte {return file_store_saved_query_proto_rawDescData}-var file_store_saved_query_proto_msgTypes = make([]protoimpl.MessageInfo, 2)+var file_store_saved_query_proto_msgTypes = make([]protoimpl.MessageInfo, 1)var file_store_saved_query_proto_goTypes = []any{- (*SavedQueryPayload)(nil), // 0: bytebase.store.SavedQueryPayload- (*SavedQueryOrganizerPayload)(nil), // 1: bytebase.store.SavedQueryOrganizerPayload+ (*SavedQueryPayload)(nil), // 0: bytebase.store.SavedQueryPayload}var file_store_saved_query_proto_depIdxs = []int32{0, // [0:0] is the sub-list for method output_type@@ -173,7 +115,7 @@ func file_store_saved_query_proto_init() {GoPackagePath: reflect.TypeOf(x{}).PkgPath(),RawDescriptor: unsafe.Slice(unsafe.StringData(file_store_saved_query_proto_rawDesc), len(file_store_saved_query_proto_rawDesc)),NumEnums: 0,- NumMessages: 2,+ NumMessages: 1,NumExtensions: 0,NumServices: 0,},diff --git a/backend/generated-go/store/saved_query_equal.pb.go b/backend/generated-go/store/saved_query_equal.pb.goindex 0109c591a1..4a8603389c 100644--- a/backend/generated-go/store/saved_query_equal.pb.go+++ b/backend/generated-go/store/saved_query_equal.pb.go@@ -15,24 +15,3 @@ func (x *SavedQueryPayload) Equal(y *SavedQueryPayload) bool {}return true}--func (x *SavedQueryOrganizerPayload) Equal(y *SavedQueryOrganizerPayload) bool {- if x == y {- return true- }- if x == nil || y == nil {- return x == nil && y == nil- }- if x.Starred != y.Starred {- return false- }- if len(x.Folders) != len(y.Folders) {- return false- }- for i := 0; i < len(x.Folders); i++ {- if x.Folders[i] != y.Folders[i] {- return false- }- }- return true-}diff --git a/backend/generated-go/v1/saved_query_service.pb.go b/backend/generated-go/v1/saved_query_service.pb.goindex 7a2a0a42dd..639ee0bbc5 100644--- a/backend/generated-go/v1/saved_query_service.pb.go+++ b/backend/generated-go/v1/saved_query_service.pb.go@@ -26,55 +26,6 @@ const (_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20))-type SavedQueryFolder_Category int32--const (- SavedQueryFolder_CATEGORY_UNSPECIFIED SavedQueryFolder_Category = 0- SavedQueryFolder_MINE SavedQueryFolder_Category = 1- SavedQueryFolder_SHARED SavedQueryFolder_Category = 2-)--// Enum value maps for SavedQueryFolder_Category.-var (- SavedQueryFolder_Category_name = map[int32]string{- 0: "CATEGORY_UNSPECIFIED",- 1: "MINE",- 2: "SHARED",- }- SavedQueryFolder_Category_value = map[string]int32{- "CATEGORY_UNSPECIFIED": 0,- "MINE": 1,- "SHARED": 2,- }-)--func (x SavedQueryFolder_Category) Enum() *SavedQueryFolder_Category {- p := new(SavedQueryFolder_Category)- *p = x- return p-}--func (x SavedQueryFolder_Category) String() string {- return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))-}--func (SavedQueryFolder_Category) Descriptor() protoreflect.EnumDescriptor {- return file_v1_saved_query_service_proto_enumTypes[0].Descriptor()-}--func (SavedQueryFolder_Category) Type() protoreflect.EnumType {- return &file_v1_saved_query_service_proto_enumTypes[0]-}--func (x SavedQueryFolder_Category) Number() protoreflect.EnumNumber {- return protoreflect.EnumNumber(x)-}--// Deprecated: Use SavedQueryFolder_Category.Descriptor instead.-func (SavedQueryFolder_Category) EnumDescriptor() ([]byte, []int) {- return file_v1_saved_query_service_proto_rawDescGZIP(), []int{6, 0}-}-type CreateSavedQueryRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The parent resource where this saved query will be created.@@ -321,29 +272,39 @@ func (x *ListSavedQueriesResponse) GetNextPageToken() string {return ""}-type ListSavedQueryFoldersRequest struct {+type SearchSavedQueryFoldersRequest struct {state protoimpl.MessageState `protogen:"open.v1"`- // The parent resource of the saved query folders.+ // The parent resource whose saved query folders are searched.// Format: projects/{project}- Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`+ Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`+ // To filter the folders by the saved queries they hold. Takes the same+ // fields and syntax as `SearchSavedQueries.filter`, except `title`. A+ // folder is returned when at least one saved query the caller can read+ // matches, so the caller-scoping is the same as SearchSavedQueries: your+ // own saved queries, plus everyone's for the admin backstop.+ //+ // For example, to split a folder tree into your own and everyone else's:+ // creator == "users/{email}"+ // creator != "users/{email}"+ Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}-func (x *ListSavedQueryFoldersRequest) Reset() {- *x = ListSavedQueryFoldersRequest{}+func (x *SearchSavedQueryFoldersRequest) Reset() {+ *x = SearchSavedQueryFoldersRequest{}mi := &file_v1_saved_query_service_proto_msgTypes[4]ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))ms.StoreMessageInfo(mi)}-func (x *ListSavedQueryFoldersRequest) String() string {+func (x *SearchSavedQueryFoldersRequest) String() string {return protoimpl.X.MessageStringOf(x)}-func (*ListSavedQueryFoldersRequest) ProtoMessage() {}+func (*SearchSavedQueryFoldersRequest) ProtoMessage() {}-func (x *ListSavedQueryFoldersRequest) ProtoReflect() protoreflect.Message {+func (x *SearchSavedQueryFoldersRequest) ProtoReflect() protoreflect.Message {mi := &file_v1_saved_query_service_proto_msgTypes[4]if x != nil {ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))@@ -355,40 +316,49 @@ func (x *ListSavedQueryFoldersRequest) ProtoReflect() protoreflect.Message {return mi.MessageOf(x)}-// Deprecated: Use ListSavedQueryFoldersRequest.ProtoReflect.Descriptor instead.-func (*ListSavedQueryFoldersRequest) Descriptor() ([]byte, []int) {+// Deprecated: Use SearchSavedQueryFoldersRequest.ProtoReflect.Descriptor instead.+func (*SearchSavedQueryFoldersRequest) Descriptor() ([]byte, []int) {return file_v1_saved_query_service_proto_rawDescGZIP(), []int{4}}-func (x *ListSavedQueryFoldersRequest) GetParent() string {+func (x *SearchSavedQueryFoldersRequest) GetParent() string {if x != nil {return x.Parent}return ""}-type ListSavedQueryFoldersResponse struct {+func (x *SearchSavedQueryFoldersRequest) GetFilter() string {+ if x != nil {+ return x.Filter+ }+ return ""+}++type SearchSavedQueryFoldersResponse struct {state protoimpl.MessageState `protogen:"open.v1"`- // The caller's saved query folders.- Folders []*SavedQueryFolder `protobuf:"bytes,1,rep,name=folders,proto3" json:"folders,omitempty"`+ // The caller's folder paths, including every ancestor prefix, sorted.+ // A folder is a path on saved queries ("a/b/c"), so empty folders cannot+ // exist.+ Folders []string `protobuf:"bytes,1,rep,name=folders,proto3" json:"folders,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}-func (x *ListSavedQueryFoldersResponse) Reset() {- *x = ListSavedQueryFoldersResponse{}+func (x *SearchSavedQueryFoldersResponse) Reset() {+ *x = SearchSavedQueryFoldersResponse{}mi := &file_v1_saved_query_service_proto_msgTypes[5]ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))ms.StoreMessageInfo(mi)}-func (x *ListSavedQueryFoldersResponse) String() string {+func (x *SearchSavedQueryFoldersResponse) String() string {return protoimpl.X.MessageStringOf(x)}-func (*ListSavedQueryFoldersResponse) ProtoMessage() {}+func (*SearchSavedQueryFoldersResponse) ProtoMessage() {}-func (x *ListSavedQueryFoldersResponse) ProtoReflect() protoreflect.Message {+func (x *SearchSavedQueryFoldersResponse) ProtoReflect() protoreflect.Message {mi := &file_v1_saved_query_service_proto_msgTypes[5]if x != nil {ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))@@ -400,42 +370,52 @@ func (x *ListSavedQueryFoldersResponse) ProtoReflect() protoreflect.Message {return mi.MessageOf(x)}-// Deprecated: Use ListSavedQueryFoldersResponse.ProtoReflect.Descriptor instead.-func (*ListSavedQueryFoldersResponse) Descriptor() ([]byte, []int) {+// Deprecated: Use SearchSavedQueryFoldersResponse.ProtoReflect.Descriptor instead.+func (*SearchSavedQueryFoldersResponse) Descriptor() ([]byte, []int) {return file_v1_saved_query_service_proto_rawDescGZIP(), []int{5}}-func (x *ListSavedQueryFoldersResponse) GetFolders() []*SavedQueryFolder {+func (x *SearchSavedQueryFoldersResponse) GetFolders() []string {if x != nil {return x.Folders}return nil}-type SavedQueryFolder struct {+type UpdateSavedQueryRequest struct {state protoimpl.MessageState `protogen:"open.v1"`- // The folder path segments.- Folders []string `protobuf:"bytes,1,rep,name=folders,proto3" json:"folders,omitempty"`- // The folder category.- Category SavedQueryFolder_Category `protobuf:"varint,2,opt,name=category,proto3,enum=bytebase.v1.SavedQueryFolder_Category" json:"category,omitempty"`+ // The saved query to update.+ //+ // The saved query's `name` field is used to identify the saved query to update.+ // Format: projects/{project}/savedQueries/{savedQuery}+ SavedQuery *SavedQuery `protobuf:"bytes,1,opt,name=saved_query,json=savedQuery,proto3" json:"saved_query,omitempty"`+ // The list of fields to be updated.+ // Fields are specified relative to the saved query.+ // (e.g., `title`, `content`; *not* `saved_query.title` or `saved_query.content`)+ // Only support update the following fields for now:+ // - `title`+ // - `content`+ // - `database`+ // - `folder`+ UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}-func (x *SavedQueryFolder) Reset() {- *x = SavedQueryFolder{}+func (x *UpdateSavedQueryRequest) Reset() {+ *x = UpdateSavedQueryRequest{}mi := &file_v1_saved_query_service_proto_msgTypes[6]ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))ms.StoreMessageInfo(mi)}-func (x *SavedQueryFolder) String() string {+func (x *UpdateSavedQueryRequest) String() string {return protoimpl.X.MessageStringOf(x)}-func (*SavedQueryFolder) ProtoMessage() {}+func (*UpdateSavedQueryRequest) ProtoMessage() {}-func (x *SavedQueryFolder) ProtoReflect() protoreflect.Message {+func (x *UpdateSavedQueryRequest) ProtoReflect() protoreflect.Message {mi := &file_v1_saved_query_service_proto_msgTypes[6]if x != nil {ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))@@ -447,58 +427,50 @@ func (x *SavedQueryFolder) ProtoReflect() protoreflect.Message {return mi.MessageOf(x)}-// Deprecated: Use SavedQueryFolder.ProtoReflect.Descriptor instead.-func (*SavedQueryFolder) Descriptor() ([]byte, []int) {+// Deprecated: Use UpdateSavedQueryRequest.ProtoReflect.Descriptor instead.+func (*UpdateSavedQueryRequest) Descriptor() ([]byte, []int) {return file_v1_saved_query_service_proto_rawDescGZIP(), []int{6}}-func (x *SavedQueryFolder) GetFolders() []string {+func (x *UpdateSavedQueryRequest) GetSavedQuery() *SavedQuery {if x != nil {- return x.Folders+ return x.SavedQuery}return nil}-func (x *SavedQueryFolder) GetCategory() SavedQueryFolder_Category {+func (x *UpdateSavedQueryRequest) GetUpdateMask() *fieldmaskpb.FieldMask {if x != nil {- return x.Category+ return x.UpdateMask}- return SavedQueryFolder_CATEGORY_UNSPECIFIED+ return nil}-type UpdateSavedQueryRequest struct {+type UpdateSavedQueryStarRequest struct {state protoimpl.MessageState `protogen:"open.v1"`- // The saved query to update.- //- // The saved query's `name` field is used to identify the saved query to update.+ // The name of the saved query to star or unstar.// Format: projects/{project}/savedQueries/{savedQuery}- SavedQuery *SavedQuery `protobuf:"bytes,1,opt,name=saved_query,json=savedQuery,proto3" json:"saved_query,omitempty"`- // The list of fields to be updated.- // Fields are specified relative to the saved query.- // (e.g., `title`, `content`; *not* `saved_query.title` or `saved_query.content`)- // Only support update the following fields for now:- // - `title`- // - `content`- // - `database`- UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`+ Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`+ // Whether the caller stars the saved query.+ Starred bool `protobuf:"varint,2,opt,name=starred,proto3" json:"starred,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}-func (x *UpdateSavedQueryRequest) Reset() {- *x = UpdateSavedQueryRequest{}+func (x *UpdateSavedQueryStarRequest) Reset() {+ *x = UpdateSavedQueryStarRequest{}mi := &file_v1_saved_query_service_proto_msgTypes[7]ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))ms.StoreMessageInfo(mi)}-func (x *UpdateSavedQueryRequest) String() string {+func (x *UpdateSavedQueryStarRequest) String() string {return protoimpl.X.MessageStringOf(x)}-func (*UpdateSavedQueryRequest) ProtoMessage() {}+func (*UpdateSavedQueryStarRequest) ProtoMessage() {}-func (x *UpdateSavedQueryRequest) ProtoReflect() protoreflect.Message {+func (x *UpdateSavedQueryStarRequest) ProtoReflect() protoreflect.Message {mi := &file_v1_saved_query_service_proto_msgTypes[7]if x != nil {ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))@@ -510,28 +482,28 @@ func (x *UpdateSavedQueryRequest) ProtoReflect() protoreflect.Message {return mi.MessageOf(x)}-// Deprecated: Use UpdateSavedQueryRequest.ProtoReflect.Descriptor instead.-func (*UpdateSavedQueryRequest) Descriptor() ([]byte, []int) {+// Deprecated: Use UpdateSavedQueryStarRequest.ProtoReflect.Descriptor instead.+func (*UpdateSavedQueryStarRequest) Descriptor() ([]byte, []int) {return file_v1_saved_query_service_proto_rawDescGZIP(), []int{7}}-func (x *UpdateSavedQueryRequest) GetSavedQuery() *SavedQuery {+func (x *UpdateSavedQueryStarRequest) GetName() string {if x != nil {- return x.SavedQuery+ return x.Name}- return nil+ return ""}-func (x *UpdateSavedQueryRequest) GetUpdateMask() *fieldmaskpb.FieldMask {+func (x *UpdateSavedQueryStarRequest) GetStarred() bool {if x != nil {- return x.UpdateMask+ return x.Starred}- return nil+ return false}-type BatchUpdateSavedQueryOrganizerRequest struct {+type BatchUpdateSavedQueriesRequest struct {state protoimpl.MessageState `protogen:"open.v1"`- // The parent resource whose saved queries' organizers are updated.+ // The parent resource whose saved queries are updated.// Format: projects/{project}Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`// To filter the batch update target.@@ -541,34 +513,32 @@ type BatchUpdateSavedQueryOrganizerRequest struct {// - name: the saved query name in "projects/{project}/savedQueries/{savedQuery}" format, support "==" and "in [xx]" operator.// - creator: the saved query creator in "users/{email}" format, support "==" and "!=" operator.// - starred: should be "true" or "false", filter starred/unstarred saved queries, support "==" operator.- // - folder: the saved query organizer folder path, support exact "==" operator.+ // - folder: the saved query folder path, support exact "==" operator.Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`- // The organizer fields to update.- Organizer *SavedQueryOrganizer `protobuf:"bytes,3,opt,name=organizer,proto3" json:"organizer,omitempty"`+ // The fields to apply to every matched saved query.+ SavedQuery *SavedQuery `protobuf:"bytes,3,opt,name=saved_query,json=savedQuery,proto3" json:"saved_query,omitempty"`// The list of fields to be updated.- // Fields are specified relative to the saved query organizer.// Only support update the following fields for now:- // - `starred`- // - `folders`+ // - `folder`UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}-func (x *BatchUpdateSavedQueryOrganizerRequest) Reset() {- *x = BatchUpdateSavedQueryOrganizerRequest{}+func (x *BatchUpdateSavedQueriesRequest) Reset() {+ *x = BatchUpdateSavedQueriesRequest{}mi := &file_v1_saved_query_service_proto_msgTypes[8]ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))ms.StoreMessageInfo(mi)}-func (x *BatchUpdateSavedQueryOrganizerRequest) String() string {+func (x *BatchUpdateSavedQueriesRequest) String() string {return protoimpl.X.MessageStringOf(x)}-func (*BatchUpdateSavedQueryOrganizerRequest) ProtoMessage() {}+func (*BatchUpdateSavedQueriesRequest) ProtoMessage() {}-func (x *BatchUpdateSavedQueryOrganizerRequest) ProtoReflect() protoreflect.Message {+func (x *BatchUpdateSavedQueriesRequest) ProtoReflect() protoreflect.Message {mi := &file_v1_saved_query_service_proto_msgTypes[8]if x != nil {ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))@@ -580,61 +550,61 @@ func (x *BatchUpdateSavedQueryOrganizerRequest) ProtoReflect() protoreflect.Messreturn mi.MessageOf(x)}-// Deprecated: Use BatchUpdateSavedQueryOrganizerRequest.ProtoReflect.Descriptor instead.-func (*BatchUpdateSavedQueryOrganizerRequest) Descriptor() ([]byte, []int) {+// Deprecated: Use BatchUpdateSavedQueriesRequest.ProtoReflect.Descriptor instead.+func (*BatchUpdateSavedQueriesRequest) Descriptor() ([]byte, []int) {return file_v1_saved_query_service_proto_rawDescGZIP(), []int{8}}-func (x *BatchUpdateSavedQueryOrganizerRequest) GetParent() string {+func (x *BatchUpdateSavedQueriesRequest) GetParent() string {if x != nil {return x.Parent}return ""}-func (x *BatchUpdateSavedQueryOrganizerRequest) GetFilter() string {+func (x *BatchUpdateSavedQueriesRequest) GetFilter() string {if x != nil {return x.Filter}return ""}-func (x *BatchUpdateSavedQueryOrganizerRequest) GetOrganizer() *SavedQueryOrganizer {+func (x *BatchUpdateSavedQueriesRequest) GetSavedQuery() *SavedQuery {if x != nil {- return x.Organizer+ return x.SavedQuery}return nil}-func (x *BatchUpdateSavedQueryOrganizerRequest) GetUpdateMask() *fieldmaskpb.FieldMask {+func (x *BatchUpdateSavedQueriesRequest) GetUpdateMask() *fieldmaskpb.FieldMask {if x != nil {return x.UpdateMask}return nil}-type BatchUpdateSavedQueryOrganizerResponse struct {- state protoimpl.MessageState `protogen:"open.v1"`- SavedQueryOrganizers []*SavedQueryOrganizer `protobuf:"bytes,1,rep,name=saved_query_organizers,json=savedQueryOrganizers,proto3" json:"saved_query_organizers,omitempty"`- UpdatedCount int32 `protobuf:"varint,2,opt,name=updated_count,json=updatedCount,proto3" json:"updated_count,omitempty"`- unknownFields protoimpl.UnknownFields- sizeCache protoimpl.SizeCache+type BatchUpdateSavedQueriesResponse struct {+ state protoimpl.MessageState `protogen:"open.v1"`+ // The number of saved queries updated.+ UpdatedCount int32 `protobuf:"varint,1,opt,name=updated_count,json=updatedCount,proto3" json:"updated_count,omitempty"`+ unknownFields protoimpl.UnknownFields+ sizeCache protoimpl.SizeCache}-func (x *BatchUpdateSavedQueryOrganizerResponse) Reset() {- *x = BatchUpdateSavedQueryOrganizerResponse{}+func (x *BatchUpdateSavedQueriesResponse) Reset() {+ *x = BatchUpdateSavedQueriesResponse{}mi := &file_v1_saved_query_service_proto_msgTypes[9]ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))ms.StoreMessageInfo(mi)}-func (x *BatchUpdateSavedQueryOrganizerResponse) String() string {+func (x *BatchUpdateSavedQueriesResponse) String() string {return protoimpl.X.MessageStringOf(x)}-func (*BatchUpdateSavedQueryOrganizerResponse) ProtoMessage() {}+func (*BatchUpdateSavedQueriesResponse) ProtoMessage() {}-func (x *BatchUpdateSavedQueryOrganizerResponse) ProtoReflect() protoreflect.Message {+func (x *BatchUpdateSavedQueriesResponse) ProtoReflect() protoreflect.Message {mi := &file_v1_saved_query_service_proto_msgTypes[9]if x != nil {ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))@@ -646,158 +616,18 @@ func (x *BatchUpdateSavedQueryOrganizerResponse) ProtoReflect() protoreflect.Mesreturn mi.MessageOf(x)}-// Deprecated: Use BatchUpdateSavedQueryOrganizerResponse.ProtoReflect.Descriptor instead.-func (*BatchUpdateSavedQueryOrganizerResponse) Descriptor() ([]byte, []int) {+// Deprecated: Use BatchUpdateSavedQueriesResponse.ProtoReflect.Descriptor instead.+func (*BatchUpdateSavedQueriesResponse) Descriptor() ([]byte, []int) {return file_v1_saved_query_service_proto_rawDescGZIP(), []int{9}}-func (x *BatchUpdateSavedQueryOrganizerResponse) GetSavedQueryOrganizers() []*SavedQueryOrganizer {- if x != nil {- return x.SavedQueryOrganizers- }- return nil-}--func (x *BatchUpdateSavedQueryOrganizerResponse) GetUpdatedCount() int32 {+func (x *BatchUpdateSavedQueriesResponse) GetUpdatedCount() int32 {if x != nil {return x.UpdatedCount}return 0}-type UpdateSavedQueryOrganizerRequest struct {- state protoimpl.MessageState `protogen:"open.v1"`- // The organizer to update.- //- // The organizer's `saved_query` field is used to identify the saved query.- // Format: projects/{project}/savedQueries/{savedQuery}- Organizer *SavedQueryOrganizer `protobuf:"bytes,1,opt,name=organizer,proto3" json:"organizer,omitempty"`- // The list of fields to be updated.- // Fields are specified relative to the saved query organizer.- // Only support update the following fields for now:- // - `starred`- UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`- // If set to true, and the saved query organizer is not found, a new saved query organizer will be created.- // In this situation, `update_mask` is ignored.- AllowMissing bool `protobuf:"varint,3,opt,name=allow_missing,json=allowMissing,proto3" json:"allow_missing,omitempty"`- unknownFields protoimpl.UnknownFields- sizeCache protoimpl.SizeCache-}--func (x *UpdateSavedQueryOrganizerRequest) Reset() {- *x = UpdateSavedQueryOrganizerRequest{}- mi := &file_v1_saved_query_service_proto_msgTypes[10]- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))- ms.StoreMessageInfo(mi)-}--func (x *UpdateSavedQueryOrganizerRequest) String() string {- return protoimpl.X.MessageStringOf(x)-}--func (*UpdateSavedQueryOrganizerRequest) ProtoMessage() {}--func (x *UpdateSavedQueryOrganizerRequest) ProtoReflect() protoreflect.Message {- mi := &file_v1_saved_query_service_proto_msgTypes[10]- if x != nil {- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))- if ms.LoadMessageInfo() == nil {- ms.StoreMessageInfo(mi)- }- return ms- }- return mi.MessageOf(x)-}--// Deprecated: Use UpdateSavedQueryOrganizerRequest.ProtoReflect.Descriptor instead.-func (*UpdateSavedQueryOrganizerRequest) Descriptor() ([]byte, []int) {- return file_v1_saved_query_service_proto_rawDescGZIP(), []int{10}-}--func (x *UpdateSavedQueryOrganizerRequest) GetOrganizer() *SavedQueryOrganizer {- if x != nil {- return x.Organizer- }- return nil-}--func (x *UpdateSavedQueryOrganizerRequest) GetUpdateMask() *fieldmaskpb.FieldMask {- if x != nil {- return x.UpdateMask- }- return nil-}--func (x *UpdateSavedQueryOrganizerRequest) GetAllowMissing() bool {- if x != nil {- return x.AllowMissing- }- return false-}--type SavedQueryOrganizer struct {- state protoimpl.MessageState `protogen:"open.v1"`- // The name of the saved query.- // Format: projects/{project}/savedQueries/{savedQuery}- SavedQuery string `protobuf:"bytes,1,opt,name=saved_query,json=savedQuery,proto3" json:"saved_query,omitempty"`- // starred means if the saved query is starred.- Starred bool `protobuf:"varint,2,opt,name=starred,proto3" json:"starred,omitempty"`- Folders []string `protobuf:"bytes,3,rep,name=folders,proto3" json:"folders,omitempty"`- unknownFields protoimpl.UnknownFields- sizeCache protoimpl.SizeCache-}--func (x *SavedQueryOrganizer) Reset() {- *x = SavedQueryOrganizer{}- mi := &file_v1_saved_query_service_proto_msgTypes[11]- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))- ms.StoreMessageInfo(mi)-}--func (x *SavedQueryOrganizer) String() string {- return protoimpl.X.MessageStringOf(x)-}--func (*SavedQueryOrganizer) ProtoMessage() {}--func (x *SavedQueryOrganizer) ProtoReflect() protoreflect.Message {- mi := &file_v1_saved_query_service_proto_msgTypes[11]- if x != nil {- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))- if ms.LoadMessageInfo() == nil {- ms.StoreMessageInfo(mi)- }- return ms- }- return mi.MessageOf(x)-}--// Deprecated: Use SavedQueryOrganizer.ProtoReflect.Descriptor instead.-func (*SavedQueryOrganizer) Descriptor() ([]byte, []int) {- return file_v1_saved_query_service_proto_rawDescGZIP(), []int{11}-}--func (x *SavedQueryOrganizer) GetSavedQuery() string {- if x != nil {- return x.SavedQuery- }- return ""-}--func (x *SavedQueryOrganizer) GetStarred() bool {- if x != nil {- return x.Starred- }- return false-}--func (x *SavedQueryOrganizer) GetFolders() []string {- if x != nil {- return x.Folders- }- return nil-}-type DeleteSavedQueryRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the saved query to delete.@@ -809,7 +639,7 @@ type DeleteSavedQueryRequest struct {func (x *DeleteSavedQueryRequest) Reset() {*x = DeleteSavedQueryRequest{}- mi := &file_v1_saved_query_service_proto_msgTypes[12]+ mi := &file_v1_saved_query_service_proto_msgTypes[10]ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))ms.StoreMessageInfo(mi)}@@ -821,7 +651,7 @@ func (x *DeleteSavedQueryRequest) String() string {func (*DeleteSavedQueryRequest) ProtoMessage() {}func (x *DeleteSavedQueryRequest) ProtoReflect() protoreflect.Message {- mi := &file_v1_saved_query_service_proto_msgTypes[12]+ mi := &file_v1_saved_query_service_proto_msgTypes[10]if x != nil {ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))if ms.LoadMessageInfo() == nil {@@ -834,7 +664,7 @@ func (x *DeleteSavedQueryRequest) ProtoReflect() protoreflect.Message {// Deprecated: Use DeleteSavedQueryRequest.ProtoReflect.Descriptor instead.func (*DeleteSavedQueryRequest) Descriptor() ([]byte, []int) {- return file_v1_saved_query_service_proto_rawDescGZIP(), []int{12}+ return file_v1_saved_query_service_proto_rawDescGZIP(), []int{10}}func (x *DeleteSavedQueryRequest) GetName() string {@@ -857,7 +687,7 @@ type SearchSavedQueriesRequest struct {// - title: the saved query title, support "contains" operator.// - creator: the saved query creator in "users/{email}" format, support "==" and "!=" operator.// - starred: should be "true" or "false", filter starred/unstarred saved queries, support "==" operator.- // - folder: the saved query organizer folder path, support "==" operator.+ // - folder: the saved query folder path, support "==" operator.//// For example:// creator == "users/{email}"@@ -881,7 +711,7 @@ type SearchSavedQueriesRequest struct {func (x *SearchSavedQueriesRequest) Reset() {*x = SearchSavedQueriesRequest{}- mi := &file_v1_saved_query_service_proto_msgTypes[13]+ mi := &file_v1_saved_query_service_proto_msgTypes[11]ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))ms.StoreMessageInfo(mi)}@@ -893,7 +723,7 @@ func (x *SearchSavedQueriesRequest) String() string {func (*SearchSavedQueriesRequest) ProtoMessage() {}func (x *SearchSavedQueriesRequest) ProtoReflect() protoreflect.Message {- mi := &file_v1_saved_query_service_proto_msgTypes[13]+ mi := &file_v1_saved_query_service_proto_msgTypes[11]if x != nil {ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))if ms.LoadMessageInfo() == nil {@@ -906,7 +736,7 @@ func (x *SearchSavedQueriesRequest) ProtoReflect() protoreflect.Message {// Deprecated: Use SearchSavedQueriesRequest.ProtoReflect.Descriptor instead.func (*SearchSavedQueriesRequest) Descriptor() ([]byte, []int) {- return file_v1_saved_query_service_proto_rawDescGZIP(), []int{13}+ return file_v1_saved_query_service_proto_rawDescGZIP(), []int{11}}func (x *SearchSavedQueriesRequest) GetParent() string {@@ -951,7 +781,7 @@ type SearchSavedQueriesResponse struct {func (x *SearchSavedQueriesResponse) Reset() {*x = SearchSavedQueriesResponse{}- mi := &file_v1_saved_query_service_proto_msgTypes[14]+ mi := &file_v1_saved_query_service_proto_msgTypes[12]ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))ms.StoreMessageInfo(mi)}@@ -963,7 +793,7 @@ func (x *SearchSavedQueriesResponse) String() string {func (*SearchSavedQueriesResponse) ProtoMessage() {}func (x *SearchSavedQueriesResponse) ProtoReflect() protoreflect.Message {- mi := &file_v1_saved_query_service_proto_msgTypes[14]+ mi := &file_v1_saved_query_service_proto_msgTypes[12]if x != nil {ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))if ms.LoadMessageInfo() == nil {@@ -976,7 +806,7 @@ func (x *SearchSavedQueriesResponse) ProtoReflect() protoreflect.Message {// Deprecated: Use SearchSavedQueriesResponse.ProtoReflect.Descriptor instead.func (*SearchSavedQueriesResponse) Descriptor() ([]byte, []int) {- return file_v1_saved_query_service_proto_rawDescGZIP(), []int{14}+ return file_v1_saved_query_service_proto_rawDescGZIP(), []int{12}}func (x *SearchSavedQueriesResponse) GetSavedQueries() []*SavedQuery {@@ -1008,7 +838,8 @@ type SavedQuery struct {Database string `protobuf:"bytes,3,opt,name=database,proto3" json:"database,omitempty"`// The title of the saved query.Title string `protobuf:"bytes,4,opt,name=title,proto3" json:"title,omitempty"`- // The creator of the SavedQuery.+ // The creator of the SavedQuery — the fixed owner; ownership does not+ // transfer.// Format: users/{email}Creator string `protobuf:"bytes,5,opt,name=creator,proto3" json:"creator,omitempty"`// The create time of the saved query.@@ -1022,15 +853,18 @@ type SavedQuery struct {// content_size is the full size of the content, may not match the size of the `content` field.ContentSize int64 `protobuf:"varint,9,opt,name=content_size,json=contentSize,proto3" json:"content_size,omitempty"`// starred indicates whether the saved query is starred by the current authenticated user.- Starred bool `protobuf:"varint,11,opt,name=starred,proto3" json:"starred,omitempty"`- Folders []string `protobuf:"bytes,12,rep,name=folders,proto3" json:"folders,omitempty"`+ Starred bool `protobuf:"varint,11,opt,name=starred,proto3" json:"starred,omitempty"`+ // The folder path this saved query lives in, set by its creator (or an+ // admin). Empty means unfiled. A saved query lives in exactly one folder;+ // a folder is a path on saved queries, e.g. "a/b/c".+ Folder string `protobuf:"bytes,13,opt,name=folder,proto3" json:"folder,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}func (x *SavedQuery) Reset() {*x = SavedQuery{}- mi := &file_v1_saved_query_service_proto_msgTypes[15]+ mi := &file_v1_saved_query_service_proto_msgTypes[13]ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))ms.StoreMessageInfo(mi)}@@ -1042,7 +876,7 @@ func (x *SavedQuery) String() string {func (*SavedQuery) ProtoMessage() {}func (x *SavedQuery) ProtoReflect() protoreflect.Message {- mi := &file_v1_saved_query_service_proto_msgTypes[15]+ mi := &file_v1_saved_query_service_proto_msgTypes[13]if x != nil {ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))if ms.LoadMessageInfo() == nil {@@ -1055,7 +889,7 @@ func (x *SavedQuery) ProtoReflect() protoreflect.Message {// Deprecated: Use SavedQuery.ProtoReflect.Descriptor instead.func (*SavedQuery) Descriptor() ([]byte, []int) {- return file_v1_saved_query_service_proto_rawDescGZIP(), []int{15}+ return file_v1_saved_query_service_proto_rawDescGZIP(), []int{13}}func (x *SavedQuery) GetName() string {@@ -1128,11 +962,11 @@ func (x *SavedQuery) GetStarred() bool {return false}-func (x *SavedQuery) GetFolders() []string {+func (x *SavedQuery) GetFolder() string {if x != nil {- return x.Folders+ return x.Folder}- return nil+ return ""}var File_v1_saved_query_service_proto protoreflect.FileDescriptor@@ -1156,55 +990,43 @@ const file_v1_saved_query_service_proto_rawDesc = "" +"page_token\x18\x04 \x01(\tR\tpageToken\"\x80\x01\n" +"\x18ListSavedQueriesResponse\x12<\n" +"\rsaved_queries\x18\x01 \x03(\v2\x17.bytebase.v1.SavedQueryR\fsavedQueries\x12&\n" +- "\x0fnext_page_token\x18\x02 \x01(\tR\rnextPageToken\";\n" +- "\x1cListSavedQueryFoldersRequest\x12\x1b\n" +- "\x06parent\x18\x01 \x01(\tB\x03\xe0A\x02R\x06parent\"X\n" +- "\x1dListSavedQueryFoldersResponse\x127\n" +- "\afolders\x18\x01 \x03(\v2\x1d.bytebase.v1.SavedQueryFolderR\afolders\"\xac\x01\n" +- "\x10SavedQueryFolder\x12\x18\n" +- "\afolders\x18\x01 \x03(\tR\afolders\x12B\n" +- "\bcategory\x18\x02 \x01(\x0e2&.bytebase.v1.SavedQueryFolder.CategoryR\bcategory\":\n" +- "\bCategory\x12\x18\n" +- "\x14CATEGORY_UNSPECIFIED\x10\x00\x12\b\n" +- "\x04MINE\x10\x01\x12\n" +- "\n" +- "\x06SHARED\x10\x02\"\x95\x01\n" ++ "\x0fnext_page_token\x18\x02 \x01(\tR\rnextPageToken\"n\n" ++ "\x1eSearchSavedQueryFoldersRequest\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\";\n" ++ "\x1fSearchSavedQueryFoldersResponse\x12\x18\n" ++ "\afolders\x18\x01 \x03(\tR\afolders\"\x95\x01\n" +"\x17UpdateSavedQueryRequest\x12=\n" +"\vsaved_query\x18\x01 \x01(\v2\x17.bytebase.v1.SavedQueryB\x03\xe0A\x02R\n" +"savedQuery\x12;\n" +"\vupdate_mask\x18\x02 \x01(\v2\x1a.google.protobuf.FieldMaskR\n" +- "updateMask\"\xe3\x01\n" +- "%BatchUpdateSavedQueryOrganizerRequest\x12\x1b\n" ++ "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\"\xd6\x01\n" ++ "\x1eBatchUpdateSavedQueriesRequest\x12\x1b\n" +"\x06parent\x18\x01 \x01(\tB\x03\xe0A\x02R\x06parent\x12\x16\n" +- "\x06filter\x18\x02 \x01(\tR\x06filter\x12C\n" +- "\torganizer\x18\x03 \x01(\v2 .bytebase.v1.SavedQueryOrganizerB\x03\xe0A\x02R\torganizer\x12@\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\"\xa5\x01\n" +- "&BatchUpdateSavedQueryOrganizerResponse\x12V\n" +- "\x16saved_query_organizers\x18\x01 \x03(\v2 .bytebase.v1.SavedQueryOrganizerR\x14savedQueryOrganizers\x12#\n" +- "\rupdated_count\x18\x02 \x01(\x05R\fupdatedCount\"\xc9\x01\n" +- " UpdateSavedQueryOrganizerRequest\x12C\n" +- "\torganizer\x18\x01 \x01(\v2 .bytebase.v1.SavedQueryOrganizerB\x03\xe0A\x02R\torganizer\x12;\n" +- "\vupdate_mask\x18\x02 \x01(\v2\x1a.google.protobuf.FieldMaskR\n" +- "updateMask\x12#\n" +- "\rallow_missing\x18\x03 \x01(\bR\fallowMissing\"o\n" +- "\x13SavedQueryOrganizer\x12$\n" +- "\vsaved_query\x18\x01 \x01(\tB\x03\xe0A\x02R\n" +- "savedQuery\x12\x18\n" +- "\astarred\x18\x02 \x01(\bR\astarred\x12\x18\n" +- "\afolders\x18\x03 \x03(\tR\afolders\"N\n" ++ "updateMask\"F\n" ++ "\x1fBatchUpdateSavedQueriesResponse\x12#\n" ++ "\rupdated_count\x18\x01 \x01(\x05R\fupdatedCount\"N\n" +"\x17DeleteSavedQueryRequest\x123\n" +"\x04name\x18\x01 \x01(\tB\x1f\xe0A\x02\xfaA\x19\n" +- "\x17bytebase.com/SavedQueryR\x04name\"\x8c\x01\n" +- "\x19SearchSavedQueriesRequest\x12\x1b\n" +- "\x06parent\x18\x01 \x01(\tB\x03\xe0A\x02R\x06parent\x12\x16\n" ++ "\x17bytebase.com/SavedQueryR\x04name\"\xa5\x01\n" ++ "\x19SearchSavedQueriesRequest\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\x1b\n" +"\tpage_size\x18\x03 \x01(\x05R\bpageSize\x12\x1d\n" +"\n" +"page_token\x18\x04 \x01(\tR\tpageToken\"\x82\x01\n" +"\x1aSearchSavedQueriesResponse\x12<\n" +"\rsaved_queries\x18\x01 \x03(\v2\x17.bytebase.v1.SavedQueryR\fsavedQueries\x12&\n" +- "\x0fnext_page_token\x18\x02 \x01(\tR\rnextPageToken\"\x8d\x04\n" ++ "\x0fnext_page_token\x18\x02 \x01(\tR\rnextPageToken\"\x9f\x04\n" +"\n" +"SavedQuery\x12\x1a\n" +"\x04name\x18\x01 \x01(\tB\x06\xe0A\x02\xe0A\x05R\x04name\x12\x1d\n" +@@ -1218,20 +1040,20 @@ const file_v1_saved_query_service_proto_rawDesc = "" +"updateTime\x12\x1d\n" +"\acontent\x18\b \x01(\fB\x03\xe0A\x02R\acontent\x12&\n" +"\fcontent_size\x18\t \x01(\x03B\x03\xe0A\x03R\vcontentSize\x12\x1d\n" +- "\astarred\x18\v \x01(\bB\x03\xe0A\x03R\astarred\x12\x1d\n" +- "\afolders\x18\f \x03(\tB\x03\xe0A\x03R\afolders:K\xeaAH\n" ++ "\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\vR\n" +- "visibility2\xf6\f\n" +- "\x11SavedQueryService\x12\xa9\x01\n" +- "\x10CreateSavedQuery\x12$.bytebase.v1.CreateSavedQueryRequest\x1a\x17.bytebase.v1.SavedQuery\"V\xdaA\x12parent,saved_query\x90\xea0\x02\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\xb0\x01\n" +- "\x10ListSavedQueries\x12$.bytebase.v1.ListSavedQueriesRequest\x1a%.bytebase.v1.ListSavedQueriesResponse\"O\xdaA\x06parent\x8a\xea0\x12bb.worksheets.list\x90\xea0\x01\x82\xd3\xe4\x93\x02&\x12$/v1/{parent=projects/*}/savedQueries\x12\xae\x01\n" +- "\x15ListSavedQueryFolders\x12).bytebase.v1.ListSavedQueryFoldersRequest\x1a*.bytebase.v1.ListSavedQueryFoldersResponse\">\xdaA\x06parent\x90\xea0\x02\x82\xd3\xe4\x93\x02+\x12)/v1/{parent=projects/*}/savedQueryFolders\x12\xaa\x01\n" +- "\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\xb6\x01\n" +- "\x10UpdateSavedQuery\x12$.bytebase.v1.UpdateSavedQueryRequest\x1a\x17.bytebase.v1.SavedQuery\"c\xdaA\x17saved_query,update_mask\x90\xea0\x02\x82\xd3\xe4\x93\x02?:\vsaved_query20/v1/{saved_query.name=projects/*/savedQueries/*}\x12\xdc\x01\n" +- "\x19UpdateSavedQueryOrganizer\x12-.bytebase.v1.UpdateSavedQueryOrganizerRequest\x1a .bytebase.v1.SavedQueryOrganizer\"n\xdaA\x15organizer,update_mask\x90\xea0\x02\x82\xd3\xe4\x93\x02L:\torganizer2?/v1/{organizer.saved_query=projects/*/savedQueries/*}/organizer\x12\xf4\x01\n" +- "\x1eBatchUpdateSavedQueryOrganizer\x122.bytebase.v1.BatchUpdateSavedQueryOrganizerRequest\x1a3.bytebase.v1.BatchUpdateSavedQueryOrganizerResponse\"i\xdaA\x1cparent,organizer,update_mask\x90\xea0\x02\x82\xd3\xe4\x93\x02@:\x01*\";/v1/{parent=projects/*}/savedQueries/organizers:batchUpdate\x12\x8d\x01\n" ++ "\x10\vJ\x04\b\f\x10\rR\n" ++ "visibilityR\afolders2\xd2\f\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" ++ "\x10ListSavedQueries\x12$.bytebase.v1.ListSavedQueriesRequest\x1a%.bytebase.v1.ListSavedQueriesResponse\"Q\xdaA\x06parent\x8a\xea0\x14bb.savedQueries.list\x90\xea0\x01\x82\xd3\xe4\x93\x02&\x12$/v1/{parent=projects/*}/savedQueries\x12\xaa\x01\n" ++ "\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\xb6\x01\n" ++ "\x10UpdateSavedQuery\x12$.bytebase.v1.UpdateSavedQueryRequest\x1a\x17.bytebase.v1.SavedQuery\"c\xdaA\x17saved_query,update_mask\x90\xea0\x02\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\xd6\x01\n" ++ "\x17BatchUpdateSavedQueries\x12+.bytebase.v1.BatchUpdateSavedQueriesRequest\x1a,.bytebase.v1.BatchUpdateSavedQueriesResponse\"`\xdaA\x1eparent,saved_query,update_mask\x90\xea0\x02\x82\xd3\xe4\x93\x025:\x01*\"0/v1/{parent=projects/*}/savedQueries:batchUpdate\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/*}B\xac\x01\n" +"\x0fcom.bytebase.v1B\x16SavedQueryServiceProtoP\x01Z4github.com/bytebase/bytebase/backend/generated-go/v1\xa2\x02\x03BXX\xaa\x02\vBytebase.V1\xca\x02\vBytebase\\V1\xe2\x02\x17Bytebase\\V1\\GPBMetadata\xea\x02\fBytebase::V1b\x06proto3"@@ -1247,68 +1069,59 @@ func file_v1_saved_query_service_proto_rawDescGZIP() []byte {return file_v1_saved_query_service_proto_rawDescData}-var file_v1_saved_query_service_proto_enumTypes = make([]protoimpl.EnumInfo, 1)-var file_v1_saved_query_service_proto_msgTypes = make([]protoimpl.MessageInfo, 16)+var file_v1_saved_query_service_proto_msgTypes = make([]protoimpl.MessageInfo, 14)var file_v1_saved_query_service_proto_goTypes = []any{- (SavedQueryFolder_Category)(0), // 0: bytebase.v1.SavedQueryFolder.Category- (*CreateSavedQueryRequest)(nil), // 1: bytebase.v1.CreateSavedQueryRequest- (*GetSavedQueryRequest)(nil), // 2: bytebase.v1.GetSavedQueryRequest- (*ListSavedQueriesRequest)(nil), // 3: bytebase.v1.ListSavedQueriesRequest- (*ListSavedQueriesResponse)(nil), // 4: bytebase.v1.ListSavedQueriesResponse- (*ListSavedQueryFoldersRequest)(nil), // 5: bytebase.v1.ListSavedQueryFoldersRequest- (*ListSavedQueryFoldersResponse)(nil), // 6: bytebase.v1.ListSavedQueryFoldersResponse- (*SavedQueryFolder)(nil), // 7: bytebase.v1.SavedQueryFolder- (*UpdateSavedQueryRequest)(nil), // 8: bytebase.v1.UpdateSavedQueryRequest- (*BatchUpdateSavedQueryOrganizerRequest)(nil), // 9: bytebase.v1.BatchUpdateSavedQueryOrganizerRequest- (*BatchUpdateSavedQueryOrganizerResponse)(nil), // 10: bytebase.v1.BatchUpdateSavedQueryOrganizerResponse- (*UpdateSavedQueryOrganizerRequest)(nil), // 11: bytebase.v1.UpdateSavedQueryOrganizerRequest- (*SavedQueryOrganizer)(nil), // 12: bytebase.v1.SavedQueryOrganizer- (*DeleteSavedQueryRequest)(nil), // 13: bytebase.v1.DeleteSavedQueryRequest- (*SearchSavedQueriesRequest)(nil), // 14: bytebase.v1.SearchSavedQueriesRequest- (*SearchSavedQueriesResponse)(nil), // 15: bytebase.v1.SearchSavedQueriesResponse- (*SavedQuery)(nil), // 16: bytebase.v1.SavedQuery- (*fieldmaskpb.FieldMask)(nil), // 17: google.protobuf.FieldMask- (*timestamppb.Timestamp)(nil), // 18: google.protobuf.Timestamp- (*emptypb.Empty)(nil), // 19: google.protobuf.Empty+ (*CreateSavedQueryRequest)(nil), // 0: bytebase.v1.CreateSavedQueryRequest+ (*GetSavedQueryRequest)(nil), // 1: bytebase.v1.GetSavedQueryRequest+ (*ListSavedQueriesRequest)(nil), // 2: bytebase.v1.ListSavedQueriesRequest+ (*ListSavedQueriesResponse)(nil), // 3: bytebase.v1.ListSavedQueriesResponse+ (*SearchSavedQueryFoldersRequest)(nil), // 4: bytebase.v1.SearchSavedQueryFoldersRequest+ (*SearchSavedQueryFoldersResponse)(nil), // 5: bytebase.v1.SearchSavedQueryFoldersResponse+ (*UpdateSavedQueryRequest)(nil), // 6: bytebase.v1.UpdateSavedQueryRequest+ (*UpdateSavedQueryStarRequest)(nil), // 7: bytebase.v1.UpdateSavedQueryStarRequest+ (*BatchUpdateSavedQueriesRequest)(nil), // 8: bytebase.v1.BatchUpdateSavedQueriesRequest+ (*BatchUpdateSavedQueriesResponse)(nil), // 9: bytebase.v1.BatchUpdateSavedQueriesResponse+ (*DeleteSavedQueryRequest)(nil), // 10: bytebase.v1.DeleteSavedQueryRequest+ (*SearchSavedQueriesRequest)(nil), // 11: bytebase.v1.SearchSavedQueriesRequest+ (*SearchSavedQueriesResponse)(nil), // 12: bytebase.v1.SearchSavedQueriesResponse+ (*SavedQuery)(nil), // 13: bytebase.v1.SavedQuery+ (*fieldmaskpb.FieldMask)(nil), // 14: google.protobuf.FieldMask+ (*timestamppb.Timestamp)(nil), // 15: google.protobuf.Timestamp+ (*emptypb.Empty)(nil), // 16: google.protobuf.Empty}var file_v1_saved_query_service_proto_depIdxs = []int32{- 16, // 0: bytebase.v1.CreateSavedQueryRequest.saved_query:type_name -> bytebase.v1.SavedQuery- 16, // 1: bytebase.v1.ListSavedQueriesResponse.saved_queries:type_name -> bytebase.v1.SavedQuery- 7, // 2: bytebase.v1.ListSavedQueryFoldersResponse.folders:type_name -> bytebase.v1.SavedQueryFolder- 0, // 3: bytebase.v1.SavedQueryFolder.category:type_name -> bytebase.v1.SavedQueryFolder.Category- 16, // 4: bytebase.v1.UpdateSavedQueryRequest.saved_query:type_name -> bytebase.v1.SavedQuery- 17, // 5: bytebase.v1.UpdateSavedQueryRequest.update_mask:type_name -> google.protobuf.FieldMask- 12, // 6: bytebase.v1.BatchUpdateSavedQueryOrganizerRequest.organizer:type_name -> bytebase.v1.SavedQueryOrganizer- 17, // 7: bytebase.v1.BatchUpdateSavedQueryOrganizerRequest.update_mask:type_name -> google.protobuf.FieldMask- 12, // 8: bytebase.v1.BatchUpdateSavedQueryOrganizerResponse.saved_query_organizers:type_name -> bytebase.v1.SavedQueryOrganizer- 12, // 9: bytebase.v1.UpdateSavedQueryOrganizerRequest.organizer:type_name -> bytebase.v1.SavedQueryOrganizer- 17, // 10: bytebase.v1.UpdateSavedQueryOrganizerRequest.update_mask:type_name -> google.protobuf.FieldMask- 16, // 11: bytebase.v1.SearchSavedQueriesResponse.saved_queries:type_name -> bytebase.v1.SavedQuery- 18, // 12: bytebase.v1.SavedQuery.create_time:type_name -> google.protobuf.Timestamp- 18, // 13: bytebase.v1.SavedQuery.update_time:type_name -> google.protobuf.Timestamp- 1, // 14: bytebase.v1.SavedQueryService.CreateSavedQuery:input_type -> bytebase.v1.CreateSavedQueryRequest- 2, // 15: bytebase.v1.SavedQueryService.GetSavedQuery:input_type -> bytebase.v1.GetSavedQueryRequest- 3, // 16: bytebase.v1.SavedQueryService.ListSavedQueries:input_type -> bytebase.v1.ListSavedQueriesRequest- 5, // 17: bytebase.v1.SavedQueryService.ListSavedQueryFolders:input_type -> bytebase.v1.ListSavedQueryFoldersRequest- 14, // 18: bytebase.v1.SavedQueryService.SearchSavedQueries:input_type -> bytebase.v1.SearchSavedQueriesRequest- 8, // 19: bytebase.v1.SavedQueryService.UpdateSavedQuery:input_type -> bytebase.v1.UpdateSavedQueryRequest- 11, // 20: bytebase.v1.SavedQueryService.UpdateSavedQueryOrganizer:input_type -> bytebase.v1.UpdateSavedQueryOrganizerRequest- 9, // 21: bytebase.v1.SavedQueryService.BatchUpdateSavedQueryOrganizer:input_type -> bytebase.v1.BatchUpdateSavedQueryOrganizerRequest- 13, // 22: bytebase.v1.SavedQueryService.DeleteSavedQuery:input_type -> bytebase.v1.DeleteSavedQueryRequest- 16, // 23: bytebase.v1.SavedQueryService.CreateSavedQuery:output_type -> bytebase.v1.SavedQuery- 16, // 24: bytebase.v1.SavedQueryService.GetSavedQuery:output_type -> bytebase.v1.SavedQuery- 4, // 25: bytebase.v1.SavedQueryService.ListSavedQueries:output_type -> bytebase.v1.ListSavedQueriesResponse- 6, // 26: bytebase.v1.SavedQueryService.ListSavedQueryFolders:output_type -> bytebase.v1.ListSavedQueryFoldersResponse- 15, // 27: bytebase.v1.SavedQueryService.SearchSavedQueries:output_type -> bytebase.v1.SearchSavedQueriesResponse- 16, // 28: bytebase.v1.SavedQueryService.UpdateSavedQuery:output_type -> bytebase.v1.SavedQuery- 12, // 29: bytebase.v1.SavedQueryService.UpdateSavedQueryOrganizer:output_type -> bytebase.v1.SavedQueryOrganizer- 10, // 30: bytebase.v1.SavedQueryService.BatchUpdateSavedQueryOrganizer:output_type -> bytebase.v1.BatchUpdateSavedQueryOrganizerResponse- 19, // 31: bytebase.v1.SavedQueryService.DeleteSavedQuery:output_type -> google.protobuf.Empty- 23, // [23:32] is the sub-list for method output_type- 14, // [14:23] is the sub-list for method input_type- 14, // [14:14] is the sub-list for extension type_name- 14, // [14:14] is the sub-list for extension extendee- 0, // [0:14] is the sub-list for field type_name+ 13, // 0: bytebase.v1.CreateSavedQueryRequest.saved_query:type_name -> bytebase.v1.SavedQuery+ 13, // 1: bytebase.v1.ListSavedQueriesResponse.saved_queries:type_name -> bytebase.v1.SavedQuery+ 13, // 2: bytebase.v1.UpdateSavedQueryRequest.saved_query:type_name -> bytebase.v1.SavedQuery+ 14, // 3: bytebase.v1.UpdateSavedQueryRequest.update_mask:type_name -> google.protobuf.FieldMask+ 13, // 4: bytebase.v1.BatchUpdateSavedQueriesRequest.saved_query:type_name -> bytebase.v1.SavedQuery+ 14, // 5: bytebase.v1.BatchUpdateSavedQueriesRequest.update_mask:type_name -> google.protobuf.FieldMask+ 13, // 6: bytebase.v1.SearchSavedQueriesResponse.saved_queries:type_name -> bytebase.v1.SavedQuery+ 15, // 7: bytebase.v1.SavedQuery.create_time:type_name -> google.protobuf.Timestamp+ 15, // 8: bytebase.v1.SavedQuery.update_time:type_name -> google.protobuf.Timestamp+ 0, // 9: bytebase.v1.SavedQueryService.CreateSavedQuery:input_type -> bytebase.v1.CreateSavedQueryRequest+ 1, // 10: bytebase.v1.SavedQueryService.GetSavedQuery:input_type -> bytebase.v1.GetSavedQueryRequest+ 2, // 11: bytebase.v1.SavedQueryService.ListSavedQueries:input_type -> bytebase.v1.ListSavedQueriesRequest+ 11, // 12: bytebase.v1.SavedQueryService.SearchSavedQueries:input_type -> bytebase.v1.SearchSavedQueriesRequest+ 4, // 13: bytebase.v1.SavedQueryService.SearchSavedQueryFolders:input_type -> bytebase.v1.SearchSavedQueryFoldersRequest+ 6, // 14: bytebase.v1.SavedQueryService.UpdateSavedQuery:input_type -> bytebase.v1.UpdateSavedQueryRequest+ 7, // 15: bytebase.v1.SavedQueryService.UpdateSavedQueryStar:input_type -> bytebase.v1.UpdateSavedQueryStarRequest+ 8, // 16: bytebase.v1.SavedQueryService.BatchUpdateSavedQueries:input_type -> bytebase.v1.BatchUpdateSavedQueriesRequest+ 10, // 17: bytebase.v1.SavedQueryService.DeleteSavedQuery:input_type -> bytebase.v1.DeleteSavedQueryRequest+ 13, // 18: bytebase.v1.SavedQueryService.CreateSavedQuery:output_type -> bytebase.v1.SavedQuery+ 13, // 19: bytebase.v1.SavedQueryService.GetSavedQuery:output_type -> bytebase.v1.SavedQuery+ 3, // 20: bytebase.v1.SavedQueryService.ListSavedQueries:output_type -> bytebase.v1.ListSavedQueriesResponse+ 12, // 21: bytebase.v1.SavedQueryService.SearchSavedQueries:output_type -> bytebase.v1.SearchSavedQueriesResponse+ 5, // 22: bytebase.v1.SavedQueryService.SearchSavedQueryFolders:output_type -> bytebase.v1.SearchSavedQueryFoldersResponse+ 13, // 23: bytebase.v1.SavedQueryService.UpdateSavedQuery:output_type -> bytebase.v1.SavedQuery+ 13, // 24: bytebase.v1.SavedQueryService.UpdateSavedQueryStar:output_type -> bytebase.v1.SavedQuery+ 9, // 25: bytebase.v1.SavedQueryService.BatchUpdateSavedQueries:output_type -> bytebase.v1.BatchUpdateSavedQueriesResponse+ 16, // 26: bytebase.v1.SavedQueryService.DeleteSavedQuery:output_type -> google.protobuf.Empty+ 18, // [18:27] is the sub-list for method output_type+ 9, // [9:18] is the sub-list for method input_type+ 9, // [9:9] is the sub-list for extension type_name+ 9, // [9:9] is the sub-list for extension extendee+ 0, // [0:9] is the sub-list for field type_name}func init() { file_v1_saved_query_service_proto_init() }@@ -1322,14 +1135,13 @@ func file_v1_saved_query_service_proto_init() {File: protoimpl.DescBuilder{GoPackagePath: reflect.TypeOf(x{}).PkgPath(),RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_saved_query_service_proto_rawDesc), len(file_v1_saved_query_service_proto_rawDesc)),- NumEnums: 1,- NumMessages: 16,+ NumEnums: 0,+ NumMessages: 14,NumExtensions: 0,NumServices: 1,},GoTypes: file_v1_saved_query_service_proto_goTypes,DependencyIndexes: file_v1_saved_query_service_proto_depIdxs,- EnumInfos: file_v1_saved_query_service_proto_enumTypes,MessageInfos: file_v1_saved_query_service_proto_msgTypes,}.Build()File_v1_saved_query_service_proto = out.Filediff --git a/backend/generated-go/v1/saved_query_service.pb.gw.go b/backend/generated-go/v1/saved_query_service.pb.gw.goindex 71437a5178..9ba6cd6d00 100644--- a/backend/generated-go/v1/saved_query_service.pb.gw.go+++ b/backend/generated-go/v1/saved_query_service.pb.gw.go@@ -172,12 +172,15 @@ func local_request_SavedQueryService_ListSavedQueries_0(ctx context.Context, marreturn msg, metadata, err}-func request_SavedQueryService_ListSavedQueryFolders_0(ctx context.Context, marshaler runtime.Marshaler, client SavedQueryServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_SavedQueryService_SearchSavedQueries_0(ctx context.Context, marshaler runtime.Marshaler, client SavedQueryServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq ListSavedQueryFoldersRequest+ protoReq SearchSavedQueriesRequestmetadata runtime.ServerMetadataerr error)+ if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }val, ok := pathParams["parent"]if !ok {return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent")@@ -189,16 +192,19 @@ func request_SavedQueryService_ListSavedQueryFolders_0(ctx context.Context, marsif req.Body != nil {_, _ = io.Copy(io.Discard, req.Body)}- msg, err := client.ListSavedQueryFolders(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ msg, err := client.SearchSavedQueries(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_SavedQueryService_ListSavedQueryFolders_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_SearchSavedQueries_0(ctx context.Context, marshaler runtime.Marshaler, server SavedQueryServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq ListSavedQueryFoldersRequest+ protoReq SearchSavedQueriesRequestmetadata runtime.ServerMetadataerr error)+ if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }val, ok := pathParams["parent"]if !ok {return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent")@@ -207,13 +213,13 @@ func local_request_SavedQueryService_ListSavedQueryFolders_0(ctx context.Contextif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)}- msg, err := server.ListSavedQueryFolders(ctx, &protoReq)+ msg, err := server.SearchSavedQueries(ctx, &protoReq)return msg, metadata, err}-func request_SavedQueryService_SearchSavedQueries_0(ctx context.Context, marshaler runtime.Marshaler, client SavedQueryServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_SavedQueryService_SearchSavedQueryFolders_0(ctx context.Context, marshaler runtime.Marshaler, client SavedQueryServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq SearchSavedQueriesRequest+ protoReq SearchSavedQueryFoldersRequestmetadata runtime.ServerMetadataerr error)@@ -231,13 +237,13 @@ func request_SavedQueryService_SearchSavedQueries_0(ctx context.Context, marshalif req.Body != nil {_, _ = io.Copy(io.Discard, req.Body)}- msg, err := client.SearchSavedQueries(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ msg, err := client.SearchSavedQueryFolders(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_SavedQueryService_SearchSavedQueries_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_SearchSavedQueryFolders_0(ctx context.Context, marshaler runtime.Marshaler, server SavedQueryServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq SearchSavedQueriesRequest+ protoReq SearchSavedQueryFoldersRequestmetadata runtime.ServerMetadataerr error)@@ -252,7 +258,7 @@ func local_request_SavedQueryService_SearchSavedQueries_0(ctx context.Context, mif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)}- msg, err := server.SearchSavedQueries(ctx, &protoReq)+ msg, err := server.SearchSavedQueryFolders(ctx, &protoReq)return msg, metadata, err}@@ -337,90 +343,54 @@ func local_request_SavedQueryService_UpdateSavedQuery_0(ctx context.Context, marreturn msg, metadata, err}-var filter_SavedQueryService_UpdateSavedQueryOrganizer_0 = &utilities.DoubleArray{Encoding: map[string]int{"organizer": 0, "saved_query": 1}, Base: []int{1, 2, 1, 0, 0}, Check: []int{0, 1, 2, 3, 2}}--func request_SavedQueryService_UpdateSavedQueryOrganizer_0(ctx context.Context, marshaler runtime.Marshaler, client SavedQueryServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_SavedQueryService_UpdateSavedQueryStar_0(ctx context.Context, marshaler runtime.Marshaler, client SavedQueryServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq UpdateSavedQueryOrganizerRequest+ protoReq UpdateSavedQueryStarRequestmetadata runtime.ServerMetadataerr error)- newReader, berr := utilities.IOReaderFactory(req.Body)- if berr != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)- }- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Organizer); err != nil && !errors.Is(err, io.EOF) {+ if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {- if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Organizer); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- } else {- protoReq.UpdateMask = fieldMask- }- }- val, ok := pathParams["organizer.saved_query"]+ val, ok := pathParams["name"]if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "organizer.saved_query")+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")}- err = runtime.PopulateFieldFromPath(&protoReq, "organizer.saved_query", val)+ protoReq.Name, err = runtime.String(val)if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "organizer.saved_query", err)- }- if err := req.ParseForm(); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_SavedQueryService_UpdateSavedQueryOrganizer_0); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}if req.Body != nil {_, _ = io.Copy(io.Discard, req.Body)}- msg, err := client.UpdateSavedQueryOrganizer(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ msg, err := client.UpdateSavedQueryStar(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_SavedQueryService_UpdateSavedQueryOrganizer_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_UpdateSavedQueryStar_0(ctx context.Context, marshaler runtime.Marshaler, server SavedQueryServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq UpdateSavedQueryOrganizerRequest+ protoReq UpdateSavedQueryStarRequestmetadata runtime.ServerMetadataerr error)- newReader, berr := utilities.IOReaderFactory(req.Body)- if berr != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)- }- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Organizer); err != nil && !errors.Is(err, io.EOF) {+ if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {- if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Organizer); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- } else {- protoReq.UpdateMask = fieldMask- }- }- val, ok := pathParams["organizer.saved_query"]+ val, ok := pathParams["name"]if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "organizer.saved_query")+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")}- err = runtime.PopulateFieldFromPath(&protoReq, "organizer.saved_query", val)+ protoReq.Name, err = runtime.String(val)if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "organizer.saved_query", err)- }- if err := req.ParseForm(); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_SavedQueryService_UpdateSavedQueryOrganizer_0); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- msg, err := server.UpdateSavedQueryOrganizer(ctx, &protoReq)+ msg, err := server.UpdateSavedQueryStar(ctx, &protoReq)return msg, metadata, err}-func request_SavedQueryService_BatchUpdateSavedQueryOrganizer_0(ctx context.Context, marshaler runtime.Marshaler, client SavedQueryServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+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) {var (- protoReq BatchUpdateSavedQueryOrganizerRequest+ protoReq BatchUpdateSavedQueriesRequestmetadata runtime.ServerMetadataerr error)@@ -438,13 +408,13 @@ func request_SavedQueryService_BatchUpdateSavedQueryOrganizer_0(ctx context.Contif req.Body != nil {_, _ = io.Copy(io.Discard, req.Body)}- msg, err := client.BatchUpdateSavedQueryOrganizer(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ msg, err := client.BatchUpdateSavedQueries(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_SavedQueryService_BatchUpdateSavedQueryOrganizer_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_BatchUpdateSavedQueries_0(ctx context.Context, marshaler runtime.Marshaler, server SavedQueryServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq BatchUpdateSavedQueryOrganizerRequest+ protoReq BatchUpdateSavedQueriesRequestmetadata runtime.ServerMetadataerr error)@@ -459,7 +429,7 @@ func local_request_SavedQueryService_BatchUpdateSavedQueryOrganizer_0(ctx contexif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)}- msg, err := server.BatchUpdateSavedQueryOrganizer(ctx, &protoReq)+ msg, err := server.BatchUpdateSavedQueries(ctx, &protoReq)return msg, metadata, err}@@ -568,45 +538,45 @@ func RegisterSavedQueryServiceHandlerServer(ctx context.Context, mux *runtime.Se}forward_SavedQueryService_ListSavedQueries_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodGet, pattern_SavedQueryService_ListSavedQueryFolders_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_SavedQueryService_SearchSavedQueries_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.SavedQueryService/ListSavedQueryFolders", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/savedQueryFolders"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.SavedQueryService/SearchSavedQueries", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/savedQueries:search"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_SavedQueryService_ListSavedQueryFolders_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_SavedQueryService_SearchSavedQueries_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_ListSavedQueryFolders_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_SavedQueryService_SearchSavedQueries_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_SavedQueryService_SearchSavedQueries_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_SavedQueryService_SearchSavedQueryFolders_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.SavedQueryService/SearchSavedQueries", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/savedQueries:search"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.SavedQueryService/SearchSavedQueryFolders", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/savedQueries:searchFolders"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_SavedQueryService_SearchSavedQueries_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_SavedQueryService_SearchSavedQueryFolders_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_SearchSavedQueries_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_SavedQueryService_SearchSavedQueryFolders_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})mux.Handle(http.MethodPatch, pattern_SavedQueryService_UpdateSavedQuery_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())@@ -628,45 +598,45 @@ func RegisterSavedQueryServiceHandlerServer(ctx context.Context, mux *runtime.Se}forward_SavedQueryService_UpdateSavedQuery_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPatch, pattern_SavedQueryService_UpdateSavedQueryOrganizer_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_SavedQueryService_UpdateSavedQueryStar_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.SavedQueryService/UpdateSavedQueryOrganizer", runtime.WithHTTPPathPattern("/v1/{organizer.saved_query=projects/*/savedQueries/*}/organizer"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.SavedQueryService/UpdateSavedQueryStar", runtime.WithHTTPPathPattern("/v1/{name=projects/*/savedQueries/*}:updateStar"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_SavedQueryService_UpdateSavedQueryOrganizer_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_SavedQueryService_UpdateSavedQueryStar_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_UpdateSavedQueryOrganizer_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_SavedQueryService_UpdateSavedQueryStar_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_SavedQueryService_BatchUpdateSavedQueryOrganizer_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_SavedQueryService_BatchUpdateSavedQueries_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.SavedQueryService/BatchUpdateSavedQueryOrganizer", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/savedQueries/organizers:batchUpdate"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.SavedQueryService/BatchUpdateSavedQueries", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/savedQueries:batchUpdate"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_SavedQueryService_BatchUpdateSavedQueryOrganizer_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_SavedQueryService_BatchUpdateSavedQueries_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_BatchUpdateSavedQueryOrganizer_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_SavedQueryService_BatchUpdateSavedQueries_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())@@ -779,39 +749,39 @@ func RegisterSavedQueryServiceHandlerClient(ctx context.Context, mux *runtime.Se}forward_SavedQueryService_ListSavedQueries_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodGet, pattern_SavedQueryService_ListSavedQueryFolders_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_SavedQueryService_SearchSavedQueries_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/ListSavedQueryFolders", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/savedQueryFolders"))+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.SavedQueryService/SearchSavedQueries", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/savedQueries:search"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := request_SavedQueryService_ListSavedQueryFolders_0(annotatedContext, inboundMarshaler, client, req, pathParams)+ resp, md, err := request_SavedQueryService_SearchSavedQueries_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_ListSavedQueryFolders_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_SavedQueryService_SearchSavedQueries_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_SavedQueryService_SearchSavedQueries_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_SavedQueryService_SearchSavedQueryFolders_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/SearchSavedQueries", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/savedQueries:search"))+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.SavedQueryService/SearchSavedQueryFolders", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/savedQueries:searchFolders"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := request_SavedQueryService_SearchSavedQueries_0(annotatedContext, inboundMarshaler, client, req, pathParams)+ resp, md, err := request_SavedQueryService_SearchSavedQueryFolders_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_SearchSavedQueries_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_SavedQueryService_SearchSavedQueryFolders_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})mux.Handle(http.MethodPatch, pattern_SavedQueryService_UpdateSavedQuery_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())@@ -830,39 +800,39 @@ func RegisterSavedQueryServiceHandlerClient(ctx context.Context, mux *runtime.Se}forward_SavedQueryService_UpdateSavedQuery_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPatch, pattern_SavedQueryService_UpdateSavedQueryOrganizer_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_SavedQueryService_UpdateSavedQueryStar_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/UpdateSavedQueryOrganizer", runtime.WithHTTPPathPattern("/v1/{organizer.saved_query=projects/*/savedQueries/*}/organizer"))+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.SavedQueryService/UpdateSavedQueryStar", runtime.WithHTTPPathPattern("/v1/{name=projects/*/savedQueries/*}:updateStar"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := request_SavedQueryService_UpdateSavedQueryOrganizer_0(annotatedContext, inboundMarshaler, client, req, pathParams)+ resp, md, err := request_SavedQueryService_UpdateSavedQueryStar_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_UpdateSavedQueryOrganizer_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_SavedQueryService_UpdateSavedQueryStar_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_SavedQueryService_BatchUpdateSavedQueryOrganizer_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_SavedQueryService_BatchUpdateSavedQueries_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/BatchUpdateSavedQueryOrganizer", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/savedQueries/organizers:batchUpdate"))+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.SavedQueryService/BatchUpdateSavedQueries", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/savedQueries:batchUpdate"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := request_SavedQueryService_BatchUpdateSavedQueryOrganizer_0(annotatedContext, inboundMarshaler, client, req, pathParams)+ resp, md, err := request_SavedQueryService_BatchUpdateSavedQueries_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_BatchUpdateSavedQueryOrganizer_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_SavedQueryService_BatchUpdateSavedQueries_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())@@ -885,25 +855,25 @@ func RegisterSavedQueryServiceHandlerClient(ctx context.Context, mux *runtime.Se}var (- pattern_SavedQueryService_CreateSavedQuery_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "savedQueries"}, ""))- pattern_SavedQueryService_GetSavedQuery_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_ListSavedQueries_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "savedQueries"}, ""))- pattern_SavedQueryService_ListSavedQueryFolders_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "savedQueryFolders"}, ""))- pattern_SavedQueryService_SearchSavedQueries_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "savedQueries"}, "search"))- 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_UpdateSavedQueryOrganizer_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3, 2, 4}, []string{"v1", "projects", "savedQueries", "organizer.saved_query", "organizer"}, ""))- pattern_SavedQueryService_BatchUpdateSavedQueryOrganizer_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3, 2, 4}, []string{"v1", "projects", "parent", "savedQueries", "organizers"}, "batchUpdate"))- 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_CreateSavedQuery_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "savedQueries"}, ""))+ pattern_SavedQueryService_GetSavedQuery_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_ListSavedQueries_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "savedQueries"}, ""))+ pattern_SavedQueryService_SearchSavedQueries_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "savedQueries"}, "search"))+ 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_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"}, "")))var (- forward_SavedQueryService_CreateSavedQuery_0 = runtime.ForwardResponseMessage- forward_SavedQueryService_GetSavedQuery_0 = runtime.ForwardResponseMessage- forward_SavedQueryService_ListSavedQueries_0 = runtime.ForwardResponseMessage- forward_SavedQueryService_ListSavedQueryFolders_0 = runtime.ForwardResponseMessage- forward_SavedQueryService_SearchSavedQueries_0 = runtime.ForwardResponseMessage- forward_SavedQueryService_UpdateSavedQuery_0 = runtime.ForwardResponseMessage- forward_SavedQueryService_UpdateSavedQueryOrganizer_0 = runtime.ForwardResponseMessage- forward_SavedQueryService_BatchUpdateSavedQueryOrganizer_0 = runtime.ForwardResponseMessage- forward_SavedQueryService_DeleteSavedQuery_0 = runtime.ForwardResponseMessage+ forward_SavedQueryService_CreateSavedQuery_0 = runtime.ForwardResponseMessage+ forward_SavedQueryService_GetSavedQuery_0 = runtime.ForwardResponseMessage+ forward_SavedQueryService_ListSavedQueries_0 = runtime.ForwardResponseMessage+ forward_SavedQueryService_SearchSavedQueries_0 = runtime.ForwardResponseMessage+ 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_DeleteSavedQuery_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.goindex 894ba0bfaf..12de7f9aec 100644--- a/backend/generated-go/v1/saved_query_service_equal.pb.go+++ b/backend/generated-go/v1/saved_query_service_equal.pb.go@@ -80,7 +80,7 @@ func (x *ListSavedQueriesResponse) Equal(y *ListSavedQueriesResponse) bool {return true}-func (x *ListSavedQueryFoldersRequest) Equal(y *ListSavedQueryFoldersRequest) bool {+func (x *SearchSavedQueryFoldersRequest) Equal(y *SearchSavedQueryFoldersRequest) bool {if x == y {return true}@@ -90,28 +90,13 @@ func (x *ListSavedQueryFoldersRequest) Equal(y *ListSavedQueryFoldersRequest) boif x.Parent != y.Parent {return false}- return true-}--func (x *ListSavedQueryFoldersResponse) Equal(y *ListSavedQueryFoldersResponse) bool {- if x == y {- return true- }- if x == nil || y == nil {- return x == nil && y == nil- }- if len(x.Folders) != len(y.Folders) {+ if x.Filter != y.Filter {return false}- for i := 0; i < len(x.Folders); i++ {- if !x.Folders[i].Equal(y.Folders[i]) {- return false- }- }return true}-func (x *SavedQueryFolder) Equal(y *SavedQueryFolder) bool {+func (x *SearchSavedQueryFoldersResponse) Equal(y *SearchSavedQueryFoldersResponse) bool {if x == y {return true}@@ -126,9 +111,6 @@ func (x *SavedQueryFolder) Equal(y *SavedQueryFolder) bool {return false}}- if x.Category != y.Category {- return false- }return true}@@ -152,61 +134,36 @@ func (x *UpdateSavedQueryRequest) Equal(y *UpdateSavedQueryRequest) bool {return true}-func (x *BatchUpdateSavedQueryOrganizerRequest) Equal(y *BatchUpdateSavedQueryOrganizerRequest) bool {+func (x *UpdateSavedQueryStarRequest) Equal(y *UpdateSavedQueryStarRequest) bool {if x == y {return true}if x == nil || y == nil {return x == nil && y == nil}- if x.Parent != y.Parent {- return false- }- if x.Filter != y.Filter {- return false- }- if !x.Organizer.Equal(y.Organizer) {+ if x.Name != y.Name {return false}- if equal, ok := interface{}(x.UpdateMask).(interface {- Equal(*fieldmaskpb.FieldMask) bool- }); !ok || !equal.Equal(y.UpdateMask) {- return false- } else if !proto.Equal(x.UpdateMask, y.UpdateMask) {+ if x.Starred != y.Starred {return false}return true}-func (x *BatchUpdateSavedQueryOrganizerResponse) Equal(y *BatchUpdateSavedQueryOrganizerResponse) bool {+func (x *BatchUpdateSavedQueriesRequest) Equal(y *BatchUpdateSavedQueriesRequest) bool {if x == y {return true}if x == nil || y == nil {return x == nil && y == nil}- if len(x.SavedQueryOrganizers) != len(y.SavedQueryOrganizers) {+ if x.Parent != y.Parent {return false}- for i := 0; i < len(x.SavedQueryOrganizers); i++ {- if !x.SavedQueryOrganizers[i].Equal(y.SavedQueryOrganizers[i]) {- return false- }- }- if x.UpdatedCount != y.UpdatedCount {+ if x.Filter != y.Filter {return false}- return true-}--func (x *UpdateSavedQueryOrganizerRequest) Equal(y *UpdateSavedQueryOrganizerRequest) bool {- if x == y {- return true- }- if x == nil || y == nil {- return x == nil && y == nil- }- if !x.Organizer.Equal(y.Organizer) {+ if !x.SavedQuery.Equal(y.SavedQuery) {return false}if equal, ok := interface{}(x.UpdateMask).(interface {@@ -216,33 +173,19 @@ func (x *UpdateSavedQueryOrganizerRequest) Equal(y *UpdateSavedQueryOrganizerReq} else if !proto.Equal(x.UpdateMask, y.UpdateMask) {return false}- if x.AllowMissing != y.AllowMissing {- return false- }return true}-func (x *SavedQueryOrganizer) Equal(y *SavedQueryOrganizer) bool {+func (x *BatchUpdateSavedQueriesResponse) Equal(y *BatchUpdateSavedQueriesResponse) bool {if x == y {return true}if x == nil || y == nil {return x == nil && y == nil}- if x.SavedQuery != y.SavedQuery {- return false- }- if x.Starred != y.Starred {- return false- }- if len(x.Folders) != len(y.Folders) {+ if x.UpdatedCount != y.UpdatedCount {return false}- for i := 0; i < len(x.Folders); i++ {- if x.Folders[i] != y.Folders[i] {- return false- }- }return true}@@ -339,13 +282,8 @@ func (x *SavedQuery) Equal(y *SavedQuery) bool {if x.Starred != y.Starred {return false}- if len(x.Folders) != len(y.Folders) {+ if x.Folder != y.Folder {return false}- for i := 0; i < len(x.Folders); i++ {- if x.Folders[i] != y.Folders[i] {- 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.goindex 9b1f9cc3f0..b31ccc2ab8 100644--- a/backend/generated-go/v1/saved_query_service_grpc.pb.go+++ b/backend/generated-go/v1/saved_query_service_grpc.pb.go@@ -20,15 +20,15 @@ import (const _ = grpc.SupportPackageIsVersion9const (- SavedQueryService_CreateSavedQuery_FullMethodName = "/bytebase.v1.SavedQueryService/CreateSavedQuery"- SavedQueryService_GetSavedQuery_FullMethodName = "/bytebase.v1.SavedQueryService/GetSavedQuery"- SavedQueryService_ListSavedQueries_FullMethodName = "/bytebase.v1.SavedQueryService/ListSavedQueries"- SavedQueryService_ListSavedQueryFolders_FullMethodName = "/bytebase.v1.SavedQueryService/ListSavedQueryFolders"- SavedQueryService_SearchSavedQueries_FullMethodName = "/bytebase.v1.SavedQueryService/SearchSavedQueries"- SavedQueryService_UpdateSavedQuery_FullMethodName = "/bytebase.v1.SavedQueryService/UpdateSavedQuery"- SavedQueryService_UpdateSavedQueryOrganizer_FullMethodName = "/bytebase.v1.SavedQueryService/UpdateSavedQueryOrganizer"- SavedQueryService_BatchUpdateSavedQueryOrganizer_FullMethodName = "/bytebase.v1.SavedQueryService/BatchUpdateSavedQueryOrganizer"- SavedQueryService_DeleteSavedQuery_FullMethodName = "/bytebase.v1.SavedQueryService/DeleteSavedQuery"+ SavedQueryService_CreateSavedQuery_FullMethodName = "/bytebase.v1.SavedQueryService/CreateSavedQuery"+ SavedQueryService_GetSavedQuery_FullMethodName = "/bytebase.v1.SavedQueryService/GetSavedQuery"+ SavedQueryService_ListSavedQueries_FullMethodName = "/bytebase.v1.SavedQueryService/ListSavedQueries"+ SavedQueryService_SearchSavedQueries_FullMethodName = "/bytebase.v1.SavedQueryService/SearchSavedQueries"+ 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_DeleteSavedQuery_FullMethodName = "/bytebase.v1.SavedQueryService/DeleteSavedQuery")// SavedQueryServiceClient is the client API for SavedQueryService service.@@ -36,44 +36,58 @@ const (// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.//// SavedQueryService manages saved queries for SQL Editor query development.-// Permission IDs still use the legacy `bb.worksheets.*` names; they are-// renamed together with the access-model redesign and its role migration.+//+// A saved query is private to its creator; `bb.savedQueries.manage` is the+// admin backstop that can reach any saved query in scope. Per-object+// VIEWER/EDITOR grants arrive with the access-model redesign, which brings+// its own policy shapes and the GetIamPolicy/SetIamPolicy pair that manages+// them.type SavedQueryServiceClient interface {- // Creates a personal saved query used in SQL Editor. Any authenticated user can create their own saved queries.- // Permissions required: None (authenticated users only)+ // Creates a personal saved query used in SQL Editor. The creator becomes+ // the fixed owner.+ // Permissions required: bb.savedQueries.create on the parent projectCreateSavedQuery(ctx context.Context, in *CreateSavedQueryRequest, opts ...grpc.CallOption) (*SavedQuery, error)- // Get a saved query by name.- // Saved queries are private: only the creator, or a caller holding- // bb.worksheets.manage on the workspace, can access one.- // Permissions required: creator, or workspace bb.worksheets.manage+ // Get a saved query by name. Returns NotFound for saved queries the+ // caller cannot read.+ // Permissions required: creator, or bb.savedQueries.manage in scopeGetSavedQuery(ctx context.Context, in *GetSavedQueryRequest, opts ...grpc.CallOption) (*SavedQuery, error)- // List saved queries.- // This is used for listing saved queries in a project, or across all projects by using `projects/-`.- // Permissions required: bb.worksheets.list+ // List saved queries: the grant-independent governance surface. Supports+ // listing in a project, or across all projects by using `projects/-`, with+ // whole statements rather than the previews Search returns — e.g. an+ // offboarding review filtering by creator.+ // Permissions required: bb.savedQueries.listListSavedQueries(ctx context.Context, in *ListSavedQueriesRequest, opts ...grpc.CallOption) (*ListSavedQueriesResponse, error)- // List the caller's saved query folders.- // Only folders stored in the caller's saved query organizer are returned.- ListSavedQueryFolders(ctx context.Context, in *ListSavedQueryFoldersRequest, opts ...grpc.CallOption) (*ListSavedQueryFoldersResponse, error)- // Search for saved queries.- // This is used for finding my saved queries in a project.- // The saved query accessibility is the same as GetSavedQuery().- // Permissions required: creator, or workspace bb.worksheets.manage+ // Search for saved queries in a project: the SQL Editor's hot list path,+ // returning only rows the caller can read, with content previews.+ // Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the projectSearchSavedQueries(ctx context.Context, in *SearchSavedQueriesRequest, opts ...grpc.CallOption) (*SearchSavedQueriesResponse, error)- // Update a saved query.- // The access is the same as GetSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage+ // Search the folder paths of the caller's saved queries in a project.+ // Folders are a derived view over the `folder` field rather than a+ // resource collection, so this is a custom method on savedQueries and+ // shares SearchSavedQueries' caller-scoped semantics — not the+ // cross-creator reach of ListSavedQueries.+ // Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the project+ SearchSavedQueryFolders(ctx context.Context, in *SearchSavedQueryFoldersRequest, opts ...grpc.CallOption) (*SearchSavedQueryFoldersResponse, error)+ // Update a saved query. `title`, `content`, and `database` require write+ // access; `folder` re-files the saved query and is creator/admin only.+ // Returns NotFound for saved queries the caller cannot read.+ // Permissions required: creator, or bb.savedQueries.manage in scopeUpdateSavedQuery(ctx context.Context, in *UpdateSavedQueryRequest, opts ...grpc.CallOption) (*SavedQuery, error)- // Update the organizer of a saved query.- // The access is the same as UpdateSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage- UpdateSavedQueryOrganizer(ctx context.Context, in *UpdateSavedQueryOrganizerRequest, opts ...grpc.CallOption) (*SavedQueryOrganizer, error)- // Batch update the organizers of saved queries.- // The access is the same as UpdateSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage- BatchUpdateSavedQueryOrganizer(ctx context.Context, in *BatchUpdateSavedQueryOrganizerRequest, opts ...grpc.CallOption) (*BatchUpdateSavedQueryOrganizerResponse, error)- // Delete a saved query.- // The access is the same as UpdateSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage+ // Star or unstar a saved query for the caller. A star is always the+ // caller's own per-user marker — invisible to others and carrying no+ // access. The only requirement is that the caller can read the saved+ // query being starred (which also keeps private saved query names+ // unprobeable).+ // Permissions required: read access to the saved query+ UpdateSavedQueryStar(ctx context.Context, in *UpdateSavedQueryStarRequest, opts ...grpc.CallOption) (*SavedQuery, error)+ // Batch re-file saved queries into a folder. The update mask supports+ // `folder` only; only rows the caller may re-file are updated (their own,+ // or any in scope for admins).+ // Permissions required: creator, or bb.savedQueries.manage in scope+ BatchUpdateSavedQueries(ctx context.Context, in *BatchUpdateSavedQueriesRequest, opts ...grpc.CallOption) (*BatchUpdateSavedQueriesResponse, error)+ // Delete a saved query. Only the creator (or an admin) can delete.+ // Returns NotFound for saved queries the caller cannot read.+ // Permissions required: creator, or bb.savedQueries.manage in scopeDeleteSavedQuery(ctx context.Context, in *DeleteSavedQueryRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)}@@ -115,20 +129,20 @@ func (c *savedQueryServiceClient) ListSavedQueries(ctx context.Context, in *Listreturn out, nil}-func (c *savedQueryServiceClient) ListSavedQueryFolders(ctx context.Context, in *ListSavedQueryFoldersRequest, opts ...grpc.CallOption) (*ListSavedQueryFoldersResponse, error) {+func (c *savedQueryServiceClient) SearchSavedQueries(ctx context.Context, in *SearchSavedQueriesRequest, opts ...grpc.CallOption) (*SearchSavedQueriesResponse, error) {cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)- out := new(ListSavedQueryFoldersResponse)- err := c.cc.Invoke(ctx, SavedQueryService_ListSavedQueryFolders_FullMethodName, in, out, cOpts...)+ out := new(SearchSavedQueriesResponse)+ err := c.cc.Invoke(ctx, SavedQueryService_SearchSavedQueries_FullMethodName, in, out, cOpts...)if err != nil {return nil, err}return out, nil}-func (c *savedQueryServiceClient) SearchSavedQueries(ctx context.Context, in *SearchSavedQueriesRequest, opts ...grpc.CallOption) (*SearchSavedQueriesResponse, error) {+func (c *savedQueryServiceClient) SearchSavedQueryFolders(ctx context.Context, in *SearchSavedQueryFoldersRequest, opts ...grpc.CallOption) (*SearchSavedQueryFoldersResponse, error) {cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)- out := new(SearchSavedQueriesResponse)- err := c.cc.Invoke(ctx, SavedQueryService_SearchSavedQueries_FullMethodName, in, out, cOpts...)+ out := new(SearchSavedQueryFoldersResponse)+ err := c.cc.Invoke(ctx, SavedQueryService_SearchSavedQueryFolders_FullMethodName, in, out, cOpts...)if err != nil {return nil, err}@@ -145,20 +159,20 @@ func (c *savedQueryServiceClient) UpdateSavedQuery(ctx context.Context, in *Updareturn out, nil}-func (c *savedQueryServiceClient) UpdateSavedQueryOrganizer(ctx context.Context, in *UpdateSavedQueryOrganizerRequest, opts ...grpc.CallOption) (*SavedQueryOrganizer, error) {+func (c *savedQueryServiceClient) UpdateSavedQueryStar(ctx context.Context, in *UpdateSavedQueryStarRequest, opts ...grpc.CallOption) (*SavedQuery, error) {cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)- out := new(SavedQueryOrganizer)- err := c.cc.Invoke(ctx, SavedQueryService_UpdateSavedQueryOrganizer_FullMethodName, in, out, cOpts...)+ out := new(SavedQuery)+ err := c.cc.Invoke(ctx, SavedQueryService_UpdateSavedQueryStar_FullMethodName, in, out, cOpts...)if err != nil {return nil, err}return out, nil}-func (c *savedQueryServiceClient) BatchUpdateSavedQueryOrganizer(ctx context.Context, in *BatchUpdateSavedQueryOrganizerRequest, opts ...grpc.CallOption) (*BatchUpdateSavedQueryOrganizerResponse, error) {+func (c *savedQueryServiceClient) BatchUpdateSavedQueries(ctx context.Context, in *BatchUpdateSavedQueriesRequest, opts ...grpc.CallOption) (*BatchUpdateSavedQueriesResponse, error) {cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)- out := new(BatchUpdateSavedQueryOrganizerResponse)- err := c.cc.Invoke(ctx, SavedQueryService_BatchUpdateSavedQueryOrganizer_FullMethodName, in, out, cOpts...)+ out := new(BatchUpdateSavedQueriesResponse)+ err := c.cc.Invoke(ctx, SavedQueryService_BatchUpdateSavedQueries_FullMethodName, in, out, cOpts...)if err != nil {return nil, err}@@ -180,44 +194,58 @@ func (c *savedQueryServiceClient) DeleteSavedQuery(ctx context.Context, in *Dele// for forward compatibility.//// SavedQueryService manages saved queries for SQL Editor query development.-// Permission IDs still use the legacy `bb.worksheets.*` names; they are-// renamed together with the access-model redesign and its role migration.+//+// A saved query is private to its creator; `bb.savedQueries.manage` is the+// admin backstop that can reach any saved query in scope. Per-object+// VIEWER/EDITOR grants arrive with the access-model redesign, which brings+// its own policy shapes and the GetIamPolicy/SetIamPolicy pair that manages+// them.type SavedQueryServiceServer interface {- // Creates a personal saved query used in SQL Editor. Any authenticated user can create their own saved queries.- // Permissions required: None (authenticated users only)+ // Creates a personal saved query used in SQL Editor. The creator becomes+ // the fixed owner.+ // Permissions required: bb.savedQueries.create on the parent projectCreateSavedQuery(context.Context, *CreateSavedQueryRequest) (*SavedQuery, error)- // Get a saved query by name.- // Saved queries are private: only the creator, or a caller holding- // bb.worksheets.manage on the workspace, can access one.- // Permissions required: creator, or workspace bb.worksheets.manage+ // Get a saved query by name. Returns NotFound for saved queries the+ // caller cannot read.+ // Permissions required: creator, or bb.savedQueries.manage in scopeGetSavedQuery(context.Context, *GetSavedQueryRequest) (*SavedQuery, error)- // List saved queries.- // This is used for listing saved queries in a project, or across all projects by using `projects/-`.- // Permissions required: bb.worksheets.list+ // List saved queries: the grant-independent governance surface. Supports+ // listing in a project, or across all projects by using `projects/-`, with+ // whole statements rather than the previews Search returns — e.g. an+ // offboarding review filtering by creator.+ // Permissions required: bb.savedQueries.listListSavedQueries(context.Context, *ListSavedQueriesRequest) (*ListSavedQueriesResponse, error)- // List the caller's saved query folders.- // Only folders stored in the caller's saved query organizer are returned.- ListSavedQueryFolders(context.Context, *ListSavedQueryFoldersRequest) (*ListSavedQueryFoldersResponse, error)- // Search for saved queries.- // This is used for finding my saved queries in a project.- // The saved query accessibility is the same as GetSavedQuery().- // Permissions required: creator, or workspace bb.worksheets.manage+ // Search for saved queries in a project: the SQL Editor's hot list path,+ // returning only rows the caller can read, with content previews.+ // Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the projectSearchSavedQueries(context.Context, *SearchSavedQueriesRequest) (*SearchSavedQueriesResponse, error)- // Update a saved query.- // The access is the same as GetSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage+ // Search the folder paths of the caller's saved queries in a project.+ // Folders are a derived view over the `folder` field rather than a+ // resource collection, so this is a custom method on savedQueries and+ // shares SearchSavedQueries' caller-scoped semantics — not the+ // cross-creator reach of ListSavedQueries.+ // Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the project+ SearchSavedQueryFolders(context.Context, *SearchSavedQueryFoldersRequest) (*SearchSavedQueryFoldersResponse, error)+ // Update a saved query. `title`, `content`, and `database` require write+ // access; `folder` re-files the saved query and is creator/admin only.+ // Returns NotFound for saved queries the caller cannot read.+ // Permissions required: creator, or bb.savedQueries.manage in scopeUpdateSavedQuery(context.Context, *UpdateSavedQueryRequest) (*SavedQuery, error)- // Update the organizer of a saved query.- // The access is the same as UpdateSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage- UpdateSavedQueryOrganizer(context.Context, *UpdateSavedQueryOrganizerRequest) (*SavedQueryOrganizer, error)- // Batch update the organizers of saved queries.- // The access is the same as UpdateSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage- BatchUpdateSavedQueryOrganizer(context.Context, *BatchUpdateSavedQueryOrganizerRequest) (*BatchUpdateSavedQueryOrganizerResponse, error)- // Delete a saved query.- // The access is the same as UpdateSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage+ // Star or unstar a saved query for the caller. A star is always the+ // caller's own per-user marker — invisible to others and carrying no+ // access. The only requirement is that the caller can read the saved+ // query being starred (which also keeps private saved query names+ // unprobeable).+ // Permissions required: read access to the saved query+ UpdateSavedQueryStar(context.Context, *UpdateSavedQueryStarRequest) (*SavedQuery, error)+ // Batch re-file saved queries into a folder. The update mask supports+ // `folder` only; only rows the caller may re-file are updated (their own,+ // or any in scope for admins).+ // Permissions required: creator, or bb.savedQueries.manage in scope+ BatchUpdateSavedQueries(context.Context, *BatchUpdateSavedQueriesRequest) (*BatchUpdateSavedQueriesResponse, error)+ // Delete a saved query. Only the creator (or an admin) can delete.+ // Returns NotFound for saved queries the caller cannot read.+ // Permissions required: creator, or bb.savedQueries.manage in scopeDeleteSavedQuery(context.Context, *DeleteSavedQueryRequest) (*emptypb.Empty, error)mustEmbedUnimplementedSavedQueryServiceServer()}@@ -238,20 +266,20 @@ func (UnimplementedSavedQueryServiceServer) GetSavedQuery(context.Context, *GetSfunc (UnimplementedSavedQueryServiceServer) ListSavedQueries(context.Context, *ListSavedQueriesRequest) (*ListSavedQueriesResponse, error) {return nil, status.Error(codes.Unimplemented, "method ListSavedQueries not implemented")}-func (UnimplementedSavedQueryServiceServer) ListSavedQueryFolders(context.Context, *ListSavedQueryFoldersRequest) (*ListSavedQueryFoldersResponse, error) {- return nil, status.Error(codes.Unimplemented, "method ListSavedQueryFolders not implemented")-}func (UnimplementedSavedQueryServiceServer) SearchSavedQueries(context.Context, *SearchSavedQueriesRequest) (*SearchSavedQueriesResponse, error) {return nil, status.Error(codes.Unimplemented, "method SearchSavedQueries not implemented")}+func (UnimplementedSavedQueryServiceServer) SearchSavedQueryFolders(context.Context, *SearchSavedQueryFoldersRequest) (*SearchSavedQueryFoldersResponse, error) {+ return nil, status.Error(codes.Unimplemented, "method SearchSavedQueryFolders not implemented")+}func (UnimplementedSavedQueryServiceServer) UpdateSavedQuery(context.Context, *UpdateSavedQueryRequest) (*SavedQuery, error) {return nil, status.Error(codes.Unimplemented, "method UpdateSavedQuery not implemented")}-func (UnimplementedSavedQueryServiceServer) UpdateSavedQueryOrganizer(context.Context, *UpdateSavedQueryOrganizerRequest) (*SavedQueryOrganizer, error) {- return nil, status.Error(codes.Unimplemented, "method UpdateSavedQueryOrganizer not implemented")+func (UnimplementedSavedQueryServiceServer) UpdateSavedQueryStar(context.Context, *UpdateSavedQueryStarRequest) (*SavedQuery, error) {+ return nil, status.Error(codes.Unimplemented, "method UpdateSavedQueryStar not implemented")}-func (UnimplementedSavedQueryServiceServer) BatchUpdateSavedQueryOrganizer(context.Context, *BatchUpdateSavedQueryOrganizerRequest) (*BatchUpdateSavedQueryOrganizerResponse, error) {- return nil, status.Error(codes.Unimplemented, "method BatchUpdateSavedQueryOrganizer not implemented")+func (UnimplementedSavedQueryServiceServer) BatchUpdateSavedQueries(context.Context, *BatchUpdateSavedQueriesRequest) (*BatchUpdateSavedQueriesResponse, error) {+ return nil, status.Error(codes.Unimplemented, "method BatchUpdateSavedQueries not implemented")}func (UnimplementedSavedQueryServiceServer) DeleteSavedQuery(context.Context, *DeleteSavedQueryRequest) (*emptypb.Empty, error) {return nil, status.Error(codes.Unimplemented, "method DeleteSavedQuery not implemented")@@ -331,38 +359,38 @@ func _SavedQueryService_ListSavedQueries_Handler(srv interface{}, ctx context.Coreturn interceptor(ctx, in, info, handler)}-func _SavedQueryService_ListSavedQueryFolders_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {- in := new(ListSavedQueryFoldersRequest)+func _SavedQueryService_SearchSavedQueries_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {+ in := new(SearchSavedQueriesRequest)if err := dec(in); err != nil {return nil, err}if interceptor == nil {- return srv.(SavedQueryServiceServer).ListSavedQueryFolders(ctx, in)+ return srv.(SavedQueryServiceServer).SearchSavedQueries(ctx, in)}info := &grpc.UnaryServerInfo{Server: srv,- FullMethod: SavedQueryService_ListSavedQueryFolders_FullMethodName,+ FullMethod: SavedQueryService_SearchSavedQueries_FullMethodName,}handler := func(ctx context.Context, req interface{}) (interface{}, error) {- return srv.(SavedQueryServiceServer).ListSavedQueryFolders(ctx, req.(*ListSavedQueryFoldersRequest))+ return srv.(SavedQueryServiceServer).SearchSavedQueries(ctx, req.(*SearchSavedQueriesRequest))}return interceptor(ctx, in, info, handler)}-func _SavedQueryService_SearchSavedQueries_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {- in := new(SearchSavedQueriesRequest)+func _SavedQueryService_SearchSavedQueryFolders_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {+ in := new(SearchSavedQueryFoldersRequest)if err := dec(in); err != nil {return nil, err}if interceptor == nil {- return srv.(SavedQueryServiceServer).SearchSavedQueries(ctx, in)+ return srv.(SavedQueryServiceServer).SearchSavedQueryFolders(ctx, in)}info := &grpc.UnaryServerInfo{Server: srv,- FullMethod: SavedQueryService_SearchSavedQueries_FullMethodName,+ FullMethod: SavedQueryService_SearchSavedQueryFolders_FullMethodName,}handler := func(ctx context.Context, req interface{}) (interface{}, error) {- return srv.(SavedQueryServiceServer).SearchSavedQueries(ctx, req.(*SearchSavedQueriesRequest))+ return srv.(SavedQueryServiceServer).SearchSavedQueryFolders(ctx, req.(*SearchSavedQueryFoldersRequest))}return interceptor(ctx, in, info, handler)}@@ -385,38 +413,38 @@ func _SavedQueryService_UpdateSavedQuery_Handler(srv interface{}, ctx context.Coreturn interceptor(ctx, in, info, handler)}-func _SavedQueryService_UpdateSavedQueryOrganizer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {- in := new(UpdateSavedQueryOrganizerRequest)+func _SavedQueryService_UpdateSavedQueryStar_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {+ in := new(UpdateSavedQueryStarRequest)if err := dec(in); err != nil {return nil, err}if interceptor == nil {- return srv.(SavedQueryServiceServer).UpdateSavedQueryOrganizer(ctx, in)+ return srv.(SavedQueryServiceServer).UpdateSavedQueryStar(ctx, in)}info := &grpc.UnaryServerInfo{Server: srv,- FullMethod: SavedQueryService_UpdateSavedQueryOrganizer_FullMethodName,+ FullMethod: SavedQueryService_UpdateSavedQueryStar_FullMethodName,}handler := func(ctx context.Context, req interface{}) (interface{}, error) {- return srv.(SavedQueryServiceServer).UpdateSavedQueryOrganizer(ctx, req.(*UpdateSavedQueryOrganizerRequest))+ return srv.(SavedQueryServiceServer).UpdateSavedQueryStar(ctx, req.(*UpdateSavedQueryStarRequest))}return interceptor(ctx, in, info, handler)}-func _SavedQueryService_BatchUpdateSavedQueryOrganizer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {- in := new(BatchUpdateSavedQueryOrganizerRequest)+func _SavedQueryService_BatchUpdateSavedQueries_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {+ in := new(BatchUpdateSavedQueriesRequest)if err := dec(in); err != nil {return nil, err}if interceptor == nil {- return srv.(SavedQueryServiceServer).BatchUpdateSavedQueryOrganizer(ctx, in)+ return srv.(SavedQueryServiceServer).BatchUpdateSavedQueries(ctx, in)}info := &grpc.UnaryServerInfo{Server: srv,- FullMethod: SavedQueryService_BatchUpdateSavedQueryOrganizer_FullMethodName,+ FullMethod: SavedQueryService_BatchUpdateSavedQueries_FullMethodName,}handler := func(ctx context.Context, req interface{}) (interface{}, error) {- return srv.(SavedQueryServiceServer).BatchUpdateSavedQueryOrganizer(ctx, req.(*BatchUpdateSavedQueryOrganizerRequest))+ return srv.(SavedQueryServiceServer).BatchUpdateSavedQueries(ctx, req.(*BatchUpdateSavedQueriesRequest))}return interceptor(ctx, in, info, handler)}@@ -458,25 +486,25 @@ var SavedQueryService_ServiceDesc = grpc.ServiceDesc{MethodName: "ListSavedQueries",Handler: _SavedQueryService_ListSavedQueries_Handler,},- {- MethodName: "ListSavedQueryFolders",- Handler: _SavedQueryService_ListSavedQueryFolders_Handler,- },{MethodName: "SearchSavedQueries",Handler: _SavedQueryService_SearchSavedQueries_Handler,},+ {+ MethodName: "SearchSavedQueryFolders",+ Handler: _SavedQueryService_SearchSavedQueryFolders_Handler,+ },{MethodName: "UpdateSavedQuery",Handler: _SavedQueryService_UpdateSavedQuery_Handler,},{- MethodName: "UpdateSavedQueryOrganizer",- Handler: _SavedQueryService_UpdateSavedQueryOrganizer_Handler,+ MethodName: "UpdateSavedQueryStar",+ Handler: _SavedQueryService_UpdateSavedQueryStar_Handler,},{- MethodName: "BatchUpdateSavedQueryOrganizer",- Handler: _SavedQueryService_BatchUpdateSavedQueryOrganizer_Handler,+ MethodName: "BatchUpdateSavedQueries",+ Handler: _SavedQueryService_BatchUpdateSavedQueries_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.goindex 8d20d841f6..cfdf60bb46 100644--- a/backend/generated-go/v1/v1connect/saved_query_service.connect.go+++ b/backend/generated-go/v1/v1connect/saved_query_service.connect.go@@ -43,21 +43,21 @@ const (// SavedQueryServiceListSavedQueriesProcedure is the fully-qualified name of the SavedQueryService's// ListSavedQueries RPC.SavedQueryServiceListSavedQueriesProcedure = "/bytebase.v1.SavedQueryService/ListSavedQueries"- // SavedQueryServiceListSavedQueryFoldersProcedure is the fully-qualified name of the- // SavedQueryService's ListSavedQueryFolders RPC.- SavedQueryServiceListSavedQueryFoldersProcedure = "/bytebase.v1.SavedQueryService/ListSavedQueryFolders"// SavedQueryServiceSearchSavedQueriesProcedure is the fully-qualified name of the// SavedQueryService's SearchSavedQueries RPC.SavedQueryServiceSearchSavedQueriesProcedure = "/bytebase.v1.SavedQueryService/SearchSavedQueries"+ // SavedQueryServiceSearchSavedQueryFoldersProcedure is the fully-qualified name of the+ // SavedQueryService's SearchSavedQueryFolders RPC.+ SavedQueryServiceSearchSavedQueryFoldersProcedure = "/bytebase.v1.SavedQueryService/SearchSavedQueryFolders"// SavedQueryServiceUpdateSavedQueryProcedure is the fully-qualified name of the SavedQueryService's// UpdateSavedQuery RPC.SavedQueryServiceUpdateSavedQueryProcedure = "/bytebase.v1.SavedQueryService/UpdateSavedQuery"- // SavedQueryServiceUpdateSavedQueryOrganizerProcedure is the fully-qualified name of the- // SavedQueryService's UpdateSavedQueryOrganizer RPC.- SavedQueryServiceUpdateSavedQueryOrganizerProcedure = "/bytebase.v1.SavedQueryService/UpdateSavedQueryOrganizer"- // SavedQueryServiceBatchUpdateSavedQueryOrganizerProcedure is the fully-qualified name of the- // SavedQueryService's BatchUpdateSavedQueryOrganizer RPC.- SavedQueryServiceBatchUpdateSavedQueryOrganizerProcedure = "/bytebase.v1.SavedQueryService/BatchUpdateSavedQueryOrganizer"+ // 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"// SavedQueryServiceDeleteSavedQueryProcedure is the fully-qualified name of the SavedQueryService's// DeleteSavedQuery RPC.SavedQueryServiceDeleteSavedQueryProcedure = "/bytebase.v1.SavedQueryService/DeleteSavedQuery"@@ -65,41 +65,51 @@ const (// SavedQueryServiceClient is a client for the bytebase.v1.SavedQueryService service.type SavedQueryServiceClient interface {- // Creates a personal saved query used in SQL Editor. Any authenticated user can create their own saved queries.- // Permissions required: None (authenticated users only)+ // Creates a personal saved query used in SQL Editor. The creator becomes+ // the fixed owner.+ // Permissions required: bb.savedQueries.create on the parent projectCreateSavedQuery(context.Context, *connect.Request[v1.CreateSavedQueryRequest]) (*connect.Response[v1.SavedQuery], error)- // Get a saved query by name.- // Saved queries are private: only the creator, or a caller holding- // bb.worksheets.manage on the workspace, can access one.- // Permissions required: creator, or workspace bb.worksheets.manage+ // Get a saved query by name. Returns NotFound for saved queries the+ // caller cannot read.+ // Permissions required: creator, or bb.savedQueries.manage in scopeGetSavedQuery(context.Context, *connect.Request[v1.GetSavedQueryRequest]) (*connect.Response[v1.SavedQuery], error)- // List saved queries.- // This is used for listing saved queries in a project, or across all projects by using `projects/-`.- // Permissions required: bb.worksheets.list+ // List saved queries: the grant-independent governance surface. Supports+ // listing in a project, or across all projects by using `projects/-`, with+ // whole statements rather than the previews Search returns — e.g. an+ // offboarding review filtering by creator.+ // Permissions required: bb.savedQueries.listListSavedQueries(context.Context, *connect.Request[v1.ListSavedQueriesRequest]) (*connect.Response[v1.ListSavedQueriesResponse], error)- // List the caller's saved query folders.- // Only folders stored in the caller's saved query organizer are returned.- ListSavedQueryFolders(context.Context, *connect.Request[v1.ListSavedQueryFoldersRequest]) (*connect.Response[v1.ListSavedQueryFoldersResponse], error)- // Search for saved queries.- // This is used for finding my saved queries in a project.- // The saved query accessibility is the same as GetSavedQuery().- // Permissions required: creator, or workspace bb.worksheets.manage+ // Search for saved queries in a project: the SQL Editor's hot list path,+ // returning only rows the caller can read, with content previews.+ // Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the projectSearchSavedQueries(context.Context, *connect.Request[v1.SearchSavedQueriesRequest]) (*connect.Response[v1.SearchSavedQueriesResponse], error)- // Update a saved query.- // The access is the same as GetSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage+ // Search the folder paths of the caller's saved queries in a project.+ // Folders are a derived view over the `folder` field rather than a+ // resource collection, so this is a custom method on savedQueries and+ // shares SearchSavedQueries' caller-scoped semantics — not the+ // cross-creator reach of ListSavedQueries.+ // Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the project+ SearchSavedQueryFolders(context.Context, *connect.Request[v1.SearchSavedQueryFoldersRequest]) (*connect.Response[v1.SearchSavedQueryFoldersResponse], error)+ // Update a saved query. `title`, `content`, and `database` require write+ // access; `folder` re-files the saved query and is creator/admin only.+ // Returns NotFound for saved queries the caller cannot read.+ // Permissions required: creator, or bb.savedQueries.manage in scopeUpdateSavedQuery(context.Context, *connect.Request[v1.UpdateSavedQueryRequest]) (*connect.Response[v1.SavedQuery], error)- // Update the organizer of a saved query.- // The access is the same as UpdateSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage- UpdateSavedQueryOrganizer(context.Context, *connect.Request[v1.UpdateSavedQueryOrganizerRequest]) (*connect.Response[v1.SavedQueryOrganizer], error)- // Batch update the organizers of saved queries.- // The access is the same as UpdateSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage- BatchUpdateSavedQueryOrganizer(context.Context, *connect.Request[v1.BatchUpdateSavedQueryOrganizerRequest]) (*connect.Response[v1.BatchUpdateSavedQueryOrganizerResponse], error)- // Delete a saved query.- // The access is the same as UpdateSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage+ // Star or unstar a saved query for the caller. A star is always the+ // caller's own per-user marker — invisible to others and carrying no+ // access. The only requirement is that the caller can read the saved+ // query being starred (which also keeps private saved query names+ // unprobeable).+ // Permissions required: read access to the saved query+ UpdateSavedQueryStar(context.Context, *connect.Request[v1.UpdateSavedQueryStarRequest]) (*connect.Response[v1.SavedQuery], error)+ // Batch re-file saved queries into a folder. The update mask supports+ // `folder` only; only rows the caller may re-file are updated (their own,+ // or any in scope for admins).+ // Permissions required: creator, or bb.savedQueries.manage in scope+ BatchUpdateSavedQueries(context.Context, *connect.Request[v1.BatchUpdateSavedQueriesRequest]) (*connect.Response[v1.BatchUpdateSavedQueriesResponse], error)+ // Delete a saved query. Only the creator (or an admin) can delete.+ // Returns NotFound for saved queries the caller cannot read.+ // Permissions required: creator, or bb.savedQueries.manage in scopeDeleteSavedQuery(context.Context, *connect.Request[v1.DeleteSavedQueryRequest]) (*connect.Response[emptypb.Empty], error)}@@ -132,34 +142,34 @@ func NewSavedQueryServiceClient(httpClient connect.HTTPClient, baseURL string, oconnect.WithSchema(savedQueryServiceMethods.ByName("ListSavedQueries")),connect.WithClientOptions(opts...),),- listSavedQueryFolders: connect.NewClient[v1.ListSavedQueryFoldersRequest, v1.ListSavedQueryFoldersResponse](- httpClient,- baseURL+SavedQueryServiceListSavedQueryFoldersProcedure,- connect.WithSchema(savedQueryServiceMethods.ByName("ListSavedQueryFolders")),- connect.WithClientOptions(opts...),- ),searchSavedQueries: connect.NewClient[v1.SearchSavedQueriesRequest, v1.SearchSavedQueriesResponse](httpClient,baseURL+SavedQueryServiceSearchSavedQueriesProcedure,connect.WithSchema(savedQueryServiceMethods.ByName("SearchSavedQueries")),connect.WithClientOptions(opts...),),+ searchSavedQueryFolders: connect.NewClient[v1.SearchSavedQueryFoldersRequest, v1.SearchSavedQueryFoldersResponse](+ httpClient,+ baseURL+SavedQueryServiceSearchSavedQueryFoldersProcedure,+ connect.WithSchema(savedQueryServiceMethods.ByName("SearchSavedQueryFolders")),+ connect.WithClientOptions(opts...),+ ),updateSavedQuery: connect.NewClient[v1.UpdateSavedQueryRequest, v1.SavedQuery](httpClient,baseURL+SavedQueryServiceUpdateSavedQueryProcedure,connect.WithSchema(savedQueryServiceMethods.ByName("UpdateSavedQuery")),connect.WithClientOptions(opts...),),- updateSavedQueryOrganizer: connect.NewClient[v1.UpdateSavedQueryOrganizerRequest, v1.SavedQueryOrganizer](+ updateSavedQueryStar: connect.NewClient[v1.UpdateSavedQueryStarRequest, v1.SavedQuery](httpClient,- baseURL+SavedQueryServiceUpdateSavedQueryOrganizerProcedure,- connect.WithSchema(savedQueryServiceMethods.ByName("UpdateSavedQueryOrganizer")),+ baseURL+SavedQueryServiceUpdateSavedQueryStarProcedure,+ connect.WithSchema(savedQueryServiceMethods.ByName("UpdateSavedQueryStar")),connect.WithClientOptions(opts...),),- batchUpdateSavedQueryOrganizer: connect.NewClient[v1.BatchUpdateSavedQueryOrganizerRequest, v1.BatchUpdateSavedQueryOrganizerResponse](+ batchUpdateSavedQueries: connect.NewClient[v1.BatchUpdateSavedQueriesRequest, v1.BatchUpdateSavedQueriesResponse](httpClient,- baseURL+SavedQueryServiceBatchUpdateSavedQueryOrganizerProcedure,- connect.WithSchema(savedQueryServiceMethods.ByName("BatchUpdateSavedQueryOrganizer")),+ baseURL+SavedQueryServiceBatchUpdateSavedQueriesProcedure,+ connect.WithSchema(savedQueryServiceMethods.ByName("BatchUpdateSavedQueries")),connect.WithClientOptions(opts...),),deleteSavedQuery: connect.NewClient[v1.DeleteSavedQueryRequest, emptypb.Empty](@@ -173,15 +183,15 @@ func NewSavedQueryServiceClient(httpClient connect.HTTPClient, baseURL string, o// savedQueryServiceClient implements SavedQueryServiceClient.type savedQueryServiceClient struct {- createSavedQuery *connect.Client[v1.CreateSavedQueryRequest, v1.SavedQuery]- getSavedQuery *connect.Client[v1.GetSavedQueryRequest, v1.SavedQuery]- listSavedQueries *connect.Client[v1.ListSavedQueriesRequest, v1.ListSavedQueriesResponse]- listSavedQueryFolders *connect.Client[v1.ListSavedQueryFoldersRequest, v1.ListSavedQueryFoldersResponse]- searchSavedQueries *connect.Client[v1.SearchSavedQueriesRequest, v1.SearchSavedQueriesResponse]- updateSavedQuery *connect.Client[v1.UpdateSavedQueryRequest, v1.SavedQuery]- updateSavedQueryOrganizer *connect.Client[v1.UpdateSavedQueryOrganizerRequest, v1.SavedQueryOrganizer]- batchUpdateSavedQueryOrganizer *connect.Client[v1.BatchUpdateSavedQueryOrganizerRequest, v1.BatchUpdateSavedQueryOrganizerResponse]- deleteSavedQuery *connect.Client[v1.DeleteSavedQueryRequest, emptypb.Empty]+ createSavedQuery *connect.Client[v1.CreateSavedQueryRequest, v1.SavedQuery]+ getSavedQuery *connect.Client[v1.GetSavedQueryRequest, v1.SavedQuery]+ listSavedQueries *connect.Client[v1.ListSavedQueriesRequest, v1.ListSavedQueriesResponse]+ searchSavedQueries *connect.Client[v1.SearchSavedQueriesRequest, v1.SearchSavedQueriesResponse]+ 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]+ deleteSavedQuery *connect.Client[v1.DeleteSavedQueryRequest, emptypb.Empty]}// CreateSavedQuery calls bytebase.v1.SavedQueryService.CreateSavedQuery.@@ -199,30 +209,29 @@ func (c *savedQueryServiceClient) ListSavedQueries(ctx context.Context, req *conreturn c.listSavedQueries.CallUnary(ctx, req)}-// ListSavedQueryFolders calls bytebase.v1.SavedQueryService.ListSavedQueryFolders.-func (c *savedQueryServiceClient) ListSavedQueryFolders(ctx context.Context, req *connect.Request[v1.ListSavedQueryFoldersRequest]) (*connect.Response[v1.ListSavedQueryFoldersResponse], error) {- return c.listSavedQueryFolders.CallUnary(ctx, req)-}-// SearchSavedQueries calls bytebase.v1.SavedQueryService.SearchSavedQueries.func (c *savedQueryServiceClient) SearchSavedQueries(ctx context.Context, req *connect.Request[v1.SearchSavedQueriesRequest]) (*connect.Response[v1.SearchSavedQueriesResponse], error) {return c.searchSavedQueries.CallUnary(ctx, req)}+// SearchSavedQueryFolders calls bytebase.v1.SavedQueryService.SearchSavedQueryFolders.+func (c *savedQueryServiceClient) SearchSavedQueryFolders(ctx context.Context, req *connect.Request[v1.SearchSavedQueryFoldersRequest]) (*connect.Response[v1.SearchSavedQueryFoldersResponse], error) {+ return c.searchSavedQueryFolders.CallUnary(ctx, req)+}+// UpdateSavedQuery calls bytebase.v1.SavedQueryService.UpdateSavedQuery.func (c *savedQueryServiceClient) UpdateSavedQuery(ctx context.Context, req *connect.Request[v1.UpdateSavedQueryRequest]) (*connect.Response[v1.SavedQuery], error) {return c.updateSavedQuery.CallUnary(ctx, req)}-// UpdateSavedQueryOrganizer calls bytebase.v1.SavedQueryService.UpdateSavedQueryOrganizer.-func (c *savedQueryServiceClient) UpdateSavedQueryOrganizer(ctx context.Context, req *connect.Request[v1.UpdateSavedQueryOrganizerRequest]) (*connect.Response[v1.SavedQueryOrganizer], error) {- return c.updateSavedQueryOrganizer.CallUnary(ctx, req)+// UpdateSavedQueryStar calls bytebase.v1.SavedQueryService.UpdateSavedQueryStar.+func (c *savedQueryServiceClient) UpdateSavedQueryStar(ctx context.Context, req *connect.Request[v1.UpdateSavedQueryStarRequest]) (*connect.Response[v1.SavedQuery], error) {+ return c.updateSavedQueryStar.CallUnary(ctx, req)}-// BatchUpdateSavedQueryOrganizer calls-// bytebase.v1.SavedQueryService.BatchUpdateSavedQueryOrganizer.-func (c *savedQueryServiceClient) BatchUpdateSavedQueryOrganizer(ctx context.Context, req *connect.Request[v1.BatchUpdateSavedQueryOrganizerRequest]) (*connect.Response[v1.BatchUpdateSavedQueryOrganizerResponse], error) {- return c.batchUpdateSavedQueryOrganizer.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)}// DeleteSavedQuery calls bytebase.v1.SavedQueryService.DeleteSavedQuery.@@ -232,41 +241,51 @@ func (c *savedQueryServiceClient) DeleteSavedQuery(ctx context.Context, req *con// SavedQueryServiceHandler is an implementation of the bytebase.v1.SavedQueryService service.type SavedQueryServiceHandler interface {- // Creates a personal saved query used in SQL Editor. Any authenticated user can create their own saved queries.- // Permissions required: None (authenticated users only)+ // Creates a personal saved query used in SQL Editor. The creator becomes+ // the fixed owner.+ // Permissions required: bb.savedQueries.create on the parent projectCreateSavedQuery(context.Context, *connect.Request[v1.CreateSavedQueryRequest]) (*connect.Response[v1.SavedQuery], error)- // Get a saved query by name.- // Saved queries are private: only the creator, or a caller holding- // bb.worksheets.manage on the workspace, can access one.- // Permissions required: creator, or workspace bb.worksheets.manage+ // Get a saved query by name. Returns NotFound for saved queries the+ // caller cannot read.+ // Permissions required: creator, or bb.savedQueries.manage in scopeGetSavedQuery(context.Context, *connect.Request[v1.GetSavedQueryRequest]) (*connect.Response[v1.SavedQuery], error)- // List saved queries.- // This is used for listing saved queries in a project, or across all projects by using `projects/-`.- // Permissions required: bb.worksheets.list+ // List saved queries: the grant-independent governance surface. Supports+ // listing in a project, or across all projects by using `projects/-`, with+ // whole statements rather than the previews Search returns — e.g. an+ // offboarding review filtering by creator.+ // Permissions required: bb.savedQueries.listListSavedQueries(context.Context, *connect.Request[v1.ListSavedQueriesRequest]) (*connect.Response[v1.ListSavedQueriesResponse], error)- // List the caller's saved query folders.- // Only folders stored in the caller's saved query organizer are returned.- ListSavedQueryFolders(context.Context, *connect.Request[v1.ListSavedQueryFoldersRequest]) (*connect.Response[v1.ListSavedQueryFoldersResponse], error)- // Search for saved queries.- // This is used for finding my saved queries in a project.- // The saved query accessibility is the same as GetSavedQuery().- // Permissions required: creator, or workspace bb.worksheets.manage+ // Search for saved queries in a project: the SQL Editor's hot list path,+ // returning only rows the caller can read, with content previews.+ // Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the projectSearchSavedQueries(context.Context, *connect.Request[v1.SearchSavedQueriesRequest]) (*connect.Response[v1.SearchSavedQueriesResponse], error)- // Update a saved query.- // The access is the same as GetSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage+ // Search the folder paths of the caller's saved queries in a project.+ // Folders are a derived view over the `folder` field rather than a+ // resource collection, so this is a custom method on savedQueries and+ // shares SearchSavedQueries' caller-scoped semantics — not the+ // cross-creator reach of ListSavedQueries.+ // Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the project+ SearchSavedQueryFolders(context.Context, *connect.Request[v1.SearchSavedQueryFoldersRequest]) (*connect.Response[v1.SearchSavedQueryFoldersResponse], error)+ // Update a saved query. `title`, `content`, and `database` require write+ // access; `folder` re-files the saved query and is creator/admin only.+ // Returns NotFound for saved queries the caller cannot read.+ // Permissions required: creator, or bb.savedQueries.manage in scopeUpdateSavedQuery(context.Context, *connect.Request[v1.UpdateSavedQueryRequest]) (*connect.Response[v1.SavedQuery], error)- // Update the organizer of a saved query.- // The access is the same as UpdateSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage- UpdateSavedQueryOrganizer(context.Context, *connect.Request[v1.UpdateSavedQueryOrganizerRequest]) (*connect.Response[v1.SavedQueryOrganizer], error)- // Batch update the organizers of saved queries.- // The access is the same as UpdateSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage- BatchUpdateSavedQueryOrganizer(context.Context, *connect.Request[v1.BatchUpdateSavedQueryOrganizerRequest]) (*connect.Response[v1.BatchUpdateSavedQueryOrganizerResponse], error)- // Delete a saved query.- // The access is the same as UpdateSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage+ // Star or unstar a saved query for the caller. A star is always the+ // caller's own per-user marker — invisible to others and carrying no+ // access. The only requirement is that the caller can read the saved+ // query being starred (which also keeps private saved query names+ // unprobeable).+ // Permissions required: read access to the saved query+ UpdateSavedQueryStar(context.Context, *connect.Request[v1.UpdateSavedQueryStarRequest]) (*connect.Response[v1.SavedQuery], error)+ // Batch re-file saved queries into a folder. The update mask supports+ // `folder` only; only rows the caller may re-file are updated (their own,+ // or any in scope for admins).+ // Permissions required: creator, or bb.savedQueries.manage in scope+ BatchUpdateSavedQueries(context.Context, *connect.Request[v1.BatchUpdateSavedQueriesRequest]) (*connect.Response[v1.BatchUpdateSavedQueriesResponse], error)+ // Delete a saved query. Only the creator (or an admin) can delete.+ // Returns NotFound for saved queries the caller cannot read.+ // Permissions required: creator, or bb.savedQueries.manage in scopeDeleteSavedQuery(context.Context, *connect.Request[v1.DeleteSavedQueryRequest]) (*connect.Response[emptypb.Empty], error)}@@ -295,34 +314,34 @@ func NewSavedQueryServiceHandler(svc SavedQueryServiceHandler, opts ...connect.Hconnect.WithSchema(savedQueryServiceMethods.ByName("ListSavedQueries")),connect.WithHandlerOptions(opts...),)- savedQueryServiceListSavedQueryFoldersHandler := connect.NewUnaryHandler(- SavedQueryServiceListSavedQueryFoldersProcedure,- svc.ListSavedQueryFolders,- connect.WithSchema(savedQueryServiceMethods.ByName("ListSavedQueryFolders")),- connect.WithHandlerOptions(opts...),- )savedQueryServiceSearchSavedQueriesHandler := connect.NewUnaryHandler(SavedQueryServiceSearchSavedQueriesProcedure,svc.SearchSavedQueries,connect.WithSchema(savedQueryServiceMethods.ByName("SearchSavedQueries")),connect.WithHandlerOptions(opts...),)+ savedQueryServiceSearchSavedQueryFoldersHandler := connect.NewUnaryHandler(+ SavedQueryServiceSearchSavedQueryFoldersProcedure,+ svc.SearchSavedQueryFolders,+ connect.WithSchema(savedQueryServiceMethods.ByName("SearchSavedQueryFolders")),+ connect.WithHandlerOptions(opts...),+ )savedQueryServiceUpdateSavedQueryHandler := connect.NewUnaryHandler(SavedQueryServiceUpdateSavedQueryProcedure,svc.UpdateSavedQuery,connect.WithSchema(savedQueryServiceMethods.ByName("UpdateSavedQuery")),connect.WithHandlerOptions(opts...),)- savedQueryServiceUpdateSavedQueryOrganizerHandler := connect.NewUnaryHandler(- SavedQueryServiceUpdateSavedQueryOrganizerProcedure,- svc.UpdateSavedQueryOrganizer,- connect.WithSchema(savedQueryServiceMethods.ByName("UpdateSavedQueryOrganizer")),+ savedQueryServiceUpdateSavedQueryStarHandler := connect.NewUnaryHandler(+ SavedQueryServiceUpdateSavedQueryStarProcedure,+ svc.UpdateSavedQueryStar,+ connect.WithSchema(savedQueryServiceMethods.ByName("UpdateSavedQueryStar")),connect.WithHandlerOptions(opts...),)- savedQueryServiceBatchUpdateSavedQueryOrganizerHandler := connect.NewUnaryHandler(- SavedQueryServiceBatchUpdateSavedQueryOrganizerProcedure,- svc.BatchUpdateSavedQueryOrganizer,- connect.WithSchema(savedQueryServiceMethods.ByName("BatchUpdateSavedQueryOrganizer")),+ savedQueryServiceBatchUpdateSavedQueriesHandler := connect.NewUnaryHandler(+ SavedQueryServiceBatchUpdateSavedQueriesProcedure,+ svc.BatchUpdateSavedQueries,+ connect.WithSchema(savedQueryServiceMethods.ByName("BatchUpdateSavedQueries")),connect.WithHandlerOptions(opts...),)savedQueryServiceDeleteSavedQueryHandler := connect.NewUnaryHandler(@@ -339,16 +358,16 @@ func NewSavedQueryServiceHandler(svc SavedQueryServiceHandler, opts ...connect.HsavedQueryServiceGetSavedQueryHandler.ServeHTTP(w, r)case SavedQueryServiceListSavedQueriesProcedure:savedQueryServiceListSavedQueriesHandler.ServeHTTP(w, r)- case SavedQueryServiceListSavedQueryFoldersProcedure:- savedQueryServiceListSavedQueryFoldersHandler.ServeHTTP(w, r)case SavedQueryServiceSearchSavedQueriesProcedure:savedQueryServiceSearchSavedQueriesHandler.ServeHTTP(w, r)+ case SavedQueryServiceSearchSavedQueryFoldersProcedure:+ savedQueryServiceSearchSavedQueryFoldersHandler.ServeHTTP(w, r)case SavedQueryServiceUpdateSavedQueryProcedure:savedQueryServiceUpdateSavedQueryHandler.ServeHTTP(w, r)- case SavedQueryServiceUpdateSavedQueryOrganizerProcedure:- savedQueryServiceUpdateSavedQueryOrganizerHandler.ServeHTTP(w, r)- case SavedQueryServiceBatchUpdateSavedQueryOrganizerProcedure:- savedQueryServiceBatchUpdateSavedQueryOrganizerHandler.ServeHTTP(w, r)+ case SavedQueryServiceUpdateSavedQueryStarProcedure:+ savedQueryServiceUpdateSavedQueryStarHandler.ServeHTTP(w, r)+ case SavedQueryServiceBatchUpdateSavedQueriesProcedure:+ savedQueryServiceBatchUpdateSavedQueriesHandler.ServeHTTP(w, r)case SavedQueryServiceDeleteSavedQueryProcedure:savedQueryServiceDeleteSavedQueryHandler.ServeHTTP(w, r)default:@@ -372,24 +391,24 @@ func (UnimplementedSavedQueryServiceHandler) ListSavedQueries(context.Context, *return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.SavedQueryService.ListSavedQueries is not implemented"))}-func (UnimplementedSavedQueryServiceHandler) ListSavedQueryFolders(context.Context, *connect.Request[v1.ListSavedQueryFoldersRequest]) (*connect.Response[v1.ListSavedQueryFoldersResponse], error) {- return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.SavedQueryService.ListSavedQueryFolders is not implemented"))-}-func (UnimplementedSavedQueryServiceHandler) SearchSavedQueries(context.Context, *connect.Request[v1.SearchSavedQueriesRequest]) (*connect.Response[v1.SearchSavedQueriesResponse], error) {return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.SavedQueryService.SearchSavedQueries is not implemented"))}+func (UnimplementedSavedQueryServiceHandler) SearchSavedQueryFolders(context.Context, *connect.Request[v1.SearchSavedQueryFoldersRequest]) (*connect.Response[v1.SearchSavedQueryFoldersResponse], error) {+ return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.SavedQueryService.SearchSavedQueryFolders is not implemented"))+}+func (UnimplementedSavedQueryServiceHandler) UpdateSavedQuery(context.Context, *connect.Request[v1.UpdateSavedQueryRequest]) (*connect.Response[v1.SavedQuery], error) {return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.SavedQueryService.UpdateSavedQuery is not implemented"))}-func (UnimplementedSavedQueryServiceHandler) UpdateSavedQueryOrganizer(context.Context, *connect.Request[v1.UpdateSavedQueryOrganizerRequest]) (*connect.Response[v1.SavedQueryOrganizer], error) {- return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.SavedQueryService.UpdateSavedQueryOrganizer is not implemented"))+func (UnimplementedSavedQueryServiceHandler) UpdateSavedQueryStar(context.Context, *connect.Request[v1.UpdateSavedQueryStarRequest]) (*connect.Response[v1.SavedQuery], error) {+ return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.SavedQueryService.UpdateSavedQueryStar is not implemented"))}-func (UnimplementedSavedQueryServiceHandler) BatchUpdateSavedQueryOrganizer(context.Context, *connect.Request[v1.BatchUpdateSavedQueryOrganizerRequest]) (*connect.Response[v1.BatchUpdateSavedQueryOrganizerResponse], error) {- return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.SavedQueryService.BatchUpdateSavedQueryOrganizer 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) DeleteSavedQuery(context.Context, *connect.Request[v1.DeleteSavedQueryRequest]) (*connect.Response[emptypb.Empty], error) {diff --git a/backend/migrator/migration/3.22/0007##saved_query_permissions_folder_star.sql b/backend/migrator/migration/3.22/0007##saved_query_permissions_folder_star.sqlnew file mode 100644index 0000000000..e95bbc2bab--- /dev/null+++ b/backend/migrator/migration/3.22/0007##saved_query_permissions_folder_star.sql@@ -0,0 +1,78 @@+-- Rename the permission family in custom roles: bb.worksheets.get maps to the+-- discovery permission bb.savedQueries.search (reads now come from per-object+-- grants, so there is no get), list and manage rename in place.+UPDATE role+SET permissions = jsonb_set(permissions, '{permissions}', (+ SELECT COALESCE(jsonb_agg(DISTINCT CASE p+ WHEN 'bb.worksheets.get' THEN 'bb.savedQueries.search'+ WHEN 'bb.worksheets.list' THEN 'bb.savedQueries.list'+ WHEN 'bb.worksheets.manage' THEN 'bb.savedQueries.manage'+ ELSE p+ END), '[]'::jsonb)+ FROM jsonb_array_elements_text(permissions->'permissions') AS p))+WHERE jsonb_typeof(permissions->'permissions') = 'array';++-- Creating and finding your own saved queries needed no permission before this+-- version (create and caller-scoped search carried no check), so the rename+-- alone would strip those basics from users whose only role is a custom role.+-- Grant every custom role the successors: create plus the caller-scoped+-- discovery gate. Predefined roles carry these in code.+UPDATE role+SET permissions = jsonb_set(permissions, '{permissions}',+ permissions->'permissions'+ || CASE WHEN permissions->'permissions' ? 'bb.savedQueries.create'+ THEN '[]'::jsonb ELSE '["bb.savedQueries.create"]'::jsonb END+ || CASE WHEN permissions->'permissions' ? 'bb.savedQueries.search'+ THEN '[]'::jsonb ELSE '["bb.savedQueries.search"]'::jsonb END)+WHERE jsonb_typeof(permissions->'permissions') = 'array';++-- A saved query lives in exactly one folder, set by its creator: the folder+-- becomes a path column on the object. The creator's own organizer placement+-- migrates; non-creator organizer rows are dropped (per-user re-foldering of+-- other people's queries is retired).+ALTER TABLE saved_query ADD COLUMN folder text NOT NULL DEFAULT '';++-- The organizer never validated its segments, so a stored array could carry+-- empty or slash-padded ones. Joining those raw would write "/b", "a/" or+-- "a//b" -- paths NormalizeSavedQueryFolder rejects and the `folder ==` filter+-- refuses to match, stranding the row in a folder nothing can name. Collapse+-- slash runs and trim the ends so every migrated path is one the application+-- can produce and find.+UPDATE saved_query+SET folder = COALESCE((+ SELECT btrim(regexp_replace(string_agg(f.elem, '/' ORDER BY f.ord), '/+', '/', 'g'), '/')+ FROM jsonb_array_elements_text(o.payload->'folders') WITH ORDINALITY AS f(elem, ord)+), '')+FROM saved_query_organizer o+WHERE o.saved_query = saved_query.resource_id+ AND o.principal = saved_query.creator;++-- Folder reads scan a project, so index them: DISTINCT folder for a project+-- (admin) or a project + creator (the caller's own tree) become index-only+-- scans instead of reading every row in the project. The project prefix still+-- answers a plain project lookup, so the old single-column index is redundant.+DROP INDEX IF EXISTS idx_saved_query_project;++CREATE INDEX idx_saved_query_project_creator_folder ON saved_query(project, creator, folder);++-- A star is a per-user marker on a readable saved query: row existence is the+-- star. The FK cascade is a race backstop only — code paths delete star rows+-- explicitly before their parent.+CREATE TABLE saved_query_star (+ saved_query text NOT NULL REFERENCES saved_query(resource_id) ON DELETE CASCADE,+ principal text NOT NULL,+ PRIMARY KEY (saved_query, principal)+);++CREATE INDEX idx_saved_query_star_principal ON saved_query_star(principal);++-- Stars are per-principal, so every starred organizer row migrates -- unlike+-- the folder backfill above, which is creator-only because a row has exactly+-- one folder. The join drops organizer rows whose saved query is already gone.+INSERT INTO saved_query_star (saved_query, principal)+SELECT o.saved_query, o.principal+FROM saved_query_organizer o+ JOIN saved_query sq ON sq.resource_id = o.saved_query+WHERE COALESCE((o.payload->>'starred')::boolean, FALSE);++DROP TABLE saved_query_organizer;diff --git a/backend/migrator/migration/LATEST.sql b/backend/migrator/migration/LATEST.sqlindex ed982e3e0d..32d1cc8032 100644--- a/backend/migrator/migration/LATEST.sql+++ b/backend/migrator/migration/LATEST.sql@@ -366,26 +366,33 @@ CREATE TABLE saved_query (project text NOT NULL REFERENCES project(resource_id),name text NOT NULL,statement text NOT NULL,+ -- The folder path this saved query lives in ("a/b/c", '' = unfiled), set+ -- by its creator (or an admin). A folder is a path on rows, so empty+ -- folders cannot exist.+ folder text NOT NULL DEFAULT '',-- Stored as SavedQueryPayload (proto/store/store/saved_query.proto); the-- connected database is a soft reference kept as its canonical name.payload jsonb NOT NULL DEFAULT '{}',PRIMARY KEY (resource_id));-CREATE INDEX idx_saved_query_project ON saved_query(project);+-- Serves the folder tree and the rows inside a folder: DISTINCT folder over a+-- project (admin) or a project + creator (the SQL Editor's own tree) both run+-- as index-only scans, and the project prefix still answers a project lookup+-- on its own.+CREATE INDEX idx_saved_query_project_creator_folder ON saved_query(project, creator, folder);CREATE INDEX idx_saved_query_creator_project ON saved_query(creator, project);--- saved_query_organizer table stores a principal's star and folder placement--- for a saved query.-CREATE TABLE saved_query_organizer (+-- saved_query_star stores per-user stars: row existence is the star. The FK+-- cascade is a race backstop only — code paths delete star rows explicitly+-- before their parent.+CREATE TABLE saved_query_star (saved_query text NOT NULL REFERENCES saved_query(resource_id) ON DELETE CASCADE,principal text NOT NULL,- payload jsonb NOT NULL DEFAULT '{}',PRIMARY KEY (saved_query, principal));-CREATE INDEX idx_saved_query_organizer_principal ON saved_query_organizer(principal);-CREATE INDEX idx_saved_query_organizer_payload ON saved_query_organizer USING GIN(payload);+CREATE INDEX idx_saved_query_star_principal ON saved_query_star(principal);CREATE TABLE db_group (project text NOT NULL REFERENCES project(resource_id),diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.goindex 4cfc0308c3..f04d438890 100644--- a/backend/migrator/migrator_test.go+++ b/backend/migrator/migrator_test.go@@ -21,8 +21,8 @@ import (func TestLatestVersion(t *testing.T) {files, err := getSortedVersionedFiles()require.NoError(t, err)- require.Equal(t, semver.MustParse("3.22.6"), *files[len(files)-1].version)- require.Equal(t, "migration/3.22/0006##rename_worksheet_to_saved_query.sql", files[len(files)-1].path)+ require.Equal(t, semver.MustParse("3.22.7"), *files[len(files)-1].version)+ require.Equal(t, "migration/3.22/0007##saved_query_permissions_folder_star.sql", files[len(files)-1].path)}func TestVersionUnique(t *testing.T) {diff --git a/backend/store/predefined_roles.go b/backend/store/predefined_roles.goindex 80acfa1e19..38a7ca21c6 100644--- a/backend/store/predefined_roles.go+++ b/backend/store/predefined_roles.go@@ -155,8 +155,10 @@ var PredefinedRoles = []*RoleMessage{permission.UsersUndelete,permission.UsersUpdate,permission.UsersUpdateEmail,- permission.WorksheetsGet,- permission.WorksheetsManage,+ permission.SavedQueriesCreate,+ permission.SavedQueriesSearch,+ permission.SavedQueriesList,+ permission.SavedQueriesManage,permission.WorkspacesGetIamPolicy,permission.WorkspacesUpdate,permission.WorkspacesDelete,@@ -293,8 +295,10 @@ var PredefinedRoles = []*RoleMessage{permission.TaskRunsList,permission.GroupsGet,permission.GroupsList,- permission.WorksheetsGet,- permission.WorksheetsManage,+ permission.SavedQueriesCreate,+ permission.SavedQueriesSearch,+ permission.SavedQueriesList,+ permission.SavedQueriesManage,permission.WorkspacesGetIamPolicy,permission.ServiceAccountsGet,permission.ServiceAccountsList,@@ -420,7 +424,10 @@ var PredefinedRoles = []*RoleMessage{permission.UsersList,permission.TaskRunsCreate,permission.TaskRunsList,- permission.WorksheetsGet,+ permission.SavedQueriesCreate,+ permission.SavedQueriesSearch,+ permission.SavedQueriesList,+ permission.SavedQueriesManage,permission.ServiceAccountsCreate,permission.ServiceAccountsDelete,permission.ServiceAccountsGet,@@ -473,6 +480,8 @@ var PredefinedRoles = []*RoleMessage{permission.RevisionsList,permission.RolloutsGet,permission.RolloutsList,+ permission.SavedQueriesCreate,+ permission.SavedQueriesSearch,permission.SheetsCreate,permission.SheetsGet,permission.TaskRunsList,@@ -498,7 +507,8 @@ var PredefinedRoles = []*RoleMessage{permission.SQLExplain,permission.SQLInfo,permission.SQLSelect,- permission.WorksheetsGet,+ permission.SavedQueriesCreate,+ permission.SavedQueriesSearch,),},{@@ -519,7 +529,8 @@ var PredefinedRoles = []*RoleMessage{permission.SQLExplain,permission.SQLInfo,permission.SQLSelect,- permission.WorksheetsGet,+ permission.SavedQueriesCreate,+ permission.SavedQueriesSearch,),},{@@ -593,6 +604,8 @@ var PredefinedRoles = []*RoleMessage{permission.ProjectsGet,permission.ProjectsGetIAMPolicy,permission.IssuesGet,+ permission.SavedQueriesCreate,+ permission.SavedQueriesSearch,),},}diff --git a/backend/store/principal.go b/backend/store/principal.goindex 12bcd3dc27..43f71b1876 100644--- a/backend/store/principal.go+++ b/backend/store/principal.go@@ -681,7 +681,7 @@ func (s *Store) UpdateUserEmail(ctx context.Context, user *UserMessage, newEmail}rows.Close()- if err := updateReference("UPDATE saved_query_organizer SET principal = $1 WHERE principal = $2"); err != nil {+ if err := updateReference("UPDATE saved_query_star SET principal = $1 WHERE principal = $2"); err != nil {return nil, err}if err := updateReference("UPDATE saved_query SET creator = $1 WHERE creator = $2"); err != nil {diff --git a/backend/store/project.go b/backend/store/project.goindex 77836d956a..a4eea576a1 100644--- a/backend/store/project.go+++ b/backend/store/project.go@@ -496,16 +496,29 @@ func (s *Store) DeleteProject(ctx context.Context, workspace string, resourceIDreturn errors.Wrapf(err, "failed to delete policy for project %s", resourceID)}- // Delete saved_query_organizer entries referencing project principals.- q = qb.Q().Space(`DELETE FROM saved_query_organizer- WHERE principal IN (SELECT email FROM service_account WHERE project = ? AND workspace = ?)- OR principal IN (SELECT email FROM workload_identity WHERE project = ? AND workspace = ?)`, resourceID, workspace, resourceID, workspace)+ // Delete star rows before their parents, in full primary-key order: stars+ // held by project principals, and stars on the saved queries the next+ // statement deletes.+ q = qb.Q().Space(`DELETE FROM saved_query_star+ WHERE (saved_query, principal) IN (+ SELECT saved_query, principal+ FROM saved_query_star+ WHERE principal IN (SELECT email FROM service_account WHERE project = ? AND workspace = ?)+ OR principal IN (SELECT email FROM workload_identity WHERE project = ? AND workspace = ?)+ OR saved_query IN (+ SELECT resource_id FROM saved_query+ WHERE creator IN (SELECT email FROM service_account WHERE project = ? AND workspace = ?)+ OR creator IN (SELECT email FROM workload_identity WHERE project = ? AND workspace = ?)+ )+ ORDER BY saved_query, principal+ FOR UPDATE+ )`, resourceID, workspace, resourceID, workspace, resourceID, workspace, resourceID, workspace)sql, args, err = q.ToSQL()if err != nil {- return errors.Wrap(err, "failed to build saved_query_organizer delete query")+ return errors.Wrap(err, "failed to build saved_query_star delete query")}if _, err := tx.ExecContext(ctx, sql, args...); err != nil {- return errors.Wrapf(err, "failed to delete saved_query_organizer for project %s", resourceID)+ return errors.Wrapf(err, "failed to delete saved_query_star for project %s", resourceID)}// Delete saved queries created by project service accounts or workload identities.diff --git a/backend/store/saved_query.go b/backend/store/saved_query.goindex d2792210c9..93adf35beb 100644--- a/backend/store/saved_query.go+++ b/backend/store/saved_query.go@@ -3,7 +3,6 @@ package storeimport ("context""database/sql"- "encoding/json""fmt""strings""time"@@ -33,13 +32,15 @@ type SavedQueryMessage struct {Title stringStatement string+ // The folder path this saved query lives in ("a/b/c", "" = unfiled).+ Folder string// Output only fieldsSize int64CreatedAt time.TimeUpdatedAt time.Time- Starred bool- Folders []string+ // Whether FindSavedQueryMessage.PrincipalEmail starred this saved query.+ Starred bool}// FindSavedQueryMessage is the API message for finding sheets.@@ -68,6 +69,8 @@ type PatchSavedQueryMessage struct {Statement *string// Database sets the connected database ("" clears it).Database *string+ // Folder re-files the saved query ("" = unfiled).+ Folder *string}// GetSavedQuery gets a sheet.@@ -105,12 +108,12 @@ func (s *Store) ListSavedQueries(ctx context.Context, find *FindSavedQueryMessagsaved_query.updated_at,saved_query.project,saved_query.payload,+ saved_query.folder,saved_query.name,%s,OCTET_LENGTH(saved_query.statement),- COALESCE(saved_query_organizer.payload, '{}')+ EXISTS (SELECT 1 FROM saved_query_star WHERE saved_query_star.saved_query = saved_query.resource_id AND saved_query_star.principal = ?)FROM saved_query- LEFT JOIN saved_query_organizer ON saved_query_organizer.saved_query = saved_query.resource_id AND saved_query_organizer.principal = ?WHERE TRUE`, statementField), find.PrincipalEmail)if find.Workspace != "" {@@ -152,7 +155,7 @@ func (s *Store) ListSavedQueries(ctx context.Context, find *FindSavedQueryMessagvar sheets []*SavedQueryMessagefor rows.Next() {var sheet SavedQueryMessage- var payloadBytes, organizerPayloadBytes []byte+ var payloadBytes []byteif err := rows.Scan(&sheet.ResourceID,&sheet.Creator,@@ -160,10 +163,11 @@ func (s *Store) ListSavedQueries(ctx context.Context, find *FindSavedQueryMessag&sheet.UpdatedAt,&sheet.ProjectID,&payloadBytes,+ &sheet.Folder,&sheet.Title,&sheet.Statement,&sheet.Size,- &organizerPayloadBytes,+ &sheet.Starred,); err != nil {return nil, err}@@ -174,13 +178,6 @@ func (s *Store) ListSavedQueries(ctx context.Context, find *FindSavedQueryMessag}sheet.Database = payload.Database- var organizerPayload storepb.SavedQueryOrganizerPayload- if err := common.ProtojsonUnmarshaler.Unmarshal(organizerPayloadBytes, &organizerPayload); err != nil {- return nil, errors.Wrapf(err, "failed to unmarshal saved query organizer payload")- }- sheet.Folders = organizerPayload.Folders- sheet.Starred = organizerPayload.Starred-sheets = append(sheets, &sheet)}if err := rows.Err(); err != nil {@@ -190,102 +187,44 @@ func (s *Store) ListSavedQueries(ctx context.Context, find *FindSavedQueryMessagreturn sheets, nil}-// ListSavedQueryOrganizers returns the caller's savedQuery organizers.-func (s *Store) ListSavedQueryOrganizers(ctx context.Context, find *FindSavedQueryMessage) ([]*SavedQueryOrganizerMessage, error) {- if len(find.ProjectIDs) == 0 && find.Workspace == "" {- return nil, errors.Errorf("empty project filter")- }- if find.PrincipalEmail == "" {- return nil, errors.Errorf("empty principal")- }- q := qb.Q().Space(`- SELECT- saved_query.resource_id,- saved_query.creator,- saved_query_organizer.principal,- saved_query_organizer.payload- FROM saved_query_organizer- JOIN saved_query ON saved_query.resource_id = saved_query_organizer.saved_query- WHERE saved_query_organizer.principal = ?`, find.PrincipalEmail)-- if find.Workspace != "" {- q.And("EXISTS (SELECT 1 FROM project WHERE project.resource_id = saved_query.project AND project.workspace = ? AND project.deleted = FALSE)", find.Workspace)- }- if len(find.ProjectIDs) == 1 {- q.And("saved_query.project = ?", find.ProjectIDs[0])- } else if len(find.ProjectIDs) > 1 {- q.And("saved_query.project = ANY(?)", find.ProjectIDs)- }-- if filterQ := find.FilterQ; filterQ != nil {- q.And("?", filterQ)- }-- q.Space("ORDER BY saved_query.project, saved_query.resource_id")-- query, args, err := q.ToSQL()+// CreateSavedQuery creates a new saved query. The insert transaction locks+// the owning project row and requires it to be active, so a create racing a+// project purge fails cleanly instead of as an FK violation — the parent+// fence for a new child row that cannot be locked in advance.+func (s *Store) CreateSavedQuery(ctx context.Context, create *SavedQueryMessage) (*SavedQueryMessage, error) {+ payloadStr, err := protojson.Marshal(&storepb.SavedQueryPayload{Database: create.Database})if err != nil {- return nil, errors.Wrapf(err, "failed to build sql")+ return nil, err}- rows, err := s.GetDB().QueryContext(ctx, query, args...)+ tx, err := s.GetDB().BeginTx(ctx, nil)if err != nil {- return nil, err+ return nil, errors.Wrap(err, "failed to begin transaction")}- defer rows.Close()-- var savedQueryOrganizers []*SavedQueryOrganizerMessage- for rows.Next() {- var savedQueryOrganizer SavedQueryOrganizerMessage- var payloadBytes []byte- if err := rows.Scan(- &savedQueryOrganizer.SavedQueryResourceID,- &savedQueryOrganizer.SavedQueryCreator,- &savedQueryOrganizer.Principal,- &payloadBytes,- ); err != nil {- return nil, err- }-- var payload storepb.SavedQueryOrganizerPayload- if err := common.ProtojsonUnmarshaler.Unmarshal(payloadBytes, &payload); err != nil {- return nil, errors.Wrapf(err, "failed to unmarshal saved query organizer payload")- }- savedQueryOrganizer.Payload = &payload+ defer tx.Rollback()- savedQueryOrganizers = append(savedQueryOrganizers, &savedQueryOrganizer)- }- if err := rows.Err(); err != nil {+ // A saved query is a new child row, so it takes the "requires an active+ // project" fence: lock the parent and refuse if it is archived or purged.+ if err := lockActiveProject(ctx, tx, create.ProjectID); err != nil {return nil, err}- return savedQueryOrganizers, nil-}--// CreateSavedQuery creates a new saved query.-func (s *Store) CreateSavedQuery(ctx context.Context, create *SavedQueryMessage) (*SavedQueryMessage, error) {- payloadStr, err := protojson.Marshal(&storepb.SavedQueryPayload{Database: create.Database})- if err != nil {- return nil, err- }- q := qb.Q().Space(`+ query, args, err := qb.Q().Space(`INSERT INTO saved_query (creator,project,name,statement,+ folder,payload)- VALUES (?, ?, ?, ?, ?)+ VALUES (?, ?, ?, ?, ?, ?)RETURNING resource_id, created_at, updated_at, OCTET_LENGTH(statement)- `, create.Creator, create.ProjectID, create.Title, create.Statement, payloadStr)-- query, args, err := q.ToSQL()+ `, create.Creator, create.ProjectID, create.Title, create.Statement, create.Folder, payloadStr).ToSQL()if err != nil {return nil, errors.Wrapf(err, "failed to build sql")}-- if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(+ if err := tx.QueryRowContext(ctx, query, args...).Scan(&create.ResourceID,&create.CreatedAt,&create.UpdatedAt,@@ -296,6 +235,9 @@ func (s *Store) CreateSavedQuery(ctx context.Context, create *SavedQueryMessage)}return nil, err}+ if err := tx.Commit(); err != nil {+ return nil, errors.Wrap(err, "failed to commit transaction")+ }return create, nil}@@ -310,6 +252,9 @@ func (s *Store) PatchSavedQuery(ctx context.Context, patch *PatchSavedQueryMessaif v := patch.Statement; v != nil {set.Comma("statement = ?", *v)}+ if v := patch.Folder; v != nil {+ set.Comma("folder = ?", *v)+ }if v := patch.Database; v != nil {if *v == "" {set.Comma("payload = payload - 'database'")@@ -328,212 +273,210 @@ func (s *Store) PatchSavedQuery(ctx context.Context, patch *PatchSavedQueryMessareturn nil}-// DeleteSavedQuery deletes an existing saved query by resource ID.-// The saved_query_organizer rows are cascade-deleted via FK on saved_query(resource_id).+// DeleteSavedQuery deletes an existing saved query by resource ID. Star rows+// are deleted first, in full primary-key order — explicitly, not via the FK+// cascade (which would lock the parent first) — matching the star and purge+// lock order so a delete racing a star toggle or a purge cannot deadlock.func (s *Store) DeleteSavedQuery(ctx context.Context, resourceID string) error {- q := qb.Q().Space(`DELETE FROM saved_query WHERE resource_id = ?`, resourceID)- query, args, err := q.ToSQL()- if err != nil {- return errors.Wrapf(err, "failed to build sql")- }- if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {- return err- }- return nil-}--// SavedQueryOrganizerMessage is the store message for savedQuery organizer.-type SavedQueryOrganizerMessage struct {- SavedQueryResourceID string- SavedQueryCreator string- Principal string- Payload *storepb.SavedQueryOrganizerPayload-}--// BatchUpdateSavedQueryOrganizerPatch is the patch for updating savedQuery organizers in batch.-type BatchUpdateSavedQueryOrganizerPatch struct {- SavedQueryResourceIDs []string- Principal string- Starred *bool- Folders *[]string-}--func (s *Store) GetSavedQueryOrganizer(ctx context.Context, savedQueryResourceID string, principal string) (*SavedQueryOrganizerMessage, error) {- q := qb.Q().Space(`- SELECT- payload- FROM saved_query_organizer- WHERE saved_query = ? AND principal = ?- `, savedQueryResourceID, principal)-- query, args, err := q.ToSQL()+ tx, err := s.GetDB().BeginTx(ctx, nil)if err != nil {- return nil, errors.Wrapf(err, "failed to build sql")+ return errors.Wrap(err, "failed to begin transaction")}+ defer tx.Rollback()- savedQueryOrganizer := SavedQueryOrganizerMessage{- SavedQueryResourceID: savedQueryResourceID,- Principal: principal,- Payload: &storepb.SavedQueryOrganizerPayload{},- }- var payload []byte- if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(- &payload,- ); err != nil {- if err == sql.ErrNoRows {- return &savedQueryOrganizer, nil- }- return nil, errors.Wrapf(err, "failed to scan")+ if _, err := tx.ExecContext(ctx, `+ DELETE FROM saved_query_star+ WHERE (saved_query, principal) IN (+ SELECT saved_query, principal+ FROM saved_query_star+ WHERE saved_query = $1+ ORDER BY saved_query, principal+ FOR UPDATE+ )+ `, resourceID); err != nil {+ return errors.Wrapf(err, "failed to delete stars for saved query %s", resourceID)}- workSheetPayload := &storepb.SavedQueryOrganizerPayload{}- if err := common.ProtojsonUnmarshaler.Unmarshal(payload, workSheetPayload); err != nil {- return nil, err+ if _, err := tx.ExecContext(ctx, `DELETE FROM saved_query WHERE resource_id = $1`, resourceID); err != nil {+ return err}- savedQueryOrganizer.Payload = workSheetPayload-- return &savedQueryOrganizer, nil+ return tx.Commit()}-// UpsertSavedQueryOrganizer upserts a new SheetOrganizerMessage.-func (s *Store) UpsertSavedQueryOrganizer(ctx context.Context, patch *SavedQueryOrganizerMessage) (*SavedQueryOrganizerMessage, error) {- payloadStr, err := protojson.Marshal(patch.Payload)- if err != nil {- return nil, err- }- q := qb.Q().Space(`- INSERT INTO saved_query_organizer (- saved_query,- principal,- payload- )- VALUES (?, ?, ?)- ON CONFLICT(saved_query, principal) DO UPDATE SET- payload = EXCLUDED.payload- RETURNING- saved_query,- principal,- payload- `, patch.SavedQueryResourceID, patch.Principal, payloadStr)-- query, args, err := q.ToSQL()+// SetSavedQueryStar stars or unstars a saved query for a principal, and+// reports whether the saved query was still there to star. Lock order per the+// store row-lock rules: toggling or removing an existing star locks that child+// row directly; only the first star for a (query, principal) inserts a child+// that cannot be locked in advance — that case alone takes the parent fence+// (lock the saved_query row), and its inserted key is novel so it never+// contends with a purge's existing-child locks. The parent fence is also the+// only path that can observe a concurrent delete, which it reports as false+// rather than an error so the caller decides what a vanished row means.+func (s *Store) SetSavedQueryStar(ctx context.Context, savedQueryResourceID, principal string, starred bool) (bool, error) {+ tx, err := s.GetDB().BeginTx(ctx, nil)if err != nil {- return nil, errors.Wrapf(err, "failed to build sql")+ return false, errors.Wrap(err, "failed to begin transaction")}+ defer tx.Rollback()- var savedQueryOrganizer SavedQueryOrganizerMessage- var payload []byte- if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(- &savedQueryOrganizer.SavedQueryResourceID,- &savedQueryOrganizer.Principal,- &payload,- ); err != nil {- if err == sql.ErrNoRows {- return nil, common.FormatDBErrorEmptyRowWithQuery(query)+ var exists bool+ if err := tx.QueryRowContext(ctx, `+ SELECT EXISTS (+ SELECT 1+ FROM saved_query_star+ WHERE saved_query = $1 AND principal = $2+ FOR UPDATE+ )+ `, savedQueryResourceID, principal).Scan(&exists); err != nil {+ return false, errors.Wrap(err, "failed to lock star row")+ }++ switch {+ case starred && !exists:+ var one int+ if err := tx.QueryRowContext(ctx, `+ SELECT 1+ FROM saved_query+ WHERE resource_id = $1+ FOR UPDATE+ `, savedQueryResourceID).Scan(&one); err != nil {+ if errors.Is(err, sql.ErrNoRows) {+ return false, nil+ }+ return false, errors.Wrapf(err, "failed to lock saved query %s", savedQueryResourceID)}- return nil, err- }- workSheetPayload := &storepb.SavedQueryOrganizerPayload{}- if err := common.ProtojsonUnmarshaler.Unmarshal(payload, workSheetPayload); err != nil {- return nil, err+ if _, err := tx.ExecContext(ctx, `+ INSERT INTO saved_query_star (saved_query, principal)+ VALUES ($1, $2)+ ON CONFLICT (saved_query, principal) DO NOTHING+ `, savedQueryResourceID, principal); err != nil {+ return false, errors.Wrap(err, "failed to insert star")+ }+ case !starred && exists:+ if _, err := tx.ExecContext(ctx, `+ DELETE FROM saved_query_star+ WHERE saved_query = $1 AND principal = $2+ `, savedQueryResourceID, principal); err != nil {+ return false, errors.Wrap(err, "failed to delete star")+ }+ default:+ // Already in the requested state: an unstar of a row that is gone+ // needs no parent, so it is reported as applied.}- savedQueryOrganizer.Payload = workSheetPayload- return &savedQueryOrganizer, nil+ if err := tx.Commit(); err != nil {+ return false, err+ }+ return true, nil}-// BatchUpdateSavedQueryOrganizer updates savedQuery organizer payload fields in batch.-func (s *Store) BatchUpdateSavedQueryOrganizer(ctx context.Context, patch *BatchUpdateSavedQueryOrganizerPatch) ([]*SavedQueryOrganizerMessage, error) {- if len(patch.SavedQueryResourceIDs) == 0 {- return nil, nil- }- if patch.Principal == "" {- return nil, errors.New("principal is empty")- }- if patch.Starred == nil && patch.Folders == nil {- return nil, errors.New("empty saved query organizer patch")+// BatchUpdateSavedQueryFolder re-files the given saved queries into folder.+// 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) {+ if len(resourceIDs) == 0 {+ return 0, nil}tx, err := s.GetDB().BeginTx(ctx, nil)if err != nil {- return nil, errors.Wrap(err, "failed to begin transaction")+ return 0, errors.Wrap(err, "failed to begin transaction")}defer tx.Rollback()- insertQuery, insertArgs, err := qb.Q().Space(`- INSERT INTO saved_query_organizer (- saved_query,- principal,- payload- )- SELECT saved_query.resource_id, ?, '{}'::jsonb+ rows, err := tx.QueryContext(ctx, `+ SELECT resource_idFROM saved_query- WHERE saved_query.resource_id = ANY(?)- ON CONFLICT (saved_query, principal) DO NOTHING- `, patch.Principal, patch.SavedQueryResourceIDs).ToSQL()+ WHERE resource_id = ANY($1)+ ORDER BY resource_id+ FOR UPDATE+ `, resourceIDs)if err != nil {- return nil, errors.Wrap(err, "failed to build saved query organizer insert query")+ return 0, errors.Wrap(err, "failed to lock saved queries")}- if _, err := tx.ExecContext(ctx, insertQuery, insertArgs...); err != nil {- return nil, errors.Wrap(err, "failed to insert missing saved query organizers")+ 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)}-- payloadExpr := "payload"- var updateArgs []any- if patch.Starred != nil {- payloadExpr = fmt.Sprintf("jsonb_set(%s, '{starred}', to_jsonb(?::boolean), true)", payloadExpr)- updateArgs = append(updateArgs, *patch.Starred)+ if err := rows.Err(); err != nil {+ return 0, err}- if patch.Folders != nil {- folderBytes, err := json.Marshal(*patch.Folders)- if err != nil {- return nil, errors.Wrap(err, "failed to marshal folders")++ 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")}- payloadExpr = fmt.Sprintf("jsonb_set(%s, '{folders}', ?::jsonb, true)", payloadExpr)- updateArgs = append(updateArgs, string(folderBytes))}- updateArgs = append(updateArgs, patch.Principal, patch.SavedQueryResourceIDs)+ if err := tx.Commit(); err != nil {+ return 0, errors.Wrap(err, "failed to commit transaction")+ }+ return len(locked), nil+}++// ListSavedQueryFolderPaths returns the distinct folder paths of the saved+// queries in a project that match filterQ. A non-nil creator restricts the+// paths to that creator's rows, which is how the API layer applies the same+// read rule the rows themselves carry: your own always, everyone's only with+// the admin backstop.+func (s *Store) ListSavedQueryFolderPaths(ctx context.Context, projectID string, creator *string, filterQ *qb.Query) ([]string, error) {+ q := qb.Q().Space(`+ SELECT DISTINCT folder+ FROM saved_query+ WHERE TRUE`)+ q.And("saved_query.project = ?", projectID)+ q.And("saved_query.folder <> ''")+ if creator != nil {+ q.And("saved_query.creator = ?", *creator)+ }+ if filterQ != nil {+ q.And("?", filterQ)+ }+ q.Space("ORDER BY folder")- updateQuery, args, err := qb.Q().Space(fmt.Sprintf(`- UPDATE saved_query_organizer- SET payload = %s- WHERE principal = ? AND saved_query = ANY(?)- RETURNING saved_query, principal, payload- `, payloadExpr), updateArgs...).ToSQL()+ query, args, err := q.ToSQL()if err != nil {- return nil, errors.Wrap(err, "failed to build saved query organizer update query")+ return nil, errors.Wrapf(err, "failed to build sql")}- rows, err := tx.QueryContext(ctx, updateQuery, args...)+ rows, err := s.GetDB().QueryContext(ctx, query, args...)if err != nil {- return nil, errors.Wrap(err, "failed to update savedQuery organizers")+ return nil, err}defer rows.Close()-- var savedQueryOrganizers []*SavedQueryOrganizerMessage+ var folders []stringfor rows.Next() {- var savedQueryOrganizer SavedQueryOrganizerMessage- var payload []byte- if err := rows.Scan(- &savedQueryOrganizer.SavedQueryResourceID,- &savedQueryOrganizer.Principal,- &payload,- ); err != nil {- return nil, err- }- workSheetPayload := &storepb.SavedQueryOrganizerPayload{}- if err := common.ProtojsonUnmarshaler.Unmarshal(payload, workSheetPayload); err != nil {+ var folder string+ if err := rows.Scan(&folder); err != nil {return nil, err}- savedQueryOrganizer.Payload = workSheetPayload- savedQueryOrganizers = append(savedQueryOrganizers, &savedQueryOrganizer)+ folders = append(folders, folder)}if err := rows.Err(); err != nil {return nil, err}+ return folders, nil+}- if err := tx.Commit(); err != nil {- return nil, errors.Wrap(err, "failed to commit transaction")- }- return savedQueryOrganizers, nil+// NormalizeSavedQueryFolder puts a client-supplied folder path into the one+// form that is stored and matched. Boundary slashes are trimmed, so "/team/"+// and "team" name the same folder, and an empty path segment is rejected+// rather than stored: every write path and the `folder ==` filter share this+// function, so a folder that can be stored is always a folder that can be+// found. "" means unfiled.+func NormalizeSavedQueryFolder(folder string) (string, error) {+ normalized := strings.Trim(folder, "/")+ if strings.Contains(normalized, "//") {+ return "", errors.Errorf("invalid folder %q: empty path segment", folder)+ }+ return normalized, nil}func GetSearchSavedQueryFilter(ctx context.Context, s *Store, caller string, filter string, allowTitleContains bool) (*qb.Query, error) {@@ -594,7 +537,10 @@ func GetSearchSavedQueryFilter(ctx context.Context, s *Store, caller string, filreturn qb.Q().Space("saved_query.creator = ?", userID), nilcase "starred":if starred, ok := value.(bool); ok {- return qb.Q().Space("saved_query.resource_id IN (SELECT saved_query FROM saved_query_organizer WHERE principal = ? AND (payload->>'starred')::boolean = ?)", caller, starred), nil+ if starred {+ return qb.Q().Space("EXISTS (SELECT 1 FROM saved_query_star WHERE saved_query_star.saved_query = saved_query.resource_id AND saved_query_star.principal = ?)", caller), nil+ }+ return qb.Q().Space("NOT EXISTS (SELECT 1 FROM saved_query_star WHERE saved_query_star.saved_query = saved_query.resource_id AND saved_query_star.principal = ?)", caller), nil}return qb.Q().Space("TRUE"), nilcase "folder":@@ -602,20 +548,11 @@ func GetSearchSavedQueryFilter(ctx context.Context, s *Store, caller string, filif !ok {return nil, errors.Errorf("invalid folder value %q", value)}- folder = strings.Trim(folder, "/")- if folder == "" {- return qb.Q().Space("COALESCE(jsonb_array_length(saved_query_organizer.payload->'folders'), 0) = 0"), nil- }- q := qb.Q()- segments := strings.Split(folder, "/")- for i, segment := range segments {- if segment == "" {- return nil, errors.Errorf("invalid folder %q", value)- }- q.And(fmt.Sprintf("saved_query_organizer.payload->'folders'->>%d = ?", i), segment)+ folder, err := NormalizeSavedQueryFolder(folder)+ if err != nil {+ return nil, err}- q.And("jsonb_array_length(saved_query_organizer.payload->'folders') = ?", len(segments))- return qb.Q().Space("(?)", q), nil+ return qb.Q().Space("saved_query.folder = ?", folder), nildefault:return nil, errors.Errorf("unsupport variable %q", variable)}diff --git a/backend/store/saved_query_folder_test.go b/backend/store/saved_query_folder_test.gonew file mode 100644index 0000000000..cbdf547770--- /dev/null+++ b/backend/store/saved_query_folder_test.go@@ -0,0 +1,34 @@+package store++import (+ "testing"++ "github.com/stretchr/testify/require"+)++func TestNormalizeSavedQueryFolder(t *testing.T) {+ testCases := []struct {+ name string+ folder string+ want string+ wantErr bool+ }{+ {name: "unfiled", folder: "", want: ""},+ {name: "already normalized", folder: "team/reports", want: "team/reports"},+ {name: "leading and trailing slashes", folder: "/team/", want: "team"},+ {name: "nested with boundary slashes", folder: "/team/reports/", want: "team/reports"},+ {name: "slashes only", folder: "///", want: ""},+ {name: "empty segment rejected", folder: "team//reports", wantErr: true},+ }+ for _, tc := range testCases {+ t.Run(tc.name, func(t *testing.T) {+ got, err := NormalizeSavedQueryFolder(tc.folder)+ if tc.wantErr {+ require.Error(t, err)+ return+ }+ require.NoError(t, err)+ require.Equal(t, tc.want, got)+ })+ }+}diff --git a/backend/store/saved_query_lock_order_test.go b/backend/store/saved_query_lock_order_test.gonew file mode 100644index 0000000000..d8ef7da0dd--- /dev/null+++ b/backend/store/saved_query_lock_order_test.go@@ -0,0 +1,392 @@+package store_test++import (+ "testing"+ "time"++ "github.com/stretchr/testify/require"++ "github.com/bytebase/bytebase/backend/common"+ "github.com/bytebase/bytebase/backend/store"+)++// Deterministic regression locks for the saved-query lock-order invariants:+// child-before-parent for existing rows, parent fence only for a new child+// insert, and full primary-key order for every multi-row lock. Each pair is+// exercised in both acquisition directions, asserting terminal outcomes —+// never a deadlock (40P01) or an FK failure.++func savedQueryStarCount(t *testing.T, fixture *projectDeletionLockOrderFixture) int {+ t.Helper()+ var count int+ require.NoError(t, fixture.db.QueryRowContext(fixture.ctx,+ "SELECT COUNT(*) FROM saved_query_star WHERE saved_query = 'saved-query-a'").Scan(&count))+ return count+}++func TestSavedQueryCreateAndDeleteProjectLockOrder(t *testing.T) {+ const seedSQL = `+ INSERT INTO saved_query (resource_id, creator, project, name, statement)+ VALUES ('saved-query-a', '[email protected]', 'project-a', 'Saved Query A', '');+ `++ t.Run("create rejects a deleted project while its purge is parked", func(t *testing.T) {+ fixture := newProjectDeletionLockOrderFixture(t, seedSQL)+ const barrierID = 9931+ barrier := newMaintenanceLockBarrier(fixture.ctx, t, fixture.db, barrierID)+ installMaintenanceLockBarrier(t, fixture.db, barrierID,+ "AFTER UPDATE OF project ON saved_query FOR EACH ROW")++ deleteResult := make(chan error, 1)+ go func() { deleteResult <- fixture.store.DeleteProject(fixture.ctx, "default", "project-a") }()+ waitForMaintenanceBarrier(fixture.ctx, t, fixture.db, barrierID)++ // The create fence locks the project row (which the parked purge does+ // not yet hold — the purge locks parents last), sees the deleted flag,+ // and rejects cleanly instead of racing to an FK failure.+ createResult := make(chan error, 1)+ go func() {+ _, err := fixture.store.CreateSavedQuery(fixture.ctx, &store.SavedQueryMessage{+ ProjectID: "project-a",+ Creator: "[email protected]",+ Title: "raced",+ Statement: "SELECT 1;",+ })+ createResult <- err+ }()+ select {+ case err := <-createResult:+ require.Error(t, err)+ require.ErrorContains(t, err, "deleted")+ case <-time.After(maintenanceLockWait):+ t.Fatal("saved query creation should reject a deleted project before purge completion")+ }+ barrier.release(t)+ requireMaintenanceResult(t, deleteResult)+ })++ t.Run("create succeeds on an unrelated project while a purge is parked", func(t *testing.T) {+ // project-b is untouched by project-a's purge. The default project is+ // deliberately not the target here: the purge re-parents saved queries+ // into it, and that FK write holds a KEY SHARE lock on the default+ // project row for the rest of the purge transaction, so a create fence+ // there legitimately waits for the (short-lived) purge to commit.+ fixture := newProjectDeletionLockOrderFixture(t, seedSQL+`+ INSERT INTO project (resource_id, workspace, name) VALUES ('project-b', 'default', 'Project B');+ `)+ const barrierID = 9932+ barrier := newMaintenanceLockBarrier(fixture.ctx, t, fixture.db, barrierID)+ installMaintenanceLockBarrier(t, fixture.db, barrierID,+ "AFTER UPDATE OF project ON saved_query FOR EACH ROW")++ deleteResult := make(chan error, 1)+ go func() { deleteResult <- fixture.store.DeleteProject(fixture.ctx, "default", "project-a") }()+ waitForMaintenanceBarrier(fixture.ctx, t, fixture.db, barrierID)++ created, err := fixture.store.CreateSavedQuery(fixture.ctx, &store.SavedQueryMessage{+ ProjectID: "project-b",+ Creator: "[email protected]",+ Title: "independent",+ Statement: "SELECT 1;",+ })+ require.NoError(t, err)+ require.NotEmpty(t, created.ResourceID)++ barrier.release(t)+ requireMaintenanceResult(t, deleteResult)+ })+}++func TestSavedQueryFirstStarAndDeleteProjectLockOrder(t *testing.T) {+ const seedSQL = `+ INSERT INTO saved_query (resource_id, creator, project, name, statement)+ VALUES ('saved-query-a', '[email protected]', 'project-a', 'Saved Query A', '');+ `++ t.Run("purge first", func(t *testing.T) {+ fixture := newProjectDeletionLockOrderFixture(t, seedSQL)+ const barrierID = 9933+ barrier := newMaintenanceLockBarrier(fixture.ctx, t, fixture.db, barrierID)+ installMaintenanceLockBarrier(t, fixture.db, barrierID,+ "AFTER UPDATE OF project ON saved_query FOR EACH ROW")++ deleteResult := make(chan error, 1)+ go func() { deleteResult <- fixture.store.DeleteProject(fixture.ctx, "default", "project-a") }()+ waitForMaintenanceBarrier(fixture.ctx, t, fixture.db, barrierID)+ purgePID := maintenanceBarrierWaitingPID(fixture.ctx, t, fixture.db, barrierID)++ // The first star takes the parent fence on the saved_query row the+ // parked purge holds via its re-parent update.+ starResult := make(chan error, 1)+ go func() {+ _, err := fixture.store.SetSavedQueryStar(fixture.ctx, "saved-query-a", "[email protected]", true)+ starResult <- err+ }()+ waitForBackendBlockedByPID(fixture.ctx, t, fixture.db, purgePID)+ barrier.release(t)++ requireMaintenanceResult(t, deleteResult)+ requireMaintenanceResult(t, starResult)+ // The row survived the purge by re-parenting, so the star landed.+ require.Equal(t, 1, savedQueryStarCount(t, fixture))+ })++ t.Run("star first", func(t *testing.T) {+ fixture := newProjectDeletionLockOrderFixture(t, seedSQL)+ const barrierID = 9934+ barrier := newMaintenanceLockBarrier(fixture.ctx, t, fixture.db, barrierID)+ installMaintenanceLockBarrier(t, fixture.db, barrierID,+ "AFTER INSERT ON saved_query_star FOR EACH ROW")++ starResult := make(chan error, 1)+ go func() {+ _, err := fixture.store.SetSavedQueryStar(fixture.ctx, "saved-query-a", "[email protected]", true)+ starResult <- err+ }()+ waitForMaintenanceBarrier(fixture.ctx, t, fixture.db, barrierID)+ starPID := maintenanceBarrierWaitingPID(fixture.ctx, t, fixture.db, barrierID)++ deleteResult := make(chan error, 1)+ go func() { deleteResult <- fixture.store.DeleteProject(fixture.ctx, "default", "project-a") }()+ waitForBackendBlockedByPID(fixture.ctx, t, fixture.db, starPID)+ barrier.release(t)++ requireMaintenanceResult(t, starResult)+ requireMaintenanceResult(t, deleteResult)+ require.Equal(t, 1, savedQueryStarCount(t, fixture))+ })+}++func TestSavedQueryDeleteAndStarToggleLockOrder(t *testing.T) {+ const seedSQL = `+ INSERT INTO saved_query (resource_id, creator, project, name, statement)+ VALUES ('saved-query-a', '[email protected]', 'default', 'Saved Query A', '');+ INSERT INTO saved_query_star (saved_query, principal) VALUES ('saved-query-a', '[email protected]');+ `++ t.Run("delete first", func(t *testing.T) {+ fixture := newProjectDeletionLockOrderFixture(t, seedSQL)+ const barrierID = 9935+ barrier := newMaintenanceLockBarrier(fixture.ctx, t, fixture.db, barrierID)+ // Park the delete after it has removed the star rows and taken the+ // parent row itself — that is the point where a first star from another+ // principal must be fenced out.+ installMaintenanceLockBarrier(t, fixture.db, barrierID,+ "AFTER DELETE ON saved_query FOR EACH ROW")++ deleteResult := make(chan error, 1)+ go func() { deleteResult <- fixture.store.DeleteSavedQuery(fixture.ctx, "saved-query-a") }()+ waitForMaintenanceBarrier(fixture.ctx, t, fixture.db, barrierID)+ deletePID := maintenanceBarrierWaitingPID(fixture.ctx, t, fixture.db, barrierID)++ // A second principal's first star waits on the parent fence held by+ // the parked delete, then reports the parent gone once it lands.+ starResult := make(chan error, 1)+ var starApplied bool+ go func() {+ applied, err := fixture.store.SetSavedQueryStar(fixture.ctx, "saved-query-a", "[email protected]", true)+ starApplied = applied+ starResult <- err+ }()+ waitForBackendBlockedByPID(fixture.ctx, t, fixture.db, deletePID)+ barrier.release(t)++ requireMaintenanceResult(t, deleteResult)+ select {+ case err := <-starResult:+ // The parent is gone, so there is nothing to star: reported as+ // not applied rather than as a failure.+ require.NoError(t, err)+ require.False(t, starApplied)+ case <-time.After(maintenanceLockWait):+ t.Fatal("timed out waiting for the star toggle")+ }+ require.Zero(t, savedQueryStarCount(t, fixture))+ })++ t.Run("toggle first", func(t *testing.T) {+ fixture := newProjectDeletionLockOrderFixture(t, seedSQL)+ const barrierID = 9936+ barrier := newMaintenanceLockBarrier(fixture.ctx, t, fixture.db, barrierID)+ installMaintenanceLockBarrier(t, fixture.db, barrierID,+ "AFTER DELETE ON saved_query_star FOR EACH ROW")++ // Unstar locks and deletes the existing child row, parking at the+ // barrier with the child lock held.+ unstarResult := make(chan error, 1)+ go func() {+ _, err := fixture.store.SetSavedQueryStar(fixture.ctx, "saved-query-a", "[email protected]", false)+ unstarResult <- err+ }()+ waitForMaintenanceBarrier(fixture.ctx, t, fixture.db, barrierID)+ unstarPID := maintenanceBarrierWaitingPID(fixture.ctx, t, fixture.db, barrierID)++ deleteResult := make(chan error, 1)+ go func() { deleteResult <- fixture.store.DeleteSavedQuery(fixture.ctx, "saved-query-a") }()+ waitForBackendBlockedByPID(fixture.ctx, t, fixture.db, unstarPID)+ barrier.release(t)++ requireMaintenanceResult(t, unstarResult)+ requireMaintenanceResult(t, deleteResult)+ var queryCount int+ require.NoError(t, fixture.db.QueryRowContext(fixture.ctx,+ "SELECT COUNT(*) FROM saved_query WHERE resource_id = 'saved-query-a'").Scan(&queryCount))+ require.Zero(t, queryCount)+ })+}++func TestSavedQueryDeleteAndDeleteProjectLockOrder(t *testing.T) {+ // The saved query is owned by a project service account, so the purge+ // deletes it (stars first) rather than re-parenting it — the contended+ // pair is the star child rows, locked in primary-key order on both paths.+ const seedSQL = `+ INSERT INTO service_account (name, email, workspace, service_key_hash, project)+ VALUES ('service account', '[email protected]', 'default', 'unused', 'project-a');+ INSERT INTO saved_query (resource_id, creator, project, name, statement)+ VALUES ('saved-query-a', '[email protected]', 'project-a', 'Saved Query A', '');+ INSERT INTO saved_query_star (saved_query, principal) VALUES+ ('saved-query-a', '[email protected]'),+ ('saved-query-a', '[email protected]');+ `++ requireGone := func(t *testing.T, fixture *projectDeletionLockOrderFixture) {+ t.Helper()+ var queryCount int+ require.NoError(t, fixture.db.QueryRowContext(fixture.ctx,+ "SELECT COUNT(*) FROM saved_query WHERE resource_id = 'saved-query-a'").Scan(&queryCount))+ require.Zero(t, queryCount)+ require.Zero(t, savedQueryStarCount(t, fixture))+ }++ t.Run("purge first", func(t *testing.T) {+ fixture := newProjectDeletionLockOrderFixture(t, seedSQL)+ const barrierID = 9937+ barrier := newMaintenanceLockBarrier(fixture.ctx, t, fixture.db, barrierID)+ installMaintenanceLockBarrier(t, fixture.db, barrierID,+ "AFTER DELETE ON saved_query_star FOR EACH ROW")++ purgeResult := make(chan error, 1)+ go func() { purgeResult <- fixture.store.DeleteProject(fixture.ctx, "default", "project-a") }()+ waitForMaintenanceBarrier(fixture.ctx, t, fixture.db, barrierID)+ purgePID := maintenanceBarrierWaitingPID(fixture.ctx, t, fixture.db, barrierID)++ deleteResult := make(chan error, 1)+ go func() { deleteResult <- fixture.store.DeleteSavedQuery(fixture.ctx, "saved-query-a") }()+ waitForBackendBlockedByPID(fixture.ctx, t, fixture.db, purgePID)+ barrier.release(t)++ requireMaintenanceResult(t, purgeResult)+ requireMaintenanceResult(t, deleteResult)+ requireGone(t, fixture)+ })++ t.Run("delete first", func(t *testing.T) {+ fixture := newProjectDeletionLockOrderFixture(t, seedSQL)+ const barrierID = 9938+ barrier := newMaintenanceLockBarrier(fixture.ctx, t, fixture.db, barrierID)+ installMaintenanceLockBarrier(t, fixture.db, barrierID,+ "AFTER DELETE ON saved_query_star FOR EACH ROW")++ deleteResult := make(chan error, 1)+ go func() { deleteResult <- fixture.store.DeleteSavedQuery(fixture.ctx, "saved-query-a") }()+ waitForMaintenanceBarrier(fixture.ctx, t, fixture.db, barrierID)+ deletePID := maintenanceBarrierWaitingPID(fixture.ctx, t, fixture.db, barrierID)++ purgeResult := make(chan error, 1)+ go func() { purgeResult <- fixture.store.DeleteProject(fixture.ctx, "default", "project-a") }()+ waitForBackendBlockedByPID(fixture.ctx, t, fixture.db, deletePID)+ barrier.release(t)++ requireMaintenanceResult(t, deleteResult)+ requireMaintenanceResult(t, purgeResult)+ requireGone(t, fixture)+ })+}++func TestSavedQueryBatchFolderMovesLockOrder(t *testing.T) {+ const seedSQL = `+ INSERT INTO saved_query (resource_id, creator, project, name, statement, folder) VALUES+ ('saved-query-a', '[email protected]', 'default', 'A', '', 'start'),+ ('saved-query-b', '[email protected]', 'default', 'B', '', 'start');+ `++ fixture := newProjectDeletionLockOrderFixture(t, seedSQL)+ const barrierID = 9939+ barrier := newMaintenanceLockBarrier(fixture.ctx, t, fixture.db, barrierID)+ installMaintenanceLockBarrier(t, fixture.db, barrierID,+ "AFTER UPDATE OF folder ON saved_query FOR EACH ROW")++ // Two overlapping batches with intersecting, reverse-ordered targets:+ // both lock in full primary-key order, so the second serializes behind+ // the first instead of deadlocking.+ firstResult := make(chan error, 1)+ go func() {+ _, err := fixture.store.BatchUpdateSavedQueryFolder(fixture.ctx,+ []string{"saved-query-a", "saved-query-b"}, "one")+ firstResult <- err+ }()+ waitForMaintenanceBarrier(fixture.ctx, t, fixture.db, barrierID)+ firstPID := maintenanceBarrierWaitingPID(fixture.ctx, t, fixture.db, barrierID)++ secondResult := make(chan error, 1)+ go func() {+ _, err := fixture.store.BatchUpdateSavedQueryFolder(fixture.ctx,+ []string{"saved-query-b", "saved-query-a"}, "two")+ secondResult <- err+ }()+ waitForBackendBlockedByPID(fixture.ctx, t, fixture.db, firstPID)+ barrier.release(t)++ requireMaintenanceResult(t, firstResult)+ requireMaintenanceResult(t, secondResult)++ var folders []string+ rows, err := fixture.db.QueryContext(fixture.ctx,+ "SELECT folder FROM saved_query ORDER BY resource_id")+ require.NoError(t, err)+ defer rows.Close()+ for rows.Next() {+ var folder string+ require.NoError(t, rows.Scan(&folder))+ folders = append(folders, folder)+ }+ require.NoError(t, rows.Err())+ require.Equal(t, []string{"two", "two"}, folders)+}++// TestCreateSavedQueryRejectsInactiveProject covers the shared fence's outcome+// on this path: the API layer checks the parent before calling, so the fence+// only fires when the project is archived or purged in between, and the caller+// has to be able to tell that from a genuine failure.+func TestCreateSavedQueryRejectsInactiveProject(t *testing.T) {+ fixture := newProjectDeletionLockOrderFixture(t, "")++ // project-a is seeded soft-deleted.+ _, err := fixture.store.CreateSavedQuery(fixture.ctx, &store.SavedQueryMessage{+ ProjectID: "project-a",+ Creator: "[email protected]",+ Title: "into an archived project",+ Statement: "SELECT 1",+ })+ require.Error(t, err)+ require.Equal(t, common.NotFound, common.ErrorCode(err))++ _, err = fixture.store.CreateSavedQuery(fixture.ctx, &store.SavedQueryMessage{+ ProjectID: "no-such-project",+ Creator: "[email protected]",+ Title: "into a purged project",+ Statement: "SELECT 1",+ })+ require.Error(t, err)+ require.Equal(t, common.NotFound, common.ErrorCode(err))++ // An active parent is unaffected.+ created, err := fixture.store.CreateSavedQuery(fixture.ctx, &store.SavedQueryMessage{+ ProjectID: "default",+ Creator: "[email protected]",+ Title: "into an active project",+ Statement: "SELECT 1",+ })+ require.NoError(t, err)+ require.NotEmpty(t, created.ResourceID)+}diff --git a/backend/store/saved_query_purge_isolation_test.go b/backend/store/saved_query_purge_isolation_test.gonew file mode 100644index 0000000000..a45ef6fc6a--- /dev/null+++ b/backend/store/saved_query_purge_isolation_test.go@@ -0,0 +1,76 @@+package store_test++import (+ "testing"++ "github.com/stretchr/testify/require"+)++// saved_query_star is keyed (saved_query, principal) and its parent key is+// globally unique, so it carries no project-scoped id-reuse risk. What it does+// carry is the purge: DeleteProject is the one writer whose star predicate+// reaches outside the project being purged, because a project principal may+// have starred another project's saved query. This locks down that reach —+// rows belonging to a surviving project must not be collateral.++func TestDeleteProjectPurgeKeepsOtherProjectSavedQueryStars(t *testing.T) {+ const seedSQL = `+ INSERT INTO project (resource_id, workspace, name) VALUES ('project-b', 'default', 'Project B');+ INSERT INTO service_account (name, email, workspace, service_key_hash, project)+ VALUES ('SA A', '[email protected]', 'default', '', 'project-a'),+ ('SA B', '[email protected]', 'default', '', 'project-b');+ INSERT INTO saved_query (resource_id, creator, project, name, statement) VALUES+ ('sq-a-sa', '[email protected]', 'project-a', 'A by SA A', ''),+ ('sq-a-user', '[email protected]', 'project-a', 'A by user', ''),+ ('sq-b-sa', '[email protected]', 'project-b', 'B by SA B', ''),+ ('sq-b-user', '[email protected]', 'project-b', 'B by user', '');+ INSERT INTO saved_query_star (saved_query, principal) VALUES+ ('sq-a-sa', '[email protected]'),+ ('sq-a-user', '[email protected]'),+ ('sq-b-sa', '[email protected]'),+ ('sq-b-sa', '[email protected]'),+ ('sq-b-user', '[email protected]');+ `++ fixture := newProjectDeletionLockOrderFixture(t, seedSQL)+ require.NoError(t, fixture.store.DeleteProject(fixture.ctx, "default", "project-a"))++ savedQueryExists := func(resourceID string) bool {+ var exists bool+ require.NoError(t, fixture.db.QueryRowContext(fixture.ctx,+ "SELECT EXISTS (SELECT 1 FROM saved_query WHERE resource_id = $1)", resourceID).Scan(&exists))+ return exists+ }+ starExists := func(savedQuery, principal string) bool {+ var exists bool+ require.NoError(t, fixture.db.QueryRowContext(fixture.ctx,+ "SELECT EXISTS (SELECT 1 FROM saved_query_star WHERE saved_query = $1 AND principal = $2)",+ savedQuery, principal).Scan(&exists))+ return exists+ }++ // Project B is untouched: its saved queries, and the stars its own+ // principals hold on them, all survive.+ require.True(t, savedQueryExists("sq-b-sa"), "project B saved query was purged with project A")+ require.True(t, savedQueryExists("sq-b-user"))+ require.True(t, starExists("sq-b-sa", "[email protected]"), "project B principal's star was purged with project A")+ require.True(t, starExists("sq-b-user", "[email protected]"), "a user's star on project B was purged with project A")++ // Project A's own rows go: the SA-created query with it, and the+ // user-created one is re-parented to the default project rather than+ // deleted, so its star has to survive with it.+ require.False(t, savedQueryExists("sq-a-sa"))+ require.False(t, starExists("sq-a-sa", "[email protected]"))+ require.True(t, savedQueryExists("sq-a-user"))+ require.True(t, starExists("sq-a-user", "[email protected]"))++ var reparented string+ require.NoError(t, fixture.db.QueryRowContext(fixture.ctx,+ "SELECT project FROM saved_query WHERE resource_id = 'sq-a-user'").Scan(&reparented))+ require.Equal(t, "default", reparented)++ // The purged project's service account is gone, so the star it held on+ // project B's saved query goes with it — that is the one cross-project+ // deletion the purge is allowed to make.+ require.False(t, starExists("sq-b-sa", "[email protected]"))+}diff --git a/backend/tests/saved_query_test.go b/backend/tests/saved_query_test.goindex bac4802f90..eafa70c201 100644--- a/backend/tests/saved_query_test.go+++ b/backend/tests/saved_query_test.go@@ -1,8 +1,8 @@package testsimport (+ "bytes""context"- "database/sql""fmt""testing"@@ -48,6 +48,25 @@ func TestListSavedQueries(t *testing.T) {_, err = ctl.addMemberToWorkspaceIAM(ctx, otherUser.Msg.Workspace, fmt.Sprintf("user:%s", otherEmail), "roles/workspaceMember")a.NoError(err)+ // Creating a saved query now takes bb.savedQueries.create on the parent+ // project, which workspaceMember does not carry -- a workspace role would+ // grant it in every project. The scenario needs this user to own a saved+ // query in ctl.project, so give them a role there.+ policyResp, err := ctl.projectServiceClient.GetIamPolicy(ctx, connect.NewRequest(&v1pb.GetIamPolicyRequest{+ Resource: ctl.project.Name,+ }))+ a.NoError(err)+ policy := policyResp.Msg+ policy.Bindings = append(policy.Bindings, &v1pb.Binding{+ Role: "roles/sqlEditorUser",+ Members: []string{fmt.Sprintf("user:%s", otherEmail)},+ })+ _, err = ctl.projectServiceClient.SetIamPolicy(ctx, connect.NewRequest(&v1pb.SetIamPolicyRequest{+ Resource: ctl.project.Name,+ Policy: policy,+ }))+ a.NoError(err)+createSavedQuery := func(title, parent string) *v1pb.SavedQuery {resp, err := ctl.savedQueryServiceClient.CreateSavedQuery(ctx, connect.NewRequest(&v1pb.CreateSavedQueryRequest{Parent: parent,@@ -82,7 +101,7 @@ func TestListSavedQueries(t *testing.T) {_, err = ctl.roleServiceClient.CreateRole(ctx, connect.NewRequest(&v1pb.CreateRoleRequest{Role: &v1pb.Role{Title: "Saved Query Lister",- Permissions: []string{"bb.worksheets.list"},+ Permissions: []string{"bb.savedQueries.list"},},RoleId: roleID,}))@@ -163,25 +182,25 @@ func TestSearchSavedQueriesFilterByFolder(t *testing.T) {a.NoError(err)return resp.Msg}- setFolders := func(savedQuery *v1pb.SavedQuery, folders []string) {- _, err := ctl.savedQueryServiceClient.UpdateSavedQueryOrganizer(ctx, connect.NewRequest(&v1pb.UpdateSavedQueryOrganizerRequest{- Organizer: &v1pb.SavedQueryOrganizer{- SavedQuery: savedQuery.Name,- Folders: folders,+ setFolder := func(savedQuery *v1pb.SavedQuery, folder string) {+ _, err := ctl.savedQueryServiceClient.UpdateSavedQuery(ctx, connect.NewRequest(&v1pb.UpdateSavedQueryRequest{+ SavedQuery: &v1pb.SavedQuery{+ Name: savedQuery.Name,+ Folder: folder,},- UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"folders"}},+ UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"folder"}},}))a.NoError(err)}alphaSavedQuery := createSavedQuery("alpha")- setFolders(alphaSavedQuery, []string{"alpha"})+ setFolder(alphaSavedQuery, "alpha")alphaChildSavedQuery := createSavedQuery("alpha-child")- setFolders(alphaChildSavedQuery, []string{"alpha", "beta"})+ setFolder(alphaChildSavedQuery, "alpha/beta")alphabetSavedQuery := createSavedQuery("alphabet")- setFolders(alphabetSavedQuery, []string{"alphabet"})+ setFolder(alphabetSavedQuery, "alphabet")nestedAlphaSavedQuery := createSavedQuery("nested-alpha")- setFolders(nestedAlphaSavedQuery, []string{"gamma", "alpha"})+ setFolder(nestedAlphaSavedQuery, "gamma/alpha")rootSavedQuery := createSavedQuery("root")resp, err := ctl.savedQueryServiceClient.SearchSavedQueries(ctx, connect.NewRequest(&v1pb.SearchSavedQueriesRequest{@@ -213,9 +232,9 @@ func TestSearchSavedQueriesFilterByFolder(t *testing.T) {a.ElementsMatch([]string{rootSavedQuery.Name}, savedQueryNames(rootResp.Msg.SavedQueries))pageFirstSavedQuery := createSavedQuery("aaa-page")- setFolders(pageFirstSavedQuery, []string{"paging"})+ setFolder(pageFirstSavedQuery, "paging")pageSecondSavedQuery := createSavedQuery("zzz-page")- setFolders(pageSecondSavedQuery, []string{"paging"})+ setFolder(pageSecondSavedQuery, "paging")firstPageResp, err := ctl.savedQueryServiceClient.SearchSavedQueries(ctx, connect.NewRequest(&v1pb.SearchSavedQueriesRequest{Parent: ctl.project.Name,@@ -303,7 +322,7 @@ func TestSearchSavedQueriesFilterByTitle(t *testing.T) {a.Error(err)}-func TestBatchUpdateSavedQueryOrganizerFilterByFolder(t *testing.T) {+func TestBatchUpdateSavedQueriesFilterByFolder(t *testing.T) {t.Parallel()a := require.New(t)ctx := context.Background()@@ -312,27 +331,18 @@ func TestBatchUpdateSavedQueryOrganizerFilterByFolder(t *testing.T) {a.NoError(err)defer ctl.Close(ctx)- createSavedQuery := func(title string) *v1pb.SavedQuery {+ createSavedQuery := func(title, folder string) *v1pb.SavedQuery {resp, err := ctl.savedQueryServiceClient.CreateSavedQuery(ctx, connect.NewRequest(&v1pb.CreateSavedQueryRequest{Parent: ctl.project.Name,SavedQuery: &v1pb.SavedQuery{Title: title,Content: []byte("SELECT 1;"),+ Folder: folder,},}))a.NoError(err)return resp.Msg}- setFolders := func(savedQuery *v1pb.SavedQuery, folders []string) {- _, err := ctl.savedQueryServiceClient.UpdateSavedQueryOrganizer(ctx, connect.NewRequest(&v1pb.UpdateSavedQueryOrganizerRequest{- Organizer: &v1pb.SavedQueryOrganizer{- SavedQuery: savedQuery.Name,- Folders: folders,- },- UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"folders"}},- }))- a.NoError(err)- }searchByFolder := func(folder string) []string {resp, err := ctl.savedQueryServiceClient.SearchSavedQueries(ctx, connect.NewRequest(&v1pb.SearchSavedQueriesRequest{Parent: ctl.project.Name,@@ -342,31 +352,24 @@ func TestBatchUpdateSavedQueryOrganizerFilterByFolder(t *testing.T) {return savedQueryNames(resp.Msg.SavedQueries)}- directSavedQuery := createSavedQuery("old-direct")- setFolders(directSavedQuery, []string{"old"})- childSavedQuery := createSavedQuery("old-child")- setFolders(childSavedQuery, []string{"old", "child"})- otherSavedQuery := createSavedQuery("other")- setFolders(otherSavedQuery, []string{"other"})+ directSavedQuery := createSavedQuery("old-direct", "old")+ childSavedQuery := createSavedQuery("old-child", "old/child")+ otherSavedQuery := createSavedQuery("other", "other")- directResp, err := ctl.savedQueryServiceClient.BatchUpdateSavedQueryOrganizer(ctx, connect.NewRequest(&v1pb.BatchUpdateSavedQueryOrganizerRequest{- Parent: ctl.project.Name,- Filter: `folder == "old"`,- Organizer: &v1pb.SavedQueryOrganizer{- Folders: []string{"new"},- },- UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"folders"}},+ 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.BatchUpdateSavedQueryOrganizer(ctx, connect.NewRequest(&v1pb.BatchUpdateSavedQueryOrganizerRequest{- Parent: ctl.project.Name,- Filter: `folder == "old/child"`,- Organizer: &v1pb.SavedQueryOrganizer{- Folders: []string{"new", "child"},- },- UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"folders"}},+ 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"}},}))a.NoError(err)a.Equal(int32(1), childResp.Msg.UpdatedCount)@@ -377,16 +380,12 @@ func TestBatchUpdateSavedQueryOrganizerFilterByFolder(t *testing.T) {a.Empty(searchByFolder("old"))a.Empty(searchByFolder("old/child"))- starResp, err := ctl.savedQueryServiceClient.BatchUpdateSavedQueryOrganizer(ctx, connect.NewRequest(&v1pb.BatchUpdateSavedQueryOrganizerRequest{- Parent: ctl.project.Name,- Filter: `folder == "new"`,- Organizer: &v1pb.SavedQueryOrganizer{- Starred: true,- },- UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"starred"}},+ starResp, err := ctl.savedQueryServiceClient.UpdateSavedQueryStar(ctx, connect.NewRequest(&v1pb.UpdateSavedQueryStarRequest{+ Name: directSavedQuery.Name,+ Starred: true,}))a.NoError(err)- a.Equal(int32(1), starResp.Msg.UpdatedCount)+ a.True(starResp.Msg.Starred)starredResp, err := ctl.savedQueryServiceClient.SearchSavedQueries(ctx, connect.NewRequest(&v1pb.SearchSavedQueriesRequest{Parent: ctl.project.Name,Filter: `folder == "new" && starred == true`,@@ -394,21 +393,49 @@ func TestBatchUpdateSavedQueryOrganizerFilterByFolder(t *testing.T) {a.NoError(err)a.ElementsMatch([]string{directSavedQuery.Name}, savedQueryNames(starredResp.Msg.SavedQueries))- nameResp, err := ctl.savedQueryServiceClient.BatchUpdateSavedQueryOrganizer(ctx, connect.NewRequest(&v1pb.BatchUpdateSavedQueryOrganizerRequest{- Parent: ctl.project.Name,- Filter: fmt.Sprintf(`name in [%q,%q]`, directSavedQuery.Name, childSavedQuery.Name),- Organizer: &v1pb.SavedQueryOrganizer{- Folders: []string{"selected"},- },- UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"folders"}},+ 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"}},}))a.NoError(err)a.Equal(int32(2), nameResp.Msg.UpdatedCount)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"}},+ }))+ a.NoError(err)+ a.Equal(int32(2), slashResp.Msg.UpdatedCount)+ 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"}},+ }))+ a.Error(err)+ a.Equal(connect.CodeInvalidArgument, connect.CodeOf(err))+ a.ElementsMatch([]string{directSavedQuery.Name, childSavedQuery.Name}, searchByFolder("boxed"))}-func TestListSavedQueryFoldersReturnsCallerFolders(t *testing.T) {+func TestSearchSavedQueryFoldersReturnsCallerFolders(t *testing.T) {t.Parallel()a := require.New(t)ctx := context.Background()@@ -419,32 +446,21 @@ func TestListSavedQueryFoldersReturnsCallerFolders(t *testing.T) {ownerToken := ctl.authInterceptor.token- createSavedQuery := func(title string) *v1pb.SavedQuery {- resp, err := ctl.savedQueryServiceClient.CreateSavedQuery(ctx, connect.NewRequest(&v1pb.CreateSavedQueryRequest{+ createSavedQuery := func(title, folder string) {+ _, err := ctl.savedQueryServiceClient.CreateSavedQuery(ctx, connect.NewRequest(&v1pb.CreateSavedQueryRequest{Parent: ctl.project.Name,SavedQuery: &v1pb.SavedQuery{Title: title,Content: []byte("SELECT 1;"),+ Folder: folder,},}))a.NoError(err)- return resp.Msg- }- setFolders := func(savedQuery *v1pb.SavedQuery, folders []string) {- _, err := ctl.savedQueryServiceClient.UpdateSavedQueryOrganizer(ctx, connect.NewRequest(&v1pb.UpdateSavedQueryOrganizerRequest{- Organizer: &v1pb.SavedQueryOrganizer{- SavedQuery: savedQuery.Name,- Folders: folders,- },- UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"folders"}},- }))- a.NoError(err)}- ownerSavedQuery := createSavedQuery("owner")- setFolders(ownerSavedQuery, []string{"owner", "child"})- ownerSharedSavedQuery := createSavedQuery("owner-shared")- setFolders(ownerSharedSavedQuery, []string{"owner-shared"})+ createSavedQuery("owner", "owner/child")+ createSavedQuery("owner-second", "owner-second")+ createSavedQuery("unfiled", "")otherEmail := fmt.Sprintf("saved-query-folder-%[email protected]", generateRandomString("user"))otherPassword := "1024bytebase"@@ -479,38 +495,220 @@ func TestListSavedQueryFoldersReturnsCallerFolders(t *testing.T) {}))a.NoError(err)ctl.authInterceptor.token = loginResp.Msg.Token- sharedSavedQuery := createSavedQuery("shared")- setFolders(sharedSavedQuery, []string{"other", "shared"})- privateSavedQuery := createSavedQuery("private")+ createSavedQuery("other-users", "theirs/deep")++ // Each caller sees only their own folder paths, with ancestor prefixes.+ otherFolders, err := ctl.savedQueryServiceClient.SearchSavedQueryFolders(ctx, connect.NewRequest(&v1pb.SearchSavedQueryFoldersRequest{+ Parent: ctl.project.Name,+ }))+ a.NoError(err)+ a.Equal([]string{"theirs", "theirs/deep"}, otherFolders.Msg.Folders)+ // A plain project member gets nothing for everyone-else's folders: the+ // filter cannot widen what the caller may read.+ const ownerEmail = "[email protected]"+ notMineForOther, err := ctl.savedQueryServiceClient.SearchSavedQueryFolders(ctx, connect.NewRequest(&v1pb.SearchSavedQueryFoldersRequest{+ Parent: ctl.project.Name,+ Filter: fmt.Sprintf(`creator != "users/%s"`, otherEmail),+ }))+ a.NoError(err)+ a.Empty(notMineForOther.Msg.Folders)++ // Unfiltered means "every folder I can read", so the admin backstop sees+ // the other creator's folders too. The My/Shared split the SQL Editor+ // renders comes from the creator filter, asserted below.ctl.authInterceptor.token = ownerToken- setFolders(sharedSavedQuery, []string{"owner", "child"})+ ownerFolders, err := ctl.savedQueryServiceClient.SearchSavedQueryFolders(ctx, connect.NewRequest(&v1pb.SearchSavedQueryFoldersRequest{+ Parent: ctl.project.Name,+ }))+ a.NoError(err)+ a.Equal([]string{"owner", "owner-second", "owner/child", "theirs", "theirs/deep"}, ownerFolders.Msg.Folders)++ ownFolders, err := ctl.savedQueryServiceClient.SearchSavedQueryFolders(ctx, connect.NewRequest(&v1pb.SearchSavedQueryFoldersRequest{+ Parent: ctl.project.Name,+ Filter: fmt.Sprintf(`creator == "users/%s"`, ownerEmail),+ }))+ a.NoError(err)+ a.Equal([]string{"owner", "owner-second", "owner/child"}, ownFolders.Msg.Folders)++ // The admin backstop is what makes the SQL Editor's shared tree work:+ // everyone-else's folders resolve server-side, so a cold cache still+ // renders the folders holding saved queries the caller never opened.+ sharedFolders, err := ctl.savedQueryServiceClient.SearchSavedQueryFolders(ctx, connect.NewRequest(&v1pb.SearchSavedQueryFoldersRequest{+ Parent: ctl.project.Name,+ Filter: fmt.Sprintf(`creator != "users/%s"`, ownerEmail),+ }))+ a.NoError(err)+ a.Equal([]string{"theirs", "theirs/deep"}, sharedFolders.Msg.Folders)+}++func TestGetSavedQueryHidesUnreadableRows(t *testing.T) {+ t.Parallel()+ a := require.New(t)+ ctx := context.Background()+ ctl := &controller{}+ ctx, err := ctl.StartServerWithExternalPg(ctx)+ a.NoError(err)+ defer ctl.Close(ctx)++ ownerToken := ctl.authInterceptor.token+ created, err := ctl.savedQueryServiceClient.CreateSavedQuery(ctx, connect.NewRequest(&v1pb.CreateSavedQueryRequest{+ Parent: ctl.project.Name,+ SavedQuery: &v1pb.SavedQuery{+ Title: "Private title that must not leak",+ Content: []byte("SELECT 1;"),+ },+ }))+ a.NoError(err)- db, err := sql.Open("pgx", ctl.profile.PgURL)+ otherEmail := fmt.Sprintf("saved-query-probe-%[email protected]", generateRandomString("user"))+ const otherPassword = "1024bytebase"+ otherUser, err := ctl.userServiceClient.CreateUser(ctx, connect.NewRequest(&v1pb.CreateUserRequest{+ User: &v1pb.User{+ Email: otherEmail,+ Password: otherPassword,+ Title: "Saved Query Probe User",+ },+ }))+ a.NoError(err)+ _, err = ctl.addMemberToWorkspaceIAM(ctx, otherUser.Msg.Workspace, fmt.Sprintf("user:%s", otherEmail), "roles/workspaceMember")+ a.NoError(err)+ policyResp, err := ctl.projectServiceClient.GetIamPolicy(ctx, connect.NewRequest(&v1pb.GetIamPolicyRequest{+ Resource: ctl.project.Name,+ }))+ a.NoError(err)+ policy := policyResp.Msg+ policy.Bindings = append(policy.Bindings, &v1pb.Binding{+ Role: "roles/sqlEditorUser",+ Members: []string{fmt.Sprintf("user:%s", otherEmail)},+ })+ _, err = ctl.projectServiceClient.SetIamPolicy(ctx, connect.NewRequest(&v1pb.SetIamPolicyRequest{+ Resource: ctl.project.Name,+ Policy: policy,+ }))+ a.NoError(err)++ loginResp, err := ctl.authServiceClient.Login(ctx, connect.NewRequest(&v1pb.LoginRequest{+ Email: otherEmail,+ Password: otherPassword,+ }))+ a.NoError(err)+ ctl.authInterceptor.token = loginResp.Msg.Token+ defer func() { ctl.authInterceptor.token = ownerToken }()++ // A saved query someone else owns answers exactly like a name that was+ // never issued -- same code, and no title in the message.+ _, err = ctl.savedQueryServiceClient.GetSavedQuery(ctx, connect.NewRequest(&v1pb.GetSavedQueryRequest{+ Name: created.Msg.Name,+ }))+ a.Error(err)+ a.Equal(connect.CodeNotFound, connect.CodeOf(err))+ a.NotContains(err.Error(), "Private title that must not leak")++ missing, err := ctl.savedQueryServiceClient.GetSavedQuery(ctx, connect.NewRequest(&v1pb.GetSavedQueryRequest{+ Name: fmt.Sprintf("%s/savedQueries/909909", ctl.project.Name),+ }))+ a.Error(err)+ a.Nil(missing)+ a.Equal(connect.CodeNotFound, connect.CodeOf(err))++ // Writes answer the same way, so a name cannot be probed by trying to+ // change or remove it either.+ _, err = ctl.savedQueryServiceClient.UpdateSavedQuery(ctx, connect.NewRequest(&v1pb.UpdateSavedQueryRequest{+ SavedQuery: &v1pb.SavedQuery{Name: created.Msg.Name, Title: "probe"},+ UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"title"}},+ }))+ a.Error(err)+ a.Equal(connect.CodeNotFound, connect.CodeOf(err))++ _, err = ctl.savedQueryServiceClient.DeleteSavedQuery(ctx, connect.NewRequest(&v1pb.DeleteSavedQueryRequest{+ Name: created.Msg.Name,+ }))+ a.Error(err)+ a.Equal(connect.CodeNotFound, connect.CodeOf(err))+}++func TestListSavedQueriesReturnsWholeStatement(t *testing.T) {+ t.Parallel()+ a := require.New(t)+ ctx := context.Background()+ ctl := &controller{}+ ctx, err := ctl.StartServerWithExternalPg(ctx)a.NoError(err)- defer db.Close()- _, privateSavedQueryID, err := common.GetProjectIDSavedQueryID(privateSavedQuery.Name)+ defer ctl.Close(ctx)++ const ownerEmail = "[email protected]"++ // Longer than the display cap Search truncates at, which the governance+ // surface must not apply -- a lister cannot Get another creator's row to+ // fetch the remainder.+ statement := append([]byte("SELECT 1; -- "), bytes.Repeat([]byte("x"), common.MaxSheetSize)...)+ created, err := ctl.savedQueryServiceClient.CreateSavedQuery(ctx, connect.NewRequest(&v1pb.CreateSavedQueryRequest{+ Parent: ctl.project.Name,+ SavedQuery: &v1pb.SavedQuery{+ Title: "long statement",+ Content: statement,+ },+ }))a.NoError(err)- _, err = db.ExecContext(ctx, `- INSERT INTO saved_query_organizer (saved_query, principal, payload)- SELECT resource_id, $1, '{"folders":["private"]}'::jsonb- FROM saved_query- WHERE resource_id = $2- `, "[email protected]", privateSavedQueryID)++ // The governance list filters on metadata -- creator is the enumeration+ // the offboarding review is built around, and the only variable this+ // filter accepts.+ listResp, err := ctl.savedQueryServiceClient.ListSavedQueries(ctx, connect.NewRequest(&v1pb.ListSavedQueriesRequest{+ Parent: ctl.project.Name,+ Filter: fmt.Sprintf(`creator == "users/%s"`, ownerEmail),+ }))a.NoError(err)+ listed := findSavedQueryByName(listResp.Msg.SavedQueries, created.Msg.Name)+ a.NotNil(listed)+ a.Equal(int64(len(statement)), listed.ContentSize)+ a.Equal(len(statement), len(listed.Content))- resp, err := ctl.savedQueryServiceClient.ListSavedQueryFolders(ctx, connect.NewRequest(&v1pb.ListSavedQueryFoldersRequest{+ searchResp, err := ctl.savedQueryServiceClient.SearchSavedQueries(ctx, connect.NewRequest(&v1pb.SearchSavedQueriesRequest{Parent: ctl.project.Name,+ Filter: fmt.Sprintf(`name == %q`, created.Msg.Name),+ }))+ a.NoError(err)+ a.Len(searchResp.Msg.SavedQueries, 1)+ a.Less(len(searchResp.Msg.SavedQueries[0].Content), len(statement))+}++func TestCreateSavedQueryRejectsArchivedProject(t *testing.T) {+ t.Parallel()+ a := require.New(t)+ ctx := context.Background()+ ctl := &controller{}+ ctx, err := ctl.StartServerWithExternalPg(ctx)+ a.NoError(err)+ defer ctl.Close(ctx)++ projectID := generateRandomString("sq-archived")+ projectResp, err := ctl.projectServiceClient.CreateProject(ctx, connect.NewRequest(&v1pb.CreateProjectRequest{+ Project: &v1pb.Project{+ Name: fmt.Sprintf("projects/%s", projectID),+ Title: projectID,+ },+ ProjectId: projectID,+ }))+ a.NoError(err)++ _, err = ctl.projectServiceClient.DeleteProject(ctx, connect.NewRequest(&v1pb.DeleteProjectRequest{+ Name: projectResp.Msg.Name,}))a.NoError(err)- a.ElementsMatch([]string{- "MINE:[owner]",- "MINE:[owner child]",- "MINE:[owner-shared]",- "SHARED:[owner]",- "SHARED:[owner child]",- "SHARED:[private]",- }, savedQueryFolderEntries(resp.Msg.Folders))++ // Resource resolution returns archived projects, so without an explicit+ // check the create would reach the store's purge fence and read as a 500.+ _, err = ctl.savedQueryServiceClient.CreateSavedQuery(ctx, connect.NewRequest(&v1pb.CreateSavedQueryRequest{+ Parent: projectResp.Msg.Name,+ SavedQuery: &v1pb.SavedQuery{+ Title: "into an archived project",+ Content: []byte("SELECT 1;"),+ },+ }))+ a.Error(err)+ a.Equal(connect.CodeNotFound, connect.CodeOf(err))}func TestSearchSavedQueriesRejectsWildcardProject(t *testing.T) {@@ -537,10 +735,11 @@ func savedQueryNames(savedQueries []*v1pb.SavedQuery) []string {return names}-func savedQueryFolderEntries(folders []*v1pb.SavedQueryFolder) []string {- entries := make([]string, 0, len(folders))- for _, folder := range folders {- entries = append(entries, fmt.Sprintf("%s:%v", folder.Category, folder.Folders))+func findSavedQueryByName(savedQueries []*v1pb.SavedQuery, name string) *v1pb.SavedQuery {+ for _, savedQuery := range savedQueries {+ if savedQuery.Name == name {+ return savedQuery+ }}- return entries+ return nil}diff --git a/docs/design/saved-queries-model.md b/docs/design/saved-queries-model.mdindex af63f753a3..a9015e524c 100644--- a/docs/design/saved-queries-model.md+++ b/docs/design/saved-queries-model.md@@ -407,7 +407,7 @@ residual resource conditions, **both re-check the permission sourcein-handler and reject resource-conditioned bindings**, enforcing the familycondition rule uniformly: a database- or environment-scoped role confersneither `list`'s content read nor `create`'s project-wide row. The search-family (`SearchSavedQueries`, `ListSavedQueryFolders`)+family (`SearchSavedQueries`, `SearchSavedQueryFolders`)is CUSTOM — its gate is `discover(u, P) ∨ admin(u, P)`, an OR thesingle-permission interceptor cannot express — and every object method isa CUSTOM per-row predicate.@@ -439,7 +439,7 @@ additive relaxation, not a new surface.| `SetIamPolicy` | 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 |-| `ListSavedQueryFolders` | CUSTOM | `discover ∨ admin` → the caller's own folder paths | paths only; unaudited |+| `SearchSavedQueryFolders` | CUSTOM | `discover ∨ admin` → the caller's own folder paths | paths only; unaudited |Duplicate/fork needs no RPC: read what you can already see, then`CreateSavedQuery` — the copy is yours and private.diff --git a/frontend/src/components/Quickstart.tsx b/frontend/src/components/Quickstart.tsxindex 1fcf0fb592..9b59406fe5 100644--- a/frontend/src/components/Quickstart.tsx+++ b/frontend/src/components/Quickstart.tsx@@ -182,7 +182,7 @@ export function Quickstart() {requiredPermissions: ["bb.sql.select","bb.projects.get",- "bb.worksheets.get",+ "bb.savedQueries.search",],needsProject: true,},diff --git a/frontend/src/modules/sql-editor/components/ConnectionPane/actions.test.tsx b/frontend/src/modules/sql-editor/components/ConnectionPane/actions.test.tsxindex 1bb49a2963..7b34da2b2e 100644--- a/frontend/src/modules/sql-editor/components/ConnectionPane/actions.test.tsx+++ b/frontend/src/modules/sql-editor/components/ConnectionPane/actions.test.tsx@@ -12,6 +12,10 @@ const mocks = vi.hoisted(() => ({sqlEditorEventsEmit: vi.fn().mockResolvedValue(undefined),setShowConnectionPanel: vi.fn(),setAsidePanelTab: vi.fn(),+ createSavedQuery: vi.fn().mockResolvedValue(undefined),+ maybeUpdateSavedQuery: vi.fn().mockResolvedValue(undefined),+ canCreateSavedQueryInProject: vi.fn(() => true),+ addTab: vi.fn(() => ({ id: "local-tab" })),}));vi.mock("react-i18next", () => ({@@ -46,8 +50,8 @@ vi.mock("@/modules/sql-editor/store", () => ({{getState: () => ({setAsidePanelTab: mocks.setAsidePanelTab,- createSavedQuery: vi.fn().mockResolvedValue(undefined),- maybeUpdateSavedQuery: vi.fn().mockResolvedValue(undefined),+ createSavedQuery: mocks.createSavedQuery,+ maybeUpdateSavedQuery: mocks.maybeUpdateSavedQuery,}),}),@@ -62,7 +66,17 @@ vi.mock("@/modules/sql-editor/model/events", () => ({sqlEditorEvents: { emit: mocks.sqlEditorEventsEmit },}));+vi.mock("@/modules/sql-editor/store/tab", () => ({+ getSQLEditorTabsState: () => ({+ tabsById: new Map(),+ currentTabId: "",+ addTab: mocks.addTab,+ updateTab: vi.fn(),+ }),+}));+vi.mock("@/utils", () => ({+ canCreateSavedQueryInProject: mocks.canCreateSavedQueryInProject,extractDatabaseResourceName: (name: string) => ({instance: "instances/prod",databaseName: name.split("/").pop() ?? "",@@ -151,9 +165,48 @@ const makeDatabaseNode = (beforeEach(async () => {vi.clearAllMocks();mocks.allowAdmin = false;+ mocks.canCreateSavedQueryInProject.mockReturnValue(true);+ mocks.addTab.mockReturnValue({ id: "local-tab" });+ mocks.createSavedQuery.mockResolvedValue(undefined);({ useConnectionMenu } = await import("./actions"));});+describe("setConnection", () => {+ test("opens a local tab instead of creating without the permission", async () => {+ // "Connect in new tab" would otherwise POST a saved query and 403 for a+ // role that can query but not create, leaving no connected tab at all.+ mocks.canCreateSavedQueryInProject.mockReturnValue(false);+ const { setConnection } = await import("./actions");++ await act(async () => {+ setConnection({+ database: { name: "instances/prod/databases/db1" } as never,+ newTab: true,+ });+ await Promise.resolve();+ });++ expect(mocks.createSavedQuery).not.toHaveBeenCalled();+ expect(mocks.addTab).toHaveBeenCalled();+ });++ test("creates a saved query when the caller may", async () => {+ mocks.canCreateSavedQueryInProject.mockReturnValue(true);+ const { setConnection } = await import("./actions");++ await act(async () => {+ setConnection({+ database: { name: "instances/prod/databases/db1" } as never,+ newTab: true,+ });+ await Promise.resolve();+ });++ expect(mocks.createSavedQuery).toHaveBeenCalled();+ expect(mocks.addTab).not.toHaveBeenCalled();+ });+});+describe("useConnectionMenu", () => {test("returns empty array when node is null", () => {const hook = renderHook(() => useConnectionMenu(null));diff --git a/frontend/src/modules/sql-editor/components/ConnectionPane/actions.tsx b/frontend/src/modules/sql-editor/components/ConnectionPane/actions.tsxindex a40193c6db..73f50072e6 100644--- a/frontend/src/modules/sql-editor/components/ConnectionPane/actions.tsx+++ b/frontend/src/modules/sql-editor/components/ConnectionPane/actions.tsx@@ -10,7 +10,10 @@ import { router } from "@/app/router";import { useSQLEditorAllowAdmin } from "@/modules/sql-editor/hooks/useSQLEditorState";import { sqlEditorEvents } from "@/modules/sql-editor/model/events";import { useSQLEditorStore } from "@/modules/sql-editor/store";-import { useSQLEditorEditorState } from "@/modules/sql-editor/store/editor";+import {+ getSQLEditorEditorState,+ useSQLEditorEditorState,+} from "@/modules/sql-editor/store/editor";import { getSQLEditorTabsState } from "@/modules/sql-editor/store/tab";import type {BatchQueryContext,@@ -25,6 +28,7 @@ import {import type { Database } from "@/types/proto-es/v1/database_service_pb";import {autoDatabaseRoute,+ canCreateSavedQueryInProject,extractDatabaseResourceName,getInstanceResource,instanceV1HasAlterSchema,@@ -87,6 +91,11 @@ export function setConnection(options: {statement: currentTab.statement,});}+ if (!canCreateSavedQueryInProject(getSQLEditorEditorState().project)) {+ // Same fallback as the tab bar's "+": open the tab locally rather than+ // failing the request, so the connection the user picked still opens.+ return Promise.resolve(getSQLEditorTabsState().addTab({ connection }));+ }return createSavedQuery({database: connection.database,});diff --git a/frontend/src/modules/sql-editor/components/EditorAction.test.tsx b/frontend/src/modules/sql-editor/components/EditorAction.test.tsxindex a9a07c433d..826fd5d905 100644--- a/frontend/src/modules/sql-editor/components/EditorAction.test.tsx+++ b/frontend/src/modules/sql-editor/components/EditorAction.test.tsx@@ -26,6 +26,7 @@ const mocks = vi.hoisted(() => ({useSavedQueryAndTab: vi.fn(),useConnectionOfCurrentSQLEditorTab: vi.fn(),isSavedQueryWritableV1: vi.fn(() => true),+ canCreateSavedQueryInProject: vi.fn(() => true),keyboardShortcutStr: vi.fn((s: string) => s),emit: vi.fn(),}));@@ -73,6 +74,7 @@ vi.mock("@/modules/sql-editor/store/editor", () => ({vi.mock("@/utils", () => ({isSavedQueryWritableV1: mocks.isSavedQueryWritableV1,+ canCreateSavedQueryInProject: mocks.canCreateSavedQueryInProject,keyboardShortcutStr: mocks.keyboardShortcutStr,isDev: () => true,}));diff --git a/frontend/src/modules/sql-editor/components/EditorAction.tsx b/frontend/src/modules/sql-editor/components/EditorAction.tsxindex 286789fa02..657838f6a4 100644--- a/frontend/src/modules/sql-editor/components/EditorAction.tsx+++ b/frontend/src/modules/sql-editor/components/EditorAction.tsx@@ -22,7 +22,11 @@ import {import { useAppStore } from "@/stores/app";import type { SQLEditorQueryParams } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";-import { isSavedQueryWritableV1, keyboardShortcutStr } from "@/utils";+import {+ canCreateSavedQueryInProject,+ isSavedQueryWritableV1,+ keyboardShortcutStr,+} from "@/utils";import { AdminModeButton } from "./AdminModeButton";import { ChooserGroup } from "./ChooserGroup";import { ContainerChooser } from "./ContainerChooser";@@ -71,6 +75,7 @@ export function EditorAction({ onExecute }: Props) {);const isDisconnected = useIsDisconnected();const resultRowsLimit = useSQLEditorEditorState((s) => s.resultRowsLimit);+ const project = useSQLEditorEditorState((s) => s.project);const isAdminMode = tabMode === "ADMIN";const showSheetsFeature = tabMode === "SAVED_QUERY";@@ -99,6 +104,9 @@ export function EditorAction({ onExecute }: Props) {if (sheet && sheet.database !== currentTab.connection.database) {return true;}+ } else if (!canCreateSavedQueryInProject(project)) {+ // Saving a tab that has no saved query behind it creates one.+ return false;}// Only disable when status is CLEAN (nothing to save).// SAVING is allowed — manual save will abort auto-save and proceed.diff --git a/frontend/src/modules/sql-editor/components/SaveSheetModal.test.tsx b/frontend/src/modules/sql-editor/components/SaveSheetModal.test.tsxindex 56ed46c119..dc95df28d0 100644--- a/frontend/src/modules/sql-editor/components/SaveSheetModal.test.tsx+++ b/frontend/src/modules/sql-editor/components/SaveSheetModal.test.tsx@@ -25,6 +25,7 @@ const mocks = vi.hoisted(() => ({getPwdForSavedQuery: vi.fn(() => ""),getFoldersForSavedQuery: vi.fn(() => []),},+ canCreateSavedQueryInProject: vi.fn(() => true),}));vi.mock("react-i18next", () => ({@@ -57,7 +58,13 @@ vi.mock("@/types", () => ({UNKNOWN_ID: 0,}));+vi.mock("@/modules/sql-editor/store/editor", () => ({+ useSQLEditorEditorState: (selector: (s: { project: string }) => unknown) =>+ selector({ project: "projects/proj1" }),+}));+vi.mock("@/utils", () => ({+ canCreateSavedQueryInProject: mocks.canCreateSavedQueryInProject,extractSavedQueryID: vi.fn((savedQuery: string) => {if (!savedQuery) return "0";// Return non-zero for saved queries that look like real ones@@ -200,6 +207,7 @@ let SaveSheetModal: typeof import("./SaveSheetModal").SaveSheetModal;beforeEach(async () => {vi.clearAllMocks();mocks.useTranslation.mockReturnValue({ t: (key: string) => key });+ mocks.canCreateSavedQueryInProject.mockReturnValue(true);mocks.editorSavedQueryStore.abortAutoSave.mockReset();mocks.editorSavedQueryStore.maybeUpdateSavedQuery.mockResolvedValue(undefined);mocks.editorSavedQueryStore.createSavedQuery.mockResolvedValue(undefined);@@ -238,6 +246,41 @@ describe("SaveSheetModal", () => {unmount();});+ test("save-sheet is a no-op for a draft when the caller cannot create", async () => {+ // Cmd/Ctrl+S emits the same event as the toolbar button, and the button is+ // already hidden without the permission -- so the shortcut must not reach+ // the create call either. The draft stays in the tab.+ mocks.canCreateSavedQueryInProject.mockReturnValue(false);+ const { container, render, unmount } = renderIntoContainer(+ <SaveSheetModal />+ );+ render();++ await act(async () => {+ emitSaveSheet({ tab: tabWithoutSavedQuery });+ });++ const dialog = container.querySelector("[data-testid='dialog']");+ expect(dialog?.getAttribute("data-open")).toBe("false");+ expect(mocks.editorSavedQueryStore.createSavedQuery).not.toHaveBeenCalled();+ unmount();+ });++ test("saving an existing saved query is unaffected by the create permission", async () => {+ mocks.canCreateSavedQueryInProject.mockReturnValue(false);+ const { render, unmount } = renderIntoContainer(<SaveSheetModal />);+ render();++ await act(async () => {+ emitSaveSheet({ tab: savedTab });+ });++ expect(+ mocks.editorSavedQueryStore.maybeUpdateSavedQuery+ ).toHaveBeenCalled();+ unmount();+ });+test("title input disables browser autocomplete", () => {const { container, render, unmount } = renderIntoContainer(<SaveSheetModal />diff --git a/frontend/src/modules/sql-editor/components/SaveSheetModal.tsx b/frontend/src/modules/sql-editor/components/SaveSheetModal.tsxindex 7669061067..f0e60ce76c 100644--- a/frontend/src/modules/sql-editor/components/SaveSheetModal.tsx+++ b/frontend/src/modules/sql-editor/components/SaveSheetModal.tsx@@ -6,10 +6,11 @@ import { Input } from "@/components/ui/input";import { useSQLEditorEvent } from "@/hooks/useSQLEditorEvent";import { useSheetContextByView } from "@/modules/sql-editor/model/Sheet";import { useSQLEditorStore } from "@/modules/sql-editor/store";+import { useSQLEditorEditorState } from "@/modules/sql-editor/store/editor";import { useAppStore } from "@/stores/app";import type { SQLEditorTab } from "@/types";import { UNKNOWN_ID } from "@/types";-import { extractSavedQueryID } from "@/utils";+import { canCreateSavedQueryInProject, extractSavedQueryID } from "@/utils";import { FolderForm } from "./FolderForm";export function SaveSheetModal() {@@ -20,6 +21,7 @@ export function SaveSheetModal() {);const createSavedQuery = useSQLEditorStore((s) => s.createSavedQuery);const sheetContext = useSheetContextByView("my");+ const project = useSQLEditorEditorState((s) => s.project);const [open, setOpen] = useState(false);const [title, setTitle] = useState("");@@ -78,6 +80,13 @@ export function SaveSheetModal() {};useSQLEditorEvent("save-sheet", ({ tab, editTitle }) => {+ // Both the toolbar button and Cmd/Ctrl+S land here, so this is where a+ // save that would create a saved query is refused -- the toolbar hides+ // its button, but the shortcut has no affordance to hide. The draft+ // stays in the tab; nothing is lost, nothing is sent.+ if (!tab.savedQuery && !canCreateSavedQueryInProject(project)) {+ return;+ }setTitle(tab.title);setRawTab(tab);diff --git a/frontend/src/modules/sql-editor/components/SheetTree.test.tsx b/frontend/src/modules/sql-editor/components/SheetTree.test.tsxindex 334f3c8ccd..6810276312 100644--- a/frontend/src/modules/sql-editor/components/SheetTree.test.tsx+++ b/frontend/src/modules/sql-editor/components/SheetTree.test.tsx@@ -18,17 +18,18 @@ globalThis.ResizeObserver = class ResizeObserver {// ---- hoisted mocks ----------------------------------------------------------const mocks = vi.hoisted(() => ({+ canSearchSavedQueriesInProject: vi.fn(() => true),useTranslation: vi.fn(() => ({ t: (key: string) => key })),appStore: {getSavedQueryByName: vi.fn(),deleteSavedQueryByName: vi.fn(),patchSavedQuery: vi.fn(),- upsertSavedQueryOrganizer: vi.fn(),+ updateSavedQueryStar: vi.fn(),} as {getSavedQueryByName: ReturnType<typeof vi.fn>;deleteSavedQueryByName: ReturnType<typeof vi.fn>;patchSavedQuery: ReturnType<typeof vi.fn>;- upsertSavedQueryOrganizer: ReturnType<typeof vi.fn>;+ updateSavedQueryStar: ReturnType<typeof vi.fn>;},getSQLEditorTabsState: vi.fn(),project: "projects/proj1",@@ -51,6 +52,10 @@ vi.mock("react-i18next", () => ({useTranslation: mocks.useTranslation,}));+vi.mock("@/utils", () => ({+ canSearchSavedQueriesInProject: mocks.canSearchSavedQueriesInProject,+}));+vi.mock("@/stores", () => ({pushNotification: mocks.pushNotification,}));@@ -487,7 +492,7 @@ const setupDefaultMocks = () => {}));mocks.appStore.deleteSavedQueryByName.mockResolvedValue(undefined);mocks.appStore.patchSavedQuery.mockResolvedValue({});- mocks.appStore.upsertSavedQueryOrganizer.mockResolvedValue(undefined);+ mocks.appStore.updateSavedQueryStar.mockResolvedValue(undefined);mocks.getSQLEditorTabsState.mockReturnValue({tabsById: new Map(),closeTab: vi.fn(),@@ -560,6 +565,7 @@ let SheetTree: typeof import("./SheetTree").SheetTree;beforeEach(async () => {vi.clearAllMocks();+ mocks.canSearchSavedQueriesInProject.mockReturnValue(true);setupDefaultMocks();({ SheetTree } = await import("./SheetTree"));});@@ -572,6 +578,27 @@ afterEach(() => {// ---- tests ------------------------------------------------------------------describe("SheetTree", () => {+ test("fetches on mount when the caller can discover saved queries", () => {+ const ctx = setupDefaultMocks();+ ctx.viewContext.isInitialized = false;+ const { render, unmount } = renderIntoContainer(<SheetTree view="my" />);+ render();+ expect(ctx.viewContext.fetchSheetList).toHaveBeenCalled();+ unmount();+ });++ test("does not fetch without discovery access", () => {+ // A SQL role can grant query access without bb.savedQueries.search, and+ // both the search and folder calls would come back denied on every mount.+ mocks.canSearchSavedQueriesInProject.mockReturnValue(false);+ const ctx = setupDefaultMocks();+ ctx.viewContext.isInitialized = false;+ const { render, unmount } = renderIntoContainer(<SheetTree view="my" />);+ render();+ expect(ctx.viewContext.fetchSheetList).not.toHaveBeenCalled();+ unmount();+ });+test("1. Renders tree from store data", () => {const { container, render, unmount } = renderIntoContainer(<SheetTreediff --git a/frontend/src/modules/sql-editor/components/SheetTree.tsx b/frontend/src/modules/sql-editor/components/SheetTree.tsxindex d462ca1fe9..99cdbebf11 100644--- a/frontend/src/modules/sql-editor/components/SheetTree.tsx+++ b/frontend/src/modules/sql-editor/components/SheetTree.tsx@@ -69,6 +69,7 @@ import { useSQLEditorStore as useSQLEditorReactStore } from "@/modules/sql-editoimport { useSQLEditorEditorState } from "@/modules/sql-editor/store/editor";import { getSQLEditorTabsState } from "@/modules/sql-editor/store/tab";import { useAppStore } from "@/stores/app";+import { canSearchSavedQueriesInProject } from "@/utils";import { filterNode } from "./filterNode";import { SharePopoverBody } from "./SharePopoverBody";import { TreeNodePrefix } from "./TreeNodePrefix";@@ -337,7 +338,10 @@ export function SheetTree({// ---- Auto-fetch on mount + project change --------------------------------useEffect(() => {- if (!isInitialized && project) {+ // Without discovery access the search and folder calls can only come back+ // denied, so the tree stays empty instead of failing on every mount. The+ // Draft view is local and unaffected -- it never fetches.+ if (!isInitialized && project && canSearchSavedQueriesInProject(project)) {void fetchSheetList();}}, [isInitialized, project, fetchSheetList]);@@ -959,9 +963,7 @@ export function SheetTree({clearTimeout(starTimerRef.current);}starTimerRef.current = setTimeout(() => {- void useAppStore- .getState()- .upsertSavedQueryOrganizer({ savedQuery, starred }, ["starred"]);+ void useAppStore.getState().updateSavedQueryStar(savedQuery, starred);}, 300);},[]@@ -1387,7 +1389,9 @@ export function SheetTree({if (!savedQuery) return;await createSavedQuery({title: savedQuery.title,- folders: savedQuery.folders,+ folders: savedQuery.folder+ ? savedQuery.folder.split("/")+ : [],database: savedQuery.database,});useAppStore.getState().notify({diff --git a/frontend/src/modules/sql-editor/components/TabList.test.tsx b/frontend/src/modules/sql-editor/components/TabList.test.tsxindex 8f4e71257a..a407d2b949 100644--- a/frontend/src/modules/sql-editor/components/TabList.test.tsx+++ b/frontend/src/modules/sql-editor/components/TabList.test.tsx@@ -25,10 +25,13 @@ const mocks = vi.hoisted(() => ({openTabList: SQLEditorTab[];setCurrentTabId?: (id: string) => void;closeTab?: (id: string) => void;+ addTab?: () => void;},closeTab: vi.fn(),setCurrentTabId: vi.fn(),createSavedQuery: vi.fn().mockResolvedValue(undefined),+ addTab: vi.fn(),+ canCreateSavedQueryInProject: vi.fn(() => true),tabListEventsOn:vi.fn<(event: string, h: (p: unknown) => void) => () => void>(),}));@@ -55,6 +58,15 @@ vi.mock("@/modules/sql-editor/store", () => ({}),}));+vi.mock("@/modules/sql-editor/store/editor", () => ({+ useSQLEditorEditorState: (selector: (s: { project: string }) => unknown) =>+ selector({ project: "projects/proj1" }),+}));++vi.mock("@/utils", () => ({+ canCreateSavedQueryInProject: mocks.canCreateSavedQueryInProject,+}));+vi.mock("@/modules/sql-editor/model/TabList/events", () => ({tabListEvents: { on: mocks.tabListEventsOn, emit: vi.fn() },}));@@ -220,6 +232,7 @@ const setup = (tabs: SQLEditorTab[], currentTabId = tabs[0]?.id ?? "") => {currentTabId,setCurrentTabId: mocks.setCurrentTabId,closeTab: mocks.closeTab,+ addTab: mocks.addTab,});mocks.tabListEventsOn.mockReturnValue(() => {});return { tabStore: mocks.tabState };@@ -228,6 +241,7 @@ const setup = (tabs: SQLEditorTab[], currentTabId = tabs[0]?.id ?? "") => {beforeEach(async () => {vi.clearAllMocks();mocks.useTranslation.mockReturnValue({ t: (key: string) => key });+ mocks.canCreateSavedQueryInProject.mockReturnValue(true);({ TabList } = await import("./TabList"));});@@ -296,6 +310,25 @@ describe("TabList", () => {addButton?.click();});expect(mocks.createSavedQuery).toHaveBeenCalled();+ expect(mocks.addTab).not.toHaveBeenCalled();+ unmount();+ });++ test("+ button opens a local tab without the create permission", () => {+ // A role can grant SQL Editor access without bb.savedQueries.create.+ // Persisting would 403, so the tab stays local instead of failing.+ mocks.canCreateSavedQueryInProject.mockReturnValue(false);+ setup([makeTab("a")]);+ const { container, render, unmount } = renderIntoContainer(<TabList />);+ render();+ const addButton = container.querySelector(+ "[aria-label='common.add']"+ ) as HTMLButtonElement | null;+ act(() => {+ addButton?.click();+ });+ expect(mocks.createSavedQuery).not.toHaveBeenCalled();+ expect(mocks.addTab).toHaveBeenCalled();unmount();});diff --git a/frontend/src/modules/sql-editor/components/TabList.tsx b/frontend/src/modules/sql-editor/components/TabList.tsxindex e233ba017d..d9b88e63f6 100644--- a/frontend/src/modules/sql-editor/components/TabList.tsx+++ b/frontend/src/modules/sql-editor/components/TabList.tsx@@ -31,12 +31,14 @@ import { Button } from "@/components/ui/button";import { cn } from "@/lib/utils";import { tabListEvents } from "@/modules/sql-editor/model/TabList/events";import { useSQLEditorStore } from "@/modules/sql-editor/store";+import { useSQLEditorEditorState } from "@/modules/sql-editor/store/editor";import {getSQLEditorTabsState,useOpenTabList,useSQLEditorTabState,} from "@/modules/sql-editor/store/tab";import type { SQLEditorTab } from "@/types/sqlEditor/tab";+import { canCreateSavedQueryInProject } from "@/utils";import { TabContextMenu, type TabContextMenuHandle } from "./TabContextMenu";import { TabItem } from "./TabItem/TabItem";@@ -61,6 +63,7 @@ type PendingClose = {export function TabList() {const { t } = useTranslation();const createSavedQuery = useSQLEditorStore((s) => s.createSavedQuery);+ const project = useSQLEditorEditorState((s) => s.project);// Zustand's selector subscribes to in-place tab mutations because// `updateTab` reassigns / triggers an immer produce on `tabsById`,@@ -160,7 +163,14 @@ export function TabList() {if (loading) return;setLoading(true);try {- await createSavedQuery({});+ // A new tab is normally backed by a saved query straight away. Without+ // the create permission that request would fail, so open a local draft+ // instead -- the editor keeps working, nothing is persisted.+ if (!canCreateSavedQueryInProject(project)) {+ getSQLEditorTabsState().addTab();+ } else {+ await createSavedQuery({});+ }requestAnimationFrame(() => {const el = scrollRef.current;if (el) el.scrollTo(el.scrollWidth, 0);diff --git a/frontend/src/modules/sql-editor/components/useDropdown.test.ts b/frontend/src/modules/sql-editor/components/useDropdown.test.tsindex 2208b4a960..9d6cf732a1 100644--- a/frontend/src/modules/sql-editor/components/useDropdown.test.ts+++ b/frontend/src/modules/sql-editor/components/useDropdown.test.ts@@ -11,6 +11,7 @@ const mocks = vi.hoisted(() => ({currentUser: { email: "[email protected]" },savedQuery: undefined as SavedQuery | undefined,isSavedQueryWritableV1: vi.fn(() => true),+ canCreateSavedQueryInProject: vi.fn(() => true),}));vi.mock("react-i18next", () => ({@@ -30,6 +31,12 @@ vi.mock("@/stores/app", () => ({vi.mock("@/utils", () => ({isSavedQueryWritableV1: mocks.isSavedQueryWritableV1,+ canCreateSavedQueryInProject: mocks.canCreateSavedQueryInProject,+}));++vi.mock("@/modules/sql-editor/store/editor", () => ({+ useSQLEditorEditorState: (selector: (s: { project: string }) => unknown) =>+ selector({ project: "projects/proj1" }),}));const baseFilter: SavedQueryFilter = {diff --git a/frontend/src/modules/sql-editor/components/useDropdown.ts b/frontend/src/modules/sql-editor/components/useDropdown.tsindex a6aeda2891..d2e3018169 100644--- a/frontend/src/modules/sql-editor/components/useDropdown.ts+++ b/frontend/src/modules/sql-editor/components/useDropdown.ts@@ -15,8 +15,9 @@ import type {SavedQueryFolderNode,SheetViewMode,} from "@/modules/sql-editor/model/Sheet";+import { useSQLEditorEditorState } from "@/modules/sql-editor/store/editor";import { useAppStore } from "@/stores/app";-import { isSavedQueryWritableV1 } from "@/utils";+import { canCreateSavedQueryInProject, isSavedQueryWritableV1 } from "@/utils";// ---------------------------------------------------------------------------// Types@@ -73,8 +74,13 @@ export function useDropdown(// ------------------------------------------------------------------// Derived: allowed-to-create-new// ------------------------------------------------------------------+ const project = useSQLEditorEditorState((s) => s.project);+ // Adding a folder is local until something is filed into it, so only the+ // entries that persist a new saved query need the create permission.const allowCreateNew =!savedQueryFilter.keyword && !savedQueryFilter.onlyShowStarred;+ const allowCreateSavedQuery =+ allowCreateNew && canCreateSavedQueryInProject(project);// ------------------------------------------------------------------// Menu options — computed from current state@@ -96,10 +102,13 @@ export function useDropdown(return [];}const isCreator = savedQueryEntity.creator === `users/${me?.email ?? ""}`;- items.push({- key: "duplicate",- label: isCreator ? t("common.duplicate") : t("common.fork"),- });+ // Duplicate and fork both write a new saved query.+ if (canCreateSavedQueryInProject(project)) {+ items.push({+ key: "duplicate",+ label: isCreator ? t("common.duplicate") : t("common.fork"),+ });+ }if (isCreator) {items.push({key: "share",@@ -133,7 +142,7 @@ export function useDropdown(});}if (viewMode === "my") {- if (allowCreateNew) {+ if (allowCreateSavedQuery) {items.push({key: "add-saved-query",label: t("sql-editor.tab.context-menu.actions.add-saved-query"),@@ -169,6 +178,8 @@ export function useDropdown(savedQueryEntity,me,allowCreateNew,+ allowCreateSavedQuery,+ project,canMultiSelect,t,]);diff --git a/frontend/src/modules/sql-editor/legacy/migration.ts b/frontend/src/modules/sql-editor/legacy/migration.tsindex 93634f902d..861f520b2d 100644--- a/frontend/src/modules/sql-editor/legacy/migration.ts+++ b/frontend/src/modules/sql-editor/legacy/migration.ts@@ -7,7 +7,11 @@ import { extractUserEmail } from "@/stores/modules/v1";import type { EditorPanelViewState, SQLEditorTab } from "@/types";import { DEFAULT_SQL_EDITOR_TAB_MODE } from "@/types";import { SavedQuerySchema } from "@/types/proto-es/v1/saved_query_service_pb";-import { defaultSQLEditorTab, WebStorageHelper } from "@/utils";+import {+ canCreateSavedQueryInProject,+ defaultSQLEditorTab,+ WebStorageHelper,+} from "@/utils";import {deleteExtendedTab,EXTENDED_TAB_FIELDS,@@ -154,6 +158,15 @@ export const migrateDraftsFromCache = async (project: string) => {const draftTabListKey = `${keyNamespace}.draft-tab-list`;const draftTabList = readLegacyStorage<SQLEditorTab[]>(draftTabListKey, []);+ // Migrating a draft creates a saved query. This check is the cheap half of+ // the answer -- false means the server will refuse too, so skip the doomed+ // requests entirely. True is not a promise: it does not evaluate binding+ // conditions, and the server rejects a resource-scoped grant for this+ // permission. The loop below has to survive a refusal either way.+ if (!canCreateSavedQueryInProject(project)) {+ return;+ }+const drafts = [...draftTabList];for (const draft of drafts) {const tab = {@@ -175,7 +188,12 @@ export const migrateDraftsFromCache = async (project: string) => {project,}));- } catch {}+ } catch {+ // The draft in legacy storage is the only copy, so it survives a+ // failed migration: a denied create, a network blip, a server error.+ // It is retried the next time this runs.+ continue;+ }}const index = draftTabList.findIndex((d) => d.id === draft.id);if (index >= 0) {diff --git a/frontend/src/modules/sql-editor/model/Sheet/context.test.tsx b/frontend/src/modules/sql-editor/model/Sheet/context.test.tsxindex b63fe54a78..ce1f13fe2d 100644--- a/frontend/src/modules/sql-editor/model/Sheet/context.test.tsx+++ b/frontend/src/modules/sql-editor/model/Sheet/context.test.tsx@@ -16,10 +16,12 @@ type AppState = {savedQueriesByKey: Record<string, SavedQuery>;isSaaSMode: () => boolean;getSavedQueryByName: (name: string) => SavedQuery | undefined;- listSavedQueryFolders: ReturnType<typeof vi.fn>;+ savedQueryList: () => SavedQuery[];+ patchSavedQueryFolderInCache: ReturnType<typeof vi.fn>;+ searchSavedQueryFolders: ReturnType<typeof vi.fn>;fetchSavedQueryList: ReturnType<typeof vi.fn>;- upsertSavedQueryOrganizer: ReturnType<typeof vi.fn>;- batchUpdateSavedQueryOrganizers: ReturnType<typeof vi.fn>;+ updateSavedQueryStar: ReturnType<typeof vi.fn>;+ batchUpdateSavedQueryFolder: ReturnType<typeof vi.fn>;};const mocks = vi.hoisted(() => {@@ -62,7 +64,8 @@ const mocks = vi.hoisted(() => {isSaaSMode: () => false,getSavedQueryByName: (name: string) =>appState.savedQueriesByKey[keyForSavedQuery(name)],- listSavedQueryFolders: vi.fn(async () => []),+ savedQueryList: () => Object.values(appState.savedQueriesByKey),+ searchSavedQueryFolders: vi.fn(async () => []),fetchSavedQueryList: vi.fn(async (_project, _filter, _params) => {const savedQuery = create(SavedQuerySchema, {name: "projects/proj1/savedQueries/1",@@ -73,8 +76,9 @@ const mocks = vi.hoisted(() => {setSavedQueries([savedQuery]);return { savedQueries: [savedQuery], nextPageToken: "next-page" };}),- upsertSavedQueryOrganizer: vi.fn(),- batchUpdateSavedQueryOrganizers: vi.fn(),+ updateSavedQueryStar: vi.fn(),+ batchUpdateSavedQueryFolder: vi.fn(async () => 0),+ patchSavedQueryFolderInCache: vi.fn(),};},addSavedQueries: setSavedQueries,@@ -254,8 +258,8 @@ describe("sheet context", () => {});test("uses a collision-free key for load-more rows", async () => {- mocks.getAppState().listSavedQueryFolders.mockResolvedValueOnce([- { folders: ["__load-more"], category: "my" },+ mocks.getAppState().searchSavedQueryFolders.mockResolvedValueOnce([+ "__load-more",]);const { provideSheetContext, useSheetContextByView } = await import(@@ -286,11 +290,7 @@ describe("sheet context", () => {test("loads caller saved query folders before the root saved query page", async () => {mocks.getAppState()- .listSavedQueryFolders.mockResolvedValueOnce([- { folders: ["alpha"], category: "my" },- { folders: ["alpha", "beta"], category: "my" },- { folders: ["shared"], category: "shared" },- ]);+ .searchSavedQueryFolders.mockResolvedValueOnce(["alpha", "alpha/beta"]);mocks.getAppState().fetchSavedQueryList.mockImplementationOnce(async () => ({savedQueries: [],nextPageToken: "",@@ -319,8 +319,9 @@ describe("sheet context", () => {await viewContext!.fetchSheetList();});- expect(mocks.getAppState().listSavedQueryFolders).toHaveBeenCalledWith(- "projects/proj1"+ expect(mocks.getAppState().searchSavedQueryFolders).toHaveBeenCalledWith(+ "projects/proj1",+ 'creator == "users/[email protected]"');expect(mocks.getAppState().fetchSavedQueryList).toHaveBeenCalledWith("projects/proj1",@@ -331,6 +332,48 @@ describe("sheet context", () => {expect(container.textContent).not.toContain("shared");});+ test("builds the shared folder tree from the server, not the row cache", async () => {+ // Regression: deriving shared folders from cached rows found nothing on a+ // cold cache, because the root page only fetches unfiled rows -- so every+ // foldered shared saved query was unreachable.+ mocks+ .getAppState()+ .searchSavedQueryFolders.mockResolvedValueOnce(["theirs", "theirs/deep"]);+ mocks.getAppState().fetchSavedQueryList.mockImplementationOnce(async () => ({+ savedQueries: [],+ nextPageToken: "",+ }));++ const { provideSheetContext, useSheetContextByView } = await import(+ "./context"+ );+ let viewContext: ReturnType<typeof useSheetContextByView> | undefined;++ const Probe = () => {+ provideSheetContext();+ viewContext = useSheetContextByView("shared");+ return (+ <div>+ {viewContext.sheetTree.children.map((child) => child.label).join(",")}+ </div>+ );+ };++ root = createRoot(container);+ await act(async () => {+ root.render(<Probe />);+ });+ await act(async () => {+ await viewContext!.fetchSheetList();+ });++ expect(mocks.getAppState().searchSavedQueryFolders).toHaveBeenCalledWith(+ "projects/proj1",+ 'creator != "users/[email protected]"'+ );+ expect(container.textContent).toContain("theirs");+ });+test("merges persisted empty folders with backend folders", async () => {window.localStorage.setItem(storageKeySqlEditorSavedQueryFolder(@@ -341,9 +384,6 @@ describe("sheet context", () => {),JSON.stringify(["/shared/alpha", "/shared/local-empty"]));- mocks.getAppState().listSavedQueryFolders.mockResolvedValueOnce([- { folders: ["alpha"], category: "my" },- ]);mocks.getAppState().fetchSavedQueryList.mockImplementationOnce(async () => ({savedQueries: [],nextPageToken: "",@@ -465,9 +505,7 @@ describe("sheet context", () => {test("keeps backend-known folders visible when starred filter is active", async () => {mocks.getAppState()- .listSavedQueryFolders.mockResolvedValue([- { folders: ["alpha"], category: "my" },- ]);+ .searchSavedQueryFolders.mockResolvedValue(["alpha"]);mocks.getAppState().fetchSavedQueryList.mockResolvedValue({savedQueries: [],nextPageToken: "",@@ -546,7 +584,7 @@ describe("sheet context", () => {project: "projects/proj1",creator: "users/[email protected]",title: "Folder saved query",- folders: ["alpha"],+ folder: "alpha",});mocks.addSavedQueries([savedQuery]);return {@@ -594,7 +632,7 @@ describe("sheet context", () => {project: "projects/proj1",creator: "users/[email protected]",title: "Folder saved query",- folders: ["alpha"],+ folder: "alpha",});mocks.addSavedQueries([savedQuery]);return {@@ -712,7 +750,7 @@ describe("sheet context", () => {project: "projects/proj1",creator: "users/[email protected]",title: "Folder saved query",- folders: ["alpha"],+ folder: "alpha",});mocks.addSavedQueries([savedQuery]);return {@@ -732,7 +770,7 @@ describe("sheet context", () => {project: "projects/proj1",creator: "users/[email protected]",title: "Child folder saved query",- folders: ["alpha", "child"],+ folder: "alpha/child",});mocks.addSavedQueries([savedQuery]);return {@@ -784,7 +822,7 @@ describe("sheet context", () => {project: "projects/proj1",creator: "users/[email protected]",title: "Alpha saved query",- folders: ["alpha"],+ folder: "alpha",});mocks.addSavedQueries([savedQuery]);return {@@ -834,7 +872,7 @@ describe("sheet context", () => {project: "projects/proj1",creator: "users/[email protected]",title: "Folder saved query",- folders: ["alpha"],+ folder: "alpha",});mocks.addSavedQueries([savedQuery]);return {@@ -881,18 +919,84 @@ describe("sheet context", () => {]);});- expect(mocks.getAppState().upsertSavedQueryOrganizer).not.toHaveBeenCalled();expect(- mocks.getAppState().batchUpdateSavedQueryOrganizers- ).toHaveBeenCalledWith([- {- parent: "projects/proj1",- filter:- 'name in ["projects/proj1/savedQueries/1","projects/proj1/savedQueries/2"]',- organizer: { folders: ["target"] },- updateMask: ["folders"],- },- ]);+ mocks.getAppState().batchUpdateSavedQueryFolder+ ).toHaveBeenCalledTimes(1);+ expect(mocks.getAppState().batchUpdateSavedQueryFolder).toHaveBeenCalledWith(+ "projects/proj1",+ 'name in ["projects/proj1/savedQueries/1","projects/proj1/savedQueries/2"]',+ "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.+ expect(+ mocks.getAppState().patchSavedQueryFolderInCache+ ).toHaveBeenCalledWith(+ ["projects/proj1/savedQueries/1", "projects/proj1/savedQueries/2"],+ "target"+ );+ });++ test("moves cached rows that the starred filter hides", async () => {+ // Regression: the server moves every row in the folder (the batch filter+ // drops display filters), so patching only the visible rows left the+ // hidden ones under their old folder once the starred filter cleared.+ const starred = create(SavedQuerySchema, {+ name: "projects/proj1/savedQueries/starred",+ project: "projects/proj1",+ creator: "users/[email protected]",+ title: "Starred",+ folder: "old",+ starred: true,+ });+ const unstarred = create(SavedQuerySchema, {+ name: "projects/proj1/savedQueries/unstarred",+ project: "projects/proj1",+ creator: "users/[email protected]",+ title: "Unstarred",+ folder: "old",+ starred: false,+ });+ mocks.getAppState().fetchSavedQueryList.mockImplementationOnce(async () => {+ mocks.addSavedQueries([starred, unstarred]);+ return { savedQueries: [starred, unstarred], nextPageToken: "" };+ });++ const { provideSheetContext, useSheetContext, useSheetContextByView } =+ await import("./context");+ let sheetContext: ReturnType<typeof useSheetContext> | undefined;+ let viewContext: ReturnType<typeof useSheetContextByView> | undefined;++ const Probe = () => {+ provideSheetContext();+ sheetContext = useSheetContext();+ viewContext = useSheetContextByView("my");+ return null;+ };++ root = createRoot(container);+ await act(async () => {+ root.render(<Probe />);+ });+ await act(async () => {+ await viewContext!.fetchSheetList();+ });+ act(() => {+ sheetContext!.setFilter({+ ...sheetContext!.filter,+ onlyShowStarred: true,+ });+ });++ await act(async () => {+ await sheetContext!.batchUpdateSavedQueryFolderPaths("my", [+ { sourceFolder: ["old"], targetFolder: ["new"] },+ ]);+ });++ expect(+ mocks.getAppState().patchSavedQueryFolderInCache+ ).toHaveBeenCalledWith([starred.name, unstarred.name], "new");});test("batch updates saved query folder paths without display filters", async () => {@@ -925,21 +1029,20 @@ describe("sheet context", () => {});expect(- mocks.getAppState().batchUpdateSavedQueryOrganizers- ).toHaveBeenCalledWith([- {- parent: "projects/proj1",- filter:- 'creator == "users/[email protected]" && folder == "old/child"',- organizer: { folders: ["new", "child"] },- updateMask: ["folders"],- },- {- parent: "projects/proj1",- filter: 'creator == "users/[email protected]" && folder == "old"',- organizer: { folders: ["new"] },- updateMask: ["folders"],- },- ]);+ mocks.getAppState().batchUpdateSavedQueryFolder+ ).toHaveBeenNthCalledWith(+ 1,+ "projects/proj1",+ 'creator == "users/[email protected]" && folder == "old/child"',+ "new/child"+ );+ expect(+ mocks.getAppState().batchUpdateSavedQueryFolder+ ).toHaveBeenNthCalledWith(+ 2,+ "projects/proj1",+ 'creator == "users/[email protected]" && folder == "old"',+ "new"+ );});});diff --git a/frontend/src/modules/sql-editor/model/Sheet/context.ts b/frontend/src/modules/sql-editor/model/Sheet/context.tsindex 6c45b603ed..6c5fe2feb9 100644--- a/frontend/src/modules/sql-editor/model/Sheet/context.ts+++ b/frontend/src/modules/sql-editor/model/Sheet/context.ts@@ -105,7 +105,7 @@ export interface ViewContext {getKeyForSavedQuery: (savedQuery: SavedQueryLikeItem) => string;getFoldersForSavedQuery: (path: string) => string[];getPathesForSavedQuery: (savedQuery: { folders: string[] }) => string[];- getPwdForSavedQuery: (savedQuery: { folders: string[] }) => string;+ getPwdForSavedQuery: (savedQuery: { folder: string }) => string;}export type SavedQueryFolderPathUpdate = {@@ -575,7 +575,7 @@ const convertToSavedQueryLikeItem = (): SavedQueryLikeItem => ({name: savedQuery.name,title: savedQuery.title,- folders: savedQuery.folders,+ folders: savedQuery.folder ? savedQuery.folder.split("/") : [],type: "savedQuery",});@@ -837,9 +837,12 @@ const buildTree = (return parent;};-const savedQueriesForView = (view: SheetViewMode): SavedQuery[] => {+// Every cached row for the view, before display filters. The tree renders+// `savedQueriesForView`, but cache maintenance has to see the rows a display+// filter hides: the server moves those too, so leaving them out strands them+// under their old folder until a refetch.+const cachedSavedQueriesForView = (view: SheetViewMode): SavedQuery[] => {if (view !== "my" && view !== "shared") return [];- const filter = useSheetContextStore.getState().filter;const project = getSQLEditorEditorState().project;// SQLEditorLayout awaits `loadCurrentUser()` in its bootstrap, so by the// time saved queries land here the app-store `currentUser` is populated.@@ -849,7 +852,7 @@ const savedQueriesForView = (view: SheetViewMode): SavedQuery[] => {const email = useAppStore.getState().currentUser?.email ?? "";const creator = `users/${email}`;const appState = useAppStore.getState();- let list = useSheetContextStore+ const list = useSheetContextStore.getState().viewStates[view].savedQueryNames.map((name) =>appState.getSavedQueryByName(name)@@ -860,12 +863,16 @@ const savedQueriesForView = (view: SheetViewMode): SavedQuery[] => {const mine = sheet.creator === creator;return view === "my" ? mine : !mine;});- if (filter.onlyShowStarred) {- list = list.filter((sheet) => sheet.starred);- }return list;};+const savedQueriesForView = (view: SheetViewMode): SavedQuery[] => {+ const list = cachedSavedQueriesForView(view);+ return useSheetContextStore.getState().filter.onlyShowStarred+ ? list.filter((sheet) => sheet.starred)+ : list;+};+const sheetLikeItemsForView = (view: SheetViewMode): SavedQueryLikeItem[] => {if (view === "draft") {const tabsState = getSQLEditorTabsState();@@ -1056,16 +1063,18 @@ const fetchSavedQueryFoldersForView = async (view: SheetViewMode) => {if (view !== "my" && view !== "shared") {return;}- const project = getSQLEditorEditorState().project;- const paths = await useAppStore.getState().listSavedQueryFolders(project);const folderPaths = new Set<string>();- for (const { folders, category } of paths) {- if (category !== view) {- continue;- }- for (const path of getPathesForSavedQuery(view, { folders })) {- folderPaths.add(path);- }+ // Both views ask the server, which returns the folder paths of the saved+ // queries the caller can read, with every ancestor prefix expanded. The+ // view's own creator filter is what splits mine from everyone else's --+ // deriving the shared tree from cached rows instead would miss every+ // foldered row, since the root page only loads unfiled ones.+ const project = getSQLEditorEditorState().project;+ const paths = await useAppStore+ .getState()+ .searchSavedQueryFolders(project, sheetFilterForView(view, [], false));+ for (const path of paths) {+ folderPaths.add(getFolderContext(view).rootPath + "/" + path);}for (const path of readPersistedFolders(view)) {folderPaths.add(path);@@ -1166,7 +1175,10 @@ const buildViewContext = (view: SheetViewMode): ViewContext => {getKeyForSavedQuery: (ws) => getKeyForSavedQuery(view, ws),getFoldersForSavedQuery: (path) => getFoldersForSavedQuery(view, path),getPathesForSavedQuery: (ws) => getPathesForSavedQuery(view, ws),- getPwdForSavedQuery: (ws) => getPwdForSavedQuery(view, ws),+ getPwdForSavedQuery: (ws) =>+ getPwdForSavedQuery(view, {+ folders: ws.folder ? ws.folder.split("/") : [],+ }),};};@@ -1241,7 +1253,12 @@ const batchUpdateSavedQueryFolders = async (const current = useAppStore.getState().getSavedQueryByName(savedQuery.name);const view = current ? viewForSavedQuery(current) : undefined;if (current && (view === "my" || view === "shared")) {- addAffectedFolderKey(view, getPwdForSavedQuery(view, current));+ addAffectedFolderKey(+ view,+ getPwdForSavedQuery(view, {+ folders: current.folder ? current.folder.split("/") : [],+ })+ );addAffectedFolderKey(view, getPwdForSavedQuery(view, savedQuery));}@@ -1264,17 +1281,22 @@ const batchUpdateSavedQueryFolders = async (}const requests = [...requestByKey.values()];if (requests.length === 0) return;- await useAppStore.getState().batchUpdateSavedQueryOrganizers(- requests.map((request) => ({- parent: request.parent,- filter: `name in [${request.names- .map((name) => '"' + escapeCELStringLiteral(name) + '"')- .join(",")}]`,- organizer: {- folders: request.folders,- },- updateMask: ["folders"],- }))+ 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+ );+ useAppStore+ .getState()+ .patchSavedQueryFolderInCache(request.names, folder);+ }));for (const [view, folderKeys] of affectedFolderKeysByView) {useSheetContextStore.getState().invalidateViewPageState(view, folderKeys);@@ -1292,22 +1314,28 @@ const batchUpdateSavedQueryFolderPaths = async (const sortedUpdates = [...updates].sort((a, b) => b.sourceFolder.length - a.sourceFolder.length);- await useAppStore.getState().batchUpdateSavedQueryOrganizers(- sortedUpdates.map((update) => ({- parent: project,- filter: sheetFilterForView(- view,- [- `folder == "${escapeCELStringLiteral(update.sourceFolder.join("/"))}"`,- ],- false- ),- organizer: {- folders: update.targetFolder,- },- updateMask: ["folders"],- }))- );+ for (const update of sortedUpdates) {+ 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);+ }};let _watchersBound = false;@@ -1446,7 +1474,7 @@ const onCurrentTabChanged = (tab: SQLEditorTab | undefined) => {savedQueryLikeItem = {name: savedQuery.name,title: savedQuery.title,- folders: savedQuery.folders,+ folders: savedQuery.folder ? savedQuery.folder.split("/") : [],type: "savedQuery",};view = isSavedQueryCreator(savedQuery) ? "my" : "shared";diff --git a/frontend/src/modules/sql-editor/store/savedQuery.test.ts b/frontend/src/modules/sql-editor/store/savedQuery.test.tsindex 262ba9b531..2ff03642b1 100644--- a/frontend/src/modules/sql-editor/store/savedQuery.test.ts+++ b/frontend/src/modules/sql-editor/store/savedQuery.test.ts@@ -79,7 +79,6 @@ const piniaMocks = vi.hoisted(() => ({savedQueryStore: {getSavedQueryByName: vi.fn(),patchSavedQuery: vi.fn(),- upsertSavedQueryOrganizer: vi.fn(),createSavedQuery: vi.fn(),fetchProject: vi.fn(),loadProjectIamPolicy: vi.fn(),diff --git a/frontend/src/modules/sql-editor/store/savedQuery.ts b/frontend/src/modules/sql-editor/store/savedQuery.tsindex 4d0e90f007..50087d0d95 100644--- a/frontend/src/modules/sql-editor/store/savedQuery.ts+++ b/frontend/src/modules/sql-editor/store/savedQuery.ts@@ -91,28 +91,25 @@ export const createSavedQuerySaveSlice: SQLEditorSliceCreator<const savedQueryTitle = title ?? currentSheet?.title ?? "";if (savedQuery && currentSheet) {+ const updateMask = ["title", "database", "content"];+ const patched = {+ ...currentSheet,+ title: savedQueryTitle,+ database,+ content: new TextEncoder().encode(statement),+ };+ if (!isUndefined(folders)) {+ patched.folder = folders.join("/");+ updateMask.push("folder");+ }const updated = await savedQueryStore.patchSavedQuery(- {- ...currentSheet,- title: savedQueryTitle,- database,- content: new TextEncoder().encode(statement),- },- ["title", "database", "content"],+ patched,+ updateMask,signal);if (!updated) {return;}- if (!isUndefined(folders)) {- await savedQueryStore.upsertSavedQueryOrganizer(- {- savedQuery: updated.name,- folders: folders,- },- ["folders"]- );- }}return tabStore.updateTab(tabId, {@@ -143,19 +140,10 @@ export const createSavedQuerySaveSlice: SQLEditorSliceCreator<database,content: new TextEncoder().encode(statement),project: editorStore.project,+ folder: folders.join("/"),}));- if (folders.length > 0) {- await savedQueryStore.upsertSavedQueryOrganizer(- {- savedQuery: newSavedQuery.name,- folders: folders,- },- ["folders"]- );- }-if (tabId) {return tabStore.updateTab(tabId, {status: "CLEAN",diff --git a/frontend/src/stores/app/savedQuery.ts b/frontend/src/stores/app/savedQuery.tsindex 88c7d269cc..617491b58e 100644--- a/frontend/src/stores/app/savedQuery.ts+++ b/frontend/src/stores/app/savedQuery.ts@@ -4,22 +4,17 @@ import { uniqBy } from "lodash-es";import { savedQueryServiceClientConnect } from "@/api";import { silentContextKey } from "@/api/context-key";import { UNKNOWN_ID } from "@/types";-import type {- SavedQuery,- SavedQueryOrganizer,-} from "@/types/proto-es/v1/saved_query_service_pb";+import type { SavedQuery } from "@/types/proto-es/v1/saved_query_service_pb";import {- BatchUpdateSavedQueryOrganizerRequestSchema,+ BatchUpdateSavedQueriesRequestSchema,CreateSavedQueryRequestSchema,DeleteSavedQueryRequestSchema,GetSavedQueryRequestSchema,- ListSavedQueryFoldersRequestSchema,- SavedQueryFolder_Category,- SavedQueryOrganizerSchema,SavedQuerySchema,SearchSavedQueriesRequestSchema,- UpdateSavedQueryOrganizerRequestSchema,+ SearchSavedQueryFoldersRequestSchema,UpdateSavedQueryRequestSchema,+ UpdateSavedQueryStarRequestSchema,} from "@/types/proto-es/v1/saved_query_service_pb";import { isValidDatabaseName } from "@/types/v1/database";import { extractSavedQueryID } from "@/utils/v1/savedQuery";@@ -77,17 +72,6 @@ export const createSavedQuerySlice: AppSliceCreator<SavedQuerySlice> = (}};- const updateCacheWithOrganizer = (organizer: SavedQueryOrganizer) => {- for (const view of ["FULL", "BASIC"] as const) {- const existing = get().getSavedQueryByName(organizer.savedQuery, view);- if (!existing) continue;- const updated = clone(SavedQuerySchema, existing);- updated.starred = organizer.starred;- updated.folders = organizer.folders;- setCacheEntry(updated, view);- }- };-return {savedQueriesByKey: {},savedQueryRequests: {},@@ -162,25 +146,15 @@ export const createSavedQuerySlice: AppSliceCreator<SavedQuerySlice> = (};},- listSavedQueryFolders: async (parent) => {+ searchSavedQueryFolders: async (parent, filter) => {const response =- await savedQueryServiceClientConnect.listSavedQueryFolders(- createProto(ListSavedQueryFoldersRequestSchema, {+ await savedQueryServiceClientConnect.searchSavedQueryFolders(+ createProto(SearchSavedQueryFoldersRequestSchema, {parent,+ filter,}));- const folders: { folders: string[]; category: "my" | "shared" }[] = [];- for (const folder of response.folders) {- switch (folder.category) {- case SavedQueryFolder_Category.MINE:- folders.push({ folders: folder.folders, category: "my" });- break;- case SavedQueryFolder_Category.SHARED:- folders.push({ folders: folder.folders, category: "shared" });- break;- }- }- return folders;+ return response.folders;},createSavedQuery: async (savedQuery) => {@@ -225,36 +199,43 @@ export const createSavedQuerySlice: AppSliceCreator<SavedQuerySlice> = (});},- upsertSavedQueryOrganizer: async (organizer, updateMask) => {+ updateSavedQueryStar: async (name, starred) => {+ const response =+ await savedQueryServiceClientConnect.updateSavedQueryStar(+ createProto(UpdateSavedQueryStarRequestSchema, { name, starred })+ );+ // Refresh whichever cache views hold the row so star badges update.+ for (const view of ["FULL", "BASIC"] as const) {+ const existing = get().getSavedQueryByName(name, view);+ if (!existing) continue;+ const updated = clone(SavedQuerySchema, existing);+ updated.starred = response.starred;+ setCacheEntry(updated, view);+ }+ },++ batchUpdateSavedQueryFolder: async (parent, filter, folder) => {const response =- await savedQueryServiceClientConnect.updateSavedQueryOrganizer(- createProto(UpdateSavedQueryOrganizerRequestSchema, {- organizer: createProto(SavedQueryOrganizerSchema, {- ...organizer,- } as SavedQueryOrganizer),- updateMask: { paths: updateMask },+ await savedQueryServiceClientConnect.batchUpdateSavedQueries(+ createProto(BatchUpdateSavedQueriesRequestSchema, {+ parent,+ filter,+ savedQuery: createProto(SavedQuerySchema, { folder }),+ updateMask: { paths: ["folder"] },}));- updateCacheWithOrganizer(response);+ return response.updatedCount;},- batchUpdateSavedQueryOrganizers: async (requests) => {- const responses = await Promise.all(- requests.map((request) =>- savedQueryServiceClientConnect.batchUpdateSavedQueryOrganizer(- createProto(BatchUpdateSavedQueryOrganizerRequestSchema, {- parent: request.parent,- filter: request.filter,- organizer: createProto(SavedQueryOrganizerSchema, {- ...request.organizer,- } as SavedQueryOrganizer),- updateMask: { paths: request.updateMask },- })- )- )- );- for (const response of responses) {- response.savedQueryOrganizers.map(updateCacheWithOrganizer);+ patchSavedQueryFolderInCache: (names, folder) => {+ for (const name of names) {+ for (const view of ["FULL", "BASIC"] as const) {+ const existing = get().getSavedQueryByName(name, view);+ if (!existing) continue;+ const updated = clone(SavedQuerySchema, existing);+ updated.folder = folder;+ setCacheEntry(updated, view);+ }}},diff --git a/frontend/src/stores/app/types.ts b/frontend/src/stores/app/types.tsindex 1630e8761e..f30cdc484f 100644--- a/frontend/src/stores/app/types.ts+++ b/frontend/src/stores/app/types.ts@@ -63,10 +63,7 @@ import type { Release } from "@/types/proto-es/v1/release_service_pb";import type { Revision } from "@/types/proto-es/v1/revision_service_pb";import type { Role } from "@/types/proto-es/v1/role_service_pb";import type { Rollout } from "@/types/proto-es/v1/rollout_service_pb";-import type {- SavedQuery,- SavedQueryOrganizer,-} from "@/types/proto-es/v1/saved_query_service_pb";+import type { SavedQuery } from "@/types/proto-es/v1/saved_query_service_pb";import type { ServiceAccount } from "@/types/proto-es/v1/service_account_service_pb";import type {DataClassificationSetting_DataClassificationConfig,@@ -638,9 +635,10 @@ export type SavedQuerySlice = {pageToken?: string;}) => Promise<{ savedQueries: SavedQuery[]; nextPageToken: string }>;- listSavedQueryFolders: (- parent: string- ) => Promise<{ folders: string[]; category: "my" | "shared" }[]>;+ searchSavedQueryFolders: (+ parent: string,+ filter?: string+ ) => Promise<string[]>;createSavedQuery: (savedQuery: SavedQuery) => Promise<SavedQuery>;patchSavedQuery: (savedQuery: SavedQuery,@@ -648,18 +646,18 @@ export type SavedQuerySlice = {signal?: AbortSignal) => Promise<SavedQuery | undefined>;deleteSavedQueryByName: (name: string) => Promise<void>;- upsertSavedQueryOrganizer: (- organizer: Partial<SavedQueryOrganizer>,- updateMask: string[]- ) => Promise<void>;- batchUpdateSavedQueryOrganizers: (- requests: {- parent: string;- filter: string;- organizer: Partial<SavedQueryOrganizer>;- updateMask: string[];- }[]- ) => Promise<void>;+ updateSavedQueryStar: (name: string, starred: boolean) => Promise<void>;+ batchUpdateSavedQueryFolder: (+ parent: string,+ filter: string,+ folder: string+ ) => Promise<number>;+ /**+ * Mirror a completed server-side folder move onto the cached rows. The+ * batch RPC answers with a count, not the moved resources, so the caller+ * names the rows it already holds.+ */+ patchSavedQueryFolderInCache: (names: string[], folder: string) => void;savedQueryList: () => SavedQuery[];};diff --git a/frontend/src/types/iam/permission-generated.ts b/frontend/src/types/iam/permission-generated.tsindex d44fafcc7b..123e758d93 100644--- a/frontend/src/types/iam/permission-generated.ts+++ b/frontend/src/types/iam/permission-generated.ts@@ -102,6 +102,10 @@ export type Permission =| "bb.rollouts.create"| "bb.rollouts.get"| "bb.rollouts.list"+ | "bb.savedQueries.create"+ | "bb.savedQueries.search"+ | "bb.savedQueries.list"+ | "bb.savedQueries.manage"| "bb.serviceAccounts.create"| "bb.serviceAccounts.delete"| "bb.serviceAccounts.get"@@ -133,9 +137,6 @@ export type Permission =| "bb.users.undelete"| "bb.users.update"| "bb.users.updateEmail"- | "bb.worksheets.get"- | "bb.worksheets.list"- | "bb.worksheets.manage"| "bb.workloadIdentities.create"| "bb.workloadIdentities.delete"| "bb.workloadIdentities.get"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.tsindex 3a56a25639..7ba9f63ae0 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@@ -2,7 +2,7 @@// @generated from file v1/saved_query_service.proto (package bytebase.v1, syntax proto3)/* eslint-disable */-import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";+import type { GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";import type { Message } from "@bufbuild/protobuf";import type { EmptySchema, FieldMask, Timestamp } from "@bufbuild/protobuf/wkt";@@ -140,91 +140,58 @@ export declare type ListSavedQueriesResponse = Message<"bytebase.v1.ListSavedQueexport declare const ListSavedQueriesResponseSchema: GenMessage<ListSavedQueriesResponse>;/**- * @generated from message bytebase.v1.ListSavedQueryFoldersRequest+ * @generated from message bytebase.v1.SearchSavedQueryFoldersRequest*/-export declare type ListSavedQueryFoldersRequest = Message<"bytebase.v1.ListSavedQueryFoldersRequest"> & {+export declare type SearchSavedQueryFoldersRequest = Message<"bytebase.v1.SearchSavedQueryFoldersRequest"> & {/**- * The parent resource of the saved query folders.+ * The parent resource whose saved query folders are searched.* Format: projects/{project}** @generated from field: string parent = 1;*/parent: string;-};--/**- * Describes the message bytebase.v1.ListSavedQueryFoldersRequest.- * Use `create(ListSavedQueryFoldersRequestSchema)` to create a new message.- */-export declare const ListSavedQueryFoldersRequestSchema: GenMessage<ListSavedQueryFoldersRequest>;-/**- * @generated from message bytebase.v1.ListSavedQueryFoldersResponse- */-export declare type ListSavedQueryFoldersResponse = Message<"bytebase.v1.ListSavedQueryFoldersResponse"> & {/**- * The caller's saved query folders.+ * To filter the folders by the saved queries they hold. Takes the same+ * fields and syntax as `SearchSavedQueries.filter`, except `title`. A+ * folder is returned when at least one saved query the caller can read+ * matches, so the caller-scoping is the same as SearchSavedQueries: your+ * own saved queries, plus everyone's for the admin backstop.+ *+ * For example, to split a folder tree into your own and everyone else's:+ * creator == "users/{email}"+ * creator != "users/{email}"*- * @generated from field: repeated bytebase.v1.SavedQueryFolder folders = 1;+ * @generated from field: string filter = 2;*/- folders: SavedQueryFolder[];+ filter: string;};/**- * Describes the message bytebase.v1.ListSavedQueryFoldersResponse.- * Use `create(ListSavedQueryFoldersResponseSchema)` to create a new message.+ * Describes the message bytebase.v1.SearchSavedQueryFoldersRequest.+ * Use `create(SearchSavedQueryFoldersRequestSchema)` to create a new message.*/-export declare const ListSavedQueryFoldersResponseSchema: GenMessage<ListSavedQueryFoldersResponse>;+export declare const SearchSavedQueryFoldersRequestSchema: GenMessage<SearchSavedQueryFoldersRequest>;/**- * @generated from message bytebase.v1.SavedQueryFolder+ * @generated from message bytebase.v1.SearchSavedQueryFoldersResponse*/-export declare type SavedQueryFolder = Message<"bytebase.v1.SavedQueryFolder"> & {+export declare type SearchSavedQueryFoldersResponse = Message<"bytebase.v1.SearchSavedQueryFoldersResponse"> & {/**- * The folder path segments.+ * The caller's folder paths, including every ancestor prefix, sorted.+ * A folder is a path on saved queries ("a/b/c"), so empty folders cannot+ * exist.** @generated from field: repeated string folders = 1;*/folders: string[];-- /**- * The folder category.- *- * @generated from field: bytebase.v1.SavedQueryFolder.Category category = 2;- */- category: SavedQueryFolder_Category;};/**- * Describes the message bytebase.v1.SavedQueryFolder.- * Use `create(SavedQueryFolderSchema)` to create a new message.- */-export declare const SavedQueryFolderSchema: GenMessage<SavedQueryFolder>;--/**- * @generated from enum bytebase.v1.SavedQueryFolder.Category+ * Describes the message bytebase.v1.SearchSavedQueryFoldersResponse.+ * Use `create(SearchSavedQueryFoldersResponseSchema)` to create a new message.*/-export enum SavedQueryFolder_Category {- /**- * @generated from enum value: CATEGORY_UNSPECIFIED = 0;- */- CATEGORY_UNSPECIFIED = 0,-- /**- * @generated from enum value: MINE = 1;- */- MINE = 1,-- /**- * @generated from enum value: SHARED = 2;- */- SHARED = 2,-}--/**- * Describes the enum bytebase.v1.SavedQueryFolder.Category.- */-export declare const SavedQueryFolder_CategorySchema: GenEnum<SavedQueryFolder_Category>;+export declare const SearchSavedQueryFoldersResponseSchema: GenMessage<SearchSavedQueryFoldersResponse>;/*** @generated from message bytebase.v1.UpdateSavedQueryRequest@@ -248,6 +215,7 @@ export declare type UpdateSavedQueryRequest = Message<"bytebase.v1.UpdateSavedQu* - `title`* - `content`* - `database`+ * - `folder`** @generated from field: google.protobuf.FieldMask update_mask = 2;*/@@ -261,11 +229,37 @@ export declare type UpdateSavedQueryRequest = Message<"bytebase.v1.UpdateSavedQuexport declare const UpdateSavedQueryRequestSchema: GenMessage<UpdateSavedQueryRequest>;/**- * @generated from message bytebase.v1.BatchUpdateSavedQueryOrganizerRequest+ * @generated from message bytebase.v1.UpdateSavedQueryStarRequest*/-export declare type BatchUpdateSavedQueryOrganizerRequest = Message<"bytebase.v1.BatchUpdateSavedQueryOrganizerRequest"> & {+export declare type UpdateSavedQueryStarRequest = Message<"bytebase.v1.UpdateSavedQueryStarRequest"> & {+ /**+ * The name of the saved query to star or unstar.+ * Format: projects/{project}/savedQueries/{savedQuery}+ *+ * @generated from field: string name = 1;+ */+ name: string;+/**- * The parent resource whose saved queries' organizers are updated.+ * Whether the caller stars the saved query.+ *+ * @generated from field: bool starred = 2;+ */+ starred: boolean;+};++/**+ * Describes the message bytebase.v1.UpdateSavedQueryStarRequest.+ * Use `create(UpdateSavedQueryStarRequestSchema)` to create a new message.+ */+export declare const UpdateSavedQueryStarRequestSchema: GenMessage<UpdateSavedQueryStarRequest>;++/**+ * @generated from message bytebase.v1.BatchUpdateSavedQueriesRequest+ */+export declare type BatchUpdateSavedQueriesRequest = Message<"bytebase.v1.BatchUpdateSavedQueriesRequest"> & {+ /**+ * The parent resource whose saved queries are updated.* Format: projects/{project}** @generated from field: string parent = 1;@@ -280,25 +274,23 @@ export declare type BatchUpdateSavedQueryOrganizerRequest = Message<"bytebase.v1* - name: the saved query name in "projects/{project}/savedQueries/{savedQuery}" format, support "==" and "in [xx]" operator.* - creator: the saved query creator in "users/{email}" format, support "==" and "!=" operator.* - starred: should be "true" or "false", filter starred/unstarred saved queries, support "==" operator.- * - folder: the saved query organizer folder path, support exact "==" operator.+ * - folder: the saved query folder path, support exact "==" operator.** @generated from field: string filter = 2;*/filter: string;/**- * The organizer fields to update.+ * The fields to apply to every matched saved query.*- * @generated from field: bytebase.v1.SavedQueryOrganizer organizer = 3;+ * @generated from field: bytebase.v1.SavedQuery saved_query = 3;*/- organizer?: SavedQueryOrganizer | undefined;+ savedQuery?: SavedQuery | undefined;/*** The list of fields to be updated.- * Fields are specified relative to the saved query organizer.* Only support update the following fields for now:- * - `starred`- * - `folders`+ * - `folder`** @generated from field: google.protobuf.FieldMask update_mask = 4;*/@@ -306,101 +298,28 @@ export declare type BatchUpdateSavedQueryOrganizerRequest = Message<"bytebase.v1};/**- * Describes the message bytebase.v1.BatchUpdateSavedQueryOrganizerRequest.- * Use `create(BatchUpdateSavedQueryOrganizerRequestSchema)` to create a new message.- */-export declare const BatchUpdateSavedQueryOrganizerRequestSchema: GenMessage<BatchUpdateSavedQueryOrganizerRequest>;--/**- * @generated from message bytebase.v1.BatchUpdateSavedQueryOrganizerResponse- */-export declare type BatchUpdateSavedQueryOrganizerResponse = Message<"bytebase.v1.BatchUpdateSavedQueryOrganizerResponse"> & {- /**- * @generated from field: repeated bytebase.v1.SavedQueryOrganizer saved_query_organizers = 1;- */- savedQueryOrganizers: SavedQueryOrganizer[];-- /**- * @generated from field: int32 updated_count = 2;- */- updatedCount: number;-};--/**- * Describes the message bytebase.v1.BatchUpdateSavedQueryOrganizerResponse.- * Use `create(BatchUpdateSavedQueryOrganizerResponseSchema)` to create a new message.- */-export declare const BatchUpdateSavedQueryOrganizerResponseSchema: GenMessage<BatchUpdateSavedQueryOrganizerResponse>;--/**- * @generated from message bytebase.v1.UpdateSavedQueryOrganizerRequest- */-export declare type UpdateSavedQueryOrganizerRequest = Message<"bytebase.v1.UpdateSavedQueryOrganizerRequest"> & {- /**- * The organizer to update.- *- * The organizer's `saved_query` field is used to identify the saved query.- * Format: projects/{project}/savedQueries/{savedQuery}- *- * @generated from field: bytebase.v1.SavedQueryOrganizer organizer = 1;- */- organizer?: SavedQueryOrganizer | undefined;-- /**- * The list of fields to be updated.- * Fields are specified relative to the saved query organizer.- * Only support update the following fields for now:- * - `starred`- *- * @generated from field: google.protobuf.FieldMask update_mask = 2;- */- updateMask?: FieldMask | undefined;-- /**- * If set to true, and the saved query organizer is not found, a new saved query organizer will be created.- * In this situation, `update_mask` is ignored.- *- * @generated from field: bool allow_missing = 3;- */- allowMissing: boolean;-};--/**- * Describes the message bytebase.v1.UpdateSavedQueryOrganizerRequest.- * Use `create(UpdateSavedQueryOrganizerRequestSchema)` to create a new message.+ * Describes the message bytebase.v1.BatchUpdateSavedQueriesRequest.+ * Use `create(BatchUpdateSavedQueriesRequestSchema)` to create a new message.*/-export declare const UpdateSavedQueryOrganizerRequestSchema: GenMessage<UpdateSavedQueryOrganizerRequest>;+export declare const BatchUpdateSavedQueriesRequestSchema: GenMessage<BatchUpdateSavedQueriesRequest>;/**- * @generated from message bytebase.v1.SavedQueryOrganizer+ * @generated from message bytebase.v1.BatchUpdateSavedQueriesResponse*/-export declare type SavedQueryOrganizer = Message<"bytebase.v1.SavedQueryOrganizer"> & {- /**- * The name of the saved query.- * Format: projects/{project}/savedQueries/{savedQuery}- *- * @generated from field: string saved_query = 1;- */- savedQuery: string;-+export declare type BatchUpdateSavedQueriesResponse = Message<"bytebase.v1.BatchUpdateSavedQueriesResponse"> & {/**- * starred means if the saved query is starred.+ * The number of saved queries updated.*- * @generated from field: bool starred = 2;+ * @generated from field: int32 updated_count = 1;*/- starred: boolean;-- /**- * @generated from field: repeated string folders = 3;- */- folders: string[];+ updatedCount: number;};/**- * Describes the message bytebase.v1.SavedQueryOrganizer.- * Use `create(SavedQueryOrganizerSchema)` to create a new message.+ * Describes the message bytebase.v1.BatchUpdateSavedQueriesResponse.+ * Use `create(BatchUpdateSavedQueriesResponseSchema)` to create a new message.*/-export declare const SavedQueryOrganizerSchema: GenMessage<SavedQueryOrganizer>;+export declare const BatchUpdateSavedQueriesResponseSchema: GenMessage<BatchUpdateSavedQueriesResponse>;/*** @generated from message bytebase.v1.DeleteSavedQueryRequest@@ -442,7 +361,7 @@ export declare type SearchSavedQueriesRequest = Message<"bytebase.v1.SearchSaved* - title: the saved query title, support "contains" operator.* - creator: the saved query creator in "users/{email}" format, support "==" and "!=" operator.* - starred: should be "true" or "false", filter starred/unstarred saved queries, support "==" operator.- * - folder: the saved query organizer folder path, support "==" operator.+ * - folder: the saved query folder path, support "==" operator.** For example:* creator == "users/{email}"@@ -546,7 +465,8 @@ export declare type SavedQuery = Message<"bytebase.v1.SavedQuery"> & {title: string;/**- * The creator of the SavedQuery.+ * The creator of the SavedQuery — the fixed owner; ownership does not+ * transfer.* Format: users/{email}** @generated from field: string creator = 5;@@ -591,9 +511,13 @@ export declare type SavedQuery = Message<"bytebase.v1.SavedQuery"> & {starred: boolean;/**- * @generated from field: repeated string folders = 12;+ * The folder path this saved query lives in, set by its creator (or an+ * admin). Empty means unfiled. A saved query lives in exactly one folder;+ * a folder is a path on saved queries, e.g. "a/b/c".+ *+ * @generated from field: string folder = 13;*/- folders: string[];+ folder: string;};/**@@ -604,15 +528,20 @@ export declare const SavedQuerySchema: GenMessage<SavedQuery>;/*** SavedQueryService manages saved queries for SQL Editor query development.- * Permission IDs still use the legacy `bb.worksheets.*` names; they are- * renamed together with the access-model redesign and its role migration.+ *+ * A saved query is private to its creator; `bb.savedQueries.manage` is the+ * admin backstop that can reach any saved query in scope. Per-object+ * VIEWER/EDITOR grants arrive with the access-model redesign, which brings+ * its own policy shapes and the GetIamPolicy/SetIamPolicy pair that manages+ * them.** @generated from service bytebase.v1.SavedQueryService*/export declare const SavedQueryService: GenService<{/**- * Creates a personal saved query used in SQL Editor. Any authenticated user can create their own saved queries.- * Permissions required: None (authenticated users only)+ * Creates a personal saved query used in SQL Editor. The creator becomes+ * the fixed owner.+ * Permissions required: bb.savedQueries.create on the parent project** @generated from rpc bytebase.v1.SavedQueryService.CreateSavedQuery*/@@ -622,10 +551,9 @@ export declare const SavedQueryService: GenService<{output: typeof SavedQuerySchema;},/**- * Get a saved query by name.- * Saved queries are private: only the creator, or a caller holding- * bb.worksheets.manage on the workspace, can access one.- * Permissions required: creator, or workspace bb.worksheets.manage+ * Get a saved query by name. Returns NotFound for saved queries the+ * caller cannot read.+ * Permissions required: creator, or bb.savedQueries.manage in scope** @generated from rpc bytebase.v1.SavedQueryService.GetSavedQuery*/@@ -635,9 +563,11 @@ export declare const SavedQueryService: GenService<{output: typeof SavedQuerySchema;},/**- * List saved queries.- * This is used for listing saved queries in a project, or across all projects by using `projects/-`.- * Permissions required: bb.worksheets.list+ * List saved queries: the grant-independent governance surface. Supports+ * listing in a project, or across all projects by using `projects/-`, with+ * whole statements rather than the previews Search returns — e.g. an+ * offboarding review filtering by creator.+ * Permissions required: bb.savedQueries.list** @generated from rpc bytebase.v1.SavedQueryService.ListSavedQueries*/@@ -647,33 +577,37 @@ export declare const SavedQueryService: GenService<{output: typeof ListSavedQueriesResponseSchema;},/**- * List the caller's saved query folders.- * Only folders stored in the caller's saved query organizer are returned.+ * Search for saved queries in a project: the SQL Editor's hot list path,+ * returning only rows the caller can read, with content previews.+ * Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the project*- * @generated from rpc bytebase.v1.SavedQueryService.ListSavedQueryFolders+ * @generated from rpc bytebase.v1.SavedQueryService.SearchSavedQueries*/- listSavedQueryFolders: {+ searchSavedQueries: {methodKind: "unary";- input: typeof ListSavedQueryFoldersRequestSchema;- output: typeof ListSavedQueryFoldersResponseSchema;+ input: typeof SearchSavedQueriesRequestSchema;+ output: typeof SearchSavedQueriesResponseSchema;},/**- * Search for saved queries.- * This is used for finding my saved queries in a project.- * The saved query accessibility is the same as GetSavedQuery().- * Permissions required: creator, or workspace bb.worksheets.manage+ * Search the folder paths of the caller's saved queries in a project.+ * Folders are a derived view over the `folder` field rather than a+ * resource collection, so this is a custom method on savedQueries and+ * shares SearchSavedQueries' caller-scoped semantics — not the+ * cross-creator reach of ListSavedQueries.+ * Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the project*- * @generated from rpc bytebase.v1.SavedQueryService.SearchSavedQueries+ * @generated from rpc bytebase.v1.SavedQueryService.SearchSavedQueryFolders*/- searchSavedQueries: {+ searchSavedQueryFolders: {methodKind: "unary";- input: typeof SearchSavedQueriesRequestSchema;- output: typeof SearchSavedQueriesResponseSchema;+ input: typeof SearchSavedQueryFoldersRequestSchema;+ output: typeof SearchSavedQueryFoldersResponseSchema;},/**- * Update a saved query.- * The access is the same as GetSavedQuery method.- * Permissions required: creator, or workspace bb.worksheets.manage+ * Update a saved query. `title`, `content`, and `database` require write+ * access; `folder` re-files the saved query and is creator/admin only.+ * Returns NotFound for saved queries the caller cannot read.+ * Permissions required: creator, or bb.savedQueries.manage in scope** @generated from rpc bytebase.v1.SavedQueryService.UpdateSavedQuery*/@@ -683,33 +617,37 @@ export declare const SavedQueryService: GenService<{output: typeof SavedQuerySchema;},/**- * Update the organizer of a saved query.- * The access is the same as UpdateSavedQuery method.- * Permissions required: creator, or workspace bb.worksheets.manage+ * Star or unstar a saved query for the caller. A star is always the+ * caller's own per-user marker — invisible to others and carrying no+ * access. The only requirement is that the caller can read the saved+ * query being starred (which also keeps private saved query names+ * unprobeable).+ * Permissions required: read access to the saved query*- * @generated from rpc bytebase.v1.SavedQueryService.UpdateSavedQueryOrganizer+ * @generated from rpc bytebase.v1.SavedQueryService.UpdateSavedQueryStar*/- updateSavedQueryOrganizer: {+ updateSavedQueryStar: {methodKind: "unary";- input: typeof UpdateSavedQueryOrganizerRequestSchema;- output: typeof SavedQueryOrganizerSchema;+ input: typeof UpdateSavedQueryStarRequestSchema;+ output: typeof SavedQuerySchema;},/**- * Batch update the organizers of saved queries.- * The access is the same as UpdateSavedQuery method.- * Permissions required: creator, or workspace bb.worksheets.manage+ * Batch re-file saved queries into a folder. The update mask supports+ * `folder` only; only rows the caller may re-file are updated (their own,+ * or any in scope for admins).+ * Permissions required: creator, or bb.savedQueries.manage in scope*- * @generated from rpc bytebase.v1.SavedQueryService.BatchUpdateSavedQueryOrganizer+ * @generated from rpc bytebase.v1.SavedQueryService.BatchUpdateSavedQueries*/- batchUpdateSavedQueryOrganizer: {+ batchUpdateSavedQueries: {methodKind: "unary";- input: typeof BatchUpdateSavedQueryOrganizerRequestSchema;- output: typeof BatchUpdateSavedQueryOrganizerResponseSchema;+ input: typeof BatchUpdateSavedQueriesRequestSchema;+ output: typeof BatchUpdateSavedQueriesResponseSchema;},/**- * Delete a saved query.- * The access is the same as UpdateSavedQuery method.- * Permissions required: creator, or workspace bb.worksheets.manage+ * Delete a saved query. Only the creator (or an admin) can delete.+ * Returns NotFound for saved queries the caller cannot read.+ * Permissions required: creator, or bb.savedQueries.manage in scope** @generated from rpc bytebase.v1.SavedQueryService.DeleteSavedQuery*/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.jsindex baa924cd45..968a6b4f1f 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@@ -2,7 +2,7 @@// @generated from file v1/saved_query_service.proto (package bytebase.v1, syntax proto3)/* eslint-disable */-import { enumDesc, fileDesc, messageDesc, serviceDesc, tsEnum } from "@bufbuild/protobuf/codegenv2";+import { fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";import { file_buf_validate_validate } from "../buf/validate/validate_pb";import { file_google_api_annotations } from "../google/api/annotations_pb";import { file_google_api_client } from "../google/api/client_pb";@@ -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+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIOCgZmaWx0ZXIYAiABKAkSEQoJcGFnZV9zaXplGAMgASgFEhIKCnBhZ2VfdG9rZW4YBCABKAkiYwoYTGlzdFNhdmVkUXVlcmllc1Jlc3BvbnNlEi4KDXNhdmVkX3F1ZXJpZXMYASADKAsyFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5EhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSIzChxMaXN0U2F2ZWRRdWVyeUZvbGRlcnNSZXF1ZXN0EhMKBnBhcmVudBgBIAEoCUID4EECIk8KHUxpc3RTYXZlZFF1ZXJ5Rm9sZGVyc1Jlc3BvbnNlEi4KB2ZvbGRlcnMYASADKAsyHS5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5Rm9sZGVyIpkBChBTYXZlZFF1ZXJ5Rm9sZGVyEg8KB2ZvbGRlcnMYASADKAkSOAoIY2F0ZWdvcnkYAiABKA4yJi5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5Rm9sZGVyLkNhdGVnb3J5IjoKCENhdGVnb3J5EhgKFENBVEVHT1JZX1VOU1BFQ0lGSUVEEAASCAoETUlORRABEgoKBlNIQVJFRBACIn0KF1VwZGF0ZVNhdmVkUXVlcnlSZXF1ZXN0EjEKC3NhdmVkX3F1ZXJ5GAEgASgLMhcuYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeUID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzayK8AQolQmF0Y2hVcGRhdGVTYXZlZFF1ZXJ5T3JnYW5pemVyUmVxdWVzdBITCgZwYXJlbnQYASABKAlCA+BBAhIOCgZmaWx0ZXIYAiABKAkSOAoJb3JnYW5pemVyGAMgASgLMiAuYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeU9yZ2FuaXplckID4EECEjQKC3VwZGF0ZV9tYXNrGAQgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFza0ID4EECIoEBCiZCYXRjaFVwZGF0ZVNhdmVkUXVlcnlPcmdhbml6ZXJSZXNwb25zZRJAChZzYXZlZF9xdWVyeV9vcmdhbml6ZXJzGAEgAygLMiAuYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeU9yZ2FuaXplchIVCg11cGRhdGVkX2NvdW50GAIgASgFIqQBCiBVcGRhdGVTYXZlZFF1ZXJ5T3JnYW5pemVyUmVxdWVzdBI4Cglvcmdhbml6ZXIYASABKAsyIC5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5T3JnYW5pemVyQgPgQQISLwoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrEhUKDWFsbG93X21pc3NpbmcYAyABKAgiUQoTU2F2ZWRRdWVyeU9yZ2FuaXplchIYCgtzYXZlZF9xdWVyeRgBIAEoCUID4EECEg8KB3N0YXJyZWQYAiABKAgSDwoHZm9sZGVycxgDIAMoCSJIChdEZWxldGVTYXZlZFF1ZXJ5UmVxdWVzdBItCgRuYW1lGAEgASgJQh/gQQL6QRkKF2J5dGViYXNlLmNvbS9TYXZlZFF1ZXJ5ImcKGVNlYXJjaFNhdmVkUXVlcmllc1JlcXVlc3QSEwoGcGFyZW50GAEgASgJQgPgQQISDgoGZmlsdGVyGAIgASgJEhEKCXBhZ2Vfc2l6ZRgDIAEoBRISCgpwYWdlX3Rva2VuGAQgASgJImUKGlNlYXJjaFNhdmVkUXVlcmllc1Jlc3BvbnNlEi4KDXNhdmVkX3F1ZXJpZXMYASADKAsyFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5EhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSKkAwoKU2F2ZWRRdWVyeRIUCgRuYW1lGAEgASgJQgbgQQLgQQUSFAoHcHJvamVjdBgCIAEoCUID4EEDEhAKCGRhdGFiYXNlGAMgASgJEhoKBXRpdGxlGAQgASgJQgvgQQK6SAVyAxjIARIUCgdjcmVhdG9yGAUgASgJQgPgQQMSNAoLY3JlYXRlX3RpbWUYBiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSNAoLdXBkYXRlX3RpbWUYByABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSFAoHY29udGVudBgIIAEoDEID4EECEhkKDGNvbnRlbnRfc2l6ZRgJIAEoA0ID4EEDEhQKB3N0YXJyZWQYCyABKAhCA+BBAxIUCgdmb2xkZXJzGAwgAygJQgPgQQM6S+pBSAoXYnl0ZWJhc2UuY29tL1NhdmVkUXVlcnkSLXByb2plY3RzL3twcm9qZWN0fS9zYXZlZFF1ZXJpZXMve3NhdmVkX3F1ZXJ5fUoECAoQC1IKdmlzaWJpbGl0eTL2DAoRU2F2ZWRRdWVyeVNlcnZpY2USqQEKEENyZWF0ZVNhdmVkUXVlcnkSJC5ieXRlYmFzZS52MS5DcmVhdGVTYXZlZFF1ZXJ5UmVxdWVzdBoXLmJ5dGViYXNlLnYxLlNhdmVkUXVlcnkiVtpBEnBhcmVudCxzYXZlZF9xdWVyeZDqMAKY6jABgtPkkwIzOgtzYXZlZF9xdWVyeSIkL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vc2F2ZWRRdWVyaWVzEoQBCg1HZXRTYXZlZFF1ZXJ5EiEuYnl0ZWJhc2UudjEuR2V0U2F2ZWRRdWVyeVJlcXVlc3QaFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5IjfaQQRuYW1lkOowAoLT5JMCJhIkL3YxL3tuYW1lPXByb2plY3RzLyovc2F2ZWRRdWVyaWVzLyp9ErABChBMaXN0U2F2ZWRRdWVyaWVzEiQuYnl0ZWJhc2UudjEuTGlzdFNhdmVkUXVlcmllc1JlcXVlc3QaJS5ieXRlYmFzZS52MS5MaXN0U2F2ZWRRdWVyaWVzUmVzcG9uc2UiT9pBBnBhcmVudIrqMBJiYi53b3Jrc2hlZXRzLmxpc3SQ6jABgtPkkwImEiQvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9zYXZlZFF1ZXJpZXMSrgEKFUxpc3RTYXZlZFF1ZXJ5Rm9sZGVycxIpLmJ5dGViYXNlLnYxLkxpc3RTYXZlZFF1ZXJ5Rm9sZGVyc1JlcXVlc3QaKi5ieXRlYmFzZS52MS5MaXN0U2F2ZWRRdWVyeUZvbGRlcnNSZXNwb25zZSI+2kEGcGFyZW50kOowAoLT5JMCKxIpL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vc2F2ZWRRdWVyeUZvbGRlcnMSqgEKElNlYXJjaFNhdmVkUXVlcmllcxImLmJ5dGViYXNlLnYxLlNlYXJjaFNhdmVkUXVlcmllc1JlcXVlc3QaJy5ieXRlYmFzZS52MS5TZWFyY2hTYXZlZFF1ZXJpZXNSZXNwb25zZSJD2kEGcGFyZW50kOowAoLT5JMCMDoBKiIrL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vc2F2ZWRRdWVyaWVzOnNlYXJjaBK2AQoQVXBkYXRlU2F2ZWRRdWVyeRIkLmJ5dGViYXNlLnYxLlVwZGF0ZVNhdmVkUXVlcnlSZXF1ZXN0GhcuYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeSJj2kEXc2F2ZWRfcXVlcnksdXBkYXRlX21hc2uQ6jACgtPkkwI/OgtzYXZlZF9xdWVyeTIwL3YxL3tzYXZlZF9xdWVyeS5uYW1lPXByb2plY3RzLyovc2F2ZWRRdWVyaWVzLyp9EtwBChlVcGRhdGVTYXZlZFF1ZXJ5T3JnYW5pemVyEi0uYnl0ZWJhc2UudjEuVXBkYXRlU2F2ZWRRdWVyeU9yZ2FuaXplclJlcXVlc3QaIC5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5T3JnYW5pemVyIm7aQRVvcmdhbml6ZXIsdXBkYXRlX21hc2uQ6jACgtPkkwJMOglvcmdhbml6ZXIyPy92MS97b3JnYW5pemVyLnNhdmVkX3F1ZXJ5PXByb2plY3RzLyovc2F2ZWRRdWVyaWVzLyp9L29yZ2FuaXplchL0AQoeQmF0Y2hVcGRhdGVTYXZlZFF1ZXJ5T3JnYW5pemVyEjIuYnl0ZWJhc2UudjEuQmF0Y2hVcGRhdGVTYXZlZFF1ZXJ5T3JnYW5pemVyUmVxdWVzdBozLmJ5dGViYXNlLnYxLkJhdGNoVXBkYXRlU2F2ZWRRdWVyeU9yZ2FuaXplclJlc3BvbnNlImnaQRxwYXJlbnQsb3JnYW5pemVyLHVwZGF0ZV9tYXNrkOowAoLT5JMCQDoBKiI7L3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vc2F2ZWRRdWVyaWVzL29yZ2FuaXplcnM6YmF0Y2hVcGRhdGUSjQEKEERlbGV0ZVNhdmVkUXVlcnkSJC5ieXRlYmFzZS52MS5EZWxldGVTYXZlZFF1ZXJ5UmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSI72kEEbmFtZZDqMAKY6jABgtPkkwImKiQvdjEve25hbWU9cHJvamVjdHMvKi9zYXZlZFF1ZXJpZXMvKn1CrAEKD2NvbS5ieXRlYmFzZS52MUIWU2F2ZWRRdWVyeVNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [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+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIOCgZmaWx0ZXIYAiABKAkSEQoJcGFnZV9zaXplGAMgASgFEhIKCnBhZ2VfdG9rZW4YBCABKAkiYwoYTGlzdFNhdmVkUXVlcmllc1Jlc3BvbnNlEi4KDXNhdmVkX3F1ZXJpZXMYASADKAsyFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5EhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJeCh5TZWFyY2hTYXZlZFF1ZXJ5Rm9sZGVyc1JlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0Eg4KBmZpbHRlchgCIAEoCSIyCh9TZWFyY2hTYXZlZFF1ZXJ5Rm9sZGVyc1Jlc3BvbnNlEg8KB2ZvbGRlcnMYASADKAkifQoXVXBkYXRlU2F2ZWRRdWVyeVJlcXVlc3QSMQoLc2F2ZWRfcXVlcnkYASABKAsyFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5QgPgQQISLwoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrIkEKG1VwZGF0ZVNhdmVkUXVlcnlTdGFyUmVxdWVzdBIRCgRuYW1lGAEgASgJQgPgQQISDwoHc3RhcnJlZBgCIAEoCCKuAQoeQmF0Y2hVcGRhdGVTYXZlZFF1ZXJpZXNSZXF1ZXN0EhMKBnBhcmVudBgBIAEoCUID4EECEg4KBmZpbHRlchgCIAEoCRIxCgtzYXZlZF9xdWVyeRgDIAEoCzIXLmJ5dGViYXNlLnYxLlNhdmVkUXVlcnlCA+BBAhI0Cgt1cGRhdGVfbWFzaxgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBAiI4Ch9CYXRjaFVwZGF0ZVNhdmVkUXVlcmllc1Jlc3BvbnNlEhUKDXVwZGF0ZWRfY291bnQYASABKAUiSAoXRGVsZXRlU2F2ZWRRdWVyeVJlcXVlc3QSLQoEbmFtZRgBIAEoCUIf4EEC+kEZChdieXRlYmFzZS5jb20vU2F2ZWRRdWVyeSKAAQoZU2VhcmNoU2F2ZWRRdWVyaWVzUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSDgoGZmlsdGVyGAIgASgJEhEKCXBhZ2Vfc2l6ZRgDIAEoBRISCgpwYWdlX3Rva2VuGAQgASgJImUKGlNlYXJjaFNhdmVkUXVlcmllc1Jlc3BvbnNlEi4KDXNhdmVkX3F1ZXJpZXMYASADKAsyFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5EhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSK3AwoKU2F2ZWRRdWVyeRIUCgRuYW1lGAEgASgJQgbgQQLgQQUSFAoHcHJvamVjdBgCIAEoCUID4EEDEhAKCGRhdGFiYXNlGAMgASgJEhoKBXRpdGxlGAQgASgJQgvgQQK6SAVyAxjIARIUCgdjcmVhdG9yGAUgASgJQgPgQQMSNAoLY3JlYXRlX3RpbWUYBiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSNAoLdXBkYXRlX3RpbWUYByABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSFAoHY29udGVudBgIIAEoDEID4EECEhkKDGNvbnRlbnRfc2l6ZRgJIAEoA0ID4EEDEhQKB3N0YXJyZWQYCyABKAhCA+BBAxIYCgZmb2xkZXIYDSABKAlCCLpIBXIDGIACOkvqQUgKF2J5dGViYXNlLmNvbS9TYXZlZFF1ZXJ5Ei1wcm9qZWN0cy97cHJvamVjdH0vc2F2ZWRRdWVyaWVzL3tzYXZlZF9xdWVyeX1KBAgKEAtKBAgMEA1SCnZpc2liaWxpdHlSB2ZvbGRlcnMy0gwKEVNhdmVkUXVlcnlTZXJ2aWNlEsMBChBDcmVhdGVTYXZlZFF1ZXJ5EiQuYnl0ZWJhc2UudjEuQ3JlYXRlU2F2ZWRRdWVyeVJlcXVlc3QaFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5InDaQRJwYXJlbnQsc2F2ZWRfcXVlcnmK6jAWYmIuc2F2ZWRRdWVyaWVzLmNyZWF0ZZDqMAGY6jABgtPkkwIzOgtzYXZlZF9xdWVyeSIkL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vc2F2ZWRRdWVyaWVzEoQBCg1HZXRTYXZlZFF1ZXJ5EiEuYnl0ZWJhc2UudjEuR2V0U2F2ZWRRdWVyeVJlcXVlc3QaFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5IjfaQQRuYW1lkOowAoLT5JMCJhIkL3YxL3tuYW1lPXByb2plY3RzLyovc2F2ZWRRdWVyaWVzLyp9ErIBChBMaXN0U2F2ZWRRdWVyaWVzEiQuYnl0ZWJhc2UudjEuTGlzdFNhdmVkUXVlcmllc1JlcXVlc3QaJS5ieXRlYmFzZS52MS5MaXN0U2F2ZWRRdWVyaWVzUmVzcG9uc2UiUdpBBnBhcmVudIrqMBRiYi5zYXZlZFF1ZXJpZXMubGlzdJDqMAGC0+STAiYSJC92MS97cGFyZW50PXByb2plY3RzLyp9L3NhdmVkUXVlcmllcxKqAQoSU2VhcmNoU2F2ZWRRdWVyaWVzEiYuYnl0ZWJhc2UudjEuU2VhcmNoU2F2ZWRRdWVyaWVzUmVxdWVzdBonLmJ5dGViYXNlLnYxLlNlYXJjaFNhdmVkUXVlcmllc1Jlc3BvbnNlIkPaQQZwYXJlbnSQ6jACgtPkkwIwOgEqIisvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9zYXZlZFF1ZXJpZXM6c2VhcmNoEsABChdTZWFyY2hTYXZlZFF1ZXJ5Rm9sZGVycxIrLmJ5dGViYXNlLnYxLlNlYXJjaFNhdmVkUXVlcnlGb2xkZXJzUmVxdWVzdBosLmJ5dGViYXNlLnYxLlNlYXJjaFNhdmVkUXVlcnlGb2xkZXJzUmVzcG9uc2UiStpBBnBhcmVudJDqMAKC0+STAjc6ASoiMi92MS97cGFyZW50PXByb2plY3RzLyp9L3NhdmVkUXVlcmllczpzZWFyY2hGb2xkZXJzErYBChBVcGRhdGVTYXZlZFF1ZXJ5EiQuYnl0ZWJhc2UudjEuVXBkYXRlU2F2ZWRRdWVyeVJlcXVlc3QaFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5ImPaQRdzYXZlZF9xdWVyeSx1cGRhdGVfbWFza5DqMAKC0+STAj86C3NhdmVkX3F1ZXJ5MjAvdjEve3NhdmVkX3F1ZXJ5Lm5hbWU9cHJvamVjdHMvKi9zYXZlZFF1ZXJpZXMvKn0SqAEKFFVwZGF0ZVNhdmVkUXVlcnlTdGFyEiguYnl0ZWJhc2UudjEuVXBkYXRlU2F2ZWRRdWVyeVN0YXJSZXF1ZXN0GhcuYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeSJN2kEMbmFtZSxzdGFycmVkkOowAoLT5JMCNDoBKiIvL3YxL3tuYW1lPXByb2plY3RzLyovc2F2ZWRRdWVyaWVzLyp9OnVwZGF0ZVN0YXIS1gEKF0JhdGNoVXBkYXRlU2F2ZWRRdWVyaWVzEisuYnl0ZWJhc2UudjEuQmF0Y2hVcGRhdGVTYXZlZFF1ZXJpZXNSZXF1ZXN0GiwuYnl0ZWJhc2UudjEuQmF0Y2hVcGRhdGVTYXZlZFF1ZXJpZXNSZXNwb25zZSJg2kEecGFyZW50LHNhdmVkX3F1ZXJ5LHVwZGF0ZV9tYXNrkOowAoLT5JMCNToBKiIwL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vc2F2ZWRRdWVyaWVzOmJhdGNoVXBkYXRlEo0BChBEZWxldGVTYXZlZFF1ZXJ5EiQuYnl0ZWJhc2UudjEuRGVsZXRlU2F2ZWRRdWVyeVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiO9pBBG5hbWWQ6jACmOowAYLT5JMCJiokL3YxL3tuYW1lPXByb2plY3RzLyovc2F2ZWRRdWVyaWVzLyp9QqwBCg9jb20uYnl0ZWJhc2UudjFCFlNhdmVkUXVlcnlTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [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.@@ -46,105 +46,83 @@ export const ListSavedQueriesResponseSchema = /*@__PURE__*/messageDesc(file_v1_saved_query_service, 3);/**- * Describes the message bytebase.v1.ListSavedQueryFoldersRequest.- * Use `create(ListSavedQueryFoldersRequestSchema)` to create a new message.+ * Describes the message bytebase.v1.SearchSavedQueryFoldersRequest.+ * Use `create(SearchSavedQueryFoldersRequestSchema)` to create a new message.*/-export const ListSavedQueryFoldersRequestSchema = /*@__PURE__*/+export const SearchSavedQueryFoldersRequestSchema = /*@__PURE__*/messageDesc(file_v1_saved_query_service, 4);/**- * Describes the message bytebase.v1.ListSavedQueryFoldersResponse.- * Use `create(ListSavedQueryFoldersResponseSchema)` to create a new message.+ * Describes the message bytebase.v1.SearchSavedQueryFoldersResponse.+ * Use `create(SearchSavedQueryFoldersResponseSchema)` to create a new message.*/-export const ListSavedQueryFoldersResponseSchema = /*@__PURE__*/+export const SearchSavedQueryFoldersResponseSchema = /*@__PURE__*/messageDesc(file_v1_saved_query_service, 5);/**- * Describes the message bytebase.v1.SavedQueryFolder.- * Use `create(SavedQueryFolderSchema)` to create a new message.+ * Describes the message bytebase.v1.UpdateSavedQueryRequest.+ * Use `create(UpdateSavedQueryRequestSchema)` to create a new message.*/-export const SavedQueryFolderSchema = /*@__PURE__*/+export const UpdateSavedQueryRequestSchema = /*@__PURE__*/messageDesc(file_v1_saved_query_service, 6);/**- * Describes the enum bytebase.v1.SavedQueryFolder.Category.- */-export const SavedQueryFolder_CategorySchema = /*@__PURE__*/- enumDesc(file_v1_saved_query_service, 6, 0);--/**- * @generated from enum bytebase.v1.SavedQueryFolder.Category- */-export const SavedQueryFolder_Category = /*@__PURE__*/- tsEnum(SavedQueryFolder_CategorySchema);--/**- * Describes the message bytebase.v1.UpdateSavedQueryRequest.- * Use `create(UpdateSavedQueryRequestSchema)` to create a new message.+ * Describes the message bytebase.v1.UpdateSavedQueryStarRequest.+ * Use `create(UpdateSavedQueryStarRequestSchema)` to create a new message.*/-export const UpdateSavedQueryRequestSchema = /*@__PURE__*/+export const UpdateSavedQueryStarRequestSchema = /*@__PURE__*/messageDesc(file_v1_saved_query_service, 7);/**- * Describes the message bytebase.v1.BatchUpdateSavedQueryOrganizerRequest.- * Use `create(BatchUpdateSavedQueryOrganizerRequestSchema)` to create a new message.+ * Describes the message bytebase.v1.BatchUpdateSavedQueriesRequest.+ * Use `create(BatchUpdateSavedQueriesRequestSchema)` to create a new message.*/-export const BatchUpdateSavedQueryOrganizerRequestSchema = /*@__PURE__*/+export const BatchUpdateSavedQueriesRequestSchema = /*@__PURE__*/messageDesc(file_v1_saved_query_service, 8);/**- * Describes the message bytebase.v1.BatchUpdateSavedQueryOrganizerResponse.- * Use `create(BatchUpdateSavedQueryOrganizerResponseSchema)` to create a new message.+ * Describes the message bytebase.v1.BatchUpdateSavedQueriesResponse.+ * Use `create(BatchUpdateSavedQueriesResponseSchema)` to create a new message.*/-export const BatchUpdateSavedQueryOrganizerResponseSchema = /*@__PURE__*/+export const BatchUpdateSavedQueriesResponseSchema = /*@__PURE__*/messageDesc(file_v1_saved_query_service, 9);-/**- * Describes the message bytebase.v1.UpdateSavedQueryOrganizerRequest.- * Use `create(UpdateSavedQueryOrganizerRequestSchema)` to create a new message.- */-export const UpdateSavedQueryOrganizerRequestSchema = /*@__PURE__*/- messageDesc(file_v1_saved_query_service, 10);--/**- * Describes the message bytebase.v1.SavedQueryOrganizer.- * Use `create(SavedQueryOrganizerSchema)` to create a new message.- */-export const SavedQueryOrganizerSchema = /*@__PURE__*/- messageDesc(file_v1_saved_query_service, 11);-/*** Describes the message bytebase.v1.DeleteSavedQueryRequest.* Use `create(DeleteSavedQueryRequestSchema)` to create a new message.*/export const DeleteSavedQueryRequestSchema = /*@__PURE__*/- messageDesc(file_v1_saved_query_service, 12);+ messageDesc(file_v1_saved_query_service, 10);/*** Describes the message bytebase.v1.SearchSavedQueriesRequest.* Use `create(SearchSavedQueriesRequestSchema)` to create a new message.*/export const SearchSavedQueriesRequestSchema = /*@__PURE__*/- messageDesc(file_v1_saved_query_service, 13);+ messageDesc(file_v1_saved_query_service, 11);/*** Describes the message bytebase.v1.SearchSavedQueriesResponse.* Use `create(SearchSavedQueriesResponseSchema)` to create a new message.*/export const SearchSavedQueriesResponseSchema = /*@__PURE__*/- messageDesc(file_v1_saved_query_service, 14);+ messageDesc(file_v1_saved_query_service, 12);/*** Describes the message bytebase.v1.SavedQuery.* Use `create(SavedQuerySchema)` to create a new message.*/export const SavedQuerySchema = /*@__PURE__*/- messageDesc(file_v1_saved_query_service, 15);+ messageDesc(file_v1_saved_query_service, 13);/*** SavedQueryService manages saved queries for SQL Editor query development.- * Permission IDs still use the legacy `bb.worksheets.*` names; they are- * renamed together with the access-model redesign and its role migration.+ *+ * A saved query is private to its creator; `bb.savedQueries.manage` is the+ * admin backstop that can reach any saved query in scope. Per-object+ * VIEWER/EDITOR grants arrive with the access-model redesign, which brings+ * its own policy shapes and the GetIamPolicy/SetIamPolicy pair that manages+ * them.** @generated from service bytebase.v1.SavedQueryService*/diff --git a/frontend/src/utils/v1/savedQuery.ts b/frontend/src/utils/v1/savedQuery.tsindex 4b6d4e4a99..9980d9baa3 100644--- a/frontend/src/utils/v1/savedQuery.ts+++ b/frontend/src/utils/v1/savedQuery.ts@@ -1,8 +1,9 @@import { getCurrentUserV1 } from "@/stores";+import { getProjectByName } from "@/stores/app/projectAccess";import { extractUserEmail } from "@/stores/modules/v1/common";import { UNKNOWN_ID } from "@/types";import type { SavedQuery } from "@/types/proto-es/v1/saved_query_service_pb";-import { hasWorkspacePermissionV2 } from "@/utils";+import { hasProjectPermissionV2 } from "@/utils";export const extractSavedQueryID = (name: string) => {const pattern = /(?:^|\/)savedQueries\/([^/]+)(?:$|\/)/;@@ -10,15 +11,42 @@ export const extractSavedQueryID = (name: string) => {return matches?.[1] ?? `${UNKNOWN_ID}`;};-// Saved queries are private: only the creator, or a workspace admin holding-// "bb.worksheets.manage" (the admin backstop), can read or write one.+// Browsing saved queries takes bb.savedQueries.search on the project, or the+// admin backstop -- the same OR the server's discovery gate applies to Search+// and SearchSavedQueryFolders. A SQL role can grant query access without+// either, in which case the tree stays empty rather than firing requests that+// can only come back denied.+export const canSearchSavedQueriesInProject = (project: string) => {+ const resolved = getProjectByName(project);+ return (+ hasProjectPermissionV2(resolved, "bb.savedQueries.search") ||+ hasProjectPermissionV2(resolved, "bb.savedQueries.manage")+ );+};++// Creating a saved query takes bb.savedQueries.create on the project. A role+// can grant SQL Editor access without it, so entry points that would persist a+// new saved query check this first -- the editor stays usable, it just keeps+// the work local.+export const canCreateSavedQueryInProject = (project: string) =>+ hasProjectPermissionV2(getProjectByName(project), "bb.savedQueries.create");++// Saved queries are private: only the creator, or someone holding+// "bb.savedQueries.manage" (the admin backstop), can read or write one.// Per-object sharing arrives with the access-model redesign.+//+// The backstop is checked on the saved query's own project, mirroring the+// server: a project-level grant (Project Owner, or a custom project role)+// is enough, and the project check already falls back to workspace grants.const canAccessSavedQuery = (sheet: SavedQuery) => {const currentUser = getCurrentUserV1();if (extractUserEmail(sheet.creator) === currentUser.email) {return true;}- return hasWorkspacePermissionV2("bb.worksheets.manage");+ return hasProjectPermissionV2(+ getProjectByName(sheet.project),+ "bb.savedQueries.manage"+ );};export const isSavedQueryReadableV1 = (sheet: SavedQuery) =>diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yamlindex 10f02b5d3f..ae7e3cc1fb 100644--- a/proto/gen/grpc-doc/openapi.yaml+++ b/proto/gen/grpc-doc/openapi.yaml@@ -13690,9 +13690,11 @@ paths:- SavedQueryServicesummary: ListSavedQueriesdescription: |-- List saved queries.- This is used for listing saved queries in a project, or across all projects by using `projects/-`.- Permissions required: bb.worksheets.list+ List saved queries: the grant-independent governance surface. Supports+ listing in a project, or across all projects by using `projects/-`, with+ whole statements rather than the previews Search returns — e.g. an+ offboarding review filtering by creator.+ Permissions required: bb.savedQueries.listoperationId: SavedQueryService_ListSavedQueriesparameters:- name: project@@ -13750,8 +13752,9 @@ paths:- SavedQueryServicesummary: CreateSavedQuerydescription: |-- Creates a personal saved query used in SQL Editor. Any authenticated user can create their own saved queries.- Permissions required: None (authenticated users only)+ Creates a personal saved query used in SQL Editor. The creator becomes+ the fixed owner.+ Permissions required: bb.savedQueries.create on the parent projectoperationId: SavedQueryService_CreateSavedQueryparameters:- name: project@@ -13775,77 +13778,15 @@ paths:application/json:schema:$ref: '#/components/schemas/bytebase.v1.SavedQuery'- /v1/projects/{project}/savedQueries/organizers:batchUpdate:- post:- tags:- - SavedQueryService- summary: BatchUpdateSavedQueryOrganizer- description: |-- Batch update the organizers of saved queries.- The access is the same as UpdateSavedQuery method.- Permissions required: creator, or workspace bb.worksheets.manage- operationId: SavedQueryService_BatchUpdateSavedQueryOrganizer- parameters:- - name: project- in: path- description: The project id.- required: true- schema:- type: string- requestBody:- content:- application/json:- schema:- type: object- properties:- filter:- type: string- title: filter- description: |-- To filter the batch update target.- The syntax and semantics of CEL are documented at https://github.com/google/cel-spec-- Supported filter:- - name: the saved query name in "projects/{project}/savedQueries/{savedQuery}" format, support "==" and "in [xx]" operator.- - creator: the saved query creator in "users/{email}" format, support "==" and "!=" operator.- - starred: should be "true" or "false", filter starred/unstarred saved queries, support "==" operator.- - folder: the saved query organizer folder path, support exact "==" operator.- organizer:- title: organizer- description: The organizer fields to update.- $ref: '#/components/schemas/bytebase.v1.SavedQueryOrganizer'- updateMask:- title: update_mask- description: |-- The list of fields to be updated.- Fields are specified relative to the saved query organizer.- Only support update the following fields for now:- - `starred`- - `folders`- $ref: '#/components/schemas/google.protobuf.FieldMask'- title: BatchUpdateSavedQueryOrganizerRequest- required:- - organizer- - updateMask- additionalProperties: false- required: true- responses:- "200":- description: Success- content:- application/json:- schema:- $ref: '#/components/schemas/bytebase.v1.BatchUpdateSavedQueryOrganizerResponse'/v1/projects/{project}/savedQueries/{savedQuery}:get:tags:- SavedQueryServicesummary: GetSavedQuerydescription: |-- Get a saved query by name.- Saved queries are private: only the creator, or a caller holding- bb.worksheets.manage on the workspace, can access one.- Permissions required: creator, or workspace bb.worksheets.manage+ Get a saved query by name. Returns NotFound for saved queries the+ caller cannot read.+ Permissions required: creator, or bb.savedQueries.manage in scopeoperationId: SavedQueryService_GetSavedQueryparameters:- name: project@@ -13872,9 +13813,9 @@ paths:- SavedQueryServicesummary: DeleteSavedQuerydescription: |-- Delete a saved query.- The access is the same as UpdateSavedQuery method.- Permissions required: creator, or workspace bb.worksheets.manage+ Delete a saved query. Only the creator (or an admin) can delete.+ Returns NotFound for saved queries the caller cannot read.+ Permissions required: creator, or bb.savedQueries.manage in scopeoperationId: SavedQueryService_DeleteSavedQueryparameters:- name: project@@ -13901,9 +13842,10 @@ paths:- SavedQueryServicesummary: UpdateSavedQuerydescription: |-- Update a saved query.- The access is the same as GetSavedQuery method.- Permissions required: creator, or workspace bb.worksheets.manage+ Update a saved query. `title`, `content`, and `database` require write+ access; `folder` re-files the saved query and is creator/admin only.+ Returns NotFound for saved queries the caller cannot read.+ Permissions required: creator, or bb.savedQueries.manage in scopeoperationId: SavedQueryService_UpdateSavedQueryparameters:- name: project@@ -14145,16 +14087,19 @@ paths:application/json:schema:$ref: '#/components/schemas/bytebase.v1.SavedQuery'- /v1/projects/{project}/savedQueries/{savedQuery}/organizer:- patch:+ /v1/projects/{project}/savedQueries/{savedQuery}:updateStar:+ post:tags:- SavedQueryService- summary: UpdateSavedQueryOrganizer- description: |-- Update the organizer of a saved query.- The access is the same as UpdateSavedQuery method.- Permissions required: creator, or workspace bb.worksheets.manage- operationId: SavedQueryService_UpdateSavedQueryOrganizer+ summary: UpdateSavedQueryStar+ description: |-+ Star or unstar a saved query for the caller. A star is always the+ caller's own per-user marker — invisible to others and carrying no+ access. The only requirement is that the caller can read the saved+ query being starred (which also keeps private saved query names+ unprobeable).+ Permissions required: read access to the saved query+ operationId: SavedQueryService_UpdateSavedQueryStarparameters:- name: projectin: path@@ -14168,251 +14113,95 @@ paths:required: trueschema:type: string- - name: updateMask- in: query- description: |-- `FieldMask` represents a set of symbolic field paths, for example:-- paths: "f.a"- paths: "f.b.d"-- Here `f` represents a field in some root message, `a` and `b`- fields in the message found in `f`, and `d` a field found in the- message in `f.b`.-- Field masks are used to specify a subset of fields that should be- returned by a get operation or modified by an update operation.- Field masks also have a custom JSON encoding (see below).-- # Field Masks in Projections-- When used in the context of a projection, a response message or- sub-message is filtered by the API to only contain those fields as- specified in the mask. For example, if the mask in the previous- example is applied to a response message as follows:-- f {- a : 22- b {- d : 1- x : 2- }- y : 13- }- z: 8-- The result will not contain specific values for fields x,y and z- (their value will be set to the default, and omitted in proto text- output):--- f {- a : 22- b {- d : 1- }- }-- A repeated field is not allowed except at the last position of a- paths string.-- If a FieldMask object is not present in a get operation, the- operation applies to all fields (as if a FieldMask of all fields- had been specified).-- Note that a field mask does not necessarily apply to the- top-level response message. In case of a REST get operation, the- field mask applies directly to the response, but in case of a REST- list operation, the mask instead applies to each individual message- in the returned resource list. In case of a REST custom method,- other definitions may be used. Where the mask applies will be- clearly documented together with its declaration in the API. In- any case, the effect on the returned resource/resources is required- behavior for APIs.-- # Field Masks in Update Operations-- A field mask in update operations specifies which fields of the- targeted resource are going to be updated. The API is required- to only change the values of the fields as specified in the mask- and leave the others untouched. If a resource is passed in to- describe the updated values, the API ignores the values of all- fields not covered by the mask.-- If a repeated field is specified for an update operation, new values will- be appended to the existing repeated field in the target resource. Note that- a repeated field is only allowed in the last position of a `paths` string.-- If a sub-message is specified in the last position of the field mask for an- update operation, then new value will be merged into the existing sub-message- in the target resource.-- For example, given the target message:-- f {- b {- d: 1- x: 2- }- c: [1]- }-- And an update message:-- f {- b {- d: 10- }- c: [2]- }-- then if the field mask is:-- paths: ["f.b", "f.c"]-- then the result will be:-- f {- b {- d: 10- x: 2- }- c: [1, 2]- }-- An implementation may provide options to override this default behavior for- repeated and message fields.-- In order to reset a field's value to the default, the field must- be in the mask and set to the default value in the provided resource.- Hence, in order to reset all fields of a resource, provide a default- instance of the resource and set all fields in the mask, or do- not provide a mask as described below.-- If a field mask is not present on update, the operation applies to- all fields (as if a field mask of all fields has been specified).- Note that in the presence of schema evolution, this may mean that- fields the client does not know and has therefore not filled into- the request will be reset to their default. If this is unwanted- behavior, a specific service may require a client to always specify- a field mask, producing an error if not.-- As with get operations, the location of the resource which- describes the updated values in the request message depends on the- operation kind. In any case, the effect of the field mask is- required to be honored by the API.-- ## Considerations for HTTP REST-- The HTTP kind of an update operation which uses a field mask must- be set to PATCH instead of PUT in order to satisfy HTTP semantics- (PUT must only be used for full updates).-- # JSON Encoding of Field Masks-- In JSON, a field mask is encoded as a single string where paths are- separated by a comma. Fields name in each path are converted- to/from lower-camel naming conventions.-- As an example, consider the following message declarations:-- message Profile {- User user = 1;- Photo photo = 2;- }- message User {- string display_name = 1;- string address = 2;- }-- In proto a field mask for `Profile` may look as such:-- mask {- paths: "user.display_name"- paths: "photo"- }-- In JSON, the same mask is represented as below:-- {- mask: "user.displayName,photo"- }-- # Field Masks and Oneof Fields-- Field masks treat fields in oneofs just as regular fields. Consider the- following message:-- message SampleMessage {- oneof test_oneof {- string name = 4;- SubMessage sub_message = 9;- }- }-- The field mask can be:-- mask {- paths: "name"- }-- Or:-- mask {- paths: "sub_message"- }-- Note that oneof type names ("test_oneof" in this case) cannot be used in- paths.-- ## Field Mask Verification-- The implementation of any API method which has a FieldMask type field in the- request should verify the included field paths, and return an- `INVALID_ARGUMENT` error if any path is unmappable.+ requestBody:+ content:+ application/json:+ schema:+ type: object+ properties:+ starred:+ type: boolean+ title: starred+ description: Whether the caller stars the saved query.+ title: UpdateSavedQueryStarRequest+ additionalProperties: false+ required: true+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.SavedQuery'+ /v1/projects/{project}/savedQueries:batchUpdate:+ post:+ tags:+ - SavedQueryService+ summary: BatchUpdateSavedQueries+ description: |-+ Batch re-file saved queries into a folder. The update mask supports+ `folder` only; only rows the caller may re-file are updated (their own,+ or any in scope for admins).+ Permissions required: creator, or bb.savedQueries.manage in scope+ operationId: SavedQueryService_BatchUpdateSavedQueries+ parameters:+ - name: project+ in: path+ description: The project id.+ required: trueschema:type: string- - name: allowMissing- in: query- description: |-- If set to true, and the saved query organizer is not found, a new saved query organizer will be created.- In this situation, `update_mask` is ignored.- schema:- type: boolean- title: allow_missingrequestBody:- description: |-- The organizer to update.-- The organizer's `saved_query` field is used to identify the saved query.- Format: projects/{project}/savedQueries/{savedQuery}content:application/json:schema:- title: organizer- description: |-- The organizer to update.+ type: object+ properties:+ filter:+ type: string+ title: filter+ description: |-+ To filter the batch update target.+ The syntax and semantics of CEL are documented at https://github.com/google/cel-spec- The organizer's `saved_query` field is used to identify the saved query.- Format: projects/{project}/savedQueries/{savedQuery}- $ref: '#/components/schemas/bytebase.v1.SavedQueryOrganizer'+ Supported filter:+ - name: the saved query name in "projects/{project}/savedQueries/{savedQuery}" format, support "==" and "in [xx]" operator.+ - creator: the saved query creator in "users/{email}" format, support "==" and "!=" operator.+ - starred: should be "true" or "false", filter starred/unstarred saved queries, support "==" operator.+ - folder: the saved query folder path, support exact "==" operator.+ savedQuery:+ title: saved_query+ description: The fields to apply to every matched saved query.+ $ref: '#/components/schemas/bytebase.v1.SavedQuery'+ updateMask:+ title: update_mask+ description: |-+ The list of fields to be updated.+ Only support update the following fields for now:+ - `folder`+ $ref: '#/components/schemas/google.protobuf.FieldMask'+ title: BatchUpdateSavedQueriesRequest+ required:+ - savedQuery+ - updateMask+ additionalProperties: false+ required: trueresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.SavedQueryOrganizer'+ $ref: '#/components/schemas/bytebase.v1.BatchUpdateSavedQueriesResponse'/v1/projects/{project}/savedQueries:search:post:tags:- SavedQueryServicesummary: SearchSavedQueriesdescription: |-- Search for saved queries.- This is used for finding my saved queries in a project.- The saved query accessibility is the same as GetSavedQuery().- Permissions required: creator, or workspace bb.worksheets.manage+ Search for saved queries in a project: the SQL Editor's hot list path,+ returning only rows the caller can read, with content previews.+ Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the projectoperationId: SavedQueryService_SearchSavedQueriesparameters:- name: project@@ -14439,7 +14228,7 @@ paths:- title: the saved query title, support "contains" operator.- creator: the saved query creator in "users/{email}" format, support "==" and "!=" operator.- starred: should be "true" or "false", filter starred/unstarred saved queries, support "==" operator.- - folder: the saved query organizer folder path, support "==" operator.+ - folder: the saved query folder path, support "==" operator.For example:creator == "users/{email}"@@ -14473,15 +14262,19 @@ paths:application/json:schema:$ref: '#/components/schemas/bytebase.v1.SearchSavedQueriesResponse'- /v1/projects/{project}/savedQueryFolders:- get:+ /v1/projects/{project}/savedQueries:searchFolders:+ post:tags:- SavedQueryService- summary: ListSavedQueryFolders- description: |-- List the caller's saved query folders.- Only folders stored in the caller's saved query organizer are returned.- operationId: SavedQueryService_ListSavedQueryFolders+ summary: SearchSavedQueryFolders+ description: |-+ Search the folder paths of the caller's saved queries in a project.+ Folders are a derived view over the `folder` field rather than a+ resource collection, so this is a custom method on savedQueries and+ shares SearchSavedQueries' caller-scoped semantics — not the+ cross-creator reach of ListSavedQueries.+ Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the project+ operationId: SavedQueryService_SearchSavedQueryFoldersparameters:- name: projectin: path@@ -14489,13 +14282,35 @@ paths:required: trueschema:type: string+ requestBody:+ content:+ application/json:+ schema:+ type: object+ properties:+ filter:+ type: string+ title: filter+ description: |-+ To filter the folders by the saved queries they hold. Takes the same+ fields and syntax as `SearchSavedQueries.filter`, except `title`. A+ folder is returned when at least one saved query the caller can read+ matches, so the caller-scoping is the same as SearchSavedQueries: your+ own saved queries, plus everyone's for the admin backstop.++ For example, to split a folder tree into your own and everyone else's:+ creator == "users/{email}"+ creator != "users/{email}"+ title: SearchSavedQueryFoldersRequest+ additionalProperties: false+ required: trueresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.ListSavedQueryFoldersResponse'+ $ref: '#/components/schemas/bytebase.v1.SearchSavedQueryFoldersResponse'/v1/projects/{project}/serviceAccounts:get:tags:@@ -20233,14 +20048,14 @@ components:type: objecttitle: BatchUpdateIssuesStatusResponseadditionalProperties: false- bytebase.v1.BatchUpdateSavedQueryOrganizerRequest:+ bytebase.v1.BatchUpdateSavedQueriesRequest:type: objectproperties:parent:type: stringtitle: parentdescription: |-- The parent resource whose saved queries' organizers are updated.+ The parent resource whose saved queries are updated.Format: projects/{project}filter:type: string@@ -20253,39 +20068,33 @@ components:- name: the saved query name in "projects/{project}/savedQueries/{savedQuery}" format, support "==" and "in [xx]" operator.- creator: the saved query creator in "users/{email}" format, support "==" and "!=" operator.- starred: should be "true" or "false", filter starred/unstarred saved queries, support "==" operator.- - folder: the saved query organizer folder path, support exact "==" operator.- organizer:- title: organizer- description: The organizer fields to update.- $ref: '#/components/schemas/bytebase.v1.SavedQueryOrganizer'+ - folder: the saved query folder path, support exact "==" operator.+ savedQuery:+ title: saved_query+ description: The fields to apply to every matched saved query.+ $ref: '#/components/schemas/bytebase.v1.SavedQuery'updateMask:title: update_maskdescription: |-The list of fields to be updated.- Fields are specified relative to the saved query organizer.Only support update the following fields for now:- - `starred`- - `folders`+ - `folder`$ref: '#/components/schemas/google.protobuf.FieldMask'- title: BatchUpdateSavedQueryOrganizerRequest+ title: BatchUpdateSavedQueriesRequestrequired:- parent- - organizer+ - savedQuery- updateMaskadditionalProperties: false- bytebase.v1.BatchUpdateSavedQueryOrganizerResponse:+ bytebase.v1.BatchUpdateSavedQueriesResponse:type: objectproperties:- savedQueryOrganizers:- type: array- items:- $ref: '#/components/schemas/bytebase.v1.SavedQueryOrganizer'- title: saved_query_organizersupdatedCount:type: integertitle: updated_countformat: int32- title: BatchUpdateSavedQueryOrganizerResponse+ description: The number of saved queries updated.+ title: BatchUpdateSavedQueriesResponseadditionalProperties: falsebytebase.v1.BillingInterval:type: string@@ -25737,30 +25546,6 @@ components:`ListSavedQueries` method to retrieve the next page of saved queries.title: ListSavedQueriesResponseadditionalProperties: false- bytebase.v1.ListSavedQueryFoldersRequest:- type: object- properties:- parent:- type: string- title: parent- description: |-- The parent resource of the saved query folders.- Format: projects/{project}- title: ListSavedQueryFoldersRequest- required:- - parent- additionalProperties: false- bytebase.v1.ListSavedQueryFoldersResponse:- type: object- properties:- folders:- type: array- items:- $ref: '#/components/schemas/bytebase.v1.SavedQueryFolder'- title: folders- description: The caller's saved query folders.- title: ListSavedQueryFoldersResponse- additionalProperties: falsebytebase.v1.ListServiceAccountsRequest:type: objectproperties:@@ -29015,7 +28800,8 @@ components:type: stringtitle: creatordescription: |-- The creator of the SavedQuery.+ The creator of the SavedQuery — the fixed owner; ownership does not+ transfer.Format: users/{email}readOnly: truecreateTime:@@ -29049,63 +28835,20 @@ components:title: starreddescription: starred indicates whether the saved query is starred by the current authenticated user.readOnly: true- folders:- type: array- items:- type: string- readOnly: true- title: folders- readOnly: true+ folder:+ type: string+ title: folder+ maxLength: 256+ description: |-+ The folder path this saved query lives in, set by its creator (or an+ admin). Empty means unfiled. A saved query lives in exactly one folder;+ a folder is a path on saved queries, e.g. "a/b/c".title: SavedQueryrequired:- name- title- contentadditionalProperties: false- bytebase.v1.SavedQueryFolder:- type: object- properties:- folders:- type: array- items:- type: string- title: folders- description: The folder path segments.- category:- title: category- description: The folder category.- $ref: '#/components/schemas/bytebase.v1.SavedQueryFolder.Category'- title: SavedQueryFolder- additionalProperties: false- bytebase.v1.SavedQueryFolder.Category:- type: string- title: Category- enum:- - CATEGORY_UNSPECIFIED- - MINE- - SHARED- bytebase.v1.SavedQueryOrganizer:- type: object- properties:- savedQuery:- type: string- title: saved_query- description: |-- The name of the saved query.- Format: projects/{project}/savedQueries/{savedQuery}- starred:- type: boolean- title: starred- description: starred means if the saved query is starred.- folders:- type: array- items:- type: string- title: folders- title: SavedQueryOrganizer- required:- - savedQuery- additionalProperties: falsebytebase.v1.SchemaCatalog:type: objectproperties:@@ -29599,7 +29342,7 @@ components:- title: the saved query title, support "contains" operator.- creator: the saved query creator in "users/{email}" format, support "==" and "!=" operator.- starred: should be "true" or "false", filter starred/unstarred saved queries, support "==" operator.- - folder: the saved query organizer folder path, support "==" operator.+ - folder: the saved query folder path, support "==" operator.For example:creator == "users/{email}"@@ -29645,6 +29388,46 @@ components:`SearchSavedQueries` method to retrieve the next page of saved queries.title: SearchSavedQueriesResponseadditionalProperties: false+ bytebase.v1.SearchSavedQueryFoldersRequest:+ type: object+ properties:+ parent:+ type: string+ title: parent+ description: |-+ The parent resource whose saved query folders are searched.+ Format: projects/{project}+ filter:+ type: string+ title: filter+ description: |-+ To filter the folders by the saved queries they hold. Takes the same+ fields and syntax as `SearchSavedQueries.filter`, except `title`. A+ folder is returned when at least one saved query the caller can read+ matches, so the caller-scoping is the same as SearchSavedQueries: your+ own saved queries, plus everyone's for the admin backstop.++ For example, to split a folder tree into your own and everyone else's:+ creator == "users/{email}"+ creator != "users/{email}"+ title: SearchSavedQueryFoldersRequest+ required:+ - parent+ additionalProperties: false+ bytebase.v1.SearchSavedQueryFoldersResponse:+ type: object+ properties:+ folders:+ type: array+ items:+ type: string+ title: folders+ description: |-+ The caller's folder paths, including every ancestor prefix, sorted.+ A folder is a path on saved queries ("a/b/c"), so empty folders cannot+ exist.+ title: SearchSavedQueryFoldersResponse+ additionalProperties: falsebytebase.v1.SemanticTypeSetting:type: objectproperties:@@ -32046,35 +31829,6 @@ components:required:- roleadditionalProperties: false- bytebase.v1.UpdateSavedQueryOrganizerRequest:- type: object- properties:- organizer:- title: organizer- description: |-- The organizer to update.-- The organizer's `saved_query` field is used to identify the saved query.- Format: projects/{project}/savedQueries/{savedQuery}- $ref: '#/components/schemas/bytebase.v1.SavedQueryOrganizer'- updateMask:- title: update_mask- description: |-- The list of fields to be updated.- Fields are specified relative to the saved query organizer.- Only support update the following fields for now:- - `starred`- $ref: '#/components/schemas/google.protobuf.FieldMask'- allowMissing:- type: boolean- title: allow_missing- description: |-- If set to true, and the saved query organizer is not found, a new saved query organizer will be created.- In this situation, `update_mask` is ignored.- title: UpdateSavedQueryOrganizerRequest- required:- - organizer- additionalProperties: falsebytebase.v1.UpdateSavedQueryRequest:type: objectproperties:@@ -32096,11 +31850,29 @@ components:- `title`- `content`- `database`+ - `folder`$ref: '#/components/schemas/google.protobuf.FieldMask'title: UpdateSavedQueryRequestrequired:- savedQueryadditionalProperties: false+ bytebase.v1.UpdateSavedQueryStarRequest:+ type: object+ properties:+ name:+ type: string+ title: name+ description: |-+ The name of the saved query to star or unstar.+ Format: projects/{project}/savedQueries/{savedQuery}+ starred:+ type: boolean+ title: starred+ description: Whether the caller stars the saved query.+ title: UpdateSavedQueryStarRequest+ required:+ - name+ additionalProperties: falsebytebase.v1.UpdateServiceAccountRequest:type: objectproperties:@@ -34162,8 +33934,12 @@ tags:- name: SavedQueryServicedescription: |-SavedQueryService manages saved queries for SQL Editor query development.- Permission IDs still use the legacy `bb.worksheets.*` names; they are- renamed together with the access-model redesign and its role migration.++ A saved query is private to its creator; `bb.savedQueries.manage` is the+ admin backstop that can reach any saved query in scope. Per-object+ VIEWER/EDITOR grants arrive with the access-model redesign, which brings+ its own policy shapes and the GetIamPolicy/SetIamPolicy pair that manages+ them.- name: ServiceAccountServicedescription: ServiceAccountService manages service accounts for API integrations.- name: SheetServicediff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.mdindex 5012c9a8b1..e8fedcb282 100644--- a/proto/gen/grpc-doc/store/README.md+++ b/proto/gen/grpc-doc/store/README.md@@ -244,7 +244,6 @@- [RolePermissions](#bytebase-store-RolePermissions)- [store/saved_query.proto](#store_saved_query-proto)- - [SavedQueryOrganizerPayload](#bytebase-store-SavedQueryOrganizerPayload)- [SavedQueryPayload](#bytebase-store-SavedQueryPayload)- [store/server_config.proto](#store_server_config-proto)@@ -4143,22 +4142,6 @@ The severity level for SQL review rules.-<a name="bytebase-store-SavedQueryOrganizerPayload"></a>--### SavedQueryOrganizerPayload----| Field | Type | Label | Description |-| ----- | ---- | ----- | ----------- |-| starred | [bool](#bool) | | |-| folders | [string](#string) | repeated | The folder path for a saved query. For example, if the folders is [A, B, C], means the saved query is in the A/B/C subfolder. |------<a name="bytebase-store-SavedQueryPayload"></a>### SavedQueryPayloaddiff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.htmlindex 478a289db7..83bc2014d6 100644--- a/proto/gen/grpc-doc/store/index.html+++ b/proto/gen/grpc-doc/store/index.html@@ -1154,10 +1154,6 @@<a href="#store%2fsaved_query.proto">store/saved_query.proto</a><ul>- <li>- <a href="#bytebase.store.SavedQueryOrganizerPayload"><span class="badge">M</span>SavedQueryOrganizerPayload</a>- </li>-<li><a href="#bytebase.store.SavedQueryPayload"><span class="badge">M</span>SavedQueryPayload</a></li>@@ -11708,38 +11704,6 @@ unreadable and the revision carries no sheet name. </p></td><p></p>- <h3 id="bytebase.store.SavedQueryOrganizerPayload">SavedQueryOrganizerPayload</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>starred</td>- <td><a href="#bool">bool</a></td>- <td></td>- <td><p> </p></td>- </tr>-- <tr>- <td>folders</td>- <td><a href="#string">string</a></td>- <td>repeated</td>- <td><p>The folder path for a saved query.-For example, if the folders is [A, B, C], means the saved query is in the A/B/C subfolder. </p></td>- </tr>-- </tbody>- </table>-----<h3 id="bytebase.store.SavedQueryPayload">SavedQueryPayload</h3><p></p>diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex e78d1dd02e..3fcb8e4229 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -679,24 +679,20 @@- [RoleService](#bytebase-v1-RoleService)- [v1/saved_query_service.proto](#v1_saved_query_service-proto)- - [BatchUpdateSavedQueryOrganizerRequest](#bytebase-v1-BatchUpdateSavedQueryOrganizerRequest)- - [BatchUpdateSavedQueryOrganizerResponse](#bytebase-v1-BatchUpdateSavedQueryOrganizerResponse)+ - [BatchUpdateSavedQueriesRequest](#bytebase-v1-BatchUpdateSavedQueriesRequest)+ - [BatchUpdateSavedQueriesResponse](#bytebase-v1-BatchUpdateSavedQueriesResponse)- [CreateSavedQueryRequest](#bytebase-v1-CreateSavedQueryRequest)- [DeleteSavedQueryRequest](#bytebase-v1-DeleteSavedQueryRequest)- [GetSavedQueryRequest](#bytebase-v1-GetSavedQueryRequest)- [ListSavedQueriesRequest](#bytebase-v1-ListSavedQueriesRequest)- [ListSavedQueriesResponse](#bytebase-v1-ListSavedQueriesResponse)- - [ListSavedQueryFoldersRequest](#bytebase-v1-ListSavedQueryFoldersRequest)- - [ListSavedQueryFoldersResponse](#bytebase-v1-ListSavedQueryFoldersResponse)- [SavedQuery](#bytebase-v1-SavedQuery)- - [SavedQueryFolder](#bytebase-v1-SavedQueryFolder)- - [SavedQueryOrganizer](#bytebase-v1-SavedQueryOrganizer)- [SearchSavedQueriesRequest](#bytebase-v1-SearchSavedQueriesRequest)- [SearchSavedQueriesResponse](#bytebase-v1-SearchSavedQueriesResponse)- - [UpdateSavedQueryOrganizerRequest](#bytebase-v1-UpdateSavedQueryOrganizerRequest)+ - [SearchSavedQueryFoldersRequest](#bytebase-v1-SearchSavedQueryFoldersRequest)+ - [SearchSavedQueryFoldersResponse](#bytebase-v1-SearchSavedQueryFoldersResponse)- [UpdateSavedQueryRequest](#bytebase-v1-UpdateSavedQueryRequest)-- - [SavedQueryFolder.Category](#bytebase-v1-SavedQueryFolder-Category)+ - [UpdateSavedQueryStarRequest](#bytebase-v1-UpdateSavedQueryStarRequest)- [SavedQueryService](#bytebase-v1-SavedQueryService)@@ -11048,36 +11044,35 @@ RoleService manages workspace roles and permissions.-<a name="bytebase-v1-BatchUpdateSavedQueryOrganizerRequest"></a>+<a name="bytebase-v1-BatchUpdateSavedQueriesRequest"></a>-### BatchUpdateSavedQueryOrganizerRequest+### BatchUpdateSavedQueriesRequest| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| parent | [string](#string) | | The parent resource whose saved queries' organizers are updated. Format: projects/{project} |+| parent | [string](#string) | | The parent resource whose saved queries are updated. Format: projects/{project} || filter | [string](#string) | | To filter the batch update target. The syntax and semantics of CEL are documented at https://github.com/google/cel-spec-Supported filter: - name: the saved query name in "projects/{project}/savedQueries/{savedQuery}" format, support "==" and "in [xx]" operator. - creator: the saved query creator in "users/{email}" format, support "==" and "!=" operator. - starred: should be "true" or "false", filter starred/unstarred saved queries, support "==" operator. - folder: the saved query organizer folder path, support exact "==" operator. |-| organizer | [SavedQueryOrganizer](#bytebase-v1-SavedQueryOrganizer) | | The organizer fields to update. |-| update_mask | [google.protobuf.FieldMask](#google-protobuf-FieldMask) | | The list of fields to be updated. Fields are specified relative to the saved query organizer. Only support update the following fields for now: - `starred` - `folders` |+Supported filter: - name: the saved query name in "projects/{project}/savedQueries/{savedQuery}" format, support "==" and "in [xx]" operator. - creator: the saved query creator in "users/{email}" format, support "==" and "!=" operator. - starred: should be "true" or "false", filter starred/unstarred saved queries, support "==" operator. - folder: the saved query folder path, support exact "==" operator. |+| saved_query | [SavedQuery](#bytebase-v1-SavedQuery) | | The fields to apply to every matched saved query. |+| update_mask | [google.protobuf.FieldMask](#google-protobuf-FieldMask) | | The list of fields to be updated. Only support update the following fields for now: - `folder` |-<a name="bytebase-v1-BatchUpdateSavedQueryOrganizerResponse"></a>+<a name="bytebase-v1-BatchUpdateSavedQueriesResponse"></a>-### BatchUpdateSavedQueryOrganizerResponse+### BatchUpdateSavedQueriesResponse| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| saved_query_organizers | [SavedQueryOrganizer](#bytebase-v1-SavedQueryOrganizer) | repeated | |-| updated_count | [int32](#int32) | | |+| updated_count | [int32](#int32) | | The number of saved queries updated. |@@ -11170,36 +11165,6 @@ When paginating, all other parameters provided to `ListSavedQueries` must match-<a name="bytebase-v1-ListSavedQueryFoldersRequest"></a>--### ListSavedQueryFoldersRequest----| Field | Type | Label | Description |-| ----- | ---- | ----- | ----------- |-| parent | [string](#string) | | The parent resource of the saved query folders. Format: projects/{project} |-------<a name="bytebase-v1-ListSavedQueryFoldersResponse"></a>--### ListSavedQueryFoldersResponse----| Field | Type | Label | Description |-| ----- | ---- | ----- | ----------- |-| folders | [SavedQueryFolder](#bytebase-v1-SavedQueryFolder) | repeated | The caller's saved query folders. |------<a name="bytebase-v1-SavedQuery"></a>### SavedQuery@@ -11212,121 +11177,118 @@ When paginating, all other parameters provided to `ListSavedQueries` must match| project | [string](#string) | | The project resource name. Format: projects/{project} || database | [string](#string) | | The database resource name. Format: instances/{instance}/databases/{database} If the database parent doesn't exist, the database field is empty. || title | [string](#string) | | The title of the saved query. |-| creator | [string](#string) | | The creator of the SavedQuery. Format: users/{email} |+| creator | [string](#string) | | The creator of the SavedQuery — the fixed owner; ownership does not transfer. Format: users/{email} || create_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | The create time of the saved query. || update_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | The last update time of the saved query. || content | [bytes](#bytes) | | The content of the saved query. By default, it will be cut off in SearchSavedQueries() method. If it doesn't match the `content_size`, you can use GetSavedQuery() request to retrieve the full content. || content_size | [int64](#int64) | | content_size is the full size of the content, may not match the size of the `content` field. || starred | [bool](#bool) | | starred indicates whether the saved query is starred by the current authenticated user. |-| folders | [string](#string) | repeated | |+| folder | [string](#string) | | The folder path this saved query lives in, set by its creator (or an admin). Empty means unfiled. A saved query lives in exactly one folder; a folder is a path on saved queries, e.g. "a/b/c". |-<a name="bytebase-v1-SavedQueryFolder"></a>+<a name="bytebase-v1-SearchSavedQueriesRequest"></a>-### SavedQueryFolder+### SearchSavedQueriesRequest| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| folders | [string](#string) | repeated | The folder path segments. |-| category | [SavedQueryFolder.Category](#bytebase-v1-SavedQueryFolder-Category) | | The folder category. |+| parent | [string](#string) | | The parent resource of the saved queries. Format: projects/{project} |+| filter | [string](#string) | | To filter the search result. The syntax and semantics of CEL are documented at https://github.com/google/cel-spec++Supported filter: - name: the saved query name in "projects/{project}/savedQueries/{savedQuery}" format, support "==" and "in [xx]" operator. - title: the saved query title, support "contains" operator. - creator: the saved query creator in "users/{email}" format, support "==" and "!=" operator. - starred: should be "true" or "false", filter starred/unstarred saved queries, support "==" operator. - folder: the saved query folder path, support "==" operator.++For example: creator == "users/{email}" title.contains("saved query title") creator != "users/{email}" starred == true starred == false folder == "foo/bar" |+| page_size | [int32](#int32) | | The maximum number of saved queries to return. The service may return fewer than this value. If unspecified, at most 10 saved queries will be returned. The maximum value is 1000; values above 1000 will be coerced to 1000. |+| page_token | [string](#string) | | A page token, received from a previous `SearchSavedQueries` call. Provide this to retrieve the subsequent page. |-<a name="bytebase-v1-SavedQueryOrganizer"></a>+<a name="bytebase-v1-SearchSavedQueriesResponse"></a>-### SavedQueryOrganizer+### SearchSavedQueriesResponse| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| saved_query | [string](#string) | | The name of the saved query. Format: projects/{project}/savedQueries/{savedQuery} |-| starred | [bool](#bool) | | starred means if the saved query is starred. |-| folders | [string](#string) | repeated | |+| saved_queries | [SavedQuery](#bytebase-v1-SavedQuery) | repeated | The saved queries that matched the search criteria. |+| next_page_token | [string](#string) | | A token to retrieve next page of saved queries. Pass this value in the page_token field in the subsequent call to `SearchSavedQueries` method to retrieve the next page of saved queries. |-<a name="bytebase-v1-SearchSavedQueriesRequest"></a>+<a name="bytebase-v1-SearchSavedQueryFoldersRequest"></a>-### SearchSavedQueriesRequest+### SearchSavedQueryFoldersRequest| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| parent | [string](#string) | | The parent resource of the saved queries. Format: projects/{project} |-| filter | [string](#string) | | To filter the search result. The syntax and semantics of CEL are documented at https://github.com/google/cel-spec+| parent | [string](#string) | | The parent resource whose saved query folders are searched. Format: projects/{project} |+| filter | [string](#string) | | To filter the folders by the saved queries they hold. Takes the same fields and syntax as `SearchSavedQueries.filter`, except `title`. A folder is returned when at least one saved query the caller can read matches, so the caller-scoping is the same as SearchSavedQueries: your own saved queries, plus everyone's for the admin backstop.-Supported filter: - name: the saved query name in "projects/{project}/savedQueries/{savedQuery}" format, support "==" and "in [xx]" operator. - title: the saved query title, support "contains" operator. - creator: the saved query creator in "users/{email}" format, support "==" and "!=" operator. - starred: should be "true" or "false", filter starred/unstarred saved queries, support "==" operator. - folder: the saved query organizer folder path, support "==" operator.+For example, to split a folder tree into your own and everyone else's: creator == "users/{email}" creator != "users/{email}" |-For example: creator == "users/{email}" title.contains("saved query title") creator != "users/{email}" starred == true starred == false folder == "foo/bar" |-| page_size | [int32](#int32) | | The maximum number of saved queries to return. The service may return fewer than this value. If unspecified, at most 10 saved queries will be returned. The maximum value is 1000; values above 1000 will be coerced to 1000. |-| page_token | [string](#string) | | A page token, received from a previous `SearchSavedQueries` call. Provide this to retrieve the subsequent page. |+<a name="bytebase-v1-SearchSavedQueryFoldersResponse"></a>-<a name="bytebase-v1-SearchSavedQueriesResponse"></a>--### SearchSavedQueriesResponse+### SearchSavedQueryFoldersResponse| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| saved_queries | [SavedQuery](#bytebase-v1-SavedQuery) | repeated | The saved queries that matched the search criteria. |-| next_page_token | [string](#string) | | A token to retrieve next page of saved queries. Pass this value in the page_token field in the subsequent call to `SearchSavedQueries` method to retrieve the next page of saved queries. |+| folders | [string](#string) | repeated | The caller's folder paths, including every ancestor prefix, sorted. A folder is a path on saved queries ("a/b/c"), so empty folders cannot exist. |-<a name="bytebase-v1-UpdateSavedQueryOrganizerRequest"></a>+<a name="bytebase-v1-UpdateSavedQueryRequest"></a>-### UpdateSavedQueryOrganizerRequest+### UpdateSavedQueryRequest| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| organizer | [SavedQueryOrganizer](#bytebase-v1-SavedQueryOrganizer) | | The organizer to update.+| saved_query | [SavedQuery](#bytebase-v1-SavedQuery) | | The saved query to update.-The organizer's `saved_query` field is used to identify the saved query. Format: projects/{project}/savedQueries/{savedQuery} |-| update_mask | [google.protobuf.FieldMask](#google-protobuf-FieldMask) | | The list of fields to be updated. Fields are specified relative to the saved query organizer. Only support update the following fields for now: - `starred` |-| allow_missing | [bool](#bool) | | If set to true, and the saved query organizer is not found, a new saved query organizer will be created. In this situation, `update_mask` is ignored. |+The saved query's `name` field is used to identify the saved query to update. Format: projects/{project}/savedQueries/{savedQuery} |+| update_mask | [google.protobuf.FieldMask](#google-protobuf-FieldMask) | | The list of fields to be updated. Fields are specified relative to the saved query. (e.g., `title`, `content`; *not* `saved_query.title` or `saved_query.content`) Only support update the following fields for now: - `title` - `content` - `database` - `folder` |-<a name="bytebase-v1-UpdateSavedQueryRequest"></a>+<a name="bytebase-v1-UpdateSavedQueryStarRequest"></a>-### UpdateSavedQueryRequest+### UpdateSavedQueryStarRequest| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| saved_query | [SavedQuery](#bytebase-v1-SavedQuery) | | The saved query to update.--The saved query's `name` field is used to identify the saved query to update. Format: projects/{project}/savedQueries/{savedQuery} |-| update_mask | [google.protobuf.FieldMask](#google-protobuf-FieldMask) | | The list of fields to be updated. Fields are specified relative to the saved query. (e.g., `title`, `content`; *not* `saved_query.title` or `saved_query.content`) Only support update the following fields for now: - `title` - `content` - `database` |+| name | [string](#string) | | The name of the saved query to star or unstar. Format: projects/{project}/savedQueries/{savedQuery} |+| starred | [bool](#bool) | | Whether the caller stars the saved query. |@@ -11334,19 +11296,6 @@ The saved query's `name` field is used to identify the saved query to update--<a name="bytebase-v1-SavedQueryFolder-Category"></a>--### SavedQueryFolder.Category---| Name | Number | Description |-| ---- | ------ | ----------- |-| CATEGORY_UNSPECIFIED | 0 | |-| MINE | 1 | |-| SHARED | 2 | |--@@ -11356,20 +11305,24 @@ The saved query's `name` field is used to identify the saved query to update### SavedQueryServiceSavedQueryService manages saved queries for SQL Editor query development.-Permission IDs still use the legacy `bb.worksheets.*` names; they are-renamed together with the access-model redesign and its role migration.++A saved query is private to its creator; `bb.savedQueries.manage` is the+admin backstop that can reach any saved query in scope. Per-object+VIEWER/EDITOR grants arrive with the access-model redesign, which brings+its own policy shapes and the GetIamPolicy/SetIamPolicy pair that manages+them.| Method Name | Request Type | Response Type | Description || ----------- | ------------ | ------------- | ------------|-| CreateSavedQuery | [CreateSavedQueryRequest](#bytebase-v1-CreateSavedQueryRequest) | [SavedQuery](#bytebase-v1-SavedQuery) | Creates a personal saved query used in SQL Editor. Any authenticated user can create their own saved queries. Permissions required: None (authenticated users only) |-| GetSavedQuery | [GetSavedQueryRequest](#bytebase-v1-GetSavedQueryRequest) | [SavedQuery](#bytebase-v1-SavedQuery) | Get a saved query by name. Saved queries are private: only the creator, or a caller holding bb.worksheets.manage on the workspace, can access one. Permissions required: creator, or workspace bb.worksheets.manage |-| ListSavedQueries | [ListSavedQueriesRequest](#bytebase-v1-ListSavedQueriesRequest) | [ListSavedQueriesResponse](#bytebase-v1-ListSavedQueriesResponse) | List saved queries. This is used for listing saved queries in a project, or across all projects by using `projects/-`. Permissions required: bb.worksheets.list |-| ListSavedQueryFolders | [ListSavedQueryFoldersRequest](#bytebase-v1-ListSavedQueryFoldersRequest) | [ListSavedQueryFoldersResponse](#bytebase-v1-ListSavedQueryFoldersResponse) | List the caller's saved query folders. Only folders stored in the caller's saved query organizer are returned. |-| SearchSavedQueries | [SearchSavedQueriesRequest](#bytebase-v1-SearchSavedQueriesRequest) | [SearchSavedQueriesResponse](#bytebase-v1-SearchSavedQueriesResponse) | Search for saved queries. This is used for finding my saved queries in a project. The saved query accessibility is the same as GetSavedQuery(). Permissions required: creator, or workspace bb.worksheets.manage |-| UpdateSavedQuery | [UpdateSavedQueryRequest](#bytebase-v1-UpdateSavedQueryRequest) | [SavedQuery](#bytebase-v1-SavedQuery) | Update a saved query. The access is the same as GetSavedQuery method. Permissions required: creator, or workspace bb.worksheets.manage |-| UpdateSavedQueryOrganizer | [UpdateSavedQueryOrganizerRequest](#bytebase-v1-UpdateSavedQueryOrganizerRequest) | [SavedQueryOrganizer](#bytebase-v1-SavedQueryOrganizer) | Update the organizer of a saved query. The access is the same as UpdateSavedQuery method. Permissions required: creator, or workspace bb.worksheets.manage |-| BatchUpdateSavedQueryOrganizer | [BatchUpdateSavedQueryOrganizerRequest](#bytebase-v1-BatchUpdateSavedQueryOrganizerRequest) | [BatchUpdateSavedQueryOrganizerResponse](#bytebase-v1-BatchUpdateSavedQueryOrganizerResponse) | Batch update the organizers of saved queries. The access is the same as UpdateSavedQuery method. Permissions required: creator, or workspace bb.worksheets.manage |-| DeleteSavedQuery | [DeleteSavedQueryRequest](#bytebase-v1-DeleteSavedQueryRequest) | [.google.protobuf.Empty](#google-protobuf-Empty) | Delete a saved query. The access is the same as UpdateSavedQuery method. Permissions required: creator, or workspace bb.worksheets.manage |+| CreateSavedQuery | [CreateSavedQueryRequest](#bytebase-v1-CreateSavedQueryRequest) | [SavedQuery](#bytebase-v1-SavedQuery) | Creates a personal saved query used in SQL Editor. The creator becomes the fixed owner. Permissions required: bb.savedQueries.create on the parent project |+| GetSavedQuery | [GetSavedQueryRequest](#bytebase-v1-GetSavedQueryRequest) | [SavedQuery](#bytebase-v1-SavedQuery) | Get a saved query by name. Returns NotFound for saved queries the caller cannot read. Permissions required: creator, or bb.savedQueries.manage in scope |+| ListSavedQueries | [ListSavedQueriesRequest](#bytebase-v1-ListSavedQueriesRequest) | [ListSavedQueriesResponse](#bytebase-v1-ListSavedQueriesResponse) | List saved queries: the grant-independent governance surface. Supports listing in a project, or across all projects by using `projects/-`, with whole statements rather than the previews Search returns — e.g. an offboarding review filtering by creator. Permissions required: bb.savedQueries.list |+| SearchSavedQueries | [SearchSavedQueriesRequest](#bytebase-v1-SearchSavedQueriesRequest) | [SearchSavedQueriesResponse](#bytebase-v1-SearchSavedQueriesResponse) | Search for saved queries in a project: the SQL Editor's hot list path, returning only rows the caller can read, with content previews. Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the project |+| SearchSavedQueryFolders | [SearchSavedQueryFoldersRequest](#bytebase-v1-SearchSavedQueryFoldersRequest) | [SearchSavedQueryFoldersResponse](#bytebase-v1-SearchSavedQueryFoldersResponse) | Search the folder paths of the caller's saved queries in a project. Folders are a derived view over the `folder` field rather than a resource collection, so this is a custom method on savedQueries and shares SearchSavedQueries' caller-scoped semantics — not the cross-creator reach of ListSavedQueries. Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the project |+| UpdateSavedQuery | [UpdateSavedQueryRequest](#bytebase-v1-UpdateSavedQueryRequest) | [SavedQuery](#bytebase-v1-SavedQuery) | Update a saved query. `title`, `content`, and `database` require write access; `folder` re-files the saved query and is creator/admin only. Returns NotFound for saved queries the caller cannot read. Permissions required: creator, or bb.savedQueries.manage in scope |+| UpdateSavedQueryStar | [UpdateSavedQueryStarRequest](#bytebase-v1-UpdateSavedQueryStarRequest) | [SavedQuery](#bytebase-v1-SavedQuery) | Star or unstar a saved query for the caller. A star is always the caller's own per-user marker — invisible to others and carrying no access. The only requirement is that the caller can read the saved query being starred (which also keeps private saved query names unprobeable). Permissions required: read access to the saved query |+| BatchUpdateSavedQueries | [BatchUpdateSavedQueriesRequest](#bytebase-v1-BatchUpdateSavedQueriesRequest) | [BatchUpdateSavedQueriesResponse](#bytebase-v1-BatchUpdateSavedQueriesResponse) | Batch re-file saved queries into a folder. The update mask supports `folder` only; only rows the caller may re-file are updated (their own, or any in scope for admins). Permissions required: creator, or bb.savedQueries.manage in scope |+| DeleteSavedQuery | [DeleteSavedQueryRequest](#bytebase-v1-DeleteSavedQueryRequest) | [.google.protobuf.Empty](#google-protobuf-Empty) | Delete a saved query. Only the creator (or an admin) can delete. Returns NotFound for saved queries the caller cannot read. Permissions required: creator, or bb.savedQueries.manage in scope |diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex 717898dba2..6824ef4066 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -2761,11 +2761,11 @@<ul><li>- <a href="#bytebase.v1.BatchUpdateSavedQueryOrganizerRequest"><span class="badge">M</span>BatchUpdateSavedQueryOrganizerRequest</a>+ <a href="#bytebase.v1.BatchUpdateSavedQueriesRequest"><span class="badge">M</span>BatchUpdateSavedQueriesRequest</a></li><li>- <a href="#bytebase.v1.BatchUpdateSavedQueryOrganizerResponse"><span class="badge">M</span>BatchUpdateSavedQueryOrganizerResponse</a>+ <a href="#bytebase.v1.BatchUpdateSavedQueriesResponse"><span class="badge">M</span>BatchUpdateSavedQueriesResponse</a></li><li>@@ -2788,49 +2788,37 @@<a href="#bytebase.v1.ListSavedQueriesResponse"><span class="badge">M</span>ListSavedQueriesResponse</a></li>- <li>- <a href="#bytebase.v1.ListSavedQueryFoldersRequest"><span class="badge">M</span>ListSavedQueryFoldersRequest</a>- </li>-- <li>- <a href="#bytebase.v1.ListSavedQueryFoldersResponse"><span class="badge">M</span>ListSavedQueryFoldersResponse</a>- </li>-<li><a href="#bytebase.v1.SavedQuery"><span class="badge">M</span>SavedQuery</a></li><li>- <a href="#bytebase.v1.SavedQueryFolder"><span class="badge">M</span>SavedQueryFolder</a>- </li>-- <li>- <a href="#bytebase.v1.SavedQueryOrganizer"><span class="badge">M</span>SavedQueryOrganizer</a>+ <a href="#bytebase.v1.SearchSavedQueriesRequest"><span class="badge">M</span>SearchSavedQueriesRequest</a></li><li>- <a href="#bytebase.v1.SearchSavedQueriesRequest"><span class="badge">M</span>SearchSavedQueriesRequest</a>+ <a href="#bytebase.v1.SearchSavedQueriesResponse"><span class="badge">M</span>SearchSavedQueriesResponse</a></li><li>- <a href="#bytebase.v1.SearchSavedQueriesResponse"><span class="badge">M</span>SearchSavedQueriesResponse</a>+ <a href="#bytebase.v1.SearchSavedQueryFoldersRequest"><span class="badge">M</span>SearchSavedQueryFoldersRequest</a></li><li>- <a href="#bytebase.v1.UpdateSavedQueryOrganizerRequest"><span class="badge">M</span>UpdateSavedQueryOrganizerRequest</a>+ <a href="#bytebase.v1.SearchSavedQueryFoldersResponse"><span class="badge">M</span>SearchSavedQueryFoldersResponse</a></li><li><a href="#bytebase.v1.UpdateSavedQueryRequest"><span class="badge">M</span>UpdateSavedQueryRequest</a></li>-<li>- <a href="#bytebase.v1.SavedQueryFolder.Category"><span class="badge">E</span>SavedQueryFolder.Category</a>+ <a href="#bytebase.v1.UpdateSavedQueryStarRequest"><span class="badge">M</span>UpdateSavedQueryStarRequest</a></li>+<li><a href="#bytebase.v1.SavedQueryService"><span class="badge">S</span>SavedQueryService</a></li>@@ -31599,7 +31587,7 @@ Permissions required: bb.roles.delete</p></td><p></p>- <h3 id="bytebase.v1.BatchUpdateSavedQueryOrganizerRequest">BatchUpdateSavedQueryOrganizerRequest</h3>+ <h3 id="bytebase.v1.BatchUpdateSavedQueriesRequest">BatchUpdateSavedQueriesRequest</h3><p></p>@@ -31613,7 +31601,7 @@ Permissions required: bb.roles.delete</p></td><td>parent</td><td><a href="#string">string</a></td><td></td>- <td><p>The parent resource whose saved queries' organizers are updated.+ <td><p>The parent resource whose saved queries are updated.Format: projects/{project} </p></td></tr>@@ -31628,14 +31616,14 @@ Supported filter:- name: the saved query name in "projects/{project}/savedQueries/{savedQuery}" format, support "==" and "in [xx]" operator.- creator: the saved query creator in "users/{email}" format, support "==" and "!=" operator.- starred: should be "true" or "false", filter starred/unstarred saved queries, support "==" operator.-- folder: the saved query organizer folder path, support exact "==" operator. </p></td>+- folder: the saved query folder path, support exact "==" operator. </p></td></tr><tr>- <td>organizer</td>- <td><a href="#bytebase.v1.SavedQueryOrganizer">SavedQueryOrganizer</a></td>+ <td>saved_query</td>+ <td><a href="#bytebase.v1.SavedQuery">SavedQuery</a></td><td></td>- <td><p>The organizer fields to update. </p></td>+ <td><p>The fields to apply to every matched saved query. </p></td></tr><tr>@@ -31643,10 +31631,8 @@ Supported filter:<td><a href="#google.protobuf.FieldMask">google.protobuf.FieldMask</a></td><td></td><td><p>The list of fields to be updated.-Fields are specified relative to the saved query organizer.Only support update the following fields for now:-- `starred`-- `folders` </p></td>+- `folder` </p></td></tr></tbody>@@ -31656,7 +31642,7 @@ Only support update the following fields for now:- <h3 id="bytebase.v1.BatchUpdateSavedQueryOrganizerResponse">BatchUpdateSavedQueryOrganizerResponse</h3>+ <h3 id="bytebase.v1.BatchUpdateSavedQueriesResponse">BatchUpdateSavedQueriesResponse</h3><p></p>@@ -31666,18 +31652,11 @@ Only support update the following fields for now:</thead><tbody>- <tr>- <td>saved_query_organizers</td>- <td><a href="#bytebase.v1.SavedQueryOrganizer">SavedQueryOrganizer</a></td>- <td>repeated</td>- <td><p> </p></td>- </tr>-<tr><td>updated_count</td><td><a href="#int32">int32</a></td><td></td>- <td><p> </p></td>+ <td><p>The number of saved queries updated. </p></td></tr></tbody>@@ -31864,55 +31843,6 @@ Pass this value in the page_token field in the subsequent call to- <h3 id="bytebase.v1.ListSavedQueryFoldersRequest">ListSavedQueryFoldersRequest</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>The parent resource of the saved query folders.-Format: projects/{project} </p></td>- </tr>-- </tbody>- </table>------ <h3 id="bytebase.v1.ListSavedQueryFoldersResponse">ListSavedQueryFoldersResponse</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>folders</td>- <td><a href="#bytebase.v1.SavedQueryFolder">SavedQueryFolder</a></td>- <td>repeated</td>- <td><p>The caller's saved query folders. </p></td>- </tr>-- </tbody>- </table>-----<h3 id="bytebase.v1.SavedQuery">SavedQuery</h3><p></p>@@ -31960,7 +31890,8 @@ If the database parent doesn't exist, the database field is empty. </p></td><td>creator</td><td><a href="#string">string</a></td><td></td>- <td><p>The creator of the SavedQuery.+ <td><p>The creator of the SavedQuery — the fixed owner; ownership does not+transfer.Format: users/{email} </p></td></tr>@@ -32002,80 +31933,12 @@ use GetSavedQuery() request to retrieve the full content. </p></td></tr><tr>- <td>folders</td>- <td><a href="#string">string</a></td>- <td>repeated</td>- <td><p> </p></td>- </tr>-- </tbody>- </table>------ <h3 id="bytebase.v1.SavedQueryFolder">SavedQueryFolder</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>folders</td>+ <td>folder</td><td><a href="#string">string</a></td>- <td>repeated</td>- <td><p>The folder path segments. </p></td>- </tr>-- <tr>- <td>category</td>- <td><a href="#bytebase.v1.SavedQueryFolder.Category">SavedQueryFolder.Category</a></td><td></td>- <td><p>The folder category. </p></td>- </tr>-- </tbody>- </table>------ <h3 id="bytebase.v1.SavedQueryOrganizer">SavedQueryOrganizer</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>saved_query</td>- <td><a href="#string">string</a></td>- <td></td>- <td><p>The name of the saved query.-Format: projects/{project}/savedQueries/{savedQuery} </p></td>- </tr>-- <tr>- <td>starred</td>- <td><a href="#bool">bool</a></td>- <td></td>- <td><p>starred means if the saved query is starred. </p></td>- </tr>-- <tr>- <td>folders</td>- <td><a href="#string">string</a></td>- <td>repeated</td>- <td><p> </p></td>+ <td><p>The folder path this saved query lives in, set by its creator (or an+admin). Empty means unfiled. A saved query lives in exactly one folder;+a folder is a path on saved queries, e.g. "a/b/c". </p></td></tr></tbody>@@ -32115,7 +31978,7 @@ Supported filter:- title: the saved query title, support "contains" operator.- creator: the saved query creator in "users/{email}" format, support "==" and "!=" operator.- starred: should be "true" or "false", filter starred/unstarred saved queries, support "==" operator.-- folder: the saved query organizer folder path, support "==" operator.+- folder: the saved query folder path, support "==" operator.For example:creator == "users/{email}"@@ -32184,7 +32047,7 @@ Pass this value in the page_token field in the subsequent call to- <h3 id="bytebase.v1.UpdateSavedQueryOrganizerRequest">UpdateSavedQueryOrganizerRequest</h3>+ <h3 id="bytebase.v1.SearchSavedQueryFoldersRequest">SearchSavedQueryFoldersRequest</h3><p></p>@@ -32195,31 +32058,52 @@ Pass this value in the page_token field in the subsequent call to<tbody><tr>- <td>organizer</td>- <td><a href="#bytebase.v1.SavedQueryOrganizer">SavedQueryOrganizer</a></td>+ <td>parent</td>+ <td><a href="#string">string</a></td><td></td>- <td><p>The organizer to update.--The organizer's `saved_query` field is used to identify the saved query.-Format: projects/{project}/savedQueries/{savedQuery} </p></td>+ <td><p>The parent resource whose saved query folders are searched.+Format: projects/{project} </p></td></tr><tr>- <td>update_mask</td>- <td><a href="#google.protobuf.FieldMask">google.protobuf.FieldMask</a></td>+ <td>filter</td>+ <td><a href="#string">string</a></td><td></td>- <td><p>The list of fields to be updated.-Fields are specified relative to the saved query organizer.-Only support update the following fields for now:-- `starred` </p></td>+ <td><p>To filter the folders by the saved queries they hold. Takes the same+fields and syntax as `SearchSavedQueries.filter`, except `title`. A+folder is returned when at least one saved query the caller can read+matches, so the caller-scoping is the same as SearchSavedQueries: your+own saved queries, plus everyone's for the admin backstop.++For example, to split a folder tree into your own and everyone else's:+creator == "users/{email}"+creator != "users/{email}" </p></td></tr>+ </tbody>+ </table>++++++ <h3 id="bytebase.v1.SearchSavedQueryFoldersResponse">SearchSavedQueryFoldersResponse</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>allow_missing</td>- <td><a href="#bool">bool</a></td>- <td></td>- <td><p>If set to true, and the saved query organizer is not found, a new saved query organizer will be created.-In this situation, `update_mask` is ignored. </p></td>+ <td>folders</td>+ <td><a href="#string">string</a></td>+ <td>repeated</td>+ <td><p>The caller's folder paths, including every ancestor prefix, sorted.+A folder is a path on saved queries ("a/b/c"), so empty folders cannot+exist. </p></td></tr></tbody>@@ -32259,7 +32143,8 @@ Fields are specified relative to the saved query.Only support update the following fields for now:- `title`- `content`-- `database` </p></td>+- `database`+- `folder` </p></td></tr></tbody>@@ -32269,43 +32154,46 @@ Only support update the following fields for now:+ <h3 id="bytebase.v1.UpdateSavedQueryStarRequest">UpdateSavedQueryStarRequest</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>name</td>+ <td><a href="#string">string</a></td>+ <td></td>+ <td><p>The name of the saved query to star or unstar.+Format: projects/{project}/savedQueries/{savedQuery} </p></td>+ </tr>++ <tr>+ <td>starred</td>+ <td><a href="#bool">bool</a></td>+ <td></td>+ <td><p>Whether the caller stars the saved query. </p></td>+ </tr>++ </tbody>+ </table>++++- <h3 id="bytebase.v1.SavedQueryFolder.Category">SavedQueryFolder.Category</h3>- <p></p>- <table class="enum-table">- <thead>- <tr><td>Name</td><td>Number</td><td>Description</td></tr>- </thead>- <tbody>-- <tr>- <td>CATEGORY_UNSPECIFIED</td>- <td>0</td>- <td><p></p></td>- </tr>-- <tr>- <td>MINE</td>- <td>1</td>- <td><p></p></td>- </tr>-- <tr>- <td>SHARED</td>- <td>2</td>- <td><p></p></td>- </tr>-- </tbody>- </table>+<h3 id="bytebase.v1.SavedQueryService">SavedQueryService</h3>- <p>SavedQueryService manages saved queries for SQL Editor query development.</p><p>Permission IDs still use the legacy `bb.worksheets.*` names; they are</p><p>renamed together with the access-model redesign and its role migration.</p>+ <p>SavedQueryService manages saved queries for SQL Editor query development.</p><p>A saved query is private to its creator; `bb.savedQueries.manage` is the</p><p>admin backstop that can reach any saved query in scope. Per-object</p><p>VIEWER/EDITOR grants arrive with the access-model redesign, which brings</p><p>its own policy shapes and the GetIamPolicy/SetIamPolicy pair that manages</p><p>them.</p><table class="enum-table"><thead><tr><td>Method Name</td><td>Request Type</td><td>Response Type</td><td>Description</td></tr>@@ -32316,81 +32204,91 @@ Only support update the following fields for now:<td>CreateSavedQuery</td><td><a href="#bytebase.v1.CreateSavedQueryRequest">CreateSavedQueryRequest</a></td><td><a href="#bytebase.v1.SavedQuery">SavedQuery</a></td>- <td><p>Creates a personal saved query used in SQL Editor. Any authenticated user can create their own saved queries.-Permissions required: None (authenticated users only)</p></td>+ <td><p>Creates a personal saved query used in SQL Editor. The creator becomes+the fixed owner.+Permissions required: bb.savedQueries.create on the parent project</p></td></tr><tr><td>GetSavedQuery</td><td><a href="#bytebase.v1.GetSavedQueryRequest">GetSavedQueryRequest</a></td><td><a href="#bytebase.v1.SavedQuery">SavedQuery</a></td>- <td><p>Get a saved query by name.-Saved queries are private: only the creator, or a caller holding-bb.worksheets.manage on the workspace, can access one.-Permissions required: creator, or workspace bb.worksheets.manage</p></td>+ <td><p>Get a saved query by name. Returns NotFound for saved queries the+caller cannot read.+Permissions required: creator, or bb.savedQueries.manage in scope</p></td></tr><tr><td>ListSavedQueries</td><td><a href="#bytebase.v1.ListSavedQueriesRequest">ListSavedQueriesRequest</a></td><td><a href="#bytebase.v1.ListSavedQueriesResponse">ListSavedQueriesResponse</a></td>- <td><p>List saved queries.-This is used for listing saved queries in a project, or across all projects by using `projects/-`.-Permissions required: bb.worksheets.list</p></td>- </tr>-- <tr>- <td>ListSavedQueryFolders</td>- <td><a href="#bytebase.v1.ListSavedQueryFoldersRequest">ListSavedQueryFoldersRequest</a></td>- <td><a href="#bytebase.v1.ListSavedQueryFoldersResponse">ListSavedQueryFoldersResponse</a></td>- <td><p>List the caller's saved query folders.-Only folders stored in the caller's saved query organizer are returned.</p></td>+ <td><p>List saved queries: the grant-independent governance surface. Supports+listing in a project, or across all projects by using `projects/-`, with+whole statements rather than the previews Search returns — e.g. an+offboarding review filtering by creator.+Permissions required: bb.savedQueries.list</p></td></tr><tr><td>SearchSavedQueries</td><td><a href="#bytebase.v1.SearchSavedQueriesRequest">SearchSavedQueriesRequest</a></td><td><a href="#bytebase.v1.SearchSavedQueriesResponse">SearchSavedQueriesResponse</a></td>- <td><p>Search for saved queries.-This is used for finding my saved queries in a project.-The saved query accessibility is the same as GetSavedQuery().-Permissions required: creator, or workspace bb.worksheets.manage</p></td>+ <td><p>Search for saved queries in a project: the SQL Editor's hot list path,+returning only rows the caller can read, with content previews.+Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the project</p></td>+ </tr>++ <tr>+ <td>SearchSavedQueryFolders</td>+ <td><a href="#bytebase.v1.SearchSavedQueryFoldersRequest">SearchSavedQueryFoldersRequest</a></td>+ <td><a href="#bytebase.v1.SearchSavedQueryFoldersResponse">SearchSavedQueryFoldersResponse</a></td>+ <td><p>Search the folder paths of the caller's saved queries in a project.+Folders are a derived view over the `folder` field rather than a+resource collection, so this is a custom method on savedQueries and+shares SearchSavedQueries' caller-scoped semantics — not the+cross-creator reach of ListSavedQueries.+Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the project</p></td></tr><tr><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.-The access is the same as GetSavedQuery method.-Permissions required: creator, or workspace bb.worksheets.manage</p></td>+ <td><p>Update a saved query. `title`, `content`, and `database` require write+access; `folder` re-files the saved query and is creator/admin only.+Returns NotFound for saved queries the caller cannot read.+Permissions required: creator, or bb.savedQueries.manage in scope</p></td></tr><tr>- <td>UpdateSavedQueryOrganizer</td>- <td><a href="#bytebase.v1.UpdateSavedQueryOrganizerRequest">UpdateSavedQueryOrganizerRequest</a></td>- <td><a href="#bytebase.v1.SavedQueryOrganizer">SavedQueryOrganizer</a></td>- <td><p>Update the organizer of a saved query.-The access is the same as UpdateSavedQuery method.-Permissions required: creator, or workspace bb.worksheets.manage</p></td>+ <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 always the+caller's own per-user marker — invisible to others and carrying no+access. The only requirement is that the caller can read the saved+query being starred (which also keeps private saved query names+unprobeable).+Permissions required: read access to the saved query</p></td></tr><tr>- <td>BatchUpdateSavedQueryOrganizer</td>- <td><a href="#bytebase.v1.BatchUpdateSavedQueryOrganizerRequest">BatchUpdateSavedQueryOrganizerRequest</a></td>- <td><a href="#bytebase.v1.BatchUpdateSavedQueryOrganizerResponse">BatchUpdateSavedQueryOrganizerResponse</a></td>- <td><p>Batch update the organizers of saved queries.-The access is the same as UpdateSavedQuery method.-Permissions required: creator, or workspace bb.worksheets.manage</p></td>+ <td>BatchUpdateSavedQueries</td>+ <td><a href="#bytebase.v1.BatchUpdateSavedQueriesRequest">BatchUpdateSavedQueriesRequest</a></td>+ <td><a href="#bytebase.v1.BatchUpdateSavedQueriesResponse">BatchUpdateSavedQueriesResponse</a></td>+ <td><p>Batch re-file saved queries into a folder. The update mask supports+`folder` only; only rows the caller may re-file are updated (their own,+or any in scope for admins).+Permissions required: creator, or bb.savedQueries.manage in scope</p></td></tr><tr><td>DeleteSavedQuery</td><td><a href="#bytebase.v1.DeleteSavedQueryRequest">DeleteSavedQueryRequest</a></td><td><a href="#google.protobuf.Empty">.google.protobuf.Empty</a></td>- <td><p>Delete a saved query.-The access is the same as UpdateSavedQuery method.-Permissions required: creator, or workspace bb.worksheets.manage</p></td>+ <td><p>Delete a saved query. Only the creator (or an admin) can delete.+Returns NotFound for saved queries the caller cannot read.+Permissions required: creator, or bb.savedQueries.manage in scope</p></td></tr></tbody>@@ -32444,19 +32342,19 @@ Permissions required: creator, or workspace bb.worksheets.manage</p></td><tr>- <td>ListSavedQueryFolders</td>- <td>GET</td>- <td>/v1/{parent=projects/*}/savedQueryFolders</td>- <td></td>+ <td>SearchSavedQueries</td>+ <td>POST</td>+ <td>/v1/{parent=projects/*}/savedQueries:search</td>+ <td>*</td></tr><tr>- <td>SearchSavedQueries</td>+ <td>SearchSavedQueryFolders</td><td>POST</td>- <td>/v1/{parent=projects/*}/savedQueries:search</td>+ <td>/v1/{parent=projects/*}/savedQueries:searchFolders</td><td>*</td></tr>@@ -32474,19 +32372,19 @@ Permissions required: creator, or workspace bb.worksheets.manage</p></td><tr>- <td>UpdateSavedQueryOrganizer</td>- <td>PATCH</td>- <td>/v1/{organizer.saved_query=projects/*/savedQueries/*}/organizer</td>- <td>organizer</td>+ <td>UpdateSavedQueryStar</td>+ <td>POST</td>+ <td>/v1/{name=projects/*/savedQueries/*}:updateStar</td>+ <td>*</td></tr><tr>- <td>BatchUpdateSavedQueryOrganizer</td>+ <td>BatchUpdateSavedQueries</td><td>POST</td>- <td>/v1/{parent=projects/*}/savedQueries/organizers:batchUpdate</td>+ <td>/v1/{parent=projects/*}/savedQueries:batchUpdate</td><td>*</td></tr>diff --git a/proto/store/store/saved_query.proto b/proto/store/store/saved_query.protoindex 75f55db731..926ec7b435 100644--- a/proto/store/store/saved_query.proto+++ b/proto/store/store/saved_query.proto@@ -13,10 +13,3 @@ message SavedQueryPayload {// is deleted or transferred, degrading to "no database" in the UI.string database = 1;}--message SavedQueryOrganizerPayload {- bool starred = 1;- // The folder path for a saved query.- // For example, if the folders is [A, B, C], means the saved query is in the A/B/C subfolder.- repeated string folders = 2;-}diff --git a/proto/v1/v1/saved_query_service.proto b/proto/v1/v1/saved_query_service.protoindex f2634dfeb2..adff88f931 100644--- a/proto/v1/v1/saved_query_service.proto+++ b/proto/v1/v1/saved_query_service.proto@@ -15,65 +15,79 @@ import "v1/annotation.proto";option go_package = "github.com/bytebase/bytebase/backend/generated-go/v1";// SavedQueryService manages saved queries for SQL Editor query development.-// Permission IDs still use the legacy `bb.worksheets.*` names; they are-// renamed together with the access-model redesign and its role migration.+//+// A saved query is private to its creator; `bb.savedQueries.manage` is the+// admin backstop that can reach any saved query in scope. Per-object+// VIEWER/EDITOR grants arrive with the access-model redesign, which brings+// its own policy shapes and the GetIamPolicy/SetIamPolicy pair that manages+// them.service SavedQueryService {- // Creates a personal saved query used in SQL Editor. Any authenticated user can create their own saved queries.- // Permissions required: None (authenticated users only)+ // Creates a personal saved query used in SQL Editor. The creator becomes+ // the fixed owner.+ // Permissions required: bb.savedQueries.create on the parent projectrpc CreateSavedQuery(CreateSavedQueryRequest) returns (SavedQuery) {option (google.api.http) = {post: "/v1/{parent=projects/*}/savedQueries"body: "saved_query"};option (google.api.method_signature) = "parent,saved_query";- option (bytebase.v1.auth_method) = CUSTOM;+ option (bytebase.v1.permission) = "bb.savedQueries.create";+ option (bytebase.v1.auth_method) = IAM;option (bytebase.v1.audit) = true;}- // Get a saved query by name.- // Saved queries are private: only the creator, or a caller holding- // bb.worksheets.manage on the workspace, can access one.- // Permissions required: creator, or workspace bb.worksheets.manage+ // Get a saved query by name. Returns NotFound for saved queries the+ // caller cannot read.+ // Permissions required: creator, or bb.savedQueries.manage in scoperpc GetSavedQuery(GetSavedQueryRequest) returns (SavedQuery) {option (google.api.http) = {get: "/v1/{name=projects/*/savedQueries/*}"};option (google.api.method_signature) = "name";option (bytebase.v1.auth_method) = CUSTOM;}- // List saved queries.- // This is used for listing saved queries in a project, or across all projects by using `projects/-`.- // Permissions required: bb.worksheets.list+ // List saved queries: the grant-independent governance surface. Supports+ // listing in a project, or across all projects by using `projects/-`, with+ // whole statements rather than the previews Search returns — e.g. an+ // offboarding review filtering by creator.+ // Permissions required: bb.savedQueries.listrpc ListSavedQueries(ListSavedQueriesRequest) returns (ListSavedQueriesResponse) {option (google.api.http) = {get: "/v1/{parent=projects/*}/savedQueries"};option (google.api.method_signature) = "parent";- option (bytebase.v1.permission) = "bb.worksheets.list";+ option (bytebase.v1.permission) = "bb.savedQueries.list";option (bytebase.v1.auth_method) = IAM;}- // List the caller's saved query folders.- // Only folders stored in the caller's saved query organizer are returned.- rpc ListSavedQueryFolders(ListSavedQueryFoldersRequest) returns (ListSavedQueryFoldersResponse) {- option (google.api.http) = {get: "/v1/{parent=projects/*}/savedQueryFolders"};+ // Search for saved queries in a project: the SQL Editor's hot list path,+ // returning only rows the caller can read, with content previews.+ // Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the project+ rpc SearchSavedQueries(SearchSavedQueriesRequest) returns (SearchSavedQueriesResponse) {+ option (google.api.http) = {+ post: "/v1/{parent=projects/*}/savedQueries:search"+ body: "*"+ };option (google.api.method_signature) = "parent";option (bytebase.v1.auth_method) = CUSTOM;}- // Search for saved queries.- // This is used for finding my saved queries in a project.- // The saved query accessibility is the same as GetSavedQuery().- // Permissions required: creator, or workspace bb.worksheets.manage- rpc SearchSavedQueries(SearchSavedQueriesRequest) returns (SearchSavedQueriesResponse) {+ // Search the folder paths of the caller's saved queries in a project.+ // Folders are a derived view over the `folder` field rather than a+ // resource collection, so this is a custom method on savedQueries and+ // shares SearchSavedQueries' caller-scoped semantics — not the+ // cross-creator reach of ListSavedQueries.+ // Permissions required: bb.savedQueries.search or bb.savedQueries.manage on the project+ rpc SearchSavedQueryFolders(SearchSavedQueryFoldersRequest) returns (SearchSavedQueryFoldersResponse) {option (google.api.http) = {- post: "/v1/{parent=projects/*}/savedQueries:search"+ post: "/v1/{parent=projects/*}/savedQueries:searchFolders"body: "*"};option (google.api.method_signature) = "parent";option (bytebase.v1.auth_method) = CUSTOM;}- // Update a saved query.- // The access is the same as GetSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage+ // Update a saved query. `title`, `content`, and `database` require write+ // access; `folder` re-files the saved query and is creator/admin only.+ // Returns NotFound for saved queries the caller cannot read.+ // Permissions required: creator, or bb.savedQueries.manage in scoperpc UpdateSavedQuery(UpdateSavedQueryRequest) returns (SavedQuery) {option (google.api.http) = {patch: "/v1/{saved_query.name=projects/*/savedQueries/*}"@@ -83,33 +97,37 @@ service SavedQueryService {option (bytebase.v1.auth_method) = CUSTOM;}- // Update the organizer of a saved query.- // The access is the same as UpdateSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage- rpc UpdateSavedQueryOrganizer(UpdateSavedQueryOrganizerRequest) returns (SavedQueryOrganizer) {+ // Star or unstar a saved query for the caller. A star is always the+ // caller's own per-user marker — invisible to others and carrying no+ // access. The only requirement is that the caller can read the saved+ // query being starred (which also keeps private saved query names+ // unprobeable).+ // Permissions required: read access to the saved query+ rpc UpdateSavedQueryStar(UpdateSavedQueryStarRequest) returns (SavedQuery) {option (google.api.http) = {- patch: "/v1/{organizer.saved_query=projects/*/savedQueries/*}/organizer"- body: "organizer"+ post: "/v1/{name=projects/*/savedQueries/*}:updateStar"+ body: "*"};- option (google.api.method_signature) = "organizer,update_mask";+ option (google.api.method_signature) = "name,starred";option (bytebase.v1.auth_method) = CUSTOM;}- // Batch update the organizers of saved queries.- // The access is the same as UpdateSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage- rpc BatchUpdateSavedQueryOrganizer(BatchUpdateSavedQueryOrganizerRequest) returns (BatchUpdateSavedQueryOrganizerResponse) {+ // Batch re-file saved queries into a folder. The update mask supports+ // `folder` only; only rows the caller may re-file are updated (their own,+ // or any in scope for admins).+ // Permissions required: creator, or bb.savedQueries.manage in scope+ rpc BatchUpdateSavedQueries(BatchUpdateSavedQueriesRequest) returns (BatchUpdateSavedQueriesResponse) {option (google.api.http) = {- post: "/v1/{parent=projects/*}/savedQueries/organizers:batchUpdate"+ post: "/v1/{parent=projects/*}/savedQueries:batchUpdate"body: "*"};- option (google.api.method_signature) = "parent,organizer,update_mask";+ option (google.api.method_signature) = "parent,saved_query,update_mask";option (bytebase.v1.auth_method) = CUSTOM;}- // Delete a saved query.- // The access is the same as UpdateSavedQuery method.- // Permissions required: creator, or workspace bb.worksheets.manage+ // Delete a saved query. Only the creator (or an admin) can delete.+ // Returns NotFound for saved queries the caller cannot read.+ // Permissions required: creator, or bb.savedQueries.manage in scoperpc DeleteSavedQuery(DeleteSavedQueryRequest) returns (google.protobuf.Empty) {option (google.api.http) = {delete: "/v1/{name=projects/*/savedQueries/*}"};option (google.api.method_signature) = "name";@@ -180,29 +198,31 @@ message ListSavedQueriesResponse {string next_page_token = 2;}-message ListSavedQueryFoldersRequest {- // The parent resource of the saved query folders.+message SearchSavedQueryFoldersRequest {+ // The parent resource whose saved query folders are searched.// Format: projects/{project}- string parent = 1 [(google.api.field_behavior) = REQUIRED];-}+ string parent = 1 [+ (google.api.field_behavior) = REQUIRED,+ (google.api.resource_reference) = {type: "bytebase.com/Project"}+ ];-message ListSavedQueryFoldersResponse {- // The caller's saved query folders.- repeated SavedQueryFolder folders = 1;+ // To filter the folders by the saved queries they hold. Takes the same+ // fields and syntax as `SearchSavedQueries.filter`, except `title`. A+ // folder is returned when at least one saved query the caller can read+ // matches, so the caller-scoping is the same as SearchSavedQueries: your+ // own saved queries, plus everyone's for the admin backstop.+ //+ // For example, to split a folder tree into your own and everyone else's:+ // creator == "users/{email}"+ // creator != "users/{email}"+ string filter = 2;}-message SavedQueryFolder {- enum Category {- CATEGORY_UNSPECIFIED = 0;- MINE = 1;- SHARED = 2;- }-- // The folder path segments.+message SearchSavedQueryFoldersResponse {+ // The caller's folder paths, including every ancestor prefix, sorted.+ // A folder is a path on saved queries ("a/b/c"), so empty folders cannot+ // exist.repeated string folders = 1;-- // The folder category.- Category category = 2;}message UpdateSavedQueryRequest {@@ -219,11 +239,21 @@ message UpdateSavedQueryRequest {// - `title`// - `content`// - `database`+ // - `folder`google.protobuf.FieldMask update_mask = 2;}-message BatchUpdateSavedQueryOrganizerRequest {- // The parent resource whose saved queries' organizers are updated.+message UpdateSavedQueryStarRequest {+ // The name of the saved query to star or unstar.+ // Format: projects/{project}/savedQueries/{savedQuery}+ string name = 1 [(google.api.field_behavior) = REQUIRED];++ // Whether the caller stars the saved query.+ bool starred = 2;+}++message BatchUpdateSavedQueriesRequest {+ // The parent resource whose saved queries are updated.// Format: projects/{project}string parent = 1 [(google.api.field_behavior) = REQUIRED];@@ -234,53 +264,21 @@ message BatchUpdateSavedQueryOrganizerRequest {// - name: the saved query name in "projects/{project}/savedQueries/{savedQuery}" format, support "==" and "in [xx]" operator.// - creator: the saved query creator in "users/{email}" format, support "==" and "!=" operator.// - starred: should be "true" or "false", filter starred/unstarred saved queries, support "==" operator.- // - folder: the saved query organizer folder path, support exact "==" operator.+ // - folder: the saved query folder path, support exact "==" operator.string filter = 2;- // The organizer fields to update.- SavedQueryOrganizer organizer = 3 [(google.api.field_behavior) = REQUIRED];+ // The fields to apply to every matched saved query.+ SavedQuery saved_query = 3 [(google.api.field_behavior) = REQUIRED];// The list of fields to be updated.- // Fields are specified relative to the saved query organizer.// Only support update the following fields for now:- // - `starred`- // - `folders`+ // - `folder`google.protobuf.FieldMask update_mask = 4 [(google.api.field_behavior) = REQUIRED];}-message BatchUpdateSavedQueryOrganizerResponse {- repeated SavedQueryOrganizer saved_query_organizers = 1;-- int32 updated_count = 2;-}--message UpdateSavedQueryOrganizerRequest {- // The organizer to update.- //- // The organizer's `saved_query` field is used to identify the saved query.- // Format: projects/{project}/savedQueries/{savedQuery}- SavedQueryOrganizer organizer = 1 [(google.api.field_behavior) = REQUIRED];-- // The list of fields to be updated.- // Fields are specified relative to the saved query organizer.- // Only support update the following fields for now:- // - `starred`- google.protobuf.FieldMask update_mask = 2;-- // If set to true, and the saved query organizer is not found, a new saved query organizer will be created.- // In this situation, `update_mask` is ignored.- bool allow_missing = 3;-}--message SavedQueryOrganizer {- // The name of the saved query.- // Format: projects/{project}/savedQueries/{savedQuery}- string saved_query = 1 [(google.api.field_behavior) = REQUIRED];-- // starred means if the saved query is starred.- bool starred = 2;-- repeated string folders = 3;+message BatchUpdateSavedQueriesResponse {+ // The number of saved queries updated.+ int32 updated_count = 1;}message DeleteSavedQueryRequest {@@ -295,7 +293,10 @@ message DeleteSavedQueryRequest {message SearchSavedQueriesRequest {// The parent resource of the saved queries.// Format: projects/{project}- string parent = 1 [(google.api.field_behavior) = REQUIRED];+ string parent = 1 [+ (google.api.field_behavior) = REQUIRED,+ (google.api.resource_reference) = {type: "bytebase.com/Project"}+ ];// To filter the search result.// The syntax and semantics of CEL are documented at https://github.com/google/cel-spec@@ -305,7 +306,7 @@ message SearchSavedQueriesRequest {// - title: the saved query title, support "contains" operator.// - creator: the saved query creator in "users/{email}" format, support "==" and "!=" operator.// - starred: should be "true" or "false", filter starred/unstarred saved queries, support "==" operator.- // - folder: the saved query organizer folder path, support "==" operator.+ // - folder: the saved query folder path, support "==" operator.//// For example:// creator == "users/{email}"@@ -366,7 +367,8 @@ message SavedQuery {(buf.validate.field).string.max_len = 200];- // The creator of the SavedQuery.+ // The creator of the SavedQuery — the fixed owner; ownership does not+ // transfer.// Format: users/{email}string creator = 5 [(google.api.field_behavior) = OUTPUT_ONLY];@@ -384,13 +386,16 @@ message SavedQuery {// content_size is the full size of the content, may not match the size of the `content` field.int64 content_size = 9 [(google.api.field_behavior) = OUTPUT_ONLY];- // The removed visibility field (saved queries are private to their creator;- // per-object sharing arrives with the access-model redesign).- reserved 10;- reserved "visibility";+ // The removed visibility field (superseded by per-object grants) and the+ // removed per-user folder segments (superseded by `folder`).+ reserved 10, 12;+ reserved "visibility", "folders";// starred indicates whether the saved query is starred by the current authenticated user.bool starred = 11 [(google.api.field_behavior) = OUTPUT_ONLY];- repeated string folders = 12 [(google.api.field_behavior) = OUTPUT_ONLY];+ // The folder path this saved query lives in, set by its creator (or an+ // admin). Empty means unfiled. A saved query lives in exactly one folder;+ // a folder is a path on saved queries, e.g. "a/b/c".+ string folder = 13 [(buf.validate.field).string.max_len = 256];}