Skip to content

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

feat: worksheet folder & better management (#18046)

ecmadao9ca822b8e35e
diff --git a/backend/api/v1/worksheet_service.go b/backend/api/v1/worksheet_service.go
index 6309b06ec8..b989f523fe 100644
--- a/backend/api/v1/worksheet_service.go
+++ b/backend/api/v1/worksheet_service.go
@@ -387,6 +387,21 @@ func (s *WorksheetService) UpdateWorksheetOrganizer(
}), nil
}
+func (s *WorksheetService) BatchUpdateWorksheetOrganizer(
+ ctx context.Context,
+ req *connect.Request[v1pb.BatchUpdateWorksheetOrganizerRequest],
+) (*connect.Response[v1pb.BatchUpdateWorksheetOrganizerResponse], error) {
+ response := &v1pb.BatchUpdateWorksheetOrganizerResponse{}
+ for _, updateReq := range req.Msg.GetRequests() {
+ updated, err := s.UpdateWorksheetOrganizer(ctx, connect.NewRequest(updateReq))
+ if err != nil {
+ return nil, err
+ }
+ response.WorksheetOrganizers = append(response.WorksheetOrganizers, updated.Msg)
+ }
+ return connect.NewResponse(response), nil
+}
+
func (s *WorksheetService) findWorksheet(ctx context.Context, find *store.FindWorkSheetMessage) (*store.WorkSheetMessage, error) {
user, ok := GetUserFromContext(ctx)
if !ok {
@@ -556,13 +571,15 @@ func convertToStoreWorksheetMessage(project *store.ProjectMessage, database *sto
}
worksheetMessage := &store.WorkSheetMessage{
- ProjectID: project.ResourceID,
- InstanceID: &database.InstanceID,
- DatabaseName: &database.DatabaseName,
- CreatorID: creatorID,
- Title: worksheet.Title,
- Statement: string(worksheet.Content),
- Visibility: visibility,
+ ProjectID: project.ResourceID,
+ CreatorID: creatorID,
+ Title: worksheet.Title,
+ Statement: string(worksheet.Content),
+ Visibility: visibility,
+ }
+ if database != nil {
+ worksheetMessage.InstanceID = &database.InstanceID
+ worksheetMessage.DatabaseName = &database.DatabaseName
}
return worksheetMessage, nil
diff --git a/backend/generated-go/v1/v1connect/worksheet_service.connect.go b/backend/generated-go/v1/v1connect/worksheet_service.connect.go
index 0b496e6929..d9d9fb5648 100644
--- a/backend/generated-go/v1/v1connect/worksheet_service.connect.go
+++ b/backend/generated-go/v1/v1connect/worksheet_service.connect.go
@@ -49,6 +49,9 @@ const (
// WorksheetServiceUpdateWorksheetOrganizerProcedure is the fully-qualified name of the
// WorksheetService's UpdateWorksheetOrganizer RPC.
WorksheetServiceUpdateWorksheetOrganizerProcedure = "/bytebase.v1.WorksheetService/UpdateWorksheetOrganizer"
+ // WorksheetServiceBatchUpdateWorksheetOrganizerProcedure is the fully-qualified name of the
+ // WorksheetService's BatchUpdateWorksheetOrganizer RPC.
+ WorksheetServiceBatchUpdateWorksheetOrganizerProcedure = "/bytebase.v1.WorksheetService/BatchUpdateWorksheetOrganizer"
// WorksheetServiceDeleteWorksheetProcedure is the fully-qualified name of the WorksheetService's
// DeleteWorksheet RPC.
WorksheetServiceDeleteWorksheetProcedure = "/bytebase.v1.WorksheetService/DeleteWorksheet"
@@ -82,6 +85,10 @@ type WorksheetServiceClient interface {
// The access is the same as UpdateWorksheet method.
// Permissions required: bb.worksheets.get (or creator, or project member for shared worksheets)
UpdateWorksheetOrganizer(context.Context, *connect.Request[v1.UpdateWorksheetOrganizerRequest]) (*connect.Response[v1.WorksheetOrganizer], error)
+ // Batch update the organizers of worksheets.
+ // The access is the same as UpdateWorksheet method.
+ // Permissions required: bb.worksheets.get (or creator, or project member for shared worksheets)
+ BatchUpdateWorksheetOrganizer(context.Context, *connect.Request[v1.BatchUpdateWorksheetOrganizerRequest]) (*connect.Response[v1.BatchUpdateWorksheetOrganizerResponse], error)
// Delete a worksheet.
// The access is the same as UpdateWorksheet method.
// Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE worksheets)
@@ -129,6 +136,12 @@ func NewWorksheetServiceClient(httpClient connect.HTTPClient, baseURL string, op
connect.WithSchema(worksheetServiceMethods.ByName("UpdateWorksheetOrganizer")),
connect.WithClientOptions(opts...),
),
+ batchUpdateWorksheetOrganizer: connect.NewClient[v1.BatchUpdateWorksheetOrganizerRequest, v1.BatchUpdateWorksheetOrganizerResponse](
+ httpClient,
+ baseURL+WorksheetServiceBatchUpdateWorksheetOrganizerProcedure,
+ connect.WithSchema(worksheetServiceMethods.ByName("BatchUpdateWorksheetOrganizer")),
+ connect.WithClientOptions(opts...),
+ ),
deleteWorksheet: connect.NewClient[v1.DeleteWorksheetRequest, emptypb.Empty](
httpClient,
baseURL+WorksheetServiceDeleteWorksheetProcedure,
@@ -140,12 +153,13 @@ func NewWorksheetServiceClient(httpClient connect.HTTPClient, baseURL string, op
// worksheetServiceClient implements WorksheetServiceClient.
type worksheetServiceClient struct {
- createWorksheet *connect.Client[v1.CreateWorksheetRequest, v1.Worksheet]
- getWorksheet *connect.Client[v1.GetWorksheetRequest, v1.Worksheet]
- searchWorksheets *connect.Client[v1.SearchWorksheetsRequest, v1.SearchWorksheetsResponse]
- updateWorksheet *connect.Client[v1.UpdateWorksheetRequest, v1.Worksheet]
- updateWorksheetOrganizer *connect.Client[v1.UpdateWorksheetOrganizerRequest, v1.WorksheetOrganizer]
- deleteWorksheet *connect.Client[v1.DeleteWorksheetRequest, emptypb.Empty]
+ createWorksheet *connect.Client[v1.CreateWorksheetRequest, v1.Worksheet]
+ getWorksheet *connect.Client[v1.GetWorksheetRequest, v1.Worksheet]
+ searchWorksheets *connect.Client[v1.SearchWorksheetsRequest, v1.SearchWorksheetsResponse]
+ updateWorksheet *connect.Client[v1.UpdateWorksheetRequest, v1.Worksheet]
+ updateWorksheetOrganizer *connect.Client[v1.UpdateWorksheetOrganizerRequest, v1.WorksheetOrganizer]
+ batchUpdateWorksheetOrganizer *connect.Client[v1.BatchUpdateWorksheetOrganizerRequest, v1.BatchUpdateWorksheetOrganizerResponse]
+ deleteWorksheet *connect.Client[v1.DeleteWorksheetRequest, emptypb.Empty]
}
// CreateWorksheet calls bytebase.v1.WorksheetService.CreateWorksheet.
@@ -173,6 +187,11 @@ func (c *worksheetServiceClient) UpdateWorksheetOrganizer(ctx context.Context, r
return c.updateWorksheetOrganizer.CallUnary(ctx, req)
}
+// BatchUpdateWorksheetOrganizer calls bytebase.v1.WorksheetService.BatchUpdateWorksheetOrganizer.
+func (c *worksheetServiceClient) BatchUpdateWorksheetOrganizer(ctx context.Context, req *connect.Request[v1.BatchUpdateWorksheetOrganizerRequest]) (*connect.Response[v1.BatchUpdateWorksheetOrganizerResponse], error) {
+ return c.batchUpdateWorksheetOrganizer.CallUnary(ctx, req)
+}
+
// DeleteWorksheet calls bytebase.v1.WorksheetService.DeleteWorksheet.
func (c *worksheetServiceClient) DeleteWorksheet(ctx context.Context, req *connect.Request[v1.DeleteWorksheetRequest]) (*connect.Response[emptypb.Empty], error) {
return c.deleteWorksheet.CallUnary(ctx, req)
@@ -206,6 +225,10 @@ type WorksheetServiceHandler interface {
// The access is the same as UpdateWorksheet method.
// Permissions required: bb.worksheets.get (or creator, or project member for shared worksheets)
UpdateWorksheetOrganizer(context.Context, *connect.Request[v1.UpdateWorksheetOrganizerRequest]) (*connect.Response[v1.WorksheetOrganizer], error)
+ // Batch update the organizers of worksheets.
+ // The access is the same as UpdateWorksheet method.
+ // Permissions required: bb.worksheets.get (or creator, or project member for shared worksheets)
+ BatchUpdateWorksheetOrganizer(context.Context, *connect.Request[v1.BatchUpdateWorksheetOrganizerRequest]) (*connect.Response[v1.BatchUpdateWorksheetOrganizerResponse], error)
// Delete a worksheet.
// The access is the same as UpdateWorksheet method.
// Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE worksheets)
@@ -249,6 +272,12 @@ func NewWorksheetServiceHandler(svc WorksheetServiceHandler, opts ...connect.Han
connect.WithSchema(worksheetServiceMethods.ByName("UpdateWorksheetOrganizer")),
connect.WithHandlerOptions(opts...),
)
+ worksheetServiceBatchUpdateWorksheetOrganizerHandler := connect.NewUnaryHandler(
+ WorksheetServiceBatchUpdateWorksheetOrganizerProcedure,
+ svc.BatchUpdateWorksheetOrganizer,
+ connect.WithSchema(worksheetServiceMethods.ByName("BatchUpdateWorksheetOrganizer")),
+ connect.WithHandlerOptions(opts...),
+ )
worksheetServiceDeleteWorksheetHandler := connect.NewUnaryHandler(
WorksheetServiceDeleteWorksheetProcedure,
svc.DeleteWorksheet,
@@ -267,6 +296,8 @@ func NewWorksheetServiceHandler(svc WorksheetServiceHandler, opts ...connect.Han
worksheetServiceUpdateWorksheetHandler.ServeHTTP(w, r)
case WorksheetServiceUpdateWorksheetOrganizerProcedure:
worksheetServiceUpdateWorksheetOrganizerHandler.ServeHTTP(w, r)
+ case WorksheetServiceBatchUpdateWorksheetOrganizerProcedure:
+ worksheetServiceBatchUpdateWorksheetOrganizerHandler.ServeHTTP(w, r)
case WorksheetServiceDeleteWorksheetProcedure:
worksheetServiceDeleteWorksheetHandler.ServeHTTP(w, r)
default:
@@ -298,6 +329,10 @@ func (UnimplementedWorksheetServiceHandler) UpdateWorksheetOrganizer(context.Con
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.WorksheetService.UpdateWorksheetOrganizer is not implemented"))
}
+func (UnimplementedWorksheetServiceHandler) BatchUpdateWorksheetOrganizer(context.Context, *connect.Request[v1.BatchUpdateWorksheetOrganizerRequest]) (*connect.Response[v1.BatchUpdateWorksheetOrganizerResponse], error) {
+ return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.WorksheetService.BatchUpdateWorksheetOrganizer is not implemented"))
+}
+
func (UnimplementedWorksheetServiceHandler) DeleteWorksheet(context.Context, *connect.Request[v1.DeleteWorksheetRequest]) (*connect.Response[emptypb.Empty], error) {
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.WorksheetService.DeleteWorksheet is not implemented"))
}
diff --git a/backend/generated-go/v1/worksheet_service.pb.go b/backend/generated-go/v1/worksheet_service.pb.go
index 141e2a1bdc..925a3442d6 100644
--- a/backend/generated-go/v1/worksheet_service.pb.go
+++ b/backend/generated-go/v1/worksheet_service.pb.go
@@ -78,7 +78,7 @@ func (x Worksheet_Visibility) Number() protoreflect.EnumNumber {
// Deprecated: Use Worksheet_Visibility.Descriptor instead.
func (Worksheet_Visibility) EnumDescriptor() ([]byte, []int) {
- return file_v1_worksheet_service_proto_rawDescGZIP(), []int{8, 0}
+ return file_v1_worksheet_service_proto_rawDescGZIP(), []int{10, 0}
}
type CreateWorksheetRequest struct {
@@ -236,6 +236,94 @@ func (x *UpdateWorksheetRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
return nil
}
+type BatchUpdateWorksheetOrganizerRequest struct {
+ state protoimpl.MessageState `protogen:"open.v1"`
+ Requests []*UpdateWorksheetOrganizerRequest `protobuf:"bytes,1,rep,name=requests,proto3" json:"requests,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
+}
+
+func (x *BatchUpdateWorksheetOrganizerRequest) Reset() {
+ *x = BatchUpdateWorksheetOrganizerRequest{}
+ mi := &file_v1_worksheet_service_proto_msgTypes[3]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+}
+
+func (x *BatchUpdateWorksheetOrganizerRequest) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BatchUpdateWorksheetOrganizerRequest) ProtoMessage() {}
+
+func (x *BatchUpdateWorksheetOrganizerRequest) ProtoReflect() protoreflect.Message {
+ mi := &file_v1_worksheet_service_proto_msgTypes[3]
+ 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 BatchUpdateWorksheetOrganizerRequest.ProtoReflect.Descriptor instead.
+func (*BatchUpdateWorksheetOrganizerRequest) Descriptor() ([]byte, []int) {
+ return file_v1_worksheet_service_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *BatchUpdateWorksheetOrganizerRequest) GetRequests() []*UpdateWorksheetOrganizerRequest {
+ if x != nil {
+ return x.Requests
+ }
+ return nil
+}
+
+type BatchUpdateWorksheetOrganizerResponse struct {
+ state protoimpl.MessageState `protogen:"open.v1"`
+ WorksheetOrganizers []*WorksheetOrganizer `protobuf:"bytes,1,rep,name=worksheet_organizers,json=worksheetOrganizers,proto3" json:"worksheet_organizers,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
+}
+
+func (x *BatchUpdateWorksheetOrganizerResponse) Reset() {
+ *x = BatchUpdateWorksheetOrganizerResponse{}
+ mi := &file_v1_worksheet_service_proto_msgTypes[4]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+}
+
+func (x *BatchUpdateWorksheetOrganizerResponse) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BatchUpdateWorksheetOrganizerResponse) ProtoMessage() {}
+
+func (x *BatchUpdateWorksheetOrganizerResponse) ProtoReflect() protoreflect.Message {
+ mi := &file_v1_worksheet_service_proto_msgTypes[4]
+ 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 BatchUpdateWorksheetOrganizerResponse.ProtoReflect.Descriptor instead.
+func (*BatchUpdateWorksheetOrganizerResponse) Descriptor() ([]byte, []int) {
+ return file_v1_worksheet_service_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *BatchUpdateWorksheetOrganizerResponse) GetWorksheetOrganizers() []*WorksheetOrganizer {
+ if x != nil {
+ return x.WorksheetOrganizers
+ }
+ return nil
+}
+
type UpdateWorksheetOrganizerRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The organizer to update.
@@ -257,7 +345,7 @@ type UpdateWorksheetOrganizerRequest struct {
func (x *UpdateWorksheetOrganizerRequest) Reset() {
*x = UpdateWorksheetOrganizerRequest{}
- mi := &file_v1_worksheet_service_proto_msgTypes[3]
+ mi := &file_v1_worksheet_service_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -269,7 +357,7 @@ func (x *UpdateWorksheetOrganizerRequest) String() string {
func (*UpdateWorksheetOrganizerRequest) ProtoMessage() {}
func (x *UpdateWorksheetOrganizerRequest) ProtoReflect() protoreflect.Message {
- mi := &file_v1_worksheet_service_proto_msgTypes[3]
+ mi := &file_v1_worksheet_service_proto_msgTypes[5]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -282,7 +370,7 @@ func (x *UpdateWorksheetOrganizerRequest) ProtoReflect() protoreflect.Message {
// Deprecated: Use UpdateWorksheetOrganizerRequest.ProtoReflect.Descriptor instead.
func (*UpdateWorksheetOrganizerRequest) Descriptor() ([]byte, []int) {
- return file_v1_worksheet_service_proto_rawDescGZIP(), []int{3}
+ return file_v1_worksheet_service_proto_rawDescGZIP(), []int{5}
}
func (x *UpdateWorksheetOrganizerRequest) GetOrganizer() *WorksheetOrganizer {
@@ -320,7 +408,7 @@ type WorksheetOrganizer struct {
func (x *WorksheetOrganizer) Reset() {
*x = WorksheetOrganizer{}
- mi := &file_v1_worksheet_service_proto_msgTypes[4]
+ mi := &file_v1_worksheet_service_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -332,7 +420,7 @@ func (x *WorksheetOrganizer) String() string {
func (*WorksheetOrganizer) ProtoMessage() {}
func (x *WorksheetOrganizer) ProtoReflect() protoreflect.Message {
- mi := &file_v1_worksheet_service_proto_msgTypes[4]
+ mi := &file_v1_worksheet_service_proto_msgTypes[6]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -345,7 +433,7 @@ func (x *WorksheetOrganizer) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorksheetOrganizer.ProtoReflect.Descriptor instead.
func (*WorksheetOrganizer) Descriptor() ([]byte, []int) {
- return file_v1_worksheet_service_proto_rawDescGZIP(), []int{4}
+ return file_v1_worksheet_service_proto_rawDescGZIP(), []int{6}
}
func (x *WorksheetOrganizer) GetWorksheet() string {
@@ -380,7 +468,7 @@ type DeleteWorksheetRequest struct {
func (x *DeleteWorksheetRequest) Reset() {
*x = DeleteWorksheetRequest{}
- mi := &file_v1_worksheet_service_proto_msgTypes[5]
+ mi := &file_v1_worksheet_service_proto_msgTypes[7]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -392,7 +480,7 @@ func (x *DeleteWorksheetRequest) String() string {
func (*DeleteWorksheetRequest) ProtoMessage() {}
func (x *DeleteWorksheetRequest) ProtoReflect() protoreflect.Message {
- mi := &file_v1_worksheet_service_proto_msgTypes[5]
+ mi := &file_v1_worksheet_service_proto_msgTypes[7]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -405,7 +493,7 @@ func (x *DeleteWorksheetRequest) ProtoReflect() protoreflect.Message {
// Deprecated: Use DeleteWorksheetRequest.ProtoReflect.Descriptor instead.
func (*DeleteWorksheetRequest) Descriptor() ([]byte, []int) {
- return file_v1_worksheet_service_proto_rawDescGZIP(), []int{5}
+ return file_v1_worksheet_service_proto_rawDescGZIP(), []int{7}
}
func (x *DeleteWorksheetRequest) GetName() string {
@@ -424,6 +512,7 @@ type SearchWorksheetsRequest struct {
// - creator: the worksheet creator in "users/{email}" format, support "==" and "!=" operator.
// - starred: should be "true" or "false", filter starred/unstarred sheets, support "==" operator.
// - visibility: check Visibility enum in the Worksheet message for values, support "==" and "in [xx]" operator.
+ // - project: the project full name in "projects/{id}" format, support "==" operator.
//
// For example:
// creator == "users/{email}"
@@ -432,6 +521,7 @@ type SearchWorksheetsRequest struct {
// starred == false
// visibility in ["PRIVATE", "PROJECT_READ", "PROJECT_WRITE"]
// visibility == "PRIVATE"
+ // project == "projects/{project resource id}"
Filter string `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
@@ -439,7 +529,7 @@ type SearchWorksheetsRequest struct {
func (x *SearchWorksheetsRequest) Reset() {
*x = SearchWorksheetsRequest{}
- mi := &file_v1_worksheet_service_proto_msgTypes[6]
+ mi := &file_v1_worksheet_service_proto_msgTypes[8]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -451,7 +541,7 @@ func (x *SearchWorksheetsRequest) String() string {
func (*SearchWorksheetsRequest) ProtoMessage() {}
func (x *SearchWorksheetsRequest) ProtoReflect() protoreflect.Message {
- mi := &file_v1_worksheet_service_proto_msgTypes[6]
+ mi := &file_v1_worksheet_service_proto_msgTypes[8]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -464,7 +554,7 @@ func (x *SearchWorksheetsRequest) ProtoReflect() protoreflect.Message {
// Deprecated: Use SearchWorksheetsRequest.ProtoReflect.Descriptor instead.
func (*SearchWorksheetsRequest) Descriptor() ([]byte, []int) {
- return file_v1_worksheet_service_proto_rawDescGZIP(), []int{6}
+ return file_v1_worksheet_service_proto_rawDescGZIP(), []int{8}
}
func (x *SearchWorksheetsRequest) GetFilter() string {
@@ -484,7 +574,7 @@ type SearchWorksheetsResponse struct {
func (x *SearchWorksheetsResponse) Reset() {
*x = SearchWorksheetsResponse{}
- mi := &file_v1_worksheet_service_proto_msgTypes[7]
+ mi := &file_v1_worksheet_service_proto_msgTypes[9]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -496,7 +586,7 @@ func (x *SearchWorksheetsResponse) String() string {
func (*SearchWorksheetsResponse) ProtoMessage() {}
func (x *SearchWorksheetsResponse) ProtoReflect() protoreflect.Message {
- mi := &file_v1_worksheet_service_proto_msgTypes[7]
+ mi := &file_v1_worksheet_service_proto_msgTypes[9]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -509,7 +599,7 @@ func (x *SearchWorksheetsResponse) ProtoReflect() protoreflect.Message {
// Deprecated: Use SearchWorksheetsResponse.ProtoReflect.Descriptor instead.
func (*SearchWorksheetsResponse) Descriptor() ([]byte, []int) {
- return file_v1_worksheet_service_proto_rawDescGZIP(), []int{7}
+ return file_v1_worksheet_service_proto_rawDescGZIP(), []int{9}
}
func (x *SearchWorksheetsResponse) GetWorksheets() []*Worksheet {
@@ -557,7 +647,7 @@ type Worksheet struct {
func (x *Worksheet) Reset() {
*x = Worksheet{}
- mi := &file_v1_worksheet_service_proto_msgTypes[8]
+ mi := &file_v1_worksheet_service_proto_msgTypes[10]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -569,7 +659,7 @@ func (x *Worksheet) String() string {
func (*Worksheet) ProtoMessage() {}
func (x *Worksheet) ProtoReflect() protoreflect.Message {
- mi := &file_v1_worksheet_service_proto_msgTypes[8]
+ mi := &file_v1_worksheet_service_proto_msgTypes[10]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -582,7 +672,7 @@ func (x *Worksheet) ProtoReflect() protoreflect.Message {
// Deprecated: Use Worksheet.ProtoReflect.Descriptor instead.
func (*Worksheet) Descriptor() ([]byte, []int) {
- return file_v1_worksheet_service_proto_rawDescGZIP(), []int{8}
+ return file_v1_worksheet_service_proto_rawDescGZIP(), []int{10}
}
func (x *Worksheet) GetName() string {
@@ -681,7 +771,11 @@ const file_v1_worksheet_service_proto_rawDesc = "" +
"\x16UpdateWorksheetRequest\x129\n" +
"\tworksheet\x18\x01 \x01(\v2\x16.bytebase.v1.WorksheetB\x03\xe0A\x02R\tworksheet\x12;\n" +
"\vupdate_mask\x18\x02 \x01(\v2\x1a.google.protobuf.FieldMaskR\n" +
- "updateMask\"\xc7\x01\n" +
+ "updateMask\"u\n" +
+ "$BatchUpdateWorksheetOrganizerRequest\x12M\n" +
+ "\brequests\x18\x01 \x03(\v2,.bytebase.v1.UpdateWorksheetOrganizerRequestB\x03\xe0A\x02R\brequests\"{\n" +
+ "%BatchUpdateWorksheetOrganizerResponse\x12R\n" +
+ "\x14worksheet_organizers\x18\x01 \x03(\v2\x1f.bytebase.v1.WorksheetOrganizerR\x13worksheetOrganizers\"\xc7\x01\n" +
"\x1fUpdateWorksheetOrganizerRequest\x12B\n" +
"\torganizer\x18\x01 \x01(\v2\x1f.bytebase.v1.WorksheetOrganizerB\x03\xe0A\x02R\torganizer\x12;\n" +
"\vupdate_mask\x18\x02 \x01(\v2\x1a.google.protobuf.FieldMaskR\n" +
@@ -722,13 +816,14 @@ const file_v1_worksheet_service_proto_rawDesc = "" +
"\x16VISIBILITY_UNSPECIFIED\x10\x00\x12\x10\n" +
"\fPROJECT_READ\x10\x01\x12\x11\n" +
"\rPROJECT_WRITE\x10\x02\x12\v\n" +
- "\aPRIVATE\x10\x032\x80\a\n" +
+ "\aPRIVATE\x10\x032\xbe\b\n" +
"\x10WorksheetService\x12\x81\x01\n" +
"\x0fCreateWorksheet\x12#.bytebase.v1.CreateWorksheetRequest\x1a\x16.bytebase.v1.Worksheet\"1\xdaA\tworksheet\x90\xea0\x02\x82\xd3\xe4\x93\x02\x1b:\tworksheet\"\x0e/v1/worksheets\x12t\n" +
"\fGetWorksheet\x12 .bytebase.v1.GetWorksheetRequest\x1a\x16.bytebase.v1.Worksheet\"*\xdaA\x04name\x90\xea0\x02\x82\xd3\xe4\x93\x02\x19\x12\x17/v1/{name=worksheets/*}\x12\x85\x01\n" +
"\x10SearchWorksheets\x12$.bytebase.v1.SearchWorksheetsRequest\x1a%.bytebase.v1.SearchWorksheetsResponse\"$\x90\xea0\x02\x82\xd3\xe4\x93\x02\x1a:\x01*\"\x15/v1/worksheets:search\x12\xa0\x01\n" +
"\x0fUpdateWorksheet\x12#.bytebase.v1.UpdateWorksheetRequest\x1a\x16.bytebase.v1.Worksheet\"P\xdaA\x15worksheet,update_mask\x90\xea0\x02\x82\xd3\xe4\x93\x02.:\tworksheet2!/v1/{worksheet.name=worksheets/*}\x12\xca\x01\n" +
- "\x18UpdateWorksheetOrganizer\x12,.bytebase.v1.UpdateWorksheetOrganizerRequest\x1a\x1f.bytebase.v1.WorksheetOrganizer\"_\xdaA\x15organizer,update_mask\x90\xea0\x02\x82\xd3\xe4\x93\x02=:\torganizer20/v1/{organizer.worksheet=worksheets/*}/organizer\x12z\n" +
+ "\x18UpdateWorksheetOrganizer\x12,.bytebase.v1.UpdateWorksheetOrganizerRequest\x1a\x1f.bytebase.v1.WorksheetOrganizer\"_\xdaA\x15organizer,update_mask\x90\xea0\x02\x82\xd3\xe4\x93\x02=:\torganizer20/v1/{organizer.worksheet=worksheets/*}/organizer\x12\xbb\x01\n" +
+ "\x1dBatchUpdateWorksheetOrganizer\x121.bytebase.v1.BatchUpdateWorksheetOrganizerRequest\x1a2.bytebase.v1.BatchUpdateWorksheetOrganizerResponse\"3\x90\xea0\x02\x82\xd3\xe4\x93\x02):\x01*2$/v1/worksheets/organizer:batchUpdate\x12z\n" +
"\x0fDeleteWorksheet\x12#.bytebase.v1.DeleteWorksheetRequest\x1a\x16.google.protobuf.Empty\"*\xdaA\x04name\x90\xea0\x02\x82\xd3\xe4\x93\x02\x19*\x17/v1/{name=worksheets/*}B\xab\x01\n" +
"\x0fcom.bytebase.v1B\x15WorksheetServiceProtoP\x01Z4github.com/bytebase/bytebase/backend/generated-go/v1\xa2\x02\x03BXX\xaa\x02\vBytebase.V1\xca\x02\vBytebase\\V1\xe2\x02\x17Bytebase\\V1\\GPBMetadata\xea\x02\fBytebase::V1b\x06proto3"
@@ -745,49 +840,55 @@ func file_v1_worksheet_service_proto_rawDescGZIP() []byte {
}
var file_v1_worksheet_service_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_v1_worksheet_service_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
+var file_v1_worksheet_service_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
var file_v1_worksheet_service_proto_goTypes = []any{
- (Worksheet_Visibility)(0), // 0: bytebase.v1.Worksheet.Visibility
- (*CreateWorksheetRequest)(nil), // 1: bytebase.v1.CreateWorksheetRequest
- (*GetWorksheetRequest)(nil), // 2: bytebase.v1.GetWorksheetRequest
- (*UpdateWorksheetRequest)(nil), // 3: bytebase.v1.UpdateWorksheetRequest
- (*UpdateWorksheetOrganizerRequest)(nil), // 4: bytebase.v1.UpdateWorksheetOrganizerRequest
- (*WorksheetOrganizer)(nil), // 5: bytebase.v1.WorksheetOrganizer
- (*DeleteWorksheetRequest)(nil), // 6: bytebase.v1.DeleteWorksheetRequest
- (*SearchWorksheetsRequest)(nil), // 7: bytebase.v1.SearchWorksheetsRequest
- (*SearchWorksheetsResponse)(nil), // 8: bytebase.v1.SearchWorksheetsResponse
- (*Worksheet)(nil), // 9: bytebase.v1.Worksheet
- (*fieldmaskpb.FieldMask)(nil), // 10: google.protobuf.FieldMask
- (*timestamppb.Timestamp)(nil), // 11: google.protobuf.Timestamp
- (*emptypb.Empty)(nil), // 12: google.protobuf.Empty
+ (Worksheet_Visibility)(0), // 0: bytebase.v1.Worksheet.Visibility
+ (*CreateWorksheetRequest)(nil), // 1: bytebase.v1.CreateWorksheetRequest
+ (*GetWorksheetRequest)(nil), // 2: bytebase.v1.GetWorksheetRequest
+ (*UpdateWorksheetRequest)(nil), // 3: bytebase.v1.UpdateWorksheetRequest
+ (*BatchUpdateWorksheetOrganizerRequest)(nil), // 4: bytebase.v1.BatchUpdateWorksheetOrganizerRequest
+ (*BatchUpdateWorksheetOrganizerResponse)(nil), // 5: bytebase.v1.BatchUpdateWorksheetOrganizerResponse
+ (*UpdateWorksheetOrganizerRequest)(nil), // 6: bytebase.v1.UpdateWorksheetOrganizerRequest
+ (*WorksheetOrganizer)(nil), // 7: bytebase.v1.WorksheetOrganizer
+ (*DeleteWorksheetRequest)(nil), // 8: bytebase.v1.DeleteWorksheetRequest
+ (*SearchWorksheetsRequest)(nil), // 9: bytebase.v1.SearchWorksheetsRequest
+ (*SearchWorksheetsResponse)(nil), // 10: bytebase.v1.SearchWorksheetsResponse
+ (*Worksheet)(nil), // 11: bytebase.v1.Worksheet
+ (*fieldmaskpb.FieldMask)(nil), // 12: google.protobuf.FieldMask
+ (*timestamppb.Timestamp)(nil), // 13: google.protobuf.Timestamp
+ (*emptypb.Empty)(nil), // 14: google.protobuf.Empty
}
var file_v1_worksheet_service_proto_depIdxs = []int32{
- 9, // 0: bytebase.v1.CreateWorksheetRequest.worksheet:type_name -> bytebase.v1.Worksheet
- 9, // 1: bytebase.v1.UpdateWorksheetRequest.worksheet:type_name -> bytebase.v1.Worksheet
- 10, // 2: bytebase.v1.UpdateWorksheetRequest.update_mask:type_name -> google.protobuf.FieldMask
- 5, // 3: bytebase.v1.UpdateWorksheetOrganizerRequest.organizer:type_name -> bytebase.v1.WorksheetOrganizer
- 10, // 4: bytebase.v1.UpdateWorksheetOrganizerRequest.update_mask:type_name -> google.protobuf.FieldMask
- 9, // 5: bytebase.v1.SearchWorksheetsResponse.worksheets:type_name -> bytebase.v1.Worksheet
- 11, // 6: bytebase.v1.Worksheet.create_time:type_name -> google.protobuf.Timestamp
- 11, // 7: bytebase.v1.Worksheet.update_time:type_name -> google.protobuf.Timestamp
- 0, // 8: bytebase.v1.Worksheet.visibility:type_name -> bytebase.v1.Worksheet.Visibility
- 1, // 9: bytebase.v1.WorksheetService.CreateWorksheet:input_type -> bytebase.v1.CreateWorksheetRequest
- 2, // 10: bytebase.v1.WorksheetService.GetWorksheet:input_type -> bytebase.v1.GetWorksheetRequest
- 7, // 11: bytebase.v1.WorksheetService.SearchWorksheets:input_type -> bytebase.v1.SearchWorksheetsRequest
- 3, // 12: bytebase.v1.WorksheetService.UpdateWorksheet:input_type -> bytebase.v1.UpdateWorksheetRequest
- 4, // 13: bytebase.v1.WorksheetService.UpdateWorksheetOrganizer:input_type -> bytebase.v1.UpdateWorksheetOrganizerRequest
- 6, // 14: bytebase.v1.WorksheetService.DeleteWorksheet:input_type -> bytebase.v1.DeleteWorksheetRequest
- 9, // 15: bytebase.v1.WorksheetService.CreateWorksheet:output_type -> bytebase.v1.Worksheet
- 9, // 16: bytebase.v1.WorksheetService.GetWorksheet:output_type -> bytebase.v1.Worksheet
- 8, // 17: bytebase.v1.WorksheetService.SearchWorksheets:output_type -> bytebase.v1.SearchWorksheetsResponse
- 9, // 18: bytebase.v1.WorksheetService.UpdateWorksheet:output_type -> bytebase.v1.Worksheet
- 5, // 19: bytebase.v1.WorksheetService.UpdateWorksheetOrganizer:output_type -> bytebase.v1.WorksheetOrganizer
- 12, // 20: bytebase.v1.WorksheetService.DeleteWorksheet:output_type -> google.protobuf.Empty
- 15, // [15:21] is the sub-list for method output_type
- 9, // [9:15] is the sub-list for method input_type
- 9, // [9:9] is the sub-list for extension type_name
- 9, // [9:9] is the sub-list for extension extendee
- 0, // [0:9] is the sub-list for field type_name
+ 11, // 0: bytebase.v1.CreateWorksheetRequest.worksheet:type_name -> bytebase.v1.Worksheet
+ 11, // 1: bytebase.v1.UpdateWorksheetRequest.worksheet:type_name -> bytebase.v1.Worksheet
+ 12, // 2: bytebase.v1.UpdateWorksheetRequest.update_mask:type_name -> google.protobuf.FieldMask
+ 6, // 3: bytebase.v1.BatchUpdateWorksheetOrganizerRequest.requests:type_name -> bytebase.v1.UpdateWorksheetOrganizerRequest
+ 7, // 4: bytebase.v1.BatchUpdateWorksheetOrganizerResponse.worksheet_organizers:type_name -> bytebase.v1.WorksheetOrganizer
+ 7, // 5: bytebase.v1.UpdateWorksheetOrganizerRequest.organizer:type_name -> bytebase.v1.WorksheetOrganizer
+ 12, // 6: bytebase.v1.UpdateWorksheetOrganizerRequest.update_mask:type_name -> google.protobuf.FieldMask
+ 11, // 7: bytebase.v1.SearchWorksheetsResponse.worksheets:type_name -> bytebase.v1.Worksheet
+ 13, // 8: bytebase.v1.Worksheet.create_time:type_name -> google.protobuf.Timestamp
+ 13, // 9: bytebase.v1.Worksheet.update_time:type_name -> google.protobuf.Timestamp
+ 0, // 10: bytebase.v1.Worksheet.visibility:type_name -> bytebase.v1.Worksheet.Visibility
+ 1, // 11: bytebase.v1.WorksheetService.CreateWorksheet:input_type -> bytebase.v1.CreateWorksheetRequest
+ 2, // 12: bytebase.v1.WorksheetService.GetWorksheet:input_type -> bytebase.v1.GetWorksheetRequest
+ 9, // 13: bytebase.v1.WorksheetService.SearchWorksheets:input_type -> bytebase.v1.SearchWorksheetsRequest
+ 3, // 14: bytebase.v1.WorksheetService.UpdateWorksheet:input_type -> bytebase.v1.UpdateWorksheetRequest
+ 6, // 15: bytebase.v1.WorksheetService.UpdateWorksheetOrganizer:input_type -> bytebase.v1.UpdateWorksheetOrganizerRequest
+ 4, // 16: bytebase.v1.WorksheetService.BatchUpdateWorksheetOrganizer:input_type -> bytebase.v1.BatchUpdateWorksheetOrganizerRequest
+ 8, // 17: bytebase.v1.WorksheetService.DeleteWorksheet:input_type -> bytebase.v1.DeleteWorksheetRequest
+ 11, // 18: bytebase.v1.WorksheetService.CreateWorksheet:output_type -> bytebase.v1.Worksheet
+ 11, // 19: bytebase.v1.WorksheetService.GetWorksheet:output_type -> bytebase.v1.Worksheet
+ 10, // 20: bytebase.v1.WorksheetService.SearchWorksheets:output_type -> bytebase.v1.SearchWorksheetsResponse
+ 11, // 21: bytebase.v1.WorksheetService.UpdateWorksheet:output_type -> bytebase.v1.Worksheet
+ 7, // 22: bytebase.v1.WorksheetService.UpdateWorksheetOrganizer:output_type -> bytebase.v1.WorksheetOrganizer
+ 5, // 23: bytebase.v1.WorksheetService.BatchUpdateWorksheetOrganizer:output_type -> bytebase.v1.BatchUpdateWorksheetOrganizerResponse
+ 14, // 24: bytebase.v1.WorksheetService.DeleteWorksheet:output_type -> google.protobuf.Empty
+ 18, // [18:25] is the sub-list for method output_type
+ 11, // [11:18] is the sub-list for method input_type
+ 11, // [11:11] is the sub-list for extension type_name
+ 11, // [11:11] is the sub-list for extension extendee
+ 0, // [0:11] is the sub-list for field type_name
}
func init() { file_v1_worksheet_service_proto_init() }
@@ -802,7 +903,7 @@ func file_v1_worksheet_service_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_worksheet_service_proto_rawDesc), len(file_v1_worksheet_service_proto_rawDesc)),
NumEnums: 1,
- NumMessages: 9,
+ NumMessages: 11,
NumExtensions: 0,
NumServices: 1,
},
diff --git a/backend/generated-go/v1/worksheet_service.pb.gw.go b/backend/generated-go/v1/worksheet_service.pb.gw.go
index fc0858d84d..7fcbf4f5ab 100644
--- a/backend/generated-go/v1/worksheet_service.pb.gw.go
+++ b/backend/generated-go/v1/worksheet_service.pb.gw.go
@@ -290,6 +290,33 @@ func local_request_WorksheetService_UpdateWorksheetOrganizer_0(ctx context.Conte
return msg, metadata, err
}
+func request_WorksheetService_BatchUpdateWorksheetOrganizer_0(ctx context.Context, marshaler runtime.Marshaler, client WorksheetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+ var (
+ protoReq BatchUpdateWorksheetOrganizerRequest
+ metadata runtime.ServerMetadata
+ )
+ if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+ }
+ if req.Body != nil {
+ _, _ = io.Copy(io.Discard, req.Body)
+ }
+ msg, err := client.BatchUpdateWorksheetOrganizer(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+ return msg, metadata, err
+}
+
+func local_request_WorksheetService_BatchUpdateWorksheetOrganizer_0(ctx context.Context, marshaler runtime.Marshaler, server WorksheetServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+ var (
+ protoReq BatchUpdateWorksheetOrganizerRequest
+ metadata runtime.ServerMetadata
+ )
+ if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+ }
+ msg, err := server.BatchUpdateWorksheetOrganizer(ctx, &protoReq)
+ return msg, metadata, err
+}
+
func request_WorksheetService_DeleteWorksheet_0(ctx context.Context, marshaler runtime.Marshaler, client WorksheetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
var (
protoReq DeleteWorksheetRequest
@@ -435,6 +462,26 @@ func RegisterWorksheetServiceHandlerServer(ctx context.Context, mux *runtime.Ser
}
forward_WorksheetService_UpdateWorksheetOrganizer_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
+ mux.Handle(http.MethodPatch, pattern_WorksheetService_BatchUpdateWorksheetOrganizer_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+ ctx, cancel := context.WithCancel(req.Context())
+ defer cancel()
+ var stream runtime.ServerTransportStream
+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.WorksheetService/BatchUpdateWorksheetOrganizer", runtime.WithHTTPPathPattern("/v1/worksheets/organizer:batchUpdate"))
+ if err != nil {
+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ resp, md, err := local_request_WorksheetService_BatchUpdateWorksheetOrganizer_0(annotatedContext, inboundMarshaler, server, req, pathParams)
+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+ if err != nil {
+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ forward_WorksheetService_BatchUpdateWorksheetOrganizer_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ })
mux.Handle(http.MethodDelete, pattern_WorksheetService_DeleteWorksheet_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
@@ -580,6 +627,23 @@ func RegisterWorksheetServiceHandlerClient(ctx context.Context, mux *runtime.Ser
}
forward_WorksheetService_UpdateWorksheetOrganizer_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
+ mux.Handle(http.MethodPatch, pattern_WorksheetService_BatchUpdateWorksheetOrganizer_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+ ctx, cancel := context.WithCancel(req.Context())
+ defer cancel()
+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.WorksheetService/BatchUpdateWorksheetOrganizer", runtime.WithHTTPPathPattern("/v1/worksheets/organizer:batchUpdate"))
+ if err != nil {
+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ resp, md, err := request_WorksheetService_BatchUpdateWorksheetOrganizer_0(annotatedContext, inboundMarshaler, client, req, pathParams)
+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+ if err != nil {
+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ forward_WorksheetService_BatchUpdateWorksheetOrganizer_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ })
mux.Handle(http.MethodDelete, pattern_WorksheetService_DeleteWorksheet_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
@@ -601,19 +665,21 @@ func RegisterWorksheetServiceHandlerClient(ctx context.Context, mux *runtime.Ser
}
var (
- pattern_WorksheetService_CreateWorksheet_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "worksheets"}, ""))
- pattern_WorksheetService_GetWorksheet_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2}, []string{"v1", "worksheets", "name"}, ""))
- pattern_WorksheetService_SearchWorksheets_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "worksheets"}, "search"))
- pattern_WorksheetService_UpdateWorksheet_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2}, []string{"v1", "worksheets", "worksheet.name"}, ""))
- pattern_WorksheetService_UpdateWorksheetOrganizer_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "worksheets", "organizer.worksheet", "organizer"}, ""))
- pattern_WorksheetService_DeleteWorksheet_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2}, []string{"v1", "worksheets", "name"}, ""))
+ pattern_WorksheetService_CreateWorksheet_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "worksheets"}, ""))
+ pattern_WorksheetService_GetWorksheet_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2}, []string{"v1", "worksheets", "name"}, ""))
+ pattern_WorksheetService_SearchWorksheets_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "worksheets"}, "search"))
+ pattern_WorksheetService_UpdateWorksheet_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2}, []string{"v1", "worksheets", "worksheet.name"}, ""))
+ pattern_WorksheetService_UpdateWorksheetOrganizer_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "worksheets", "organizer.worksheet", "organizer"}, ""))
+ pattern_WorksheetService_BatchUpdateWorksheetOrganizer_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "worksheets", "organizer"}, "batchUpdate"))
+ pattern_WorksheetService_DeleteWorksheet_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2}, []string{"v1", "worksheets", "name"}, ""))
)
var (
- forward_WorksheetService_CreateWorksheet_0 = runtime.ForwardResponseMessage
- forward_WorksheetService_GetWorksheet_0 = runtime.ForwardResponseMessage
- forward_WorksheetService_SearchWorksheets_0 = runtime.ForwardResponseMessage
- forward_WorksheetService_UpdateWorksheet_0 = runtime.ForwardResponseMessage
- forward_WorksheetService_UpdateWorksheetOrganizer_0 = runtime.ForwardResponseMessage
- forward_WorksheetService_DeleteWorksheet_0 = runtime.ForwardResponseMessage
+ forward_WorksheetService_CreateWorksheet_0 = runtime.ForwardResponseMessage
+ forward_WorksheetService_GetWorksheet_0 = runtime.ForwardResponseMessage
+ forward_WorksheetService_SearchWorksheets_0 = runtime.ForwardResponseMessage
+ forward_WorksheetService_UpdateWorksheet_0 = runtime.ForwardResponseMessage
+ forward_WorksheetService_UpdateWorksheetOrganizer_0 = runtime.ForwardResponseMessage
+ forward_WorksheetService_BatchUpdateWorksheetOrganizer_0 = runtime.ForwardResponseMessage
+ forward_WorksheetService_DeleteWorksheet_0 = runtime.ForwardResponseMessage
)
diff --git a/backend/generated-go/v1/worksheet_service_equal.pb.go b/backend/generated-go/v1/worksheet_service_equal.pb.go
index eaada32682..96a6140c0d 100644
--- a/backend/generated-go/v1/worksheet_service_equal.pb.go
+++ b/backend/generated-go/v1/worksheet_service_equal.pb.go
@@ -54,6 +54,42 @@ func (x *UpdateWorksheetRequest) Equal(y *UpdateWorksheetRequest) bool {
return true
}
+func (x *BatchUpdateWorksheetOrganizerRequest) Equal(y *BatchUpdateWorksheetOrganizerRequest) bool {
+ if x == y {
+ return true
+ }
+ if x == nil || y == nil {
+ return x == nil && y == nil
+ }
+ if len(x.Requests) != len(y.Requests) {
+ return false
+ }
+ for i := 0; i < len(x.Requests); i++ {
+ if !x.Requests[i].Equal(y.Requests[i]) {
+ return false
+ }
+ }
+ return true
+}
+
+func (x *BatchUpdateWorksheetOrganizerResponse) Equal(y *BatchUpdateWorksheetOrganizerResponse) bool {
+ if x == y {
+ return true
+ }
+ if x == nil || y == nil {
+ return x == nil && y == nil
+ }
+ if len(x.WorksheetOrganizers) != len(y.WorksheetOrganizers) {
+ return false
+ }
+ for i := 0; i < len(x.WorksheetOrganizers); i++ {
+ if !x.WorksheetOrganizers[i].Equal(y.WorksheetOrganizers[i]) {
+ return false
+ }
+ }
+ return true
+}
+
func (x *UpdateWorksheetOrganizerRequest) Equal(y *UpdateWorksheetOrganizerRequest) bool {
if x == y {
return true
diff --git a/backend/generated-go/v1/worksheet_service_grpc.pb.go b/backend/generated-go/v1/worksheet_service_grpc.pb.go
index 3f77fb49e6..8d178bc351 100644
--- a/backend/generated-go/v1/worksheet_service_grpc.pb.go
+++ b/backend/generated-go/v1/worksheet_service_grpc.pb.go
@@ -20,12 +20,13 @@ import (
const _ = grpc.SupportPackageIsVersion9
const (
- WorksheetService_CreateWorksheet_FullMethodName = "/bytebase.v1.WorksheetService/CreateWorksheet"
- WorksheetService_GetWorksheet_FullMethodName = "/bytebase.v1.WorksheetService/GetWorksheet"
- WorksheetService_SearchWorksheets_FullMethodName = "/bytebase.v1.WorksheetService/SearchWorksheets"
- WorksheetService_UpdateWorksheet_FullMethodName = "/bytebase.v1.WorksheetService/UpdateWorksheet"
- WorksheetService_UpdateWorksheetOrganizer_FullMethodName = "/bytebase.v1.WorksheetService/UpdateWorksheetOrganizer"
- WorksheetService_DeleteWorksheet_FullMethodName = "/bytebase.v1.WorksheetService/DeleteWorksheet"
+ WorksheetService_CreateWorksheet_FullMethodName = "/bytebase.v1.WorksheetService/CreateWorksheet"
+ WorksheetService_GetWorksheet_FullMethodName = "/bytebase.v1.WorksheetService/GetWorksheet"
+ WorksheetService_SearchWorksheets_FullMethodName = "/bytebase.v1.WorksheetService/SearchWorksheets"
+ WorksheetService_UpdateWorksheet_FullMethodName = "/bytebase.v1.WorksheetService/UpdateWorksheet"
+ WorksheetService_UpdateWorksheetOrganizer_FullMethodName = "/bytebase.v1.WorksheetService/UpdateWorksheetOrganizer"
+ WorksheetService_BatchUpdateWorksheetOrganizer_FullMethodName = "/bytebase.v1.WorksheetService/BatchUpdateWorksheetOrganizer"
+ WorksheetService_DeleteWorksheet_FullMethodName = "/bytebase.v1.WorksheetService/DeleteWorksheet"
)
// WorksheetServiceClient is the client API for WorksheetService service.
@@ -60,6 +61,10 @@ type WorksheetServiceClient interface {
// The access is the same as UpdateWorksheet method.
// Permissions required: bb.worksheets.get (or creator, or project member for shared worksheets)
UpdateWorksheetOrganizer(ctx context.Context, in *UpdateWorksheetOrganizerRequest, opts ...grpc.CallOption) (*WorksheetOrganizer, error)
+ // Batch update the organizers of worksheets.
+ // The access is the same as UpdateWorksheet method.
+ // Permissions required: bb.worksheets.get (or creator, or project member for shared worksheets)
+ BatchUpdateWorksheetOrganizer(ctx context.Context, in *BatchUpdateWorksheetOrganizerRequest, opts ...grpc.CallOption) (*BatchUpdateWorksheetOrganizerResponse, error)
// Delete a worksheet.
// The access is the same as UpdateWorksheet method.
// Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE worksheets)
@@ -124,6 +129,16 @@ func (c *worksheetServiceClient) UpdateWorksheetOrganizer(ctx context.Context, i
return out, nil
}
+func (c *worksheetServiceClient) BatchUpdateWorksheetOrganizer(ctx context.Context, in *BatchUpdateWorksheetOrganizerRequest, opts ...grpc.CallOption) (*BatchUpdateWorksheetOrganizerResponse, error) {
+ cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+ out := new(BatchUpdateWorksheetOrganizerResponse)
+ err := c.cc.Invoke(ctx, WorksheetService_BatchUpdateWorksheetOrganizer_FullMethodName, in, out, cOpts...)
+ if err != nil {
+ return nil, err
+ }
+ return out, nil
+}
+
func (c *worksheetServiceClient) DeleteWorksheet(ctx context.Context, in *DeleteWorksheetRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(emptypb.Empty)
@@ -166,6 +181,10 @@ type WorksheetServiceServer interface {
// The access is the same as UpdateWorksheet method.
// Permissions required: bb.worksheets.get (or creator, or project member for shared worksheets)
UpdateWorksheetOrganizer(context.Context, *UpdateWorksheetOrganizerRequest) (*WorksheetOrganizer, error)
+ // Batch update the organizers of worksheets.
+ // The access is the same as UpdateWorksheet method.
+ // Permissions required: bb.worksheets.get (or creator, or project member for shared worksheets)
+ BatchUpdateWorksheetOrganizer(context.Context, *BatchUpdateWorksheetOrganizerRequest) (*BatchUpdateWorksheetOrganizerResponse, error)
// Delete a worksheet.
// The access is the same as UpdateWorksheet method.
// Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE worksheets)
@@ -195,6 +214,9 @@ func (UnimplementedWorksheetServiceServer) UpdateWorksheet(context.Context, *Upd
func (UnimplementedWorksheetServiceServer) UpdateWorksheetOrganizer(context.Context, *UpdateWorksheetOrganizerRequest) (*WorksheetOrganizer, error) {
return nil, status.Errorf(codes.Unimplemented, "method UpdateWorksheetOrganizer not implemented")
}
+func (UnimplementedWorksheetServiceServer) BatchUpdateWorksheetOrganizer(context.Context, *BatchUpdateWorksheetOrganizerRequest) (*BatchUpdateWorksheetOrganizerResponse, error) {
+ return nil, status.Errorf(codes.Unimplemented, "method BatchUpdateWorksheetOrganizer not implemented")
+}
func (UnimplementedWorksheetServiceServer) DeleteWorksheet(context.Context, *DeleteWorksheetRequest) (*emptypb.Empty, error) {
return nil, status.Errorf(codes.Unimplemented, "method DeleteWorksheet not implemented")
}
@@ -309,6 +331,24 @@ func _WorksheetService_UpdateWorksheetOrganizer_Handler(srv interface{}, ctx con
return interceptor(ctx, in, info, handler)
}
+func _WorksheetService_BatchUpdateWorksheetOrganizer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(BatchUpdateWorksheetOrganizerRequest)
+ if err := dec(in); err != nil {
+ return nil, err
+ }
+ if interceptor == nil {
+ return srv.(WorksheetServiceServer).BatchUpdateWorksheetOrganizer(ctx, in)
+ }
+ info := &grpc.UnaryServerInfo{
+ Server: srv,
+ FullMethod: WorksheetService_BatchUpdateWorksheetOrganizer_FullMethodName,
+ }
+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+ return srv.(WorksheetServiceServer).BatchUpdateWorksheetOrganizer(ctx, req.(*BatchUpdateWorksheetOrganizerRequest))
+ }
+ return interceptor(ctx, in, info, handler)
+}
+
func _WorksheetService_DeleteWorksheet_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(DeleteWorksheetRequest)
if err := dec(in); err != nil {
@@ -354,6 +394,10 @@ var WorksheetService_ServiceDesc = grpc.ServiceDesc{
MethodName: "UpdateWorksheetOrganizer",
Handler: _WorksheetService_UpdateWorksheetOrganizer_Handler,
},
+ {
+ MethodName: "BatchUpdateWorksheetOrganizer",
+ Handler: _WorksheetService_BatchUpdateWorksheetOrganizer_Handler,
+ },
{
MethodName: "DeleteWorksheet",
Handler: _WorksheetService_DeleteWorksheet_Handler,
diff --git a/backend/store/worksheet.go b/backend/store/worksheet.go
index d7d72ecb7e..49ed7dba0f 100644
--- a/backend/store/worksheet.go
+++ b/backend/store/worksheet.go
@@ -461,6 +461,12 @@ func GetListSheetFilter(ctx context.Context, s *Store, callerID int, filter stri
case "visibility":
visibility := WorkSheetVisibility(value.(string))
return qb.Q().Space("worksheet.visibility = ?", visibility), nil
+ case "project":
+ projectID, err := common.GetProjectID(value.(string))
+ if err != nil {
+ return nil, errors.Errorf("invalid project filter %q", value)
+ }
+ return qb.Q().Space("worksheet.project = ?", projectID), nil
default:
return nil, errors.Errorf("unsupport variable %q", variable)
}
diff --git a/frontend/src/components/ProvideSQLEditorContext.vue b/frontend/src/components/ProvideSQLEditorContext.vue
index 42a0572c50..e5cc75fed9 100644
--- a/frontend/src/components/ProvideSQLEditorContext.vue
+++ b/frontend/src/components/ProvideSQLEditorContext.vue
@@ -64,10 +64,7 @@ import {
extractInstanceResourceName,
getDefaultPagination,
} from "@/utils";
-import {
- useSheetContext,
- extractWorksheetConnection,
-} from "@/views/sql-editor/Sheet";
+import { extractWorksheetConnection } from "@/views/sql-editor/Sheet";
import {
useSQLEditorContext,
type AsidePanelTab,
@@ -82,7 +79,6 @@ const editorStore = useSQLEditorStore();
const worksheetStore = useWorkSheetStore();
const tabStore = useSQLEditorTabStore();
const policyStore = usePolicyV1Store();
-const { isFetching: isFetchingWorksheet } = useSheetContext();
const {
asidePanelTab,
events: editorEvents,
@@ -194,9 +190,7 @@ const prepareSheetLegacy = async () => {
(tab) => tab.worksheet == sheetName
);
- isFetchingWorksheet.value = true;
const sheet = await worksheetStore.getOrFetchWorksheetByName(sheetName);
- isFetchingWorksheet.value = false;
if (!sheet) {
if (openingSheetTab) {
@@ -260,9 +254,7 @@ const prepareSheet = async () => {
(tab) => tab.worksheet == sheetName
);
- isFetchingWorksheet.value = true;
const sheet = await worksheetStore.getOrFetchWorksheetByName(sheetName);
- isFetchingWorksheet.value = false;
if (!sheet) {
if (openingSheetTab) {
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index 520fa244b9..3054f7df0b 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -147,6 +147,7 @@
"no-data": "No data",
"visibility": "Visibility",
"duplicate": "Duplicate",
+ "fork": "Fork",
"enable": "Enable",
"disable": "Disable",
"view-doc": "View doc",
@@ -2027,6 +2028,7 @@
}
},
"copy-url": "Copy URL",
+ "url-copied-to-clipboard": "The URL is copied to your clipboard",
"connect-to-a-database": "Connect to a database",
"link-access": "Link access",
"private": "Private",
@@ -2037,6 +2039,7 @@
"project-write-desc": "Both sheet owner and project users with \"bb.worksheets.get\" permission can read/write",
"create-read-only-data-source": "Go to create",
"save-sheet": "Save Sheet",
+ "choose-folder": "Choose folder",
"save-sheet-input-placeholder": "Please input a sheet name",
"format": "Format",
"visualize-explain": "Visualize Explain",
@@ -2052,12 +2055,8 @@
"allow-admin-mode-only": "Instance {instance} is accessible in admin mode only.",
"query-time": "Query time",
"connection-lost": "Connection lost. Will try to reconnect when executing next query.",
- "sheet": {
- "self": "Sheet",
- "connection": "Connection"
- },
+ "sheet": {},
"tab": {
- "unsaved": "Unsaved",
"context-menu": {
"actions": {
"close": "Close",
@@ -2065,7 +2064,9 @@
"close-to-the-right": "Close to the right",
"close-saved": "Close saved",
"close-all": "Close all",
- "rename": "Rename"
+ "rename": "Rename",
+ "add-folder": "Add folder",
+ "add-worksheet": "Add worksheet"
}
}
},
@@ -2212,8 +2213,6 @@
"invalid-view-name": "Invalid view name",
"duplicated-view-name": "Duplicated view name"
},
- "confirm-to-close": {
- },
"foreign-key": {
"edit": "Edit foreign key",
"name-description": "The unique name of foreign key"
@@ -2332,19 +2331,27 @@
},
"sheet": {
"mine": "Mine",
- "star": "Star",
- "unstar": "Unstar",
- "starred": "Starred",
"shared": "Shared",
"notifications": {
- "duplicate-success": "Successfully duplicate to \"My sheets\""
+ "duplicate-success": "Successfully duplicate the worksheet"
},
- "hint-tips": {
- "confirm-to-delete-this-sheet": "Confirm to delete this sheet?",
- "confirm-to-duplicate-sheet": "Confirm to duplicate this sheet?"
+ "filter": {
+ "show-mine": "Show mine",
+ "show-shared": "Show shared",
+ "show-draft": "Show draft",
+ "only-show-starred": "Only show starred"
},
- "search-sheets": "Search Sheets",
- "draft": "Draft"
+ "hint-tips": {
+ "non-empty-folder-title": "Non-empty folder",
+ "non-empty-folder-content": "Do you want to move all worksheets into the root folder or just delete them?",
+ "move-to-root-folder": "Move to root folder",
+ "delete-all-sheets": "Delete all files",
+ "duplicate-folder-name-title": "Duplicate folder name",
+ "duplicate-folder-name-content": "Do you want to merge all subfolders and files into the existing folder \"{folder}\"?",
+ "confirm-to-delete-sheet-title": "Confirm to delete this worksheet?",
+ "confirm-to-duplicate-sheet": "Confirm to duplicate this worksheet?"
+ },
+ "search-sheets": "Search Sheets"
},
"sql-review": {
"title": "SQL Review",
@@ -2897,4 +2904,4 @@
"last-visit": "Last visit",
"changelog-for-version": "Changelog for {version}"
}
-}
\ No newline at end of file
+}
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index 3f1fc8de0d..db221e6b9e 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -1,6 +1,5 @@
{
"common": {
- "apply-to-database": "Aplicar a la base de datos",
"view": "Ver",
"you": "tu",
"general": "General",
@@ -148,6 +147,7 @@
"no-data": "Sin datos",
"visibility": "Visibilidad",
"duplicate": "Duplicar",
+ "fork": "Bifurcación",
"enable": "Habilitar",
"disable": "Inhabilitar",
"view-doc": "Ver doc",
@@ -245,7 +245,8 @@
},
"collapse": "Colapsar",
"line": "Línea",
- "column": "Columna"
+ "column": "Columna",
+ "apply-to-database": "Aplicar a la base de datos"
},
"error-page": {
"go-back-home": "Volver al inicio"
@@ -2027,6 +2028,7 @@
}
},
"copy-url": "Copiar URL",
+ "url-copied-to-clipboard": "La URL se copia al portapapeles.",
"connect-to-a-database": "Conectarse a una base de datos",
"link-access": "Acceso al enlace",
"private": "Privado",
@@ -2037,6 +2039,7 @@
"project-write-desc": "Tanto el propietario de la hoja como los usuarios del proyecto con permiso \"bb.worksheets.get\" pueden leer/escribir",
"create-read-only-data-source": "Ir a crear",
"save-sheet": "Guardar hoja",
+ "choose-folder": "Seleccionar carpeta",
"save-sheet-input-placeholder": "Por favor, ingresa un nombre para la hoja",
"format": "Formato",
"visualize-explain": "Visualizar explicación",
@@ -2052,12 +2055,8 @@
"allow-admin-mode-only": "La instancia {instance} solo es accesible en modo administrador.",
"query-time": "Tiempo de consulta",
"connection-lost": "Conexión perdida. \nIntentará volver a conectarse al ejecutar la siguiente consulta.",
- "sheet": {
- "self": "Hoja",
- "connection": "Conexión"
- },
+ "sheet": {},
"tab": {
- "unsaved": "No guardado",
"context-menu": {
"actions": {
"close": "Cerca",
@@ -2065,7 +2064,9 @@
"close-to-the-right": "Cerca de la derecha",
"close-saved": "Cerrar guardado",
"close-all": "Cierra todo",
- "rename": "Rebautizar"
+ "rename": "Rebautizar",
+ "add-folder": "Agregar carpeta",
+ "add-worksheet": "Agregar hoja de trabajo"
}
}
},
@@ -2212,8 +2213,6 @@
"invalid-view-name": "Nombre de vista no válido",
"duplicated-view-name": "Nombre de vista duplicado"
},
- "confirm-to-close": {
- },
"foreign-key": {
"edit": "Editar clave externa",
"name-description": "El nombre único de la clave externa"
@@ -2332,19 +2331,27 @@
},
"sheet": {
"mine": "Mío",
- "star": "Marcar Favorito",
- "unstar": "Quitar Favorito",
- "starred": "Favorito",
"shared": "Compartido",
"notifications": {
"duplicate-success": "Duplicado con éxito en \"Mis hojas\""
},
+ "filter": {
+ "show-mine": "Muéstrame el mío",
+ "show-shared": "Mostrar compartido",
+ "show-draft": "Mostrar borrador",
+ "only-show-starred": "Solo programa protagonizado"
+ },
"hint-tips": {
- "confirm-to-delete-this-sheet": "¿Confirmar para eliminar esta hoja?",
+ "non-empty-folder-title": "carpeta no vacía",
+ "non-empty-folder-content": "¿Desea mover todas las hojas de cálculo a la carpeta raíz o simplemente eliminarlas?",
+ "move-to-root-folder": "Mover a la carpeta raíz",
+ "delete-all-sheets": "Eliminar todos los archivos",
+ "duplicate-folder-name-title": "Nombre de carpeta duplicado",
+ "duplicate-folder-name-content": "¿Desea fusionar todas las subcarpetas y archivos en la carpeta existente \"{folder}\"?",
+ "confirm-to-delete-sheet-title": "¿Confirmar la eliminación de esta hoja de cálculo?",
"confirm-to-duplicate-sheet": "¿Confirmar para duplicar esta hoja?"
},
- "search-sheets": "Hojas de búsqueda",
- "draft": "Borrador"
+ "search-sheets": "Hojas de búsqueda"
},
"sql-review": {
"title": "Revisión de SQL",
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index af6fa59f61..b9094b0eb5 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -1,6 +1,5 @@
{
"common": {
- "apply-to-database": "データベースに適用",
"view": "チェック",
"you": "あなた",
"general": "全般",
@@ -148,6 +147,7 @@
"no-data": "データなし",
"visibility": "可視性",
"duplicate": "コピー",
+ "fork": "フォーク",
"enable": "オンにする",
"disable": "無効にする",
"view-doc": "ドキュメントを見る",
@@ -245,7 +245,8 @@
},
"collapse": "閉じる",
"line": "行",
- "column": "列"
+ "column": "列",
+ "apply-to-database": "データベースに適用"
},
"error-page": {
"go-back-home": "ホームページに戻る"
@@ -2027,6 +2028,7 @@
}
},
"copy-url": "URLをコピー",
+ "url-copied-to-clipboard": "URLがクリップボードにコピーされました",
"connect-to-a-database": "データベースに接続する",
"link-access": "リンクアクセス",
"private": "プライベート",
@@ -2037,6 +2039,7 @@
"project-write-desc": "シート所有者と「bb.worksheets.get」権限を持つプロジェクトユーザーの両方が読み取り/書き込みできます。",
"create-read-only-data-source": "作成に行く",
"save-sheet": "ワークシートの保存",
+ "choose-folder": "フォルダを選択",
"save-sheet-input-placeholder": "ワークシート名を入力してください",
"format": "フォーマット",
"visualize-explain": "視覚化の説明",
@@ -2052,12 +2055,8 @@
"allow-admin-mode-only": "インスタンス {instance} には管理者モードでのみアクセスできます。",
"query-time": "クエリ時間",
"connection-lost": "接続切断。次回クエリが実行されるときに再接続が試行されます。",
- "sheet": {
- "self": "ワークシート",
- "connection": "接続する"
- },
+ "sheet": {},
"tab": {
- "unsaved": "保存されていません",
"context-menu": {
"actions": {
"close": "閉じる",
@@ -2065,7 +2064,9 @@
"close-to-the-right": "右側をすべて閉じます",
"close-saved": "保存済みを閉じる",
"close-all": "すべて閉じる",
- "rename": "名前の変更"
+ "rename": "名前の変更",
+ "add-folder": "フォルダを追加",
+ "add-worksheet": "ワークシートを追加"
}
}
},
@@ -2212,8 +2213,6 @@
"invalid-view-name": "無効なビュー名です",
"duplicated-view-name": "重複したビュー名"
},
- "confirm-to-close": {
- },
"foreign-key": {
"edit": "外部キーを編集",
"name-description": "外部キーの一意の名前"
@@ -2332,19 +2331,27 @@
},
"sheet": {
"mine": "マイワークシート",
- "star": "お気に入りに追加",
- "unstar": "お気に入りをキャンセルする",
- "starred": "お気に入り",
"shared": "共有",
"notifications": {
"duplicate-success": "「マイワークシート」にコピーされました"
},
+ "filter": {
+ "show-mine": "私のものを表示",
+ "show-shared": "共有を表示",
+ "show-draft": "下書きを表示",
+ "only-show-starred": "スター付きのみ表示"
+ },
"hint-tips": {
- "confirm-to-delete-this-sheet": "このワークシートを削除してもよろしいですか?",
+ "non-empty-folder-title": "空でないフォルダ",
+ "non-empty-folder-content": "すべてのワークシートをルート フォルダーに移動しますか、それとも削除するだけですか?",
+ "move-to-root-folder": "ルートフォルダに移動する",
+ "delete-all-sheets": "すべてのファイルを削除する",
+ "duplicate-folder-name-title": "重複したフォルダ名",
+ "duplicate-folder-name-content": "すべてのサブフォルダーとファイルを既存のフォルダー \"{folder}\" にマージしますか?",
+ "confirm-to-delete-sheet-title": "このワークシートを削除しますか?",
"confirm-to-duplicate-sheet": "このワークシートをコピーしてもよろしいですか?"
},
- "search-sheets": "ワークシートの検索",
- "draft": "下書き"
+ "search-sheets": "ワークシートの検索"
},
"sql-review": {
"title": "SQL監査ポリシー",
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index 86c5cbbf25..0daa7a211b 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -1,6 +1,5 @@
{
"common": {
- "apply-to-database": "Áp dụng cho cơ sở dữ liệu",
"view": "Xem",
"you": "bạn",
"general": "Chung",
@@ -148,6 +147,7 @@
"no-data": "Không có dữ liệu",
"visibility": "Hiển thị",
"duplicate": "Nhân bản",
+ "fork": "Bản sao",
"enable": "Bật",
"disable": "Tắt",
"view-doc": "Xem tài liệu",
@@ -245,7 +245,8 @@
},
"collapse": "Sụp đổ",
"line": "Dòng",
- "column": "Cột"
+ "column": "Cột",
+ "apply-to-database": "Áp dụng cho cơ sở dữ liệu"
},
"error-page": {
"go-back-home": "Về trang chủ"
@@ -2027,6 +2028,7 @@
}
},
"copy-url": "Sao chép URL",
+ "url-copied-to-clipboard": "URL đã được sao chép vào bảng nhớ tạm của bạn",
"connect-to-a-database": "Kết nối với cơ sở dữ liệu",
"link-access": "Truy cập liên kết",
"private": "Riêng tư",
@@ -2037,6 +2039,7 @@
"project-write-desc": "Cả chủ sở hữu trang tính và người dùng dự án có quyền \"bb.worksheets.get\" đều có thể đọc/ghi",
"create-read-only-data-source": "Đi tới tạo",
"save-sheet": "Lưu trang tính",
+ "choose-folder": "Chọn thư mục",
"save-sheet-input-placeholder": "Vui lòng nhập tên trang tính",
"format": "Định dạng",
"visualize-explain": "Trực quan hóa Giải thích",
@@ -2052,12 +2055,8 @@
"allow-admin-mode-only": "Phiên bản {instance} chỉ có thể truy cập ở chế độ quản trị.",
"query-time": "Thời gian truy vấn",
"connection-lost": "Mất kết nối. Sẽ thử kết nối lại khi thực hiện truy vấn tiếp theo.",
- "sheet": {
- "self": "Trang tính",
- "connection": "Kết nối"
- },
+ "sheet": {},
"tab": {
- "unsaved": "Chưa lưu",
"context-menu": {
"actions": {
"close": "Đóng",
@@ -2065,7 +2064,9 @@
"close-to-the-right": "Đóng các trang tính bên phải",
"close-saved": "Đóng các trang tính đã lưu",
"close-all": "Đóng tất cả",
- "rename": "Đổi tên"
+ "rename": "Đổi tên",
+ "add-folder": "Thêm thư mục",
+ "add-worksheet": "Thêm bảng tính"
}
}
},
@@ -2212,8 +2213,6 @@
"invalid-view-name": "Tên khung nhìn không hợp lệ",
"duplicated-view-name": "Tên khung nhìn trùng lặp"
},
- "confirm-to-close": {
- },
"foreign-key": {
"edit": "Chỉnh sửa khóa ngoại",
"name-description": "Tên duy nhất của khóa ngoại"
@@ -2332,19 +2331,27 @@
},
"sheet": {
"mine": "Của tôi",
- "star": "Đánh dấu sao",
- "unstar": "Bỏ đánh dấu sao",
- "starred": "Đã đánh dấu sao",
"shared": "Được chia sẻ",
"notifications": {
"duplicate-success": "Đã nhân bản thành công vào \"Trang tính của tôi\""
},
+ "filter": {
+ "show-mine": "Hiển thị của tôi",
+ "show-shared": "Hiển thị chia sẻ",
+ "show-draft": "Hiển thị bản nháp",
+ "only-show-starred": "Chỉ hiển thị có dấu sao"
+ },
"hint-tips": {
- "confirm-to-delete-this-sheet": "Xác nhận xóa trang tính này?",
+ "non-empty-folder-title": "Thư mục không trống",
+ "non-empty-folder-content": "Bạn muốn di chuyển tất cả các trang tính vào thư mục gốc hay chỉ xóa chúng?",
+ "move-to-root-folder": "Di chuyển đến thư mục gốc",
+ "delete-all-sheets": "Xóa tất cả các tập tin",
+ "duplicate-folder-name-title": "Tên thư mục trùng lặp",
+ "duplicate-folder-name-content": "Bạn có muốn hợp nhất tất cả các thư mục con và tệp vào thư mục hiện có \"{folder}\" không?",
+ "confirm-to-delete-sheet-title": "Xác nhận xóa bảng tính này?",
"confirm-to-duplicate-sheet": "Xác nhận nhân bản trang tính này?"
},
- "search-sheets": "Tìm kiếm Trang tính",
- "draft": "Bản nháp"
+ "search-sheets": "Tìm kiếm Trang tính"
},
"sql-review": {
"title": "Đánh giá SQL",
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index 5cdd9a76ff..068e34f2f7 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -1,6 +1,5 @@
{
"common": {
- "apply-to-database": "应用到数据库",
"view": "查看",
"you": "您",
"general": "通用",
@@ -148,6 +147,7 @@
"no-data": "无数据",
"visibility": "可见性",
"duplicate": "拷贝",
+ "fork": "复刻",
"enable": "开启",
"disable": "禁用",
"view-doc": "查看文档",
@@ -245,7 +245,8 @@
},
"collapse": "收起",
"line": "行",
- "column": "列"
+ "column": "列",
+ "apply-to-database": "应用到数据库"
},
"error-page": {
"go-back-home": "回到主页"
@@ -2027,6 +2028,7 @@
}
},
"copy-url": "复制 URL",
+ "url-copied-to-clipboard": "URL 已复制到剪贴板",
"connect-to-a-database": "连接到数据库",
"link-access": "链接访问权限",
"private": "私有",
@@ -2037,6 +2039,7 @@
"project-write-desc": "工作表所有者和具有“bb.worksheets.get”权限的项目用户都可以读/写",
"create-read-only-data-source": "前去创建",
"save-sheet": "保存工作表",
+ "choose-folder": "选择文件夹",
"save-sheet-input-placeholder": "请输入工作表名称",
"format": "格式化",
"visualize-explain": "可视化 Explain",
@@ -2052,12 +2055,8 @@
"allow-admin-mode-only": "实例{instance}只能通过管理员模式访问。",
"query-time": "查询时间",
"connection-lost": "连接丢失。下一次执行查询时将尝试重新连接。",
- "sheet": {
- "self": "工作表",
- "connection": "连接"
- },
+ "sheet": {},
"tab": {
- "unsaved": "未保存",
"context-menu": {
"actions": {
"close": "关闭",
@@ -2065,7 +2064,9 @@
"close-to-the-right": "关闭右侧所有的",
"close-saved": "关闭已保存的",
"close-all": "关闭所有",
- "rename": "重命名"
+ "rename": "重命名",
+ "add-folder": "添加文件夹",
+ "add-worksheet": "添加工作表"
}
}
},
@@ -2212,8 +2213,6 @@
"invalid-view-name": "无效的视图名称",
"duplicated-view-name": "重复的视图名称"
},
- "confirm-to-close": {
- },
"foreign-key": {
"edit": "修改外键",
"name-description": "外键的名称应该是唯一的"
@@ -2332,19 +2331,27 @@
},
"sheet": {
"mine": "我的",
- "star": "添加收藏",
- "unstar": "取消收藏",
- "starred": "收藏的",
"shared": "共享的",
"notifications": {
"duplicate-success": "已成功拷贝至“我的工作表”"
},
+ "filter": {
+ "show-mine": "显示我的",
+ "show-shared": "显示共享",
+ "show-draft": "显示草稿",
+ "only-show-starred": "仅显示收藏"
+ },
"hint-tips": {
- "confirm-to-delete-this-sheet": "确定删除这条工作表?",
+ "non-empty-folder-title": "非空文件夹",
+ "non-empty-folder-content": "您是想将所有工作表移动到根文件夹,还是直接删除它们?",
+ "move-to-root-folder": "移动到根文件夹",
+ "delete-all-sheets": "删除所有文件",
+ "duplicate-folder-name-title": "重复的文件夹名称",
+ "duplicate-folder-name-content": "是否要将所有子文件夹和文件合并到现有文件夹“{folder}”中?",
+ "confirm-to-delete-sheet-title": "确认删除此工作表?",
"confirm-to-duplicate-sheet": "确定要复制这条工作表?"
},
- "search-sheets": "搜索工作表",
- "draft": "草稿"
+ "search-sheets": "搜索工作表"
},
"sql-review": {
"title": "SQL 审核策略",
diff --git a/frontend/src/store/modules/sqlEditor/tab.ts b/frontend/src/store/modules/sqlEditor/tab.ts
index 9d8437fa8a..b248d5d5d7 100644
--- a/frontend/src/store/modules/sqlEditor/tab.ts
+++ b/frontend/src/store/modules/sqlEditor/tab.ts
@@ -493,6 +493,7 @@ export const useSQLEditorTabStore = defineStore("sqlEditorTab", () => {
);
return {
+ project,
tabIdList,
tabList,
currentTabId,
diff --git a/frontend/src/store/modules/v1/worksheet.ts b/frontend/src/store/modules/v1/worksheet.ts
index 0da9937deb..618dca82e3 100644
--- a/frontend/src/store/modules/v1/worksheet.ts
+++ b/frontend/src/store/modules/v1/worksheet.ts
@@ -14,7 +14,7 @@ import {
DeleteWorksheetRequestSchema,
SearchWorksheetsRequestSchema,
UpdateWorksheetOrganizerRequestSchema,
- Worksheet_Visibility,
+ BatchUpdateWorksheetOrganizerRequestSchema,
} from "@/types/proto-es/v1/worksheet_service_pb";
import type { WorksheetOrganizer } from "@/types/proto-es/v1/worksheet_service_pb";
import type { Worksheet } from "@/types/proto-es/v1/worksheet_service_pb";
@@ -61,11 +61,6 @@ export const useWorkSheetStore = defineStore("worksheet_v1", () => {
return worksheet.creator !== `users/${me.value.email}`;
});
});
- const starredWorksheetList = computed(() => {
- return worksheetList.value.filter((worksheet) => {
- return worksheet.starred;
- });
- });
// Utilities
const setCache = async (worksheet: Worksheet, view: WorksheetView) => {
@@ -190,30 +185,9 @@ export const useWorkSheetStore = defineStore("worksheet_v1", () => {
return promise;
};
- const fetchMyWorksheetList = async () => {
- const me = useCurrentUserV1();
- const request = create(SearchWorksheetsRequestSchema, {
- filter: `creator == "users/${me.value.email}"`,
- });
- const response =
- await worksheetServiceClientConnect.searchWorksheets(request);
- await setListCache(response.worksheets);
- return response.worksheets;
- };
- const fetchSharedWorksheetList = async () => {
- const me = useCurrentUserV1();
- const request = create(SearchWorksheetsRequestSchema, {
- filter: `creator != "users/${me.value.email}" && visibility in ["${Worksheet_Visibility[Worksheet_Visibility.PROJECT_READ]}","${Worksheet_Visibility[Worksheet_Visibility.PROJECT_WRITE]}"]`,
- });
- const response =
- await worksheetServiceClientConnect.searchWorksheets(request);
- await setListCache(response.worksheets);
- return response.worksheets;
- };
-
- const fetchStarredWorksheetList = async () => {
+ const fetchWorksheetList = async (filter: string) => {
const request = create(SearchWorksheetsRequestSchema, {
- filter: `starred == true`,
+ filter,
});
const response =
await worksheetServiceClientConnect.searchWorksheets(request);
@@ -241,43 +215,73 @@ export const useWorkSheetStore = defineStore("worksheet_v1", () => {
cacheByUID.invalidateEntity([uid, "BASIC"]);
};
- const upsertWorksheetOrganizer = async (
- organizer: Pick<WorksheetOrganizer, "worksheet" | "starred">
+ const updateWorksheetCacheWithOrganizer = async (
+ organizer: WorksheetOrganizer
) => {
- const fullOrganizer = { ...organizer } as WorksheetOrganizer;
- const request = create(UpdateWorksheetOrganizerRequestSchema, {
- organizer: fullOrganizer,
- // for now we only support change the `starred` field.
- updateMask: { paths: ["starred"] },
- });
- await worksheetServiceClientConnect.updateWorksheetOrganizer(request);
-
// Update local sheet values
const fullViewWorksheet = getWorksheetByName(organizer.worksheet, "FULL");
if (fullViewWorksheet) {
fullViewWorksheet.starred = organizer.starred;
+ fullViewWorksheet.folders = organizer.folders;
await setCache(fullViewWorksheet, "FULL");
}
const basicViewWorksheet = getWorksheetByName(organizer.worksheet, "BASIC");
if (basicViewWorksheet) {
basicViewWorksheet.starred = organizer.starred;
+ basicViewWorksheet.folders = organizer.folders;
await setCache(basicViewWorksheet, "BASIC");
}
};
+ const batchUpsertWorksheetOrganizers = async (
+ requests: {
+ organizer: Pick<WorksheetOrganizer, "worksheet" | "starred" | "folders">;
+ updateMask: string[];
+ }[]
+ ) => {
+ const request = create(BatchUpdateWorksheetOrganizerRequestSchema, {
+ requests: requests.map((request) =>
+ create(UpdateWorksheetOrganizerRequestSchema, {
+ organizer: { ...request.organizer } as WorksheetOrganizer,
+ updateMask: { paths: request.updateMask },
+ })
+ ),
+ });
+ const response =
+ await worksheetServiceClientConnect.batchUpdateWorksheetOrganizer(
+ request
+ );
+
+ await Promise.all(
+ response.worksheetOrganizers.map(updateWorksheetCacheWithOrganizer)
+ );
+ };
+
+ const upsertWorksheetOrganizer = async (
+ organizer: Pick<WorksheetOrganizer, "worksheet" | "starred" | "folders">,
+ updateMask: string[]
+ ) => {
+ const fullOrganizer = { ...organizer } as WorksheetOrganizer;
+ const request = create(UpdateWorksheetOrganizerRequestSchema, {
+ organizer: fullOrganizer,
+ updateMask: { paths: updateMask },
+ });
+ const response =
+ await worksheetServiceClientConnect.updateWorksheetOrganizer(request);
+ await updateWorksheetCacheWithOrganizer(response);
+ };
+
return {
myWorksheetList,
sharedWorksheetList,
- starredWorksheetList,
createWorksheet,
getWorksheetByName,
getOrFetchWorksheetByName,
- fetchMyWorksheetList,
- fetchSharedWorksheetList,
- fetchStarredWorksheetList,
+ fetchWorksheetList,
patchWorksheet,
deleteWorksheetByName,
upsertWorksheetOrganizer,
+ batchUpsertWorksheetOrganizers,
};
});
diff --git a/frontend/src/types/proto-es/v1/worksheet_service_pb.d.ts b/frontend/src/types/proto-es/v1/worksheet_service_pb.d.ts
index 4285b86c6e..88b023c903 100644
--- a/frontend/src/types/proto-es/v1/worksheet_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/worksheet_service_pb.d.ts
@@ -83,6 +83,38 @@ export declare type UpdateWorksheetRequest = Message<"bytebase.v1.UpdateWorkshee
*/
export declare const UpdateWorksheetRequestSchema: GenMessage<UpdateWorksheetRequest>;
+/**
+ * @generated from message bytebase.v1.BatchUpdateWorksheetOrganizerRequest
+ */
+export declare type BatchUpdateWorksheetOrganizerRequest = Message<"bytebase.v1.BatchUpdateWorksheetOrganizerRequest"> & {
+ /**
+ * @generated from field: repeated bytebase.v1.UpdateWorksheetOrganizerRequest requests = 1;
+ */
+ requests: UpdateWorksheetOrganizerRequest[];
+};
+
+/**
+ * Describes the message bytebase.v1.BatchUpdateWorksheetOrganizerRequest.
+ * Use `create(BatchUpdateWorksheetOrganizerRequestSchema)` to create a new message.
+ */
+export declare const BatchUpdateWorksheetOrganizerRequestSchema: GenMessage<BatchUpdateWorksheetOrganizerRequest>;
+
+/**
+ * @generated from message bytebase.v1.BatchUpdateWorksheetOrganizerResponse
+ */
+export declare type BatchUpdateWorksheetOrganizerResponse = Message<"bytebase.v1.BatchUpdateWorksheetOrganizerResponse"> & {
+ /**
+ * @generated from field: repeated bytebase.v1.WorksheetOrganizer worksheet_organizers = 1;
+ */
+ worksheetOrganizers: WorksheetOrganizer[];
+};
+
+/**
+ * Describes the message bytebase.v1.BatchUpdateWorksheetOrganizerResponse.
+ * Use `create(BatchUpdateWorksheetOrganizerResponseSchema)` to create a new message.
+ */
+export declare const BatchUpdateWorksheetOrganizerResponseSchema: GenMessage<BatchUpdateWorksheetOrganizerResponse>;
+
/**
* @generated from message bytebase.v1.UpdateWorksheetOrganizerRequest
*/
@@ -184,6 +216,7 @@ export declare type SearchWorksheetsRequest = Message<"bytebase.v1.SearchWorkshe
* - creator: the worksheet creator in "users/{email}" format, support "==" and "!=" operator.
* - starred: should be "true" or "false", filter starred/unstarred sheets, support "==" operator.
* - visibility: check Visibility enum in the Worksheet message for values, support "==" and "in [xx]" operator.
+ * - project: the project full name in "projects/{id}" format, support "==" operator.
*
* For example:
* creator == "users/{email}"
@@ -192,6 +225,7 @@ export declare type SearchWorksheetsRequest = Message<"bytebase.v1.SearchWorkshe
* starred == false
* visibility in ["PRIVATE", "PROJECT_READ", "PROJECT_WRITE"]
* visibility == "PRIVATE"
+ * project == "projects/{project resource id}"
*
* @generated from field: string filter = 1;
*/
@@ -429,6 +463,18 @@ export declare const WorksheetService: GenService<{
input: typeof UpdateWorksheetOrganizerRequestSchema;
output: typeof WorksheetOrganizerSchema;
},
+ /**
+ * Batch update the organizers of worksheets.
+ * The access is the same as UpdateWorksheet method.
+ * Permissions required: bb.worksheets.get (or creator, or project member for shared worksheets)
+ *
+ * @generated from rpc bytebase.v1.WorksheetService.BatchUpdateWorksheetOrganizer
+ */
+ batchUpdateWorksheetOrganizer: {
+ methodKind: "unary";
+ input: typeof BatchUpdateWorksheetOrganizerRequestSchema;
+ output: typeof BatchUpdateWorksheetOrganizerResponseSchema;
+ },
/**
* Delete a worksheet.
* The access is the same as UpdateWorksheet method.
diff --git a/frontend/src/types/proto-es/v1/worksheet_service_pb.js b/frontend/src/types/proto-es/v1/worksheet_service_pb.js
index 8ce81fa1b6..8873cf5dfb 100644
--- a/frontend/src/types/proto-es/v1/worksheet_service_pb.js
+++ b/frontend/src/types/proto-es/v1/worksheet_service_pb.js
@@ -14,7 +14,7 @@ import { file_v1_annotation } from "./annotation_pb";
* Describes the file v1/worksheet_service.proto.
*/
export const file_v1_worksheet_service = /*@__PURE__*/
- fileDesc("Chp2MS93b3Jrc2hlZXRfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEiSAoWQ3JlYXRlV29ya3NoZWV0UmVxdWVzdBIuCgl3b3Jrc2hlZXQYASABKAsyFi5ieXRlYmFzZS52MS5Xb3Jrc2hlZXRCA+BBAiIoChNHZXRXb3Jrc2hlZXRSZXF1ZXN0EhEKBG5hbWUYASABKAlCA+BBAiJ5ChZVcGRhdGVXb3Jrc2hlZXRSZXF1ZXN0Ei4KCXdvcmtzaGVldBgBIAEoCzIWLmJ5dGViYXNlLnYxLldvcmtzaGVldEID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzayKiAQofVXBkYXRlV29ya3NoZWV0T3JnYW5pemVyUmVxdWVzdBI3Cglvcmdhbml6ZXIYASABKAsyHy5ieXRlYmFzZS52MS5Xb3Jrc2hlZXRPcmdhbml6ZXJCA+BBAhIvCgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sSFQoNYWxsb3dfbWlzc2luZxgDIAEoCCJOChJXb3Jrc2hlZXRPcmdhbml6ZXISFgoJd29ya3NoZWV0GAEgASgJQgPgQQISDwoHc3RhcnJlZBgCIAEoCBIPCgdmb2xkZXJzGAMgAygJIisKFkRlbGV0ZVdvcmtzaGVldFJlcXVlc3QSEQoEbmFtZRgBIAEoCUID4EECIikKF1NlYXJjaFdvcmtzaGVldHNSZXF1ZXN0Eg4KBmZpbHRlchgBIAEoCSJGChhTZWFyY2hXb3Jrc2hlZXRzUmVzcG9uc2USKgoKd29ya3NoZWV0cxgBIAMoCzIWLmJ5dGViYXNlLnYxLldvcmtzaGVldCLcAwoJV29ya3NoZWV0EhQKBG5hbWUYASABKAlCBuBBAuBBBRIUCgdwcm9qZWN0GAIgASgJQgPgQQISEAoIZGF0YWJhc2UYAyABKAkSGgoFdGl0bGUYBCABKAlCC+BBArpIBXIDGMgBEhQKB2NyZWF0b3IYBSABKAlCA+BBAxI0CgtjcmVhdGVfdGltZRgGIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgHIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIUCgdjb250ZW50GAggASgMQgPgQQISGQoMY29udGVudF9zaXplGAkgASgDQgPgQQMSOgoKdmlzaWJpbGl0eRgKIAEoDjIhLmJ5dGViYXNlLnYxLldvcmtzaGVldC5WaXNpYmlsaXR5QgPgQQISFAoHc3RhcnJlZBgLIAEoCEID4EEDEhQKB2ZvbGRlcnMYDCADKAlCA+BBAyJaCgpWaXNpYmlsaXR5EhoKFlZJU0lCSUxJVFlfVU5TUEVDSUZJRUQQABIQCgxQUk9KRUNUX1JFQUQQARIRCg1QUk9KRUNUX1dSSVRFEAISCwoHUFJJVkFURRADMoAHChBXb3Jrc2hlZXRTZXJ2aWNlEoEBCg9DcmVhdGVXb3Jrc2hlZXQSIy5ieXRlYmFzZS52MS5DcmVhdGVXb3Jrc2hlZXRSZXF1ZXN0GhYuYnl0ZWJhc2UudjEuV29ya3NoZWV0IjHaQQl3b3Jrc2hlZXSQ6jACgtPkkwIbOgl3b3Jrc2hlZXQiDi92MS93b3Jrc2hlZXRzEnQKDEdldFdvcmtzaGVldBIgLmJ5dGViYXNlLnYxLkdldFdvcmtzaGVldFJlcXVlc3QaFi5ieXRlYmFzZS52MS5Xb3Jrc2hlZXQiKtpBBG5hbWWQ6jACgtPkkwIZEhcvdjEve25hbWU9d29ya3NoZWV0cy8qfRKFAQoQU2VhcmNoV29ya3NoZWV0cxIkLmJ5dGViYXNlLnYxLlNlYXJjaFdvcmtzaGVldHNSZXF1ZXN0GiUuYnl0ZWJhc2UudjEuU2VhcmNoV29ya3NoZWV0c1Jlc3BvbnNlIiSQ6jACgtPkkwIaOgEqIhUvdjEvd29ya3NoZWV0czpzZWFyY2gSoAEKD1VwZGF0ZVdvcmtzaGVldBIjLmJ5dGViYXNlLnYxLlVwZGF0ZVdvcmtzaGVldFJlcXVlc3QaFi5ieXRlYmFzZS52MS5Xb3Jrc2hlZXQiUNpBFXdvcmtzaGVldCx1cGRhdGVfbWFza5DqMAKC0+STAi46CXdvcmtzaGVldDIhL3YxL3t3b3Jrc2hlZXQubmFtZT13b3Jrc2hlZXRzLyp9EsoBChhVcGRhdGVXb3Jrc2hlZXRPcmdhbml6ZXISLC5ieXRlYmFzZS52MS5VcGRhdGVXb3Jrc2hlZXRPcmdhbml6ZXJSZXF1ZXN0Gh8uYnl0ZWJhc2UudjEuV29ya3NoZWV0T3JnYW5pemVyIl/aQRVvcmdhbml6ZXIsdXBkYXRlX21hc2uQ6jACgtPkkwI9Oglvcmdhbml6ZXIyMC92MS97b3JnYW5pemVyLndvcmtzaGVldD13b3Jrc2hlZXRzLyp9L29yZ2FuaXplchJ6Cg9EZWxldGVXb3Jrc2hlZXQSIy5ieXRlYmFzZS52MS5EZWxldGVXb3Jrc2hlZXRSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IiraQQRuYW1lkOowAoLT5JMCGSoXL3YxL3tuYW1lPXdvcmtzaGVldHMvKn1CqwEKD2NvbS5ieXRlYmFzZS52MUIVV29ya3NoZWV0U2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_v1_annotation]);
+ fileDesc("Chp2MS93b3Jrc2hlZXRfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEiSAoWQ3JlYXRlV29ya3NoZWV0UmVxdWVzdBIuCgl3b3Jrc2hlZXQYASABKAsyFi5ieXRlYmFzZS52MS5Xb3Jrc2hlZXRCA+BBAiIoChNHZXRXb3Jrc2hlZXRSZXF1ZXN0EhEKBG5hbWUYASABKAlCA+BBAiJ5ChZVcGRhdGVXb3Jrc2hlZXRSZXF1ZXN0Ei4KCXdvcmtzaGVldBgBIAEoCzIWLmJ5dGViYXNlLnYxLldvcmtzaGVldEID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzayJrCiRCYXRjaFVwZGF0ZVdvcmtzaGVldE9yZ2FuaXplclJlcXVlc3QSQwoIcmVxdWVzdHMYASADKAsyLC5ieXRlYmFzZS52MS5VcGRhdGVXb3Jrc2hlZXRPcmdhbml6ZXJSZXF1ZXN0QgPgQQIiZgolQmF0Y2hVcGRhdGVXb3Jrc2hlZXRPcmdhbml6ZXJSZXNwb25zZRI9ChR3b3Jrc2hlZXRfb3JnYW5pemVycxgBIAMoCzIfLmJ5dGViYXNlLnYxLldvcmtzaGVldE9yZ2FuaXplciKiAQofVXBkYXRlV29ya3NoZWV0T3JnYW5pemVyUmVxdWVzdBI3Cglvcmdhbml6ZXIYASABKAsyHy5ieXRlYmFzZS52MS5Xb3Jrc2hlZXRPcmdhbml6ZXJCA+BBAhIvCgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sSFQoNYWxsb3dfbWlzc2luZxgDIAEoCCJOChJXb3Jrc2hlZXRPcmdhbml6ZXISFgoJd29ya3NoZWV0GAEgASgJQgPgQQISDwoHc3RhcnJlZBgCIAEoCBIPCgdmb2xkZXJzGAMgAygJIisKFkRlbGV0ZVdvcmtzaGVldFJlcXVlc3QSEQoEbmFtZRgBIAEoCUID4EECIikKF1NlYXJjaFdvcmtzaGVldHNSZXF1ZXN0Eg4KBmZpbHRlchgBIAEoCSJGChhTZWFyY2hXb3Jrc2hlZXRzUmVzcG9uc2USKgoKd29ya3NoZWV0cxgBIAMoCzIWLmJ5dGViYXNlLnYxLldvcmtzaGVldCLcAwoJV29ya3NoZWV0EhQKBG5hbWUYASABKAlCBuBBAuBBBRIUCgdwcm9qZWN0GAIgASgJQgPgQQISEAoIZGF0YWJhc2UYAyABKAkSGgoFdGl0bGUYBCABKAlCC+BBArpIBXIDGMgBEhQKB2NyZWF0b3IYBSABKAlCA+BBAxI0CgtjcmVhdGVfdGltZRgGIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgHIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIUCgdjb250ZW50GAggASgMQgPgQQISGQoMY29udGVudF9zaXplGAkgASgDQgPgQQMSOgoKdmlzaWJpbGl0eRgKIAEoDjIhLmJ5dGViYXNlLnYxLldvcmtzaGVldC5WaXNpYmlsaXR5QgPgQQISFAoHc3RhcnJlZBgLIAEoCEID4EEDEhQKB2ZvbGRlcnMYDCADKAlCA+BBAyJaCgpWaXNpYmlsaXR5EhoKFlZJU0lCSUxJVFlfVU5TUEVDSUZJRUQQABIQCgxQUk9KRUNUX1JFQUQQARIRCg1QUk9KRUNUX1dSSVRFEAISCwoHUFJJVkFURRADMr4IChBXb3Jrc2hlZXRTZXJ2aWNlEoEBCg9DcmVhdGVXb3Jrc2hlZXQSIy5ieXRlYmFzZS52MS5DcmVhdGVXb3Jrc2hlZXRSZXF1ZXN0GhYuYnl0ZWJhc2UudjEuV29ya3NoZWV0IjHaQQl3b3Jrc2hlZXSQ6jACgtPkkwIbOgl3b3Jrc2hlZXQiDi92MS93b3Jrc2hlZXRzEnQKDEdldFdvcmtzaGVldBIgLmJ5dGViYXNlLnYxLkdldFdvcmtzaGVldFJlcXVlc3QaFi5ieXRlYmFzZS52MS5Xb3Jrc2hlZXQiKtpBBG5hbWWQ6jACgtPkkwIZEhcvdjEve25hbWU9d29ya3NoZWV0cy8qfRKFAQoQU2VhcmNoV29ya3NoZWV0cxIkLmJ5dGViYXNlLnYxLlNlYXJjaFdvcmtzaGVldHNSZXF1ZXN0GiUuYnl0ZWJhc2UudjEuU2VhcmNoV29ya3NoZWV0c1Jlc3BvbnNlIiSQ6jACgtPkkwIaOgEqIhUvdjEvd29ya3NoZWV0czpzZWFyY2gSoAEKD1VwZGF0ZVdvcmtzaGVldBIjLmJ5dGViYXNlLnYxLlVwZGF0ZVdvcmtzaGVldFJlcXVlc3QaFi5ieXRlYmFzZS52MS5Xb3Jrc2hlZXQiUNpBFXdvcmtzaGVldCx1cGRhdGVfbWFza5DqMAKC0+STAi46CXdvcmtzaGVldDIhL3YxL3t3b3Jrc2hlZXQubmFtZT13b3Jrc2hlZXRzLyp9EsoBChhVcGRhdGVXb3Jrc2hlZXRPcmdhbml6ZXISLC5ieXRlYmFzZS52MS5VcGRhdGVXb3Jrc2hlZXRPcmdhbml6ZXJSZXF1ZXN0Gh8uYnl0ZWJhc2UudjEuV29ya3NoZWV0T3JnYW5pemVyIl/aQRVvcmdhbml6ZXIsdXBkYXRlX21hc2uQ6jACgtPkkwI9Oglvcmdhbml6ZXIyMC92MS97b3JnYW5pemVyLndvcmtzaGVldD13b3Jrc2hlZXRzLyp9L29yZ2FuaXplchK7AQodQmF0Y2hVcGRhdGVXb3Jrc2hlZXRPcmdhbml6ZXISMS5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZVdvcmtzaGVldE9yZ2FuaXplclJlcXVlc3QaMi5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZVdvcmtzaGVldE9yZ2FuaXplclJlc3BvbnNlIjOQ6jACgtPkkwIpOgEqMiQvdjEvd29ya3NoZWV0cy9vcmdhbml6ZXI6YmF0Y2hVcGRhdGUSegoPRGVsZXRlV29ya3NoZWV0EiMuYnl0ZWJhc2UudjEuRGVsZXRlV29ya3NoZWV0UmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSIq2kEEbmFtZZDqMAKC0+STAhkqFy92MS97bmFtZT13b3Jrc2hlZXRzLyp9QqsBCg9jb20uYnl0ZWJhc2UudjFCFVdvcmtzaGVldFNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_v1_annotation]);
/**
* Describes the message bytebase.v1.CreateWorksheetRequest.
@@ -37,53 +37,67 @@ export const GetWorksheetRequestSchema = /*@__PURE__*/
export const UpdateWorksheetRequestSchema = /*@__PURE__*/
messageDesc(file_v1_worksheet_service, 2);
+/**
+ * Describes the message bytebase.v1.BatchUpdateWorksheetOrganizerRequest.
+ * Use `create(BatchUpdateWorksheetOrganizerRequestSchema)` to create a new message.
+ */
+export const BatchUpdateWorksheetOrganizerRequestSchema = /*@__PURE__*/
+ messageDesc(file_v1_worksheet_service, 3);
+
+/**
+ * Describes the message bytebase.v1.BatchUpdateWorksheetOrganizerResponse.
+ * Use `create(BatchUpdateWorksheetOrganizerResponseSchema)` to create a new message.
+ */
+export const BatchUpdateWorksheetOrganizerResponseSchema = /*@__PURE__*/
+ messageDesc(file_v1_worksheet_service, 4);
+
/**
* Describes the message bytebase.v1.UpdateWorksheetOrganizerRequest.
* Use `create(UpdateWorksheetOrganizerRequestSchema)` to create a new message.
*/
export const UpdateWorksheetOrganizerRequestSchema = /*@__PURE__*/
- messageDesc(file_v1_worksheet_service, 3);
+ messageDesc(file_v1_worksheet_service, 5);
/**
* Describes the message bytebase.v1.WorksheetOrganizer.
* Use `create(WorksheetOrganizerSchema)` to create a new message.
*/
export const WorksheetOrganizerSchema = /*@__PURE__*/
- messageDesc(file_v1_worksheet_service, 4);
+ messageDesc(file_v1_worksheet_service, 6);
/**
* Describes the message bytebase.v1.DeleteWorksheetRequest.
* Use `create(DeleteWorksheetRequestSchema)` to create a new message.
*/
export const DeleteWorksheetRequestSchema = /*@__PURE__*/
- messageDesc(file_v1_worksheet_service, 5);
+ messageDesc(file_v1_worksheet_service, 7);
/**
* Describes the message bytebase.v1.SearchWorksheetsRequest.
* Use `create(SearchWorksheetsRequestSchema)` to create a new message.
*/
export const SearchWorksheetsRequestSchema = /*@__PURE__*/
- messageDesc(file_v1_worksheet_service, 6);
+ messageDesc(file_v1_worksheet_service, 8);
/**
* Describes the message bytebase.v1.SearchWorksheetsResponse.
* Use `create(SearchWorksheetsResponseSchema)` to create a new message.
*/
export const SearchWorksheetsResponseSchema = /*@__PURE__*/
- messageDesc(file_v1_worksheet_service, 7);
+ messageDesc(file_v1_worksheet_service, 9);
/**
* Describes the message bytebase.v1.Worksheet.
* Use `create(WorksheetSchema)` to create a new message.
*/
export const WorksheetSchema = /*@__PURE__*/
- messageDesc(file_v1_worksheet_service, 8);
+ messageDesc(file_v1_worksheet_service, 10);
/**
* Describes the enum bytebase.v1.Worksheet.Visibility.
*/
export const Worksheet_VisibilitySchema = /*@__PURE__*/
- enumDesc(file_v1_worksheet_service, 8, 0);
+ enumDesc(file_v1_worksheet_service, 10, 0);
/**
* @generated from enum bytebase.v1.Worksheet.Visibility
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/FilterMenuItem.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/FilterMenuItem.vue
new file mode 100644
index 0000000000..7fe369a9ad
--- /dev/null
+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/FilterMenuItem.vue
@@ -0,0 +1,25 @@
+<template>
+ <div class="menu-item">
+ <div class="flex flex-row items-center gap-x-4 justify-between">
+ <span>{{ label }}</span>
+ <NSwitch size="small" :value="value" @update:value="handleUpdate" />
+ </div>
+ </div>
+</template>
+
+<script setup lang="ts">
+import { NSwitch } from "naive-ui";
+
+defineProps<{
+ label: string;
+ value: boolean;
+}>();
+
+const emit = defineEmits<{
+ "update:value": [value: boolean];
+}>();
+
+const handleUpdate = (val: boolean) => {
+ emit("update:value", val);
+};
+</script>
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/AbstractListItem.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/AbstractListItem.vue
deleted file mode 100644
index 937c4841af..0000000000
--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/AbstractListItem.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
- <div
- class="flex flex-row items-center overflow-hidden gap-x-1 p-1 mx-1 rounded-sm hover:bg-accent/5 cursor-pointer"
- :class="[selected && 'bg-accent/10!']"
- >
- <FileCodeIcon class="w-4 h-4" />
- <div class="flex-1 flex flex-row items-center truncate">
- <NPerformantEllipsis>
- <!-- eslint-disable-next-line vue/no-v-html -->
- <span v-html="renderedTitle" />
- </NPerformantEllipsis>
- </div>
- <div class="shrink-0 flex flex-row items-center" @click.stop.prevent="">
- <slot name="suffix" />
- </div>
- </div>
-</template>
-
-<script setup lang="ts">
-import { FileCodeIcon } from "lucide-vue-next";
-import { NPerformantEllipsis } from "naive-ui";
-import { computed } from "vue";
-import { titleHTML } from "./common";
-
-const props = defineProps<{
- title: string;
- selected?: boolean;
- keyword?: string;
-}>();
-
-const renderedTitle = computed(() => {
- return titleHTML(props.title, props.keyword ?? "");
-});
-</script>
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/DraftList.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/DraftList.vue
deleted file mode 100644
index c3db77c390..0000000000
--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/DraftList.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
- <div class="flex flex-col items-stretch gap-y-1">
- <DraftListItem
- v-for="draft in draftList"
- :key="draft.id"
- :draft="draft"
- :keyword="keyword"
- />
-
- <div
- v-if="draftList.length === 0"
- class="p-2 pl-7 text-control-placeholder"
- >
- {{ $t("common.no-data") }}
- </div>
- </div>
-</template>
-
-<script setup lang="ts">
-import { computed, onMounted } from "vue";
-import { useSQLEditorTabStore } from "@/store";
-import DraftListItem from "./DraftListItem.vue";
-
-const props = defineProps<{
- keyword?: string;
-}>();
-
-const emit = defineEmits<{
- (event: "ready"): void;
-}>();
-
-const tabStore = useSQLEditorTabStore();
-
-const draftList = computed(() => {
- const tabList = tabStore.tabList.filter((tab) => !tab.worksheet);
- const keyword = (props.keyword ?? "").trim().toLowerCase();
- const filteredList = keyword
- ? tabList.filter((tab) => tab.title.toLowerCase().includes(keyword))
- : tabList;
- return filteredList;
-});
-
-onMounted(() => {
- emit("ready");
-});
-</script>
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/DraftListItem.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/DraftListItem.vue
deleted file mode 100644
index 45cf39c91b..0000000000
--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/DraftListItem.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
- <AbstractListItem
- :title="draft.title"
- :selected="selected"
- :data-item-key="keyForDraft(draft)"
- :keyword="keyword"
- @click="handleClick"
- >
- <template #suffix></template>
- </AbstractListItem>
-</template>
-
-<script setup lang="ts">
-import { computed } from "vue";
-import { useSQLEditorTabStore } from "@/store";
-import type { SQLEditorTab } from "@/types";
-import { keyForDraft } from "../common";
-import AbstractListItem from "./AbstractListItem.vue";
-
-const props = defineProps<{
- draft: SQLEditorTab;
- keyword?: string;
-}>();
-
-const tabStore = useSQLEditorTabStore();
-
-const selected = computed(() => {
- const tab = tabStore.currentTab;
-
- return tab?.id === props.draft.id;
-});
-
-const handleClick = () => {
- tabStore.setCurrentTabId(props.draft.id);
-};
-</script>
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/DraftTree.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/DraftTree.vue
new file mode 100644
index 0000000000..6d7d722ba7
--- /dev/null
+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/DraftTree.vue
@@ -0,0 +1,222 @@
+<template>
+ <div class="flex flex-col items-stretch gap-y-1 relative worksheet-tree">
+ <NTree
+ block-line
+ :keyboard="false"
+ :data="[treeNode]"
+ :multiple="false"
+ :show-irrelevant-nodes="false"
+ :filter="filterNode(rootPath)"
+ :pattern="keyword"
+ :render-prefix="renderPrefix"
+ :render-suffix="renderSuffix"
+ :render-label="renderLabel"
+ :node-props="nodeProps"
+ :selected-keys="selectedKeys"
+ :expanded-keys="expandedKeysArray"
+ :override-default-node-click-behavior="overrideNodeClickBehavior"
+ @update:expanded-keys="(keys: string[]) => expandedKeys = new Set(keys)"
+ />
+ </div>
+</template>
+
+<script lang="tsx" setup>
+import {
+ XIcon,
+ FolderPenIcon,
+ FilePenIcon,
+ FolderOpenIcon,
+} from "lucide-vue-next";
+import {
+ NTree,
+ type TreeOption,
+ type TreeOverrideNodeClickBehavior,
+} from "naive-ui";
+import { ref, computed, watch } from "vue";
+import { HighlightLabelText } from "@/components/v2";
+import { t } from "@/plugins/i18n";
+import {
+ useSQLEditorTabStore,
+ useCurrentUserV1,
+ useTabViewStateStore,
+} from "@/store";
+import { isDescendantOf, useDynamicLocalStorage } from "@/utils";
+import { filterNode } from "./common";
+
+// TODO(ed): can we deprecate the DraftTree and use the SheetTree & useSheetTreeByView instead?
+interface DraftWorsheetNode extends TreeOption {
+ key: string;
+ label: string;
+ draftId?: string;
+ children?: DraftWorsheetNode[];
+}
+
+const props = defineProps<{
+ keyword: string;
+}>();
+
+const rootPath = computed(() => "/draft");
+const tabStore = useSQLEditorTabStore();
+const me = useCurrentUserV1();
+const { removeViewState } = useTabViewStateStore();
+const selectedKeys = ref<string[]>([]);
+const expandedKeys = useDynamicLocalStorage<Set<string>>(
+ computed(
+ () => `bb.sql-editor.worksheet-tree-expand-keys.draft.${me.value.name}`
+ ),
+ new Set([rootPath.value])
+);
+
+// Convert Set to Array once per render cycle instead of spreading in template
+const expandedKeysArray = computed(() => Array.from(expandedKeys.value));
+
+const overrideNodeClickBehavior: TreeOverrideNodeClickBehavior = ({
+ option,
+}) => {
+ if (option.children) {
+ return "toggleExpand";
+ }
+ return "default";
+};
+
+const keyForDraft = (tab: { id: string }) => {
+ return `bb-worksheet-list-draft-${tab.id}`;
+};
+
+// Extract only tree-relevant properties to avoid rebuilding on unrelated changes
+// (e.g., statement, status, connection changes should NOT trigger rebuild)
+const draftTreeData = computed(() => {
+ return tabStore.tabList
+ .filter((tab) => !tab.worksheet)
+ .map((tab) => ({
+ id: tab.id,
+ title: tab.title,
+ worksheet: tab.worksheet, // Track to detect when draft becomes saved
+ }));
+});
+
+const treeNode = computed((): DraftWorsheetNode => {
+ return {
+ isLeaf: false,
+ key: rootPath.value,
+ label: t("common.draft"),
+ children: draftTreeData.value.map((draftData) => {
+ return {
+ isLeaf: true,
+ key: keyForDraft({ id: draftData.id }),
+ label: draftData.title,
+ draftId: draftData.id,
+ };
+ }),
+ };
+});
+
+const renderPrefix = ({ option }: { option: TreeOption }) => {
+ const node = option as DraftWorsheetNode;
+ if (node.draftId) {
+ // the node is file
+ return <FilePenIcon class="w-4 h-auto text-gray-600" />;
+ }
+ if (expandedKeys.value.has(node.key)) {
+ // is opened folder
+ return <FolderOpenIcon class="w-4 h-auto text-gray-600" />;
+ }
+ return <FolderPenIcon class="w-4 h-auto text-gray-600" />;
+};
+
+const renderSuffix = ({ option }: { option: TreeOption }) => {
+ const node = option as DraftWorsheetNode;
+ if (!node.draftId) {
+ return null;
+ }
+
+ return (
+ <XIcon
+ class="w-4 h-auto text-gray-600"
+ onClick={() => {
+ if (node.draftId) {
+ const draft = tabStore.tabList.find((t) => t.id === node.draftId);
+ if (draft) {
+ tabStore.removeTab(draft);
+ }
+ removeViewState(node.draftId);
+ }
+ }}
+ />
+ );
+};
+
+const renderLabel = ({ option }: { option: TreeOption }) => {
+ const node = option as DraftWorsheetNode;
+ return <HighlightLabelText text={node.label} keyword={props.keyword} />;
+};
+
+const nodeProps = ({ option }: { option: TreeOption }) => {
+ const node = option as DraftWorsheetNode;
+ return {
+ "data-item-key": node.key,
+ onClick(e: MouseEvent) {
+ if (
+ !isDescendantOf(e.target as Element, ".n-tree-node-content__text") &&
+ !isDescendantOf(e.target as Element, ".n-tree-node-content__prefix")
+ ) {
+ return;
+ }
+ if (node.draftId) {
+ tabStore.setCurrentTabId(node.draftId);
+ }
+ },
+ };
+};
+
+watch(
+ () => ({
+ id: tabStore.currentTab?.id,
+ worksheet: tabStore.currentTab?.worksheet,
+ }),
+ ({ id, worksheet }) => {
+ selectedKeys.value = [];
+ if (!id) {
+ return;
+ }
+ if (worksheet) {
+ return;
+ }
+ const key = keyForDraft({ id });
+ selectedKeys.value = [key];
+ expandedKeys.value.add(rootPath.value);
+ },
+ { immediate: true }
+);
+</script>
+
+<style lang="postcss" scoped>
+.worksheet-tree :deep(.n-tree .v-vl) {
+ --n-node-content-height: 21px !important;
+}
+.worksheet-tree :deep(.n-tree-node-content) {
+ padding-left: 0 !important;
+ padding-right: 1rem !important;
+ font-size: 0.875rem;
+ line-height: 1.25rem;
+ flex: 1;
+}
+.worksheet-tree :deep(.n-tree-node-wrapper) {
+ padding: 0;
+}
+.worksheet-tree :deep(.n-tree-node-switcher--hide) {
+ width: 0.5rem !important;
+}
+.worksheet-tree :deep(.n-tree-node-content__prefix) {
+ flex-shrink: 0;
+}
+.worksheet-tree :deep(.n-tree-node-content__suffix) {
+ flex-shrink: 0;
+}
+.worksheet-tree :deep(.n-tree-node-content__text) {
+ overflow: hidden;
+ flex: 1;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+</style>
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetList.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetList.vue
deleted file mode 100644
index e1c03dc341..0000000000
--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetList.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-<template>
- <div class="flex flex-col items-stretch gap-y-1">
- <div v-if="isLoading" class="p-2 pl-7">
- <BBSpin :size="16" />
- </div>
-
- <SheetListItem
- v-for="worksheet in sortedWorksheetList"
- :key="worksheet.name"
- :view="view"
- :worksheet="worksheet"
- :keyword="keyword"
- />
-
- <div
- v-if="!isLoading && sortedWorksheetList.length === 0"
- class="p-2 pl-7 text-control-placeholder"
- >
- {{ $t("common.no-data") }}
- </div>
- </div>
-</template>
-
-<script setup lang="ts">
-import { orderBy } from "lodash-es";
-import { computed, nextTick, watch } from "vue";
-import { BBSpin } from "@/bbkit";
-import { useDatabaseV1Store } from "@/store";
-import { isValidDatabaseName } from "@/types";
-import {
- useSheetContextByView,
- type SheetViewMode,
-} from "@/views/sql-editor/Sheet";
-import SheetListItem from "./SheetListItem.vue";
-
-const props = defineProps<{
- view: SheetViewMode;
- keyword?: string;
-}>();
-
-const emit = defineEmits<{
- (event: "ready"): void;
-}>();
-
-const { isInitialized, isLoading, sheetList, fetchSheetList } =
- useSheetContextByView(props.view);
-const databaseStore = useDatabaseV1Store();
-
-const filteredWorksheetList = computed(() => {
- let sheets = sheetList.value;
-
- // Filter by keyword.
- const keyword = (props.keyword ?? "").trim().toLowerCase();
- if (keyword) {
- sheets = sheets.filter((worksheet) =>
- worksheet.title.toLowerCase().includes(keyword)
- );
- }
-
- return sheets;
-});
-
-const sortedWorksheetList = computed(() => {
- return orderBy(
- filteredWorksheetList.value,
- [
- // Unconnected sheets go behind
- (worksheet) => {
- if (!worksheet.database) {
- return Number.MAX_VALUE;
- }
- const db = databaseStore.getDatabaseByName(worksheet.database);
- if (!isValidDatabaseName(db.name)) {
- return Number.MAX_VALUE;
- }
- return 1;
- },
- // Alphabetically by default
- (item) => item.title,
- ],
- ["asc", "asc"]
- );
-});
-
-watch(
- isInitialized,
- async () => {
- if (!isInitialized.value) {
- await fetchSheetList();
- await nextTick();
- emit("ready");
- }
- },
- { immediate: true }
-);
-</script>
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetListItem.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetListItem.vue
deleted file mode 100644
index acc5ea9196..0000000000
--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetListItem.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<template>
- <AbstractListItem
- :title="worksheet.title"
- :selected="selected"
- :keyword="keyword"
- :data-item-key="keyForWorksheet(worksheet)"
- @click="handleClick"
- >
- <template #suffix>
- <Dropdown
- :sheet="worksheet"
- :view="props.view"
- :secondary="true"
- :unsaved="unsaved"
- />
- </template>
- </AbstractListItem>
-</template>
-
-<script setup lang="ts">
-import { computed } from "vue";
-import { useSQLEditorTabStore } from "@/store";
-import type { Worksheet } from "@/types/proto-es/v1/worksheet_service_pb";
-import type { SheetViewMode } from "@/views/sql-editor/Sheet";
-import {
- Dropdown,
- openWorksheetByName,
- useSheetContext,
-} from "@/views/sql-editor/Sheet";
-import { useSQLEditorContext } from "@/views/sql-editor/context";
-import { keyForWorksheet } from "../common";
-import AbstractListItem from "./AbstractListItem.vue";
-
-const props = defineProps<{
- view: SheetViewMode;
- worksheet: Worksheet;
- keyword?: string;
-}>();
-
-const tabStore = useSQLEditorTabStore();
-const editorContext = useSQLEditorContext();
-const worksheetContext = useSheetContext();
-
-const unsaved = computed(() => {
- const tab = tabStore.tabList.find(
- (tab) => tab.worksheet === props.worksheet.name
- );
-
- return tab && (tab.status === "DIRTY" || tab.status === "NEW");
-});
-
-const selected = computed(() => {
- const tab = tabStore.currentTab;
-
- return tab?.worksheet === props.worksheet.name;
-});
-
-const handleClick = (e: MouseEvent) => {
- openWorksheetByName(
- props.worksheet.name,
- editorContext,
- worksheetContext,
- e.metaKey || e.ctrlKey
- );
-};
-</script>
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue
new file mode 100644
index 0000000000..b9b847c3c6
--- /dev/null
+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue
@@ -0,0 +1,786 @@
+<template>
+ <div class="flex flex-col items-stretch gap-y-1 relative worksheet-tree">
+ <div v-if="isLoading" class="p-2 pl-7">
+ <BBSpin :size="16" />
+ </div>
+
+ <!-- TODO(ed): do we need to support batch operations? -->
+ <!-- For example, batch select worksheets then move the folder or delete -->
+ <NTree
+ v-else
+ block-line
+ :keyboard="false"
+ :draggable="!editingNode"
+ :data="[sheetTree]"
+ :multiple="false"
+ :show-irrelevant-nodes="false"
+ :filter="filterNode(folderContext.rootPath.value)"
+ :pattern="worksheetFilter.keyword"
+ :render-suffix="renderSuffix"
+ :render-prefix="renderPrefix"
+ :render-label="renderLabel"
+ :node-props="nodeProps"
+ :expanded-keys="expandedKeysArray"
+ :selected-keys="selectedKeys"
+ @drop="handleDrop"
+ @update:expanded-keys="(keys: string[]) => expandedKeys = new Set(keys)"
+ />
+
+ <NDropdown
+ class="worksheet-menu"
+ trigger="manual"
+ placement="bottom-start"
+ :show="contextMenuContext.showDropdown"
+ :options="contextMenuOptions"
+ :x="contextMenuContext.position.x"
+ :y="contextMenuContext.position.y"
+ @select="handleContextMenuSelect"
+ @clickoutside="handleContextMenuClickOutside"
+ />
+
+ <NPopover
+ trigger="manual"
+ placement="bottom-start"
+ :show-arrow="true"
+ :disabled="false"
+ :show="contextMenuContext.showSharePanel"
+ :x="contextMenuContext.position.x"
+ :y="contextMenuContext.position.y"
+ @clickoutside="handleContextMenuClickOutside"
+ >
+ <SharePopover
+ :worksheet="contextMenuContext.node?.worksheet"
+ @on-updated="handleContextMenuClickOutside"
+ />
+ </NPopover>
+ </div>
+</template>
+
+<script setup lang="tsx">
+import { create } from "@bufbuild/protobuf";
+import { useDebounceFn } from "@vueuse/core";
+import {
+ NTree,
+ NInput,
+ NDropdown,
+ NPopover,
+ useDialog,
+ type TreeOption,
+ type TreeDropInfo,
+ type DialogReactive,
+} from "naive-ui";
+import { storeToRefs } from "pinia";
+import { nextTick, watch, computed } from "vue";
+import { BBSpin } from "@/bbkit";
+import { HighlightLabelText } from "@/components/v2";
+import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";
+import { t } from "@/plugins/i18n";
+import {
+ useSQLEditorTabStore,
+ useSQLEditorStore,
+ useWorkSheetStore,
+ pushNotification,
+ useTabViewStateStore,
+} from "@/store";
+import { DEBOUNCE_SEARCH_DELAY } from "@/types";
+import {
+ WorksheetSchema,
+ Worksheet_Visibility,
+ type Worksheet,
+} from "@/types/proto-es/v1/worksheet_service_pb";
+import { isDescendantOf, defer } from "@/utils";
+import SharePopover from "@/views/sql-editor/EditorCommon/SharePopover.vue";
+import {
+ useSheetContextByView,
+ type SheetViewMode,
+ type WorsheetFolderNode,
+ openWorksheetByName,
+ useSheetContext,
+ revealWorksheets,
+} from "@/views/sql-editor/Sheet";
+import { useSQLEditorContext } from "@/views/sql-editor/context";
+import { TreeNodePrefix, TreeNodeSuffix } from "./TreeNodeRenders";
+import { filterNode } from "./common";
+import { useDropdown, type DropdownOptionType } from "./dropdown";
+
+const props = defineProps<{
+ view: SheetViewMode;
+}>();
+
+const worksheetV1Store = useWorkSheetStore();
+const { project } = storeToRefs(useSQLEditorStore());
+const editorContext = useSQLEditorContext();
+const {
+ filter: worksheetFilter,
+ selectedKeys,
+ expandedKeys,
+ editingNode,
+ isWorksheetCreator,
+ batchUpdateWorksheetFolders,
+} = useSheetContext();
+const {
+ events,
+ isInitialized,
+ isLoading,
+ sheetTree,
+ fetchSheetList,
+ folderContext,
+ getFoldersForWorksheet,
+} = useSheetContextByView(props.view);
+const $dialog = useDialog();
+const { removeViewState } = useTabViewStateStore();
+const tabStore = useSQLEditorTabStore();
+
+const {
+ context: contextMenuContext,
+ options: contextMenuOptions,
+ handleSharePanelShow,
+ handleMenuShow,
+ handleClickOutside: handleContextMenuClickOutside,
+} = useDropdown();
+
+const expandedKeysArray = computed(() => Array.from(expandedKeys.value));
+
+watch(
+ isInitialized,
+ async () => {
+ if (!isInitialized.value) {
+ await fetchSheetList(project.value);
+ }
+ },
+ { immediate: true }
+);
+
+watch(
+ () => project.value,
+ () => {
+ isInitialized.value = false;
+ }
+);
+
+const handleWorksheetToggleStar = useDebounceFn(
+ async (worksheet: Worksheet) => {
+ const starred = !worksheet.starred;
+ await worksheetV1Store.upsertWorksheetOrganizer(
+ {
+ worksheet: worksheet.name,
+ starred,
+ folders: worksheet.folders,
+ },
+ ["starred"]
+ );
+ worksheet.starred = starred;
+ },
+ DEBOUNCE_SEARCH_DELAY
+);
+
+const renderPrefix = ({ option }: { option: TreeOption }) => {
+ const node = option as WorsheetFolderNode;
+ return (
+ <TreeNodePrefix
+ node={node}
+ expandedKeys={expandedKeys.value}
+ rootPath={folderContext.rootPath.value}
+ view={props.view}
+ />
+ );
+};
+
+const renderSuffix = ({ option }: { option: TreeOption }) => {
+ const node = option as WorsheetFolderNode;
+ return (
+ <TreeNodeSuffix
+ node={node}
+ isWorksheetCreator={isWorksheetCreator}
+ onSharePanelShow={handleSharePanelShow}
+ onContextMenuShow={handleMenuShow}
+ onToggleStar={handleWorksheetToggleStar}
+ />
+ );
+};
+
+const handleRenameNode = useDebounceFn(async () => {
+ if (!editingNode.value) {
+ return;
+ }
+
+ const cleanup = () => {
+ nextTick(() => (editingNode.value = undefined));
+ };
+
+ const newTitle = editingNode.value.node.label.trim();
+ if (!newTitle) {
+ editingNode.value.node.label = editingNode.value.rawLabel;
+ return cleanup();
+ }
+
+ const newKey = [
+ ...editingNode.value.node.key.split("/").slice(0, -1),
+ newTitle,
+ ].join("/");
+ if (newKey === editingNode.value.node.key) {
+ editingNode.value = undefined;
+ return;
+ }
+
+ if (editingNode.value.node.worksheet) {
+ editingNode.value.node.worksheet.title = newTitle;
+ await worksheetV1Store.patchWorksheet(editingNode.value.node.worksheet, [
+ "title",
+ ]);
+
+ // update tab title
+ const tab = tabStore.tabList.find(
+ (t) => t.worksheet === editingNode.value?.node.worksheet?.name
+ );
+ if (tab) {
+ tabStore.updateTab(tab.id, {
+ title: newTitle,
+ });
+ }
+
+ cleanup();
+ } else {
+ const editing = editingNode.value;
+ const moveFolder = async () => {
+ await updateWorksheetFolders(editing.node, editing.node.key, newKey);
+ replaceExpandedKeys(editing.node.key, newKey);
+ folderContext.moveFolder(editing.node.key, newKey);
+ cleanup();
+ };
+
+ const parentNode = findParentNode(
+ sheetTree.value,
+ editingNode.value.node.key
+ );
+ const merge = await handleDuplicateFolderName(parentNode, newKey);
+ if (merge) {
+ await moveFolder();
+ } else {
+ editing.node.label = editing.rawLabel;
+ cleanup();
+ }
+ }
+}, DEBOUNCE_SEARCH_DELAY);
+
+const renderLabel = ({ option }: { option: TreeOption }) => {
+ const node = option as WorsheetFolderNode;
+
+ if (editingNode.value && editingNode.value.node.key === node.key) {
+ return (
+ <NInput
+ value={editingNode.value.node.label}
+ size="small"
+ class="flex-1"
+ inputProps={{
+ // the autofocus not always work,
+ // so we need to set the id for input and use the document.getElementById API
+ id: `input-${editingNode.value.node.key}`,
+ }}
+ autofocus={true}
+ onBlur={async () => {
+ await handleRenameNode();
+ }}
+ onKeyup={async (e: KeyboardEvent) => {
+ if (e.key === "Enter") {
+ await handleRenameNode();
+ }
+ }}
+ onInput={(val: string) => {
+ if (!editingNode.value) {
+ return;
+ }
+ if (val.includes("/")) {
+ return;
+ }
+ editingNode.value.node.label = val;
+ }}
+ />
+ );
+ }
+
+ return (
+ <HighlightLabelText
+ text={node.label}
+ keyword={worksheetFilter.value.keyword}
+ />
+ );
+};
+
+const nodeProps = ({ option }: { option: TreeOption }) => {
+ const node = option as WorsheetFolderNode;
+
+ return {
+ "data-item-key": node.key,
+ onClick(e: MouseEvent) {
+ if (
+ !isDescendantOf(e.target as Element, ".n-tree-node-content__text") &&
+ !isDescendantOf(e.target as Element, ".n-tree-node-content__prefix")
+ ) {
+ return;
+ }
+ if (editingNode.value) {
+ return;
+ }
+ if (node.worksheet) {
+ selectedKeys.value = [node.key];
+ openWorksheetByName(
+ node.worksheet.name,
+ editorContext,
+ e.metaKey || e.ctrlKey
+ );
+ } else {
+ if (expandedKeys.value.has(node.key)) {
+ expandedKeys.value.delete(node.key);
+ } else {
+ expandedKeys.value.add(node.key);
+ }
+ }
+ },
+ };
+};
+
+const deleteWorksheets = async (worksheets: Worksheet[]) => {
+ await Promise.all(
+ worksheets.map((worksheet) =>
+ worksheetV1Store.deleteWorksheetByName(worksheet.name)
+ )
+ );
+ for (const worksheet of worksheets) {
+ const tab = tabStore.tabList.find(
+ (tab) => tab.worksheet === worksheet.name
+ );
+ if (tab) {
+ tabStore.removeTab(tab);
+ removeViewState(tab.id);
+ }
+ }
+};
+
+const handleDeleteFolder = (node: WorsheetFolderNode) => {
+ const worksheets = revealWorksheets(node, (node) => node.worksheet);
+ if (worksheets.length === 0) {
+ folderContext.removeFolder(node.key);
+ } else {
+ const dialogInstance = $dialog.create({
+ title: t("sheet.hint-tips.non-empty-folder-title"),
+ content: t("sheet.hint-tips.non-empty-folder-content"),
+ type: "warning",
+ autoFocus: false,
+ closable: true,
+ maskClosable: true,
+ closeOnEsc: true,
+ negativeText: t("sheet.hint-tips.delete-all-sheets"),
+ negativeButtonProps: {
+ type: "error",
+ },
+ onNegativeClick: async () => {
+ dialogInstance.loading = true;
+ await deleteWorksheets(worksheets);
+ folderContext.removeFolder(node.key);
+ dialogInstance.destroy();
+ },
+ positiveText: t("sheet.hint-tips.move-to-root-folder"),
+ onPositiveClick: async () => {
+ dialogInstance.loading = true;
+ await batchUpdateWorksheetFolders(
+ worksheets.map((worksheet) => ({
+ ...worksheet,
+ folders: [],
+ }))
+ );
+ folderContext.removeFolder(node.key);
+ dialogInstance.destroy();
+ },
+ showIcon: false,
+ onClose() {
+ dialogInstance.destroy();
+ },
+ });
+ }
+};
+
+const handleDeleteSheet = (worksheet: Worksheet) => {
+ const cleanup = (dialogInstance: DialogReactive | undefined) => {
+ dialogInstance?.destroy();
+ };
+
+ const dialogInstance = $dialog.create({
+ title: t("sheet.hint-tips.confirm-to-delete-sheet-title"),
+ type: "error",
+ autoFocus: false,
+ closable: true,
+ maskClosable: true,
+ closeOnEsc: true,
+ async onPositiveClick() {
+ dialogInstance.loading = true;
+ await deleteWorksheets([worksheet]);
+ cleanup(dialogInstance);
+ },
+ onNegativeClick() {
+ cleanup(dialogInstance);
+ },
+ onClose() {
+ cleanup(dialogInstance);
+ },
+ negativeText: t("common.cancel"),
+ positiveText: t("common.delete"),
+ showIcon: false,
+ });
+};
+
+const handleDuplicateSheet = async (worksheet: Worksheet) => {
+ const dialogInstance = $dialog.create({
+ title: t("sheet.hint-tips.confirm-to-duplicate-sheet"),
+ type: "info",
+ autoFocus: false,
+ closable: true,
+ maskClosable: true,
+ closeOnEsc: true,
+ async onPositiveClick() {
+ dialogInstance.loading = true;
+ const newWorksheet = await worksheetV1Store.createWorksheet(
+ create(WorksheetSchema, {
+ title: worksheet.title,
+ project: worksheet.project,
+ content: worksheet.content,
+ database: worksheet.database,
+ visibility: Worksheet_Visibility.PRIVATE,
+ })
+ );
+ const isCreator = isWorksheetCreator(worksheet);
+ if (isCreator) {
+ await worksheetV1Store.upsertWorksheetOrganizer(
+ {
+ worksheet: newWorksheet.name,
+ folders: worksheet.folders,
+ starred: false,
+ },
+ ["folders"]
+ );
+ }
+ pushNotification({
+ module: "bytebase",
+ style: "INFO",
+ title: t("sheet.notifications.duplicate-success"),
+ });
+ dialogInstance.destroy();
+ },
+ onNegativeClick() {
+ dialogInstance.destroy();
+ },
+ negativeText: t("common.cancel"),
+ positiveText: t("common.confirm"),
+ onClose() {
+ dialogInstance.destroy();
+ },
+ showIcon: false,
+ });
+};
+
+const handleFocusInput = () => {
+ nextTick(() => {
+ const input = document.getElementById(
+ `input-${editingNode.value?.node.key}`
+ ) as HTMLInputElement;
+ input?.focus();
+ input?.select();
+ });
+};
+
+useEmitteryEventListener(events, "on-built", ({ viewMode }) => {
+ if (viewMode !== props.view) {
+ return;
+ }
+ if (!editingNode.value) {
+ return;
+ }
+ handleFocusInput();
+});
+
+// Generate unique folder name based on existing children
+// Returns "new folder", "new folder2", "new folder3", etc.
+// Optimized: children are already sorted, so iterate in reverse to find max quickly
+const generateNewFolderName = (children: WorsheetFolderNode[]): string => {
+ const baseName = "new folder";
+ const regex = /^new folder(\d+)$/;
+
+ // Since children are sorted alphabetically, iterate in reverse
+ // to find the highest numbered "new folder" variant quickly
+ let maxNumber = 0;
+ for (let i = children.length - 1; i >= 0; i--) {
+ const child = children[i];
+
+ // Skip worksheets, only check folders
+ if (child.worksheet) {
+ continue;
+ }
+
+ const match = child.label.match(regex);
+ if (match) {
+ // Found highest numbered folder, can exit early
+ maxNumber = parseInt(match[1], 10);
+ break;
+ } else if (child.label === baseName) {
+ maxNumber = 1;
+ break;
+ } else if (child.label < baseName) {
+ // Since sorted, if we're past "new folder" alphabetically, we can stop
+ break;
+ }
+ }
+
+ return maxNumber === 0 ? baseName : `${baseName}${maxNumber + 1}`;
+};
+
+const handleContextMenuSelect = async (key: DropdownOptionType) => {
+ if (!contextMenuContext.node) {
+ return;
+ }
+
+ switch (key) {
+ case "share":
+ contextMenuContext.showSharePanel = true;
+ return;
+ case "rename":
+ editingNode.value = {
+ node: contextMenuContext.node,
+ rawLabel: contextMenuContext.node.label,
+ };
+ handleFocusInput();
+ break;
+ case "delete":
+ if (contextMenuContext.node.worksheet) {
+ handleDeleteSheet(contextMenuContext.node.worksheet);
+ } else {
+ handleDeleteFolder(contextMenuContext.node);
+ }
+ break;
+ case "duplicate":
+ if (contextMenuContext.node.worksheet) {
+ handleDuplicateSheet(contextMenuContext.node.worksheet);
+ }
+ break;
+ case "add-folder":
+ expandedKeys.value.add(contextMenuContext.node.key);
+ const label = generateNewFolderName(contextMenuContext.node.children);
+ const newPath = folderContext.addFolder(
+ `${contextMenuContext.node.key}/${label}`
+ );
+ editingNode.value = {
+ node: {
+ key: newPath,
+ editable: true,
+ label,
+ children: [],
+ },
+ rawLabel: label,
+ };
+ break;
+ case "add-worksheet":
+ const newWorksheet = await worksheetV1Store.createWorksheet(
+ create(WorksheetSchema, {
+ title: "new worksheet",
+ project: project.value,
+ visibility:
+ props.view === "shared"
+ ? Worksheet_Visibility.PROJECT_READ
+ : Worksheet_Visibility.PRIVATE,
+ })
+ );
+ const folders = contextMenuContext.node.key
+ .replace(folderContext.rootPath.value, "")
+ .split("/")
+ .filter((p) => p);
+ await worksheetV1Store.upsertWorksheetOrganizer(
+ {
+ worksheet: newWorksheet.name,
+ starred: false,
+ folders,
+ },
+ ["folders"]
+ );
+
+ nextTick(() => {
+ openWorksheetByName(newWorksheet.name, editorContext, true);
+ editorContext.showConnectionPanel.value = true;
+ });
+ break;
+ default:
+ break;
+ }
+ handleContextMenuClickOutside();
+};
+
+const findParentNode = (
+ node: WorsheetFolderNode,
+ key: string
+): WorsheetFolderNode | undefined => {
+ if (node.key === key) {
+ return;
+ }
+ for (const child of node.children) {
+ if (child.key === key) {
+ return node;
+ }
+ const result = findParentNode(child, key);
+ if (result) {
+ return result;
+ }
+ }
+ return;
+};
+
+const updateWorksheetFolders = async (
+ node: WorsheetFolderNode,
+ oldParentKey: string,
+ newParentKey: string
+) => {
+ const worksheets = revealWorksheets(node, (node: WorsheetFolderNode) => {
+ if (node.worksheet) {
+ const newFullPath = node.key.replace(oldParentKey, newParentKey);
+ node.worksheet.folders = getFoldersForWorksheet(newFullPath);
+ return node.worksheet;
+ }
+ });
+ await batchUpdateWorksheetFolders(worksheets);
+};
+
+const replaceExpandedKeys = (oldKey: string, newKey: string) => {
+ const updates: Array<{ oldPath: string; newPath: string }> = [];
+
+ for (const path of expandedKeys.value) {
+ if (
+ path === oldKey ||
+ folderContext.isSubFolder({ parent: oldKey, path, dig: true })
+ ) {
+ updates.push({
+ oldPath: path,
+ newPath: newKey ? path.replace(oldKey, newKey) : "",
+ });
+ }
+ }
+
+ for (const { oldPath, newPath } of updates) {
+ expandedKeys.value.delete(oldPath);
+ if (newPath) {
+ expandedKeys.value.add(newPath);
+ }
+ }
+};
+
+const handleDuplicateFolderName = async (
+ parentNode: WorsheetFolderNode | undefined,
+ key: string
+) => {
+ const sameNode = parentNode?.children.find((child) => child.key === key);
+ const _defer = defer<boolean>();
+
+ if (!!sameNode) {
+ const dialogInstance = $dialog.create({
+ title: t("sheet.hint-tips.duplicate-folder-name-title"),
+ content: t("sheet.hint-tips.duplicate-folder-name-content", {
+ folder: sameNode.label,
+ }),
+ type: "warning",
+ autoFocus: false,
+ closable: true,
+ maskClosable: true,
+ closeOnEsc: true,
+ async onPositiveClick() {
+ dialogInstance.destroy();
+ _defer.resolve(true);
+ },
+ async onNegativeClick() {
+ dialogInstance.destroy();
+ _defer.resolve(false);
+ },
+ onClose() {
+ dialogInstance.destroy();
+ _defer.resolve(false);
+ },
+ negativeText: t("common.cancel"),
+ positiveText: t("common.confirm"),
+ showIcon: false,
+ });
+ } else {
+ _defer.resolve(true);
+ }
+
+ return _defer.promise;
+};
+
+const handleDrop = async ({ node, dragNode }: TreeDropInfo) => {
+ const parentNode = node as WorsheetFolderNode;
+ const draggedNode = dragNode as WorsheetFolderNode;
+
+ const oldParentNode = findParentNode(sheetTree.value, draggedNode.key);
+ if (!oldParentNode) {
+ return;
+ }
+ if (oldParentNode.key == parentNode.key) {
+ // parent folder not change
+ return;
+ }
+
+ const nodeKeys = draggedNode.key.split("/");
+ const oldParentKey = nodeKeys.slice(0, -1).join("/");
+ const nodeKey = nodeKeys.slice(-1)[0];
+ const newKey = folderContext.ensureFolderPath(`${parentNode.key}/${nodeKey}`);
+
+ const merge = await handleDuplicateFolderName(parentNode, newKey);
+ if (!merge) {
+ return;
+ }
+
+ const shouldCloseOldParent =
+ !draggedNode.worksheet && oldParentNode.children.length === 1;
+
+ await updateWorksheetFolders(draggedNode, oldParentKey, parentNode.key);
+ if (!draggedNode.worksheet) {
+ folderContext.moveFolder(draggedNode.key, newKey);
+ }
+
+ nextTick(() => {
+ // Update expanded keys for the moved folder and all its subfolders
+ replaceExpandedKeys(draggedNode.key, newKey);
+ // Ensure new parent folder is expanded to show the moved item
+ expandedKeys.value.add(parentNode.key);
+ // Close old parent folder if it's now empty
+ if (shouldCloseOldParent) {
+ replaceExpandedKeys(oldParentNode.key, "");
+ }
+ });
+};
+</script>
+
+<style lang="postcss" scoped>
+.worksheet-tree :deep(.n-tree .v-vl) {
+ --n-node-content-height: 21px !important;
+}
+.worksheet-tree :deep(.n-tree-node-content) {
+ padding-left: 0 !important;
+ padding-right: 1rem !important;
+ font-size: 0.875rem;
+ line-height: 1.25rem;
+ flex: 1;
+}
+.worksheet-tree :deep(.n-tree-node-wrapper) {
+ padding: 0;
+}
+.worksheet-tree :deep(.n-tree-node-switcher--hide) {
+ width: 0.5rem !important;
+}
+.worksheet-tree :deep(.n-tree-node-content__prefix) {
+ flex-shrink: 0;
+}
+.worksheet-tree :deep(.n-tree-node-content__suffix) {
+ flex-shrink: 0;
+}
+.worksheet-tree :deep(.n-tree-node-content__text) {
+ overflow: hidden;
+ flex: 1;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+</style>
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodeRenders.tsx b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodeRenders.tsx
new file mode 100644
index 0000000000..a7e27d1134
--- /dev/null
+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodeRenders.tsx
@@ -0,0 +1,172 @@
+import {
+ StarIcon,
+ MoreHorizontalIcon,
+ FolderSyncIcon,
+ FolderCodeIcon,
+ FolderMinusIcon,
+ FileCodeIcon,
+ FolderOpenIcon,
+ UsersIcon,
+} from "lucide-vue-next";
+import { NTooltip } from "naive-ui";
+import { defineComponent, type PropType } from "vue";
+import { t } from "@/plugins/i18n";
+import { useUserStore } from "@/store";
+import {
+ Worksheet_Visibility,
+ type Worksheet,
+} from "@/types/proto-es/v1/worksheet_service_pb";
+import type { WorsheetFolderNode } from "@/views/sql-editor/Sheet";
+
+// Prefix icon component
+export const TreeNodePrefix = defineComponent({
+ name: "TreeNodePrefix",
+ props: {
+ node: {
+ type: Object as PropType<WorsheetFolderNode>,
+ required: true,
+ },
+ expandedKeys: {
+ type: Object as PropType<Set<string>>,
+ required: true,
+ },
+ rootPath: {
+ type: String,
+ required: true,
+ },
+ view: {
+ type: String as PropType<"my" | "shared">,
+ required: true,
+ },
+ },
+ setup(props) {
+ return () => {
+ if (props.node.worksheet) {
+ // the node is file
+ return <FileCodeIcon class="w-4 h-auto text-gray-600" />;
+ }
+ if (props.expandedKeys.has(props.node.key)) {
+ // is opened folder
+ return <FolderOpenIcon class="w-4 h-auto text-gray-600" />;
+ }
+ if (props.node.key === props.rootPath) {
+ // root folder icon
+ if (props.view === "shared") {
+ return <FolderSyncIcon class="w-4 h-auto text-gray-600" />;
+ }
+ return <FolderCodeIcon class="w-4 h-auto text-gray-600" />;
+ }
+ if (props.node.empty) {
+ // empty folder icon
+ return <FolderMinusIcon class="w-4 h-auto text-gray-600" />;
+ }
+ // fallback to normal folder icon
+ return <FolderCodeIcon class="w-4 h-auto text-gray-600" />;
+ };
+ },
+});
+
+// Suffix icons component
+export const TreeNodeSuffix = defineComponent({
+ name: "TreeNodeSuffix",
+ props: {
+ node: {
+ type: Object as PropType<WorsheetFolderNode>,
+ required: true,
+ },
+ isWorksheetCreator: {
+ type: Function as PropType<(worksheet: Worksheet) => boolean>,
+ required: true,
+ },
+ },
+ emits: ["contextMenuShow", "sharePanelShow", "toggleStar"],
+ setup(props, { emit }) {
+ const userStore = useUserStore();
+
+ const visibilityDisplayName = (visibility: Worksheet_Visibility) => {
+ switch (visibility) {
+ case Worksheet_Visibility.PRIVATE:
+ return t("sql-editor.private");
+ case Worksheet_Visibility.PROJECT_READ:
+ return t("sql-editor.project-read");
+ case Worksheet_Visibility.PROJECT_WRITE:
+ return t("sql-editor.project-write");
+ default:
+ return "";
+ }
+ };
+
+ const creatorForSheet = (sheet: Worksheet) => {
+ return (
+ userStore.getUserByIdentifier(sheet.creator)?.title ?? sheet.creator
+ );
+ };
+
+ const renderShareIcon = (worksheet: Worksheet) => {
+ if (
+ worksheet.visibility !== Worksheet_Visibility.PROJECT_READ &&
+ worksheet.visibility !== Worksheet_Visibility.PROJECT_WRITE
+ ) {
+ return null;
+ }
+
+ return (
+ <NTooltip>
+ {{
+ trigger: () => (
+ <UsersIcon
+ class="w-4 text-gray-400"
+ onClick={(e) => emit("sharePanelShow", e, props.node)}
+ />
+ ),
+ default: () => {
+ return (
+ <div>
+ <div>
+ {t("common.visibility")}
+ {": "}
+ {visibilityDisplayName(worksheet.visibility)}
+ </div>
+ {props.isWorksheetCreator(worksheet) ? null : (
+ <div>
+ {t("common.creator")}
+ {": "}
+ {creatorForSheet(worksheet)}
+ </div>
+ )}
+ </div>
+ );
+ },
+ }}
+ </NTooltip>
+ );
+ };
+
+ return () => {
+ if (!props.node.worksheet) {
+ return (
+ <MoreHorizontalIcon
+ class="w-4 h-auto text-gray-600"
+ onClick={(e: MouseEvent) => emit("contextMenuShow", e, props.node)}
+ />
+ );
+ }
+
+ return (
+ <div class="inline-flex gap-1">
+ {renderShareIcon(props.node.worksheet)}
+ <StarIcon
+ class={`w-4 h-auto text-gray-400 ${props.node.worksheet.starred ? "text-yellow-400" : ""}`}
+ onClick={() =>
+ props.node.worksheet && emit("toggleStar", props.node.worksheet)
+ }
+ />
+ <MoreHorizontalIcon
+ class="w-4 h-auto text-gray-600"
+ onClick={(e: MouseEvent) => emit("contextMenuShow", e, props.node)}
+ />
+ </div>
+ );
+ };
+ },
+});
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/common.ts b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/common.ts
index 8f79e291ba..7f9e18e8a0 100644
--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/common.ts
+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/common.ts
@@ -1,4 +1,5 @@
import { escape } from "lodash-es";
+import type { TreeOption } from "naive-ui";
import { getHighlightHTMLByRegExp } from "@/utils";
export const titleHTML = (title: string, keyword: string) => {
@@ -14,3 +15,18 @@ export const titleHTML = (title: string, keyword: string) => {
false /* !caseSensitive */
);
};
+
+// TODO(ed):
+// Find a better UX for filter.
+// 1. We do need to expand all nodes for filter results?
+// 2. We do still need a tree for filter results? How about just plain list?
+// 3. If we don't show empty folder in filter results, how to support "create/rename folder", "move/rename worksheet" actions?
+export const filterNode =
+ (rootPath: string) => (pattern: string, option: TreeOption) => {
+ const keyword = pattern.trim().toLowerCase();
+ if (option.key === rootPath || !keyword) {
+ // always show the root node
+ return true;
+ }
+ return option.label?.toLowerCase().includes(keyword) ?? false;
+ };
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.ts b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.ts
new file mode 100644
index 0000000000..d7c3a8894f
--- /dev/null
+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.ts
@@ -0,0 +1,177 @@
+import {
+ FilesIcon,
+ FileCodeIcon,
+ FolderIcon,
+ Share2Icon,
+ TrashIcon,
+ PencilLineIcon,
+} from "lucide-vue-next";
+import { type DropdownOption } from "naive-ui";
+import { computed, reactive, watch, h } from "vue";
+import { t } from "@/plugins/i18n";
+import { useCurrentUserV1 } from "@/store";
+import { type Position } from "@/types";
+import { isWorksheetWritableV1 } from "@/utils";
+import { type WorsheetFolderNode } from "@/views/sql-editor/Sheet";
+
+export type DropdownOptionType =
+ | "share"
+ | "rename"
+ | "delete"
+ | "add-folder"
+ | "add-worksheet"
+ | "duplicate";
+
+type WorksheetDropdown = DropdownOption & {
+ key: DropdownOptionType;
+};
+
+interface DropdownContext {
+ position: Position;
+ showDropdown: boolean;
+ showSharePanel: boolean;
+ node?: WorsheetFolderNode;
+}
+
+export const useDropdown = () => {
+ const me = useCurrentUserV1();
+
+ const context = reactive<DropdownContext>({
+ position: {
+ x: 0,
+ y: 0,
+ },
+ showDropdown: false,
+ showSharePanel: false,
+ });
+
+ watch(
+ () => context.node,
+ (node) => {
+ if (!node) {
+ context.showDropdown = false;
+ context.showSharePanel = false;
+ }
+ }
+ );
+
+ watch(
+ () => context.showSharePanel,
+ (show) => {
+ if (show) {
+ context.showDropdown = false;
+ }
+ }
+ );
+
+ watch(
+ () => context.showDropdown,
+ (show) => {
+ if (show) {
+ context.showSharePanel = false;
+ }
+ }
+ );
+
+ const isCreator = computed(() => {
+ return context.node?.worksheet?.creator === `users/${me.value.email}`;
+ });
+
+ const options = computed((): WorksheetDropdown[] => {
+ if (!context.node) {
+ return [];
+ }
+
+ const items: WorksheetDropdown[] = [];
+ if (context.node.worksheet) {
+ items.push({
+ icon: () => h(FilesIcon, { class: "w-4 text-gray-600" }),
+ key: "duplicate",
+ label: isCreator.value ? t("common.duplicate") : t("common.fork"),
+ });
+ if (isCreator.value) {
+ items.push({
+ icon: () => h(Share2Icon, { class: "w-4 text-gray-600" }),
+ key: "share",
+ label: t("common.share"),
+ });
+ }
+ const canWriteSheet = isWorksheetWritableV1(context.node.worksheet);
+ if (canWriteSheet) {
+ items.push(
+ {
+ icon: () => h(PencilLineIcon, { class: "w-4 text-gray-600" }),
+ key: "rename",
+ label: t("sql-editor.tab.context-menu.actions.rename"),
+ },
+ {
+ icon: () => h(TrashIcon, { class: "w-4 text-gray-600" }),
+ key: "delete",
+ label: t("common.delete"),
+ }
+ );
+ }
+ } else {
+ items.push(
+ {
+ icon: () => h(FolderIcon, { class: "w-4 text-gray-600" }),
+ key: "add-folder",
+ label: t("sql-editor.tab.context-menu.actions.add-folder"),
+ },
+ {
+ icon: () => h(FileCodeIcon, { class: "w-4 text-gray-600" }),
+ key: "add-worksheet",
+ label: t("sql-editor.tab.context-menu.actions.add-worksheet"),
+ }
+ );
+ if (context.node.editable) {
+ items.push(
+ {
+ icon: () => h(PencilLineIcon, { class: "w-4 text-gray-600" }),
+ key: "rename",
+ label: t("sql-editor.tab.context-menu.actions.rename"),
+ },
+ {
+ icon: () => h(TrashIcon, { class: "w-4 text-gray-600" }),
+ key: "delete",
+ label: t("common.delete"),
+ }
+ );
+ }
+ }
+
+ return items;
+ });
+
+ const resetData = (e: MouseEvent, node: WorsheetFolderNode) => {
+ e.preventDefault();
+ e.stopPropagation();
+ context.node = node;
+ context.position = {
+ x: e.clientX,
+ y: e.clientY,
+ };
+ };
+
+ const handleMenuShow = (e: MouseEvent, node: WorsheetFolderNode) => {
+ resetData(e, node);
+ context.showDropdown = true;
+ };
+
+ const handleSharePanelShow = (e: MouseEvent, node: WorsheetFolderNode) => {
+ resetData(e, node);
+ context.showSharePanel = true;
+ };
+
+ const handleClickOutside = () => {
+ context.node = undefined;
+ };
+
+ return {
+ context,
+ options,
+ handleMenuShow,
+ handleSharePanelShow,
+ handleClickOutside,
+ };
+};
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/index.ts b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/index.ts
index cfe1a9b17b..c3e79b9f16 100644
--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/index.ts
+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/index.ts
@@ -1,3 +1,4 @@
-import SheetList from "./SheetList.vue";
+import DraftTree from "./DraftTree.vue";
+import SheetTree from "./SheetTree.vue";
-export { SheetList };
+export { SheetTree, DraftTree };
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/WorksheetPane.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/WorksheetPane.vue
index 22757700db..7d480c70e0 100644
--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/WorksheetPane.vue
+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/WorksheetPane.vue
@@ -2,124 +2,122 @@
<div class="h-full flex flex-col gap-1 overflow-hidden pb-1 text-sm">
<div class="flex items-center gap-x-1 px-1">
<SearchBox
- v-model:value="keyword"
+ v-model:value="filter.keyword"
size="small"
:placeholder="$t('sheet.search-sheets')"
:clearable="true"
style="max-width: 100%"
/>
- <NButton
- quaternary
- style="--n-padding: 0 5px; --n-height: 28px"
- @click="showPanel = true"
+ <NDropdown
+ :show="showDropdown"
+ :options="options"
+ placement="bottom-start"
+ @clickoutside="showDropdown = false"
>
- <template #icon>
- <heroicons:arrow-left-on-rectangle />
- </template>
- </NButton>
+ <NButton
+ quaternary
+ style="--n-padding: 0 5px; --n-height: 28px"
+ @click="showDropdown = true"
+ >
+ <template #icon>
+ <FunnelIcon :class="['w-4', filterChanged ? 'text-accent' : '']" />
+ </template>
+ </NButton>
+ </NDropdown>
+ </div>
+ <div class="flex-1 flex flex-col gap-y-2 overflow-y-auto worksheet-scroll">
+ <SheetTree v-if="filter.showMine" view="my" />
+ <SheetTree v-if="filter.showShared" view="shared" />
+ <DraftTree v-if="filter.showDraft" :keyword="filter.keyword" />
</div>
- <NScrollbar class="flex-1 overflow-hidden">
- <NCollapse v-model:expanded-names="expandedGroups" class="worksheet-pane">
- <NCollapseItem name="my" :title="$t('sheet.mine')">
- <SheetList view="my" :keyword="keyword" @ready="setReady('my')" />
- </NCollapseItem>
- <NCollapseItem name="starred" :title="$t('sheet.starred')">
- <SheetList
- view="starred"
- :keyword="keyword"
- @ready="setReady('starred')"
- />
- </NCollapseItem>
- <NCollapseItem name="shared" :title="$t('sheet.shared')">
- <SheetList
- view="shared"
- :keyword="keyword"
- @ready="setReady('shared')"
- />
- </NCollapseItem>
- <NCollapseItem name="draft" :title="$t('sheet.draft')">
- <DraftList :keyword="keyword" @ready="setReady('draft')" />
- </NCollapseItem>
- </NCollapse>
- </NScrollbar>
</div>
</template>
-<script setup lang="ts">
-import { NButton, NCollapse, NCollapseItem, NScrollbar } from "naive-ui";
-import { ref, watch } from "vue";
+<script setup lang="tsx">
+import { FunnelIcon } from "lucide-vue-next";
+import { NButton, NDropdown, type DropdownOption } from "naive-ui";
+import { ref, computed } from "vue";
import { SearchBox } from "@/components/v2";
-import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";
-import {
- useCurrentUserV1,
- useSQLEditorTabStore,
- useWorkSheetStore,
-} from "@/store";
+import { t } from "@/plugins/i18n";
import { useSheetContext } from "../../Sheet";
-import { SheetList } from "./SheetList";
-import DraftList from "./SheetList/DraftList.vue";
-import type { GroupType } from "./common";
-import { useScrollLogic } from "./scroll-logic";
-
-const { showPanel, events: sheetEvents } = useSheetContext();
-const tabStore = useSQLEditorTabStore();
-const sheetStore = useWorkSheetStore();
-const me = useCurrentUserV1();
-const keyword = ref("");
-const expandedGroups = ref<GroupType[]>(["my", "starred", "shared", "draft"]);
+import FilterMenuItem from "./FilterMenuItem.vue";
+import { SheetTree, DraftTree } from "./SheetList";
-const maybeExpandGroup = (group: GroupType) => {
- if (expandedGroups.value.includes(group)) return;
- expandedGroups.value.push(group);
-};
+const { filter, filterChanged } = useSheetContext();
+const showDropdown = ref<boolean>(false);
-useEmitteryEventListener(sheetEvents, "add-sheet", () => {
- maybeExpandGroup("draft");
+const options = computed((): DropdownOption[] => {
+ return [
+ {
+ key: "show-mine",
+ type: "render",
+ render: () => (
+ <FilterMenuItem
+ label={t("sheet.filter.show-mine")}
+ value={filter.value.showMine}
+ onUpdate:value={(val: boolean) => (filter.value.showMine = val)}
+ />
+ ),
+ },
+ {
+ key: "show-shared",
+ type: "render",
+ render: () => (
+ <FilterMenuItem
+ label={t("sheet.filter.show-shared")}
+ value={filter.value.showShared}
+ onUpdate:value={(val: boolean) => (filter.value.showShared = val)}
+ />
+ ),
+ },
+ {
+ key: "show-draft",
+ type: "render",
+ render: () => (
+ <FilterMenuItem
+ label={t("sheet.filter.show-draft")}
+ value={filter.value.showDraft}
+ onUpdate:value={(val: boolean) => (filter.value.showDraft = val)}
+ />
+ ),
+ },
+ {
+ key: "only-show-starred",
+ type: "render",
+ render: () => (
+ <FilterMenuItem
+ label={t("sheet.filter.only-show-starred")}
+ value={filter.value.onlyShowStarred}
+ onUpdate:value={(val: boolean) =>
+ (filter.value.onlyShowStarred = val)
+ }
+ />
+ ),
+ },
+ ];
});
-
-const { setReady, scrollCurrentItemIntoView } = useScrollLogic();
-
-watch(
- () => tabStore.currentTab,
- (tab) => {
- if (!tab) {
- return;
- }
- if (!tab.worksheet) {
- maybeExpandGroup("draft");
- scrollCurrentItemIntoView(tab);
- return;
- }
- const sheet = sheetStore.getWorksheetByName(tab.worksheet);
- if (!sheet) {
- return;
- }
- if (sheet.starred) {
- maybeExpandGroup("starred");
- } else if (sheet.creator != `users/${me.value.email}`) {
- maybeExpandGroup("shared");
- }
-
- scrollCurrentItemIntoView(tab);
- },
- { immediate: true }
-);
</script>
<style lang="postcss" scoped>
-.worksheet-pane {
- --n-title-padding: 0.5rem 0 0.5rem 6px !important;
- --n-item-margin: 0.25rem 0 0.25rem !important;
+.worksheet-scroll {
+ scrollbar-width: thin;
+ scrollbar-color: rgba(0, 0, 0, 0.2) transparent;
}
-.worksheet-pane
- :deep(
- .n-collapse-item
- .n-collapse-item__content-wrapper
- .n-collapse-item__content-inner
- ) {
- padding-top: 0rem !important;
+
+.worksheet-scroll::-webkit-scrollbar {
+ width: 6px;
}
-.worksheet-pane :deep(.n-collapse-item:first-child) {
- margin-top: 0.25rem;
+
+.worksheet-scroll::-webkit-scrollbar-track {
+ background: transparent;
+}
+
+.worksheet-scroll::-webkit-scrollbar-thumb {
+ background-color: rgba(0, 0, 0, 0.2);
+ border-radius: 3px;
+}
+
+.worksheet-scroll::-webkit-scrollbar-thumb:hover {
+ background-color: rgba(0, 0, 0, 0.3);
}
</style>
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/common.ts b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/common.ts
deleted file mode 100644
index 4b889b608c..0000000000
--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/common.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { SQLEditorTab } from "@/types";
-import type { Worksheet } from "@/types/proto-es/v1/worksheet_service_pb";
-import { extractWorksheetUID } from "@/utils";
-import type { SheetViewMode } from "../../Sheet";
-
-export type GroupType = SheetViewMode | "draft";
-
-export const keyForWorksheet = (worksheet: Worksheet) => {
- return `bb-worksheet-list-worksheet-${extractWorksheetUID(worksheet.name)}`;
-};
-export const keyForDraft = (tab: SQLEditorTab) => {
- return `bb-worksheet-list-draft-${tab.id}`;
-};
diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/scroll-logic.ts b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/scroll-logic.ts
deleted file mode 100644
index c8fa4c85a4..0000000000
--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/scroll-logic.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import scrollIntoView from "scroll-into-view-if-needed";
-import { nextTick, ref, watch } from "vue";
-import { useSQLEditorTabStore, useWorkSheetStore } from "@/store";
-import type { SQLEditorTab } from "@/types";
-import { keyForDraft, keyForWorksheet, type GroupType } from "./common";
-
-export const useScrollLogic = () => {
- const tabStore = useSQLEditorTabStore();
- const readyQueue = ref<GroupType[]>([]);
- const ready = ref<boolean>(false);
-
- const setReady = (group: GroupType) => {
- if (readyQueue.value.includes(group)) return;
- readyQueue.value.push(group);
- };
-
- const pendingScrollCurrentItemIntoView = ref<SQLEditorTab>();
-
- const scrollCurrentItemIntoView = async (tab: SQLEditorTab | undefined) => {
- pendingScrollCurrentItemIntoView.value = tab;
- };
-
- watch(
- () => readyQueue.value.length,
- (length) => {
- if (length === 4) {
- ready.value = true;
- scrollCurrentItemIntoView(tabStore.currentTab);
- }
- },
- { immediate: true }
- );
-
- const cleanup = () => {
- pendingScrollCurrentItemIntoView.value = undefined;
- };
-
- const scrollItemIntoViewByKey = async (key: string) => {
- await nextTick();
- const dom = document.querySelector(`[data-item-key="${key}"]`);
- if (dom) {
- scrollIntoView(dom, {
- scrollMode: "if-needed",
- });
- }
- cleanup();
- };
-
- watch(
- [pendingScrollCurrentItemIntoView, ready],
- ([tab, ready]) => {
- if (!tab) return;
- if (!ready) return;
- if (tab.worksheet) {
- const worksheet = useWorkSheetStore().getWorksheetByName(tab.worksheet);
- if (!worksheet) return cleanup();
- const key = keyForWorksheet(worksheet);
- scrollItemIntoViewByKey(key);
- return;
- }
- const key = keyForDraft(tab);
- scrollItemIntoViewByKey(key);
- },
- {
- immediate: true,
- }
- );
-
- return { setReady, scrollCurrentItemIntoView };
-};
diff --git a/frontend/src/views/sql-editor/EditorCommon/EditorAction.vue b/frontend/src/views/sql-editor/EditorCommon/EditorAction.vue
index ff2fd23322..6715d16862 100644
--- a/frontend/src/views/sql-editor/EditorCommon/EditorAction.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/EditorAction.vue
@@ -114,7 +114,7 @@
</NPopover>
</template>
<template #default>
- <SharePopover />
+ <SharePopover :worksheet="sheetAndTabStore.currentSheet" />
</template>
</NPopover>
</template>
@@ -160,6 +160,7 @@ import {
useSQLEditorTabStore,
useUIStateStore,
useWorkSheetStore,
+ useWorkSheetAndTabStore,
} from "@/store";
import {
DEFAULT_SQL_EDITOR_TAB_MODE,
@@ -194,6 +195,7 @@ const tabStore = useSQLEditorTabStore();
const uiStateStore = useUIStateStore();
const { events } = useSQLEditorContext();
const { resultRowsLimit } = storeToRefs(useSQLEditorStore());
+const sheetAndTabStore = useWorkSheetAndTabStore();
const { currentTab, isDisconnected } = storeToRefs(tabStore);
diff --git a/frontend/src/views/sql-editor/EditorCommon/SaveSheetForm.vue b/frontend/src/views/sql-editor/EditorCommon/SaveSheetForm.vue
deleted file mode 100644
index cc35fc1353..0000000000
--- a/frontend/src/views/sql-editor/EditorCommon/SaveSheetForm.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<template>
- <div class="save-sheet-modal w-80">
- <NInput
- ref="sheetTitleInputRef"
- v-model:value="sheetTitle"
- :placeholder="$t('sql-editor.save-sheet-input-placeholder')"
- :maxlength="200"
- @keyup.enter="handleSaveSheet"
- />
- </div>
- <div class="mt-4 flex justify-end gap-x-2">
- <NButton @click="emit('close')">{{ $t("common.close") }}</NButton>
- <NButton type="primary" @click="handleSaveSheet">
- {{ $t("common.save") }}
- </NButton>
- </div>
-</template>
-
-<script lang="ts" setup>
-import { NButton, NInput } from "naive-ui";
-import { ref, nextTick } from "vue";
-import type { SQLEditorTab } from "@/types";
-import type { Worksheet } from "@/types/proto-es/v1/worksheet_service_pb";
-
-const props = defineProps<{
- tab: SQLEditorTab;
- mask?: Array<keyof Worksheet>;
-}>();
-
-const emit = defineEmits<{
- (e: "close"): void;
- (e: "confirm", tab: SQLEditorTab, mask?: Array<keyof Worksheet>): void;
-}>();
-
-const sheetTitle = ref(props.tab.title);
-const sheetTitleInputRef = ref();
-
-const handleSaveSheet = () => {
- emit(
- "confirm",
- {
- ...props.tab,
- title: sheetTitle.value,
- },
- props.mask
- );
-};
-
-nextTick(() => {
- sheetTitleInputRef.value?.focus();
-});
-</script>
diff --git a/frontend/src/views/sql-editor/EditorCommon/SaveSheetModal.vue b/frontend/src/views/sql-editor/EditorCommon/SaveSheetModal.vue
index d2feba7f34..3432350e97 100644
--- a/frontend/src/views/sql-editor/EditorCommon/SaveSheetModal.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/SaveSheetModal.vue
@@ -1,159 +1,210 @@
<template>
- <BBModal
- v-if="state.pendingEdit"
- :title="$t('sql-editor.save-sheet')"
- @close="close"
- >
- <SaveSheetForm
- :tab="state.pendingEdit.tab"
- :mask="state.pendingEdit.mask"
- @close="close"
- @confirm="doSaveSheet"
- />
+ <BBModal v-if="showModal" :title="$t('sql-editor.save-sheet')" @close="close">
+ <div
+ class="save-sheet-modal flex flex-col gap-y-3 w-lg max-w-[calc(100vw-8rem)]"
+ >
+ <div class="flex flex-col gap-y-1">
+ <p>
+ {{ $t("common.title") }}
+ <RequiredStar />
+ </p>
+ <NInput
+ ref="sheetTitleInputRef"
+ v-model:value="pendingEdit.title"
+ :placeholder="$t('sql-editor.save-sheet-input-placeholder')"
+ :maxlength="200"
+ />
+ </div>
+ <div class="flex flex-col gap-y-1">
+ <p>{{ $t("sql-editor.choose-folder") }}</p>
+ <!-- TODO(ed): support creating new folders when saving the worksheet -->
+ <NTreeSelect
+ filterable
+ clearable
+ checkable
+ show-path
+ virtual-scroll
+ :multiple="false"
+ :options="[folderTree]"
+ :check-strategy="'parent'"
+ :render-prefix="renderPrefix"
+ v-model:expanded-keys="expandedKeys"
+ v-model:value="pendingEdit.folder"
+ />
+ </div>
+ <div class="flex justify-end gap-x-2 mt-4">
+ <NButton @click="close">{{ $t("common.close") }}</NButton>
+ <NButton
+ :disabled="!pendingEdit.title"
+ type="primary"
+ @click="() => doSaveSheet(pendingEdit)"
+ >
+ {{ $t("common.save") }}
+ </NButton>
+ </div>
+ </div>
</BBModal>
</template>
-<script lang="ts" setup>
+<script lang="tsx" setup>
import { create } from "@bufbuild/protobuf";
-import { reactive } from "vue";
+import {
+ FolderCodeIcon,
+ FolderOpenIcon,
+ FolderMinusIcon,
+} from "lucide-vue-next";
+import { NInput, NButton, NTreeSelect, type TreeOption } from "naive-ui";
+import { ref } from "vue";
import { BBModal } from "@/bbkit";
+import RequiredStar from "@/components/RequiredStar.vue";
import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";
-import {
- useDatabaseV1Store,
- useWorkSheetStore,
- useSQLEditorTabStore,
-} from "@/store";
+import { useWorkSheetStore, useSQLEditorTabStore } from "@/store";
import type { SQLEditorTab } from "@/types";
import { UNKNOWN_ID } from "@/types";
-import type { Worksheet } from "@/types/proto-es/v1/worksheet_service_pb";
import {
WorksheetSchema,
Worksheet_Visibility,
+ type Worksheet,
} from "@/types/proto-es/v1/worksheet_service_pb";
import { extractWorksheetUID } from "@/utils";
-import { useSheetContext } from "../Sheet";
+import { useSheetContextByView } from "@/views/sql-editor/Sheet";
+import type { WorsheetFolderNode } from "@/views/sql-editor/Sheet";
import { useSQLEditorContext } from "../context";
-import SaveSheetForm from "./SaveSheetForm.vue";
-
-type LocalState = {
- pendingEdit?: {
- tab: SQLEditorTab;
- mask?: Array<keyof Worksheet>;
- };
-};
const tabStore = useSQLEditorTabStore();
-const databaseStore = useDatabaseV1Store();
const worksheetV1Store = useWorkSheetStore();
-const { events: sheetEvents } = useSheetContext();
const { events: editorEvents } = useSQLEditorContext();
+const { folderTree, folderContext, getPwdForWorksheet } =
+ useSheetContextByView("my");
-const state = reactive<LocalState>({});
+const pendingEdit = ref<{
+ title: string;
+ folder: string;
+ rawTab?: SQLEditorTab;
+}>({
+ title: "",
+ folder: "",
+});
+const expandedKeys = ref<string[]>([folderContext.rootPath.value]);
+const showModal = ref(false);
-const doSaveSheet = async (
- tab: SQLEditorTab,
- mask?: Array<keyof Worksheet>
-) => {
- const { title, statement, worksheet } = tab;
+const doSaveSheet = async ({
+ title,
+ folder,
+ rawTab,
+}: {
+ title: string;
+ folder: string;
+ rawTab?: SQLEditorTab;
+}) => {
+ if (!rawTab) {
+ return close();
+ }
+ const { statement, worksheet } = rawTab;
if (title === "") {
return;
}
const sheetId = Number(extractWorksheetUID(worksheet ?? ""));
+ let worksheetEntity: Worksheet | undefined;
if (sheetId !== UNKNOWN_ID) {
const currentSheet = worksheetV1Store.getWorksheetByName(worksheet);
if (!currentSheet) return;
- const updatedSheet = await worksheetV1Store.patchWorksheet(
+ worksheetEntity = await worksheetV1Store.patchWorksheet(
{
...currentSheet,
title: title,
- database: tab.connection.database,
+ database: rawTab.connection.database,
content: new TextEncoder().encode(statement),
},
- mask ?? ["title", "content", "database"]
+ ["title", "content", "database"]
);
- if (updatedSheet) {
- const tab = tabStore.tabList.find(
- (t) => t.worksheet === updatedSheet.name
- );
- if (tab) {
- tabStore.updateTab(tab.id, {
- title,
- status: "CLEAN",
- });
- }
- }
} else {
- if (!tab.connection.database) {
- return false;
- }
- const database = await databaseStore.getOrFetchDatabaseByName(
- tab.connection.database,
- true /* silent */
- );
- const createdSheet = await worksheetV1Store.createWorksheet(
+ worksheetEntity = await worksheetV1Store.createWorksheet(
create(WorksheetSchema, {
title,
- project: database.project,
+ project: tabStore.project,
content: new TextEncoder().encode(statement),
- database: database.name,
+ database: rawTab.connection.database,
visibility: Worksheet_Visibility.PRIVATE,
})
);
- if (tabStore.currentTabId === tab.id) {
- tabStore.updateCurrentTab({
- worksheet: createdSheet.name,
- title,
- status: "CLEAN",
- });
- }
}
- // Refresh "my" sheet list.
- sheetEvents.emit("refresh", { views: ["my"] });
- state.pendingEdit = undefined;
-};
+ if (worksheetEntity) {
+ if (folder && folder !== folderContext.rootPath.value) {
+ const folders = folder
+ .replace(folderContext.rootPath.value, "")
+ .split("/")
+ .filter((p) => p);
+ await worksheetV1Store.upsertWorksheetOrganizer(
+ {
+ worksheet: worksheetEntity.name,
+ starred: false,
+ folders,
+ },
+ ["folders"]
+ );
+ }
-const needSheetTitle = (tab: SQLEditorTab) => {
- if (tab.worksheet) {
- // If the sheet is saved, we don't need to show the name popup.
- return false;
+ tabStore.updateTab(rawTab.id, {
+ title,
+ status: "CLEAN",
+ worksheet: worksheetEntity.name,
+ });
}
- return true;
-};
-const trySaveSheet = (
- tab: SQLEditorTab,
- editTitle?: boolean,
- mask?: Array<keyof Worksheet>
-) => {
- if (!tab.connection.database) {
- return;
- }
- if (needSheetTitle(tab) || editTitle) {
- state.pendingEdit = {
- tab,
- mask,
- };
- return;
- }
- state.pendingEdit = undefined;
+ showModal.value = false;
+};
- doSaveSheet(tab, mask);
+const needShowModal = (tab: SQLEditorTab) => {
+ // If the sheet is saved, we don't need to show the name popup.
+ return !tab.worksheet;
};
const close = () => {
- state.pendingEdit = undefined;
+ showModal.value = false;
};
-useEmitteryEventListener(
- editorEvents,
- "save-sheet",
- ({ tab, editTitle, mask }) => {
- trySaveSheet(tab, editTitle, mask);
+useEmitteryEventListener(editorEvents, "save-sheet", ({ tab, editTitle }) => {
+ pendingEdit.value = {
+ title: tab.title,
+ folder: folderContext.rootPath.value,
+ rawTab: tab,
+ };
+
+ if (needShowModal(tab) || editTitle) {
+ const worksheet = worksheetV1Store.getWorksheetByName(tab.worksheet);
+ if (worksheet) {
+ pendingEdit.value.folder = getPwdForWorksheet(worksheet);
+ }
+ showModal.value = true;
+ return;
+ }
+ doSaveSheet(pendingEdit.value);
+});
+
+const renderPrefix = ({ option }: { option: TreeOption }) => {
+ const node = option as WorsheetFolderNode;
+ if (node.worksheet) {
+ return null;
+ }
+ if (expandedKeys.value.includes(node.key)) {
+ // is opened folder
+ return <FolderOpenIcon class="w-4 h-auto text-gray-600" />;
}
-);
+ if (node.key === folderContext.rootPath.value) {
+ // root folder icon
+ return <FolderCodeIcon class="w-4 h-auto text-gray-600" />;
+ }
+ if (node.empty) {
+ // empty folder icon
+ return <FolderMinusIcon class="w-4 h-auto text-gray-600" />;
+ }
+ // fallback to normal folder icon
+ return <FolderCodeIcon class="w-4 h-auto text-gray-600" />;
+};
</script>
diff --git a/frontend/src/views/sql-editor/EditorCommon/SharePopover.vue b/frontend/src/views/sql-editor/EditorCommon/SharePopover.vue
index 822110a164..42a983601b 100644
--- a/frontend/src/views/sql-editor/EditorCommon/SharePopover.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/SharePopover.vue
@@ -96,19 +96,34 @@ import {
useSQLEditorTabStore,
useWorkSheetStore,
useSettingV1Store,
- useWorkSheetAndTabStore,
+ useCurrentUserV1,
} from "@/store";
import type { AccessOption } from "@/types";
-import { Worksheet_Visibility } from "@/types/proto-es/v1/worksheet_service_pb";
-import { extractProjectResourceName, extractWorksheetUID } from "@/utils";
+import {
+ Worksheet_Visibility,
+ type Worksheet,
+} from "@/types/proto-es/v1/worksheet_service_pb";
+import {
+ extractProjectResourceName,
+ extractWorksheetUID,
+ toClipboard,
+} from "@/utils";
+
+const props = defineProps<{
+ worksheet?: Worksheet;
+}>();
+
+const emit = defineEmits<{
+ (event: "on-updated"): void;
+}>();
const { t } = useI18n();
const router = useRouter();
const tabStore = useSQLEditorTabStore();
const worksheetV1Store = useWorkSheetStore();
-const sheetAndTabStore = useWorkSheetAndTabStore();
const settingStore = useSettingV1Store();
+const me = useCurrentUserV1();
const workspaceExternalURL = computed(
() => settingStore.workspaceProfileSetting?.externalUrl
@@ -137,11 +152,8 @@ const accessOptions = computed<AccessOption[]>(() => {
];
});
-const sheet = computed(() => {
- return sheetAndTabStore.currentSheet;
-});
const allowChangeAccess = computed(() => {
- return sheetAndTabStore.isCreator;
+ return props.worksheet?.creator === `users/${me.value.email}`;
});
const currentAccess = ref<AccessOption>(accessOptions.value[0]);
@@ -149,34 +161,46 @@ const isShowAccessPopover = ref(false);
const handleChangeAccess = async (option: AccessOption) => {
// only creator can change access
- if (allowChangeAccess.value && sheet.value) {
+ if (allowChangeAccess.value && props.worksheet) {
currentAccess.value = option;
await worksheetV1Store.patchWorksheet(
{
- ...sheet.value,
+ ...props.worksheet,
visibility: currentAccess.value.value,
},
["visibility"]
);
- pushNotification({
- module: "bytebase",
- style: "SUCCESS",
- title: t("common.updated"),
- });
+
+ if (sharedTabLink.value) {
+ await toClipboard(sharedTabLink.value);
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: t("sql-editor.url-copied-to-clipboard"),
+ });
+ } else {
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: t("common.updated"),
+ });
+ }
+
+ emit("on-updated");
}
isShowAccessPopover.value = false;
};
const sharedTabLink = computed(() => {
- if (!sheet.value) {
+ if (!props.worksheet) {
return "";
}
const route = router.resolve({
name: SQL_EDITOR_WORKSHEET_MODULE,
params: {
- project: extractProjectResourceName(sheet.value.project),
- sheet: extractWorksheetUID(sheet.value.name),
+ project: extractProjectResourceName(props.worksheet.project),
+ sheet: extractWorksheetUID(props.worksheet.name),
},
});
return new URL(
@@ -186,8 +210,8 @@ const sharedTabLink = computed(() => {
});
onMounted(() => {
- if (sheet.value) {
- const { visibility } = sheet.value;
+ if (props.worksheet) {
+ const { visibility } = props.worksheet;
const idx = accessOptions.value.findIndex(
(item) => item.value === visibility
);
diff --git a/frontend/src/views/sql-editor/SQLEditorHomePage.vue b/frontend/src/views/sql-editor/SQLEditorHomePage.vue
index 4bbba9ba55..92c36606a4 100644
--- a/frontend/src/views/sql-editor/SQLEditorHomePage.vue
+++ b/frontend/src/views/sql-editor/SQLEditorHomePage.vue
@@ -44,12 +44,6 @@
<Quickstart v-if="actuatorStore.info?.enableSample" />
- <Drawer v-model:show="showSheetPanel">
- <DrawerContent :title="$t('sql-editor.sheet.self')">
- <SheetPanel @close="showSheetPanel = false" />
- </DrawerContent>
- </Drawer>
-
<teleport to="#sql-editor-debug">
<li>[Page]isDisconnected: {{ isDisconnected }}</li>
<li>[Page]currentTab.id: {{ currentTab?.id }}</li>
@@ -70,7 +64,7 @@ import { reactive } from "vue";
import { useRouter } from "vue-router";
import IAMRemindModal from "@/components/IAMRemindModal.vue";
import Quickstart from "@/components/Quickstart.vue";
-import { Drawer, DrawerContent } from "@/components/v2";
+import { Drawer } from "@/components/v2";
import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";
import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/router/dashboard/projectV1";
import {
@@ -84,8 +78,6 @@ import AsidePanel from "./AsidePanel";
import ConnectionPanel from "./ConnectionPanel";
import EditorPanel from "./EditorPanel";
import { provideCurrentTabViewStateContext } from "./EditorPanel/context/viewState";
-import { useSheetContext } from "./Sheet";
-import SheetPanel from "./SheetPanel";
import TabList from "./TabList";
import { useSQLEditorContext } from "./context";
@@ -109,7 +101,6 @@ const {
pendingInsertAtCaret,
} = useSQLEditorContext();
const { project: projectName, projectContextReady } = storeToRefs(editorStore);
-const { showPanel: showSheetPanel } = useSheetContext();
const { currentTab, isDisconnected } = storeToRefs(tabStore);
diff --git a/frontend/src/views/sql-editor/Sheet/common/Dropdown.vue b/frontend/src/views/sql-editor/Sheet/common/Dropdown.vue
deleted file mode 100644
index b03320325b..0000000000
--- a/frontend/src/views/sql-editor/Sheet/common/Dropdown.vue
+++ /dev/null
@@ -1,213 +0,0 @@
-<template>
- <NDropdown
- v-if="options.length > 0"
- trigger="click"
- :options="options"
- v-bind="dropdownProps"
- @select="handleAction"
- >
- <NButton size="tiny" style="--n-padding: 0 4px" quaternary>
- <template #icon>
- <EllipsisIcon
- v-if="!unsaved"
- v-show="!transparent"
- class="bb-overlay-stack-ignore-esc"
- />
- <NTooltip v-if="unsaved" placement="right">
- <template #trigger>
- <DotIcon
- :stroke-width="12"
- class="text-accent w-4 h-4 focus:outline-0"
- />
- </template>
- <template #default>
- <span>{{ $t("sql-editor.tab.unsaved") }}</span>
- </template>
- </NTooltip>
- </template>
- </NButton>
- </NDropdown>
-</template>
-
-<script lang="ts" setup>
-import { create } from "@bufbuild/protobuf";
-import { DotIcon, EllipsisIcon } from "lucide-vue-next";
-import type { DropdownProps } from "naive-ui";
-import {
- type DropdownOption,
- NDropdown,
- useDialog,
- NButton,
- NTooltip,
-} from "naive-ui";
-import { computed } from "vue";
-import { useI18n } from "vue-i18n";
-import {
- useWorkSheetStore,
- pushNotification,
- useSQLEditorTabStore,
- useTabViewStateStore,
-} from "@/store";
-import type { Worksheet } from "@/types/proto-es/v1/worksheet_service_pb";
-import {
- WorksheetSchema,
- Worksheet_Visibility,
-} from "@/types/proto-es/v1/worksheet_service_pb";
-import {
- isWorksheetWritableV1,
- getSheetStatement,
- defaultSQLEditorTab,
-} from "@/utils";
-import { useSheetContext, type SheetViewMode } from "../";
-import { useSQLEditorContext } from "../../context";
-
-const props = defineProps<{
- view: SheetViewMode;
- sheet: Worksheet;
- dropdownProps?: DropdownProps;
- secondary?: boolean;
- transparent?: boolean;
- unsaved?: boolean;
-}>();
-
-const emit = defineEmits<{
- (event: "dismiss"): void;
-}>();
-
-const { t } = useI18n();
-const worksheetV1Store = useWorkSheetStore();
-const dialog = useDialog();
-const { events } = useSheetContext();
-const { events: editorEvents } = useSQLEditorContext();
-const { removeViewState } = useTabViewStateStore();
-
-const options = computed(() => {
- const options: DropdownOption[] = [];
- const { sheet, view } = props;
-
- if (sheet.starred) {
- options.push({
- key: "unstar",
- label: t("sheet.unstar"),
- });
- } else {
- options.push({
- key: "star",
- label: t("sheet.star"),
- });
- }
-
- const canWriteSheet = isWorksheetWritableV1(sheet);
- if (canWriteSheet) {
- options.push(
- {
- key: "delete",
- label: t("common.delete"),
- },
- {
- key: "rename",
- label: t("sql-editor.tab.context-menu.actions.rename"),
- }
- );
- }
- if (view === "shared") {
- options.push({
- key: "duplicate",
- label: t("common.duplicate"),
- });
- }
-
- return options;
-});
-
-const handleAction = async (key: string) => {
- const { sheet: worksheet } = props;
- if (key === "delete") {
- const dialogInstance = dialog.create({
- title: t("sheet.hint-tips.confirm-to-delete-this-sheet"),
- type: "info",
- autoFocus: false,
- closable: false,
- maskClosable: false,
- closeOnEsc: false,
- async onPositiveClick() {
- try {
- dialogInstance.loading = true;
- await worksheetV1Store.deleteWorksheetByName(worksheet.name);
- events.emit("refresh", { views: ["my", "shared", "starred"] });
- turnSheetToUnsavedTab(worksheet);
- } finally {
- dialogInstance.destroy();
- dialogInstance.loading = false;
- }
- },
- onNegativeClick() {
- dialogInstance.destroy();
- },
- negativeText: t("common.cancel"),
- positiveText: t("common.confirm"),
- showIcon: true,
- });
- } else if (key === "star" || key === "unstar") {
- await worksheetV1Store.upsertWorksheetOrganizer({
- worksheet: worksheet.name,
- starred: key === "star",
- });
- events.emit("refresh", { views: ["starred"] });
- } else if (key === "duplicate") {
- const dialogInstance = dialog.create({
- title: t("sheet.hint-tips.confirm-to-duplicate-sheet"),
- type: "info",
- autoFocus: false,
- closable: false,
- maskClosable: false,
- closeOnEsc: false,
- async onPositiveClick() {
- await worksheetV1Store.createWorksheet(
- create(WorksheetSchema, {
- title: worksheet.title,
- project: worksheet.project,
- content: worksheet.content,
- database: worksheet.database,
- visibility: Worksheet_Visibility.PRIVATE,
- })
- );
- pushNotification({
- module: "bytebase",
- style: "INFO",
- title: t("sheet.notifications.duplicate-success"),
- });
- dialogInstance.destroy();
- },
- onNegativeClick() {
- dialogInstance.destroy();
- },
- negativeText: t("common.cancel"),
- positiveText: t("common.confirm"),
- showIcon: true,
- });
- } else if (key === "rename") {
- editorEvents.emit("save-sheet", {
- tab: {
- ...defaultSQLEditorTab(),
- worksheet: worksheet.name,
- title: worksheet.title,
- statement: getSheetStatement(worksheet),
- },
- editTitle: true,
- mask: ["title"],
- });
- }
-
- emit("dismiss");
-};
-
-const turnSheetToUnsavedTab = (sheet: Worksheet) => {
- const tabStore = useSQLEditorTabStore();
- const tab = tabStore.tabList.find((tab) => tab.worksheet === sheet.name);
- if (tab) {
- tabStore.removeTab(tab);
- removeViewState(tab.id);
- }
-};
-</script>
diff --git a/frontend/src/views/sql-editor/Sheet/common/index.ts b/frontend/src/views/sql-editor/Sheet/common/index.ts
deleted file mode 100644
index 11dc56b305..0000000000
--- a/frontend/src/views/sql-editor/Sheet/common/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import Dropdown from "./Dropdown.vue";
-
-export { Dropdown };
diff --git a/frontend/src/views/sql-editor/Sheet/context.ts b/frontend/src/views/sql-editor/Sheet/context.ts
index d82e029f74..6b20f732df 100644
--- a/frontend/src/views/sql-editor/Sheet/context.ts
+++ b/frontend/src/views/sql-editor/Sheet/context.ts
@@ -1,41 +1,92 @@
+import { useDebounceFn } from "@vueuse/core";
import Emittery from "emittery";
-import { storeToRefs } from "pinia";
-import type { InjectionKey, Ref } from "vue";
-import { inject, provide, ref, computed } from "vue";
+import { orderBy, isEqual } from "lodash-es";
+import type { TreeOption } from "naive-ui";
+import scrollIntoView from "scroll-into-view-if-needed";
+import type { InjectionKey, Ref, ComputedRef } from "vue";
+import { inject, provide, ref, computed, watch, nextTick } from "vue";
import { t } from "@/plugins/i18n";
import {
pushNotification,
useDatabaseV1Store,
- useSQLEditorStore,
useSQLEditorTabStore,
useWorkSheetStore,
+ useCurrentUserV1,
} from "@/store";
+import { DEBOUNCE_SEARCH_DELAY } from "@/types";
import type { SQLEditorTab } from "@/types";
-import type { Worksheet } from "@/types/proto-es/v1/worksheet_service_pb";
+import {
+ Worksheet_Visibility,
+ type Worksheet,
+} from "@/types/proto-es/v1/worksheet_service_pb";
import {
emptySQLEditorConnection,
getSheetStatement,
isWorksheetReadableV1,
+ extractWorksheetUID,
suggestedTabTitleForSQLEditorConnection,
} from "@/utils";
+import { useDynamicLocalStorage } from "@/utils";
import { setDefaultDataSourceForConn } from "../EditorCommon";
import type { SQLEditorContext } from "../context";
+import { useFolderByView } from "./folder";
import type { SheetViewMode } from "./types";
-type SheetEvents = Emittery<{
- refresh: { views: SheetViewMode[] };
- "add-sheet": undefined;
+type SheetTreeEvents = Emittery<{
+ "on-built": { viewMode: SheetViewMode };
}>;
-const useSheetListByView = (viewMode: SheetViewMode) => {
- const sheetStore = useWorkSheetStore();
+export interface WorsheetFolderNode extends TreeOption {
+ key: string;
+ label: string;
+ editable: boolean;
+ empty?: boolean;
+ worksheet?: Worksheet;
+ children: WorsheetFolderNode[];
+}
+
+interface WorksheetFilter {
+ keyword: string;
+ onlyShowStarred: boolean;
+ showMine: boolean;
+ showShared: boolean;
+ showDraft: boolean;
+}
- const { project } = storeToRefs(useSQLEditorStore());
+const useSheetTreeByView = (
+ viewMode: SheetViewMode,
+ filter: ComputedRef<WorksheetFilter>
+) => {
+ const sheetStore = useWorkSheetStore();
+ const folderContext = useFolderByView(viewMode);
+ const me = useCurrentUserV1();
+ const events: SheetTreeEvents = new Emittery();
const isInitialized = ref(false);
const isLoading = ref(false);
+
+ const rootNodeLabel = computed(() => {
+ switch (viewMode) {
+ case "my":
+ return t("sheet.mine");
+ case "shared":
+ return t("sheet.shared");
+ default:
+ return "";
+ }
+ });
+
+ const getRootTreeNode = (): WorsheetFolderNode => ({
+ isLeaf: false,
+ children: [],
+ key: folderContext.rootPath.value,
+ label: rootNodeLabel.value,
+ editable: false,
+ });
+ const sheetTree = ref<WorsheetFolderNode>(getRootTreeNode());
+
const sheetList = computed(() => {
- let list = [];
+ let list: Worksheet[] = [];
switch (viewMode) {
case "my":
list = sheetStore.myWorksheetList;
@@ -43,29 +94,150 @@ const useSheetListByView = (viewMode: SheetViewMode) => {
case "shared":
list = sheetStore.sharedWorksheetList;
break;
- case "starred":
- list = sheetStore.starredWorksheetList;
- break;
+ default:
+ return [];
}
- return list.filter((worksheet) => {
- return !project.value || worksheet.project === project.value;
+ if (filter.value.onlyShowStarred) {
+ return list.filter((sheet) => sheet.starred);
+ }
+ return list;
+ });
+
+ const getPathesForWorksheet = (worksheet: Worksheet): string[] => {
+ const pathes = [folderContext.rootPath.value];
+ let currentPath = folderContext.rootPath.value;
+
+ for (const folder of worksheet.folders) {
+ currentPath = folderContext.ensureFolderPath(`${currentPath}/${folder}`);
+ pathes.push(currentPath);
+ }
+
+ return pathes;
+ };
+
+ const getPwdForWorksheet = (worksheet: Worksheet): string => {
+ return folderContext.ensureFolderPath(
+ [folderContext.rootPath.value, ...worksheet.folders].join("/")
+ );
+ };
+
+ const getKeyForWorksheet = (worksheet: Worksheet): string => {
+ return [
+ getPwdForWorksheet(worksheet),
+ `bytebase-worksheets-${extractWorksheetUID(worksheet.name)}`,
+ ].join("/");
+ };
+
+ const getFoldersForWorksheet = (path: string): string[] => {
+ return path
+ .replace(folderContext.rootPath.value, "")
+ .split("/")
+ .slice(0, -1) // the last element should be the getKeyForWorksheet(worksheet)
+ .filter((p) => p);
+ };
+
+ // Extract only tree-relevant properties to avoid rebuilding on unrelated changes
+ // (e.g., starred, content, visibility changes should NOT trigger rebuild)
+ const treeRelevantSheetData = computed(() => {
+ return sheetList.value.map((worksheet) => ({
+ name: worksheet.name,
+ title: worksheet.title,
+ folders: worksheet.folders,
+ }));
+ });
+
+ const buildTree = (
+ parent: WorsheetFolderNode,
+ worksheetsByFolder: Map<string, Worksheet[]>
+ ) => {
+ parent.children = folderContext
+ .listSubFolders(parent.key)
+ .map((folder) => ({
+ isLeaf: false,
+ children: [],
+ key: folder,
+ label: folder.split("/").slice(-1)[0],
+ editable: true,
+ }));
+
+ let empty = true;
+ for (const childNode of parent.children) {
+ const subtree = buildTree(childNode, worksheetsByFolder);
+ if (!subtree.empty) {
+ empty = false;
+ }
+ }
+
+ const sheets = orderBy(
+ worksheetsByFolder.get(parent.key) || [],
+ (item) => item.title
+ ).map((worksheet) => {
+ return {
+ isLeaf: true,
+ key: getKeyForWorksheet(worksheet),
+ label: worksheet.title,
+ worksheet,
+ editable: true,
+ children: [],
+ };
});
+
+ parent.children.push(...sheets);
+ parent.empty = sheets.length === 0 && empty;
+
+ return parent;
+ };
+
+ const folderTree = computed(() => buildTree(getRootTreeNode(), new Map()));
+
+ const rebuildTree = useDebounceFn(() => {
+ const worksheetsByFolder = new Map<string, Worksheet[]>();
+ for (const worksheet of sheetList.value) {
+ const pwd = getPwdForWorksheet(worksheet);
+ if (!worksheetsByFolder.has(pwd)) {
+ worksheetsByFolder.set(pwd, []);
+ }
+ worksheetsByFolder.get(pwd)!.push(worksheet);
+ }
+
+ sheetTree.value = buildTree(getRootTreeNode(), worksheetsByFolder);
+ events.emit("on-built", { viewMode });
+ }, DEBOUNCE_SEARCH_DELAY);
+
+ // Watch only relevant properties: folder structure and worksheet name/folders
+ // No deep watch needed - computed will track changes to name, folders automatically
+ watch([() => folderContext.folders.value, treeRelevantSheetData], () => {
+ rebuildTree();
});
- const fetchSheetList = async () => {
+ const fetchSheetList = async (project: string) => {
isLoading.value = true;
+ const filter = [];
+ if (project) {
+ filter.push(`project == "${project}"`);
+ }
try {
switch (viewMode) {
case "my":
- await sheetStore.fetchMyWorksheetList();
+ filter.push(`creator == "users/${me.value.email}"`);
break;
case "shared":
- await sheetStore.fetchSharedWorksheetList();
- break;
- case "starred":
- await sheetStore.fetchStarredWorksheetList();
+ filter.push(
+ `creator != "users/${me.value.email}"`,
+ `visibility in ["${Worksheet_Visibility[Worksheet_Visibility.PROJECT_READ]}","${Worksheet_Visibility[Worksheet_Visibility.PROJECT_WRITE]}"]`
+ );
break;
}
+ await sheetStore.fetchWorksheetList(filter.join(" && "));
+
+ const folderPathes = new Set<string>([]);
+ for (const worksheet of sheetList.value) {
+ for (const path of getPathesForWorksheet(worksheet)) {
+ folderPathes.add(path);
+ }
+ }
+ folderContext.mergeFolders(folderPathes);
+ rebuildTree();
isInitialized.value = true;
} finally {
@@ -74,19 +246,31 @@ const useSheetListByView = (viewMode: SheetViewMode) => {
};
return {
+ events,
isInitialized,
isLoading,
+ sheetTree,
+ folderTree,
sheetList,
fetchSheetList,
+ folderContext,
+ getKeyForWorksheet,
+ getFoldersForWorksheet,
+ getPathesForWorksheet,
+ getPwdForWorksheet,
};
};
export type SheetContext = {
- showPanel: Ref<boolean>;
- isFetching: Ref<boolean>;
view: Ref<SheetViewMode>;
- views: Record<SheetViewMode, ReturnType<typeof useSheetListByView>>;
- events: SheetEvents;
+ views: Record<SheetViewMode, ReturnType<typeof useSheetTreeByView>>;
+ filter: Ref<WorksheetFilter>;
+ filterChanged: ComputedRef<boolean>;
+ expandedKeys: Ref<Set<string>>;
+ selectedKeys: Ref<string[]>;
+ editingNode: Ref<{ node: WorsheetFolderNode; rawLabel: string } | undefined>;
+ isWorksheetCreator: (worksheet: Worksheet) => boolean;
+ batchUpdateWorksheetFolders: (worksheets: Worksheet[]) => Promise<void>;
};
export const KEY = Symbol("bb.sql-editor.sheet") as InjectionKey<SheetContext>;
@@ -100,22 +284,140 @@ export const useSheetContextByView = (view: SheetViewMode) => {
return context.views[view];
};
+export const revealWorksheets = (
+ node: WorsheetFolderNode,
+ callback: (node: WorsheetFolderNode) => Worksheet | undefined
+): Worksheet[] => {
+ if (node.worksheet) {
+ const worksheet = callback(node);
+ return worksheet ? [worksheet] : [];
+ }
+
+ const worksheets: Worksheet[] = [];
+ for (const child of node.children) {
+ worksheets.push(...revealWorksheets(child, callback));
+ }
+ return worksheets;
+};
+
export const provideSheetContext = () => {
- const context: SheetContext = {
- showPanel: ref(false),
- isFetching: ref(false),
- view: ref("my"),
- views: {
- my: useSheetListByView("my"),
- shared: useSheetListByView("shared"),
- starred: useSheetListByView("starred"),
+ const me = useCurrentUserV1();
+ const tabStore = useSQLEditorTabStore();
+ const worksheetV1Store = useWorkSheetStore();
+
+ const initialFilter = computed(
+ (): WorksheetFilter => ({
+ keyword: "",
+ showShared: true,
+ showMine: true,
+ showDraft: true,
+ onlyShowStarred: false,
+ })
+ );
+ const filter = useDynamicLocalStorage<WorksheetFilter>(
+ computed(() => `bb.sql-editor.worksheet-filter.${me.value.name}`),
+ {
+ ...initialFilter.value,
+ }
+ );
+ const filterChanged = computed(
+ () => !isEqual(filter.value, initialFilter.value)
+ );
+
+ const views = {
+ my: useSheetTreeByView(
+ "my",
+ computed(() => filter.value)
+ ),
+ shared: useSheetTreeByView(
+ "shared",
+ computed(() => filter.value)
+ ),
+ };
+
+ const expandedKeys = useDynamicLocalStorage<Set<string>>(
+ computed(() => `bb.sql-editor.worksheet-tree-expand-keys.${me.value.name}`),
+ new Set([
+ ...Object.values(views).map((item) => item.folderContext.rootPath.value),
+ ])
+ );
+ const selectedKeys = ref<string[]>([]);
+
+ const isWorksheetCreator = (worksheet: Worksheet) => {
+ return worksheet.creator === `users/${me.value.email}`;
+ };
+
+ // Only watch the worksheet name, not the entire tab object
+ // This prevents unnecessary re-runs when tab statement/status/etc changes
+ watch(
+ () => tabStore.currentTab?.worksheet,
+ async (worksheetName) => {
+ selectedKeys.value = [];
+
+ if (!worksheetName) {
+ return;
+ }
+
+ const worksheet = worksheetV1Store.getWorksheetByName(worksheetName);
+ if (!worksheet) {
+ return;
+ }
+
+ const isCreator = isWorksheetCreator(worksheet);
+ const view: SheetViewMode = isCreator ? "my" : "shared";
+ const viewContext = views[view];
+
+ if (!viewContext) {
+ return;
+ }
+
+ const key = viewContext.getKeyForWorksheet(worksheet);
+ selectedKeys.value = [key];
+
+ // Expand all parent folders to make the selected node visible
+ for (const path of viewContext.getPathesForWorksheet(worksheet)) {
+ expandedKeys.value.add(path);
+ }
+
+ // Scroll the selected node into view
+ await nextTick();
+ const dom = document.querySelector(`[data-item-key="${key}"]`);
+ if (dom) {
+ scrollIntoView(dom, {
+ scrollMode: "if-needed",
+ block: "nearest",
+ });
+ }
},
- events: new Emittery(),
+ { immediate: true }
+ );
+
+ const batchUpdateWorksheetFolders = async (worksheets: Worksheet[]) => {
+ await worksheetV1Store.batchUpsertWorksheetOrganizers(
+ worksheets.map((worksheet) => ({
+ organizer: {
+ worksheet: worksheet.name,
+ starred: worksheet.starred,
+ folders: worksheet.folders,
+ },
+ updateMask: ["folders"],
+ }))
+ );
};
- context.events.on("refresh", () => {
- // Nothing todo
- });
+ const context: SheetContext = {
+ expandedKeys,
+ selectedKeys,
+ view: ref("my"),
+ views,
+ filter,
+ filterChanged,
+ isWorksheetCreator,
+ editingNode: ref<
+ { node: WorsheetFolderNode; rawLabel: string } | undefined
+ >(),
+ batchUpdateWorksheetFolders,
+ };
provide(KEY, context);
@@ -142,17 +444,10 @@ export const extractWorksheetConnection = async (worksheet: Worksheet) => {
export const openWorksheetByName = async (
name: string,
editorContext: SQLEditorContext,
- worksheetContext: SheetContext,
forceNewTab = false
) => {
- const cleanup = () => {
- worksheetContext.isFetching.value = false;
- };
-
- worksheetContext.isFetching.value = true;
const worksheet = await useWorkSheetStore().getOrFetchWorksheetByName(name);
if (!worksheet) {
- cleanup();
return false;
}
@@ -162,12 +457,9 @@ export const openWorksheetByName = async (
style: "CRITICAL",
title: t("common.access-denied"),
});
- cleanup();
return false;
}
- cleanup();
-
await editorContext.maybeSwitchProject(worksheet.project);
const tabStore = useSQLEditorTabStore();
const openingSheetTab = tabStore.tabList.find(
diff --git a/frontend/src/views/sql-editor/Sheet/folder.ts b/frontend/src/views/sql-editor/Sheet/folder.ts
new file mode 100644
index 0000000000..60c2dff2c6
--- /dev/null
+++ b/frontend/src/views/sql-editor/Sheet/folder.ts
@@ -0,0 +1,126 @@
+import { sortBy } from "lodash-es";
+import { computed } from "vue";
+import { useCurrentUserV1 } from "@/store";
+import { useDynamicLocalStorage } from "@/utils";
+import type { SheetViewMode } from "./types";
+
+export const useFolderByView = (viewMode: SheetViewMode) => {
+ const me = useCurrentUserV1();
+ const rootPath = computed(() => `/${viewMode}`);
+ const localCacheKey = computed(
+ () => `bb.sql-editor.worksheet-folder.${viewMode}.${me.value.name}`
+ );
+ const localCache = useDynamicLocalStorage<Set<string>>(
+ localCacheKey,
+ new Set()
+ );
+
+ const folders = computed(() => sortBy([...localCache.value]));
+
+ // A valid folder path should be like "/xxx"
+ // It must not end with "/", for example, "xxx/" is not valid
+ // It must starts with "/", like "/xxx"
+ const ensureFolderPath = (path: string) => {
+ let p = path;
+ while (p.startsWith("/")) {
+ p = p.slice(1);
+ }
+ while (p.endsWith("/")) {
+ p = p.slice(0, -1);
+ }
+ if (!p) {
+ return rootPath.value;
+ }
+ if (!p.startsWith("/")) {
+ p = `/${p}`;
+ }
+ return p;
+ };
+
+ const addFolder = (path: string) => {
+ const newPath = ensureFolderPath(path);
+ localCache.value.add(newPath);
+ return newPath;
+ };
+
+ const isSubFolder = ({
+ parent,
+ path,
+ dig,
+ }: {
+ parent: string;
+ path: string;
+ dig: boolean;
+ }) => {
+ const parentPrefix = `${parent}/`;
+ return (
+ // ensure not self
+ path !== parentPrefix &&
+ // ensure is subfolder
+ path.startsWith(parentPrefix) &&
+ dig
+ ? true
+ : !path.replace(parentPrefix, "").includes("/")
+ );
+ };
+
+ const removeFolder = (path: string) => {
+ localCache.value = new Set(
+ [...localCache.value].filter(
+ (value) =>
+ !(
+ value == path ||
+ isSubFolder({ parent: path, path: value, dig: true })
+ )
+ )
+ );
+ };
+
+ const moveFolder = (from: string, to: string) => {
+ const fromPath = ensureFolderPath(from);
+ const toPath = ensureFolderPath(to);
+
+ const pendingUpdatePathes = [];
+ for (const path of localCache.value.values()) {
+ if (
+ path === fromPath ||
+ isSubFolder({ parent: fromPath, path, dig: true })
+ ) {
+ pendingUpdatePathes.push({
+ old: path,
+ new: path.replace(fromPath, toPath),
+ });
+ }
+ }
+
+ for (const item of pendingUpdatePathes) {
+ localCache.value.delete(item.old);
+ localCache.value.add(item.new);
+ }
+ };
+
+ const mergeFolders = (pathes: Set<string>) => {
+ for (const folder of pathes.values()) {
+ const validPath = ensureFolderPath(folder);
+ localCache.value.add(validPath);
+ }
+ };
+
+ const listSubFolders = (parent: string) => {
+ return folders.value.filter((path) => {
+ return isSubFolder({ parent, path, dig: false });
+ });
+ };
+
+ return {
+ rootPath,
+ folders,
+ listSubFolders,
+ ensureFolderPath,
+ addFolder,
+ removeFolder,
+ moveFolder,
+ mergeFolders,
+ isSubFolder,
+ };
+};
diff --git a/frontend/src/views/sql-editor/Sheet/index.ts b/frontend/src/views/sql-editor/Sheet/index.ts
index f3067e997e..a39c86850d 100644
--- a/frontend/src/views/sql-editor/Sheet/index.ts
+++ b/frontend/src/views/sql-editor/Sheet/index.ts
@@ -1,3 +1,2 @@
export * from "./types";
export * from "./context";
-export * from "./common";
diff --git a/frontend/src/views/sql-editor/Sheet/types.ts b/frontend/src/views/sql-editor/Sheet/types.ts
index 7b4d7f2b57..31dfb6f435 100644
--- a/frontend/src/views/sql-editor/Sheet/types.ts
+++ b/frontend/src/views/sql-editor/Sheet/types.ts
@@ -1,2 +1,2 @@
-export const SheetViewModeList = ["my", "shared", "starred"] as const;
+export const SheetViewModeList = ["my", "shared"] as const;
export type SheetViewMode = (typeof SheetViewModeList)[number];
diff --git a/frontend/src/views/sql-editor/SheetPanel/SheetPanel.vue b/frontend/src/views/sql-editor/SheetPanel/SheetPanel.vue
deleted file mode 100644
index ee55dfd8e7..0000000000
--- a/frontend/src/views/sql-editor/SheetPanel/SheetPanel.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<template>
- <div class="w-[75vw] max-w-[calc(100vw-2rem)] relative">
- <NTabs v-model:value="view">
- <NTabPane name="my" :tab="$t('sheet.mine')">
- <SheetTable
- view="my"
- :keyword="keyword"
- @select-sheet="handleSelectSheet"
- />
- </NTabPane>
- <NTabPane name="starred" :tab="$t('sheet.starred')">
- <SheetTable
- view="starred"
- :keyword="keyword"
- @select-sheet="handleSelectSheet"
- />
- </NTabPane>
- <NTabPane name="shared" :tab="$t('sheet.shared')">
- <SheetTable
- view="shared"
- :keyword="keyword"
- @select-sheet="handleSelectSheet"
- />
- </NTabPane>
-
- <template #suffix>
- <div class="flex items-center gap-x-2">
- <SearchBox
- v-model:value="keyword"
- :placeholder="$t('sheet.search-sheets')"
- />
- <NButton type="primary" @click="handleAddSheet">
- {{ $t("common.create") }}
- </NButton>
- </div>
- </template>
- </NTabs>
- <MaskSpinner v-if="isFetching" />
- </div>
-</template>
-
-<script setup lang="ts">
-import { NButton, NTabs, NTabPane } from "naive-ui";
-import { ref } from "vue";
-import MaskSpinner from "@/components/misc/MaskSpinner.vue";
-import { SearchBox } from "@/components/v2";
-import type { Worksheet } from "@/types/proto-es/v1/worksheet_service_pb";
-import { useSheetContext, openWorksheetByName, addNewSheet } from "../Sheet";
-import { useSQLEditorContext } from "../context";
-import SheetTable from "./SheetTable";
-
-const emit = defineEmits<{
- (event: "close"): void;
-}>();
-
-const editorContext = useSQLEditorContext();
-const worksheetContext = useSheetContext();
-const { view, isFetching, events } = worksheetContext;
-const keyword = ref("");
-
-const handleSelectSheet = async (sheet: Worksheet) => {
- if (await openWorksheetByName(sheet.name, editorContext, worksheetContext)) {
- emit("close");
- }
-};
-
-const handleAddSheet = () => {
- addNewSheet();
- emit("close");
- events.emit("add-sheet");
-};
-</script>
diff --git a/frontend/src/views/sql-editor/SheetPanel/SheetTable/SheetConnection.vue b/frontend/src/views/sql-editor/SheetPanel/SheetTable/SheetConnection.vue
deleted file mode 100644
index 376ffd435f..0000000000
--- a/frontend/src/views/sql-editor/SheetPanel/SheetTable/SheetConnection.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<template>
- <div v-if="database" class="flex items-center flex-wrap gap-1">
- <InstanceV1Name :instance="database.instanceResource" :link="false">
- <template #prefix>
- <EnvironmentV1Name
- :environment="database.effectiveEnvironmentEntity"
- :link="false"
- :show-icon="false"
- text-class=" text-control-light"
- />
- </template>
- </InstanceV1Name>
-
- <div class="flex items-center gap-x-1">
- <heroicons-outline:database />
-
- <EnvironmentV1Name
- v-if="
- formatEnvironmentName(instanceEnvironment.id) !==
- database.effectiveEnvironment
- "
- :environment="instanceEnvironment"
- :link="false"
- :show-icon="false"
- text-class=" text-control-light"
- />
-
- <DatabaseV1Name :database="database" :link="false" />
- </div>
- </div>
-</template>
-
-<script lang="ts" setup>
-import { computedAsync } from "@vueuse/core";
-import { computed } from "vue";
-import {
- DatabaseV1Name,
- InstanceV1Name,
- EnvironmentV1Name,
-} from "@/components/v2";
-import { useDatabaseV1Store, useEnvironmentV1Store } from "@/store";
-import { formatEnvironmentName, isValidDatabaseName } from "@/types";
-import type { Worksheet } from "@/types/proto-es/v1/worksheet_service_pb";
-
-const props = defineProps<{
- sheet: Worksheet;
-}>();
-const databaseStore = useDatabaseV1Store();
-
-const database = computedAsync(async () => {
- const { sheet } = props;
- if (!props.sheet.database) return undefined;
- const db = await databaseStore.getOrFetchDatabaseByName(sheet.database);
- if (!isValidDatabaseName(db.name)) return undefined;
- return db;
-});
-
-const instanceEnvironment = computed(() => {
- return useEnvironmentV1Store().getEnvironmentByName(
- database.value?.instanceResource.environment ?? ""
- );
-});
-</script>
diff --git a/frontend/src/views/sql-editor/SheetPanel/SheetTable/SheetTable.vue b/frontend/src/views/sql-editor/SheetPanel/SheetTable/SheetTable.vue
deleted file mode 100644
index d149f7cb5c..0000000000
--- a/frontend/src/views/sql-editor/SheetPanel/SheetTable/SheetTable.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-<template>
- <NDataTable
- size="small"
- :columns="columns"
- :data="sortedSheetList"
- :loading="isLoading"
- :striped="true"
- :bordered="true"
- :row-key="(sheet: Worksheet) => sheet.name"
- :row-props="getRowProps"
- />
-</template>
-
-<script lang="tsx" setup>
-import { escape, orderBy } from "lodash-es";
-import { NDataTable } from "naive-ui";
-import type { DataTableColumn } from "naive-ui";
-import { computed, onMounted } from "vue";
-import { useI18n } from "vue-i18n";
-import HumanizeDate from "@/components/misc/HumanizeDate.vue";
-import { ProjectV1Name } from "@/components/v2";
-import { useUserStore, useProjectV1Store } from "@/store";
-import { getDateForPbTimestampProtoEs } from "@/types";
-import type { Worksheet } from "@/types/proto-es/v1/worksheet_service_pb";
-import { Worksheet_Visibility } from "@/types/proto-es/v1/worksheet_service_pb";
-import { getHighlightHTMLByRegExp } from "@/utils";
-import type { SheetViewMode } from "../../Sheet";
-import { useSheetContextByView, Dropdown } from "../../Sheet";
-import SheetConnection from "./SheetConnection.vue";
-
-const props = defineProps<{
- view: SheetViewMode;
- keyword?: string;
-}>();
-
-const emit = defineEmits<{
- (event: "select-sheet", sheet: Worksheet): void;
-}>();
-
-const { t } = useI18n();
-const projectStore = useProjectV1Store();
-const userStore = useUserStore();
-const { isInitialized, isLoading, sheetList, fetchSheetList } =
- useSheetContextByView(props.view);
-
-const showCreator = computed(() => {
- return props.view === "shared" || props.view === "starred";
-});
-
-const handleSheetClick = (sheet: Worksheet) => {
- emit("select-sheet", sheet);
-};
-
-const columns = computed((): DataTableColumn<Worksheet>[] => {
- const cols: DataTableColumn<Worksheet>[] = [
- {
- title: t("common.name"),
- key: "name",
- render: (sheet) => <div v-html={titleHTML(sheet)} />,
- },
- {
- title: t("sql-editor.sheet.connection"),
- key: "connection",
- render: (sheet) => <SheetConnection sheet={sheet} />,
- },
- {
- title: t("common.project"),
- key: "project",
- render: (sheet) => (
- <ProjectV1Name project={projectForSheet(sheet)} link={false} />
- ),
- },
- {
- title: t("common.visibility"),
- key: "visibility",
- width: 150,
- render: (sheet) => visibilityDisplayName(sheet.visibility),
- },
- ];
-
- if (showCreator.value) {
- cols.push({
- title: t("common.creator"),
- key: "creator",
- render: (sheet) => creatorForSheet(sheet),
- });
- }
-
- cols.push(
- {
- title: t("common.updated-at"),
- key: "updatedAt",
- width: 180,
- render: (sheet) => (
- <HumanizeDate date={getDateForPbTimestampProtoEs(sheet.updateTime)} />
- ),
- },
- {
- title: "",
- key: "operations",
- width: 50,
- render: (sheet) => <Dropdown sheet={sheet} view={props.view} />,
- }
- );
-
- return cols;
-});
-
-const getRowProps = (sheet: Worksheet) => {
- return {
- style: "cursor: pointer;",
- onClick: () => {
- handleSheetClick(sheet);
- },
- };
-};
-
-const filteredList = computed(() => {
- const keyword = props.keyword?.toLowerCase()?.trim();
- if (!keyword) return sheetList.value;
- return sheetList.value.filter((sheet) => {
- return sheet.title.toLowerCase().includes(keyword);
- });
-});
-
-const sortedSheetList = computed(() => {
- return orderBy<Worksheet>(
- filteredList.value,
- [(sheet) => sheet.title],
- ["asc"]
- );
-});
-
-const projectForSheet = (sheet: Worksheet) => {
- return projectStore.getProjectByName(sheet.project);
-};
-
-const creatorForSheet = (sheet: Worksheet) => {
- return userStore.getUserByIdentifier(sheet.creator)?.title ?? sheet.creator;
-};
-
-const visibilityDisplayName = (visibility: Worksheet_Visibility) => {
- switch (visibility) {
- case Worksheet_Visibility.PRIVATE:
- return t("sql-editor.private");
- case Worksheet_Visibility.PROJECT_READ:
- return t("sql-editor.project-read");
- case Worksheet_Visibility.PROJECT_WRITE:
- return t("sql-editor.project-write");
- default:
- return "";
- }
-};
-
-const titleHTML = (sheet: Worksheet) => {
- const kw = props.keyword?.toLowerCase().trim();
- const { title } = sheet;
-
- if (!kw) {
- return escape(title);
- }
-
- return getHighlightHTMLByRegExp(
- escape(title),
- escape(kw),
- false /* !caseSensitive */
- );
-};
-
-onMounted(() => {
- if (!isInitialized.value) {
- fetchSheetList();
- }
-});
-</script>
diff --git a/frontend/src/views/sql-editor/SheetPanel/SheetTable/index.ts b/frontend/src/views/sql-editor/SheetPanel/SheetTable/index.ts
deleted file mode 100644
index 7c7bac0e73..0000000000
--- a/frontend/src/views/sql-editor/SheetPanel/SheetTable/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import SheetTable from "./SheetTable.vue";
-
-export default SheetTable;
diff --git a/frontend/src/views/sql-editor/SheetPanel/index.ts b/frontend/src/views/sql-editor/SheetPanel/index.ts
deleted file mode 100644
index 616a1bd733..0000000000
--- a/frontend/src/views/sql-editor/SheetPanel/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import SheetPanel from "./SheetPanel.vue";
-
-export default SheetPanel;
diff --git a/frontend/src/views/sql-editor/TabList/TabItem/Prefix.vue b/frontend/src/views/sql-editor/TabList/TabItem/Prefix.vue
index a928202514..36ee6d639f 100644
--- a/frontend/src/views/sql-editor/TabList/TabItem/Prefix.vue
+++ b/frontend/src/views/sql-editor/TabList/TabItem/Prefix.vue
@@ -1,6 +1,6 @@
<template>
<SheetConnectionIcon :tab="tab" class="w-4 h-4" />
- <heroicons-outline:user-group
+ <UsersIcon
v-if="
sheet?.visibility === Worksheet_Visibility.PROJECT_READ ||
sheet?.visibility === Worksheet_Visibility.PROJECT_WRITE
@@ -13,7 +13,7 @@
</template>
<script lang="ts" setup>
-import { WrenchIcon } from "lucide-vue-next";
+import { WrenchIcon, UsersIcon } from "lucide-vue-next";
import { computed } from "vue";
import { useWorkSheetStore } from "@/store";
import type { SQLEditorTab } from "@/types";
diff --git a/frontend/src/views/sql-editor/TabList/TabList.vue b/frontend/src/views/sql-editor/TabList/TabList.vue
index 51779378c1..ecf0dc7d92 100644
--- a/frontend/src/views/sql-editor/TabList/TabList.vue
+++ b/frontend/src/views/sql-editor/TabList/TabList.vue
@@ -76,7 +76,6 @@ import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener
import { useSQLEditorTabStore, useTabViewStateStore } from "@/store";
import type { SQLEditorTab } from "@/types";
import { defer, usePreventBackAndForward } from "@/utils";
-import { useSheetContext } from "../Sheet";
import { useSQLEditorContext } from "../context";
import BrandingLogoWrapper from "./BrandingLogoWrapper.vue";
import ContextMenu from "./ContextMenu.vue";
@@ -98,7 +97,6 @@ const state = reactive<LocalState>({
dragging: false,
hoverTabId: "",
});
-const { events: sheetEvents } = useSheetContext();
const scrollbarRef = ref<InstanceType<typeof NScrollbar>>();
const tabListRef = ref<InstanceType<typeof Draggable>>();
const { removeViewState } = useTabViewStateStore();
@@ -133,7 +131,6 @@ const handleAddTab = () => {
});
});
});
- sheetEvents.emit("add-sheet");
};
const handleRemoveTab = async (
diff --git a/frontend/src/views/sql-editor/context.ts b/frontend/src/views/sql-editor/context.ts
index 4c0eaca97c..482f94fb61 100644
--- a/frontend/src/views/sql-editor/context.ts
+++ b/frontend/src/views/sql-editor/context.ts
@@ -6,7 +6,6 @@ import { inject, provide, ref } from "vue";
import { useSQLEditorStore } from "@/store";
import type { SQLEditorTab } from "@/types";
import type { GetSchemaStringRequest_ObjectType } from "@/types/proto-es/v1/database_service_pb";
-import type { Worksheet } from "@/types/proto-es/v1/worksheet_service_pb";
export type AsidePanelTab = "SCHEMA" | "WORKSHEET" | "HISTORY";
@@ -17,7 +16,6 @@ export type SQLEditorEvents = Emittery<{
"save-sheet": {
tab: SQLEditorTab;
editTitle?: boolean;
- mask?: Array<keyof Worksheet>;
};
"alter-schema": {
// Format: instances/{instance}/databases/{database}
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index 70f7f6359c..ea3ddf8b4f 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -7533,6 +7533,34 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/Status'
+ /v1/worksheets/organizer:batchUpdate:
+ patch:
+ tags:
+ - WorksheetService
+ description: |-
+ Batch update the organizers of worksheets.
+ The access is the same as UpdateWorksheet method.
+ Permissions required: bb.worksheets.get (or creator, or project member for shared worksheets)
+ operationId: WorksheetService_BatchUpdateWorksheetOrganizer
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/BatchUpdateWorksheetOrganizerRequest'
+ required: true
+ responses:
+ "200":
+ description: OK
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/BatchUpdateWorksheetOrganizerResponse'
+ default:
+ description: Default error response
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/Status'
/v1/worksheets/{worksheet}:
get:
tags:
@@ -8790,6 +8818,22 @@ components:
BatchUpdateIssuesStatusResponse:
type: object
properties: {}
+ BatchUpdateWorksheetOrganizerRequest:
+ required:
+ - requests
+ type: object
+ properties:
+ requests:
+ type: array
+ items:
+ $ref: '#/components/schemas/UpdateWorksheetOrganizerRequest'
+ BatchUpdateWorksheetOrganizerResponse:
+ type: object
+ properties:
+ worksheetOrganizers:
+ type: array
+ items:
+ $ref: '#/components/schemas/WorksheetOrganizer'
Binding:
type: object
properties:
@@ -13388,6 +13432,7 @@ components:
- creator: the worksheet creator in "users/{email}" format, support "==" and "!=" operator.
- starred: should be "true" or "false", filter starred/unstarred sheets, support "==" operator.
- visibility: check Visibility enum in the Worksheet message for values, support "==" and "in [xx]" operator.
+ - project: the project full name in "projects/{id}" format, support "==" operator.
For example:
creator == "users/{email}"
@@ -13396,6 +13441,7 @@ components:
starred == false
visibility in ["PRIVATE", "PROJECT_READ", "PROJECT_WRITE"]
visibility == "PRIVATE"
+ project == "projects/{project resource id}"
SearchWorksheetsResponse:
type: object
properties:
@@ -14415,6 +14461,32 @@ components:
description: |-
If set to true, and the instance is not found, a new instance will be created.
In this situation, `update_mask` is ignored.
+ UpdateWorksheetOrganizerRequest:
+ required:
+ - organizer
+ type: object
+ properties:
+ organizer:
+ allOf:
+ - $ref: '#/components/schemas/WorksheetOrganizer'
+ description: |-
+ The organizer to update.
+
+ The organizer's `worksheet` field is used to identify the worksheet.
+ Format: worksheets/{worksheet}
+ updateMask:
+ type: string
+ description: |-
+ The list of fields to be updated.
+ Fields are specified relative to the worksheet organizer.
+ Only support update the following fields for now:
+ - `starred`
+ format: field-mask
+ allowMissing:
+ type: boolean
+ description: |-
+ If set to true, and the worksheet organizer is not found, a new worksheet organizer will be created.
+ In this situation, `update_mask` is ignored.
User:
type: object
properties:
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 112a5a50c3..05f47201f4 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -678,6 +678,8 @@
- [SubscriptionService](#bytebase-v1-SubscriptionService)
- [v1/worksheet_service.proto](#v1_worksheet_service-proto)
+ - [BatchUpdateWorksheetOrganizerRequest](#bytebase-v1-BatchUpdateWorksheetOrganizerRequest)
+ - [BatchUpdateWorksheetOrganizerResponse](#bytebase-v1-BatchUpdateWorksheetOrganizerResponse)
- [CreateWorksheetRequest](#bytebase-v1-CreateWorksheetRequest)
- [DeleteWorksheetRequest](#bytebase-v1-DeleteWorksheetRequest)
- [GetWorksheetRequest](#bytebase-v1-GetWorksheetRequest)
@@ -10919,6 +10921,36 @@ SubscriptionService manages enterprise subscriptions and licensing.
+<a name="bytebase-v1-BatchUpdateWorksheetOrganizerRequest"></a>
+
+### BatchUpdateWorksheetOrganizerRequest
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| requests | [UpdateWorksheetOrganizerRequest](#bytebase-v1-UpdateWorksheetOrganizerRequest) | repeated | |
+
+
+
+
+
+
+<a name="bytebase-v1-BatchUpdateWorksheetOrganizerResponse"></a>
+
+### BatchUpdateWorksheetOrganizerResponse
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| worksheet_organizers | [WorksheetOrganizer](#bytebase-v1-WorksheetOrganizer) | repeated | |
+
+
+
+
+
+
<a name="bytebase-v1-CreateWorksheetRequest"></a>
### CreateWorksheetRequest
@@ -10974,9 +11006,9 @@ SubscriptionService manages enterprise subscriptions and licensing.
| ----- | ---- | ----- | ----------- |
| 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: - creator: the worksheet 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 sheets, support &#34;==&#34; operator. - visibility: check Visibility enum in the Worksheet message for values, support &#34;==&#34; and &#34;in [xx]&#34; operator.
+Supported filter: - creator: the worksheet 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 sheets, support &#34;==&#34; operator. - visibility: check Visibility enum in the Worksheet message for values, support &#34;==&#34; and &#34;in [xx]&#34; operator. - project: the project full name in &#34;projects/{id}&#34; format, support &#34;==&#34; operator.
-For example: creator == &#34;users/{email}&#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; |
+For example: creator == &#34;users/{email}&#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; project == &#34;projects/{project resource id}&#34; |
@@ -11110,6 +11142,7 @@ WorksheetService manages SQL worksheets for query development.
| SearchWorksheets | [SearchWorksheetsRequest](#bytebase-v1-SearchWorksheetsRequest) | [SearchWorksheetsResponse](#bytebase-v1-SearchWorksheetsResponse) | Search for worksheets. This is used for finding my worksheets or worksheets shared by other people. The sheet accessibility is the same as GetWorksheet(). Permissions required: bb.worksheets.get (or creator, or project member for shared worksheets) |
| UpdateWorksheet | [UpdateWorksheetRequest](#bytebase-v1-UpdateWorksheetRequest) | [Worksheet](#bytebase-v1-Worksheet) | Update a worksheet. The users can access this method if, - they are the creator of the worksheet; - they have bb.worksheets.manage permission on the workspace; - the sheet 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 worksheets) |
| UpdateWorksheetOrganizer | [UpdateWorksheetOrganizerRequest](#bytebase-v1-UpdateWorksheetOrganizerRequest) | [WorksheetOrganizer](#bytebase-v1-WorksheetOrganizer) | Update the organizer of a worksheet. The access is the same as UpdateWorksheet method. Permissions required: bb.worksheets.get (or creator, or project member for shared worksheets) |
+| BatchUpdateWorksheetOrganizer | [BatchUpdateWorksheetOrganizerRequest](#bytebase-v1-BatchUpdateWorksheetOrganizerRequest) | [BatchUpdateWorksheetOrganizerResponse](#bytebase-v1-BatchUpdateWorksheetOrganizerResponse) | Batch update the organizers of worksheets. The access is the same as UpdateWorksheet method. Permissions required: bb.worksheets.get (or creator, or project member for shared worksheets) |
| DeleteWorksheet | [DeleteWorksheetRequest](#bytebase-v1-DeleteWorksheetRequest) | [.google.protobuf.Empty](#google-protobuf-Empty) | Delete a worksheet. The access is the same as UpdateWorksheet method. Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE worksheets) |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index c1e424b6b0..8c36310c40 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -2761,6 +2761,14 @@
<a href="#v1%2fworksheet_service.proto">v1/worksheet_service.proto</a>
<ul>
+ <li>
+ <a href="#bytebase.v1.BatchUpdateWorksheetOrganizerRequest"><span class="badge">M</span>BatchUpdateWorksheetOrganizerRequest</a>
+ </li>
+
+ <li>
+ <a href="#bytebase.v1.BatchUpdateWorksheetOrganizerResponse"><span class="badge">M</span>BatchUpdateWorksheetOrganizerResponse</a>
+ </li>
+
<li>
<a href="#bytebase.v1.CreateWorksheetRequest"><span class="badge">M</span>CreateWorksheetRequest</a>
</li>
@@ -30551,6 +30559,54 @@ Permissions required: bb.settings.set</p></td>
<p></p>
+ <h3 id="bytebase.v1.BatchUpdateWorksheetOrganizerRequest">BatchUpdateWorksheetOrganizerRequest</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>requests</td>
+ <td><a href="#bytebase.v1.UpdateWorksheetOrganizerRequest">UpdateWorksheetOrganizerRequest</a></td>
+ <td>repeated</td>
+ <td><p> </p></td>
+ </tr>
+
+ </tbody>
+ </table>
+
+
+
+
+
+ <h3 id="bytebase.v1.BatchUpdateWorksheetOrganizerResponse">BatchUpdateWorksheetOrganizerResponse</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>worksheet_organizers</td>
+ <td><a href="#bytebase.v1.WorksheetOrganizer">WorksheetOrganizer</a></td>
+ <td>repeated</td>
+ <td><p> </p></td>
+ </tr>
+
+ </tbody>
+ </table>
+
+
+
+
+
<h3 id="bytebase.v1.CreateWorksheetRequest">CreateWorksheetRequest</h3>
<p></p>
@@ -30646,6 +30702,7 @@ Supported filter:
- creator: the worksheet 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 sheets, support &#34;==&#34; operator.
- visibility: check Visibility enum in the Worksheet message for values, support &#34;==&#34; and &#34;in [xx]&#34; operator.
+- project: the project full name in &#34;projects/{id}&#34; format, support &#34;==&#34; operator.
For example:
creator == &#34;users/{email}&#34;
@@ -30653,7 +30710,8 @@ 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; </p></td>
+visibility == &#34;PRIVATE&#34;
+project == &#34;projects/{project resource id}&#34; </p></td>
</tr>
</tbody>
@@ -31021,6 +31079,15 @@ The access is the same as UpdateWorksheet method.
Permissions required: bb.worksheets.get (or creator, or project member for shared worksheets)</p></td>
</tr>
+ <tr>
+ <td>BatchUpdateWorksheetOrganizer</td>
+ <td><a href="#bytebase.v1.BatchUpdateWorksheetOrganizerRequest">BatchUpdateWorksheetOrganizerRequest</a></td>
+ <td><a href="#bytebase.v1.BatchUpdateWorksheetOrganizerResponse">BatchUpdateWorksheetOrganizerResponse</a></td>
+ <td><p>Batch update the organizers of worksheets.
+The access is the same as UpdateWorksheet method.
+Permissions required: bb.worksheets.get (or creator, or project member for shared worksheets)</p></td>
+ </tr>
+
<tr>
<td>DeleteWorksheet</td>
<td><a href="#bytebase.v1.DeleteWorksheetRequest">DeleteWorksheetRequest</a></td>
@@ -31100,6 +31167,16 @@ Permissions required: bb.worksheets.manage (or creator, or project member for PR
+ <tr>
+ <td>BatchUpdateWorksheetOrganizer</td>
+ <td>PATCH</td>
+ <td>/v1/worksheets/organizer:batchUpdate</td>
+ <td>*</td>
+ </tr>
+
+
+
+
<tr>
<td>DeleteWorksheet</td>
<td>DELETE</td>
diff --git a/proto/v1/v1/worksheet_service.proto b/proto/v1/v1/worksheet_service.proto
index 8d704eca54..309397d0a5 100644
--- a/proto/v1/v1/worksheet_service.proto
+++ b/proto/v1/v1/worksheet_service.proto
@@ -77,6 +77,17 @@ service WorksheetService {
option (bytebase.v1.auth_method) = CUSTOM;
}
+ // Batch update the organizers of worksheets.
+ // The access is the same as UpdateWorksheet method.
+ // Permissions required: bb.worksheets.get (or creator, or project member for shared worksheets)
+ rpc BatchUpdateWorksheetOrganizer(BatchUpdateWorksheetOrganizerRequest) returns (BatchUpdateWorksheetOrganizerResponse) {
+ option (google.api.http) = {
+ patch: "/v1/worksheets/organizer:batchUpdate"
+ body: "*"
+ };
+ option (bytebase.v1.auth_method) = CUSTOM;
+ }
+
// Delete a worksheet.
// The access is the same as UpdateWorksheet method.
// Permissions required: bb.worksheets.manage (or creator, or project member for PROJECT_WRITE worksheets)
@@ -116,6 +127,14 @@ message UpdateWorksheetRequest {
google.protobuf.FieldMask update_mask = 2;
}
+message BatchUpdateWorksheetOrganizerRequest {
+ repeated UpdateWorksheetOrganizerRequest requests = 1 [(google.api.field_behavior) = REQUIRED];
+}
+
+message BatchUpdateWorksheetOrganizerResponse {
+ repeated WorksheetOrganizer worksheet_organizers = 1;
+}
+
message UpdateWorksheetOrganizerRequest {
// The organizer to update.
//
@@ -159,6 +178,7 @@ message SearchWorksheetsRequest {
// - creator: the worksheet creator in "users/{email}" format, support "==" and "!=" operator.
// - starred: should be "true" or "false", filter starred/unstarred sheets, support "==" operator.
// - visibility: check Visibility enum in the Worksheet message for values, support "==" and "in [xx]" operator.
+ // - project: the project full name in "projects/{id}" format, support "==" operator.
//
// For example:
// creator == "users/{email}"
@@ -167,6 +187,7 @@ message SearchWorksheetsRequest {
// starred == false
// visibility in ["PRIVATE", "PROJECT_READ", "PROJECT_WRITE"]
// visibility == "PRIVATE"
+ // project == "projects/{project resource id}"
string filter = 1;
}