Skip to content

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

refactor!: remove saved query visibility and rename the tables (#21160)

Danny Xu9592ea3d4a18
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index cbec2be7db..a574c65ce7 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -5777,7 +5777,7 @@ paths:
description: |-
Batch update the organizers of saved queries.
The access is the same as UpdateSavedQuery method.
- Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ Permissions required: creator, or workspace bb.worksheets.manage
operationId: bytebase.v1.SavedQueryService.BatchUpdateSavedQueryOrganizer
parameters:
- name: Connect-Protocol-Version
@@ -5854,7 +5854,7 @@ paths:
description: |-
Delete a saved query.
The access is the same as UpdateSavedQuery method.
- Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries)
+ Permissions required: creator, or workspace bb.worksheets.manage
operationId: bytebase.v1.SavedQueryService.DeleteSavedQuery
parameters:
- name: Connect-Protocol-Version
@@ -5892,11 +5892,9 @@ paths:
summary: GetSavedQuery
description: |-
Get a saved query by name.
- The users can access this method if,
- - they are the creator of the saved query;
- - they have bb.worksheets.get permission on the workspace;
- - the saved query is shared with them with PROJECT_READ and PROJECT_WRITE visibility, and they have bb.projects.get permission on the project.
- Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ 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
operationId: bytebase.v1.SavedQueryService.GetSavedQuery
parameters:
- name: Connect-Protocol-Version
@@ -6011,9 +6009,9 @@ paths:
summary: SearchSavedQueries
description: |-
Search for saved queries.
- This is used for finding my saved queries or saved queries shared by other people.
+ This is used for finding my saved queries in a project.
The saved query accessibility is the same as GetSavedQuery().
- Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ Permissions required: creator, or workspace bb.worksheets.manage
operationId: bytebase.v1.SavedQueryService.SearchSavedQueries
parameters:
- name: Connect-Protocol-Version
@@ -6051,11 +6049,8 @@ paths:
summary: UpdateSavedQuery
description: |-
Update a saved query.
- The users can access this method if,
- - they are the creator of the saved query;
- - they have bb.worksheets.manage permission on the workspace;
- - the saved query is shared with them with PROJECT_WRITE visibility, and they have bb.projects.get permission on the project.
- Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries)
+ The access is the same as GetSavedQuery method.
+ Permissions required: creator, or workspace bb.worksheets.manage
operationId: bytebase.v1.SavedQueryService.UpdateSavedQuery
parameters:
- name: Connect-Protocol-Version
@@ -6094,7 +6089,7 @@ paths:
description: |-
Update the organizer of a saved query.
The access is the same as UpdateSavedQuery method.
- Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ Permissions required: creator, or workspace bb.worksheets.manage
operationId: bytebase.v1.SavedQueryService.UpdateSavedQueryOrganizer
parameters:
- name: Connect-Protocol-Version
@@ -9306,7 +9301,6 @@ 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.
- - visibility: check Visibility enum in the SavedQuery message for values, support "==" and "in [xx]" operator.
- folder: the saved query organizer folder path, support exact "==" operator.
organizer:
title: organizer
@@ -17733,9 +17727,6 @@ components:
title: content_size
format: int64
description: content_size is the full size of the content, may not match the size of the `content` field.
- visibility:
- title: visibility
- $ref: '#/components/schemas/bytebase.v1.SavedQuery.Visibility'
starred:
type: boolean
title: starred
@@ -17747,14 +17738,6 @@ components:
title: folders
title: SavedQuery
additionalProperties: false
- bytebase.v1.SavedQuery.Visibility:
- type: string
- title: Visibility
- enum:
- - VISIBILITY_UNSPECIFIED
- - PROJECT_READ
- - PROJECT_WRITE
- - PRIVATE
bytebase.v1.SavedQueryFolder:
type: object
properties:
@@ -18281,7 +18264,6 @@ 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.
- - visibility: check Visibility enum in the SavedQuery message for values, support "==" and "in [xx]" operator.
- folder: the saved query organizer folder path, support "==" operator.
For example:
@@ -18290,8 +18272,6 @@ components:
creator != "users/{email}"
starred == true
starred == false
- visibility in ["PRIVATE", "PROJECT_READ", "PROJECT_WRITE"]
- visibility == "PRIVATE"
folder == "foo/bar"
pageSize:
type: integer
@@ -20682,12 +20662,11 @@ components:
description: |-
The list of fields to be updated.
Fields are specified relative to the saved query.
- (e.g., `title`, `statement`; *not* `saved_query.title` or `saved_query.statement`)
+ (e.g., `title`, `content`; *not* `saved_query.title` or `saved_query.content`)
Only support update the following fields for now:
- `title`
- - `statement`
- - `starred`
- - `visibility`
+ - `content`
+ - `database`
$ref: '#/components/schemas/google.protobuf.FieldMask'
title: UpdateSavedQueryRequest
additionalProperties: false
diff --git a/backend/api/v1/interactive_project_database_test.go b/backend/api/v1/interactive_project_database_test.go
index 16b0acaa3e..8fe6366c5a 100644
--- a/backend/api/v1/interactive_project_database_test.go
+++ b/backend/api/v1/interactive_project_database_test.go
@@ -8,9 +8,12 @@ import (
"connectrpc.com/connect"
"github.com/stretchr/testify/require"
+ "google.golang.org/protobuf/types/known/fieldmaskpb"
+
"github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/common/testcontainer"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
+ v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/migrator"
"github.com/bytebase/bytebase/backend/store"
)
@@ -43,35 +46,68 @@ func TestBOT36SavedQueryDatabasesUseCanonicalOwningProjectNames(t *testing.T) {
ctx, stores, projectID, instanceID, databaseName := setupBOT36ProjectDatabase(t)
service := NewSavedQueryService(stores, nil)
- _, err := service.getSavedQueryDatabase(ctx, projectID, common.FormatDatabase(instanceID, databaseName))
+ _, err := service.validateSavedQueryDatabase(ctx, projectID, common.FormatDatabase(instanceID, databaseName))
require.Equal(t, connect.CodeInvalidArgument, connect.CodeOf(err))
- _, err = service.getSavedQueryDatabase(ctx, projectID, common.FormatProjectDatabase("other-project", instanceID, databaseName))
+ _, err = service.validateSavedQueryDatabase(ctx, projectID, common.FormatProjectDatabase("other-project", instanceID, databaseName))
require.Equal(t, connect.CodeNotFound, connect.CodeOf(err))
- database, err := service.getSavedQueryDatabase(ctx, projectID, common.FormatProjectDatabase(projectID, instanceID, databaseName))
+ canonical, err := service.validateSavedQueryDatabase(ctx, projectID, common.FormatProjectDatabase(projectID, instanceID, databaseName))
require.NoError(t, err)
- require.Equal(t, databaseName, database.DatabaseName)
-
- savedQuery, err := service.convertToAPISavedQuery(ctx, &store.WorkSheetMessage{
- ProjectID: projectID,
- ResourceID: "saved-query-a",
- InstanceID: &instanceID,
- DatabaseName: &databaseName,
+ require.Equal(t, common.FormatProjectDatabase(projectID, instanceID, databaseName), canonical)
+
+ // The stored canonical name round-trips through the API shape without
+ // re-resolution — a dangling reference degrades instead of erroring.
+ savedQuery := convertToAPISavedQuery(&store.SavedQueryMessage{
+ ProjectID: projectID,
+ ResourceID: "saved-query-a",
+ Database: canonical,
})
- require.NoError(t, err)
- require.Equal(t, common.FormatProjectDatabase(projectID, instanceID, databaseName), savedQuery.Database)
+ require.Equal(t, canonical, savedQuery.Database)
- workspaceDatabase, err := service.getSavedQueryDatabase(ctx, projectID, common.FormatDatabase("workspace-instance", "shared"))
+ workspaceCanonical, err := service.validateSavedQueryDatabase(ctx, projectID, common.FormatDatabase("workspace-instance", "shared"))
require.NoError(t, err)
- workspaceSavedQuery, err := service.convertToAPISavedQuery(ctx, &store.WorkSheetMessage{
- ProjectID: projectID,
- ResourceID: "saved-query-b",
- InstanceID: &workspaceDatabase.InstanceID,
- DatabaseName: &workspaceDatabase.DatabaseName,
+ require.Equal(t, common.FormatDatabase("workspace-instance", "shared"), workspaceCanonical)
+}
+
+func TestUpdateSavedQueryKeepsDanglingDatabaseReference(t *testing.T) {
+ ctx, stores, projectID, _, _ := setupBOT36ProjectDatabase(t)
+ service := NewSavedQueryService(stores, nil)
+
+ // The database reference is a soft link: an autosave that re-sends the
+ // stored (now dangling) value must not fail validation — that would
+ // brick content saves after the database is deleted or transferred.
+ dangling := common.FormatDatabase("deleted-instance", "gone")
+ created, err := stores.CreateSavedQuery(ctx, &store.SavedQueryMessage{
+ ProjectID: projectID,
+ Creator: "[email protected]",
+ Title: "dangling",
+ Statement: "SELECT 1;",
+ Database: dangling,
})
require.NoError(t, err)
- require.Equal(t, common.FormatDatabase("workspace-instance", "shared"), workspaceSavedQuery.Database)
+
+ updated, err := service.UpdateSavedQuery(ctx, connect.NewRequest(&v1pb.UpdateSavedQueryRequest{
+ SavedQuery: &v1pb.SavedQuery{
+ Name: common.FormatSavedQuery(projectID, created.ResourceID),
+ Database: dangling,
+ Content: []byte("SELECT 2;"),
+ },
+ UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"database", "content"}},
+ }))
+ require.NoError(t, err)
+ require.Equal(t, dangling, updated.Msg.Database)
+ require.Equal(t, []byte("SELECT 2;"), updated.Msg.Content)
+
+ // An explicit change to a nonexistent database still fails hard.
+ _, err = service.UpdateSavedQuery(ctx, connect.NewRequest(&v1pb.UpdateSavedQueryRequest{
+ SavedQuery: &v1pb.SavedQuery{
+ Name: common.FormatSavedQuery(projectID, created.ResourceID),
+ Database: common.FormatDatabase("another-missing", "db"),
+ },
+ UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"database"}},
+ }))
+ require.Equal(t, connect.CodeNotFound, connect.CodeOf(err))
}
func TestBOT36AccessGrantTargetsRequireCanonicalOwningProject(t *testing.T) {
diff --git a/backend/api/v1/saved_query_service.go b/backend/api/v1/saved_query_service.go
index ce1fdd33d8..701343c09e 100644
--- a/backend/api/v1/saved_query_service.go
+++ b/backend/api/v1/saved_query_service.go
@@ -21,8 +21,6 @@ import (
)
// SavedQueryService implements the saved query service.
-// The store layer still uses the legacy worksheet naming (table `worksheet`);
-// this service converts between the two at the API boundary.
type SavedQueryService struct {
v1connect.UnimplementedSavedQueryServiceHandler
store *store.Store
@@ -69,25 +67,19 @@ func (s *SavedQueryService) CreateSavedQuery(
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project with resource id %q had deleted", projectResourceID))
}
- var database *store.DatabaseMessage
+ database := ""
if request.SavedQuery.Database != "" {
- database, err = s.getSavedQueryDatabase(ctx, projectResourceID, request.SavedQuery.Database)
+ database, err = s.validateSavedQueryDatabase(ctx, projectResourceID, request.SavedQuery.Database)
if err != nil {
return nil, err
}
}
- storeSavedQueryCreate, err := convertToStoreWorkSheetMessage(project, database, user.Email, request.SavedQuery)
- if err != nil {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("failed to convert saved query: %v", err))
- }
- savedQuery, err := s.store.CreateWorkSheet(ctx, storeSavedQueryCreate)
+ storeSavedQueryCreate := convertToStoreSavedQueryMessage(project, database, user.Email, request.SavedQuery)
+ savedQuery, err := s.store.CreateSavedQuery(ctx, storeSavedQueryCreate)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create saved query: %v", err))
}
- v1pbSavedQuery, err := s.convertToAPISavedQuery(ctx, savedQuery)
- if err != nil {
- return nil, err
- }
+ v1pbSavedQuery := convertToAPISavedQuery(savedQuery)
return connect.NewResponse(v1pbSavedQuery), nil
}
@@ -114,10 +106,7 @@ func (s *SavedQueryService) GetSavedQuery(
return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("cannot access saved query %s", savedQuery.Title))
}
- v1pbSavedQuery, err := s.convertToAPISavedQuery(ctx, savedQuery)
- if err != nil {
- return nil, err
- }
+ v1pbSavedQuery := convertToAPISavedQuery(savedQuery)
return connect.NewResponse(v1pbSavedQuery), nil
}
@@ -156,12 +145,12 @@ func (s *SavedQueryService) ListSavedQueries(
}
limitPlusOne := offset.limit + 1
- filterQ, err := store.GetListWorksheetFilter(request.Filter)
+ filterQ, err := store.GetListSavedQueryFilter(request.Filter)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- savedQueryList, err := s.store.ListWorkSheets(ctx, &store.FindWorkSheetMessage{
+ savedQueryList, err := s.store.ListSavedQueries(ctx, &store.FindSavedQueryMessage{
ProjectIDs: projectIDs,
Workspace: workspaceID,
PrincipalEmail: user.Email,
@@ -183,10 +172,7 @@ func (s *SavedQueryService) ListSavedQueries(
v1pbSavedQueries := make([]*v1pb.SavedQuery, 0, len(savedQueryList))
for _, savedQuery := range savedQueryList {
- v1pbSavedQuery, err := s.convertToAPISavedQuery(ctx, savedQuery)
- if err != nil {
- return nil, err
- }
+ v1pbSavedQuery := convertToAPISavedQuery(savedQuery)
v1pbSavedQueries = append(v1pbSavedQueries, v1pbSavedQuery)
}
return connect.NewResponse(&v1pb.ListSavedQueriesResponse{
@@ -214,11 +200,11 @@ func (s *SavedQueryService) ListSavedQueryFolders(
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
}
- find := &store.FindWorkSheetMessage{
+ find := &store.FindSavedQueryMessage{
ProjectIDs: []string{projectID},
PrincipalEmail: user.Email,
}
- organizerList, err := s.store.ListWorksheetOrganizers(ctx, find)
+ organizerList, err := s.store.ListSavedQueryOrganizers(ctx, find)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to list saved query folders: %v", err))
}
@@ -230,7 +216,7 @@ func (s *SavedQueryService) ListSavedQueryFolders(
folderByKey := make(map[string]savedQueryFolder)
for _, organizer := range organizerList {
var category v1pb.SavedQueryFolder_Category
- if organizer.WorksheetCreator == user.Email {
+ if organizer.SavedQueryCreator == user.Email {
category = v1pb.SavedQueryFolder_MINE
} else {
category = v1pb.SavedQueryFolder_SHARED
@@ -294,20 +280,20 @@ func (s *SavedQueryService) SearchSavedQueries(
}
limitPlusOne := offset.limit + 1
- savedQueryFind := &store.FindWorkSheetMessage{
+ savedQueryFind := &store.FindSavedQueryMessage{
ProjectIDs: []string{projectID},
PrincipalEmail: user.Email,
Limit: &limitPlusOne,
Offset: &offset.offset,
}
- filterQ, err := store.GetListSheetFilter(ctx, s.store, user.Email, request.Filter, true /* allowTitleContains */)
+ filterQ, err := store.GetSearchSavedQueryFilter(ctx, s.store, user.Email, request.Filter, true /* allowTitleContains */)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
savedQueryFind.FilterQ = filterQ
- savedQueryList, err := s.store.ListWorkSheets(ctx, savedQueryFind)
+ savedQueryList, err := s.store.ListSavedQueries(ctx, savedQueryFind)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to list saved queries: %v", err))
}
@@ -329,10 +315,7 @@ func (s *SavedQueryService) SearchSavedQueries(
slog.Warn("cannot access saved query", slog.String("name", savedQuery.Title))
continue
}
- v1pbSavedQuery, err := s.convertToAPISavedQuery(ctx, savedQuery)
- if err != nil {
- return nil, err
- }
+ v1pbSavedQuery := convertToAPISavedQuery(savedQuery)
v1pbSavedQueries = append(v1pbSavedQueries, v1pbSavedQuery)
}
return connect.NewResponse(&v1pb.SearchSavedQueriesResponse{
@@ -378,7 +361,7 @@ func (s *SavedQueryService) UpdateSavedQuery(
return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("cannot write saved query %s", savedQuery.Title))
}
- savedQueryPatch := &store.PatchWorkSheetMessage{
+ savedQueryPatch := &store.PatchSavedQueryMessage{
ResourceID: savedQuery.ResourceID,
}
for _, path := range request.UpdateMask.Paths {
@@ -388,34 +371,33 @@ func (s *SavedQueryService) UpdateSavedQuery(
case "content":
statement := string(request.SavedQuery.Content)
savedQueryPatch.Statement = &statement
- case "visibility":
- visibility, err := convertToStoreWorkSheetVisibility(request.SavedQuery.Visibility)
- if err != nil {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid visibility %q", request.SavedQuery.Visibility))
- }
- stringVisibility := string(visibility)
- savedQueryPatch.Visibility = &stringVisibility
case "database":
- if request.SavedQuery.Database != "" {
- database, err := s.getSavedQueryDatabase(ctx, savedQuery.ProjectID, request.SavedQuery.Database)
+ switch request.SavedQuery.Database {
+ case savedQuery.Database:
+ // Unchanged — skip validation entirely. The reference is a
+ // soft link: autosave re-sends the stored value on every
+ // write, and re-validating would brick content saves once
+ // the database is deleted or transferred. A stale stored
+ // value keeps dangling, exactly like the read path.
+ case "":
+ emptyStr := ""
+ savedQueryPatch.Database = &emptyStr
+ default:
+ database, err := s.validateSavedQueryDatabase(ctx, savedQuery.ProjectID, request.SavedQuery.Database)
if err != nil {
return nil, err
}
- savedQueryPatch.InstanceID, savedQueryPatch.DatabaseName = &database.InstanceID, &database.DatabaseName
- } else {
- emptyStr := ""
- savedQueryPatch.InstanceID = &emptyStr
- savedQueryPatch.DatabaseName = &emptyStr
+ savedQueryPatch.Database = &database
}
default:
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid update mask path %q", path))
}
}
- if err := s.store.PatchWorkSheet(ctx, savedQueryPatch); err != nil {
+ if err := s.store.PatchSavedQuery(ctx, savedQueryPatch); err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to update saved query: %v", err))
}
- savedQuery, err = s.store.GetWorkSheet(ctx, &store.FindWorkSheetMessage{
+ savedQuery, err = s.store.GetSavedQuery(ctx, &store.FindSavedQueryMessage{
ProjectIDs: []string{savedQuery.ProjectID},
ResourceID: &savedQueryID,
PrincipalEmail: user.Email,
@@ -426,10 +408,7 @@ func (s *SavedQueryService) UpdateSavedQuery(
if savedQuery == nil {
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("saved query %q not found", request.SavedQuery.Name))
}
- v1pbSavedQuery, err := s.convertToAPISavedQuery(ctx, savedQuery)
- if err != nil {
- return nil, err
- }
+ v1pbSavedQuery := convertToAPISavedQuery(savedQuery)
return connect.NewResponse(v1pbSavedQuery), nil
}
@@ -455,7 +434,7 @@ func (s *SavedQueryService) DeleteSavedQuery(
return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("cannot write saved query %s", savedQuery.Title))
}
- if err := s.store.DeleteWorkSheet(ctx, savedQuery.ResourceID); err != nil {
+ if err := s.store.DeleteSavedQuery(ctx, savedQuery.ResourceID); err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to delete saved query: %v", err))
}
@@ -490,7 +469,7 @@ func (s *SavedQueryService) UpdateSavedQueryOrganizer(
if !ok {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
}
- savedQueryOrganizerUpsert, err := s.store.GetWorksheetOrganizer(ctx, savedQuery.ResourceID, user.Email)
+ savedQueryOrganizerUpsert, err := s.store.GetSavedQueryOrganizer(ctx, savedQuery.ResourceID, user.Email)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to found saved query organizer with error: %v", err))
}
@@ -506,7 +485,7 @@ func (s *SavedQueryService) UpdateSavedQueryOrganizer(
}
}
- organizer, err := s.store.UpsertWorksheetOrganizer(ctx, savedQueryOrganizerUpsert)
+ 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))
}
@@ -546,11 +525,11 @@ func (s *SavedQueryService) BatchUpdateSavedQueryOrganizer(
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
}
- filterQ, err := store.GetListSheetFilter(ctx, s.store, user.Email, request.Filter, false /* allowTitleContains */)
+ filterQ, err := store.GetSearchSavedQueryFilter(ctx, s.store, user.Email, request.Filter, false /* allowTitleContains */)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- savedQueryList, err := s.store.ListWorkSheets(ctx, &store.FindWorkSheetMessage{
+ savedQueryList, err := s.store.ListSavedQueries(ctx, &store.FindSavedQueryMessage{
ProjectIDs: []string{projectID},
PrincipalEmail: user.Email,
FilterQ: filterQ,
@@ -572,9 +551,9 @@ func (s *SavedQueryService) BatchUpdateSavedQueryOrganizer(
savedQueryIDs = append(savedQueryIDs, savedQuery.ResourceID)
}
- patch := &store.BatchUpdateWorksheetOrganizerPatch{
- WorksheetResourceIDs: savedQueryIDs,
- Principal: user.Email,
+ patch := &store.BatchUpdateSavedQueryOrganizerPatch{
+ SavedQueryResourceIDs: savedQueryIDs,
+ Principal: user.Email,
}
for _, path := range request.UpdateMask.Paths {
switch path {
@@ -589,7 +568,7 @@ func (s *SavedQueryService) BatchUpdateSavedQueryOrganizer(
}
}
- organizers, err := s.store.BatchUpdateWorksheetOrganizer(ctx, patch)
+ organizers, err := s.store.BatchUpdateSavedQueryOrganizer(ctx, patch)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to batch update saved query organizers: %v", err))
}
@@ -598,7 +577,7 @@ func (s *SavedQueryService) BatchUpdateSavedQueryOrganizer(
}
for _, organizer := range organizers {
response.SavedQueryOrganizers = append(response.SavedQueryOrganizers, &v1pb.SavedQueryOrganizer{
- SavedQuery: fmt.Sprintf("%s/savedQueries/%s", request.Parent, organizer.WorksheetResourceID),
+ SavedQuery: fmt.Sprintf("%s/savedQueries/%s", request.Parent, organizer.SavedQueryResourceID),
Starred: organizer.Payload.Starred,
Folders: organizer.Payload.Folders,
})
@@ -606,12 +585,12 @@ func (s *SavedQueryService) BatchUpdateSavedQueryOrganizer(
return connect.NewResponse(response), nil
}
-func (s *SavedQueryService) findSavedQuery(ctx context.Context, projectID string, savedQueryID string, loadFull bool) (*store.WorkSheetMessage, error) {
+func (s *SavedQueryService) findSavedQuery(ctx context.Context, projectID string, savedQueryID string, loadFull bool) (*store.SavedQueryMessage, error) {
user, ok := GetUserFromContext(ctx)
if !ok {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
}
- savedQuery, err := s.store.GetWorkSheet(ctx, &store.FindWorkSheetMessage{
+ savedQuery, err := s.store.GetSavedQuery(ctx, &store.FindSavedQueryMessage{
ProjectIDs: []string{projectID},
ResourceID: &savedQueryID,
LoadFull: loadFull,
@@ -626,13 +605,19 @@ func (s *SavedQueryService) findSavedQuery(ctx context.Context, projectID string
return savedQuery, nil
}
-func (s *SavedQueryService) getSavedQueryDatabase(ctx context.Context, projectID, name string) (*store.DatabaseMessage, error) {
+// validateSavedQueryDatabase checks that `name` refers to an existing
+// database in the saved query's own project and is canonical for its
+// instance's scope (project form for a project instance, workspace form
+// otherwise), then returns it as the canonical name to store. The stored
+// reference is soft: it is validated only at write time and may dangle
+// afterwards.
+func (s *SavedQueryService) validateSavedQueryDatabase(ctx context.Context, projectID, name string) (string, error) {
targetProjectID, instanceID, databaseName, err := common.GetDatabaseResourceName(name)
if err != nil {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", name))
+ return "", connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", name))
}
if targetProjectID != nil && *targetProjectID != projectID {
- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found in project %q", name, projectID))
+ return "", connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found in project %q", name, projectID))
}
database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{
Workspace: common.GetWorkspaceIDFromContext(ctx),
@@ -640,76 +625,46 @@ func (s *SavedQueryService) getSavedQueryDatabase(ctx context.Context, projectID
DatabaseName: &databaseName,
})
if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get database"))
+ return "", connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get database"))
}
if database == nil || database.ProjectID != projectID {
- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found in project %q", name, projectID))
+ return "", connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found in project %q", name, projectID))
}
instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{
Workspace: common.GetWorkspaceIDFromContext(ctx),
ResourceID: &instanceID,
})
if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get instance %q", instanceID))
+ return "", connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get instance %q", instanceID))
}
if instance == nil || instance.Deleted {
- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("instance %q not found", instanceID))
+ return "", connect.NewError(connect.CodeNotFound, errors.Errorf("instance %q not found", instanceID))
}
if (targetProjectID == nil) != (instance.ProjectID == nil) ||
targetProjectID != nil && *targetProjectID != *instance.ProjectID {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("database name %q is not canonical for its instance", name))
+ return "", connect.NewError(connect.CodeInvalidArgument, errors.Errorf("database name %q is not canonical for its instance", name))
}
- return database, nil
+ return name, nil
}
// canWriteSavedQuery check if the principal can write the saved query.
-// The saved query is writable when the user has bb.worksheets.manage permission on the workspace, or.
-// PRIVATE: the creator.
-// PROJECT_WRITE: all members with bb.projects.get permission in the project.
-func (s *SavedQueryService) canWriteSavedQuery(ctx context.Context, savedQuery *store.WorkSheetMessage) (bool, error) {
- user, ok := GetUserFromContext(ctx)
- if !ok {
- return false, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
- }
-
- // The saved query creator and workspace "bb.worksheets.manage" can always write.
- if savedQuery.Creator == user.Email {
- return true, nil
- }
- ok, err := s.iamManager.CheckPermission(ctx, permission.WorksheetsManage, user, common.GetWorkspaceIDFromContext(ctx))
- if err != nil {
- return false, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))
- }
- if ok {
- return true, nil
- }
-
- switch savedQuery.Visibility {
- case store.PrivateWorkSheet:
- return false, nil
- case store.ProjectReadWorkSheet:
- // For READ visibility, check the "bb.worksheets.manage" permission in the project.
- return s.checkSavedQueryPermission(ctx, savedQuery.ProjectID, user, permission.WorksheetsManage)
- case store.ProjectWriteWorkSheet:
- // For READ visibility, needs "bb.worksheets.get" permission in the project.
- return s.checkSavedQueryPermission(ctx, savedQuery.ProjectID, user, permission.WorksheetsGet)
- default:
- return false, nil
- }
+// Saved queries are private: only the creator, or a caller holding
+// "bb.worksheets.manage" on the workspace (the admin backstop), can write.
+func (s *SavedQueryService) canWriteSavedQuery(ctx context.Context, savedQuery *store.SavedQueryMessage) (bool, error) {
+ return s.canAccessSavedQuery(ctx, savedQuery)
}
// canReadSavedQuery check if the principal can read the saved query.
-// The saved query is readable when the user has bb.worksheets.get permission on the workspace, or.
-// PRIVATE: the creator only.
-// PROJECT_WRITE: all members with bb.projects.get permission in the project.
-// PROJECT_READ: all members with bb.projects.get permission in the project.
-func (s *SavedQueryService) canReadSavedQuery(ctx context.Context, savedQuery *store.WorkSheetMessage) (bool, error) {
+// The access is the same as canWriteSavedQuery.
+func (s *SavedQueryService) canReadSavedQuery(ctx context.Context, savedQuery *store.SavedQueryMessage) (bool, error) {
+ return s.canAccessSavedQuery(ctx, savedQuery)
+}
+
+func (s *SavedQueryService) canAccessSavedQuery(ctx context.Context, savedQuery *store.SavedQueryMessage) (bool, error) {
user, ok := GetUserFromContext(ctx)
if !ok {
return false, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
}
-
- // The saved query creator and workspace bb.worksheets.get can always read.
if savedQuery.Creator == user.Email {
return true, nil
}
@@ -717,120 +672,35 @@ func (s *SavedQueryService) canReadSavedQuery(ctx context.Context, savedQuery *s
if err != nil {
return false, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))
}
- if ok {
- return true, nil
- }
-
- switch savedQuery.Visibility {
- case store.PrivateWorkSheet:
- return false, nil
- case store.ProjectReadWorkSheet, store.ProjectWriteWorkSheet:
- // Check the "bb.worksheets.get" permission in the project.
- return s.checkSavedQueryPermission(ctx, savedQuery.ProjectID, user, permission.WorksheetsGet)
- default:
- return false, nil
- }
-}
-
-func (s *SavedQueryService) checkSavedQueryPermission(
- ctx context.Context,
- projectID string,
- user *store.UserMessage,
- permission permission.Permission,
-) (bool, error) {
- workspaceID := common.GetWorkspaceIDFromContext(ctx)
- project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
- Workspace: workspaceID,
- ResourceID: &projectID,
- })
- if err != nil {
- return false, err
- }
- ok, err := s.iamManager.CheckPermission(ctx, permission, user, workspaceID, project.ResourceID)
- if err != nil {
- return false, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))
- }
return ok, nil
}
-func (s *SavedQueryService) convertToAPISavedQuery(ctx context.Context, savedQuery *store.WorkSheetMessage) (*v1pb.SavedQuery, error) {
- databaseParent := ""
- if savedQuery.InstanceID != nil && savedQuery.DatabaseName != nil {
- instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{
- Workspace: common.GetWorkspaceIDFromContext(ctx),
- ResourceID: savedQuery.InstanceID,
- })
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get saved query instance %q", *savedQuery.InstanceID))
- }
- if instance == nil {
- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("saved query instance %q not found", *savedQuery.InstanceID))
- }
- databaseParent = common.FormatDatabase(*savedQuery.InstanceID, *savedQuery.DatabaseName)
- if instance.ProjectID != nil {
- databaseParent = common.FormatProjectDatabase(*instance.ProjectID, *savedQuery.InstanceID, *savedQuery.DatabaseName)
- }
- }
-
- visibility := v1pb.SavedQuery_VISIBILITY_UNSPECIFIED
- switch savedQuery.Visibility {
- case store.ProjectReadWorkSheet:
- visibility = v1pb.SavedQuery_PROJECT_READ
- case store.ProjectWriteWorkSheet:
- visibility = v1pb.SavedQuery_PROJECT_WRITE
- case store.PrivateWorkSheet:
- visibility = v1pb.SavedQuery_PRIVATE
- default:
- // Keep VISIBILITY_UNSPECIFIED
- }
+// convertToAPISavedQuery converts a store message to the API shape. The
+// stored database reference is already the canonical name and is returned
+// as is — it is soft and may dangle, in which case the UI degrades to "no
+// database" (no per-row resolution, no hard error).
+func convertToAPISavedQuery(savedQuery *store.SavedQueryMessage) *v1pb.SavedQuery {
return &v1pb.SavedQuery{
Name: common.FormatSavedQuery(savedQuery.ProjectID, savedQuery.ResourceID),
Project: common.FormatProject(savedQuery.ProjectID),
- Database: databaseParent,
+ Database: savedQuery.Database,
Title: savedQuery.Title,
Creator: fmt.Sprintf("users/%s", savedQuery.Creator),
CreateTime: timestamppb.New(savedQuery.CreatedAt),
UpdateTime: timestamppb.New(savedQuery.UpdatedAt),
Content: []byte(savedQuery.Statement),
ContentSize: savedQuery.Size,
- Visibility: visibility,
Starred: savedQuery.Starred,
Folders: savedQuery.Folders,
- }, nil
-}
-
-func convertToStoreWorkSheetMessage(project *store.ProjectMessage, database *store.DatabaseMessage, creator string, savedQuery *v1pb.SavedQuery) (*store.WorkSheetMessage, error) {
- visibility, err := convertToStoreWorkSheetVisibility(savedQuery.Visibility)
- if err != nil {
- return nil, err
}
-
- worksheetMessage := &store.WorkSheetMessage{
- ProjectID: project.ResourceID,
- Creator: creator,
- Title: savedQuery.Title,
- Statement: string(savedQuery.Content),
- Visibility: visibility,
- }
- if database != nil {
- worksheetMessage.InstanceID = &database.InstanceID
- worksheetMessage.DatabaseName = &database.DatabaseName
- }
-
- return worksheetMessage, nil
}
-func convertToStoreWorkSheetVisibility(visibility v1pb.SavedQuery_Visibility) (store.WorkSheetVisibility, error) {
- switch visibility {
- case v1pb.SavedQuery_VISIBILITY_UNSPECIFIED:
- return store.WorkSheetVisibility(""), connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid visibility %q", visibility))
- case v1pb.SavedQuery_PROJECT_READ:
- return store.ProjectReadWorkSheet, nil
- case v1pb.SavedQuery_PROJECT_WRITE:
- return store.ProjectWriteWorkSheet, nil
- case v1pb.SavedQuery_PRIVATE:
- return store.PrivateWorkSheet, nil
- default:
- return store.WorkSheetVisibility(""), connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid visibility %q", visibility))
+func convertToStoreSavedQueryMessage(project *store.ProjectMessage, database string, creator string, savedQuery *v1pb.SavedQuery) *store.SavedQueryMessage {
+ return &store.SavedQueryMessage{
+ ProjectID: project.ResourceID,
+ Creator: creator,
+ Title: savedQuery.Title,
+ Statement: string(savedQuery.Content),
+ Database: database,
}
}
diff --git a/backend/generated-go/store/saved_query.pb.go b/backend/generated-go/store/saved_query.pb.go
new file mode 100644
index 0000000000..b7c14a90c2
--- /dev/null
+++ b/backend/generated-go/store/saved_query.pb.go
@@ -0,0 +1,187 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.36.12
+// protoc (unknown)
+// source: store/saved_query.proto
+
+package store
+
+import (
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+ reflect "reflect"
+ sync "sync"
+ unsafe "unsafe"
+)
+
+const (
+ // Verify that this generated code is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+type SavedQueryPayload struct {
+ state protoimpl.MessageState `protogen:"open.v1"`
+ // The connected database, stored as its canonical resource name:
+ // instances/{instance}/databases/{database} for a workspace instance,
+ // projects/{project}/instances/{instance}/databases/{database} for a
+ // project instance. Validated against the saved query's own project at
+ // write time; the reference is soft and may dangle after the database
+ // is deleted or transferred, degrading to "no database" in the UI.
+ Database string `protobuf:"bytes,1,opt,name=database,proto3" json:"database,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
+}
+
+func (x *SavedQueryPayload) Reset() {
+ *x = SavedQueryPayload{}
+ mi := &file_store_saved_query_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+}
+
+func (x *SavedQueryPayload) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SavedQueryPayload) ProtoMessage() {}
+
+func (x *SavedQueryPayload) ProtoReflect() protoreflect.Message {
+ mi := &file_store_saved_query_proto_msgTypes[0]
+ 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 SavedQueryPayload.ProtoReflect.Descriptor instead.
+func (*SavedQueryPayload) Descriptor() ([]byte, []int) {
+ return file_store_saved_query_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *SavedQueryPayload) GetDatabase() string {
+ if x != nil {
+ return x.Database
+ }
+ 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.FileDescriptor
+
+const 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" +
+ "\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 (
+ file_store_saved_query_proto_rawDescOnce sync.Once
+ file_store_saved_query_proto_rawDescData []byte
+)
+
+func file_store_saved_query_proto_rawDescGZIP() []byte {
+ file_store_saved_query_proto_rawDescOnce.Do(func() {
+ file_store_saved_query_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_store_saved_query_proto_rawDesc), len(file_store_saved_query_proto_rawDesc)))
+ })
+ return file_store_saved_query_proto_rawDescData
+}
+
+var file_store_saved_query_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_store_saved_query_proto_goTypes = []any{
+ (*SavedQueryPayload)(nil), // 0: bytebase.store.SavedQueryPayload
+ (*SavedQueryOrganizerPayload)(nil), // 1: bytebase.store.SavedQueryOrganizerPayload
+}
+var file_store_saved_query_proto_depIdxs = []int32{
+ 0, // [0:0] is the sub-list for method output_type
+ 0, // [0:0] is the sub-list for method input_type
+ 0, // [0:0] is the sub-list for extension type_name
+ 0, // [0:0] is the sub-list for extension extendee
+ 0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_store_saved_query_proto_init() }
+func file_store_saved_query_proto_init() {
+ if File_store_saved_query_proto != nil {
+ return
+ }
+ type x struct{}
+ out := protoimpl.TypeBuilder{
+ File: protoimpl.DescBuilder{
+ 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,
+ NumExtensions: 0,
+ NumServices: 0,
+ },
+ GoTypes: file_store_saved_query_proto_goTypes,
+ DependencyIndexes: file_store_saved_query_proto_depIdxs,
+ MessageInfos: file_store_saved_query_proto_msgTypes,
+ }.Build()
+ File_store_saved_query_proto = out.File
+ file_store_saved_query_proto_goTypes = nil
+ file_store_saved_query_proto_depIdxs = nil
+}
diff --git a/backend/generated-go/store/worksheet_equal.pb.go b/backend/generated-go/store/saved_query_equal.pb.go
similarity index 53%
rename from backend/generated-go/store/worksheet_equal.pb.go
rename to backend/generated-go/store/saved_query_equal.pb.go
index caf879117e..0109c591a1 100644
--- a/backend/generated-go/store/worksheet_equal.pb.go
+++ b/backend/generated-go/store/saved_query_equal.pb.go
@@ -1,9 +1,22 @@
// Code generated by protoc-gen-equal-go. DO NOT EDIT.
-// source: store/worksheet.proto
+// source: store/saved_query.proto
package store
-func (x *WorkSheetOrganizerPayload) Equal(y *WorkSheetOrganizerPayload) bool {
+func (x *SavedQueryPayload) Equal(y *SavedQueryPayload) bool {
+ if x == y {
+ return true
+ }
+ if x == nil || y == nil {
+ return x == nil && y == nil
+ }
+ if x.Database != y.Database {
+ return false
+ }
+ return true
+}
+
+func (x *SavedQueryOrganizerPayload) Equal(y *SavedQueryOrganizerPayload) bool {
if x == y {
return true
}
diff --git a/backend/generated-go/store/worksheet.pb.go b/backend/generated-go/store/worksheet.pb.go
deleted file mode 100644
index 21d0cfc0d9..0000000000
--- a/backend/generated-go/store/worksheet.pb.go
+++ /dev/null
@@ -1,134 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// protoc-gen-go v1.36.12
-// protoc (unknown)
-// source: store/worksheet.proto
-
-package store
-
-import (
- protoreflect "google.golang.org/protobuf/reflect/protoreflect"
- protoimpl "google.golang.org/protobuf/runtime/protoimpl"
- reflect "reflect"
- sync "sync"
- unsafe "unsafe"
-)
-
-const (
- // Verify that this generated code is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
- // Verify that runtime/protoimpl is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type WorkSheetOrganizerPayload struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Starred bool `protobuf:"varint,1,opt,name=starred,proto3" json:"starred,omitempty"`
- // The folder path for a worksheet.
- // For example, if the folders is [A, B, C], means the worksheet 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 *WorkSheetOrganizerPayload) Reset() {
- *x = WorkSheetOrganizerPayload{}
- mi := &file_store_worksheet_proto_msgTypes[0]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
-}
-
-func (x *WorkSheetOrganizerPayload) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WorkSheetOrganizerPayload) ProtoMessage() {}
-
-func (x *WorkSheetOrganizerPayload) ProtoReflect() protoreflect.Message {
- mi := &file_store_worksheet_proto_msgTypes[0]
- 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 WorkSheetOrganizerPayload.ProtoReflect.Descriptor instead.
-func (*WorkSheetOrganizerPayload) Descriptor() ([]byte, []int) {
- return file_store_worksheet_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *WorkSheetOrganizerPayload) GetStarred() bool {
- if x != nil {
- return x.Starred
- }
- return false
-}
-
-func (x *WorkSheetOrganizerPayload) GetFolders() []string {
- if x != nil {
- return x.Folders
- }
- return nil
-}
-
-var File_store_worksheet_proto protoreflect.FileDescriptor
-
-const file_store_worksheet_proto_rawDesc = "" +
- "\n" +
- "\x15store/worksheet.proto\x12\x0ebytebase.store\"O\n" +
- "\x19WorkSheetOrganizerPayload\x12\x18\n" +
- "\astarred\x18\x01 \x01(\bR\astarred\x12\x18\n" +
- "\afolders\x18\x02 \x03(\tR\afoldersB\x91\x01\n" +
- "\x12com.bytebase.storeB\x0eWorksheetProtoP\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 (
- file_store_worksheet_proto_rawDescOnce sync.Once
- file_store_worksheet_proto_rawDescData []byte
-)
-
-func file_store_worksheet_proto_rawDescGZIP() []byte {
- file_store_worksheet_proto_rawDescOnce.Do(func() {
- file_store_worksheet_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_store_worksheet_proto_rawDesc), len(file_store_worksheet_proto_rawDesc)))
- })
- return file_store_worksheet_proto_rawDescData
-}
-
-var file_store_worksheet_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_store_worksheet_proto_goTypes = []any{
- (*WorkSheetOrganizerPayload)(nil), // 0: bytebase.store.WorkSheetOrganizerPayload
-}
-var file_store_worksheet_proto_depIdxs = []int32{
- 0, // [0:0] is the sub-list for method output_type
- 0, // [0:0] is the sub-list for method input_type
- 0, // [0:0] is the sub-list for extension type_name
- 0, // [0:0] is the sub-list for extension extendee
- 0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_store_worksheet_proto_init() }
-func file_store_worksheet_proto_init() {
- if File_store_worksheet_proto != nil {
- return
- }
- type x struct{}
- out := protoimpl.TypeBuilder{
- File: protoimpl.DescBuilder{
- GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
- RawDescriptor: unsafe.Slice(unsafe.StringData(file_store_worksheet_proto_rawDesc), len(file_store_worksheet_proto_rawDesc)),
- NumEnums: 0,
- NumMessages: 1,
- NumExtensions: 0,
- NumServices: 0,
- },
- GoTypes: file_store_worksheet_proto_goTypes,
- DependencyIndexes: file_store_worksheet_proto_depIdxs,
- MessageInfos: file_store_worksheet_proto_msgTypes,
- }.Build()
- File_store_worksheet_proto = out.File
- file_store_worksheet_proto_goTypes = nil
- file_store_worksheet_proto_depIdxs = nil
-}
diff --git a/backend/generated-go/v1/saved_query_service.pb.go b/backend/generated-go/v1/saved_query_service.pb.go
index f0319088fe..3dc394c373 100644
--- a/backend/generated-go/v1/saved_query_service.pb.go
+++ b/backend/generated-go/v1/saved_query_service.pb.go
@@ -75,61 +75,6 @@ func (SavedQueryFolder_Category) EnumDescriptor() ([]byte, []int) {
return file_v1_saved_query_service_proto_rawDescGZIP(), []int{6, 0}
}
-type SavedQuery_Visibility int32
-
-const (
- SavedQuery_VISIBILITY_UNSPECIFIED SavedQuery_Visibility = 0
- // Read access in project scope, saved query OWNER/DBA and project OWNER can read/write, other project members can read.
- SavedQuery_PROJECT_READ SavedQuery_Visibility = 1
- // Write access in project scope, saved query OWNER/DBA and all members in the project can write the saved query.
- SavedQuery_PROJECT_WRITE SavedQuery_Visibility = 2
- // Private, only saved query OWNER can read/write.
- SavedQuery_PRIVATE SavedQuery_Visibility = 3
-)
-
-// Enum value maps for SavedQuery_Visibility.
-var (
- SavedQuery_Visibility_name = map[int32]string{
- 0: "VISIBILITY_UNSPECIFIED",
- 1: "PROJECT_READ",
- 2: "PROJECT_WRITE",
- 3: "PRIVATE",
- }
- SavedQuery_Visibility_value = map[string]int32{
- "VISIBILITY_UNSPECIFIED": 0,
- "PROJECT_READ": 1,
- "PROJECT_WRITE": 2,
- "PRIVATE": 3,
- }
-)
-
-func (x SavedQuery_Visibility) Enum() *SavedQuery_Visibility {
- p := new(SavedQuery_Visibility)
- *p = x
- return p
-}
-
-func (x SavedQuery_Visibility) String() string {
- return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (SavedQuery_Visibility) Descriptor() protoreflect.EnumDescriptor {
- return file_v1_saved_query_service_proto_enumTypes[1].Descriptor()
-}
-
-func (SavedQuery_Visibility) Type() protoreflect.EnumType {
- return &file_v1_saved_query_service_proto_enumTypes[1]
-}
-
-func (x SavedQuery_Visibility) Number() protoreflect.EnumNumber {
- return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use SavedQuery_Visibility.Descriptor instead.
-func (SavedQuery_Visibility) EnumDescriptor() ([]byte, []int) {
- return file_v1_saved_query_service_proto_rawDescGZIP(), []int{15, 0}
-}
-
type CreateSavedQueryRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The parent resource where this saved query will be created.
@@ -530,12 +475,11 @@ type UpdateSavedQueryRequest struct {
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`, `statement`; *not* `saved_query.title` or `saved_query.statement`)
+ // (e.g., `title`, `content`; *not* `saved_query.title` or `saved_query.content`)
// Only support update the following fields for now:
// - `title`
- // - `statement`
- // - `starred`
- // - `visibility`
+ // - `content`
+ // - `database`
UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
@@ -597,7 +541,6 @@ 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.
- // - visibility: check Visibility enum in the SavedQuery message for values, support "==" and "in [xx]" operator.
// - folder: the saved query organizer folder path, support exact "==" operator.
Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
// The organizer fields to update.
@@ -914,7 +857,6 @@ 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.
- // - visibility: check Visibility enum in the SavedQuery message for values, support "==" and "in [xx]" operator.
// - folder: the saved query organizer folder path, support "==" operator.
//
// For example:
@@ -923,8 +865,6 @@ type SearchSavedQueriesRequest struct {
// creator != "users/{email}"
// starred == true
// starred == false
- // visibility in ["PRIVATE", "PROJECT_READ", "PROJECT_WRITE"]
- // visibility == "PRIVATE"
// folder == "foo/bar"
Filter string `protobuf:"bytes,2,opt,name=filter,proto3" json:"filter,omitempty"`
// The maximum number of saved queries to return. The service may return fewer than
@@ -1080,8 +1020,7 @@ type SavedQuery struct {
// use GetSavedQuery() request to retrieve the full content.
Content []byte `protobuf:"bytes,8,opt,name=content,proto3" json:"content,omitempty"`
// 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"`
- Visibility SavedQuery_Visibility `protobuf:"varint,10,opt,name=visibility,proto3,enum=bytebase.v1.SavedQuery_Visibility" json:"visibility,omitempty"`
+ 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"`
@@ -1182,13 +1121,6 @@ func (x *SavedQuery) GetContentSize() int64 {
return 0
}
-func (x *SavedQuery) GetVisibility() SavedQuery_Visibility {
- if x != nil {
- return x.Visibility
- }
- return SavedQuery_VISIBILITY_UNSPECIFIED
-}
-
func (x *SavedQuery) GetStarred() bool {
if x != nil {
return x.Starred
@@ -1270,7 +1202,7 @@ const file_v1_saved_query_service_proto_rawDesc = "" +
"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\"\xd3\x04\n" +
+ "\x0fnext_page_token\x18\x02 \x01(\tR\rnextPageToken\"\xc0\x03\n" +
"\n" +
"SavedQuery\x12\x1a\n" +
"\x04name\x18\x01 \x01(\tB\x06\xe0A\x02\xe0A\x05R\x04name\x12\x1d\n" +
@@ -1283,19 +1215,11 @@ const file_v1_saved_query_service_proto_rawDesc = "" +
"\vupdate_time\x18\a \x01(\v2\x1a.google.protobuf.TimestampB\x03\xe0A\x03R\n" +
"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\x12G\n" +
- "\n" +
- "visibility\x18\n" +
- " \x01(\x0e2\".bytebase.v1.SavedQuery.VisibilityB\x03\xe0A\x02R\n" +
- "visibility\x12\x1d\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\"Z\n" +
- "\n" +
- "Visibility\x12\x1a\n" +
- "\x16VISIBILITY_UNSPECIFIED\x10\x00\x12\x10\n" +
- "\fPROJECT_READ\x10\x01\x12\x11\n" +
- "\rPROJECT_WRITE\x10\x02\x12\v\n" +
- "\aPRIVATE\x10\x032\xee\f\n" +
+ "\afolders\x18\f \x03(\tB\x03\xe0A\x03R\afoldersJ\x04\b\n" +
+ "\x10\vR\n" +
+ "visibility2\xee\f\n" +
"\x11SavedQueryService\x12\xa5\x01\n" +
"\x10CreateSavedQuery\x12$.bytebase.v1.CreateSavedQueryRequest\x1a\x17.bytebase.v1.SavedQuery\"R\xdaA\x12parent,saved_query\x90\xea0\x02\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" +
@@ -1320,70 +1244,68 @@ 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, 2)
+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_goTypes = []any{
(SavedQueryFolder_Category)(0), // 0: bytebase.v1.SavedQueryFolder.Category
- (SavedQuery_Visibility)(0), // 1: bytebase.v1.SavedQuery.Visibility
- (*CreateSavedQueryRequest)(nil), // 2: bytebase.v1.CreateSavedQueryRequest
- (*GetSavedQueryRequest)(nil), // 3: bytebase.v1.GetSavedQueryRequest
- (*ListSavedQueriesRequest)(nil), // 4: bytebase.v1.ListSavedQueriesRequest
- (*ListSavedQueriesResponse)(nil), // 5: bytebase.v1.ListSavedQueriesResponse
- (*ListSavedQueryFoldersRequest)(nil), // 6: bytebase.v1.ListSavedQueryFoldersRequest
- (*ListSavedQueryFoldersResponse)(nil), // 7: bytebase.v1.ListSavedQueryFoldersResponse
- (*SavedQueryFolder)(nil), // 8: bytebase.v1.SavedQueryFolder
- (*UpdateSavedQueryRequest)(nil), // 9: bytebase.v1.UpdateSavedQueryRequest
- (*BatchUpdateSavedQueryOrganizerRequest)(nil), // 10: bytebase.v1.BatchUpdateSavedQueryOrganizerRequest
- (*BatchUpdateSavedQueryOrganizerResponse)(nil), // 11: bytebase.v1.BatchUpdateSavedQueryOrganizerResponse
- (*UpdateSavedQueryOrganizerRequest)(nil), // 12: bytebase.v1.UpdateSavedQueryOrganizerRequest
- (*SavedQueryOrganizer)(nil), // 13: bytebase.v1.SavedQueryOrganizer
- (*DeleteSavedQueryRequest)(nil), // 14: bytebase.v1.DeleteSavedQueryRequest
- (*SearchSavedQueriesRequest)(nil), // 15: bytebase.v1.SearchSavedQueriesRequest
- (*SearchSavedQueriesResponse)(nil), // 16: bytebase.v1.SearchSavedQueriesResponse
- (*SavedQuery)(nil), // 17: bytebase.v1.SavedQuery
- (*fieldmaskpb.FieldMask)(nil), // 18: google.protobuf.FieldMask
- (*timestamppb.Timestamp)(nil), // 19: google.protobuf.Timestamp
- (*emptypb.Empty)(nil), // 20: google.protobuf.Empty
+ (*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
}
var file_v1_saved_query_service_proto_depIdxs = []int32{
- 17, // 0: bytebase.v1.CreateSavedQueryRequest.saved_query:type_name -> bytebase.v1.SavedQuery
- 17, // 1: bytebase.v1.ListSavedQueriesResponse.saved_queries:type_name -> bytebase.v1.SavedQuery
- 8, // 2: bytebase.v1.ListSavedQueryFoldersResponse.folders:type_name -> bytebase.v1.SavedQueryFolder
+ 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
- 17, // 4: bytebase.v1.UpdateSavedQueryRequest.saved_query:type_name -> bytebase.v1.SavedQuery
- 18, // 5: bytebase.v1.UpdateSavedQueryRequest.update_mask:type_name -> google.protobuf.FieldMask
- 13, // 6: bytebase.v1.BatchUpdateSavedQueryOrganizerRequest.organizer:type_name -> bytebase.v1.SavedQueryOrganizer
- 18, // 7: bytebase.v1.BatchUpdateSavedQueryOrganizerRequest.update_mask:type_name -> google.protobuf.FieldMask
- 13, // 8: bytebase.v1.BatchUpdateSavedQueryOrganizerResponse.saved_query_organizers:type_name -> bytebase.v1.SavedQueryOrganizer
- 13, // 9: bytebase.v1.UpdateSavedQueryOrganizerRequest.organizer:type_name -> bytebase.v1.SavedQueryOrganizer
- 18, // 10: bytebase.v1.UpdateSavedQueryOrganizerRequest.update_mask:type_name -> google.protobuf.FieldMask
- 17, // 11: bytebase.v1.SearchSavedQueriesResponse.saved_queries:type_name -> bytebase.v1.SavedQuery
- 19, // 12: bytebase.v1.SavedQuery.create_time:type_name -> google.protobuf.Timestamp
- 19, // 13: bytebase.v1.SavedQuery.update_time:type_name -> google.protobuf.Timestamp
- 1, // 14: bytebase.v1.SavedQuery.visibility:type_name -> bytebase.v1.SavedQuery.Visibility
- 2, // 15: bytebase.v1.SavedQueryService.CreateSavedQuery:input_type -> bytebase.v1.CreateSavedQueryRequest
- 3, // 16: bytebase.v1.SavedQueryService.GetSavedQuery:input_type -> bytebase.v1.GetSavedQueryRequest
- 4, // 17: bytebase.v1.SavedQueryService.ListSavedQueries:input_type -> bytebase.v1.ListSavedQueriesRequest
- 6, // 18: bytebase.v1.SavedQueryService.ListSavedQueryFolders:input_type -> bytebase.v1.ListSavedQueryFoldersRequest
- 15, // 19: bytebase.v1.SavedQueryService.SearchSavedQueries:input_type -> bytebase.v1.SearchSavedQueriesRequest
- 9, // 20: bytebase.v1.SavedQueryService.UpdateSavedQuery:input_type -> bytebase.v1.UpdateSavedQueryRequest
- 12, // 21: bytebase.v1.SavedQueryService.UpdateSavedQueryOrganizer:input_type -> bytebase.v1.UpdateSavedQueryOrganizerRequest
- 10, // 22: bytebase.v1.SavedQueryService.BatchUpdateSavedQueryOrganizer:input_type -> bytebase.v1.BatchUpdateSavedQueryOrganizerRequest
- 14, // 23: bytebase.v1.SavedQueryService.DeleteSavedQuery:input_type -> bytebase.v1.DeleteSavedQueryRequest
- 17, // 24: bytebase.v1.SavedQueryService.CreateSavedQuery:output_type -> bytebase.v1.SavedQuery
- 17, // 25: bytebase.v1.SavedQueryService.GetSavedQuery:output_type -> bytebase.v1.SavedQuery
- 5, // 26: bytebase.v1.SavedQueryService.ListSavedQueries:output_type -> bytebase.v1.ListSavedQueriesResponse
- 7, // 27: bytebase.v1.SavedQueryService.ListSavedQueryFolders:output_type -> bytebase.v1.ListSavedQueryFoldersResponse
- 16, // 28: bytebase.v1.SavedQueryService.SearchSavedQueries:output_type -> bytebase.v1.SearchSavedQueriesResponse
- 17, // 29: bytebase.v1.SavedQueryService.UpdateSavedQuery:output_type -> bytebase.v1.SavedQuery
- 13, // 30: bytebase.v1.SavedQueryService.UpdateSavedQueryOrganizer:output_type -> bytebase.v1.SavedQueryOrganizer
- 11, // 31: bytebase.v1.SavedQueryService.BatchUpdateSavedQueryOrganizer:output_type -> bytebase.v1.BatchUpdateSavedQueryOrganizerResponse
- 20, // 32: bytebase.v1.SavedQueryService.DeleteSavedQuery:output_type -> google.protobuf.Empty
- 24, // [24:33] is the sub-list for method output_type
- 15, // [15:24] is the sub-list for method input_type
- 15, // [15:15] is the sub-list for extension type_name
- 15, // [15:15] is the sub-list for extension extendee
- 0, // [0:15] is the sub-list for field type_name
+ 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
}
func init() { file_v1_saved_query_service_proto_init() }
@@ -1397,7 +1319,7 @@ 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: 2,
+ NumEnums: 1,
NumMessages: 16,
NumExtensions: 0,
NumServices: 1,
diff --git a/backend/generated-go/v1/saved_query_service_equal.pb.go b/backend/generated-go/v1/saved_query_service_equal.pb.go
index cca13a28e4..894ba0bfaf 100644
--- a/backend/generated-go/v1/saved_query_service_equal.pb.go
+++ b/backend/generated-go/v1/saved_query_service_equal.pb.go
@@ -336,9 +336,6 @@ func (x *SavedQuery) Equal(y *SavedQuery) bool {
if x.ContentSize != y.ContentSize {
return false
}
- if x.Visibility != y.Visibility {
- return false
- }
if x.Starred != y.Starred {
return false
}
diff --git a/backend/generated-go/v1/saved_query_service_grpc.pb.go b/backend/generated-go/v1/saved_query_service_grpc.pb.go
index 03b77add86..9b1f9cc3f0 100644
--- a/backend/generated-go/v1/saved_query_service_grpc.pb.go
+++ b/backend/generated-go/v1/saved_query_service_grpc.pb.go
@@ -43,11 +43,9 @@ type SavedQueryServiceClient interface {
// Permissions required: None (authenticated users only)
CreateSavedQuery(ctx context.Context, in *CreateSavedQueryRequest, opts ...grpc.CallOption) (*SavedQuery, error)
// Get a saved query by name.
- // The users can access this method if,
- // - they are the creator of the saved query;
- // - they have bb.worksheets.get permission on the workspace;
- // - the saved query is shared with them with PROJECT_READ and PROJECT_WRITE visibility, and they have bb.projects.get permission on the project.
- // Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // 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
GetSavedQuery(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/-`.
@@ -57,28 +55,25 @@ type SavedQueryServiceClient interface {
// 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 or saved queries shared by other people.
+ // This is used for finding my saved queries in a project.
// The saved query accessibility is the same as GetSavedQuery().
- // Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // Permissions required: creator, or workspace bb.worksheets.manage
SearchSavedQueries(ctx context.Context, in *SearchSavedQueriesRequest, opts ...grpc.CallOption) (*SearchSavedQueriesResponse, error)
// Update a saved query.
- // The users can access this method if,
- // - they are the creator of the saved query;
- // - they have bb.worksheets.manage permission on the workspace;
- // - the saved query is shared with them with PROJECT_WRITE visibility, and they have bb.projects.get permission on the project.
- // Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries)
+ // The access is the same as GetSavedQuery method.
+ // Permissions required: creator, or workspace bb.worksheets.manage
UpdateSavedQuery(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: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // 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: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // 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: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries)
+ // Permissions required: creator, or workspace bb.worksheets.manage
DeleteSavedQuery(ctx context.Context, in *DeleteSavedQueryRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
}
@@ -192,11 +187,9 @@ type SavedQueryServiceServer interface {
// Permissions required: None (authenticated users only)
CreateSavedQuery(context.Context, *CreateSavedQueryRequest) (*SavedQuery, error)
// Get a saved query by name.
- // The users can access this method if,
- // - they are the creator of the saved query;
- // - they have bb.worksheets.get permission on the workspace;
- // - the saved query is shared with them with PROJECT_READ and PROJECT_WRITE visibility, and they have bb.projects.get permission on the project.
- // Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // 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
GetSavedQuery(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/-`.
@@ -206,28 +199,25 @@ type SavedQueryServiceServer interface {
// 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 or saved queries shared by other people.
+ // This is used for finding my saved queries in a project.
// The saved query accessibility is the same as GetSavedQuery().
- // Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // Permissions required: creator, or workspace bb.worksheets.manage
SearchSavedQueries(context.Context, *SearchSavedQueriesRequest) (*SearchSavedQueriesResponse, error)
// Update a saved query.
- // The users can access this method if,
- // - they are the creator of the saved query;
- // - they have bb.worksheets.manage permission on the workspace;
- // - the saved query is shared with them with PROJECT_WRITE visibility, and they have bb.projects.get permission on the project.
- // Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries)
+ // The access is the same as GetSavedQuery method.
+ // Permissions required: creator, or workspace bb.worksheets.manage
UpdateSavedQuery(context.Context, *UpdateSavedQueryRequest) (*SavedQuery, error)
// Update the organizer of a saved query.
// The access is the same as UpdateSavedQuery method.
- // Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // 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: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // 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: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries)
+ // Permissions required: creator, or workspace bb.worksheets.manage
DeleteSavedQuery(context.Context, *DeleteSavedQueryRequest) (*emptypb.Empty, error)
mustEmbedUnimplementedSavedQueryServiceServer()
}
diff --git a/backend/generated-go/v1/v1connect/saved_query_service.connect.go b/backend/generated-go/v1/v1connect/saved_query_service.connect.go
index d8d852b7a8..8d20d841f6 100644
--- a/backend/generated-go/v1/v1connect/saved_query_service.connect.go
+++ b/backend/generated-go/v1/v1connect/saved_query_service.connect.go
@@ -69,11 +69,9 @@ type SavedQueryServiceClient interface {
// Permissions required: None (authenticated users only)
CreateSavedQuery(context.Context, *connect.Request[v1.CreateSavedQueryRequest]) (*connect.Response[v1.SavedQuery], error)
// Get a saved query by name.
- // The users can access this method if,
- // - they are the creator of the saved query;
- // - they have bb.worksheets.get permission on the workspace;
- // - the saved query is shared with them with PROJECT_READ and PROJECT_WRITE visibility, and they have bb.projects.get permission on the project.
- // Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // 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
GetSavedQuery(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/-`.
@@ -83,28 +81,25 @@ type SavedQueryServiceClient interface {
// 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 or saved queries shared by other people.
+ // This is used for finding my saved queries in a project.
// The saved query accessibility is the same as GetSavedQuery().
- // Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // Permissions required: creator, or workspace bb.worksheets.manage
SearchSavedQueries(context.Context, *connect.Request[v1.SearchSavedQueriesRequest]) (*connect.Response[v1.SearchSavedQueriesResponse], error)
// Update a saved query.
- // The users can access this method if,
- // - they are the creator of the saved query;
- // - they have bb.worksheets.manage permission on the workspace;
- // - the saved query is shared with them with PROJECT_WRITE visibility, and they have bb.projects.get permission on the project.
- // Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries)
+ // The access is the same as GetSavedQuery method.
+ // Permissions required: creator, or workspace bb.worksheets.manage
UpdateSavedQuery(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: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // 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: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // 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: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries)
+ // Permissions required: creator, or workspace bb.worksheets.manage
DeleteSavedQuery(context.Context, *connect.Request[v1.DeleteSavedQueryRequest]) (*connect.Response[emptypb.Empty], error)
}
@@ -241,11 +236,9 @@ type SavedQueryServiceHandler interface {
// Permissions required: None (authenticated users only)
CreateSavedQuery(context.Context, *connect.Request[v1.CreateSavedQueryRequest]) (*connect.Response[v1.SavedQuery], error)
// Get a saved query by name.
- // The users can access this method if,
- // - they are the creator of the saved query;
- // - they have bb.worksheets.get permission on the workspace;
- // - the saved query is shared with them with PROJECT_READ and PROJECT_WRITE visibility, and they have bb.projects.get permission on the project.
- // Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // 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
GetSavedQuery(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/-`.
@@ -255,28 +248,25 @@ type SavedQueryServiceHandler interface {
// 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 or saved queries shared by other people.
+ // This is used for finding my saved queries in a project.
// The saved query accessibility is the same as GetSavedQuery().
- // Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // Permissions required: creator, or workspace bb.worksheets.manage
SearchSavedQueries(context.Context, *connect.Request[v1.SearchSavedQueriesRequest]) (*connect.Response[v1.SearchSavedQueriesResponse], error)
// Update a saved query.
- // The users can access this method if,
- // - they are the creator of the saved query;
- // - they have bb.worksheets.manage permission on the workspace;
- // - the saved query is shared with them with PROJECT_WRITE visibility, and they have bb.projects.get permission on the project.
- // Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries)
+ // The access is the same as GetSavedQuery method.
+ // Permissions required: creator, or workspace bb.worksheets.manage
UpdateSavedQuery(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: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // 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: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // 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: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries)
+ // Permissions required: creator, or workspace bb.worksheets.manage
DeleteSavedQuery(context.Context, *connect.Request[v1.DeleteSavedQueryRequest]) (*connect.Response[emptypb.Empty], error)
}
diff --git a/backend/migrator/migration/3.22/0006##rename_worksheet_to_saved_query.sql b/backend/migrator/migration/3.22/0006##rename_worksheet_to_saved_query.sql
new file mode 100644
index 0000000000..03dd37c086
--- /dev/null
+++ b/backend/migrator/migration/3.22/0006##rename_worksheet_to_saved_query.sql
@@ -0,0 +1,37 @@
+-- Saved queries are private to their creator until the access-model redesign
+-- ships per-object grants; the design migrates every visibility owner-private
+-- with no mapping, so the flag is removed rather than carried. The tables move
+-- to the renamed model in the same step.
+ALTER TABLE worksheet DROP COLUMN visibility;
+
+ALTER TABLE worksheet RENAME TO saved_query;
+ALTER TABLE worksheet_organizer RENAME TO saved_query_organizer;
+ALTER TABLE saved_query_organizer RENAME COLUMN worksheet TO saved_query;
+
+ALTER INDEX IF EXISTS idx_worksheet_project RENAME TO idx_saved_query_project;
+ALTER INDEX IF EXISTS idx_worksheet_creator_project RENAME TO idx_saved_query_creator_project;
+ALTER INDEX IF EXISTS idx_worksheet_organizer_principal RENAME TO idx_saved_query_organizer_principal;
+ALTER INDEX IF EXISTS idx_worksheet_organizer_payload RENAME TO idx_saved_query_organizer_payload;
+
+-- The connected database moves from (instance, db_name) columns into the
+-- payload as its canonical resource name (SavedQueryPayload.database), which
+-- also encodes whether the instance is workspace- or project-scoped. Per the
+-- design's carry rule, the reference is kept only when the database still
+-- belongs to the saved query's own project; otherwise it is cleared.
+UPDATE saved_query
+SET payload = COALESCE(saved_query.payload, '{}'::jsonb) || jsonb_build_object(
+ 'database',
+ CASE
+ WHEN instance.project IS NOT NULL THEN 'projects/' || instance.project || '/instances/' || instance.resource_id || '/databases/' || db.name
+ ELSE 'instances/' || instance.resource_id || '/databases/' || db.name
+ END)
+FROM db
+ JOIN instance ON instance.resource_id = db.instance
+WHERE saved_query.instance = db.instance
+ AND saved_query.db_name = db.name
+ AND db.project = saved_query.project
+ -- Skip rows whose instance/database project scoping drifted apart; a
+ -- name built from incoherent scopes would never validate again.
+ AND (instance.project IS NULL OR instance.project = db.project);
+
+ALTER TABLE saved_query DROP COLUMN instance, DROP COLUMN db_name;
diff --git a/backend/migrator/migration/LATEST.sql b/backend/migrator/migration/LATEST.sql
index 4b53ed01ea..ed982e3e0d 100644
--- a/backend/migrator/migration/LATEST.sql
+++ b/backend/migrator/migration/LATEST.sql
@@ -356,38 +356,36 @@ CREATE TABLE issue_comment (
CREATE INDEX idx_issue_comment_issue_id ON issue_comment(project, issue_id);
CREATE UNIQUE INDEX idx_issue_comment_unique_resource_id ON issue_comment(resource_id);
--- worksheet table stores worksheets in SQL Editor.
-CREATE TABLE worksheet (
+-- saved_query table stores SQL Editor saved queries.
+CREATE TABLE saved_query (
-- global unique
resource_id text NOT NULL DEFAULT gen_random_uuid()::text,
creator text NOT NULL,
created_at timestamptz NOT NULL DEFAULT now(),
updated_at timestamptz NOT NULL DEFAULT now(),
project text NOT NULL REFERENCES project(resource_id),
- instance text,
- db_name text,
name text NOT NULL,
statement text NOT NULL,
- -- visibility: PROJECT_READ, PROJECT_WRITE, PRIVATE
- -- Enum: Worksheet.Visibility (proto/v1/v1/worksheet_service.proto)
- visibility text NOT NULL,
+ -- 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_worksheet_project ON worksheet(project);
-CREATE INDEX idx_worksheet_creator_project ON worksheet(creator, project);
+CREATE INDEX idx_saved_query_project ON saved_query(project);
+CREATE INDEX idx_saved_query_creator_project ON saved_query(creator, project);
--- worksheet_organizer table stores the sheet status for a principal.
-CREATE TABLE worksheet_organizer (
- worksheet text NOT NULL REFERENCES worksheet(resource_id) ON DELETE CASCADE,
+-- saved_query_organizer table stores a principal's star and folder placement
+-- for a saved query.
+CREATE TABLE saved_query_organizer (
+ saved_query text NOT NULL REFERENCES saved_query(resource_id) ON DELETE CASCADE,
principal text NOT NULL,
payload jsonb NOT NULL DEFAULT '{}',
- PRIMARY KEY (worksheet, principal)
+ PRIMARY KEY (saved_query, principal)
);
-CREATE INDEX idx_worksheet_organizer_principal ON worksheet_organizer(principal);
-CREATE INDEX idx_worksheet_organizer_payload ON worksheet_organizer USING GIN(payload);
+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 TABLE db_group (
project text NOT NULL REFERENCES project(resource_id),
diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.go
index 953bb5161f..4cfc0308c3 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.5"), *files[len(files)-1].version)
- require.Equal(t, "migration/3.22/0005##scope_sheet_blob.sql", files[len(files)-1].path)
+ 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)
}
func TestVersionUnique(t *testing.T) {
diff --git a/backend/store/README.md b/backend/store/README.md
index 5d703e0e84..811a1f9032 100644
--- a/backend/store/README.md
+++ b/backend/store/README.md
@@ -12,7 +12,7 @@ PostgreSQL holds row locks until a transaction ends. Transactions that acquire t
- `plan_webhook_delivery -> plan -> project`
- `plan_check_run -> plan -> project`
- `task_run_log -> task_run -> task -> plan -> project`
- - `worksheet_organizer -> worksheet -> project`
+ - `saved_query_organizer -> saved_query -> project`
- `changelog -> sync_history -> db -> instance -> project`
- `revision -> db -> instance -> project`
- `db_schema -> db -> instance -> project`
@@ -43,7 +43,7 @@ validate that policy against project deletion before writing the managed data.
Transactions spanning project- or instance-owned sibling branches follow this canonical order:
```text
-query_history -> policy -> worksheet_organizer -> worksheet
+query_history -> policy -> saved_query_organizer -> saved_query
-> issue_comment -> issue -> plan_webhook_delivery -> plan_check_run
-> task_run_log -> task_run -> task -> plan -> access_grant -> release
-> db_group -> changelog -> sync_history -> revision -> db_schema -> db
diff --git a/backend/store/instance.go b/backend/store/instance.go
index afeb20f492..926e75fa2d 100644
--- a/backend/store/instance.go
+++ b/backend/store/instance.go
@@ -890,20 +890,6 @@ func (s *Store) DeleteInstance(ctx context.Context, workspace string, resourceID
return errors.Wrapf(err, "failed to delete query history for instance %s", resourceID)
}
- // Update worksheets to nullify instance and db_name references
- q = qb.Q().Space(`
- UPDATE worksheet
- SET instance = NULL, db_name = NULL
- WHERE instance = ?
- `, resourceID)
- query, args, err = q.ToSQL()
- if err != nil {
- return errors.Wrapf(err, "failed to build sql")
- }
- if _, err := tx.ExecContext(ctx, query, args...); err != nil {
- return errors.Wrapf(err, "failed to update worksheets for instance %s", resourceID)
- }
-
// Delete task_run_log entries for tasks associated with this instance
q = qb.Q().Space(`
DELETE FROM task_run_log trl
diff --git a/backend/store/maintenance_lock_order_test.go b/backend/store/maintenance_lock_order_test.go
index eb5d8ea36a..cf562ff5b1 100644
--- a/backend/store/maintenance_lock_order_test.go
+++ b/backend/store/maintenance_lock_order_test.go
@@ -149,16 +149,16 @@ func requireProjectInstanceDeletionState(ctx context.Context, t *testing.T, db *
}
}
+ // The connected-database reference now lives in the payload as a soft
+ // canonical name that simply dangles after instance deletion, so only
+ // the purge re-parenting is asserted here.
var project string
- var instance, database sql.NullString
require.NoError(t, db.QueryRowContext(ctx, `
- SELECT project, instance, db_name
- FROM worksheet
- WHERE resource_id = 'worksheet-a'
- `).Scan(&project, &instance, &database))
+ SELECT project
+ FROM saved_query
+ WHERE resource_id = 'saved-query-a'
+ `).Scan(&project))
require.Equal(t, "default", project)
- require.False(t, instance.Valid)
- require.False(t, database.Valid)
}
func requireProjectUserDeletionState(ctx context.Context, t *testing.T, db *sql.DB) {
@@ -202,16 +202,21 @@ func TestDeleteProjectAndDeleteInstanceLockOrder(t *testing.T) {
VALUES (101, '[email protected]', 'project-a', 'Plan A', '');
INSERT INTO task (id, project, plan_id, instance, type)
VALUES (101, 'project-a', 101, 'instance-a', 'DATABASE_SCHEMA_UPDATE');
- INSERT INTO worksheet (resource_id, creator, project, instance, db_name, name, statement, visibility)
- VALUES ('worksheet-a', '[email protected]', 'project-a', 'instance-a', 'db-a', 'Worksheet A', '', 'PROJECT_READ');
+ INSERT INTO saved_query (resource_id, creator, project, name, statement)
+ VALUES ('saved-query-a', '[email protected]', 'project-a', 'Saved Query A', '');
`
t.Run("delete project first", func(t *testing.T) {
fixture := newProjectDeletionLockOrderFixture(t, seedSQL)
const barrierID = 9921
barrier := newMaintenanceLockBarrier(fixture.ctx, t, fixture.db, barrierID)
+ // Park the purge on its task delete: `task` is the table both paths
+ // still contend on. (The purge used to be parked on the saved-query
+ // re-parent, with DeleteInstance blocking via its saved-query
+ // nullify UPDATE — that cross-path statement was removed when the
+ // connected-database reference became a soft payload link.)
installMaintenanceLockBarrier(t, fixture.db, barrierID,
- "AFTER UPDATE OF project ON worksheet FOR EACH ROW")
+ "AFTER DELETE ON task FOR EACH ROW")
projectResult := make(chan error, 1)
go func() { projectResult <- fixture.store.DeleteProject(fixture.ctx, "default", "project-a") }()
@@ -274,13 +279,13 @@ func TestCreateProjectInstanceAndDeleteProjectLockOrder(t *testing.T) {
t.Run("delete project first rejects an absent project instance", func(t *testing.T) {
fixture := newProjectDeletionLockOrderFixture(t, `
- INSERT INTO worksheet (resource_id, creator, project, name, statement, visibility)
- VALUES ('worksheet-a', '[email protected]', 'project-a', 'Worksheet A', '', 'PROJECT_READ');
+ INSERT INTO saved_query (resource_id, creator, project, name, statement)
+ VALUES ('saved-query-a', '[email protected]', 'project-a', 'Saved Query A', '');
`)
const barrierID = 9927
barrier := newMaintenanceLockBarrier(fixture.ctx, t, fixture.db, barrierID)
installMaintenanceLockBarrier(t, fixture.db, barrierID,
- "AFTER UPDATE OF project ON worksheet FOR EACH ROW")
+ "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") }()
diff --git a/backend/store/principal.go b/backend/store/principal.go
index 60192fe3a9..12bcd3dc27 100644
--- a/backend/store/principal.go
+++ b/backend/store/principal.go
@@ -681,10 +681,10 @@ func (s *Store) UpdateUserEmail(ctx context.Context, user *UserMessage, newEmail
}
rows.Close()
- if err := updateReference("UPDATE worksheet_organizer SET principal = $1 WHERE principal = $2"); err != nil {
+ if err := updateReference("UPDATE saved_query_organizer SET principal = $1 WHERE principal = $2"); err != nil {
return nil, err
}
- if err := updateReference("UPDATE worksheet SET creator = $1 WHERE creator = $2"); err != nil {
+ if err := updateReference("UPDATE saved_query SET creator = $1 WHERE creator = $2"); err != nil {
return nil, err
}
if err := updateReference("UPDATE issue_comment SET creator = $1 WHERE creator = $2"); err != nil {
diff --git a/backend/store/project.go b/backend/store/project.go
index 4b108f5c30..77836d956a 100644
--- a/backend/store/project.go
+++ b/backend/store/project.go
@@ -496,52 +496,38 @@ func (s *Store) DeleteProject(ctx context.Context, workspace string, resourceID
return errors.Wrapf(err, "failed to delete policy for project %s", resourceID)
}
- // Delete worksheet_organizer entries referencing project principals.
- q = qb.Q().Space(`DELETE FROM worksheet_organizer
+ // 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)
sql, args, err = q.ToSQL()
if err != nil {
- return errors.Wrap(err, "failed to build worksheet_organizer delete query")
+ return errors.Wrap(err, "failed to build saved_query_organizer delete query")
}
if _, err := tx.ExecContext(ctx, sql, args...); err != nil {
- return errors.Wrapf(err, "failed to delete worksheet_organizer for project %s", resourceID)
+ return errors.Wrapf(err, "failed to delete saved_query_organizer for project %s", resourceID)
}
- // Clear project-instance references before deleting their instances.
- q = qb.Q().Space(`
- UPDATE worksheet
- SET instance = NULL, db_name = NULL
- WHERE instance IN (SELECT resource_id FROM instance WHERE project = ?)
- `, resourceID)
- sql, args, err = q.ToSQL()
- if err != nil {
- return errors.Wrap(err, "failed to build project instance worksheet update query")
- }
- if _, err := tx.ExecContext(ctx, sql, args...); err != nil {
- return errors.Wrapf(err, "failed to update worksheets for project instances in project %s", resourceID)
- }
-
- // Delete worksheets created by project service accounts or workload identities.
- q = qb.Q().Space(`DELETE FROM worksheet
+ // Delete saved queries created by project service accounts or workload identities.
+ q = qb.Q().Space(`DELETE 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 = ?)`, resourceID, workspace, resourceID, workspace)
sql, args, err = q.ToSQL()
if err != nil {
- return errors.Wrap(err, "failed to build worksheet delete query for principals")
+ return errors.Wrap(err, "failed to build saved query delete query for principals")
}
if _, err := tx.ExecContext(ctx, sql, args...); err != nil {
- return errors.Wrapf(err, "failed to delete worksheets for project principals %s", resourceID)
+ return errors.Wrapf(err, "failed to delete saved queries for project principals %s", resourceID)
}
- // Reassign remaining worksheets associated with this project.
- q = qb.Q().Space("UPDATE worksheet SET project = ? WHERE project = ?", defaultProjectID, resourceID)
+ // Reassign remaining saved queries associated with this project.
+ q = qb.Q().Space("UPDATE saved_query SET project = ? WHERE project = ?", defaultProjectID, resourceID)
sql, args, err = q.ToSQL()
if err != nil {
- return errors.Wrap(err, "failed to build worksheet update query")
+ return errors.Wrap(err, "failed to build saved query update query")
}
if _, err := tx.ExecContext(ctx, sql, args...); err != nil {
- return errors.Wrapf(err, "failed to update worksheets for project %s", resourceID)
+ return errors.Wrapf(err, "failed to update saved queries for project %s", resourceID)
}
// Delete issue_comment entries for issues in this project
diff --git a/backend/store/worksheet.go b/backend/store/saved_query.go
similarity index 55%
rename from backend/store/worksheet.go
rename to backend/store/saved_query.go
index 16b3af3caa..d2792210c9 100644
--- a/backend/store/worksheet.go
+++ b/backend/store/saved_query.go
@@ -20,33 +20,19 @@ import (
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
)
-// WorkSheetVisibility is the visibility of a sheet.
-type WorkSheetVisibility string
-
-const (
- // PrivateWorkSheet is the sheet visibility for PRIVATE. Only sheet OWNER can read/write.
- PrivateWorkSheet WorkSheetVisibility = "PRIVATE"
- // ProjectReadWorkSheet is the sheet visibility for PROJECT. Both sheet OWNER and project OWNER can read/write, and project DEVELOPER can read.
- ProjectReadWorkSheet WorkSheetVisibility = "PROJECT_READ"
- // ProjectWriteWorkSheet is the sheet visibility for PROJECT. Both sheet OWNER and project OWNER can read/write, and project DEVELOPER can read.
- ProjectWriteWorkSheet WorkSheetVisibility = "PROJECT_WRITE"
-)
-
-// WorkSheetMessage is the message for a sheet.
-type WorkSheetMessage struct {
+// SavedQueryMessage is the message for a saved query.
+type SavedQueryMessage struct {
ProjectID string
ResourceID string
- // The DatabaseUID is optional.
- // If not NULL, the sheet ProjectID should always be equal to the id of the database related project.
- // A project must remove all linked sheets for a particular database before that database can be transferred to a different project.
- InstanceID *string
- DatabaseName *string
+ // The connected database's canonical resource name, or "" for none.
+ // Validated against the saved query's own project at write time; the
+ // reference is soft and may dangle afterwards.
+ Database string
Creator string
- Title string
- Statement string
- Visibility WorkSheetVisibility
+ Title string
+ Statement string
// Output only fields
Size int64
@@ -56,8 +42,8 @@ type WorkSheetMessage struct {
Folders []string
}
-// FindWorkSheetMessage is the API message for finding sheets.
-type FindWorkSheetMessage struct {
+// FindSavedQueryMessage is the API message for finding sheets.
+type FindSavedQueryMessage struct {
// Either ProjectIDs or Workspace is required.
ProjectIDs []string
Workspace string
@@ -75,19 +61,18 @@ type FindWorkSheetMessage struct {
Offset *int
}
-// PatchWorkSheetMessage is the message to patch a sheet.
-type PatchWorkSheetMessage struct {
- ResourceID string
- Title *string
- Statement *string
- Visibility *string
- InstanceID *string
- DatabaseName *string
+// PatchSavedQueryMessage is the message to patch a saved query.
+type PatchSavedQueryMessage struct {
+ ResourceID string
+ Title *string
+ Statement *string
+ // Database sets the connected database ("" clears it).
+ Database *string
}
-// GetWorkSheet gets a sheet.
-func (s *Store) GetWorkSheet(ctx context.Context, find *FindWorkSheetMessage) (*WorkSheetMessage, error) {
- sheets, err := s.ListWorkSheets(ctx, find)
+// GetSavedQuery gets a sheet.
+func (s *Store) GetSavedQuery(ctx context.Context, find *FindSavedQueryMessage) (*SavedQueryMessage, error) {
+ sheets, err := s.ListSavedQueries(ctx, find)
if err != nil {
return nil, err
}
@@ -102,41 +87,39 @@ func (s *Store) GetWorkSheet(ctx context.Context, find *FindWorkSheetMessage) (*
return sheet, nil
}
-// ListWorkSheets returns a list of sheets.
-func (s *Store) ListWorkSheets(ctx context.Context, find *FindWorkSheetMessage) ([]*WorkSheetMessage, error) {
+// ListSavedQueries returns a list of sheets.
+func (s *Store) ListSavedQueries(ctx context.Context, find *FindSavedQueryMessage) ([]*SavedQueryMessage, error) {
if len(find.ProjectIDs) == 0 && find.Workspace == "" {
return nil, errors.Errorf("empty project filter")
}
- statementField := fmt.Sprintf("LEFT(worksheet.statement, %d)", common.MaxSheetSize)
+ statementField := fmt.Sprintf("LEFT(saved_query.statement, %d)", common.MaxSheetSize)
if find.LoadFull {
- statementField = "worksheet.statement"
+ statementField = "saved_query.statement"
}
q := qb.Q().Space(fmt.Sprintf(`
SELECT
- worksheet.resource_id,
- worksheet.creator,
- worksheet.created_at,
- worksheet.updated_at,
- worksheet.project,
- worksheet.instance,
- worksheet.db_name,
- worksheet.name,
+ saved_query.resource_id,
+ saved_query.creator,
+ saved_query.created_at,
+ saved_query.updated_at,
+ saved_query.project,
+ saved_query.payload,
+ saved_query.name,
%s,
- worksheet.visibility,
- OCTET_LENGTH(worksheet.statement),
- COALESCE(worksheet_organizer.payload, '{}')
- FROM worksheet
- LEFT JOIN worksheet_organizer ON worksheet_organizer.worksheet = worksheet.resource_id AND worksheet_organizer.principal = ?
+ OCTET_LENGTH(saved_query.statement),
+ COALESCE(saved_query_organizer.payload, '{}')
+ 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 != "" {
- q.And("EXISTS (SELECT 1 FROM project WHERE project.resource_id = worksheet.project AND project.workspace = ? AND project.deleted = FALSE)", 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("worksheet.project = ?", find.ProjectIDs[0])
+ q.And("saved_query.project = ?", find.ProjectIDs[0])
} else if len(find.ProjectIDs) > 1 {
- q.And("worksheet.project = ANY(?)", find.ProjectIDs)
+ q.And("saved_query.project = ANY(?)", find.ProjectIDs)
}
if filterQ := find.FilterQ; filterQ != nil {
@@ -144,10 +127,10 @@ func (s *Store) ListWorkSheets(ctx context.Context, find *FindWorkSheetMessage)
}
if v := find.ResourceID; v != nil {
- q.And("worksheet.resource_id = ?", *v)
+ q.And("saved_query.resource_id = ?", *v)
}
- q.Space("ORDER BY worksheet.name, worksheet.resource_id")
+ q.Space("ORDER BY saved_query.name, saved_query.resource_id")
if v := find.Limit; v != nil {
q.Space("LIMIT ?", *v)
}
@@ -166,40 +149,37 @@ func (s *Store) ListWorkSheets(ctx context.Context, find *FindWorkSheetMessage)
}
defer rows.Close()
- var sheets []*WorkSheetMessage
+ var sheets []*SavedQueryMessage
for rows.Next() {
- var sheet WorkSheetMessage
- var instanceID, databaseName sql.NullString
- var payloadBytes []byte
+ var sheet SavedQueryMessage
+ var payloadBytes, organizerPayloadBytes []byte
if err := rows.Scan(
&sheet.ResourceID,
&sheet.Creator,
&sheet.CreatedAt,
&sheet.UpdatedAt,
&sheet.ProjectID,
- &instanceID,
- &databaseName,
+ &payloadBytes,
&sheet.Title,
&sheet.Statement,
- &sheet.Visibility,
&sheet.Size,
- &payloadBytes,
+ &organizerPayloadBytes,
); err != nil {
return nil, err
}
- if instanceID.Valid {
- sheet.InstanceID = &instanceID.String
- }
- if databaseName.Valid {
- sheet.DatabaseName = &databaseName.String
- }
- var payload storepb.WorkSheetOrganizerPayload
+ var payload storepb.SavedQueryPayload
if err := common.ProtojsonUnmarshaler.Unmarshal(payloadBytes, &payload); err != nil {
- return nil, errors.Wrapf(err, "failed to unmarshal worksheet organizer payload")
+ return nil, errors.Wrapf(err, "failed to unmarshal saved query payload")
+ }
+ 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 = payload.Folders
- sheet.Starred = payload.Starred
+ sheet.Folders = organizerPayload.Folders
+ sheet.Starred = organizerPayload.Starred
sheets = append(sheets, &sheet)
}
@@ -210,8 +190,8 @@ func (s *Store) ListWorkSheets(ctx context.Context, find *FindWorkSheetMessage)
return sheets, nil
}
-// ListWorksheetOrganizers returns the caller's worksheet organizers.
-func (s *Store) ListWorksheetOrganizers(ctx context.Context, find *FindWorkSheetMessage) ([]*WorksheetOrganizerMessage, error) {
+// 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")
}
@@ -220,29 +200,28 @@ func (s *Store) ListWorksheetOrganizers(ctx context.Context, find *FindWorkSheet
}
q := qb.Q().Space(`
SELECT
- worksheet.resource_id,
- worksheet.creator,
- worksheet.visibility,
- worksheet_organizer.principal,
- worksheet_organizer.payload
- FROM worksheet_organizer
- JOIN worksheet ON worksheet.resource_id = worksheet_organizer.worksheet
- WHERE worksheet_organizer.principal = ?`, find.PrincipalEmail)
+ 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 = worksheet.project AND project.workspace = ? AND project.deleted = FALSE)", 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("worksheet.project = ?", find.ProjectIDs[0])
+ q.And("saved_query.project = ?", find.ProjectIDs[0])
} else if len(find.ProjectIDs) > 1 {
- q.And("worksheet.project = ANY(?)", find.ProjectIDs)
+ q.And("saved_query.project = ANY(?)", find.ProjectIDs)
}
if filterQ := find.FilterQ; filterQ != nil {
q.And("?", filterQ)
}
- q.Space("ORDER BY worksheet.project, worksheet.resource_id")
+ q.Space("ORDER BY saved_query.project, saved_query.resource_id")
query, args, err := q.ToSQL()
if err != nil {
@@ -255,53 +234,51 @@ func (s *Store) ListWorksheetOrganizers(ctx context.Context, find *FindWorkSheet
}
defer rows.Close()
- var worksheetOrganizers []*WorksheetOrganizerMessage
+ var savedQueryOrganizers []*SavedQueryOrganizerMessage
for rows.Next() {
- var worksheetOrganizer WorksheetOrganizerMessage
- var visibility string
+ var savedQueryOrganizer SavedQueryOrganizerMessage
var payloadBytes []byte
if err := rows.Scan(
- &worksheetOrganizer.WorksheetResourceID,
- &worksheetOrganizer.WorksheetCreator,
- &visibility,
- &worksheetOrganizer.Principal,
+ &savedQueryOrganizer.SavedQueryResourceID,
+ &savedQueryOrganizer.SavedQueryCreator,
+ &savedQueryOrganizer.Principal,
&payloadBytes,
); err != nil {
return nil, err
}
- worksheetOrganizer.WorksheetVisibility = WorkSheetVisibility(visibility)
- var payload storepb.WorkSheetOrganizerPayload
+ var payload storepb.SavedQueryOrganizerPayload
if err := common.ProtojsonUnmarshaler.Unmarshal(payloadBytes, &payload); err != nil {
- return nil, errors.Wrapf(err, "failed to unmarshal worksheet organizer payload")
+ return nil, errors.Wrapf(err, "failed to unmarshal saved query organizer payload")
}
- worksheetOrganizer.Payload = &payload
+ savedQueryOrganizer.Payload = &payload
- worksheetOrganizers = append(worksheetOrganizers, &worksheetOrganizer)
+ savedQueryOrganizers = append(savedQueryOrganizers, &savedQueryOrganizer)
}
if err := rows.Err(); err != nil {
return nil, err
}
- return worksheetOrganizers, nil
+ return savedQueryOrganizers, nil
}
-// CreateWorkSheet creates a new sheet.
-func (s *Store) CreateWorkSheet(ctx context.Context, create *WorkSheetMessage) (*WorkSheetMessage, error) {
+// 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(`
- INSERT INTO worksheet (
+ INSERT INTO saved_query (
creator,
project,
- instance,
- db_name,
name,
statement,
- visibility,
payload
)
- VALUES (?, ?, ?, ?, ?, ?, ?, '{}')
+ VALUES (?, ?, ?, ?, ?)
RETURNING resource_id, created_at, updated_at, OCTET_LENGTH(statement)
- `, create.Creator, create.ProjectID, create.InstanceID, create.DatabaseName, create.Title, create.Statement, create.Visibility)
+ `, create.Creator, create.ProjectID, create.Title, create.Statement, payloadStr)
query, args, err := q.ToSQL()
if err != nil {
@@ -323,8 +300,8 @@ func (s *Store) CreateWorkSheet(ctx context.Context, create *WorkSheetMessage) (
return create, nil
}
-// PatchWorkSheet updates a sheet.
-func (s *Store) PatchWorkSheet(ctx context.Context, patch *PatchWorkSheetMessage) error {
+// PatchSavedQuery updates a sheet.
+func (s *Store) PatchSavedQuery(ctx context.Context, patch *PatchSavedQueryMessage) error {
set := qb.Q()
set.Comma("updated_at = ?", time.Now())
if v := patch.Title; v != nil {
@@ -333,25 +310,15 @@ func (s *Store) PatchWorkSheet(ctx context.Context, patch *PatchWorkSheetMessage
if v := patch.Statement; v != nil {
set.Comma("statement = ?", *v)
}
- if v := patch.Visibility; v != nil {
- set.Comma("visibility = ?", *v)
- }
- if v := patch.InstanceID; v != nil {
- if *v == "" {
- set.Comma("instance = ?", nil)
- } else {
- set.Comma("instance = ?", *v)
- }
- }
- if v := patch.DatabaseName; v != nil {
+ if v := patch.Database; v != nil {
if *v == "" {
- set.Comma("db_name = ?", nil)
+ set.Comma("payload = payload - 'database'")
} else {
- set.Comma("db_name = ?", *v)
+ set.Comma("payload = payload || jsonb_build_object('database', ?::text)", *v)
}
}
- query, args, err := qb.Q().Space("UPDATE worksheet SET ? WHERE resource_id = ?", set, patch.ResourceID).ToSQL()
+ query, args, err := qb.Q().Space("UPDATE saved_query SET ? WHERE resource_id = ?", set, patch.ResourceID).ToSQL()
if err != nil {
return errors.Wrapf(err, "failed to build sql")
}
@@ -361,10 +328,10 @@ func (s *Store) PatchWorkSheet(ctx context.Context, patch *PatchWorkSheetMessage
return nil
}
-// DeleteWorkSheet deletes an existing sheet by resource ID.
-// The worksheet_organizer rows are cascade-deleted via FK on worksheet(resource_id).
-func (s *Store) DeleteWorkSheet(ctx context.Context, resourceID string) error {
- q := qb.Q().Space(`DELETE FROM worksheet WHERE resource_id = ?`, resourceID)
+// DeleteSavedQuery deletes an existing saved query by resource ID.
+// The saved_query_organizer rows are cascade-deleted via FK on saved_query(resource_id).
+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")
@@ -375,90 +342,89 @@ func (s *Store) DeleteWorkSheet(ctx context.Context, resourceID string) error {
return nil
}
-// WorksheetOrganizerMessage is the store message for worksheet organizer.
-type WorksheetOrganizerMessage struct {
- WorksheetResourceID string
- WorksheetCreator string
- WorksheetVisibility WorkSheetVisibility
- Principal string
- Payload *storepb.WorkSheetOrganizerPayload
+// SavedQueryOrganizerMessage is the store message for savedQuery organizer.
+type SavedQueryOrganizerMessage struct {
+ SavedQueryResourceID string
+ SavedQueryCreator string
+ Principal string
+ Payload *storepb.SavedQueryOrganizerPayload
}
-// BatchUpdateWorksheetOrganizerPatch is the patch for updating worksheet organizers in batch.
-type BatchUpdateWorksheetOrganizerPatch struct {
- WorksheetResourceIDs []string
- Principal string
- Starred *bool
- Folders *[]string
+// BatchUpdateSavedQueryOrganizerPatch is the patch for updating savedQuery organizers in batch.
+type BatchUpdateSavedQueryOrganizerPatch struct {
+ SavedQueryResourceIDs []string
+ Principal string
+ Starred *bool
+ Folders *[]string
}
-func (s *Store) GetWorksheetOrganizer(ctx context.Context, worksheetResourceID string, principal string) (*WorksheetOrganizerMessage, error) {
+func (s *Store) GetSavedQueryOrganizer(ctx context.Context, savedQueryResourceID string, principal string) (*SavedQueryOrganizerMessage, error) {
q := qb.Q().Space(`
SELECT
payload
- FROM worksheet_organizer
- WHERE worksheet = ? AND principal = ?
- `, worksheetResourceID, principal)
+ FROM saved_query_organizer
+ WHERE saved_query = ? AND principal = ?
+ `, savedQueryResourceID, principal)
query, args, err := q.ToSQL()
if err != nil {
return nil, errors.Wrapf(err, "failed to build sql")
}
- worksheetOrganizer := WorksheetOrganizerMessage{
- WorksheetResourceID: worksheetResourceID,
- Principal: principal,
- Payload: &storepb.WorkSheetOrganizerPayload{},
+ 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 &worksheetOrganizer, nil
+ return &savedQueryOrganizer, nil
}
return nil, errors.Wrapf(err, "failed to scan")
}
- workSheetPayload := &storepb.WorkSheetOrganizerPayload{}
+ workSheetPayload := &storepb.SavedQueryOrganizerPayload{}
if err := common.ProtojsonUnmarshaler.Unmarshal(payload, workSheetPayload); err != nil {
return nil, err
}
- worksheetOrganizer.Payload = workSheetPayload
+ savedQueryOrganizer.Payload = workSheetPayload
- return &worksheetOrganizer, nil
+ return &savedQueryOrganizer, nil
}
-// UpsertWorksheetOrganizer upserts a new SheetOrganizerMessage.
-func (s *Store) UpsertWorksheetOrganizer(ctx context.Context, patch *WorksheetOrganizerMessage) (*WorksheetOrganizerMessage, error) {
+// 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 worksheet_organizer (
- worksheet,
+ INSERT INTO saved_query_organizer (
+ saved_query,
principal,
payload
)
VALUES (?, ?, ?)
- ON CONFLICT(worksheet, principal) DO UPDATE SET
+ ON CONFLICT(saved_query, principal) DO UPDATE SET
payload = EXCLUDED.payload
RETURNING
- worksheet,
+ saved_query,
principal,
payload
- `, patch.WorksheetResourceID, patch.Principal, payloadStr)
+ `, patch.SavedQueryResourceID, patch.Principal, payloadStr)
query, args, err := q.ToSQL()
if err != nil {
return nil, errors.Wrapf(err, "failed to build sql")
}
- var worksheetOrganizer WorksheetOrganizerMessage
+ var savedQueryOrganizer SavedQueryOrganizerMessage
var payload []byte
if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(
- &worksheetOrganizer.WorksheetResourceID,
- &worksheetOrganizer.Principal,
+ &savedQueryOrganizer.SavedQueryResourceID,
+ &savedQueryOrganizer.Principal,
&payload,
); err != nil {
if err == sql.ErrNoRows {
@@ -466,25 +432,25 @@ func (s *Store) UpsertWorksheetOrganizer(ctx context.Context, patch *WorksheetOr
}
return nil, err
}
- workSheetPayload := &storepb.WorkSheetOrganizerPayload{}
+ workSheetPayload := &storepb.SavedQueryOrganizerPayload{}
if err := common.ProtojsonUnmarshaler.Unmarshal(payload, workSheetPayload); err != nil {
return nil, err
}
- worksheetOrganizer.Payload = workSheetPayload
+ savedQueryOrganizer.Payload = workSheetPayload
- return &worksheetOrganizer, nil
+ return &savedQueryOrganizer, nil
}
-// BatchUpdateWorksheetOrganizer updates worksheet organizer payload fields in batch.
-func (s *Store) BatchUpdateWorksheetOrganizer(ctx context.Context, patch *BatchUpdateWorksheetOrganizerPatch) ([]*WorksheetOrganizerMessage, error) {
- if len(patch.WorksheetResourceIDs) == 0 {
+// 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 worksheet organizer patch")
+ return nil, errors.New("empty saved query organizer patch")
}
tx, err := s.GetDB().BeginTx(ctx, nil)
@@ -494,21 +460,21 @@ func (s *Store) BatchUpdateWorksheetOrganizer(ctx context.Context, patch *BatchU
defer tx.Rollback()
insertQuery, insertArgs, err := qb.Q().Space(`
- INSERT INTO worksheet_organizer (
- worksheet,
+ INSERT INTO saved_query_organizer (
+ saved_query,
principal,
payload
)
- SELECT worksheet.resource_id, ?, '{}'::jsonb
- FROM worksheet
- WHERE worksheet.resource_id = ANY(?)
- ON CONFLICT (worksheet, principal) DO NOTHING
- `, patch.Principal, patch.WorksheetResourceIDs).ToSQL()
+ SELECT saved_query.resource_id, ?, '{}'::jsonb
+ FROM saved_query
+ WHERE saved_query.resource_id = ANY(?)
+ ON CONFLICT (saved_query, principal) DO NOTHING
+ `, patch.Principal, patch.SavedQueryResourceIDs).ToSQL()
if err != nil {
- return nil, errors.Wrap(err, "failed to build worksheet organizer insert query")
+ return nil, errors.Wrap(err, "failed to build saved query organizer insert query")
}
if _, err := tx.ExecContext(ctx, insertQuery, insertArgs...); err != nil {
- return nil, errors.Wrap(err, "failed to insert missing worksheet organizers")
+ return nil, errors.Wrap(err, "failed to insert missing saved query organizers")
}
payloadExpr := "payload"
@@ -525,40 +491,40 @@ func (s *Store) BatchUpdateWorksheetOrganizer(ctx context.Context, patch *BatchU
payloadExpr = fmt.Sprintf("jsonb_set(%s, '{folders}', ?::jsonb, true)", payloadExpr)
updateArgs = append(updateArgs, string(folderBytes))
}
- updateArgs = append(updateArgs, patch.Principal, patch.WorksheetResourceIDs)
+ updateArgs = append(updateArgs, patch.Principal, patch.SavedQueryResourceIDs)
updateQuery, args, err := qb.Q().Space(fmt.Sprintf(`
- UPDATE worksheet_organizer
+ UPDATE saved_query_organizer
SET payload = %s
- WHERE principal = ? AND worksheet = ANY(?)
- RETURNING worksheet, principal, payload
+ WHERE principal = ? AND saved_query = ANY(?)
+ RETURNING saved_query, principal, payload
`, payloadExpr), updateArgs...).ToSQL()
if err != nil {
- return nil, errors.Wrap(err, "failed to build worksheet organizer update query")
+ return nil, errors.Wrap(err, "failed to build saved query organizer update query")
}
rows, err := tx.QueryContext(ctx, updateQuery, args...)
if err != nil {
- return nil, errors.Wrap(err, "failed to update worksheet organizers")
+ return nil, errors.Wrap(err, "failed to update savedQuery organizers")
}
defer rows.Close()
- var worksheetOrganizers []*WorksheetOrganizerMessage
+ var savedQueryOrganizers []*SavedQueryOrganizerMessage
for rows.Next() {
- var worksheetOrganizer WorksheetOrganizerMessage
+ var savedQueryOrganizer SavedQueryOrganizerMessage
var payload []byte
if err := rows.Scan(
- &worksheetOrganizer.WorksheetResourceID,
- &worksheetOrganizer.Principal,
+ &savedQueryOrganizer.SavedQueryResourceID,
+ &savedQueryOrganizer.Principal,
&payload,
); err != nil {
return nil, err
}
- workSheetPayload := &storepb.WorkSheetOrganizerPayload{}
+ workSheetPayload := &storepb.SavedQueryOrganizerPayload{}
if err := common.ProtojsonUnmarshaler.Unmarshal(payload, workSheetPayload); err != nil {
return nil, err
}
- worksheetOrganizer.Payload = workSheetPayload
- worksheetOrganizers = append(worksheetOrganizers, &worksheetOrganizer)
+ savedQueryOrganizer.Payload = workSheetPayload
+ savedQueryOrganizers = append(savedQueryOrganizers, &savedQueryOrganizer)
}
if err := rows.Err(); err != nil {
return nil, err
@@ -567,10 +533,10 @@ func (s *Store) BatchUpdateWorksheetOrganizer(ctx context.Context, patch *BatchU
if err := tx.Commit(); err != nil {
return nil, errors.Wrap(err, "failed to commit transaction")
}
- return worksheetOrganizers, nil
+ return savedQueryOrganizers, nil
}
-func GetListSheetFilter(ctx context.Context, s *Store, caller string, filter string, allowTitleContains bool) (*qb.Query, error) {
+func GetSearchSavedQueryFilter(ctx context.Context, s *Store, caller string, filter string, allowTitleContains bool) (*qb.Query, error) {
if filter == "" {
return nil, nil
}
@@ -600,12 +566,12 @@ func GetListSheetFilter(ctx context.Context, s *Store, caller string, filter str
}
return user.Email, nil
}
- getWorksheetID := func(name string) (string, error) {
- _, worksheetID, err := common.GetProjectIDSavedQueryID(name)
+ getSavedQueryID := func(name string) (string, error) {
+ _, savedQueryID, err := common.GetProjectIDSavedQueryID(name)
if err != nil {
return "", errors.Errorf("invalid saved query name %q", name)
}
- return worksheetID, nil
+ return savedQueryID, nil
}
parseToSQL := func(variable, value any) (*qb.Query, error) {
@@ -615,25 +581,22 @@ func GetListSheetFilter(ctx context.Context, s *Store, caller string, filter str
if !ok {
return nil, errors.Errorf("invalid name value %q", value)
}
- worksheetID, err := getWorksheetID(name)
+ savedQueryID, err := getSavedQueryID(name)
if err != nil {
return nil, err
}
- return qb.Q().Space("worksheet.resource_id = ?", worksheetID), nil
+ return qb.Q().Space("saved_query.resource_id = ?", savedQueryID), nil
case "creator":
userID, err := getUserID(value.(string))
if err != nil {
return nil, err
}
- return qb.Q().Space("worksheet.creator = ?", userID), nil
+ return qb.Q().Space("saved_query.creator = ?", userID), nil
case "starred":
if starred, ok := value.(bool); ok {
- return qb.Q().Space("worksheet.resource_id IN (SELECT worksheet FROM worksheet_organizer WHERE principal = ? AND (payload->>'starred')::boolean = ?)", caller, starred), nil
+ 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
}
return qb.Q().Space("TRUE"), nil
- case "visibility":
- visibility := WorkSheetVisibility(value.(string))
- return qb.Q().Space("worksheet.visibility = ?", visibility), nil
case "folder":
folder, ok := value.(string)
if !ok {
@@ -641,7 +604,7 @@ func GetListSheetFilter(ctx context.Context, s *Store, caller string, filter str
}
folder = strings.Trim(folder, "/")
if folder == "" {
- return qb.Q().Space("COALESCE(jsonb_array_length(worksheet_organizer.payload->'folders'), 0) = 0"), nil
+ return qb.Q().Space("COALESCE(jsonb_array_length(saved_query_organizer.payload->'folders'), 0) = 0"), nil
}
q := qb.Q()
segments := strings.Split(folder, "/")
@@ -649,9 +612,9 @@ func GetListSheetFilter(ctx context.Context, s *Store, caller string, filter str
if segment == "" {
return nil, errors.Errorf("invalid folder %q", value)
}
- q.And(fmt.Sprintf("worksheet_organizer.payload->'folders'->>%d = ?", i), segment)
+ q.And(fmt.Sprintf("saved_query_organizer.payload->'folders'->>%d = ?", i), segment)
}
- q.And("jsonb_array_length(worksheet_organizer.payload->'folders') = ?", len(segments))
+ q.And("jsonb_array_length(saved_query_organizer.payload->'folders') = ?", len(segments))
return qb.Q().Space("(?)", q), nil
default:
return nil, errors.Errorf("unsupport variable %q", variable)
@@ -708,7 +671,7 @@ func GetListSheetFilter(ctx context.Context, s *Store, caller string, filter str
if !allowTitleContains {
return nil, errors.Errorf("unsupport variable %q", variable)
}
- return qb.Q().Space("LOWER(worksheet.name) LIKE ? ESCAPE '\\'", "%"+escapeLikePattern(strings.ToLower(strValue))+"%"), nil
+ return qb.Q().Space("LOWER(saved_query.name) LIKE ? ESCAPE '\\'", "%"+escapeLikePattern(strings.ToLower(strValue))+"%"), nil
default:
return nil, errors.Errorf("unsupport variable %q", variable)
}
@@ -721,7 +684,7 @@ func GetListSheetFilter(ctx context.Context, s *Store, caller string, filter str
if err != nil {
return nil, err
}
- return qb.Q().Space("worksheet.creator != ?", userID), nil
+ return qb.Q().Space("saved_query.creator != ?", userID), nil
case celoperators.In:
variable, value := getVariableAndValueFromExpr(expr)
rawList, ok := value.([]any)
@@ -733,31 +696,21 @@ func GetListSheetFilter(ctx context.Context, s *Store, caller string, filter str
}
switch variable {
case "name":
- worksheetIDs := []string{}
+ savedQueryIDs := []string{}
for _, raw := range rawList {
name, ok := raw.(string)
if !ok {
return nil, errors.Errorf("invalid name value %q", raw)
}
- worksheetID, err := getWorksheetID(name)
+ savedQueryID, err := getSavedQueryID(name)
if err != nil {
return nil, err
}
- worksheetIDs = append(worksheetIDs, worksheetID)
- }
- return qb.Q().Space("worksheet.resource_id = ANY(?)", worksheetIDs), nil
- case "visibility":
- visibilityList := []string{}
- for _, raw := range rawList {
- visibility, ok := raw.(string)
- if !ok {
- return nil, errors.Errorf("invalid visibility value %q", raw)
- }
- visibilityList = append(visibilityList, visibility)
+ savedQueryIDs = append(savedQueryIDs, savedQueryID)
}
- return qb.Q().Space("worksheet.visibility = ANY(?)", visibilityList), nil
+ return qb.Q().Space("saved_query.resource_id = ANY(?)", savedQueryIDs), nil
default:
- return nil, errors.Errorf(`only "name" and "visibility" support "in" filter`)
+ return nil, errors.Errorf(`only "name" supports "in" filter`)
}
default:
return nil, errors.Errorf("unexpected function %v", functionName)
@@ -782,7 +735,7 @@ func escapeLikePattern(pattern string) string {
).Replace(pattern)
}
-func GetListWorksheetFilter(filter string) (*qb.Query, error) {
+func GetListSavedQueryFilter(filter string) (*qb.Query, error) {
if filter == "" {
return nil, nil
}
@@ -836,9 +789,9 @@ func GetListWorksheetFilter(filter string) (*qb.Query, error) {
return nil, errors.New("invalid empty creator identifier")
}
if functionName == celoperators.Equals {
- return qb.Q().Space("worksheet.creator = ?", creatorEmail), nil
+ return qb.Q().Space("saved_query.creator = ?", creatorEmail), nil
}
- return qb.Q().Space("worksheet.creator != ?", creatorEmail), nil
+ return qb.Q().Space("saved_query.creator != ?", creatorEmail), nil
default:
return nil, errors.Errorf("unexpected function %v", functionName)
}
diff --git a/backend/tests/project_instance_compat_extras_test.go b/backend/tests/project_instance_compat_extras_test.go
index 09bb289847..272b6681f0 100644
--- a/backend/tests/project_instance_compat_extras_test.go
+++ b/backend/tests/project_instance_compat_extras_test.go
@@ -126,10 +126,9 @@ func TestProjectInstanceSavedQuery(t *testing.T) {
resp, err := ctl.savedQueryServiceClient.CreateSavedQuery(ctx, connect.NewRequest(&v1pb.CreateSavedQueryRequest{
Parent: ctl.project.Name,
SavedQuery: &v1pb.SavedQuery{
- Title: "project instance saved query",
- Content: []byte("SELECT 1;"),
- Database: database,
- Visibility: v1pb.SavedQuery_PRIVATE,
+ Title: "project instance saved query",
+ Content: []byte("SELECT 1;"),
+ Database: database,
},
}))
if err != nil {
diff --git a/backend/tests/saved_query_test.go b/backend/tests/saved_query_test.go
index 7f211dfb6b..bac4802f90 100644
--- a/backend/tests/saved_query_test.go
+++ b/backend/tests/saved_query_test.go
@@ -52,9 +52,8 @@ func TestListSavedQueries(t *testing.T) {
resp, err := ctl.savedQueryServiceClient.CreateSavedQuery(ctx, connect.NewRequest(&v1pb.CreateSavedQueryRequest{
Parent: parent,
SavedQuery: &v1pb.SavedQuery{
- Title: title,
- Content: []byte("SELECT 1;"),
- Visibility: v1pb.SavedQuery_PROJECT_READ,
+ Title: title,
+ Content: []byte("SELECT 1;"),
},
}))
a.NoError(err)
@@ -157,9 +156,8 @@ func TestSearchSavedQueriesFilterByFolder(t *testing.T) {
resp, err := ctl.savedQueryServiceClient.CreateSavedQuery(ctx, connect.NewRequest(&v1pb.CreateSavedQueryRequest{
Parent: ctl.project.Name,
SavedQuery: &v1pb.SavedQuery{
- Title: title,
- Content: []byte("SELECT 1;"),
- Visibility: v1pb.SavedQuery_PRIVATE,
+ Title: title,
+ Content: []byte("SELECT 1;"),
},
}))
a.NoError(err)
@@ -251,9 +249,8 @@ func TestSearchSavedQueriesFilterByTitle(t *testing.T) {
resp, err := ctl.savedQueryServiceClient.CreateSavedQuery(ctx, connect.NewRequest(&v1pb.CreateSavedQueryRequest{
Parent: ctl.project.Name,
SavedQuery: &v1pb.SavedQuery{
- Title: title,
- Content: []byte("SELECT 1;"),
- Visibility: v1pb.SavedQuery_PRIVATE,
+ Title: title,
+ Content: []byte("SELECT 1;"),
},
}))
a.NoError(err)
@@ -319,9 +316,8 @@ func TestBatchUpdateSavedQueryOrganizerFilterByFolder(t *testing.T) {
resp, err := ctl.savedQueryServiceClient.CreateSavedQuery(ctx, connect.NewRequest(&v1pb.CreateSavedQueryRequest{
Parent: ctl.project.Name,
SavedQuery: &v1pb.SavedQuery{
- Title: title,
- Content: []byte("SELECT 1;"),
- Visibility: v1pb.SavedQuery_PRIVATE,
+ Title: title,
+ Content: []byte("SELECT 1;"),
},
}))
a.NoError(err)
@@ -423,13 +419,12 @@ func TestListSavedQueryFoldersReturnsCallerFolders(t *testing.T) {
ownerToken := ctl.authInterceptor.token
- createSavedQuery := func(title string, visibility v1pb.SavedQuery_Visibility) *v1pb.SavedQuery {
+ createSavedQuery := func(title 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;"),
- Visibility: visibility,
+ Title: title,
+ Content: []byte("SELECT 1;"),
},
}))
a.NoError(err)
@@ -446,9 +441,9 @@ func TestListSavedQueryFoldersReturnsCallerFolders(t *testing.T) {
a.NoError(err)
}
- ownerSavedQuery := createSavedQuery("owner", v1pb.SavedQuery_PRIVATE)
+ ownerSavedQuery := createSavedQuery("owner")
setFolders(ownerSavedQuery, []string{"owner", "child"})
- ownerSharedSavedQuery := createSavedQuery("owner-shared", v1pb.SavedQuery_PROJECT_READ)
+ ownerSharedSavedQuery := createSavedQuery("owner-shared")
setFolders(ownerSharedSavedQuery, []string{"owner-shared"})
otherEmail := fmt.Sprintf("saved-query-folder-%[email protected]", generateRandomString("user"))
@@ -484,9 +479,9 @@ func TestListSavedQueryFoldersReturnsCallerFolders(t *testing.T) {
}))
a.NoError(err)
ctl.authInterceptor.token = loginResp.Msg.Token
- sharedSavedQuery := createSavedQuery("shared", v1pb.SavedQuery_PROJECT_READ)
+ sharedSavedQuery := createSavedQuery("shared")
setFolders(sharedSavedQuery, []string{"other", "shared"})
- privateSavedQuery := createSavedQuery("private", v1pb.SavedQuery_PRIVATE)
+ privateSavedQuery := createSavedQuery("private")
ctl.authInterceptor.token = ownerToken
setFolders(sharedSavedQuery, []string{"owner", "child"})
@@ -497,9 +492,9 @@ func TestListSavedQueryFoldersReturnsCallerFolders(t *testing.T) {
_, privateSavedQueryID, err := common.GetProjectIDSavedQueryID(privateSavedQuery.Name)
a.NoError(err)
_, err = db.ExecContext(ctx, `
- INSERT INTO worksheet_organizer (worksheet, principal, payload)
+ INSERT INTO saved_query_organizer (saved_query, principal, payload)
SELECT resource_id, $1, '{"folders":["private"]}'::jsonb
- FROM worksheet
+ FROM saved_query
WHERE resource_id = $2
`, "[email protected]", privateSavedQueryID)
a.NoError(err)
diff --git a/docs/design/saved-queries-model.md b/docs/design/saved-queries-model.md
index a147037f64..af63f753a3 100644
--- a/docs/design/saved-queries-model.md
+++ b/docs/design/saved-queries-model.md
@@ -479,9 +479,11 @@ changelog.
**Existing data migrates owner-private** — a deliberate, one-time breaking
change. Every existing row keeps its `creator`, `title`, `content`, and its
-connected-database reference (`instance`/`db_name` — retained columns, not
-dropped — so run context survives; cleared only if that database no longer
-belongs to the query's project, per the same-project invariant);
+connected-database reference (carried into the payload as the database's
+canonical resource name, `SavedQueryPayload.database` — so run context
+survives and the name encodes workspace- vs project-instance scope; cleared
+only if that database no longer belongs to the query's project, per the
+same-project invariant);
`visibility` is dropped and `bindings` starts empty, so `PRIVATE`,
`PROJECT_READ`, and `PROJECT_WRITE` alike become creator-only. **Owner
organization is preserved**: the creator's own `worksheet_organizer` row
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index 933ce71dab..e217dc1a38 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -489,7 +489,6 @@
"view": "View",
"view-details": "View Details",
"view-doc": "View doc",
- "visibility": "Visibility",
"want-help": "Want help",
"warning": "Warning",
"webhooks": "Webhooks",
@@ -2992,7 +2991,6 @@
},
"invalid-database": "Invalid database {{database}}",
"last-synced": "Last synced: <time></time>",
- "link-access": "Access",
"loading-data": "Loading Data...",
"loading-databases": "Loading Databases...",
"manage-connections": "Manage connections",
@@ -3009,12 +3007,6 @@
"pending-query": "Pending query",
"preview-table-data": "Preview table data",
"previous-row": "Previous Row",
- "private": "Private",
- "private-desc": "Only you can access this saved query",
- "project-read": "Project can view",
- "project-read-desc": "Project members can view this saved query. Only the owner and admins can edit it.",
- "project-write": "Project can edit",
- "project-write-desc": "Project members can view and edit this saved query.",
"query-context": {
"admin-data-source-is-disallowed-to-query": "Admin data source is disallowed to query."
},
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index 09a704b3aa..20a7e613cb 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -489,7 +489,6 @@
"view": "Ver",
"view-details": "Ver Detalles",
"view-doc": "Ver doc",
- "visibility": "Visibilidad",
"want-help": "¿Quiere ayuda?",
"warning": "Advertencia",
"webhooks": "Webhooks",
@@ -2992,7 +2991,6 @@
},
"invalid-database": "Base de datos no válida {{database}}",
"last-synced": "Última sincronización: <time></time>",
- "link-access": "Acceso",
"loading-data": "Cargando datos...",
"loading-databases": "Cargando bases de datos...",
"manage-connections": "Gestionar las conexiones",
@@ -3009,12 +3007,6 @@
"pending-query": "Consulta pendiente",
"preview-table-data": "Vista previa de datos de la tabla",
"previous-row": "Fila anterior",
- "private": "Privado",
- "private-desc": "Solo tú puedes acceder a esta consulta guardada",
- "project-read": "El proyecto puede ver",
- "project-read-desc": "Los miembros del proyecto pueden ver esta consulta guardada. Solo el propietario y los administradores pueden editarla.",
- "project-write": "El proyecto puede editar",
- "project-write-desc": "Los miembros del proyecto pueden ver y editar esta consulta guardada.",
"query-context": {
"admin-data-source-is-disallowed-to-query": "No se permite realizar consultas a la fuente de datos del administrador."
},
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index c268670685..2b70950447 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -489,7 +489,6 @@
"view": "表示",
"view-details": "詳細を表示",
"view-doc": "ドキュメントを見る",
- "visibility": "可視性",
"want-help": "ヘルプが必要ですか",
"warning": "警告する",
"webhooks": "Webhook",
@@ -2992,7 +2991,6 @@
},
"invalid-database": "無効なデータベース {{database}}",
"last-synced": "最終同期時間: <time></time>",
- "link-access": "アクセス",
"loading-data": "データのロード...",
"loading-databases": "データベース情報をロードしています...",
"manage-connections": "接続を管理する",
@@ -3009,12 +3007,6 @@
"pending-query": "保留中のクエリ",
"preview-table-data": "テーブルデータのプレビュー",
"previous-row": "前の行",
- "private": "プライベート",
- "private-desc": "このクエリにアクセスできるのはあなただけです",
- "project-read": "プロジェクト内で閲覧可",
- "project-read-desc": "プロジェクトメンバーはこのクエリを閲覧できます。編集できるのは所有者と管理者のみです。",
- "project-write": "プロジェクト内で編集可",
- "project-write-desc": "プロジェクトメンバーはこのクエリを閲覧・編集できます。",
"query-context": {
"admin-data-source-is-disallowed-to-query": "管理者データ ソースはクエリできません。"
},
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index 1a0781ade4..ff525992bc 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -489,7 +489,6 @@
"view": "Xem",
"view-details": "Xem Chi tiết",
"view-doc": "Xem tài liệu",
- "visibility": "Hiển thị",
"want-help": "Cần trợ giúp",
"warning": "Cảnh báo",
"webhooks": "Webhook",
@@ -2992,7 +2991,6 @@
},
"invalid-database": "Cơ sở dữ liệu không hợp lệ {{database}}",
"last-synced": "Đã đồng bộ lần cuối: <time></time>",
- "link-access": "Quyền truy cập",
"loading-data": "Đang tải Dữ liệu...",
"loading-databases": "Đang tải Cơ sở dữ liệu...",
"manage-connections": "Quản lý kết nối",
@@ -3009,12 +3007,6 @@
"pending-query": "Đang chờ truy vấn",
"preview-table-data": "Xem trước dữ liệu bảng",
"previous-row": "Dòng trước",
- "private": "Riêng tư",
- "private-desc": "Chỉ bạn mới có thể truy cập truy vấn đã lưu này",
- "project-read": "Dự án có thể xem",
- "project-read-desc": "Thành viên dự án có thể xem truy vấn đã lưu này. Chỉ chủ sở hữu và quản trị viên mới có thể chỉnh sửa.",
- "project-write": "Dự án có thể chỉnh sửa",
- "project-write-desc": "Thành viên dự án có thể xem và chỉnh sửa truy vấn đã lưu này.",
"query-context": {
"admin-data-source-is-disallowed-to-query": "Nguồn dữ liệu quản trị không được phép truy vấn."
},
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index 1d3502a5c9..76e8ccb2ad 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -489,7 +489,6 @@
"view": "查看",
"view-details": "查看详情",
"view-doc": "查看文档",
- "visibility": "可见性",
"want-help": "需要帮助",
"warning": "警告",
"webhooks": "Webhook",
@@ -2992,7 +2991,6 @@
},
"invalid-database": "数据库 {{database}} 无效",
"last-synced": "上次同步时间:<time></time>",
- "link-access": "访问权限",
"loading-data": "加载数据中...",
"loading-databases": "加载数据库信息...",
"manage-connections": "管理连接",
@@ -3009,12 +3007,6 @@
"pending-query": "待处理查询",
"preview-table-data": "预览表数据",
"previous-row": "上一行",
- "private": "私有",
- "private-desc": "只有您自己可以访问此查询",
- "project-read": "项目内可查看",
- "project-read-desc": "项目成员可以查看此查询,仅所有者和管理员可以编辑。",
- "project-write": "项目内可编辑",
- "project-write-desc": "项目成员可以查看和编辑此查询。",
"query-context": {
"admin-data-source-is-disallowed-to-query": "禁止查询主数据源。"
},
diff --git a/frontend/src/modules/sql-editor/components/SharePopoverBody.test.tsx b/frontend/src/modules/sql-editor/components/SharePopoverBody.test.tsx
index ec9dbac48e..68240ae4b2 100644
--- a/frontend/src/modules/sql-editor/components/SharePopoverBody.test.tsx
+++ b/frontend/src/modules/sql-editor/components/SharePopoverBody.test.tsx
@@ -12,31 +12,26 @@ const mocks = vi.hoisted(() => ({
serverInfo: { externalUrl: "https://example.com" } as
| { externalUrl: string }
| undefined,
- useCurrentUser: vi.fn(),
- patchSavedQuery: vi.fn().mockResolvedValue({}),
pushNotification: vi.fn(),
extractProjectResourceName: vi.fn(
(name: string) => name.split("/")[1] ?? name
),
extractSavedQueryID: vi.fn((name: string) => name.split("/")[3] ?? name),
- routerResolve: vi.fn(() => ({ href: "/sql-editor/projects/proj1/sheets/1" })),
+ routerResolve: vi.fn(() => ({
+ href: "/sql-editor/projects/proj1/savedQueries/1",
+ })),
}));
vi.mock("react-i18next", () => ({
useTranslation: mocks.useTranslation,
}));
-vi.mock("@/hooks/useAppState", () => ({
- useCurrentUser: mocks.useCurrentUser,
-}));
-
vi.mock("@/stores/app", () => {
// `notify` reuses the `pushNotification` vi.fn so the existing test
// assertions on `mocks.pushNotification` keep working after the migration
// from the Pinia helper to the app-store notification slice.
const state = () => ({
serverInfo: mocks.serverInfo,
- patchSavedQuery: mocks.patchSavedQuery,
notify: mocks.pushNotification,
});
return {
@@ -59,38 +54,12 @@ vi.mock("@/app/router", async (importOriginal) => ({
},
}));
-vi.mock("@/components/ui/popover", () => ({
- Popover: ({ children }: { children: React.ReactNode }) => (
- <div data-testid="popover">{children}</div>
- ),
- PopoverTrigger: ({
- children,
- render: renderEl,
- }: {
- children?: React.ReactNode;
- render?: React.ReactElement;
- }) => (
- <div data-testid="popover-trigger">
- {renderEl ? renderEl : null}
- {children}
- </div>
- ),
- PopoverContent: ({ children }: { children: React.ReactNode }) => (
- <div data-testid="popover-content">{children}</div>
- ),
-}));
-
-vi.mock("@/components/ui/tooltip", () => ({
- Tooltip: ({ children }: { children: React.ReactNode }) => <>{children}</>,
-}));
-
let SharePopoverBody: typeof import("./SharePopoverBody").SharePopoverBody;
const mockSavedQuery = {
name: "projects/proj1/savedQueries/1",
project: "projects/proj1",
creator: "users/[email protected]",
- visibility: 3 /* PRIVATE */,
title: "test sheet",
};
@@ -118,13 +87,7 @@ beforeEach(async () => {
vi.clearAllMocks();
mocks.useTranslation.mockReturnValue({ t: (key: string) => key });
-
mocks.serverInfo = { externalUrl: "https://example.com" };
- mocks.useCurrentUser.mockReturnValue({
- email: "[email protected]",
- name: "users/[email protected]",
- });
- mocks.patchSavedQuery.mockResolvedValue({});
// Mock clipboard
Object.defineProperty(navigator, "clipboard", {
@@ -152,73 +115,22 @@ describe("SharePopoverBody", () => {
unmount();
});
- test("shows 3 visibility options when selector is opened", () => {
+ test("renders the deep link without an access selector", () => {
const { container, render, unmount } = renderIntoContainer(
<SharePopoverBody savedQuery={mockSavedQuery as never} />
);
render();
- // The popover-content should contain 3 options
- const popoverContent = container.querySelector(
- "[data-testid='popover-content']"
- );
- expect(popoverContent).not.toBeNull();
- // 3 option rows each with cursor-pointer class
- const optionRows =
- popoverContent?.querySelectorAll("[data-option-row]") ?? [];
- expect(optionRows.length).toBe(3);
- unmount();
- });
-
- test("visibility selector disabled when user is not creator", () => {
- mocks.useCurrentUser.mockReturnValue({
- email: "[email protected]",
- name: "users/[email protected]",
- });
-
- const { container, render, unmount } = renderIntoContainer(
- <SharePopoverBody savedQuery={mockSavedQuery as never} />
- );
- render();
- // Trigger should have disabled styling
- const trigger = container.querySelector("[data-access-trigger]");
- expect(trigger?.getAttribute("data-disabled")).toBe("true");
- unmount();
- });
-
- test("handleChangeAccess calls patchSavedQuery and pushNotification but does NOT close the outer popover", async () => {
- const patchSavedQuery = mocks.patchSavedQuery;
-
- const { container, render, unmount } = renderIntoContainer(
- <SharePopoverBody savedQuery={mockSavedQuery as never} />
- );
- render();
-
- const popoverContent = container.querySelector(
- "[data-testid='popover-content']"
- );
- const optionRows = popoverContent?.querySelectorAll("[data-option-row]");
- expect(optionRows?.length).toBeGreaterThanOrEqual(1);
-
- // Click second option (Project Read).
- await act(async () => {
- (optionRows?.[1] as HTMLElement)?.click();
- });
-
- expect(patchSavedQuery).toHaveBeenCalledTimes(1);
- expect(mocks.pushNotification).toHaveBeenCalledTimes(1);
- // The SharePopoverBody no longer signals "close me" on access
- // change — the outer share popover stays open so the user can copy
- // the just-updated link.
+ const input = container.querySelector("input") as HTMLInputElement;
+ expect(input.value).toContain("/savedQueries/1");
+ // Saved queries are private until per-object grants ship, so the
+ // popover carries no visibility selector.
+ expect(container.querySelector("[data-access-trigger]")).toBeNull();
unmount();
});
test("copy button writes to clipboard and pushes notification", async () => {
const { container, render, unmount } = renderIntoContainer(
- <SharePopoverBody
- savedQuery={
- { ...mockSavedQuery, visibility: 1 /* PROJECT_READ */ } as never
- }
- />
+ <SharePopoverBody savedQuery={mockSavedQuery as never} />
);
render();
@@ -238,8 +150,7 @@ describe("SharePopoverBody", () => {
test("copy button disabled when there is no shareable saved query link", () => {
// No saved query (an unsaved draft) → no link → copy disabled. A saved
- // saved query from the tree always has a link, so copy is enabled regardless
- // of the current tab's status (covered by the private-saved-query test below).
+ // query from the tree always has a link, so copy stays enabled there.
const { container, render, unmount } = renderIntoContainer(
<SharePopoverBody savedQuery={undefined as never} />
);
@@ -252,20 +163,4 @@ describe("SharePopoverBody", () => {
expect(copyBtn.disabled).toBe(true);
unmount();
});
-
- test("copy button enabled for a private saved query (share status ignored)", () => {
- // mockSavedQuery is PRIVATE; the copy button stays enabled regardless of
- // share status, gated only by the tab's saved state.
- const { container, render, unmount } = renderIntoContainer(
- <SharePopoverBody savedQuery={mockSavedQuery as never} />
- );
- render();
-
- const copyBtn = container.querySelector(
- "[data-copy-btn]"
- ) as HTMLButtonElement;
- expect(copyBtn).not.toBeNull();
- expect(copyBtn.disabled).toBe(false);
- unmount();
- });
});
diff --git a/frontend/src/modules/sql-editor/components/SharePopoverBody.tsx b/frontend/src/modules/sql-editor/components/SharePopoverBody.tsx
index 8dc7737cfd..44bcea1c56 100644
--- a/frontend/src/modules/sql-editor/components/SharePopoverBody.tsx
+++ b/frontend/src/modules/sql-editor/components/SharePopoverBody.tsx
@@ -1,92 +1,28 @@
-import {
- Check,
- ChevronDown,
- Copy,
- Link2,
- LockKeyhole,
- Users,
-} from "lucide-react";
-import { useEffect, useMemo, useState } from "react";
+import { Copy, Link2 } from "lucide-react";
+import { useMemo } from "react";
import { useTranslation } from "react-i18next";
import { router } from "@/app/router";
import { SQL_EDITOR_SAVED_QUERY_MODULE } from "@/app/router/handles";
import { Button } from "@/components/ui/button";
-import {
- Popover,
- PopoverContent,
- PopoverTrigger,
-} from "@/components/ui/popover";
-import { useCurrentUser } from "@/hooks/useAppState";
import { writeTextToClipboard } from "@/lib/clipboard";
-import { cn } from "@/lib/utils";
import { useAppStore } from "@/stores/app";
import type { SavedQuery } from "@/types/proto-es/v1/saved_query_service_pb";
-import { SavedQuery_Visibility } from "@/types/proto-es/v1/saved_query_service_pb";
import { extractProjectResourceName, extractSavedQueryID } from "@/utils";
-type AccessOption = {
- label: string;
- description: string;
- value: SavedQuery_Visibility;
- icon: React.ReactNode;
-};
-
type Props = {
readonly savedQuery?: SavedQuery;
};
/**
* Replaces frontend/src/views/sql-editor/EditorCommon/SharePopover.vue.
- * Renders the share popover body content: visibility selector + shareable link.
+ * Renders the share popover body: the saved query's deep link with a copy
+ * button. The link carries location, not access — a saved query is private
+ * to its creator (admins aside) until the access-model redesign ships
+ * per-object grants, so there is no access selector here.
*/
export function SharePopoverBody({ savedQuery }: Props) {
const { t } = useTranslation();
const workspaceExternalURL = useAppStore((s) => s.serverInfo?.externalUrl);
- const currentUser = useCurrentUser();
-
- const accessOptions = useMemo<AccessOption[]>(
- () => [
- {
- label: t("sql-editor.private"),
- description: t("sql-editor.private-desc"),
- value: SavedQuery_Visibility.PRIVATE,
- icon: <LockKeyhole className="size-5" />,
- },
- {
- label: t("sql-editor.project-read"),
- description: t("sql-editor.project-read-desc"),
- value: SavedQuery_Visibility.PROJECT_READ,
- icon: <Users className="size-5" />,
- },
- {
- label: t("sql-editor.project-write"),
- description: t("sql-editor.project-write-desc"),
- value: SavedQuery_Visibility.PROJECT_WRITE,
- icon: <Users className="size-5" />,
- },
- ],
- [t]
- );
-
- const allowChangeAccess = useMemo(() => {
- if (!savedQuery || !currentUser) return false;
- return savedQuery.creator === `users/${currentUser.email}`;
- }, [savedQuery, currentUser]);
-
- const [currentAccess, setCurrentAccess] = useState<AccessOption>(
- () => accessOptions[0]
- );
-
- const [selectorOpen, setSelectorOpen] = useState(false);
-
- // Sync currentAccess from savedQuery.visibility when saved query changes
- useEffect(() => {
- if (!savedQuery) return;
- const idx = accessOptions.findIndex(
- (opt) => opt.value === savedQuery.visibility
- );
- setCurrentAccess(idx !== -1 ? accessOptions[idx] : accessOptions[0]);
- }, [savedQuery, accessOptions]);
const sharedTabLink = useMemo(() => {
if (!savedQuery) return "";
@@ -101,38 +37,6 @@ export function SharePopoverBody({ savedQuery }: Props) {
.href;
}, [savedQuery, workspaceExternalURL]);
- const handleChangeAccess = async (option: AccessOption) => {
- if (!allowChangeAccess || !savedQuery) {
- setSelectorOpen(false);
- return;
- }
- setCurrentAccess(option);
- await useAppStore
- .getState()
- .patchSavedQuery({ ...savedQuery, visibility: option.value }, [
- "visibility",
- ]);
-
- if (await writeTextToClipboard(sharedTabLink)) {
- useAppStore.getState().notify({
- module: "bytebase",
- style: "SUCCESS",
- title: t("sql-editor.url-copied-to-clipboard"),
- });
- } else {
- useAppStore.getState().notify({
- module: "bytebase",
- style: "SUCCESS",
- title: t("common.updated"),
- });
- }
-
- // Close only the inner access selector — keep the outer share
- // popover open so the user can still copy the just-updated link
- // (or change the access again).
- setSelectorOpen(false);
- };
-
const handleCopyLink = async () => {
if (await writeTextToClipboard(sharedTabLink)) {
useAppStore.getState().notify({
@@ -147,72 +51,10 @@ export function SharePopoverBody({ savedQuery }: Props) {
return (
<div className="w-96 p-2 flex flex-col gap-y-4">
- {/* Header: Share title + visibility selector */}
<section className="w-full flex flex-row justify-between items-center">
<div className="pr-4">
<h2 className="text-lg font-semibold">{t("common.share")}</h2>
</div>
- <Popover open={selectorOpen} onOpenChange={setSelectorOpen}>
- <PopoverTrigger
- // The trigger renders a <div>, not a native <button>; tell Base
- // UI so it doesn't warn about missing native button semantics.
- nativeButton={false}
- render={
- <div
- data-access-trigger
- data-disabled={!allowChangeAccess ? "true" : "false"}
- className={cn(
- "flex items-center",
- allowChangeAccess ? "cursor-pointer" : "cursor-not-allowed"
- )}
- />
- }
- >
- <span className="pr-2">{t("sql-editor.link-access")}:</span>
- <div
- className={cn(
- "border flex flex-row justify-start items-center px-2 py-1 rounded-sm",
- allowChangeAccess
- ? "hover:border-accent"
- : "border-control-border text-control-placeholder"
- )}
- >
- <strong>{currentAccess.label}</strong>
- <ChevronDown className="size-4 ml-1" />
- </div>
- </PopoverTrigger>
- <PopoverContent side="bottom" align="end" className="w-80 p-2">
- <div className="flex flex-col gap-y-2">
- {accessOptions.map((option) => (
- <div
- key={option.value}
- data-option-row
- className={cn(
- "p-2 rounded-xs flex justify-between",
- allowChangeAccess && "cursor-pointer hover:bg-control-bg",
- option.value === currentAccess.value && "bg-control-bg"
- )}
- onClick={() => handleChangeAccess(option)}
- >
- <div>
- <div className="flex gap-x-2 items-center">
- {option.icon}
- <h2 className="text-md flex">{option.label}</h2>
- </div>
- <span className="text-xs textinfolabel">
- {option.description}
- </span>
- </div>
- {option.value === currentAccess.value && (
- <div className="flex items-center">
- <Check className="size-5" />
- </div>
- )}
- </div>
- ))}
- </div>
- </PopoverContent>
- </Popover>
</section>
{/* Link input + copy button — single bordered container with rounded
diff --git a/frontend/src/modules/sql-editor/components/TreeNodeSuffix.test.tsx b/frontend/src/modules/sql-editor/components/TreeNodeSuffix.test.tsx
index c6b104b5a0..67bd4718c7 100644
--- a/frontend/src/modules/sql-editor/components/TreeNodeSuffix.test.tsx
+++ b/frontend/src/modules/sql-editor/components/TreeNodeSuffix.test.tsx
@@ -68,14 +68,6 @@ vi.mock("@/components/ui/tooltip", () => ({
),
}));
-vi.mock("@/types/proto-es/v1/saved_query_service_pb", () => ({
- SavedQuery_Visibility: {
- PRIVATE: 0,
- PROJECT_READ: 1,
- PROJECT_WRITE: 2,
- },
-}));
-
// ---- helpers ----------------------------------------------------------------
const makeNode = (
@@ -130,7 +122,6 @@ beforeEach(async () => {
mocks.getSavedQueryByName.mockImplementation((name: string) => ({
name,
starred: false,
- visibility: 0, // PRIVATE
creator: "users/[email protected]",
}));
mocks.getSQLEditorTabsState.mockReturnValue({
diff --git a/frontend/src/modules/sql-editor/components/TreeNodeSuffix.tsx b/frontend/src/modules/sql-editor/components/TreeNodeSuffix.tsx
index d8f931f018..7ed256fdea 100644
--- a/frontend/src/modules/sql-editor/components/TreeNodeSuffix.tsx
+++ b/frontend/src/modules/sql-editor/components/TreeNodeSuffix.tsx
@@ -11,7 +11,6 @@ import {
} from "@/modules/sql-editor/model/Sheet";
import { getSQLEditorTabsState } from "@/modules/sql-editor/store/tab";
import { useAppStore } from "@/stores/app";
-import { SavedQuery_Visibility } from "@/types/proto-es/v1/saved_query_service_pb";
type Props = {
readonly node: SavedQueryFolderNode;
@@ -57,7 +56,6 @@ export function TreeNodeSuffix({
return {
name: sheet.name,
starred: sheet.starred,
- visibility: sheet.visibility,
creator: sheet.creator,
};
})
@@ -82,19 +80,6 @@ export function TreeNodeSuffix({
savedQueryLite?.creator,
]);
- const visibilityDisplayName = (visibility: SavedQuery_Visibility) => {
- switch (visibility) {
- case SavedQuery_Visibility.PRIVATE:
- return t("sql-editor.private");
- case SavedQuery_Visibility.PROJECT_READ:
- return t("sql-editor.project-read");
- case SavedQuery_Visibility.PROJECT_WRITE:
- return t("sql-editor.project-write");
- default:
- return "";
- }
- };
-
const creatorForSheet = (creator: string) => {
return savedQueryCreatorTitle ?? creator;
};
@@ -142,33 +127,21 @@ export function TreeNodeSuffix({
);
}
- // SavedQuery node: visibility badge + star + more
+ // SavedQuery node: creator badge (admin view of someone else's query) +
+ // star + more
if (!savedQueryLite) {
return null;
}
- const showVisibilityBadge =
- savedQueryLite.visibility === SavedQuery_Visibility.PROJECT_READ ||
- savedQueryLite.visibility === SavedQuery_Visibility.PROJECT_WRITE;
-
return (
<div className="inline-flex shrink-0 items-center gap-x-1">
- {showVisibilityBadge && (
+ {!isSavedQueryCreator(savedQueryLite) && (
<Tooltip
content={
<div>
- <div>
- {t("common.visibility")}
- {": "}
- {visibilityDisplayName(savedQueryLite.visibility)}
- </div>
- {!isSavedQueryCreator(savedQueryLite) && (
- <div>
- {t("common.creator")}
- {": "}
- {creatorForSheet(savedQueryLite.creator)}
- </div>
- )}
+ {t("common.creator")}
+ {": "}
+ {creatorForSheet(savedQueryLite.creator)}
</div>
}
>
diff --git a/frontend/src/modules/sql-editor/legacy/migration.ts b/frontend/src/modules/sql-editor/legacy/migration.ts
index 8cee93bf5a..93634f902d 100644
--- a/frontend/src/modules/sql-editor/legacy/migration.ts
+++ b/frontend/src/modules/sql-editor/legacy/migration.ts
@@ -6,10 +6,7 @@ import { getCurrentUserV1 } from "@/stores/modules/migration-helpers";
import { extractUserEmail } from "@/stores/modules/v1";
import type { EditorPanelViewState, SQLEditorTab } from "@/types";
import { DEFAULT_SQL_EDITOR_TAB_MODE } from "@/types";
-import {
- SavedQuery_Visibility,
- SavedQuerySchema,
-} from "@/types/proto-es/v1/saved_query_service_pb";
+import { SavedQuerySchema } from "@/types/proto-es/v1/saved_query_service_pb";
import { defaultSQLEditorTab, WebStorageHelper } from "@/utils";
import {
deleteExtendedTab,
@@ -176,7 +173,6 @@ export const migrateDraftsFromCache = async (project: string) => {
database: connection.database,
content: new TextEncoder().encode(tab.statement),
project,
- visibility: SavedQuery_Visibility.PRIVATE,
})
);
} catch {}
diff --git a/frontend/src/modules/sql-editor/model/Sheet/context.test.tsx b/frontend/src/modules/sql-editor/model/Sheet/context.test.tsx
index 107083f60f..b63fe54a78 100644
--- a/frontend/src/modules/sql-editor/model/Sheet/context.test.tsx
+++ b/frontend/src/modules/sql-editor/model/Sheet/context.test.tsx
@@ -4,7 +4,6 @@ import { createRoot, type Root } from "react-dom/client";
import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
import {
SavedQuerySchema,
- SavedQuery_Visibility,
type SavedQuery,
} from "@/types/proto-es/v1/saved_query_service_pb";
import {
@@ -70,7 +69,6 @@ const mocks = vi.hoisted(() => {
project: "projects/proj1",
creator: "users/[email protected]",
title: "Existing saved query",
- visibility: SavedQuery_Visibility.PRIVATE,
});
setSavedQueries([savedQuery]);
return { savedQueries: [savedQuery], nextPageToken: "next-page" };
@@ -175,7 +173,6 @@ describe("sheet context", () => {
project: "projects/proj1",
creator: "users/[email protected]",
title: "Created saved query",
- visibility: SavedQuery_Visibility.PRIVATE,
}),
]);
await act(async () => {
@@ -550,7 +547,6 @@ describe("sheet context", () => {
creator: "users/[email protected]",
title: "Folder saved query",
folders: ["alpha"],
- visibility: SavedQuery_Visibility.PRIVATE,
});
mocks.addSavedQueries([savedQuery]);
return {
@@ -599,7 +595,6 @@ describe("sheet context", () => {
creator: "users/[email protected]",
title: "Folder saved query",
folders: ["alpha"],
- visibility: SavedQuery_Visibility.PRIVATE,
});
mocks.addSavedQueries([savedQuery]);
return {
@@ -639,7 +634,6 @@ describe("sheet context", () => {
project: "projects/proj1",
creator: "users/[email protected]",
title: "Zeta saved query",
- visibility: SavedQuery_Visibility.PRIVATE,
});
mocks.getAppState().fetchSavedQueryList.mockImplementationOnce(async () => {
mocks.addSavedQueries([firstSavedQuery]);
@@ -673,7 +667,6 @@ describe("sheet context", () => {
project: "projects/proj1",
creator: "users/[email protected]",
title: "Alpha saved query",
- visibility: SavedQuery_Visibility.PRIVATE,
});
mocks.getAppState().fetchSavedQueryList.mockImplementationOnce(async () => {
mocks.addSavedQueries([secondSavedQuery]);
@@ -720,7 +713,6 @@ describe("sheet context", () => {
creator: "users/[email protected]",
title: "Folder saved query",
folders: ["alpha"],
- visibility: SavedQuery_Visibility.PRIVATE,
});
mocks.addSavedQueries([savedQuery]);
return {
@@ -741,7 +733,6 @@ describe("sheet context", () => {
creator: "users/[email protected]",
title: "Child folder saved query",
folders: ["alpha", "child"],
- visibility: SavedQuery_Visibility.PRIVATE,
});
mocks.addSavedQueries([savedQuery]);
return {
@@ -794,7 +785,6 @@ describe("sheet context", () => {
creator: "users/[email protected]",
title: "Alpha saved query",
folders: ["alpha"],
- visibility: SavedQuery_Visibility.PRIVATE,
});
mocks.addSavedQueries([savedQuery]);
return {
@@ -845,7 +835,6 @@ describe("sheet context", () => {
creator: "users/[email protected]",
title: "Folder saved query",
folders: ["alpha"],
- visibility: SavedQuery_Visibility.PRIVATE,
});
mocks.addSavedQueries([savedQuery]);
return {
diff --git a/frontend/src/modules/sql-editor/model/Sheet/context.ts b/frontend/src/modules/sql-editor/model/Sheet/context.ts
index 7b669f13fd..6c45b603ed 100644
--- a/frontend/src/modules/sql-editor/model/Sheet/context.ts
+++ b/frontend/src/modules/sql-editor/model/Sheet/context.ts
@@ -20,10 +20,7 @@ import {
import { useAppStore } from "@/stores/app";
import type { SQLEditorTab, SQLEditorTabMode } from "@/types";
import { DEBOUNCE_SEARCH_DELAY } from "@/types";
-import {
- type SavedQuery,
- SavedQuery_Visibility,
-} from "@/types/proto-es/v1/saved_query_service_pb";
+import { type SavedQuery } from "@/types/proto-es/v1/saved_query_service_pb";
import {
getDefaultPagination,
getSheetStatement,
@@ -1024,13 +1021,13 @@ const sheetFilterForView = (
includeDisplayFilters = true
): string => {
const email = useAppStore.getState().currentUser?.email ?? "";
+ // The server already restricts Search results to rows the caller can
+ // read (their own, plus everything for workspace admins), so "shared"
+ // is simply the readable rows someone else created.
const baseFilters =
view === "my"
? [`creator == "users/${escapeCELStringLiteral(email)}"`]
- : [
- `creator != "users/${escapeCELStringLiteral(email)}"`,
- `visibility in ["${SavedQuery_Visibility[SavedQuery_Visibility.PROJECT_READ]}","${SavedQuery_Visibility[SavedQuery_Visibility.PROJECT_WRITE]}"]`,
- ];
+ : [`creator != "users/${escapeCELStringLiteral(email)}"`];
return [
...baseFilters,
...extraFilters,
@@ -1195,14 +1192,9 @@ const viewForSavedQuery = (
): SheetViewMode | undefined => {
const project = getSQLEditorEditorState().project;
if (savedQuery.project !== project) return undefined;
- if (isSavedQueryCreator(savedQuery)) return "my";
- if (
- savedQuery.visibility === SavedQuery_Visibility.PROJECT_READ ||
- savedQuery.visibility === SavedQuery_Visibility.PROJECT_WRITE
- ) {
- return "shared";
- }
- return undefined;
+ // A reachable saved query someone else created can only be here via the
+ // admin backstop — it lists under "shared".
+ return isSavedQueryCreator(savedQuery) ? "my" : "shared";
};
const addNewSavedQueriesToViewMembership = (
diff --git a/frontend/src/modules/sql-editor/store/savedQuery.ts b/frontend/src/modules/sql-editor/store/savedQuery.ts
index e7b733fdd8..4d0e90f007 100644
--- a/frontend/src/modules/sql-editor/store/savedQuery.ts
+++ b/frontend/src/modules/sql-editor/store/savedQuery.ts
@@ -5,10 +5,7 @@ import { sqlEditorEvents } from "@/modules/sql-editor/model/events";
import { openSavedQueryByName } from "@/modules/sql-editor/model/Sheet";
import { useAppStore } from "@/stores/app";
import { isValidProjectName } from "@/types";
-import {
- SavedQuery_Visibility,
- SavedQuerySchema,
-} from "@/types/proto-es/v1/saved_query_service_pb";
+import { SavedQuerySchema } from "@/types/proto-es/v1/saved_query_service_pb";
import { getSQLEditorEditorState } from "./editor";
import { getSQLEditorTabsState } from "./tab";
import type { SavedQuerySaveSlice, SQLEditorSliceCreator } from "./types";
@@ -146,7 +143,6 @@ export const createSavedQuerySaveSlice: SQLEditorSliceCreator<
database,
content: new TextEncoder().encode(statement),
project: editorStore.project,
- visibility: SavedQuery_Visibility.PRIVATE,
})
);
diff --git a/frontend/src/types/proto-es/v1/saved_query_service_pb.d.ts b/frontend/src/types/proto-es/v1/saved_query_service_pb.d.ts
index 334aec8d5a..3a56a25639 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
@@ -243,12 +243,11 @@ export declare type UpdateSavedQueryRequest = Message<"bytebase.v1.UpdateSavedQu
/**
* The list of fields to be updated.
* Fields are specified relative to the saved query.
- * (e.g., `title`, `statement`; *not* `saved_query.title` or `saved_query.statement`)
+ * (e.g., `title`, `content`; *not* `saved_query.title` or `saved_query.content`)
* Only support update the following fields for now:
* - `title`
- * - `statement`
- * - `starred`
- * - `visibility`
+ * - `content`
+ * - `database`
*
* @generated from field: google.protobuf.FieldMask update_mask = 2;
*/
@@ -281,7 +280,6 @@ 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.
- * - visibility: check Visibility enum in the SavedQuery message for values, support "==" and "in [xx]" operator.
* - folder: the saved query organizer folder path, support exact "==" operator.
*
* @generated from field: string filter = 2;
@@ -444,7 +442,6 @@ 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.
- * - visibility: check Visibility enum in the SavedQuery message for values, support "==" and "in [xx]" operator.
* - folder: the saved query organizer folder path, support "==" operator.
*
* For example:
@@ -453,8 +450,6 @@ export declare type SearchSavedQueriesRequest = Message<"bytebase.v1.SearchSaved
* creator != "users/{email}"
* starred == true
* starred == false
- * visibility in ["PRIVATE", "PROJECT_READ", "PROJECT_WRITE"]
- * visibility == "PRIVATE"
* folder == "foo/bar"
*
* @generated from field: string filter = 2;
@@ -588,11 +583,6 @@ export declare type SavedQuery = Message<"bytebase.v1.SavedQuery"> & {
*/
contentSize: bigint;
- /**
- * @generated from field: bytebase.v1.SavedQuery.Visibility visibility = 10;
- */
- visibility: SavedQuery_Visibility;
-
/**
* starred indicates whether the saved query is starred by the current authenticated user.
*
@@ -612,42 +602,6 @@ export declare type SavedQuery = Message<"bytebase.v1.SavedQuery"> & {
*/
export declare const SavedQuerySchema: GenMessage<SavedQuery>;
-/**
- * @generated from enum bytebase.v1.SavedQuery.Visibility
- */
-export enum SavedQuery_Visibility {
- /**
- * @generated from enum value: VISIBILITY_UNSPECIFIED = 0;
- */
- VISIBILITY_UNSPECIFIED = 0,
-
- /**
- * Read access in project scope, saved query OWNER/DBA and project OWNER can read/write, other project members can read.
- *
- * @generated from enum value: PROJECT_READ = 1;
- */
- PROJECT_READ = 1,
-
- /**
- * Write access in project scope, saved query OWNER/DBA and all members in the project can write the saved query.
- *
- * @generated from enum value: PROJECT_WRITE = 2;
- */
- PROJECT_WRITE = 2,
-
- /**
- * Private, only saved query OWNER can read/write.
- *
- * @generated from enum value: PRIVATE = 3;
- */
- PRIVATE = 3,
-}
-
-/**
- * Describes the enum bytebase.v1.SavedQuery.Visibility.
- */
-export declare const SavedQuery_VisibilitySchema: GenEnum<SavedQuery_Visibility>;
-
/**
* SavedQueryService manages saved queries for SQL Editor query development.
* Permission IDs still use the legacy `bb.worksheets.*` names; they are
@@ -669,11 +623,9 @@ export declare const SavedQueryService: GenService<{
},
/**
* Get a saved query by name.
- * The users can access this method if,
- * - they are the creator of the saved query;
- * - they have bb.worksheets.get permission on the workspace;
- * - the saved query is shared with them with PROJECT_READ and PROJECT_WRITE visibility, and they have bb.projects.get permission on the project.
- * Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ * 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
*
* @generated from rpc bytebase.v1.SavedQueryService.GetSavedQuery
*/
@@ -707,9 +659,9 @@ export declare const SavedQueryService: GenService<{
},
/**
* Search for saved queries.
- * This is used for finding my saved queries or saved queries shared by other people.
+ * This is used for finding my saved queries in a project.
* The saved query accessibility is the same as GetSavedQuery().
- * Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ * Permissions required: creator, or workspace bb.worksheets.manage
*
* @generated from rpc bytebase.v1.SavedQueryService.SearchSavedQueries
*/
@@ -720,11 +672,8 @@ export declare const SavedQueryService: GenService<{
},
/**
* Update a saved query.
- * The users can access this method if,
- * - they are the creator of the saved query;
- * - they have bb.worksheets.manage permission on the workspace;
- * - the saved query is shared with them with PROJECT_WRITE visibility, and they have bb.projects.get permission on the project.
- * Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries)
+ * The access is the same as GetSavedQuery method.
+ * Permissions required: creator, or workspace bb.worksheets.manage
*
* @generated from rpc bytebase.v1.SavedQueryService.UpdateSavedQuery
*/
@@ -736,7 +685,7 @@ export declare const SavedQueryService: GenService<{
/**
* Update the organizer of a saved query.
* The access is the same as UpdateSavedQuery method.
- * Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ * Permissions required: creator, or workspace bb.worksheets.manage
*
* @generated from rpc bytebase.v1.SavedQueryService.UpdateSavedQueryOrganizer
*/
@@ -748,7 +697,7 @@ export declare const SavedQueryService: GenService<{
/**
* Batch update the organizers of saved queries.
* The access is the same as UpdateSavedQuery method.
- * Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ * Permissions required: creator, or workspace bb.worksheets.manage
*
* @generated from rpc bytebase.v1.SavedQueryService.BatchUpdateSavedQueryOrganizer
*/
@@ -760,7 +709,7 @@ export declare const SavedQueryService: GenService<{
/**
* Delete a saved query.
* The access is the same as UpdateSavedQuery method.
- * Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries)
+ * Permissions required: creator, or workspace bb.worksheets.manage
*
* @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.js
index 8cbdcef511..ebaa51d5f9 100644
--- a/frontend/src/types/proto-es/v1/saved_query_service_pb.js
+++ b/frontend/src/types/proto-es/v1/saved_query_service_pb.js
@@ -15,7 +15,7 @@ import { file_v1_annotation } from "./annotation_pb";
* Describes the file v1/saved_query_service.proto.
*/
export const file_v1_saved_query_service = /*@__PURE__*/
- fileDesc("Chx2MS9zYXZlZF9xdWVyeV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJhChdDcmVhdGVTYXZlZFF1ZXJ5UmVxdWVzdBITCgZwYXJlbnQYASABKAlCA+BBAhIxCgtzYXZlZF9xdWVyeRgCIAEoCzIXLmJ5dGViYXNlLnYxLlNhdmVkUXVlcnlCA+BBAiIpChRHZXRTYXZlZFF1ZXJ5UmVxdWVzdBIRCgRuYW1lGAEgASgJQgPgQQIifgoXTGlzdFNhdmVkUXVlcmllc1JlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0Eg4KBmZpbHRlchgCIAEoCRIRCglwYWdlX3NpemUYAyABKAUSEgoKcGFnZV90b2tlbhgEIAEoCSJjChhMaXN0U2F2ZWRRdWVyaWVzUmVzcG9uc2USLgoNc2F2ZWRfcXVlcmllcxgBIAMoCzIXLmJ5dGViYXNlLnYxLlNhdmVkUXVlcnkSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIjMKHExpc3RTYXZlZFF1ZXJ5Rm9sZGVyc1JlcXVlc3QSEwoGcGFyZW50GAEgASgJQgPgQQIiTwodTGlzdFNhdmVkUXVlcnlGb2xkZXJzUmVzcG9uc2USLgoHZm9sZGVycxgBIAMoCzIdLmJ5dGViYXNlLnYxLlNhdmVkUXVlcnlGb2xkZXIimQEKEFNhdmVkUXVlcnlGb2xkZXISDwoHZm9sZGVycxgBIAMoCRI4CghjYXRlZ29yeRgCIAEoDjImLmJ5dGViYXNlLnYxLlNhdmVkUXVlcnlGb2xkZXIuQ2F0ZWdvcnkiOgoIQ2F0ZWdvcnkSGAoUQ0FURUdPUllfVU5TUEVDSUZJRUQQABIICgRNSU5FEAESCgoGU0hBUkVEEAIifQoXVXBkYXRlU2F2ZWRRdWVyeVJlcXVlc3QSMQoLc2F2ZWRfcXVlcnkYASABKAsyFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5QgPgQQISLwoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrIrwBCiVCYXRjaFVwZGF0ZVNhdmVkUXVlcnlPcmdhbml6ZXJSZXF1ZXN0EhMKBnBhcmVudBgBIAEoCUID4EECEg4KBmZpbHRlchgCIAEoCRI4Cglvcmdhbml6ZXIYAyABKAsyIC5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5T3JnYW5pemVyQgPgQQISNAoLdXBkYXRlX21hc2sYBCABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrQgPgQQIigQEKJkJhdGNoVXBkYXRlU2F2ZWRRdWVyeU9yZ2FuaXplclJlc3BvbnNlEkAKFnNhdmVkX3F1ZXJ5X29yZ2FuaXplcnMYASADKAsyIC5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5T3JnYW5pemVyEhUKDXVwZGF0ZWRfY291bnQYAiABKAUipAEKIFVwZGF0ZVNhdmVkUXVlcnlPcmdhbml6ZXJSZXF1ZXN0EjgKCW9yZ2FuaXplchgBIAEoCzIgLmJ5dGViYXNlLnYxLlNhdmVkUXVlcnlPcmdhbml6ZXJCA+BBAhIvCgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sSFQoNYWxsb3dfbWlzc2luZxgDIAEoCCJRChNTYXZlZFF1ZXJ5T3JnYW5pemVyEhgKC3NhdmVkX3F1ZXJ5GAEgASgJQgPgQQISDwoHc3RhcnJlZBgCIAEoCBIPCgdmb2xkZXJzGAMgAygJIiwKF0RlbGV0ZVNhdmVkUXVlcnlSZXF1ZXN0EhEKBG5hbWUYASABKAlCA+BBAiJnChlTZWFyY2hTYXZlZFF1ZXJpZXNSZXF1ZXN0EhMKBnBhcmVudBgBIAEoCUID4EECEg4KBmZpbHRlchgCIAEoCRIRCglwYWdlX3NpemUYAyABKAUSEgoKcGFnZV90b2tlbhgEIAEoCSJlChpTZWFyY2hTYXZlZFF1ZXJpZXNSZXNwb25zZRIuCg1zYXZlZF9xdWVyaWVzGAEgAygLMhcuYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeRIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAki3gMKClNhdmVkUXVlcnkSFAoEbmFtZRgBIAEoCUIG4EEC4EEFEhQKB3Byb2plY3QYAiABKAlCA+BBAxIQCghkYXRhYmFzZRgDIAEoCRIaCgV0aXRsZRgEIAEoCUIL4EECukgFcgMYyAESFAoHY3JlYXRvchgFIAEoCUID4EEDEjQKC2NyZWF0ZV90aW1lGAYgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEjQKC3VwZGF0ZV90aW1lGAcgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEhQKB2NvbnRlbnQYCCABKAxCA+BBAhIZCgxjb250ZW50X3NpemUYCSABKANCA+BBAxI7Cgp2aXNpYmlsaXR5GAogASgOMiIuYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeS5WaXNpYmlsaXR5QgPgQQISFAoHc3RhcnJlZBgLIAEoCEID4EEDEhQKB2ZvbGRlcnMYDCADKAlCA+BBAyJaCgpWaXNpYmlsaXR5EhoKFlZJU0lCSUxJVFlfVU5TUEVDSUZJRUQQABIQCgxQUk9KRUNUX1JFQUQQARIRCg1QUk9KRUNUX1dSSVRFEAISCwoHUFJJVkFURRADMu4MChFTYXZlZFF1ZXJ5U2VydmljZRKlAQoQQ3JlYXRlU2F2ZWRRdWVyeRIkLmJ5dGViYXNlLnYxLkNyZWF0ZVNhdmVkUXVlcnlSZXF1ZXN0GhcuYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeSJS2kEScGFyZW50LHNhdmVkX3F1ZXJ5kOowAoLT5JMCMzoLc2F2ZWRfcXVlcnkiJC92MS97cGFyZW50PXByb2plY3RzLyp9L3NhdmVkUXVlcmllcxKEAQoNR2V0U2F2ZWRRdWVyeRIhLmJ5dGViYXNlLnYxLkdldFNhdmVkUXVlcnlSZXF1ZXN0GhcuYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeSI32kEEbmFtZZDqMAKC0+STAiYSJC92MS97bmFtZT1wcm9qZWN0cy8qL3NhdmVkUXVlcmllcy8qfRKwAQoQTGlzdFNhdmVkUXVlcmllcxIkLmJ5dGViYXNlLnYxLkxpc3RTYXZlZFF1ZXJpZXNSZXF1ZXN0GiUuYnl0ZWJhc2UudjEuTGlzdFNhdmVkUXVlcmllc1Jlc3BvbnNlIk/aQQZwYXJlbnSK6jASYmIud29ya3NoZWV0cy5saXN0kOowAYLT5JMCJhIkL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vc2F2ZWRRdWVyaWVzEq4BChVMaXN0U2F2ZWRRdWVyeUZvbGRlcnMSKS5ieXRlYmFzZS52MS5MaXN0U2F2ZWRRdWVyeUZvbGRlcnNSZXF1ZXN0GiouYnl0ZWJhc2UudjEuTGlzdFNhdmVkUXVlcnlGb2xkZXJzUmVzcG9uc2UiPtpBBnBhcmVudJDqMAKC0+STAisSKS92MS97cGFyZW50PXByb2plY3RzLyp9L3NhdmVkUXVlcnlGb2xkZXJzEqoBChJTZWFyY2hTYXZlZFF1ZXJpZXMSJi5ieXRlYmFzZS52MS5TZWFyY2hTYXZlZFF1ZXJpZXNSZXF1ZXN0GicuYnl0ZWJhc2UudjEuU2VhcmNoU2F2ZWRRdWVyaWVzUmVzcG9uc2UiQ9pBBnBhcmVudJDqMAKC0+STAjA6ASoiKy92MS97cGFyZW50PXByb2plY3RzLyp9L3NhdmVkUXVlcmllczpzZWFyY2gStgEKEFVwZGF0ZVNhdmVkUXVlcnkSJC5ieXRlYmFzZS52MS5VcGRhdGVTYXZlZFF1ZXJ5UmVxdWVzdBoXLmJ5dGViYXNlLnYxLlNhdmVkUXVlcnkiY9pBF3NhdmVkX3F1ZXJ5LHVwZGF0ZV9tYXNrkOowAoLT5JMCPzoLc2F2ZWRfcXVlcnkyMC92MS97c2F2ZWRfcXVlcnkubmFtZT1wcm9qZWN0cy8qL3NhdmVkUXVlcmllcy8qfRLcAQoZVXBkYXRlU2F2ZWRRdWVyeU9yZ2FuaXplchItLmJ5dGViYXNlLnYxLlVwZGF0ZVNhdmVkUXVlcnlPcmdhbml6ZXJSZXF1ZXN0GiAuYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeU9yZ2FuaXplciJu2kEVb3JnYW5pemVyLHVwZGF0ZV9tYXNrkOowAoLT5JMCTDoJb3JnYW5pemVyMj8vdjEve29yZ2FuaXplci5zYXZlZF9xdWVyeT1wcm9qZWN0cy8qL3NhdmVkUXVlcmllcy8qfS9vcmdhbml6ZXIS9AEKHkJhdGNoVXBkYXRlU2F2ZWRRdWVyeU9yZ2FuaXplchIyLmJ5dGViYXNlLnYxLkJhdGNoVXBkYXRlU2F2ZWRRdWVyeU9yZ2FuaXplclJlcXVlc3QaMy5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZVNhdmVkUXVlcnlPcmdhbml6ZXJSZXNwb25zZSJp2kEccGFyZW50LG9yZ2FuaXplcix1cGRhdGVfbWFza5DqMAKC0+STAkA6ASoiOy92MS97cGFyZW50PXByb2plY3RzLyp9L3NhdmVkUXVlcmllcy9vcmdhbml6ZXJzOmJhdGNoVXBkYXRlEokBChBEZWxldGVTYXZlZFF1ZXJ5EiQuYnl0ZWJhc2UudjEuRGVsZXRlU2F2ZWRRdWVyeVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiN9pBBG5hbWWQ6jACgtPkkwImKiQvdjEve25hbWU9cHJvamVjdHMvKi9zYXZlZFF1ZXJpZXMvKn1CrAEKD2NvbS5ieXRlYmFzZS52MUIWU2F2ZWRRdWVyeVNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [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("Chx2MS9zYXZlZF9xdWVyeV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJhChdDcmVhdGVTYXZlZFF1ZXJ5UmVxdWVzdBITCgZwYXJlbnQYASABKAlCA+BBAhIxCgtzYXZlZF9xdWVyeRgCIAEoCzIXLmJ5dGViYXNlLnYxLlNhdmVkUXVlcnlCA+BBAiIpChRHZXRTYXZlZFF1ZXJ5UmVxdWVzdBIRCgRuYW1lGAEgASgJQgPgQQIifgoXTGlzdFNhdmVkUXVlcmllc1JlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0Eg4KBmZpbHRlchgCIAEoCRIRCglwYWdlX3NpemUYAyABKAUSEgoKcGFnZV90b2tlbhgEIAEoCSJjChhMaXN0U2F2ZWRRdWVyaWVzUmVzcG9uc2USLgoNc2F2ZWRfcXVlcmllcxgBIAMoCzIXLmJ5dGViYXNlLnYxLlNhdmVkUXVlcnkSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIjMKHExpc3RTYXZlZFF1ZXJ5Rm9sZGVyc1JlcXVlc3QSEwoGcGFyZW50GAEgASgJQgPgQQIiTwodTGlzdFNhdmVkUXVlcnlGb2xkZXJzUmVzcG9uc2USLgoHZm9sZGVycxgBIAMoCzIdLmJ5dGViYXNlLnYxLlNhdmVkUXVlcnlGb2xkZXIimQEKEFNhdmVkUXVlcnlGb2xkZXISDwoHZm9sZGVycxgBIAMoCRI4CghjYXRlZ29yeRgCIAEoDjImLmJ5dGViYXNlLnYxLlNhdmVkUXVlcnlGb2xkZXIuQ2F0ZWdvcnkiOgoIQ2F0ZWdvcnkSGAoUQ0FURUdPUllfVU5TUEVDSUZJRUQQABIICgRNSU5FEAESCgoGU0hBUkVEEAIifQoXVXBkYXRlU2F2ZWRRdWVyeVJlcXVlc3QSMQoLc2F2ZWRfcXVlcnkYASABKAsyFy5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5QgPgQQISLwoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrIrwBCiVCYXRjaFVwZGF0ZVNhdmVkUXVlcnlPcmdhbml6ZXJSZXF1ZXN0EhMKBnBhcmVudBgBIAEoCUID4EECEg4KBmZpbHRlchgCIAEoCRI4Cglvcmdhbml6ZXIYAyABKAsyIC5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5T3JnYW5pemVyQgPgQQISNAoLdXBkYXRlX21hc2sYBCABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrQgPgQQIigQEKJkJhdGNoVXBkYXRlU2F2ZWRRdWVyeU9yZ2FuaXplclJlc3BvbnNlEkAKFnNhdmVkX3F1ZXJ5X29yZ2FuaXplcnMYASADKAsyIC5ieXRlYmFzZS52MS5TYXZlZFF1ZXJ5T3JnYW5pemVyEhUKDXVwZGF0ZWRfY291bnQYAiABKAUipAEKIFVwZGF0ZVNhdmVkUXVlcnlPcmdhbml6ZXJSZXF1ZXN0EjgKCW9yZ2FuaXplchgBIAEoCzIgLmJ5dGViYXNlLnYxLlNhdmVkUXVlcnlPcmdhbml6ZXJCA+BBAhIvCgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sSFQoNYWxsb3dfbWlzc2luZxgDIAEoCCJRChNTYXZlZFF1ZXJ5T3JnYW5pemVyEhgKC3NhdmVkX3F1ZXJ5GAEgASgJQgPgQQISDwoHc3RhcnJlZBgCIAEoCBIPCgdmb2xkZXJzGAMgAygJIiwKF0RlbGV0ZVNhdmVkUXVlcnlSZXF1ZXN0EhEKBG5hbWUYASABKAlCA+BBAiJnChlTZWFyY2hTYXZlZFF1ZXJpZXNSZXF1ZXN0EhMKBnBhcmVudBgBIAEoCUID4EECEg4KBmZpbHRlchgCIAEoCRIRCglwYWdlX3NpemUYAyABKAUSEgoKcGFnZV90b2tlbhgEIAEoCSJlChpTZWFyY2hTYXZlZFF1ZXJpZXNSZXNwb25zZRIuCg1zYXZlZF9xdWVyaWVzGAEgAygLMhcuYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeRIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAki1wIKClNhdmVkUXVlcnkSFAoEbmFtZRgBIAEoCUIG4EEC4EEFEhQKB3Byb2plY3QYAiABKAlCA+BBAxIQCghkYXRhYmFzZRgDIAEoCRIaCgV0aXRsZRgEIAEoCUIL4EECukgFcgMYyAESFAoHY3JlYXRvchgFIAEoCUID4EEDEjQKC2NyZWF0ZV90aW1lGAYgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEjQKC3VwZGF0ZV90aW1lGAcgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEhQKB2NvbnRlbnQYCCABKAxCA+BBAhIZCgxjb250ZW50X3NpemUYCSABKANCA+BBAxIUCgdzdGFycmVkGAsgASgIQgPgQQMSFAoHZm9sZGVycxgMIAMoCUID4EEDSgQIChALUgp2aXNpYmlsaXR5Mu4MChFTYXZlZFF1ZXJ5U2VydmljZRKlAQoQQ3JlYXRlU2F2ZWRRdWVyeRIkLmJ5dGViYXNlLnYxLkNyZWF0ZVNhdmVkUXVlcnlSZXF1ZXN0GhcuYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeSJS2kEScGFyZW50LHNhdmVkX3F1ZXJ5kOowAoLT5JMCMzoLc2F2ZWRfcXVlcnkiJC92MS97cGFyZW50PXByb2plY3RzLyp9L3NhdmVkUXVlcmllcxKEAQoNR2V0U2F2ZWRRdWVyeRIhLmJ5dGViYXNlLnYxLkdldFNhdmVkUXVlcnlSZXF1ZXN0GhcuYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeSI32kEEbmFtZZDqMAKC0+STAiYSJC92MS97bmFtZT1wcm9qZWN0cy8qL3NhdmVkUXVlcmllcy8qfRKwAQoQTGlzdFNhdmVkUXVlcmllcxIkLmJ5dGViYXNlLnYxLkxpc3RTYXZlZFF1ZXJpZXNSZXF1ZXN0GiUuYnl0ZWJhc2UudjEuTGlzdFNhdmVkUXVlcmllc1Jlc3BvbnNlIk/aQQZwYXJlbnSK6jASYmIud29ya3NoZWV0cy5saXN0kOowAYLT5JMCJhIkL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vc2F2ZWRRdWVyaWVzEq4BChVMaXN0U2F2ZWRRdWVyeUZvbGRlcnMSKS5ieXRlYmFzZS52MS5MaXN0U2F2ZWRRdWVyeUZvbGRlcnNSZXF1ZXN0GiouYnl0ZWJhc2UudjEuTGlzdFNhdmVkUXVlcnlGb2xkZXJzUmVzcG9uc2UiPtpBBnBhcmVudJDqMAKC0+STAisSKS92MS97cGFyZW50PXByb2plY3RzLyp9L3NhdmVkUXVlcnlGb2xkZXJzEqoBChJTZWFyY2hTYXZlZFF1ZXJpZXMSJi5ieXRlYmFzZS52MS5TZWFyY2hTYXZlZFF1ZXJpZXNSZXF1ZXN0GicuYnl0ZWJhc2UudjEuU2VhcmNoU2F2ZWRRdWVyaWVzUmVzcG9uc2UiQ9pBBnBhcmVudJDqMAKC0+STAjA6ASoiKy92MS97cGFyZW50PXByb2plY3RzLyp9L3NhdmVkUXVlcmllczpzZWFyY2gStgEKEFVwZGF0ZVNhdmVkUXVlcnkSJC5ieXRlYmFzZS52MS5VcGRhdGVTYXZlZFF1ZXJ5UmVxdWVzdBoXLmJ5dGViYXNlLnYxLlNhdmVkUXVlcnkiY9pBF3NhdmVkX3F1ZXJ5LHVwZGF0ZV9tYXNrkOowAoLT5JMCPzoLc2F2ZWRfcXVlcnkyMC92MS97c2F2ZWRfcXVlcnkubmFtZT1wcm9qZWN0cy8qL3NhdmVkUXVlcmllcy8qfRLcAQoZVXBkYXRlU2F2ZWRRdWVyeU9yZ2FuaXplchItLmJ5dGViYXNlLnYxLlVwZGF0ZVNhdmVkUXVlcnlPcmdhbml6ZXJSZXF1ZXN0GiAuYnl0ZWJhc2UudjEuU2F2ZWRRdWVyeU9yZ2FuaXplciJu2kEVb3JnYW5pemVyLHVwZGF0ZV9tYXNrkOowAoLT5JMCTDoJb3JnYW5pemVyMj8vdjEve29yZ2FuaXplci5zYXZlZF9xdWVyeT1wcm9qZWN0cy8qL3NhdmVkUXVlcmllcy8qfS9vcmdhbml6ZXIS9AEKHkJhdGNoVXBkYXRlU2F2ZWRRdWVyeU9yZ2FuaXplchIyLmJ5dGViYXNlLnYxLkJhdGNoVXBkYXRlU2F2ZWRRdWVyeU9yZ2FuaXplclJlcXVlc3QaMy5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZVNhdmVkUXVlcnlPcmdhbml6ZXJSZXNwb25zZSJp2kEccGFyZW50LG9yZ2FuaXplcix1cGRhdGVfbWFza5DqMAKC0+STAkA6ASoiOy92MS97cGFyZW50PXByb2plY3RzLyp9L3NhdmVkUXVlcmllcy9vcmdhbml6ZXJzOmJhdGNoVXBkYXRlEokBChBEZWxldGVTYXZlZFF1ZXJ5EiQuYnl0ZWJhc2UudjEuRGVsZXRlU2F2ZWRRdWVyeVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiN9pBBG5hbWWQ6jACgtPkkwImKiQvdjEve25hbWU9cHJvamVjdHMvKi9zYXZlZFF1ZXJpZXMvKn1CrAEKD2NvbS5ieXRlYmFzZS52MUIWU2F2ZWRRdWVyeVNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [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.
@@ -141,18 +141,6 @@ export const SearchSavedQueriesResponseSchema = /*@__PURE__*/
export const SavedQuerySchema = /*@__PURE__*/
messageDesc(file_v1_saved_query_service, 15);
-/**
- * Describes the enum bytebase.v1.SavedQuery.Visibility.
- */
-export const SavedQuery_VisibilitySchema = /*@__PURE__*/
- enumDesc(file_v1_saved_query_service, 15, 0);
-
-/**
- * @generated from enum bytebase.v1.SavedQuery.Visibility
- */
-export const SavedQuery_Visibility = /*@__PURE__*/
- tsEnum(SavedQuery_VisibilitySchema);
-
/**
* SavedQueryService manages saved queries for SQL Editor query development.
* Permission IDs still use the legacy `bb.worksheets.*` names; they are
diff --git a/frontend/src/utils/v1/savedQuery.ts b/frontend/src/utils/v1/savedQuery.ts
index fdc629f51a..4b6d4e4a99 100644
--- a/frontend/src/utils/v1/savedQuery.ts
+++ b/frontend/src/utils/v1/savedQuery.ts
@@ -1,10 +1,8 @@
import { getCurrentUserV1 } from "@/stores";
-import { getProjectByName } from "@/stores/app/projectAccess";
import { extractUserEmail } from "@/stores/modules/v1/common";
-import { UNKNOWN_ID, UNKNOWN_PROJECT_NAME } from "@/types";
+import { UNKNOWN_ID } from "@/types";
import type { SavedQuery } from "@/types/proto-es/v1/saved_query_service_pb";
-import { SavedQuery_Visibility } from "@/types/proto-es/v1/saved_query_service_pb";
-import { hasProjectPermissionV2, hasWorkspacePermissionV2 } from "@/utils";
+import { hasWorkspacePermissionV2 } from "@/utils";
export const extractSavedQueryID = (name: string) => {
const pattern = /(?:^|\/)savedQueries\/([^/]+)(?:$|\/)/;
@@ -12,68 +10,22 @@ export const extractSavedQueryID = (name: string) => {
return matches?.[1] ?? `${UNKNOWN_ID}`;
};
-// readable to
-// PRIVATE: workspace Owner/DBA and the creator only.
-// PROJECT_WRITE: workspace Owner/DBA and all members in the project.
-// PROJECT_READ: workspace Owner/DBA and all members in the project.
-export const isSavedQueryReadableV1 = (sheet: SavedQuery) => {
+// Saved queries are private: only the creator, or a workspace admin holding
+// "bb.worksheets.manage" (the admin backstop), can read or write one.
+// Per-object sharing arrives with the access-model redesign.
+const canAccessSavedQuery = (sheet: SavedQuery) => {
const currentUser = getCurrentUserV1();
-
if (extractUserEmail(sheet.creator) === currentUser.email) {
- // Always readable to the creator
return true;
}
-
- if (hasWorkspacePermissionV2("bb.worksheets.manage")) {
- return true;
- }
-
- switch (sheet.visibility) {
- case SavedQuery_Visibility.PRIVATE:
- return false;
- case SavedQuery_Visibility.PROJECT_READ:
- case SavedQuery_Visibility.PROJECT_WRITE: {
- const projectV1 = getProjectByName(sheet.project);
- if (projectV1.name === UNKNOWN_PROJECT_NAME) {
- return false;
- }
- return hasProjectPermissionV2(projectV1, "bb.worksheets.get");
- }
- }
- return false;
+ return hasWorkspacePermissionV2("bb.worksheets.manage");
};
-// writable to
-// PRIVATE: workspace Owner/DBA and the creator only.
-// PROJECT_WRITE: workspace Owner/DBA and all members in the project.
-// PROJECT_READ: workspace Owner/DBA and project owner.
-export const isSavedQueryWritableV1 = (sheet: SavedQuery) => {
- const currentUser = getCurrentUserV1();
-
- if (extractUserEmail(sheet.creator) === currentUser.email) {
- // Always writable to the creator
- return true;
- }
-
- if (hasWorkspacePermissionV2("bb.worksheets.manage")) {
- return true;
- }
+export const isSavedQueryReadableV1 = (sheet: SavedQuery) =>
+ canAccessSavedQuery(sheet);
- const projectV1 = getProjectByName(sheet.project);
- if (projectV1.name === UNKNOWN_PROJECT_NAME) {
- return false;
- }
- switch (sheet.visibility) {
- case SavedQuery_Visibility.PRIVATE:
- return false;
- case SavedQuery_Visibility.PROJECT_WRITE:
- return hasProjectPermissionV2(projectV1, "bb.projects.get");
- case SavedQuery_Visibility.PROJECT_READ:
- return hasProjectPermissionV2(projectV1, "bb.worksheets.manage");
- }
-
- return false;
-};
+export const isSavedQueryWritableV1 = (sheet: SavedQuery) =>
+ canAccessSavedQuery(sheet);
// `extractSavedQueryConnection` moved to `@/lib/sqlEditorConnection`
// so the database lookup can go through the React app store without
diff --git a/frontend/tests/e2e/framework/api-client.ts b/frontend/tests/e2e/framework/api-client.ts
index 61bae96fa5..a4089385f3 100644
--- a/frontend/tests/e2e/framework/api-client.ts
+++ b/frontend/tests/e2e/framework/api-client.ts
@@ -498,7 +498,7 @@ export class BytebaseApiClient {
const b64 = Buffer.from(content).toString("base64");
return this.request<{ name: string }>(
"POST", `/v1/${project}/savedQueries`,
- { title, database, content: b64, visibility: "PRIVATE" },
+ { title, database, content: b64 },
);
}
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index 68ee44a128..e104dae372 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -13783,7 +13783,7 @@ paths:
description: |-
Batch update the organizers of saved queries.
The access is the same as UpdateSavedQuery method.
- Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ Permissions required: creator, or workspace bb.worksheets.manage
operationId: SavedQueryService_BatchUpdateSavedQueryOrganizer
parameters:
- name: project
@@ -13809,7 +13809,6 @@ paths:
- 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.
- - visibility: check Visibility enum in the SavedQuery message for values, support "==" and "in [xx]" operator.
- folder: the saved query organizer folder path, support exact "==" operator.
organizer:
title: organizer
@@ -13844,11 +13843,9 @@ paths:
summary: GetSavedQuery
description: |-
Get a saved query by name.
- The users can access this method if,
- - they are the creator of the saved query;
- - they have bb.worksheets.get permission on the workspace;
- - the saved query is shared with them with PROJECT_READ and PROJECT_WRITE visibility, and they have bb.projects.get permission on the project.
- Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ 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
operationId: SavedQueryService_GetSavedQuery
parameters:
- name: project
@@ -13877,7 +13874,7 @@ paths:
description: |-
Delete a saved query.
The access is the same as UpdateSavedQuery method.
- Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries)
+ Permissions required: creator, or workspace bb.worksheets.manage
operationId: SavedQueryService_DeleteSavedQuery
parameters:
- name: project
@@ -13905,11 +13902,8 @@ paths:
summary: UpdateSavedQuery
description: |-
Update a saved query.
- The users can access this method if,
- - they are the creator of the saved query;
- - they have bb.worksheets.manage permission on the workspace;
- - the saved query is shared with them with PROJECT_WRITE visibility, and they have bb.projects.get permission on the project.
- Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries)
+ The access is the same as GetSavedQuery method.
+ Permissions required: creator, or workspace bb.worksheets.manage
operationId: SavedQueryService_UpdateSavedQuery
parameters:
- name: project
@@ -14159,7 +14153,7 @@ paths:
description: |-
Update the organizer of a saved query.
The access is the same as UpdateSavedQuery method.
- Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ Permissions required: creator, or workspace bb.worksheets.manage
operationId: SavedQueryService_UpdateSavedQueryOrganizer
parameters:
- name: project
@@ -14416,9 +14410,9 @@ paths:
summary: SearchSavedQueries
description: |-
Search for saved queries.
- This is used for finding my saved queries or saved queries shared by other people.
+ This is used for finding my saved queries in a project.
The saved query accessibility is the same as GetSavedQuery().
- Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ Permissions required: creator, or workspace bb.worksheets.manage
operationId: SavedQueryService_SearchSavedQueries
parameters:
- name: project
@@ -14445,7 +14439,6 @@ 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.
- - visibility: check Visibility enum in the SavedQuery message for values, support "==" and "in [xx]" operator.
- folder: the saved query organizer folder path, support "==" operator.
For example:
@@ -14454,8 +14447,6 @@ paths:
creator != "users/{email}"
starred == true
starred == false
- visibility in ["PRIVATE", "PROJECT_READ", "PROJECT_WRITE"]
- visibility == "PRIVATE"
folder == "foo/bar"
pageSize:
type: integer
@@ -20262,7 +20253,6 @@ 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.
- - visibility: check Visibility enum in the SavedQuery message for values, support "==" and "in [xx]" operator.
- folder: the saved query organizer folder path, support exact "==" operator.
organizer:
title: organizer
@@ -29027,9 +29017,6 @@ components:
format: int64
description: content_size is the full size of the content, may not match the size of the `content` field.
readOnly: true
- visibility:
- title: visibility
- $ref: '#/components/schemas/bytebase.v1.SavedQuery.Visibility'
starred:
type: boolean
title: starred
@@ -29047,16 +29034,7 @@ components:
- name
- title
- content
- - visibility
additionalProperties: false
- bytebase.v1.SavedQuery.Visibility:
- type: string
- title: Visibility
- enum:
- - VISIBILITY_UNSPECIFIED
- - PROJECT_READ
- - PROJECT_WRITE
- - PRIVATE
bytebase.v1.SavedQueryFolder:
type: object
properties:
@@ -29594,7 +29572,6 @@ 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.
- - visibility: check Visibility enum in the SavedQuery message for values, support "==" and "in [xx]" operator.
- folder: the saved query organizer folder path, support "==" operator.
For example:
@@ -29603,8 +29580,6 @@ components:
creator != "users/{email}"
starred == true
starred == false
- visibility in ["PRIVATE", "PROJECT_READ", "PROJECT_WRITE"]
- visibility == "PRIVATE"
folder == "foo/bar"
pageSize:
type: integer
@@ -32089,12 +32064,11 @@ components:
description: |-
The list of fields to be updated.
Fields are specified relative to the saved query.
- (e.g., `title`, `statement`; *not* `saved_query.title` or `saved_query.statement`)
+ (e.g., `title`, `content`; *not* `saved_query.title` or `saved_query.content`)
Only support update the following fields for now:
- `title`
- - `statement`
- - `starred`
- - `visibility`
+ - `content`
+ - `database`
$ref: '#/components/schemas/google.protobuf.FieldMask'
title: UpdateSavedQueryRequest
required:
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index 578d79e692..5012c9a8b1 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -243,6 +243,10 @@
- [store/role.proto](#store_role-proto)
- [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)
- [ServerConfigPayload](#bytebase-store-ServerConfigPayload)
@@ -355,9 +359,6 @@
- [store/vcs_provider_user.proto](#store_vcs_provider_user-proto)
- [VCSProviderUserPayload](#bytebase-store-VCSProviderUserPayload)
-- [store/worksheet.proto](#store_worksheet-proto)
- - [WorkSheetOrganizerPayload](#bytebase-store-WorkSheetOrganizerPayload)
-
- [store/workspace.proto](#store_workspace-proto)
- [WorkspacePayload](#bytebase-store-WorkspacePayload)
@@ -4135,6 +4136,53 @@ The severity level for SQL review rules.
+<a name="store_saved_query-proto"></a>
+<p align="right"><a href="#top">Top</a></p>
+
+## store/saved_query.proto
+
+
+
+<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>
+
+### SavedQueryPayload
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| database | [string](#string) | | The connected database, stored as its canonical resource name: instances/{instance}/databases/{database} for a workspace instance, projects/{project}/instances/{instance}/databases/{database} for a project instance. Validated against the saved query&#39;s own project at write time; the reference is soft and may dangle after the database is deleted or transferred, degrading to &#34;no database&#34; in the UI. |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<a name="store_server_config-proto"></a>
<p align="right"><a href="#top">Top</a></p>
@@ -5711,38 +5759,6 @@ ProviderType identifies the CI/CD platform.
-<a name="store_worksheet-proto"></a>
-<p align="right"><a href="#top">Top</a></p>
-
-## store/worksheet.proto
-
-
-
-<a name="bytebase-store-WorkSheetOrganizerPayload"></a>
-
-### WorkSheetOrganizerPayload
-
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| starred | [bool](#bool) | | |
-| folders | [string](#string) | repeated | The folder path for a worksheet. For example, if the folders is [A, B, C], means the worksheet is in the A/B/C subfolder. |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<a name="store_workspace-proto"></a>
<p align="right"><a href="#top">Top</a></p>
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index 08a2dc69e0..478a289db7 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -1146,6 +1146,25 @@
+ </ul>
+ </li>
+
+
+ <li>
+ <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>
+
+
+
+
</ul>
</li>
@@ -1593,21 +1612,6 @@
- </ul>
- </li>
-
-
- <li>
- <a href="#store%2fworksheet.proto">store/worksheet.proto</a>
- <ul>
-
- <li>
- <a href="#bytebase.store.WorkSheetOrganizerPayload"><span class="badge">M</span>WorkSheetOrganizerPayload</a>
- </li>
-
-
-
-
</ul>
</li>
@@ -11698,6 +11702,81 @@ unreadable and the revision carries no sheet name. </p></td>
+ <div class="file-heading">
+ <h2 id="store/saved_query.proto">store/saved_query.proto</h2><a href="#title">Top</a>
+ </div>
+ <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>
+
+
+ <table class="field-table">
+ <thead>
+ <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+ </thead>
+ <tbody>
+
+ <tr>
+ <td>database</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>The connected database, stored as its canonical resource name:
+instances/{instance}/databases/{database} for a workspace instance,
+projects/{project}/instances/{instance}/databases/{database} for a
+project instance. Validated against the saved query&#39;s own project at
+write time; the reference is soft and may dangle after the database
+is deleted or transferred, degrading to &#34;no database&#34; in the UI. </p></td>
+ </tr>
+
+ </tbody>
+ </table>
+
+
+
+
+
+
+
+
+
+
+
+
+
<div class="file-heading">
<h2 id="store/server_config.proto">store/server_config.proto</h2><a href="#title">Top</a>
</div>
@@ -15204,52 +15283,6 @@ Used to auto-select workspace on next login instead of requiring a workspace pic
- <div class="file-heading">
- <h2 id="store/worksheet.proto">store/worksheet.proto</h2><a href="#title">Top</a>
- </div>
- <p></p>
-
-
- <h3 id="bytebase.store.WorkSheetOrganizerPayload">WorkSheetOrganizerPayload</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 worksheet.
-For example, if the folders is [A, B, C], means the worksheet is in the A/B/C subfolder. </p></td>
- </tr>
-
- </tbody>
- </table>
-
-
-
-
-
-
-
-
-
-
-
-
-
<div class="file-heading">
<h2 id="store/workspace.proto">store/workspace.proto</h2><a href="#title">Top</a>
</div>
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 501dfaa0e0..0e720c28a9 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -694,7 +694,6 @@
- [UpdateSavedQueryOrganizerRequest](#bytebase-v1-UpdateSavedQueryOrganizerRequest)
- [UpdateSavedQueryRequest](#bytebase-v1-UpdateSavedQueryRequest)
- - [SavedQuery.Visibility](#bytebase-v1-SavedQuery-Visibility)
- [SavedQueryFolder.Category](#bytebase-v1-SavedQueryFolder-Category)
- [SavedQueryService](#bytebase-v1-SavedQueryService)
@@ -11034,7 +11033,7 @@ RoleService manages workspace roles and permissions.
| parent | [string](#string) | | The parent resource whose saved queries&#39; organizers 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 &#34;projects/{project}/savedQueries/{savedQuery}&#34; format, support &#34;==&#34; and &#34;in [xx]&#34; operator. - creator: the saved query creator in &#34;users/{email}&#34; format, support &#34;==&#34; and &#34;!=&#34; operator. - starred: should be &#34;true&#34; or &#34;false&#34;, filter starred/unstarred saved queries, support &#34;==&#34; operator. - visibility: check Visibility enum in the SavedQuery message for values, support &#34;==&#34; and &#34;in [xx]&#34; operator. - folder: the saved query organizer folder path, support exact &#34;==&#34; operator. |
+Supported filter: - name: the saved query name in &#34;projects/{project}/savedQueries/{savedQuery}&#34; format, support &#34;==&#34; and &#34;in [xx]&#34; operator. - creator: the saved query creator in &#34;users/{email}&#34; format, support &#34;==&#34; and &#34;!=&#34; operator. - starred: should be &#34;true&#34; or &#34;false&#34;, filter starred/unstarred saved queries, support &#34;==&#34; operator. - folder: the saved query organizer folder path, support exact &#34;==&#34; 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` |
@@ -11192,7 +11191,6 @@ When paginating, all other parameters provided to `ListSavedQueries` must match
| 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&#39;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. |
-| visibility | [SavedQuery.Visibility](#bytebase-v1-SavedQuery-Visibility) | | |
| starred | [bool](#bool) | | starred indicates whether the saved query is starred by the current authenticated user. |
| folders | [string](#string) | repeated | |
@@ -11245,9 +11243,9 @@ When paginating, all other parameters provided to `ListSavedQueries` must match
| 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 &#34;projects/{project}/savedQueries/{savedQuery}&#34; format, support &#34;==&#34; and &#34;in [xx]&#34; operator. - title: the saved query title, support &#34;contains&#34; operator. - creator: the saved query creator in &#34;users/{email}&#34; format, support &#34;==&#34; and &#34;!=&#34; operator. - starred: should be &#34;true&#34; or &#34;false&#34;, filter starred/unstarred saved queries, support &#34;==&#34; operator. - visibility: check Visibility enum in the SavedQuery message for values, support &#34;==&#34; and &#34;in [xx]&#34; operator. - folder: the saved query organizer folder path, support &#34;==&#34; operator.
+Supported filter: - name: the saved query name in &#34;projects/{project}/savedQueries/{savedQuery}&#34; format, support &#34;==&#34; and &#34;in [xx]&#34; operator. - title: the saved query title, support &#34;contains&#34; operator. - creator: the saved query creator in &#34;users/{email}&#34; format, support &#34;==&#34; and &#34;!=&#34; operator. - starred: should be &#34;true&#34; or &#34;false&#34;, filter starred/unstarred saved queries, support &#34;==&#34; operator. - folder: the saved query organizer folder path, support &#34;==&#34; operator.
-For example: creator == &#34;users/{email}&#34; title.contains(&#34;saved query title&#34;) creator != &#34;users/{email}&#34; starred == true starred == false visibility in [&#34;PRIVATE&#34;, &#34;PROJECT_READ&#34;, &#34;PROJECT_WRITE&#34;] visibility == &#34;PRIVATE&#34; folder == &#34;foo/bar&#34; |
+For example: creator == &#34;users/{email}&#34; title.contains(&#34;saved query title&#34;) creator != &#34;users/{email}&#34; starred == true starred == false folder == &#34;foo/bar&#34; |
| 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. |
@@ -11302,7 +11300,7 @@ The organizer&#39;s `saved_query` field is used to identify the saved query. For
| saved_query | [SavedQuery](#bytebase-v1-SavedQuery) | | The saved query to update.
The saved query&#39;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`, `statement`; *not* `saved_query.title` or `saved_query.statement`) Only support update the following fields for now: - `title` - `statement` - `starred` - `visibility` |
+| 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` |
@@ -11311,20 +11309,6 @@ The saved query&#39;s `name` field is used to identify the saved query to update
-<a name="bytebase-v1-SavedQuery-Visibility"></a>
-
-### SavedQuery.Visibility
-
-
-| Name | Number | Description |
-| ---- | ------ | ----------- |
-| VISIBILITY_UNSPECIFIED | 0 | |
-| PROJECT_READ | 1 | Read access in project scope, saved query OWNER/DBA and project OWNER can read/write, other project members can read. |
-| PROJECT_WRITE | 2 | Write access in project scope, saved query OWNER/DBA and all members in the project can write the saved query. |
-| PRIVATE | 3 | Private, only saved query OWNER can read/write. |
-
-
-
<a name="bytebase-v1-SavedQueryFolder-Category"></a>
### SavedQueryFolder.Category
@@ -11352,14 +11336,14 @@ renamed together with the access-model redesign and its role migration.
| 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. The users can access this method if, - they are the creator of the saved query; - they have bb.worksheets.get permission on the workspace; - the saved query is shared with them with PROJECT_READ and PROJECT_WRITE visibility, and they have bb.projects.get permission on the project. Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries) |
+| 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&#39;s saved query folders. Only folders stored in the caller&#39;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 or saved queries shared by other people. The saved query accessibility is the same as GetSavedQuery(). Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries) |
-| UpdateSavedQuery | [UpdateSavedQueryRequest](#bytebase-v1-UpdateSavedQueryRequest) | [SavedQuery](#bytebase-v1-SavedQuery) | Update a saved query. The users can access this method if, - they are the creator of the saved query; - they have bb.worksheets.manage permission on the workspace; - the saved query is shared with them with PROJECT_WRITE visibility, and they have bb.projects.get permission on the project. Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries) |
-| 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: bb.worksheets.get (or creator, or project member for shared saved queries) |
-| 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: bb.worksheets.get (or creator, or project member for shared saved queries) |
-| 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: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries) |
+| 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 |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index f02ae4fa01..99855bf04e 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -2817,10 +2817,6 @@
</li>
- <li>
- <a href="#bytebase.v1.SavedQuery.Visibility"><span class="badge">E</span>SavedQuery.Visibility</a>
- </li>
-
<li>
<a href="#bytebase.v1.SavedQueryFolder.Category"><span class="badge">E</span>SavedQueryFolder.Category</a>
</li>
@@ -31540,7 +31536,6 @@ Supported filter:
- name: the saved query name in &#34;projects/{project}/savedQueries/{savedQuery}&#34; format, support &#34;==&#34; and &#34;in [xx]&#34; operator.
- creator: the saved query creator in &#34;users/{email}&#34; format, support &#34;==&#34; and &#34;!=&#34; operator.
- starred: should be &#34;true&#34; or &#34;false&#34;, filter starred/unstarred saved queries, support &#34;==&#34; operator.
-- visibility: check Visibility enum in the SavedQuery message for values, support &#34;==&#34; and &#34;in [xx]&#34; operator.
- folder: the saved query organizer folder path, support exact &#34;==&#34; operator. </p></td>
</tr>
@@ -31907,13 +31902,6 @@ use GetSavedQuery() request to retrieve the full content. </p></td>
<td><p>content_size is the full size of the content, may not match the size of the `content` field. </p></td>
</tr>
- <tr>
- <td>visibility</td>
- <td><a href="#bytebase.v1.SavedQuery.Visibility">SavedQuery.Visibility</a></td>
- <td></td>
- <td><p> </p></td>
- </tr>
-
<tr>
<td>starred</td>
<td><a href="#bool">bool</a></td>
@@ -32035,7 +32023,6 @@ Supported filter:
- title: the saved query title, support &#34;contains&#34; operator.
- creator: the saved query creator in &#34;users/{email}&#34; format, support &#34;==&#34; and &#34;!=&#34; operator.
- starred: should be &#34;true&#34; or &#34;false&#34;, filter starred/unstarred saved queries, support &#34;==&#34; operator.
-- visibility: check Visibility enum in the SavedQuery message for values, support &#34;==&#34; and &#34;in [xx]&#34; operator.
- folder: the saved query organizer folder path, support &#34;==&#34; operator.
For example:
@@ -32044,8 +32031,6 @@ title.contains(&#34;saved query title&#34;)
creator != &#34;users/{email}&#34;
starred == true
starred == false
-visibility in [&#34;PRIVATE&#34;, &#34;PROJECT_READ&#34;, &#34;PROJECT_WRITE&#34;]
-visibility == &#34;PRIVATE&#34;
folder == &#34;foo/bar&#34; </p></td>
</tr>
@@ -32178,12 +32163,11 @@ Format: projects/{project}/savedQueries/{savedQuery} </p></td>
<td></td>
<td><p>The list of fields to be updated.
Fields are specified relative to the saved query.
-(e.g., `title`, `statement`; *not* `saved_query.title` or `saved_query.statement`)
+(e.g., `title`, `content`; *not* `saved_query.title` or `saved_query.content`)
Only support update the following fields for now:
- `title`
-- `statement`
-- `starred`
-- `visibility` </p></td>
+- `content`
+- `database` </p></td>
</tr>
</tbody>
@@ -32195,41 +32179,6 @@ Only support update the following fields for now:
- <h3 id="bytebase.v1.SavedQuery.Visibility">SavedQuery.Visibility</h3>
- <p></p>
- <table class="enum-table">
- <thead>
- <tr><td>Name</td><td>Number</td><td>Description</td></tr>
- </thead>
- <tbody>
-
- <tr>
- <td>VISIBILITY_UNSPECIFIED</td>
- <td>0</td>
- <td><p></p></td>
- </tr>
-
- <tr>
- <td>PROJECT_READ</td>
- <td>1</td>
- <td><p>Read access in project scope, saved query OWNER/DBA and project OWNER can read/write, other project members can read.</p></td>
- </tr>
-
- <tr>
- <td>PROJECT_WRITE</td>
- <td>2</td>
- <td><p>Write access in project scope, saved query OWNER/DBA and all members in the project can write the saved query.</p></td>
- </tr>
-
- <tr>
- <td>PRIVATE</td>
- <td>3</td>
- <td><p>Private, only saved query OWNER can read/write.</p></td>
- </tr>
-
- </tbody>
- </table>
-
<h3 id="bytebase.v1.SavedQueryFolder.Category">SavedQueryFolder.Category</h3>
<p></p>
<table class="enum-table">
@@ -32284,11 +32233,9 @@ Permissions required: None (authenticated users only)</p></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.
-The users can access this method if,
-- they are the creator of the saved query;
-- they have bb.worksheets.get permission on the workspace;
-- the saved query is shared with them with PROJECT_READ and PROJECT_WRITE visibility, and they have bb.projects.get permission on the project.
-Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)</p></td>
+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>
</tr>
<tr>
@@ -32313,9 +32260,9 @@ Only folders stored in the caller&#39;s saved query organizer are returned.</p><
<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 or saved queries shared by other people.
+This is used for finding my saved queries in a project.
The saved query accessibility is the same as GetSavedQuery().
-Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)</p></td>
+Permissions required: creator, or workspace bb.worksheets.manage</p></td>
</tr>
<tr>
@@ -32323,11 +32270,8 @@ Permissions required: bb.worksheets.get (or creator, or project member for share
<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 users can access this method if,
-- they are the creator of the saved query;
-- they have bb.worksheets.manage permission on the workspace;
-- the saved query is shared with them with PROJECT_WRITE visibility, and they have bb.projects.get permission on the project.
-Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries)</p></td>
+The access is the same as GetSavedQuery method.
+Permissions required: creator, or workspace bb.worksheets.manage</p></td>
</tr>
<tr>
@@ -32336,7 +32280,7 @@ Permissions required: bb.worksheets.manage (or creator, or project member for PR
<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: bb.worksheets.get (or creator, or project member for shared saved queries)</p></td>
+Permissions required: creator, or workspace bb.worksheets.manage</p></td>
</tr>
<tr>
@@ -32345,7 +32289,7 @@ Permissions required: bb.worksheets.get (or creator, or project member for share
<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: bb.worksheets.get (or creator, or project member for shared saved queries)</p></td>
+Permissions required: creator, or workspace bb.worksheets.manage</p></td>
</tr>
<tr>
@@ -32354,7 +32298,7 @@ Permissions required: bb.worksheets.get (or creator, or project member for share
<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: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries)</p></td>
+Permissions required: creator, or workspace bb.worksheets.manage</p></td>
</tr>
</tbody>
diff --git a/proto/store/store/saved_query.proto b/proto/store/store/saved_query.proto
new file mode 100644
index 0000000000..75f55db731
--- /dev/null
+++ b/proto/store/store/saved_query.proto
@@ -0,0 +1,22 @@
+syntax = "proto3";
+
+package bytebase.store;
+
+option go_package = "generated-go/store";
+
+message SavedQueryPayload {
+ // The connected database, stored as its canonical resource name:
+ // instances/{instance}/databases/{database} for a workspace instance,
+ // projects/{project}/instances/{instance}/databases/{database} for a
+ // project instance. Validated against the saved query's own project at
+ // write time; the reference is soft and may dangle after the database
+ // 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/store/store/worksheet.proto b/proto/store/store/worksheet.proto
deleted file mode 100644
index bdb086e698..0000000000
--- a/proto/store/store/worksheet.proto
+++ /dev/null
@@ -1,12 +0,0 @@
-syntax = "proto3";
-
-package bytebase.store;
-
-option go_package = "generated-go/store";
-
-message WorkSheetOrganizerPayload {
- bool starred = 1;
- // The folder path for a worksheet.
- // For example, if the folders is [A, B, C], means the worksheet 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.proto
index faebcccea3..d96ef61043 100644
--- a/proto/v1/v1/saved_query_service.proto
+++ b/proto/v1/v1/saved_query_service.proto
@@ -30,11 +30,9 @@ service SavedQueryService {
}
// Get a saved query by name.
- // The users can access this method if,
- // - they are the creator of the saved query;
- // - they have bb.worksheets.get permission on the workspace;
- // - the saved query is shared with them with PROJECT_READ and PROJECT_WRITE visibility, and they have bb.projects.get permission on the project.
- // Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // 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
rpc GetSavedQuery(GetSavedQueryRequest) returns (SavedQuery) {
option (google.api.http) = {get: "/v1/{name=projects/*/savedQueries/*}"};
option (google.api.method_signature) = "name";
@@ -60,9 +58,9 @@ service SavedQueryService {
}
// Search for saved queries.
- // This is used for finding my saved queries or saved queries shared by other people.
+ // This is used for finding my saved queries in a project.
// The saved query accessibility is the same as GetSavedQuery().
- // Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // Permissions required: creator, or workspace bb.worksheets.manage
rpc SearchSavedQueries(SearchSavedQueriesRequest) returns (SearchSavedQueriesResponse) {
option (google.api.http) = {
post: "/v1/{parent=projects/*}/savedQueries:search"
@@ -73,11 +71,8 @@ service SavedQueryService {
}
// Update a saved query.
- // The users can access this method if,
- // - they are the creator of the saved query;
- // - they have bb.worksheets.manage permission on the workspace;
- // - the saved query is shared with them with PROJECT_WRITE visibility, and they have bb.projects.get permission on the project.
- // Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries)
+ // The access is the same as GetSavedQuery method.
+ // Permissions required: creator, or workspace bb.worksheets.manage
rpc UpdateSavedQuery(UpdateSavedQueryRequest) returns (SavedQuery) {
option (google.api.http) = {
patch: "/v1/{saved_query.name=projects/*/savedQueries/*}"
@@ -89,7 +84,7 @@ service SavedQueryService {
// Update the organizer of a saved query.
// The access is the same as UpdateSavedQuery method.
- // Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // Permissions required: creator, or workspace bb.worksheets.manage
rpc UpdateSavedQueryOrganizer(UpdateSavedQueryOrganizerRequest) returns (SavedQueryOrganizer) {
option (google.api.http) = {
patch: "/v1/{organizer.saved_query=projects/*/savedQueries/*}/organizer"
@@ -101,7 +96,7 @@ service SavedQueryService {
// Batch update the organizers of saved queries.
// The access is the same as UpdateSavedQuery method.
- // Permissions required: bb.worksheets.get (or creator, or project member for shared saved queries)
+ // Permissions required: creator, or workspace bb.worksheets.manage
rpc BatchUpdateSavedQueryOrganizer(BatchUpdateSavedQueryOrganizerRequest) returns (BatchUpdateSavedQueryOrganizerResponse) {
option (google.api.http) = {
post: "/v1/{parent=projects/*}/savedQueries/organizers:batchUpdate"
@@ -113,7 +108,7 @@ service SavedQueryService {
// Delete a saved query.
// The access is the same as UpdateSavedQuery method.
- // Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE saved queries)
+ // Permissions required: creator, or workspace bb.worksheets.manage
rpc DeleteSavedQuery(DeleteSavedQueryRequest) returns (google.protobuf.Empty) {
option (google.api.http) = {delete: "/v1/{name=projects/*/savedQueries/*}"};
option (google.api.method_signature) = "name";
@@ -214,12 +209,11 @@ message UpdateSavedQueryRequest {
// The list of fields to be updated.
// Fields are specified relative to the saved query.
- // (e.g., `title`, `statement`; *not* `saved_query.title` or `saved_query.statement`)
+ // (e.g., `title`, `content`; *not* `saved_query.title` or `saved_query.content`)
// Only support update the following fields for now:
// - `title`
- // - `statement`
- // - `starred`
- // - `visibility`
+ // - `content`
+ // - `database`
google.protobuf.FieldMask update_mask = 2;
}
@@ -235,7 +229,6 @@ 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.
- // - visibility: check Visibility enum in the SavedQuery message for values, support "==" and "in [xx]" operator.
// - folder: the saved query organizer folder path, support exact "==" operator.
string filter = 2;
@@ -304,7 +297,6 @@ 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.
- // - visibility: check Visibility enum in the SavedQuery message for values, support "==" and "in [xx]" operator.
// - folder: the saved query organizer folder path, support "==" operator.
//
// For example:
@@ -313,8 +305,6 @@ message SearchSavedQueriesRequest {
// creator != "users/{email}"
// starred == true
// starred == false
- // visibility in ["PRIVATE", "PROJECT_READ", "PROJECT_WRITE"]
- // visibility == "PRIVATE"
// folder == "foo/bar"
string filter = 2;
@@ -381,16 +371,10 @@ 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];
- enum Visibility {
- VISIBILITY_UNSPECIFIED = 0;
- // Read access in project scope, saved query OWNER/DBA and project OWNER can read/write, other project members can read.
- PROJECT_READ = 1;
- // Write access in project scope, saved query OWNER/DBA and all members in the project can write the saved query.
- PROJECT_WRITE = 2;
- // Private, only saved query OWNER can read/write.
- PRIVATE = 3;
- }
- Visibility visibility = 10 [(google.api.field_behavior) = REQUIRED];
+ // The removed visibility field (saved queries are private to their creator;
+ // per-object sharing arrives with the access-model redesign).
+ reserved 10;
+ reserved "visibility";
// starred indicates whether the saved query is starred by the current authenticated user.
bool starred = 11 [(google.api.field_behavior) = OUTPUT_ONLY];