feat(spaces): add settings management (#6234)
This commit is contained in:
parent
cdd13ca24e
commit
854d893fc6
33 changed files with 2560 additions and 175 deletions
|
|
@ -35,7 +35,7 @@ Every memo remains an author-owned, independent resource. Placement, audience, a
|
|||
- Space archival or restoration.
|
||||
- Guests, email or external-user invitations, open enrollment, federation, or public Space discovery.
|
||||
- A generated default Space.
|
||||
- UI/UX design or a redesign of global surfaces.
|
||||
- Re-scoping user-global surfaces such as Inbox and user profiles around a Space.
|
||||
|
||||
## Research
|
||||
|
||||
|
|
@ -52,7 +52,7 @@ The research supports four choices:
|
|||
- Make Space one first-class resource with explicit membership and roles, gated by invitee acceptance.
|
||||
- Keep placement, audience, authorship, and distribution independent.
|
||||
- Represent Unassigned as a real absence of placement.
|
||||
- Eventually make Spaces visible in normal browsing and creation flows, while deferring UI/UX here.
|
||||
- Make Spaces visible in normal browsing, creation, and management flows while keeping user-global surfaces independent of the current Space.
|
||||
|
||||
Sources: [Discourse category permissions](https://meta.discourse.org/t/understanding-groups-and-category-permissions/87678), [Discourse post ownership](https://meta.discourse.org/t/changing-ownership-of-posts/276672), [Notion Teamspaces](https://www.notion.com/help/intro-to-teamspaces), [Notion sharing and permissions](https://www.notion.com/help/sharing-and-permissions), [Mastodon post visibility](https://docs.joinmastodon.org/user/posting/), and [Mastodon Lists](https://docs.joinmastodon.org/entities/List/).
|
||||
|
||||
|
|
@ -158,6 +158,8 @@ A dedicated Space service provides create, list, get, update, and hard-delete op
|
|||
|
||||
Listing Spaces returns only Spaces in which the caller has active membership; no application-wide Space listing or archive API is added. An authenticated non-member, including a pending invitee, receives `NotFound` for Space metadata, members, and feed requests.
|
||||
|
||||
Space responses returned through membership-authorized operations include the authenticated user's membership role and the accepted-member count as output-only projections. Metadata-only Space summaries, such as the summary carried by an invitation, use the default role and count values.
|
||||
|
||||
Memo responses gain an optional Space resource name, and `Visibility` adds `SPACE = 4` without renumbering existing values. The domain-to-v1 mapping is Author to `PRIVATE`, Instance to `PROTECTED`, Public to `PUBLIC`, and Space to `SPACE`. `VISIBILITY_UNSPECIFIED` remains an input sentinel: create treats it as `PRIVATE`, an explicit visibility update rejects it, and responses never return it. Visibility values are named domains and must not be compared numerically. The global default memo visibility setting continues to accept only `PRIVATE`, `PROTECTED`, and `PUBLIC`, because it cannot identify a Space.
|
||||
|
||||
Memo listing gains explicit all-readable, Unassigned, and Space scopes. Space scope requires active membership. Existing global and Space feeds exclude comments by default, and Space identity is not added to the CEL filter schema.
|
||||
|
|
@ -166,6 +168,10 @@ Placement and audience use the existing memo update mechanism so the memo author
|
|||
|
||||
MCP memo operations reuse the same memo policy; Space management is not exposed through MCP in the initial version.
|
||||
|
||||
### UI shape
|
||||
|
||||
The active Space scopes collaborative resource browsing and creation, including Home and attachment lists. Inbox and user profiles remain user-global and their routes do not inherit the active Space. Global Settings provides a Spaces section for viewing received invitations and managing joined Spaces, metadata, members, roles, and pending invitations; it is a management surface rather than another Space switcher.
|
||||
|
||||
### Security invariants
|
||||
|
||||
Before `SPACE` can be stored, one shared, memo-local, fail-closed policy must cover point reads, lists and counts, files, reactions, relations, notifications, email, webhooks, shares, search, statistics, public feeds, and MCP. Child resources resolve the memo they directly belong to. Application `ADMIN` receives no implicit bypass.
|
||||
|
|
@ -181,7 +187,7 @@ OR SPACE + active membership in memo.space_id
|
|||
|
||||
CEL filters may only narrow this predicate. Space membership is checked per request or through immediately invalidated cache state. Write paths validate membership and placement as part of their ordinary operation. Missing or unreadable notification subjects and relation endpoints fail closed without leaking partial metadata. Broader serialization between concurrent membership, placement, and memo mutations remains deferred.
|
||||
|
||||
Live refresh is an authenticated, subject-free cache-invalidation channel. Successful memo, reaction, Space, invitation, and membership mutations broadcast only `{"type":"memo.changed"}` to connected clients. The event carries no resource name, audience, actor, invitation, or membership data; clients invalidate memo-backed caches and refetch through ordinary authorization. SSE does not materialize recipient sets or perform memo-level authorization.
|
||||
Live refresh is an authenticated, subject-free cache-invalidation channel. Successful memo and reaction mutations broadcast `{"type":"memo.changed"}`; successful Space, invitation, and membership mutations broadcast `{"type":"space.changed"}`. Neither event carries a resource name, audience, actor, invitation, or membership data. Clients invalidate the corresponding Space- and memo-backed caches and refetch through ordinary authorization. SSE does not materialize recipient sets or perform memo-level authorization.
|
||||
|
||||
Notifications are authorized when presented. Email and user webhook payloads are authorized before entering the existing asynchronous queue; the initial version does not cancel a prepared delivery when access changes while it is queued. A comment webhook requires both the comment and its context memo to be readable by the webhook owner when the event is prepared. A deleted-memo webhook is built only from an author-readable pre-delete snapshot.
|
||||
|
||||
|
|
@ -207,6 +213,4 @@ Files for `PRIVATE`, `PROTECTED`, and `SPACE` memos use `private, no-store`; pub
|
|||
|
||||
## Deferred design
|
||||
|
||||
UI/UX is explicitly out of scope, including navigation, editor controls, membership screens, warnings, and confirmation flows.
|
||||
|
||||
Email and external-user invitations, invitation expiration, inviter attribution, invitation history, open enrollment, account erasure beyond the membership guard, notification delivery and retention policy, application-admin moderation and recovery, audit history, soft deletion, restoration, retryable external-object cleanup, delivery-time cancellation of queued email/webhooks, broader concurrent-mutation hardening, and asynchronous deletion of very large Spaces remain deferred. Later work must preserve invitee consent, independent memo authorization, non-propagating relations, and explicit Space aggregate deletion unless this design is revisited.
|
||||
|
|
|
|||
|
|
@ -149,6 +149,14 @@ message Space {
|
|||
|
||||
// Optional. A description of the space.
|
||||
string description = 3 [(google.api.field_behavior) = OPTIONAL];
|
||||
|
||||
// Output only. The authenticated user's membership role in this space.
|
||||
// ROLE_UNSPECIFIED when this Space is exposed as metadata-only.
|
||||
SpaceMember.Role current_user_role = 4 [(google.api.field_behavior) = OUTPUT_ONLY];
|
||||
|
||||
// Output only. The number of accepted members in this space. Pending
|
||||
// invitations are excluded. Zero when this Space is exposed as metadata-only.
|
||||
int32 member_count = 5 [(google.api.field_behavior) = OUTPUT_ONLY];
|
||||
}
|
||||
|
||||
// SpaceMember is a user's membership and governance role in a space.
|
||||
|
|
|
|||
|
|
@ -81,7 +81,13 @@ type Space struct {
|
|||
// Required. The human-readable title.
|
||||
Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"`
|
||||
// Optional. A description of the space.
|
||||
Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
|
||||
Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
|
||||
// Output only. The authenticated user's membership role in this space.
|
||||
// ROLE_UNSPECIFIED when this Space is exposed as metadata-only.
|
||||
CurrentUserRole SpaceMember_Role `protobuf:"varint,4,opt,name=current_user_role,json=currentUserRole,proto3,enum=memos.api.v1.SpaceMember_Role" json:"current_user_role,omitempty"`
|
||||
// Output only. The number of accepted members in this space. Pending
|
||||
// invitations are excluded. Zero when this Space is exposed as metadata-only.
|
||||
MemberCount int32 `protobuf:"varint,5,opt,name=member_count,json=memberCount,proto3" json:"member_count,omitempty"`
|
||||
unknownFields protoimpl.UnknownFields
|
||||
sizeCache protoimpl.SizeCache
|
||||
}
|
||||
|
|
@ -137,6 +143,20 @@ func (x *Space) GetDescription() string {
|
|||
return ""
|
||||
}
|
||||
|
||||
func (x *Space) GetCurrentUserRole() SpaceMember_Role {
|
||||
if x != nil {
|
||||
return x.CurrentUserRole
|
||||
}
|
||||
return SpaceMember_ROLE_UNSPECIFIED
|
||||
}
|
||||
|
||||
func (x *Space) GetMemberCount() int32 {
|
||||
if x != nil {
|
||||
return x.MemberCount
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
// SpaceMember is a user's membership and governance role in a space.
|
||||
type SpaceMember struct {
|
||||
state protoimpl.MessageState `protogen:"open.v1"`
|
||||
|
|
@ -1306,11 +1326,13 @@ var File_api_v1_space_service_proto protoreflect.FileDescriptor
|
|||
|
||||
const file_api_v1_space_service_proto_rawDesc = "" +
|
||||
"\n" +
|
||||
"\x1aapi/v1/space_service.proto\x12\fmemos.api.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x19google/api/resource.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a google/protobuf/field_mask.proto\"\xa0\x01\n" +
|
||||
"\x1aapi/v1/space_service.proto\x12\fmemos.api.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x19google/api/resource.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a google/protobuf/field_mask.proto\"\x99\x02\n" +
|
||||
"\x05Space\x12\x17\n" +
|
||||
"\x04name\x18\x01 \x01(\tB\x03\xe0A\bR\x04name\x12\x19\n" +
|
||||
"\x05title\x18\x02 \x01(\tB\x03\xe0A\x02R\x05title\x12%\n" +
|
||||
"\vdescription\x18\x03 \x01(\tB\x03\xe0A\x01R\vdescription:<\xeaA9\n" +
|
||||
"\vdescription\x18\x03 \x01(\tB\x03\xe0A\x01R\vdescription\x12O\n" +
|
||||
"\x11current_user_role\x18\x04 \x01(\x0e2\x1e.memos.api.v1.SpaceMember.RoleB\x03\xe0A\x03R\x0fcurrentUserRole\x12&\n" +
|
||||
"\fmember_count\x18\x05 \x01(\x05B\x03\xe0A\x03R\vmemberCount:<\xeaA9\n" +
|
||||
"\x12memos.api.v1/Space\x12\x0espaces/{space}\x1a\x04name*\x06spaces2\x05space\"\xa2\x02\n" +
|
||||
"\vSpaceMember\x12\x17\n" +
|
||||
"\x04name\x18\x01 \x01(\tB\x03\xe0A\bR\x04name\x12-\n" +
|
||||
|
|
@ -1462,56 +1484,57 @@ var file_api_v1_space_service_proto_goTypes = []any{
|
|||
(*emptypb.Empty)(nil), // 25: google.protobuf.Empty
|
||||
}
|
||||
var file_api_v1_space_service_proto_depIdxs = []int32{
|
||||
0, // 0: memos.api.v1.SpaceMember.role:type_name -> memos.api.v1.SpaceMember.Role
|
||||
0, // 1: memos.api.v1.SpaceInvitation.role:type_name -> memos.api.v1.SpaceMember.Role
|
||||
1, // 2: memos.api.v1.SpaceInvitation.space:type_name -> memos.api.v1.Space
|
||||
1, // 3: memos.api.v1.CreateSpaceRequest.space:type_name -> memos.api.v1.Space
|
||||
1, // 4: memos.api.v1.ListSpacesResponse.spaces:type_name -> memos.api.v1.Space
|
||||
1, // 5: memos.api.v1.UpdateSpaceRequest.space:type_name -> memos.api.v1.Space
|
||||
24, // 6: memos.api.v1.UpdateSpaceRequest.update_mask:type_name -> google.protobuf.FieldMask
|
||||
3, // 7: memos.api.v1.CreateSpaceInvitationRequest.space_invitation:type_name -> memos.api.v1.SpaceInvitation
|
||||
3, // 8: memos.api.v1.ListSpaceInvitationsResponse.space_invitations:type_name -> memos.api.v1.SpaceInvitation
|
||||
3, // 9: memos.api.v1.ListUserSpaceInvitationsResponse.space_invitations:type_name -> memos.api.v1.SpaceInvitation
|
||||
2, // 10: memos.api.v1.ListSpaceMembersResponse.space_members:type_name -> memos.api.v1.SpaceMember
|
||||
2, // 11: memos.api.v1.UpdateSpaceMemberRequest.space_member:type_name -> memos.api.v1.SpaceMember
|
||||
24, // 12: memos.api.v1.UpdateSpaceMemberRequest.update_mask:type_name -> google.protobuf.FieldMask
|
||||
4, // 13: memos.api.v1.SpaceService.CreateSpace:input_type -> memos.api.v1.CreateSpaceRequest
|
||||
5, // 14: memos.api.v1.SpaceService.ListSpaces:input_type -> memos.api.v1.ListSpacesRequest
|
||||
7, // 15: memos.api.v1.SpaceService.GetSpace:input_type -> memos.api.v1.GetSpaceRequest
|
||||
8, // 16: memos.api.v1.SpaceService.UpdateSpace:input_type -> memos.api.v1.UpdateSpaceRequest
|
||||
9, // 17: memos.api.v1.SpaceService.DeleteSpace:input_type -> memos.api.v1.DeleteSpaceRequest
|
||||
10, // 18: memos.api.v1.SpaceService.CreateSpaceInvitation:input_type -> memos.api.v1.CreateSpaceInvitationRequest
|
||||
11, // 19: memos.api.v1.SpaceService.ListSpaceInvitations:input_type -> memos.api.v1.ListSpaceInvitationsRequest
|
||||
13, // 20: memos.api.v1.SpaceService.ListUserSpaceInvitations:input_type -> memos.api.v1.ListUserSpaceInvitationsRequest
|
||||
15, // 21: memos.api.v1.SpaceService.GetSpaceInvitation:input_type -> memos.api.v1.GetSpaceInvitationRequest
|
||||
16, // 22: memos.api.v1.SpaceService.DeleteSpaceInvitation:input_type -> memos.api.v1.DeleteSpaceInvitationRequest
|
||||
17, // 23: memos.api.v1.SpaceService.AcceptSpaceInvitation:input_type -> memos.api.v1.AcceptSpaceInvitationRequest
|
||||
18, // 24: memos.api.v1.SpaceService.DeclineSpaceInvitation:input_type -> memos.api.v1.DeclineSpaceInvitationRequest
|
||||
19, // 25: memos.api.v1.SpaceService.ListSpaceMembers:input_type -> memos.api.v1.ListSpaceMembersRequest
|
||||
21, // 26: memos.api.v1.SpaceService.GetSpaceMember:input_type -> memos.api.v1.GetSpaceMemberRequest
|
||||
22, // 27: memos.api.v1.SpaceService.UpdateSpaceMember:input_type -> memos.api.v1.UpdateSpaceMemberRequest
|
||||
23, // 28: memos.api.v1.SpaceService.DeleteSpaceMember:input_type -> memos.api.v1.DeleteSpaceMemberRequest
|
||||
1, // 29: memos.api.v1.SpaceService.CreateSpace:output_type -> memos.api.v1.Space
|
||||
6, // 30: memos.api.v1.SpaceService.ListSpaces:output_type -> memos.api.v1.ListSpacesResponse
|
||||
1, // 31: memos.api.v1.SpaceService.GetSpace:output_type -> memos.api.v1.Space
|
||||
1, // 32: memos.api.v1.SpaceService.UpdateSpace:output_type -> memos.api.v1.Space
|
||||
25, // 33: memos.api.v1.SpaceService.DeleteSpace:output_type -> google.protobuf.Empty
|
||||
3, // 34: memos.api.v1.SpaceService.CreateSpaceInvitation:output_type -> memos.api.v1.SpaceInvitation
|
||||
12, // 35: memos.api.v1.SpaceService.ListSpaceInvitations:output_type -> memos.api.v1.ListSpaceInvitationsResponse
|
||||
14, // 36: memos.api.v1.SpaceService.ListUserSpaceInvitations:output_type -> memos.api.v1.ListUserSpaceInvitationsResponse
|
||||
3, // 37: memos.api.v1.SpaceService.GetSpaceInvitation:output_type -> memos.api.v1.SpaceInvitation
|
||||
25, // 38: memos.api.v1.SpaceService.DeleteSpaceInvitation:output_type -> google.protobuf.Empty
|
||||
2, // 39: memos.api.v1.SpaceService.AcceptSpaceInvitation:output_type -> memos.api.v1.SpaceMember
|
||||
25, // 40: memos.api.v1.SpaceService.DeclineSpaceInvitation:output_type -> google.protobuf.Empty
|
||||
20, // 41: memos.api.v1.SpaceService.ListSpaceMembers:output_type -> memos.api.v1.ListSpaceMembersResponse
|
||||
2, // 42: memos.api.v1.SpaceService.GetSpaceMember:output_type -> memos.api.v1.SpaceMember
|
||||
2, // 43: memos.api.v1.SpaceService.UpdateSpaceMember:output_type -> memos.api.v1.SpaceMember
|
||||
25, // 44: memos.api.v1.SpaceService.DeleteSpaceMember:output_type -> google.protobuf.Empty
|
||||
29, // [29:45] is the sub-list for method output_type
|
||||
13, // [13:29] is the sub-list for method input_type
|
||||
13, // [13:13] is the sub-list for extension type_name
|
||||
13, // [13:13] is the sub-list for extension extendee
|
||||
0, // [0:13] is the sub-list for field type_name
|
||||
0, // 0: memos.api.v1.Space.current_user_role:type_name -> memos.api.v1.SpaceMember.Role
|
||||
0, // 1: memos.api.v1.SpaceMember.role:type_name -> memos.api.v1.SpaceMember.Role
|
||||
0, // 2: memos.api.v1.SpaceInvitation.role:type_name -> memos.api.v1.SpaceMember.Role
|
||||
1, // 3: memos.api.v1.SpaceInvitation.space:type_name -> memos.api.v1.Space
|
||||
1, // 4: memos.api.v1.CreateSpaceRequest.space:type_name -> memos.api.v1.Space
|
||||
1, // 5: memos.api.v1.ListSpacesResponse.spaces:type_name -> memos.api.v1.Space
|
||||
1, // 6: memos.api.v1.UpdateSpaceRequest.space:type_name -> memos.api.v1.Space
|
||||
24, // 7: memos.api.v1.UpdateSpaceRequest.update_mask:type_name -> google.protobuf.FieldMask
|
||||
3, // 8: memos.api.v1.CreateSpaceInvitationRequest.space_invitation:type_name -> memos.api.v1.SpaceInvitation
|
||||
3, // 9: memos.api.v1.ListSpaceInvitationsResponse.space_invitations:type_name -> memos.api.v1.SpaceInvitation
|
||||
3, // 10: memos.api.v1.ListUserSpaceInvitationsResponse.space_invitations:type_name -> memos.api.v1.SpaceInvitation
|
||||
2, // 11: memos.api.v1.ListSpaceMembersResponse.space_members:type_name -> memos.api.v1.SpaceMember
|
||||
2, // 12: memos.api.v1.UpdateSpaceMemberRequest.space_member:type_name -> memos.api.v1.SpaceMember
|
||||
24, // 13: memos.api.v1.UpdateSpaceMemberRequest.update_mask:type_name -> google.protobuf.FieldMask
|
||||
4, // 14: memos.api.v1.SpaceService.CreateSpace:input_type -> memos.api.v1.CreateSpaceRequest
|
||||
5, // 15: memos.api.v1.SpaceService.ListSpaces:input_type -> memos.api.v1.ListSpacesRequest
|
||||
7, // 16: memos.api.v1.SpaceService.GetSpace:input_type -> memos.api.v1.GetSpaceRequest
|
||||
8, // 17: memos.api.v1.SpaceService.UpdateSpace:input_type -> memos.api.v1.UpdateSpaceRequest
|
||||
9, // 18: memos.api.v1.SpaceService.DeleteSpace:input_type -> memos.api.v1.DeleteSpaceRequest
|
||||
10, // 19: memos.api.v1.SpaceService.CreateSpaceInvitation:input_type -> memos.api.v1.CreateSpaceInvitationRequest
|
||||
11, // 20: memos.api.v1.SpaceService.ListSpaceInvitations:input_type -> memos.api.v1.ListSpaceInvitationsRequest
|
||||
13, // 21: memos.api.v1.SpaceService.ListUserSpaceInvitations:input_type -> memos.api.v1.ListUserSpaceInvitationsRequest
|
||||
15, // 22: memos.api.v1.SpaceService.GetSpaceInvitation:input_type -> memos.api.v1.GetSpaceInvitationRequest
|
||||
16, // 23: memos.api.v1.SpaceService.DeleteSpaceInvitation:input_type -> memos.api.v1.DeleteSpaceInvitationRequest
|
||||
17, // 24: memos.api.v1.SpaceService.AcceptSpaceInvitation:input_type -> memos.api.v1.AcceptSpaceInvitationRequest
|
||||
18, // 25: memos.api.v1.SpaceService.DeclineSpaceInvitation:input_type -> memos.api.v1.DeclineSpaceInvitationRequest
|
||||
19, // 26: memos.api.v1.SpaceService.ListSpaceMembers:input_type -> memos.api.v1.ListSpaceMembersRequest
|
||||
21, // 27: memos.api.v1.SpaceService.GetSpaceMember:input_type -> memos.api.v1.GetSpaceMemberRequest
|
||||
22, // 28: memos.api.v1.SpaceService.UpdateSpaceMember:input_type -> memos.api.v1.UpdateSpaceMemberRequest
|
||||
23, // 29: memos.api.v1.SpaceService.DeleteSpaceMember:input_type -> memos.api.v1.DeleteSpaceMemberRequest
|
||||
1, // 30: memos.api.v1.SpaceService.CreateSpace:output_type -> memos.api.v1.Space
|
||||
6, // 31: memos.api.v1.SpaceService.ListSpaces:output_type -> memos.api.v1.ListSpacesResponse
|
||||
1, // 32: memos.api.v1.SpaceService.GetSpace:output_type -> memos.api.v1.Space
|
||||
1, // 33: memos.api.v1.SpaceService.UpdateSpace:output_type -> memos.api.v1.Space
|
||||
25, // 34: memos.api.v1.SpaceService.DeleteSpace:output_type -> google.protobuf.Empty
|
||||
3, // 35: memos.api.v1.SpaceService.CreateSpaceInvitation:output_type -> memos.api.v1.SpaceInvitation
|
||||
12, // 36: memos.api.v1.SpaceService.ListSpaceInvitations:output_type -> memos.api.v1.ListSpaceInvitationsResponse
|
||||
14, // 37: memos.api.v1.SpaceService.ListUserSpaceInvitations:output_type -> memos.api.v1.ListUserSpaceInvitationsResponse
|
||||
3, // 38: memos.api.v1.SpaceService.GetSpaceInvitation:output_type -> memos.api.v1.SpaceInvitation
|
||||
25, // 39: memos.api.v1.SpaceService.DeleteSpaceInvitation:output_type -> google.protobuf.Empty
|
||||
2, // 40: memos.api.v1.SpaceService.AcceptSpaceInvitation:output_type -> memos.api.v1.SpaceMember
|
||||
25, // 41: memos.api.v1.SpaceService.DeclineSpaceInvitation:output_type -> google.protobuf.Empty
|
||||
20, // 42: memos.api.v1.SpaceService.ListSpaceMembers:output_type -> memos.api.v1.ListSpaceMembersResponse
|
||||
2, // 43: memos.api.v1.SpaceService.GetSpaceMember:output_type -> memos.api.v1.SpaceMember
|
||||
2, // 44: memos.api.v1.SpaceService.UpdateSpaceMember:output_type -> memos.api.v1.SpaceMember
|
||||
25, // 45: memos.api.v1.SpaceService.DeleteSpaceMember:output_type -> google.protobuf.Empty
|
||||
30, // [30:46] is the sub-list for method output_type
|
||||
14, // [14:30] is the sub-list for method input_type
|
||||
14, // [14:14] is the sub-list for extension type_name
|
||||
14, // [14:14] is the sub-list for extension extendee
|
||||
0, // [0:14] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_api_v1_space_service_proto_init() }
|
||||
|
|
|
|||
|
|
@ -4376,6 +4376,24 @@ components:
|
|||
description:
|
||||
type: string
|
||||
description: Optional. A description of the space.
|
||||
currentUserRole:
|
||||
readOnly: true
|
||||
enum:
|
||||
- ROLE_UNSPECIFIED
|
||||
- ADMIN
|
||||
- USER
|
||||
type: string
|
||||
description: |-
|
||||
Output only. The authenticated user's membership role in this space.
|
||||
ROLE_UNSPECIFIED when this Space is exposed as metadata-only.
|
||||
format: enum
|
||||
memberCount:
|
||||
readOnly: true
|
||||
type: integer
|
||||
description: |-
|
||||
Output only. The number of accepted members in this space. Pending
|
||||
invitations are excluded. Zero when this Space is exposed as metadata-only.
|
||||
format: int32
|
||||
description: Space is a collaboration boundary for placed memos.
|
||||
SpaceInvitation:
|
||||
required:
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ func (s *APIV1Service) CreateSpace(ctx context.Context, request *v1pb.CreateSpac
|
|||
if err != nil {
|
||||
return nil, mapSpaceMutationError(err, "failed to create space")
|
||||
}
|
||||
s.SSEHub.publishMemoChanged()
|
||||
s.SSEHub.publishSpaceChanged()
|
||||
return convertSpaceFromStore(created), nil
|
||||
}
|
||||
|
||||
|
|
@ -212,7 +212,7 @@ func (s *APIV1Service) UpdateSpace(ctx context.Context, request *v1pb.UpdateSpac
|
|||
if updated == nil {
|
||||
return nil, status.Error(codes.NotFound, "space not found")
|
||||
}
|
||||
s.SSEHub.publishMemoChanged()
|
||||
s.SSEHub.publishSpaceChanged()
|
||||
return convertSpaceFromStore(updated), nil
|
||||
}
|
||||
|
||||
|
|
@ -234,7 +234,7 @@ func (s *APIV1Service) DeleteSpace(ctx context.Context, request *v1pb.DeleteSpac
|
|||
if err != nil {
|
||||
return nil, mapSpaceMutationError(err, "failed to delete space")
|
||||
}
|
||||
s.SSEHub.publishMemoChanged()
|
||||
s.SSEHub.publishSpaceChanged()
|
||||
if err := s.cleanupDeletedAttachmentStorage(ctx, deleteResult.Attachments); err != nil {
|
||||
return nil, status.Errorf(codes.Internal, "space was deleted but attachment storage cleanup failed: %v", err)
|
||||
}
|
||||
|
|
@ -288,7 +288,7 @@ func (s *APIV1Service) CreateSpaceInvitation(ctx context.Context, request *v1pb.
|
|||
if err != nil {
|
||||
return nil, mapSpaceMutationError(err, "failed to create space invitation")
|
||||
}
|
||||
s.SSEHub.publishMemoChanged()
|
||||
s.SSEHub.publishSpaceChanged()
|
||||
return convertSpaceInvitationFromStore(space, targetUser, created), nil
|
||||
}
|
||||
|
||||
|
|
@ -500,7 +500,7 @@ func (s *APIV1Service) DeleteSpaceInvitation(ctx context.Context, request *v1pb.
|
|||
}, currentUser.ID); err != nil {
|
||||
return nil, mapSpaceMutationError(err, "failed to revoke space invitation")
|
||||
}
|
||||
s.SSEHub.publishMemoChanged()
|
||||
s.SSEHub.publishSpaceChanged()
|
||||
return &emptypb.Empty{}, nil
|
||||
}
|
||||
|
||||
|
|
@ -522,7 +522,7 @@ func (s *APIV1Service) AcceptSpaceInvitation(ctx context.Context, request *v1pb.
|
|||
if err != nil {
|
||||
return nil, mapSpaceMutationError(err, "failed to accept space invitation")
|
||||
}
|
||||
s.SSEHub.publishMemoChanged()
|
||||
s.SSEHub.publishSpaceChanged()
|
||||
return convertSpaceMemberFromStore(space, currentUser, member), nil
|
||||
}
|
||||
|
||||
|
|
@ -543,7 +543,7 @@ func (s *APIV1Service) DeclineSpaceInvitation(ctx context.Context, request *v1pb
|
|||
if err := s.Store.DeclineSpaceInvitation(ctx, &store.DeclineSpaceInvitation{SpaceID: invitation.SpaceID, UserID: currentUser.ID}, currentUser.ID); err != nil {
|
||||
return nil, mapSpaceMutationError(err, "failed to decline space invitation")
|
||||
}
|
||||
s.SSEHub.publishMemoChanged()
|
||||
s.SSEHub.publishSpaceChanged()
|
||||
return &emptypb.Empty{}, nil
|
||||
}
|
||||
|
||||
|
|
@ -712,7 +712,7 @@ func (s *APIV1Service) UpdateSpaceMember(ctx context.Context, request *v1pb.Upda
|
|||
if updated == nil {
|
||||
return nil, status.Error(codes.NotFound, "space member not found")
|
||||
}
|
||||
s.SSEHub.publishMemoChanged()
|
||||
s.SSEHub.publishSpaceChanged()
|
||||
return convertSpaceMemberFromStore(space, targetUser, updated), nil
|
||||
}
|
||||
|
||||
|
|
@ -738,6 +738,6 @@ func (s *APIV1Service) DeleteSpaceMember(ctx context.Context, request *v1pb.Dele
|
|||
}, currentUser.ID); err != nil {
|
||||
return nil, mapSpaceMutationError(err, "failed to delete space member")
|
||||
}
|
||||
s.SSEHub.publishMemoChanged()
|
||||
s.SSEHub.publishSpaceChanged()
|
||||
return &emptypb.Empty{}, nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,16 @@ func buildSpaceInvitationName(spaceUID, username string) string {
|
|||
}
|
||||
|
||||
func convertSpaceFromStore(space *store.Space) *v1pb.Space {
|
||||
converted := convertSpaceMetadataFromStore(space)
|
||||
if converted == nil {
|
||||
return nil
|
||||
}
|
||||
converted.CurrentUserRole = convertSpaceMemberRoleFromStore(space.CurrentUserRole)
|
||||
converted.MemberCount = space.MemberCount
|
||||
return converted
|
||||
}
|
||||
|
||||
func convertSpaceMetadataFromStore(space *store.Space) *v1pb.Space {
|
||||
if space == nil {
|
||||
return nil
|
||||
}
|
||||
|
|
@ -69,6 +79,6 @@ func convertSpaceInvitationFromStore(space *store.Space, user *store.User, invit
|
|||
Name: buildSpaceInvitationName(space.UID, user.Username),
|
||||
Invitee: BuildUserName(user.Username),
|
||||
Role: convertSpaceMemberRoleFromStore(invitation.Role),
|
||||
Space: convertSpaceFromStore(space),
|
||||
Space: convertSpaceMetadataFromStore(space),
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,6 +66,8 @@ func TestSpaceServiceMembershipVisibilityAndGovernance(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
require.Equal(t, "spaces/team-notes", space.Name)
|
||||
require.Equal(t, "Team notes", space.Title)
|
||||
require.Equal(t, v1pb.SpaceMember_ADMIN, space.CurrentUserRole)
|
||||
require.Equal(t, int32(1), space.MemberCount)
|
||||
_, err = service.CreateSpace(userCtx(ctx, owner.ID), &v1pb.CreateSpaceRequest{
|
||||
SpaceId: "team-notes",
|
||||
Space: &v1pb.Space{Title: "Duplicate"},
|
||||
|
|
@ -89,7 +91,11 @@ func TestSpaceServiceMembershipVisibilityAndGovernance(t *testing.T) {
|
|||
})
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, "spaces/team-notes/invitations/space-member", invitation.Name)
|
||||
require.Equal(t, space, invitation.Space, "the invitation must identify the Space without granting membership access")
|
||||
require.Equal(t, space.Name, invitation.Space.Name, "the invitation must identify the Space without granting membership access")
|
||||
require.Equal(t, space.Title, invitation.Space.Title)
|
||||
require.Equal(t, space.Description, invitation.Space.Description)
|
||||
require.Equal(t, v1pb.SpaceMember_ROLE_UNSPECIFIED, invitation.Space.CurrentUserRole)
|
||||
require.Zero(t, invitation.Space.MemberCount)
|
||||
|
||||
_, err = service.GetSpace(userCtx(ctx, member.ID), &v1pb.GetSpaceRequest{Name: space.Name})
|
||||
require.Equal(t, codes.NotFound, status.Code(err), "a pending invitation must not grant Space access")
|
||||
|
|
@ -122,8 +128,22 @@ func TestSpaceServiceMembershipVisibilityAndGovernance(t *testing.T) {
|
|||
_, err = service.GetSpaceInvitation(userCtx(ctx, owner.ID), &v1pb.GetSpaceInvitationRequest{Name: invitation.Name})
|
||||
require.Equal(t, codes.NotFound, status.Code(err))
|
||||
|
||||
_, err = service.GetSpace(userCtx(ctx, member.ID), &v1pb.GetSpaceRequest{Name: space.Name})
|
||||
memberSpace, err := service.GetSpace(userCtx(ctx, member.ID), &v1pb.GetSpaceRequest{Name: space.Name})
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, v1pb.SpaceMember_USER, memberSpace.CurrentUserRole)
|
||||
require.Equal(t, int32(2), memberSpace.MemberCount)
|
||||
memberSpaces, err := service.ListSpaces(userCtx(ctx, member.ID), &v1pb.ListSpacesRequest{})
|
||||
require.NoError(t, err)
|
||||
require.Len(t, memberSpaces.Spaces, 1)
|
||||
require.Equal(t, v1pb.SpaceMember_USER, memberSpaces.Spaces[0].CurrentUserRole)
|
||||
require.Equal(t, int32(2), memberSpaces.Spaces[0].MemberCount)
|
||||
updatedSpace, err := service.UpdateSpace(userCtx(ctx, owner.ID), &v1pb.UpdateSpaceRequest{
|
||||
Space: &v1pb.Space{Name: space.Name, Title: "Updated team notes"},
|
||||
UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"title"}},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, v1pb.SpaceMember_ADMIN, updatedSpace.CurrentUserRole)
|
||||
require.Equal(t, int32(2), updatedSpace.MemberCount)
|
||||
_, err = service.UpdateSpace(userCtx(ctx, member.ID), &v1pb.UpdateSpaceRequest{
|
||||
Space: &v1pb.Space{Name: space.Name, Title: "not allowed"},
|
||||
UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"title"}},
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import "sync"
|
|||
const (
|
||||
sseClientEventBufferSize = 32
|
||||
memoChangedSSEFrame = "data: {\"type\":\"memo.changed\"}\n\n"
|
||||
spaceChangedSSEFrame = "data: {\"type\":\"space.changed\"}\n\n"
|
||||
)
|
||||
|
||||
// SSEClient represents a single SSE connection.
|
||||
|
|
@ -78,8 +79,17 @@ func (h *SSEHub) Close() {
|
|||
// Slow clients with a full buffer are disconnected so they can reconnect and
|
||||
// resynchronize instead of silently missing an event.
|
||||
func (h *SSEHub) publishMemoChanged() {
|
||||
frame := []byte(memoChangedSSEFrame)
|
||||
h.publish([]byte(memoChangedSSEFrame))
|
||||
}
|
||||
|
||||
// publishSpaceChanged tells connected clients to refresh Space-backed caches
|
||||
// and caches whose visibility or presentation depends on Space state.
|
||||
// Like memo.changed, the event carries no authorization-sensitive data.
|
||||
func (h *SSEHub) publishSpaceChanged() {
|
||||
h.publish([]byte(spaceChangedSSEFrame))
|
||||
}
|
||||
|
||||
func (h *SSEHub) publish(frame []byte) {
|
||||
var slowClients []*SSEClient
|
||||
h.mu.RLock()
|
||||
for c := range h.clients {
|
||||
|
|
|
|||
|
|
@ -83,6 +83,22 @@ func TestSSEHubPublishMemoChangedBroadcastsToSubscribers(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestSSEHubPublishSpaceChangedBroadcastsDistinctFrame(t *testing.T) {
|
||||
hub := NewSSEHub()
|
||||
first := hub.Subscribe()
|
||||
defer hub.Unsubscribe(first)
|
||||
second := hub.Subscribe()
|
||||
defer hub.Unsubscribe(second)
|
||||
|
||||
hub.publishSpaceChanged()
|
||||
|
||||
for _, client := range []*SSEClient{first, second} {
|
||||
frame := string(mustReceive(t, client.events, time.Second))
|
||||
assert.Equal(t, spaceChangedSSEFrame, frame)
|
||||
assert.NotEqual(t, memoChangedSSEFrame, frame)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSSEHubSlowClientIsDisconnected(t *testing.T) {
|
||||
hub := NewSSEHub()
|
||||
slow := hub.Subscribe()
|
||||
|
|
|
|||
|
|
@ -57,6 +57,11 @@ func requireMemoChanged(t *testing.T, ch <-chan []byte) {
|
|||
require.Equal(t, memoChangedSSEFrame, string(mustReceive(t, ch, time.Second)))
|
||||
}
|
||||
|
||||
func requireSpaceChanged(t *testing.T, ch <-chan []byte) {
|
||||
t.Helper()
|
||||
require.Equal(t, spaceChangedSSEFrame, string(mustReceive(t, ch, time.Second)))
|
||||
}
|
||||
|
||||
func requireNoMemoChanged(t *testing.T, ch <-chan []byte) {
|
||||
t.Helper()
|
||||
select {
|
||||
|
|
@ -223,7 +228,7 @@ func TestDeleteAttachmentPublishesBeforeStorageCleanupFailure(t *testing.T) {
|
|||
require.Nil(t, storedAttachment, "the database deletion must remain committed")
|
||||
}
|
||||
|
||||
func TestSpaceMutationsPublishMemoChanged(t *testing.T) {
|
||||
func TestSpaceMutationsPublishSpaceChanged(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
svc := newIntegrationService(t)
|
||||
owner := createSpaceTestUser(ctx, t, svc, "sse-space-owner", store.RoleAdmin)
|
||||
|
|
@ -237,7 +242,7 @@ func TestSpaceMutationsPublishMemoChanged(t *testing.T) {
|
|||
Space: &v1pb.Space{Title: "SSE Space"},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
requireMemoChanged(t, client.events)
|
||||
requireSpaceChanged(t, client.events)
|
||||
|
||||
space.Title = "Renamed SSE Space"
|
||||
_, err = svc.UpdateSpace(ownerCtx, &v1pb.UpdateSpaceRequest{
|
||||
|
|
@ -245,17 +250,17 @@ func TestSpaceMutationsPublishMemoChanged(t *testing.T) {
|
|||
UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"title"}},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
requireMemoChanged(t, client.events)
|
||||
requireSpaceChanged(t, client.events)
|
||||
|
||||
invitation, err := svc.CreateSpaceInvitation(ownerCtx, &v1pb.CreateSpaceInvitationRequest{
|
||||
Parent: space.Name,
|
||||
SpaceInvitation: &v1pb.SpaceInvitation{Invitee: BuildUserName(member.Username), Role: v1pb.SpaceMember_USER},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
requireMemoChanged(t, client.events)
|
||||
requireSpaceChanged(t, client.events)
|
||||
membership, err := svc.AcceptSpaceInvitation(userCtx(ctx, member.ID), &v1pb.AcceptSpaceInvitationRequest{Name: invitation.Name})
|
||||
require.NoError(t, err)
|
||||
requireMemoChanged(t, client.events)
|
||||
requireSpaceChanged(t, client.events)
|
||||
|
||||
membership.Role = v1pb.SpaceMember_ADMIN
|
||||
_, err = svc.UpdateSpaceMember(ownerCtx, &v1pb.UpdateSpaceMemberRequest{
|
||||
|
|
@ -263,15 +268,15 @@ func TestSpaceMutationsPublishMemoChanged(t *testing.T) {
|
|||
UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"role"}},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
requireMemoChanged(t, client.events)
|
||||
requireSpaceChanged(t, client.events)
|
||||
|
||||
_, err = svc.DeleteSpaceMember(ownerCtx, &v1pb.DeleteSpaceMemberRequest{Name: membership.Name})
|
||||
require.NoError(t, err)
|
||||
requireMemoChanged(t, client.events)
|
||||
requireSpaceChanged(t, client.events)
|
||||
|
||||
_, err = svc.DeleteSpace(ownerCtx, &v1pb.DeleteSpaceRequest{Name: space.Name})
|
||||
require.NoError(t, err)
|
||||
requireMemoChanged(t, client.events)
|
||||
requireSpaceChanged(t, client.events)
|
||||
}
|
||||
|
||||
func TestUpdateMemoSSEBroadcastsToAllSubscribers(t *testing.T) {
|
||||
|
|
|
|||
|
|
@ -45,6 +45,8 @@ func (d *DB) CreateSpace(ctx context.Context, create *store.Space, creatorID int
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
space.CurrentUserRole = store.SpaceMemberRoleAdmin
|
||||
space.MemberCount = 1
|
||||
if err := tx.Commit(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -53,6 +55,9 @@ func (d *DB) CreateSpace(ctx context.Context, create *store.Space, creatorID int
|
|||
|
||||
func (d *DB) ListSpaces(ctx context.Context, find *store.FindSpace) ([]*store.Space, error) {
|
||||
where, args := []string{"1 = 1"}, []any{}
|
||||
selectFields := "space.id, space.uid, space.title, space.description"
|
||||
joins := ""
|
||||
groupBy := ""
|
||||
if find.ID != nil {
|
||||
where, args = append(where, "space.id = ?"), append(args, *find.ID)
|
||||
}
|
||||
|
|
@ -68,10 +73,16 @@ func (d *DB) ListSpaces(ctx context.Context, find *store.FindSpace) ([]*store.Sp
|
|||
where, args = append(where, "space.uid = ?"), append(args, *find.UID)
|
||||
}
|
||||
if find.MemberUserID != nil {
|
||||
where, args = append(where, "EXISTS (SELECT 1 FROM space_member sm JOIN user u ON u.id = sm.user_id WHERE sm.space_id = space.id AND sm.user_id = ? AND sm.status = 'ACTIVE' AND sm.role IN ('ADMIN', 'USER') AND u.row_status = 'NORMAL')"), append(args, *find.MemberUserID)
|
||||
selectFields += ", viewer_member.role, COUNT(active_member.user_id)"
|
||||
joins = ` JOIN space_member viewer_member ON viewer_member.space_id = space.id
|
||||
JOIN user viewer_user ON viewer_user.id = viewer_member.user_id
|
||||
JOIN space_member active_member ON active_member.space_id = space.id AND active_member.status = 'ACTIVE' AND active_member.role IN ('ADMIN', 'USER')
|
||||
JOIN user active_user ON active_user.id = active_member.user_id AND active_user.row_status = 'NORMAL'`
|
||||
where = append(where, "viewer_member.user_id = ?", "viewer_member.status = 'ACTIVE'", "viewer_member.role IN ('ADMIN', 'USER')", "viewer_user.row_status = 'NORMAL'")
|
||||
args = append(args, *find.MemberUserID)
|
||||
groupBy = " GROUP BY space.id, space.uid, space.title, space.description, viewer_member.role"
|
||||
}
|
||||
query := `SELECT space.id, space.uid, space.title, space.description
|
||||
FROM space WHERE ` + strings.Join(where, " AND ") + ` ORDER BY space.id DESC`
|
||||
query := "SELECT " + selectFields + " FROM space" + joins + " WHERE " + strings.Join(where, " AND ") + groupBy + " ORDER BY space.id DESC"
|
||||
query = appendMySQLLimit(query, find.Limit, find.Offset)
|
||||
rows, err := d.db.QueryContext(ctx, query, args...)
|
||||
if err != nil {
|
||||
|
|
@ -81,7 +92,7 @@ func (d *DB) ListSpaces(ctx context.Context, find *store.FindSpace) ([]*store.Sp
|
|||
spaces := []*store.Space{}
|
||||
for rows.Next() {
|
||||
space := &store.Space{}
|
||||
if err := scanMySQLSpace(rows, space); err != nil {
|
||||
if err := scanMySQLSpaceWithSummary(rows, space, find.MemberUserID != nil); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
spaces = append(spaces, space)
|
||||
|
|
@ -116,6 +127,9 @@ func (d *DB) UpdateSpace(ctx context.Context, update *store.UpdateSpace, actorUs
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := populateMySQLSpaceSummary(ctx, tx, space, actorUserID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := tx.Commit(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -423,6 +437,24 @@ func scanMySQLSpace(row mysqlRowScanner, space *store.Space) error {
|
|||
return row.Scan(&space.ID, &space.UID, &space.Title, &space.Description)
|
||||
}
|
||||
|
||||
func scanMySQLSpaceWithSummary(row mysqlRowScanner, space *store.Space, withSummary bool) error {
|
||||
if !withSummary {
|
||||
return scanMySQLSpace(row, space)
|
||||
}
|
||||
return row.Scan(&space.ID, &space.UID, &space.Title, &space.Description, &space.CurrentUserRole, &space.MemberCount)
|
||||
}
|
||||
|
||||
func populateMySQLSpaceSummary(ctx context.Context, tx *sql.Tx, space *store.Space, userID int32) error {
|
||||
return tx.QueryRowContext(ctx, `SELECT viewer_member.role, COUNT(active_member.user_id)
|
||||
FROM space_member viewer_member
|
||||
JOIN user viewer_user ON viewer_user.id = viewer_member.user_id
|
||||
JOIN space_member active_member ON active_member.space_id = viewer_member.space_id AND active_member.status = 'ACTIVE' AND active_member.role IN ('ADMIN', 'USER')
|
||||
JOIN user active_user ON active_user.id = active_member.user_id AND active_user.row_status = 'NORMAL'
|
||||
WHERE viewer_member.space_id = ? AND viewer_member.user_id = ? AND viewer_member.status = 'ACTIVE'
|
||||
AND viewer_member.role IN ('ADMIN', 'USER') AND viewer_user.row_status = 'NORMAL'
|
||||
GROUP BY viewer_member.role`, space.ID, userID).Scan(&space.CurrentUserRole, &space.MemberCount)
|
||||
}
|
||||
|
||||
func getMySQLSpace(ctx context.Context, tx *sql.Tx, id int32) (*store.Space, error) {
|
||||
space := &store.Space{}
|
||||
return space, scanMySQLSpace(tx.QueryRowContext(ctx, `SELECT id, uid, title, description FROM space WHERE id = ?`, id), space)
|
||||
|
|
|
|||
|
|
@ -36,6 +36,8 @@ func (d *DB) CreateSpace(ctx context.Context, create *store.Space, creatorID int
|
|||
if _, err := tx.ExecContext(ctx, "INSERT INTO space_member (space_id, user_id, status, role) VALUES ($1, $2, $3, $4)", space.ID, creatorID, store.SpaceMemberStatusActive, store.SpaceMemberRoleAdmin); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
space.CurrentUserRole = store.SpaceMemberRoleAdmin
|
||||
space.MemberCount = 1
|
||||
if err := tx.Commit(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -44,6 +46,9 @@ func (d *DB) CreateSpace(ctx context.Context, create *store.Space, creatorID int
|
|||
|
||||
func (d *DB) ListSpaces(ctx context.Context, find *store.FindSpace) ([]*store.Space, error) {
|
||||
where, args := []string{"1 = 1"}, []any{}
|
||||
selectFields := "space.id, space.uid, space.title, space.description"
|
||||
joins := ""
|
||||
groupBy := ""
|
||||
add := func(condition string, value any) {
|
||||
args = append(args, value)
|
||||
where = append(where, fmt.Sprintf(condition, placeholder(len(args))))
|
||||
|
|
@ -63,10 +68,16 @@ func (d *DB) ListSpaces(ctx context.Context, find *store.FindSpace) ([]*store.Sp
|
|||
add("space.uid = %s", *find.UID)
|
||||
}
|
||||
if find.MemberUserID != nil {
|
||||
add(`EXISTS (SELECT 1 FROM space_member sm JOIN "user" u ON u.id = sm.user_id WHERE sm.space_id = space.id AND sm.user_id = %s AND sm.status = 'ACTIVE' AND sm.role IN ('ADMIN', 'USER') AND u.row_status = 'NORMAL')`, *find.MemberUserID)
|
||||
selectFields += ", viewer_member.role, COUNT(active_member.user_id)"
|
||||
joins = ` JOIN space_member viewer_member ON viewer_member.space_id = space.id
|
||||
JOIN "user" viewer_user ON viewer_user.id = viewer_member.user_id
|
||||
JOIN space_member active_member ON active_member.space_id = space.id AND active_member.status = 'ACTIVE' AND active_member.role IN ('ADMIN', 'USER')
|
||||
JOIN "user" active_user ON active_user.id = active_member.user_id AND active_user.row_status = 'NORMAL'`
|
||||
add("viewer_member.user_id = %s", *find.MemberUserID)
|
||||
where = append(where, "viewer_member.status = 'ACTIVE'", "viewer_member.role IN ('ADMIN', 'USER')", "viewer_user.row_status = 'NORMAL'")
|
||||
groupBy = " GROUP BY space.id, space.uid, space.title, space.description, viewer_member.role"
|
||||
}
|
||||
query := `SELECT space.id, space.uid, space.title, space.description
|
||||
FROM space WHERE ` + strings.Join(where, " AND ") + ` ORDER BY space.id DESC`
|
||||
query := "SELECT " + selectFields + " FROM space" + joins + " WHERE " + strings.Join(where, " AND ") + groupBy + " ORDER BY space.id DESC"
|
||||
query = appendPostgresLimit(query, find.Limit, find.Offset)
|
||||
rows, err := d.db.QueryContext(ctx, query, args...)
|
||||
if err != nil {
|
||||
|
|
@ -76,7 +87,11 @@ func (d *DB) ListSpaces(ctx context.Context, find *store.FindSpace) ([]*store.Sp
|
|||
spaces := []*store.Space{}
|
||||
for rows.Next() {
|
||||
space := &store.Space{}
|
||||
if err := rows.Scan(&space.ID, &space.UID, &space.Title, &space.Description); err != nil {
|
||||
scanTargets := []any{&space.ID, &space.UID, &space.Title, &space.Description}
|
||||
if find.MemberUserID != nil {
|
||||
scanTargets = append(scanTargets, &space.CurrentUserRole, &space.MemberCount)
|
||||
}
|
||||
if err := rows.Scan(scanTargets...); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
spaces = append(spaces, space)
|
||||
|
|
@ -113,12 +128,26 @@ func (d *DB) UpdateSpace(ctx context.Context, update *store.UpdateSpace, actorUs
|
|||
if err := tx.QueryRowContext(ctx, query, args...).Scan(&space.ID, &space.UID, &space.Title, &space.Description); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := populatePostgresSpaceSummary(ctx, tx, space, actorUserID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := tx.Commit(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return space, nil
|
||||
}
|
||||
|
||||
func populatePostgresSpaceSummary(ctx context.Context, tx *sql.Tx, space *store.Space, userID int32) error {
|
||||
return tx.QueryRowContext(ctx, `SELECT viewer_member.role, COUNT(active_member.user_id)
|
||||
FROM space_member viewer_member
|
||||
JOIN "user" viewer_user ON viewer_user.id = viewer_member.user_id
|
||||
JOIN space_member active_member ON active_member.space_id = viewer_member.space_id AND active_member.status = 'ACTIVE' AND active_member.role IN ('ADMIN', 'USER')
|
||||
JOIN "user" active_user ON active_user.id = active_member.user_id AND active_user.row_status = 'NORMAL'
|
||||
WHERE viewer_member.space_id = $1 AND viewer_member.user_id = $2 AND viewer_member.status = 'ACTIVE'
|
||||
AND viewer_member.role IN ('ADMIN', 'USER') AND viewer_user.row_status = 'NORMAL'
|
||||
GROUP BY viewer_member.role`, space.ID, userID).Scan(&space.CurrentUserRole, &space.MemberCount)
|
||||
}
|
||||
|
||||
func (d *DB) CreateSpaceInvitation(ctx context.Context, create *store.SpaceInvitation, actorUserID int32) (*store.SpaceInvitation, error) {
|
||||
tx, err := d.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -37,6 +37,8 @@ func (d *DB) CreateSpace(ctx context.Context, create *store.Space, creatorID int
|
|||
if _, err := tx.ExecContext(ctx, "INSERT INTO space_member (space_id, user_id, status, role) VALUES (?, ?, ?, ?)", space.ID, creatorID, store.SpaceMemberStatusActive, store.SpaceMemberRoleAdmin); err != nil {
|
||||
return nil, errors.Wrap(err, "failed to create initial space admin")
|
||||
}
|
||||
space.CurrentUserRole = store.SpaceMemberRoleAdmin
|
||||
space.MemberCount = 1
|
||||
if err := tx.Commit(); err != nil {
|
||||
return nil, errors.Wrap(err, "failed to commit space create transaction")
|
||||
}
|
||||
|
|
@ -45,6 +47,9 @@ func (d *DB) CreateSpace(ctx context.Context, create *store.Space, creatorID int
|
|||
|
||||
func (d *DB) ListSpaces(ctx context.Context, find *store.FindSpace) ([]*store.Space, error) {
|
||||
where, args := []string{"1 = 1"}, []any{}
|
||||
selectFields := "space.id, space.uid, space.title, space.description"
|
||||
joins := ""
|
||||
groupBy := ""
|
||||
if find.ID != nil {
|
||||
where, args = append(where, "space.id = ?"), append(args, *find.ID)
|
||||
}
|
||||
|
|
@ -60,10 +65,16 @@ func (d *DB) ListSpaces(ctx context.Context, find *store.FindSpace) ([]*store.Sp
|
|||
where, args = append(where, "space.uid = ?"), append(args, *find.UID)
|
||||
}
|
||||
if find.MemberUserID != nil {
|
||||
where, args = append(where, "EXISTS (SELECT 1 FROM space_member sm JOIN user u ON u.id = sm.user_id WHERE sm.space_id = space.id AND sm.user_id = ? AND sm.status = 'ACTIVE' AND sm.role IN ('ADMIN', 'USER') AND u.row_status = 'NORMAL')"), append(args, *find.MemberUserID)
|
||||
selectFields += ", viewer_member.role, COUNT(active_member.user_id)"
|
||||
joins = ` JOIN space_member viewer_member ON viewer_member.space_id = space.id
|
||||
JOIN user viewer_user ON viewer_user.id = viewer_member.user_id
|
||||
JOIN space_member active_member ON active_member.space_id = space.id AND active_member.status = 'ACTIVE' AND active_member.role IN ('ADMIN', 'USER')
|
||||
JOIN user active_user ON active_user.id = active_member.user_id AND active_user.row_status = 'NORMAL'`
|
||||
where = append(where, "viewer_member.user_id = ?", "viewer_member.status = 'ACTIVE'", "viewer_member.role IN ('ADMIN', 'USER')", "viewer_user.row_status = 'NORMAL'")
|
||||
args = append(args, *find.MemberUserID)
|
||||
groupBy = " GROUP BY space.id, space.uid, space.title, space.description, viewer_member.role"
|
||||
}
|
||||
query := `SELECT space.id, space.uid, space.title, space.description
|
||||
FROM space WHERE ` + strings.Join(where, " AND ") + ` ORDER BY space.id DESC`
|
||||
query := "SELECT " + selectFields + " FROM space" + joins + " WHERE " + strings.Join(where, " AND ") + groupBy + " ORDER BY space.id DESC"
|
||||
query = appendSQLiteLimit(query, find.Limit, find.Offset)
|
||||
rows, err := d.db.QueryContext(ctx, query, args...)
|
||||
if err != nil {
|
||||
|
|
@ -73,7 +84,11 @@ func (d *DB) ListSpaces(ctx context.Context, find *store.FindSpace) ([]*store.Sp
|
|||
spaces := []*store.Space{}
|
||||
for rows.Next() {
|
||||
space := &store.Space{}
|
||||
if err := rows.Scan(&space.ID, &space.UID, &space.Title, &space.Description); err != nil {
|
||||
scanTargets := []any{&space.ID, &space.UID, &space.Title, &space.Description}
|
||||
if find.MemberUserID != nil {
|
||||
scanTargets = append(scanTargets, &space.CurrentUserRole, &space.MemberCount)
|
||||
}
|
||||
if err := rows.Scan(scanTargets...); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
spaces = append(spaces, space)
|
||||
|
|
@ -104,12 +119,26 @@ func (d *DB) UpdateSpace(ctx context.Context, update *store.UpdateSpace, actorUs
|
|||
if err := tx.QueryRowContext(ctx, query, args...).Scan(&space.ID, &space.UID, &space.Title, &space.Description); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := populateSQLiteSpaceSummary(ctx, tx, space, actorUserID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := tx.Commit(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return space, nil
|
||||
}
|
||||
|
||||
func populateSQLiteSpaceSummary(ctx context.Context, tx dbExecutor, space *store.Space, userID int32) error {
|
||||
return tx.QueryRowContext(ctx, `SELECT viewer_member.role, COUNT(active_member.user_id)
|
||||
FROM space_member viewer_member
|
||||
JOIN user viewer_user ON viewer_user.id = viewer_member.user_id
|
||||
JOIN space_member active_member ON active_member.space_id = viewer_member.space_id AND active_member.status = 'ACTIVE' AND active_member.role IN ('ADMIN', 'USER')
|
||||
JOIN user active_user ON active_user.id = active_member.user_id AND active_user.row_status = 'NORMAL'
|
||||
WHERE viewer_member.space_id = ? AND viewer_member.user_id = ? AND viewer_member.status = 'ACTIVE'
|
||||
AND viewer_member.role IN ('ADMIN', 'USER') AND viewer_user.row_status = 'NORMAL'
|
||||
GROUP BY viewer_member.role`, space.ID, userID).Scan(&space.CurrentUserRole, &space.MemberCount)
|
||||
}
|
||||
|
||||
func (d *DB) CreateSpaceInvitation(ctx context.Context, create *store.SpaceInvitation, actorUserID int32) (*store.SpaceInvitation, error) {
|
||||
tx, err := d.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -68,13 +68,16 @@ func (r SpaceMemberRole) IsActiveMember() bool {
|
|||
type Space struct {
|
||||
ID int32
|
||||
|
||||
UID string
|
||||
Title string
|
||||
Description string
|
||||
UID string
|
||||
Title string
|
||||
Description string
|
||||
CurrentUserRole SpaceMemberRole
|
||||
MemberCount int32
|
||||
}
|
||||
|
||||
// FindSpace selects spaces. MemberUserID restricts results to spaces where the
|
||||
// user has a membership and is applied before pagination.
|
||||
// user has a membership, populates the viewer summary, and is applied before
|
||||
// pagination.
|
||||
type FindSpace struct {
|
||||
ID *int32
|
||||
IDList []int32
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ func TestSpaceStoreMembershipGuards(t *testing.T) {
|
|||
|
||||
space, err := ts.CreateSpace(ctx, &store.Space{UID: "space-store", Title: "Store Space"}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, store.SpaceMemberRoleAdmin, space.CurrentUserRole)
|
||||
require.Equal(t, int32(1), space.MemberCount)
|
||||
|
||||
ownerMembership, err := ts.GetSpaceMember(ctx, &store.FindSpaceMember{SpaceID: &space.ID, UserID: &owner.ID, ViewerUserID: &owner.ID})
|
||||
require.NoError(t, err)
|
||||
|
|
@ -29,6 +31,24 @@ func TestSpaceStoreMembershipGuards(t *testing.T) {
|
|||
created, err := createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, member.ID, created.UserID)
|
||||
ownerSpaces, err := ts.ListSpaces(ctx, &store.FindSpace{MemberUserID: &owner.ID})
|
||||
require.NoError(t, err)
|
||||
require.Len(t, ownerSpaces, 1)
|
||||
require.Equal(t, store.SpaceMemberRoleAdmin, ownerSpaces[0].CurrentUserRole)
|
||||
require.Equal(t, int32(2), ownerSpaces[0].MemberCount)
|
||||
memberSpace, err := ts.GetSpace(ctx, &store.FindSpace{UID: &space.UID, MemberUserID: &member.ID})
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, store.SpaceMemberRoleUser, memberSpace.CurrentUserRole)
|
||||
require.Equal(t, int32(2), memberSpace.MemberCount)
|
||||
unscopedSpace, err := ts.GetSpace(ctx, &store.FindSpace{UID: &space.UID})
|
||||
require.NoError(t, err)
|
||||
require.Empty(t, unscopedSpace.CurrentUserRole)
|
||||
require.Zero(t, unscopedSpace.MemberCount)
|
||||
updatedTitle := "Updated Store Space"
|
||||
updatedSpace, err := ts.UpdateSpace(ctx, &store.UpdateSpace{ID: space.ID, Title: &updatedTitle}, owner.ID)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, store.SpaceMemberRoleAdmin, updatedSpace.CurrentUserRole)
|
||||
require.Equal(t, int32(2), updatedSpace.MemberCount)
|
||||
_, err = createSpaceMemberForTest(ctx, ts, &store.SpaceMember{SpaceID: space.ID, UserID: member.ID, Role: store.SpaceMemberRoleUser}, owner.ID)
|
||||
require.ErrorIs(t, err, store.ErrSpaceMemberAlreadyExists)
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ import { Link, matchPath, useLocation, useNavigate, useSearchParams } from "reac
|
|||
import ConfirmDialog from "@/components/ConfirmDialog";
|
||||
import { MemoDetailSidebar } from "@/components/MemoDetailSidebar";
|
||||
import MemoDisplaySettingMenu from "@/components/MemoDisplaySettingMenu";
|
||||
import { SETTINGS_SECTIONS } from "@/components/Settings/settingSections";
|
||||
import { DEFAULT_SETTING_SECTION, SETTINGS_SECTIONS } from "@/components/Settings/settingSections";
|
||||
import StatisticsView from "@/components/StatisticsView";
|
||||
import UserMenu from "@/components/UserMenu";
|
||||
import { Button } from "@/components/ui/button";
|
||||
|
|
@ -376,7 +376,7 @@ const SettingsSidebarContent = () => {
|
|||
const user = useCurrentUser();
|
||||
const { setMobileOpen } = useAppSidebar();
|
||||
const isHost = user?.role === User_Role.ADMIN;
|
||||
const currentSection = location.hash.slice(1) || "my-account";
|
||||
const currentSection = location.hash.slice(1) || DEFAULT_SETTING_SECTION;
|
||||
const basic = SETTINGS_SECTIONS.filter((section) => section.scope === "basic");
|
||||
const admin = SETTINGS_SECTIONS.filter((section) => section.scope === "admin");
|
||||
const renderSections = (sections: typeof SETTINGS_SECTIONS) =>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ import { CheckIcon, ChevronsUpDownIcon, LoaderCircleIcon, type LucideIcon, PlusI
|
|||
import { type ReactNode, useState } from "react";
|
||||
import CreateSpaceDialog from "@/components/CreateSpaceDialog";
|
||||
import MemosLogo from "@/components/MemosLogo";
|
||||
import SpaceMark from "@/components/SpaceMark";
|
||||
import {
|
||||
DropdownMenu,
|
||||
DropdownMenuContent,
|
||||
|
|
@ -13,32 +14,8 @@ import {
|
|||
} from "@/components/ui/dropdown-menu";
|
||||
import { useSpaceContext } from "@/contexts/SpaceContext";
|
||||
import { cn } from "@/lib/utils";
|
||||
import type { Space } from "@/types/proto/api/v1/space_service_pb";
|
||||
import { useTranslate } from "@/utils/i18n";
|
||||
|
||||
// Mirrors MemosLogo's compact scale so the brand and a Space read as peers in the menu.
|
||||
const MARK_SCALE = {
|
||||
md: "size-7 rounded-[7px] text-[13px]",
|
||||
sm: "size-5 rounded-[5px] text-[11px]",
|
||||
} as const;
|
||||
|
||||
const SpaceMark = ({ space, size = "md" }: { space?: Space; size?: "sm" | "md" }) => {
|
||||
const label = space?.title.trim() || "S";
|
||||
const initial = Array.from(label)[0]?.toLocaleUpperCase() ?? "S";
|
||||
|
||||
return (
|
||||
<span
|
||||
aria-hidden
|
||||
className={cn(
|
||||
"flex shrink-0 items-center justify-center bg-sidebar-accent font-semibold text-sidebar-accent-foreground",
|
||||
MARK_SCALE[size],
|
||||
)}
|
||||
>
|
||||
{initial}
|
||||
</span>
|
||||
);
|
||||
};
|
||||
|
||||
// Icons in action and status rows sit in a glyph-width slot so every label in the menu
|
||||
// starts on the same text rail as the context rows.
|
||||
const RowIcon = ({ icon: Icon, className }: { icon: LucideIcon; className?: string }) => (
|
||||
|
|
@ -128,7 +105,7 @@ function SpaceSwitcher({ className }: { className?: string }) {
|
|||
</DropdownMenuItem>
|
||||
</DropdownMenuContent>
|
||||
</DropdownMenu>
|
||||
<CreateSpaceDialog open={createOpen} onOpenChange={setCreateOpen} />
|
||||
<CreateSpaceDialog open={createOpen} onOpenChange={setCreateOpen} onCreated={selectSpace} />
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,21 +5,22 @@ import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, D
|
|||
import { Input } from "@/components/ui/input";
|
||||
import { Label } from "@/components/ui/label";
|
||||
import { Textarea } from "@/components/ui/textarea";
|
||||
import { useSpaceContext } from "@/contexts/SpaceContext";
|
||||
import useCurrentUser from "@/hooks/useCurrentUser";
|
||||
import { useCreateSpace } from "@/hooks/useSpaceQueries";
|
||||
import { handleError } from "@/lib/error";
|
||||
import type { Space } from "@/types/proto/api/v1/space_service_pb";
|
||||
import { useTranslate } from "@/utils/i18n";
|
||||
|
||||
interface Props {
|
||||
open: boolean;
|
||||
onOpenChange: (open: boolean) => void;
|
||||
onCreated?: (space: Space) => void;
|
||||
note?: string;
|
||||
}
|
||||
|
||||
function CreateSpaceDialog({ open, onOpenChange }: Props) {
|
||||
function CreateSpaceDialog({ open, onOpenChange, onCreated, note }: Props) {
|
||||
const t = useTranslate();
|
||||
const currentUserName = useCurrentUser()?.name ?? "";
|
||||
const { selectSpace } = useSpaceContext();
|
||||
const createSpace = useCreateSpace(currentUserName);
|
||||
const [title, setTitle] = useState("");
|
||||
const [description, setDescription] = useState("");
|
||||
|
|
@ -38,17 +39,20 @@ function CreateSpaceDialog({ open, onOpenChange }: Props) {
|
|||
return;
|
||||
}
|
||||
|
||||
let space: Space;
|
||||
try {
|
||||
const space = await createSpace.mutateAsync({
|
||||
space = await createSpace.mutateAsync({
|
||||
title: trimmedTitle,
|
||||
description: description.trim() || undefined,
|
||||
});
|
||||
selectSpace(space);
|
||||
toast.success(t("space.create-success"));
|
||||
onOpenChange(false);
|
||||
} catch (error) {
|
||||
handleError(error, toast.error, { context: "Create space" });
|
||||
return;
|
||||
}
|
||||
|
||||
toast.success(t("space.create-success"));
|
||||
onOpenChange(false);
|
||||
onCreated?.(space);
|
||||
};
|
||||
|
||||
const handleOpenChange = (nextOpen: boolean) => {
|
||||
|
|
@ -87,7 +91,7 @@ function CreateSpaceDialog({ open, onOpenChange }: Props) {
|
|||
className="min-h-20 resize-none"
|
||||
/>
|
||||
</div>
|
||||
<p className="text-xs text-muted-foreground">{t("space.creator-admin-note")}</p>
|
||||
<p className="text-xs text-muted-foreground">{note ?? t("space.creator-admin-note")}</p>
|
||||
<DialogFooter>
|
||||
<Button type="button" variant="ghost" disabled={createSpace.isPending} onClick={() => onOpenChange(false)}>
|
||||
{t("common.cancel")}
|
||||
|
|
|
|||
193
web/src/components/Settings/InviteSpaceMemberDialog.tsx
Normal file
193
web/src/components/Settings/InviteSpaceMemberDialog.tsx
Normal file
|
|
@ -0,0 +1,193 @@
|
|||
import { create } from "@bufbuild/protobuf";
|
||||
import { CheckIcon, LoaderCircleIcon, SearchIcon } from "lucide-react";
|
||||
import { type FormEvent, useEffect, useState } from "react";
|
||||
import toast from "react-hot-toast";
|
||||
import UserAvatar from "@/components/UserAvatar";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Label } from "@/components/ui/label";
|
||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
|
||||
import { useCreateSpaceInvitation } from "@/hooks/useSpaceQueries";
|
||||
import { useUsersByUsernames } from "@/hooks/useUserQueries";
|
||||
import { handleError } from "@/lib/error";
|
||||
import { type Space, SpaceInvitationSchema, SpaceMember_Role } from "@/types/proto/api/v1/space_service_pb";
|
||||
import { useTranslate } from "@/utils/i18n";
|
||||
|
||||
const LOOKUP_DELAY_MS = 300;
|
||||
|
||||
interface Props {
|
||||
open: boolean;
|
||||
onOpenChange: (open: boolean) => void;
|
||||
space: Space;
|
||||
viewerName: string;
|
||||
memberUserNames: Set<string>;
|
||||
pendingInviteeNames: Set<string>;
|
||||
}
|
||||
|
||||
const InviteSpaceMemberDialog = ({ open, onOpenChange, space, viewerName, memberUserNames, pendingInviteeNames }: Props) => {
|
||||
const t = useTranslate();
|
||||
const createInvitation = useCreateSpaceInvitation(viewerName);
|
||||
const [query, setQuery] = useState("");
|
||||
const [lookupUsername, setLookupUsername] = useState("");
|
||||
const [selectedUserName, setSelectedUserName] = useState("");
|
||||
const [role, setRole] = useState(SpaceMember_Role.USER);
|
||||
const roleOptions = [
|
||||
{ value: String(SpaceMember_Role.USER), label: t("setting.spaces.space-user") },
|
||||
{ value: String(SpaceMember_Role.ADMIN), label: t("setting.spaces.space-admin") },
|
||||
];
|
||||
const normalizedUsername = query.trim().replace(/^@/, "");
|
||||
const lookupSettled = lookupUsername === normalizedUsername;
|
||||
const usersQuery = useUsersByUsernames(lookupUsername ? [lookupUsername] : [], {
|
||||
enabled: open && Boolean(lookupUsername),
|
||||
});
|
||||
const candidate = lookupUsername ? usersQuery.data?.get(lookupUsername) : undefined;
|
||||
const isCurrentUser = candidate?.name === viewerName;
|
||||
const isMember = candidate ? memberUserNames.has(candidate.name) : false;
|
||||
const isPendingInvitee = candidate ? pendingInviteeNames.has(candidate.name) : false;
|
||||
const isCandidateAvailable = Boolean(candidate && !isCurrentUser && !isMember && !isPendingInvitee);
|
||||
const isSelected = Boolean(candidate && candidate.name === selectedUserName);
|
||||
|
||||
useEffect(() => {
|
||||
const timeout = window.setTimeout(() => setLookupUsername(normalizedUsername), LOOKUP_DELAY_MS);
|
||||
return () => window.clearTimeout(timeout);
|
||||
}, [normalizedUsername]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!open) {
|
||||
setQuery("");
|
||||
setLookupUsername("");
|
||||
setSelectedUserName("");
|
||||
setRole(SpaceMember_Role.USER);
|
||||
}
|
||||
}, [open]);
|
||||
|
||||
const handleQueryChange = (value: string) => {
|
||||
setQuery(value);
|
||||
setSelectedUserName("");
|
||||
};
|
||||
|
||||
const handleOpenChange = (nextOpen: boolean) => {
|
||||
if (!nextOpen && createInvitation.isPending) {
|
||||
return;
|
||||
}
|
||||
onOpenChange(nextOpen);
|
||||
};
|
||||
|
||||
const handleSubmit = async (event: FormEvent<HTMLFormElement>) => {
|
||||
event.preventDefault();
|
||||
if (!candidate || !isSelected || !isCandidateAvailable || createInvitation.isPending) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await createInvitation.mutateAsync({
|
||||
parent: space.name,
|
||||
spaceInvitation: create(SpaceInvitationSchema, {
|
||||
invitee: candidate.name,
|
||||
role,
|
||||
}),
|
||||
});
|
||||
toast.success(t("setting.spaces.invite-success", { username: candidate.username }));
|
||||
onOpenChange(false);
|
||||
} catch (error) {
|
||||
handleError(error, toast.error, { context: "Create space invitation" });
|
||||
}
|
||||
};
|
||||
|
||||
const resultStatus = isCurrentUser
|
||||
? t("setting.spaces.invite-yourself")
|
||||
: isMember
|
||||
? t("setting.spaces.already-member")
|
||||
: isPendingInvitee
|
||||
? t("setting.spaces.already-invited")
|
||||
: t("setting.spaces.active-user");
|
||||
|
||||
return (
|
||||
<Dialog open={open} onOpenChange={handleOpenChange}>
|
||||
<DialogContent size="sm" data-critical-surface="invite-member-dialog">
|
||||
<form className="grid gap-4" onSubmit={handleSubmit}>
|
||||
<DialogHeader>
|
||||
<DialogTitle>{t("setting.spaces.invite-to", { space: space.title })}</DialogTitle>
|
||||
<DialogDescription>{t("setting.spaces.invite-description")}</DialogDescription>
|
||||
</DialogHeader>
|
||||
|
||||
<div className="grid gap-2">
|
||||
<Label htmlFor="space-member-search">{t("setting.spaces.memos-user")}</Label>
|
||||
<div className="relative">
|
||||
<SearchIcon className="pointer-events-none absolute left-2.5 top-1/2 size-4 -translate-y-1/2 text-muted-foreground" />
|
||||
<Input
|
||||
id="space-member-search"
|
||||
value={query}
|
||||
onChange={(event) => handleQueryChange(event.target.value)}
|
||||
autoFocus
|
||||
autoComplete="off"
|
||||
placeholder={t("setting.spaces.search-user-placeholder")}
|
||||
className="pl-8"
|
||||
/>
|
||||
{normalizedUsername && (!lookupSettled || usersQuery.isFetching) ? (
|
||||
<LoaderCircleIcon className="absolute right-2.5 top-1/2 size-4 -translate-y-1/2 animate-spin text-muted-foreground" />
|
||||
) : null}
|
||||
</div>
|
||||
|
||||
{candidate && lookupSettled ? (
|
||||
<button
|
||||
type="button"
|
||||
disabled={!isCandidateAvailable}
|
||||
aria-pressed={isSelected}
|
||||
onClick={() => setSelectedUserName(isSelected ? "" : candidate.name)}
|
||||
className={
|
||||
isSelected
|
||||
? "flex w-full items-center gap-3 rounded-lg border border-primary/35 bg-primary/5 px-3 py-2 text-left transition-colors"
|
||||
: "flex w-full items-center gap-3 rounded-lg border border-border px-3 py-2 text-left transition-colors hover:bg-muted/40 disabled:cursor-not-allowed disabled:opacity-60"
|
||||
}
|
||||
>
|
||||
<UserAvatar className="size-8 rounded-lg" avatarUrl={candidate.avatarUrl} />
|
||||
<div className="min-w-0 flex-1">
|
||||
<p className="truncate text-sm font-medium">{candidate.displayName || `@${candidate.username}`}</p>
|
||||
<p className="truncate text-xs text-muted-foreground">
|
||||
@{candidate.username} · {resultStatus}
|
||||
</p>
|
||||
</div>
|
||||
{isSelected ? <CheckIcon className="size-4 shrink-0 text-primary" /> : null}
|
||||
</button>
|
||||
) : null}
|
||||
|
||||
{normalizedUsername && lookupSettled && usersQuery.isSuccess && !candidate ? (
|
||||
<p className="text-xs leading-5 text-muted-foreground">
|
||||
{t("setting.spaces.user-not-found", { username: normalizedUsername })}
|
||||
</p>
|
||||
) : null}
|
||||
</div>
|
||||
|
||||
<div className="grid gap-2">
|
||||
<Label>{t("common.role")}</Label>
|
||||
<Select value={String(role)} items={roleOptions} onValueChange={(value) => setRole(Number(value) as SpaceMember_Role)}>
|
||||
<SelectTrigger className="w-full" aria-label={t("common.role")}>
|
||||
<SelectValue />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value={String(SpaceMember_Role.USER)}>{t("setting.spaces.space-user")}</SelectItem>
|
||||
<SelectItem value={String(SpaceMember_Role.ADMIN)}>{t("setting.spaces.space-admin")}</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<p className="text-xs leading-5 text-muted-foreground">
|
||||
{role === SpaceMember_Role.ADMIN ? t("setting.spaces.admin-role-description") : t("setting.spaces.user-role-description")}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<DialogFooter>
|
||||
<Button type="button" variant="ghost" disabled={createInvitation.isPending} onClick={() => onOpenChange(false)}>
|
||||
{t("common.cancel")}
|
||||
</Button>
|
||||
<Button type="submit" disabled={!isSelected || !isCandidateAvailable || createInvitation.isPending}>
|
||||
{t("setting.spaces.send-invitation")}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</form>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
);
|
||||
};
|
||||
|
||||
export default InviteSpaceMemberDialog;
|
||||
731
web/src/components/Settings/SpacesSection.tsx
Normal file
731
web/src/components/Settings/SpacesSection.tsx
Normal file
|
|
@ -0,0 +1,731 @@
|
|||
import {
|
||||
ArrowLeftIcon,
|
||||
ChevronRightIcon,
|
||||
Clock3Icon,
|
||||
LoaderCircleIcon,
|
||||
LogOutIcon,
|
||||
PlusIcon,
|
||||
ShieldCheckIcon,
|
||||
Trash2Icon,
|
||||
UserPlusIcon,
|
||||
} from "lucide-react";
|
||||
import { useEffect, useMemo, useState } from "react";
|
||||
import toast from "react-hot-toast";
|
||||
import { useNavigate, useSearchParams } from "react-router-dom";
|
||||
import ConfirmDialog from "@/components/ConfirmDialog";
|
||||
import CreateSpaceDialog from "@/components/CreateSpaceDialog";
|
||||
import InviteSpaceMemberDialog from "@/components/Settings/InviteSpaceMemberDialog";
|
||||
import SettingSection from "@/components/Settings/SettingSection";
|
||||
import SpaceMark from "@/components/SpaceMark";
|
||||
import UserAvatar from "@/components/UserAvatar";
|
||||
import { Badge } from "@/components/ui/badge";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Label } from "@/components/ui/label";
|
||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
|
||||
import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
|
||||
import { Textarea } from "@/components/ui/textarea";
|
||||
import useCurrentUser from "@/hooks/useCurrentUser";
|
||||
import {
|
||||
useAcceptSpaceInvitation,
|
||||
useDeclineSpaceInvitation,
|
||||
useDeleteSpace,
|
||||
useDeleteSpaceInvitation,
|
||||
useDeleteSpaceMember,
|
||||
useSpaceInvitations,
|
||||
useSpaceMembers,
|
||||
useSpaces,
|
||||
useUpdateSpace,
|
||||
useUpdateSpaceMember,
|
||||
useUserSpaceInvitations,
|
||||
} from "@/hooks/useSpaceQueries";
|
||||
import { useUsersByUsernames } from "@/hooks/useUserQueries";
|
||||
import { handleError } from "@/lib/error";
|
||||
import { extractUsernameFromName } from "@/lib/resource-names";
|
||||
import { ROUTES } from "@/router/routes";
|
||||
import { type Space, type SpaceInvitation, type SpaceMember, SpaceMember_Role } from "@/types/proto/api/v1/space_service_pb";
|
||||
import type { User } from "@/types/proto/api/v1/user_service_pb";
|
||||
import { useTranslate } from "@/utils/i18n";
|
||||
|
||||
type DetailTab = "general" | "members";
|
||||
|
||||
const getSpacesSettingsLocation = (spaceName?: string) => ({
|
||||
pathname: ROUTES.SETTING,
|
||||
search: spaceName ? `?${new URLSearchParams({ space: spaceName }).toString()}` : "",
|
||||
hash: "#spaces",
|
||||
});
|
||||
|
||||
const SpaceRoleBadge = ({ role }: { role: SpaceMember_Role }) => {
|
||||
const t = useTranslate();
|
||||
const isAdmin = role === SpaceMember_Role.ADMIN;
|
||||
return (
|
||||
<Badge variant={isAdmin ? "secondary" : "outline"} shape="pill" className="h-5 px-2 font-normal">
|
||||
{isAdmin ? t("setting.spaces.space-admin") : t("setting.spaces.space-user")}
|
||||
</Badge>
|
||||
);
|
||||
};
|
||||
|
||||
const MemberIdentity = ({ member, user, isCurrentUser }: { member: SpaceMember; user?: User; isCurrentUser?: boolean }) => {
|
||||
const t = useTranslate();
|
||||
const username = user?.username || extractUsernameFromName(member.user);
|
||||
const displayName = user?.displayName || `@${username}`;
|
||||
|
||||
return (
|
||||
<div className="flex min-w-0 items-center gap-3">
|
||||
<UserAvatar className="size-10 rounded-xl" avatarUrl={user?.avatarUrl} />
|
||||
<div className="min-w-0">
|
||||
<div className="flex flex-wrap items-center gap-1.5">
|
||||
<p className="truncate text-sm font-medium">{displayName}</p>
|
||||
{isCurrentUser ? <span className="text-xs text-muted-foreground">{t("setting.spaces.you")}</span> : null}
|
||||
</div>
|
||||
<p className="mt-0.5 truncate text-xs text-muted-foreground">@{username}</p>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
const InvitationIdentity = ({ invitation, user }: { invitation: SpaceInvitation; user?: User }) => {
|
||||
const username = user?.username || extractUsernameFromName(invitation.invitee);
|
||||
const displayName = user?.displayName || `@${username}`;
|
||||
|
||||
return (
|
||||
<div className="flex min-w-0 items-center gap-3">
|
||||
<UserAvatar className="size-10 rounded-xl" avatarUrl={user?.avatarUrl} />
|
||||
<div className="min-w-0">
|
||||
<p className="truncate text-sm font-medium">{displayName}</p>
|
||||
<p className="mt-0.5 truncate text-xs text-muted-foreground">@{username}</p>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
const SpacesSection = () => {
|
||||
const t = useTranslate();
|
||||
const navigate = useNavigate();
|
||||
const [searchParams] = useSearchParams();
|
||||
const currentUser = useCurrentUser();
|
||||
const viewerName = currentUser?.name ?? "";
|
||||
const managedSpaceName = searchParams.get("space") ?? "";
|
||||
const spacesQuery = useSpaces(viewerName);
|
||||
const receivedInvitationsQuery = useUserSpaceInvitations(viewerName);
|
||||
const spaces = spacesQuery.data ?? [];
|
||||
const receivedInvitations = receivedInvitationsQuery.data ?? [];
|
||||
const managedSpace = spaces.find((space) => space.name === managedSpaceName);
|
||||
const [createOpen, setCreateOpen] = useState(false);
|
||||
const acceptInvitation = useAcceptSpaceInvitation(viewerName);
|
||||
const declineInvitation = useDeclineSpaceInvitation(viewerName);
|
||||
|
||||
useEffect(() => {
|
||||
if (managedSpaceName && spacesQuery.isSuccess && !managedSpace) {
|
||||
navigate(getSpacesSettingsLocation(), { replace: true });
|
||||
}
|
||||
}, [managedSpace, managedSpaceName, navigate, spacesQuery.isSuccess]);
|
||||
|
||||
const handleOpenSpace = (spaceName: string) => {
|
||||
navigate(getSpacesSettingsLocation(spaceName));
|
||||
window.scrollTo({ top: 0, behavior: "smooth" });
|
||||
};
|
||||
|
||||
const handleAcceptInvitation = async (invitation: SpaceInvitation) => {
|
||||
try {
|
||||
await acceptInvitation.mutateAsync({ name: invitation.name });
|
||||
toast.success(t("setting.spaces.accept-success", { space: invitation.space?.title ?? t("setting.spaces.label") }));
|
||||
} catch (error) {
|
||||
handleError(error, toast.error, { context: "Accept space invitation" });
|
||||
}
|
||||
};
|
||||
|
||||
const handleDeclineInvitation = async (invitation: SpaceInvitation) => {
|
||||
try {
|
||||
await declineInvitation.mutateAsync({ name: invitation.name });
|
||||
toast.success(t("setting.spaces.decline-success"));
|
||||
} catch (error) {
|
||||
handleError(error, toast.error, { context: "Decline space invitation" });
|
||||
}
|
||||
};
|
||||
|
||||
if (managedSpaceName && !managedSpace && spacesQuery.isLoading) {
|
||||
return (
|
||||
<SettingSection title={t("setting.spaces.title")} description={t("setting.spaces.description")}>
|
||||
<div className="flex items-center justify-center gap-2 py-12 text-sm text-muted-foreground">
|
||||
<LoaderCircleIcon className="size-4 animate-spin" />
|
||||
{t("setting.spaces.loading")}
|
||||
</div>
|
||||
</SettingSection>
|
||||
);
|
||||
}
|
||||
|
||||
return managedSpace ? (
|
||||
<SpaceDetail
|
||||
key={managedSpace.name}
|
||||
space={managedSpace}
|
||||
viewerName={viewerName}
|
||||
onBack={() => navigate(getSpacesSettingsLocation())}
|
||||
/>
|
||||
) : (
|
||||
<>
|
||||
<SettingSection
|
||||
title={t("setting.spaces.title")}
|
||||
description={t("setting.spaces.description")}
|
||||
actions={
|
||||
<Button size="sm" onClick={() => setCreateOpen(true)}>
|
||||
<PlusIcon data-icon="inline-start" />
|
||||
{t("setting.spaces.create-space")}
|
||||
</Button>
|
||||
}
|
||||
className="gap-5"
|
||||
>
|
||||
<div data-critical-surface="spaces-overview" className="flex min-w-0 flex-col gap-5">
|
||||
{receivedInvitations.length > 0 ? (
|
||||
<section aria-labelledby="space-invitations-heading" className="space-y-2.5">
|
||||
<div className="flex items-center justify-between">
|
||||
<h4 id="space-invitations-heading" className="text-sm font-medium">
|
||||
{t("setting.spaces.invitations")}
|
||||
</h4>
|
||||
<span className="text-xs text-muted-foreground">
|
||||
{t("setting.spaces.pending-count", { count: receivedInvitations.length })}
|
||||
</span>
|
||||
</div>
|
||||
<div className="divide-y divide-border overflow-hidden rounded-lg border border-border bg-background">
|
||||
{receivedInvitations.map((invitation) => (
|
||||
<div key={invitation.name} className="flex min-w-0 flex-col gap-3 px-3 py-3 sm:flex-row sm:items-center">
|
||||
<div className="flex min-w-0 flex-1 items-center gap-3">
|
||||
<SpaceMark space={invitation.space} size="lg" />
|
||||
<div className="min-w-0">
|
||||
<div className="flex flex-wrap items-center gap-2">
|
||||
<p className="truncate text-sm font-medium">{invitation.space?.title || t("setting.spaces.untitled")}</p>
|
||||
<SpaceRoleBadge role={invitation.role} />
|
||||
</div>
|
||||
<p className="mt-1 truncate text-xs leading-5 text-muted-foreground">
|
||||
{invitation.space?.description || t("setting.spaces.invited-to-join")}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex shrink-0 items-center justify-end gap-2">
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
disabled={acceptInvitation.isPending || declineInvitation.isPending}
|
||||
onClick={() => void handleDeclineInvitation(invitation)}
|
||||
>
|
||||
{t("setting.spaces.decline")}
|
||||
</Button>
|
||||
<Button
|
||||
size="sm"
|
||||
disabled={acceptInvitation.isPending || declineInvitation.isPending}
|
||||
onClick={() => void handleAcceptInvitation(invitation)}
|
||||
>
|
||||
{t("setting.spaces.accept")}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</section>
|
||||
) : null}
|
||||
|
||||
<section aria-labelledby="your-spaces-heading" className="space-y-2.5">
|
||||
<div className="flex items-center justify-between">
|
||||
<h4 id="your-spaces-heading" className="text-sm font-medium">
|
||||
{t("setting.spaces.your-spaces")}
|
||||
</h4>
|
||||
{spaces.length > 0 ? (
|
||||
<span className="text-xs text-muted-foreground">
|
||||
{spaces.length === 1
|
||||
? t("setting.spaces.space-count", { count: spaces.length })
|
||||
: t("setting.spaces.spaces-count", { count: spaces.length })}
|
||||
</span>
|
||||
) : null}
|
||||
</div>
|
||||
{spacesQuery.isLoading ? (
|
||||
<div className="flex items-center justify-center gap-2 rounded-lg border border-border py-10 text-sm text-muted-foreground">
|
||||
<LoaderCircleIcon className="size-4 animate-spin" />
|
||||
{t("setting.spaces.loading")}
|
||||
</div>
|
||||
) : spacesQuery.isError ? (
|
||||
<div className="rounded-lg border border-border px-3 py-8 text-center text-sm text-muted-foreground">
|
||||
{t("setting.spaces.load-error")}
|
||||
</div>
|
||||
) : spaces.length === 0 ? (
|
||||
<div className="rounded-lg border border-dashed border-border px-4 py-9 text-center">
|
||||
<p className="text-sm font-medium">{t("setting.spaces.no-spaces")}</p>
|
||||
<p className="mx-auto mt-1 max-w-md text-xs leading-5 text-muted-foreground">{t("setting.spaces.no-spaces-description")}</p>
|
||||
<Button variant="outline" size="sm" className="mt-4" onClick={() => setCreateOpen(true)}>
|
||||
<PlusIcon data-icon="inline-start" />
|
||||
{t("setting.spaces.create-space")}
|
||||
</Button>
|
||||
</div>
|
||||
) : (
|
||||
<div className="divide-y divide-border overflow-hidden rounded-lg border border-border bg-background">
|
||||
{spaces.map((space) => (
|
||||
<button
|
||||
key={space.name}
|
||||
type="button"
|
||||
aria-label={t("setting.spaces.manage-space", { space: space.title })}
|
||||
onClick={() => handleOpenSpace(space.name)}
|
||||
className="group flex w-full min-w-0 items-center gap-3 px-3 py-3 text-left transition-colors hover:bg-muted/35 focus-visible:bg-muted/35 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring/45"
|
||||
>
|
||||
<SpaceMark space={space} size="lg" />
|
||||
<div className="min-w-0 flex-1">
|
||||
<div className="flex min-w-0 flex-wrap items-center gap-2">
|
||||
<p className="truncate text-sm font-medium">{space.title}</p>
|
||||
<SpaceRoleBadge role={space.currentUserRole} />
|
||||
</div>
|
||||
<p className="mt-1 truncate text-xs text-muted-foreground">
|
||||
{space.description || t("setting.spaces.no-description")}
|
||||
</p>
|
||||
</div>
|
||||
<span className="hidden shrink-0 text-xs text-muted-foreground sm:inline">
|
||||
{space.memberCount === 1
|
||||
? t("setting.spaces.member-count", { count: space.memberCount })
|
||||
: t("setting.spaces.members-count", { count: space.memberCount })}
|
||||
</span>
|
||||
<ChevronRightIcon className="size-4 shrink-0 text-muted-foreground/65 transition-transform group-hover:translate-x-0.5" />
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</section>
|
||||
</div>
|
||||
</SettingSection>
|
||||
|
||||
<CreateSpaceDialog
|
||||
open={createOpen}
|
||||
onOpenChange={setCreateOpen}
|
||||
onCreated={(space) => navigate(getSpacesSettingsLocation(space.name))}
|
||||
note={t("setting.spaces.create-scope-note")}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
interface SpaceDetailProps {
|
||||
space: Space;
|
||||
viewerName: string;
|
||||
onBack: () => void;
|
||||
}
|
||||
|
||||
const SpaceDetail = ({ space, viewerName, onBack }: SpaceDetailProps) => {
|
||||
const t = useTranslate();
|
||||
const membersQuery = useSpaceMembers(viewerName, space.name);
|
||||
const members = membersQuery.data ?? [];
|
||||
const currentMember = members.find((member) => member.user === viewerName);
|
||||
const currentRole = currentMember?.role ?? space.currentUserRole;
|
||||
const isAdmin = currentRole === SpaceMember_Role.ADMIN;
|
||||
const invitationsQuery = useSpaceInvitations(viewerName, space.name, { enabled: isAdmin });
|
||||
const invitations = invitationsQuery.data ?? [];
|
||||
const usernames = useMemo(
|
||||
() =>
|
||||
Array.from(
|
||||
new Set(
|
||||
[...members.map((member) => member.user), ...invitations.map((invitation) => invitation.invitee)].map(extractUsernameFromName),
|
||||
),
|
||||
),
|
||||
[invitations, members],
|
||||
);
|
||||
const usersQuery = useUsersByUsernames(usernames);
|
||||
const usersByUsername = usersQuery.data ?? new Map<string, User | undefined>();
|
||||
const [tab, setTab] = useState<DetailTab>("general");
|
||||
const [title, setTitle] = useState(space.title);
|
||||
const [description, setDescription] = useState(space.description);
|
||||
const [inviteOpen, setInviteOpen] = useState(false);
|
||||
const [leaveOpen, setLeaveOpen] = useState(false);
|
||||
const [deleteOpen, setDeleteOpen] = useState(false);
|
||||
const [removeTarget, setRemoveTarget] = useState<SpaceMember>();
|
||||
const [cancelInvitationTarget, setCancelInvitationTarget] = useState<SpaceInvitation>();
|
||||
const updateSpace = useUpdateSpace(viewerName);
|
||||
const deleteSpace = useDeleteSpace(viewerName);
|
||||
const updateMember = useUpdateSpaceMember(viewerName);
|
||||
const deleteMember = useDeleteSpaceMember(viewerName);
|
||||
const deleteInvitation = useDeleteSpaceInvitation(viewerName);
|
||||
const activeAdminCount = members.filter((member) => member.role === SpaceMember_Role.ADMIN).length;
|
||||
const isLastAdmin = currentRole === SpaceMember_Role.ADMIN && activeAdminCount === 1;
|
||||
const memberUserNames = useMemo(() => new Set(members.map((member) => member.user)), [members]);
|
||||
const pendingInviteeNames = useMemo(() => new Set(invitations.map((invitation) => invitation.invitee)), [invitations]);
|
||||
const roleOptions = [
|
||||
{ value: String(SpaceMember_Role.USER), label: t("setting.spaces.space-user") },
|
||||
{ value: String(SpaceMember_Role.ADMIN), label: t("setting.spaces.space-admin") },
|
||||
];
|
||||
const detailsChanged = title.trim() !== space.title || description.trim() !== space.description;
|
||||
|
||||
useEffect(() => {
|
||||
setTitle(space.title);
|
||||
setDescription(space.description);
|
||||
}, [space.description, space.title]);
|
||||
|
||||
const handleSave = async () => {
|
||||
const trimmedTitle = title.trim();
|
||||
if (!trimmedTitle || !isAdmin || updateSpace.isPending) return;
|
||||
try {
|
||||
await updateSpace.mutateAsync({
|
||||
space: { name: space.name, title: trimmedTitle, description: description.trim() },
|
||||
updateMask: ["title", "description"],
|
||||
});
|
||||
toast.success(t("setting.spaces.save-success"));
|
||||
} catch (error) {
|
||||
handleError(error, toast.error, { context: "Update space" });
|
||||
}
|
||||
};
|
||||
|
||||
const handleRoleChange = async (member: SpaceMember, role: SpaceMember_Role) => {
|
||||
if (member.role === role || updateMember.isPending) return;
|
||||
try {
|
||||
await updateMember.mutateAsync({ spaceMember: { name: member.name, role }, updateMask: ["role"] });
|
||||
toast.success(t("setting.spaces.role-update-success"));
|
||||
} catch (error) {
|
||||
handleError(error, toast.error, { context: "Update space member" });
|
||||
}
|
||||
};
|
||||
|
||||
const handleRemoveMember = async () => {
|
||||
if (!removeTarget) return;
|
||||
try {
|
||||
await deleteMember.mutateAsync({ name: removeTarget.name });
|
||||
toast.success(t("setting.spaces.remove-success", { username: extractUsernameFromName(removeTarget.user) }));
|
||||
setRemoveTarget(undefined);
|
||||
} catch (error) {
|
||||
handleError(error, toast.error, { context: "Remove space member" });
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
|
||||
const handleCancelInvitation = async () => {
|
||||
if (!cancelInvitationTarget) return;
|
||||
try {
|
||||
await deleteInvitation.mutateAsync({ name: cancelInvitationTarget.name });
|
||||
toast.success(t("setting.spaces.cancel-invitation-success"));
|
||||
setCancelInvitationTarget(undefined);
|
||||
} catch (error) {
|
||||
handleError(error, toast.error, { context: "Cancel space invitation" });
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
|
||||
const handleLeave = async () => {
|
||||
if (!currentMember) return;
|
||||
try {
|
||||
await deleteMember.mutateAsync({ name: currentMember.name });
|
||||
toast.success(t("setting.spaces.leave-success", { space: space.title }));
|
||||
onBack();
|
||||
} catch (error) {
|
||||
handleError(error, toast.error, { context: "Leave space" });
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
|
||||
const handleDeleteSpace = async () => {
|
||||
try {
|
||||
await deleteSpace.mutateAsync({ name: space.name });
|
||||
toast.success(t("setting.spaces.delete-success", { space: space.title }));
|
||||
onBack();
|
||||
} catch (error) {
|
||||
handleError(error, toast.error, { context: "Delete space" });
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<section className="min-w-0">
|
||||
<button
|
||||
type="button"
|
||||
onClick={onBack}
|
||||
className="mb-4 inline-flex items-center gap-1.5 text-sm text-muted-foreground hover:text-foreground"
|
||||
>
|
||||
<ArrowLeftIcon className="size-4" />
|
||||
{t("setting.spaces.label")}
|
||||
</button>
|
||||
|
||||
<header className="flex min-w-0 flex-col gap-3 border-b border-border/70 pb-4 sm:flex-row sm:items-center">
|
||||
<SpaceMark space={space} size="xl" />
|
||||
<div className="min-w-0 flex-1">
|
||||
<div className="flex min-w-0 flex-wrap items-center gap-2">
|
||||
<h3 className="truncate text-lg font-semibold tracking-tight">{space.title}</h3>
|
||||
<SpaceRoleBadge role={currentRole} />
|
||||
</div>
|
||||
<p className="mt-1 truncate text-sm text-muted-foreground">{space.description || t("setting.spaces.no-description")}</p>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<Tabs value={tab} onValueChange={(value) => setTab(value as DetailTab)} variant="underline" className="mt-2">
|
||||
<TabsList className="w-full justify-start border-b border-border/70">
|
||||
<TabsTrigger value="general" className="flex-none px-3">
|
||||
{t("setting.spaces.general")}
|
||||
</TabsTrigger>
|
||||
<TabsTrigger value="members" className="flex-none px-3">
|
||||
{t("setting.spaces.members")}
|
||||
<span className="text-xs font-normal text-muted-foreground">{members.length || space.memberCount}</span>
|
||||
</TabsTrigger>
|
||||
</TabsList>
|
||||
</Tabs>
|
||||
|
||||
{tab === "general" ? (
|
||||
<div className="space-y-5 pt-3">
|
||||
<section className="space-y-2.5">
|
||||
<div>
|
||||
<h4 className="text-sm font-medium">{t("setting.spaces.space-details")}</h4>
|
||||
<p className="mt-1 text-xs leading-5 text-muted-foreground">{t("setting.spaces.space-details-description")}</p>
|
||||
</div>
|
||||
<div className="overflow-hidden rounded-lg border border-border bg-background">
|
||||
<div className="grid gap-2 border-b border-border px-3 py-3 sm:grid-cols-[170px_1fr] sm:items-center">
|
||||
<Label htmlFor="space-settings-title">{t("common.name")}</Label>
|
||||
<Input
|
||||
id="space-settings-title"
|
||||
value={title}
|
||||
onChange={(event) => setTitle(event.target.value)}
|
||||
readOnly={!isAdmin}
|
||||
className={!isAdmin ? "bg-muted/25" : undefined}
|
||||
/>
|
||||
</div>
|
||||
<div className="grid gap-2 px-3 py-3 sm:grid-cols-[170px_1fr] sm:items-start">
|
||||
<div>
|
||||
<Label htmlFor="space-settings-description">{t("common.description")}</Label>
|
||||
<p className="mt-1 text-xs leading-5 text-muted-foreground">{t("setting.spaces.description-help")}</p>
|
||||
</div>
|
||||
<Textarea
|
||||
id="space-settings-description"
|
||||
value={description}
|
||||
onChange={(event) => setDescription(event.target.value)}
|
||||
readOnly={!isAdmin}
|
||||
className={isAdmin ? "min-h-20 resize-none" : "min-h-20 resize-none bg-muted/25"}
|
||||
/>
|
||||
</div>
|
||||
{isAdmin ? (
|
||||
<div className="flex justify-end border-t border-border bg-muted/20 px-3 py-2.5">
|
||||
<Button size="sm" disabled={!title.trim() || !detailsChanged || updateSpace.isPending} onClick={() => void handleSave()}>
|
||||
{t("setting.spaces.save-changes")}
|
||||
</Button>
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section className="space-y-2.5">
|
||||
<h4 className="text-sm font-medium">{t("setting.spaces.your-access")}</h4>
|
||||
<div className="flex flex-col gap-3 rounded-lg border border-border px-3 py-3 sm:flex-row sm:items-center sm:justify-between">
|
||||
<div className="flex items-start gap-2">
|
||||
<ShieldCheckIcon className="mt-0.5 size-4 shrink-0 text-muted-foreground" />
|
||||
<div>
|
||||
<p className="text-sm font-medium">{t("setting.spaces.role-in-space")}</p>
|
||||
<p className="mt-1 text-xs leading-5 text-muted-foreground">
|
||||
{isAdmin ? t("setting.spaces.admin-role-description") : t("setting.spaces.user-role-description")}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<SpaceRoleBadge role={currentRole} />
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section className="rounded-xl border border-destructive/30 bg-destructive/5 p-4">
|
||||
<div className="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
|
||||
<div className="flex min-w-0 items-start gap-3">
|
||||
<span className="flex size-8 shrink-0 items-center justify-center rounded-full bg-destructive/10 text-destructive">
|
||||
<LogOutIcon className="size-4" />
|
||||
</span>
|
||||
<div>
|
||||
<h4 className="text-sm font-medium">{t("setting.spaces.leave-space")}</h4>
|
||||
<p className="mt-1 text-xs leading-5 text-muted-foreground">
|
||||
{isLastAdmin ? t("setting.spaces.last-admin-leave-description") : t("setting.spaces.leave-description")}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<Button
|
||||
variant="outline"
|
||||
size="sm"
|
||||
disabled={!currentMember || isLastAdmin}
|
||||
className="border-destructive/35 text-destructive hover:bg-destructive/10"
|
||||
onClick={() => setLeaveOpen(true)}
|
||||
>
|
||||
{t("setting.spaces.leave-space")}
|
||||
</Button>
|
||||
</div>
|
||||
{isAdmin ? (
|
||||
<div className="mt-4 flex flex-col gap-4 border-t border-destructive/20 pt-4 sm:flex-row sm:items-start sm:justify-between">
|
||||
<div className="flex min-w-0 items-start gap-3">
|
||||
<span className="flex size-8 shrink-0 items-center justify-center rounded-full bg-destructive/10 text-destructive">
|
||||
<Trash2Icon className="size-4" />
|
||||
</span>
|
||||
<div>
|
||||
<h4 className="text-sm font-medium">{t("setting.spaces.delete-space")}</h4>
|
||||
<p className="mt-1 text-xs leading-5 text-muted-foreground">{t("setting.spaces.delete-description")}</p>
|
||||
</div>
|
||||
</div>
|
||||
<Button variant="destructive" size="sm" onClick={() => setDeleteOpen(true)}>
|
||||
{t("setting.spaces.delete-space")}
|
||||
</Button>
|
||||
</div>
|
||||
) : null}
|
||||
</section>
|
||||
</div>
|
||||
) : (
|
||||
<div data-critical-surface="space-members" className="space-y-5 pt-3">
|
||||
<section className="space-y-2.5">
|
||||
<div className="flex flex-col gap-3 sm:flex-row sm:items-end sm:justify-between">
|
||||
<div>
|
||||
<h4 className="text-sm font-medium">{t("setting.spaces.members")}</h4>
|
||||
<p className="mt-1 text-xs leading-5 text-muted-foreground">{t("setting.spaces.members-description")}</p>
|
||||
</div>
|
||||
{isAdmin ? (
|
||||
<Button size="sm" onClick={() => setInviteOpen(true)}>
|
||||
<UserPlusIcon data-icon="inline-start" />
|
||||
{t("setting.spaces.invite-member")}
|
||||
</Button>
|
||||
) : null}
|
||||
</div>
|
||||
|
||||
<div className="divide-y divide-border overflow-hidden rounded-lg border border-border bg-background">
|
||||
{membersQuery.isLoading ? (
|
||||
<div className="flex items-center justify-center gap-2 px-3 py-8 text-sm text-muted-foreground">
|
||||
<LoaderCircleIcon className="size-4 animate-spin" />
|
||||
{t("setting.spaces.loading-members")}
|
||||
</div>
|
||||
) : membersQuery.isError ? (
|
||||
<div className="px-3 py-8 text-center text-sm text-muted-foreground">{t("setting.spaces.members-load-error")}</div>
|
||||
) : (
|
||||
members.map((member) => {
|
||||
const isCurrentUser = member.user === viewerName;
|
||||
return (
|
||||
<div key={member.name} className="grid min-w-0 gap-3 px-3 py-3 sm:grid-cols-[minmax(0,1fr)_auto] sm:items-center">
|
||||
<MemberIdentity
|
||||
member={member}
|
||||
user={usersByUsername.get(extractUsernameFromName(member.user))}
|
||||
isCurrentUser={isCurrentUser}
|
||||
/>
|
||||
<div className="flex min-w-0 flex-wrap items-center justify-end gap-2">
|
||||
{isAdmin && !isCurrentUser ? (
|
||||
<Select
|
||||
value={String(member.role)}
|
||||
items={roleOptions}
|
||||
disabled={updateMember.isPending}
|
||||
onValueChange={(value) => void handleRoleChange(member, Number(value) as SpaceMember_Role)}
|
||||
>
|
||||
<SelectTrigger
|
||||
size="sm"
|
||||
className="w-[126px] rounded-md"
|
||||
aria-label={t("setting.spaces.change-role", { username: extractUsernameFromName(member.user) })}
|
||||
>
|
||||
<SelectValue />
|
||||
</SelectTrigger>
|
||||
<SelectContent align="end">
|
||||
<SelectItem value={String(SpaceMember_Role.USER)}>{t("setting.spaces.space-user")}</SelectItem>
|
||||
<SelectItem value={String(SpaceMember_Role.ADMIN)}>{t("setting.spaces.space-admin")}</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
) : (
|
||||
<SpaceRoleBadge role={member.role} />
|
||||
)}
|
||||
{isAdmin && !isCurrentUser ? (
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
className="text-muted-foreground hover:text-destructive"
|
||||
onClick={() => setRemoveTarget(member)}
|
||||
>
|
||||
{t("setting.spaces.remove")}
|
||||
</Button>
|
||||
) : null}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
})
|
||||
)}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{isAdmin ? (
|
||||
<section className="space-y-2.5">
|
||||
<div className="flex items-center justify-between">
|
||||
<h4 className="text-sm font-medium">{t("setting.spaces.pending-invitations")}</h4>
|
||||
<span className="text-xs text-muted-foreground">{invitations.length}</span>
|
||||
</div>
|
||||
<div className="divide-y divide-border overflow-hidden rounded-lg border border-border bg-background">
|
||||
{invitationsQuery.isLoading ? (
|
||||
<div className="flex items-center justify-center gap-2 px-3 py-5 text-sm text-muted-foreground">
|
||||
<LoaderCircleIcon className="size-4 animate-spin" />
|
||||
{t("setting.spaces.loading-invitations")}
|
||||
</div>
|
||||
) : invitations.length === 0 ? (
|
||||
<div className="px-3 py-5 text-center text-sm text-muted-foreground">{t("setting.spaces.no-pending-invitations")}</div>
|
||||
) : (
|
||||
invitations.map((invitation) => (
|
||||
<div key={invitation.name} className="grid min-w-0 gap-3 px-3 py-3 sm:grid-cols-[minmax(0,1fr)_auto] sm:items-center">
|
||||
<InvitationIdentity invitation={invitation} user={usersByUsername.get(extractUsernameFromName(invitation.invitee))} />
|
||||
<div className="flex min-w-0 flex-wrap items-center justify-end gap-2">
|
||||
<Badge variant="warning" shape="pill" className="h-5 px-2 font-normal">
|
||||
<Clock3Icon data-icon="inline-start" />
|
||||
{t("setting.spaces.invitation-pending")}
|
||||
</Badge>
|
||||
<SpaceRoleBadge role={invitation.role} />
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
className="text-muted-foreground hover:text-destructive"
|
||||
onClick={() => setCancelInvitationTarget(invitation)}
|
||||
>
|
||||
{t("setting.spaces.cancel-invitation")}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
))
|
||||
)}
|
||||
</div>
|
||||
</section>
|
||||
) : null}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<InviteSpaceMemberDialog
|
||||
open={inviteOpen}
|
||||
onOpenChange={setInviteOpen}
|
||||
space={space}
|
||||
viewerName={viewerName}
|
||||
memberUserNames={memberUserNames}
|
||||
pendingInviteeNames={pendingInviteeNames}
|
||||
/>
|
||||
|
||||
<ConfirmDialog
|
||||
open={leaveOpen}
|
||||
onOpenChange={setLeaveOpen}
|
||||
title={t("setting.spaces.leave-confirm-title", { space: space.title })}
|
||||
description={t("setting.spaces.leave-confirm-description")}
|
||||
confirmLabel={t("setting.spaces.leave")}
|
||||
cancelLabel={t("common.cancel")}
|
||||
onConfirm={handleLeave}
|
||||
confirmVariant="destructive"
|
||||
/>
|
||||
<ConfirmDialog
|
||||
open={deleteOpen}
|
||||
onOpenChange={setDeleteOpen}
|
||||
title={t("setting.spaces.delete-confirm-title", { space: space.title })}
|
||||
description={t("setting.spaces.delete-confirm-description")}
|
||||
confirmLabel={t("common.delete")}
|
||||
cancelLabel={t("common.cancel")}
|
||||
onConfirm={handleDeleteSpace}
|
||||
confirmVariant="destructive"
|
||||
/>
|
||||
<ConfirmDialog
|
||||
open={Boolean(removeTarget)}
|
||||
onOpenChange={(open) => !open && setRemoveTarget(undefined)}
|
||||
title={t("setting.spaces.remove-confirm-title", { username: extractUsernameFromName(removeTarget?.user ?? "") })}
|
||||
description={t("setting.spaces.remove-confirm-description")}
|
||||
confirmLabel={t("setting.spaces.remove")}
|
||||
cancelLabel={t("common.cancel")}
|
||||
onConfirm={handleRemoveMember}
|
||||
confirmVariant="destructive"
|
||||
/>
|
||||
<ConfirmDialog
|
||||
open={Boolean(cancelInvitationTarget)}
|
||||
onOpenChange={(open) => !open && setCancelInvitationTarget(undefined)}
|
||||
title={t("setting.spaces.cancel-invitation-confirm-title", {
|
||||
username: extractUsernameFromName(cancelInvitationTarget?.invitee ?? ""),
|
||||
})}
|
||||
description={t("setting.spaces.cancel-invitation-confirm-description")}
|
||||
confirmLabel={t("setting.spaces.cancel-invitation")}
|
||||
cancelLabel={t("common.cancel")}
|
||||
onConfirm={handleCancelInvitation}
|
||||
confirmVariant="destructive"
|
||||
/>
|
||||
</section>
|
||||
);
|
||||
};
|
||||
|
||||
export default SpacesSection;
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
import {
|
||||
BarChart3Icon,
|
||||
BoxesIcon,
|
||||
CogIcon,
|
||||
DatabaseIcon,
|
||||
HeartHandshakeIcon,
|
||||
|
|
@ -24,6 +25,7 @@ import MyAccountSection from "@/components/Settings/MyAccountSection";
|
|||
import NotificationSection from "@/components/Settings/NotificationSection";
|
||||
import PreferencesSection from "@/components/Settings/PreferencesSection";
|
||||
import ResourceStatsSection from "@/components/Settings/ResourceStatsSection";
|
||||
import SpacesSection from "@/components/Settings/SpacesSection";
|
||||
import SSOSection from "@/components/Settings/SSOSection";
|
||||
import StorageSection from "@/components/Settings/StorageSection";
|
||||
import TagsSection from "@/components/Settings/TagsSection";
|
||||
|
|
@ -32,6 +34,7 @@ import { InstanceSetting_Key } from "@/types/proto/api/v1/instance_service_pb";
|
|||
|
||||
export type SettingSectionKey =
|
||||
| "my-account"
|
||||
| "spaces"
|
||||
| "access-token"
|
||||
| "preference"
|
||||
| "webhook"
|
||||
|
|
@ -64,6 +67,13 @@ export const SETTINGS_SECTIONS: SettingSectionDefinition[] = [
|
|||
icon: UserIcon,
|
||||
component: MyAccountSection,
|
||||
},
|
||||
{
|
||||
key: "spaces",
|
||||
scope: "basic",
|
||||
labelKey: "setting.spaces.label",
|
||||
icon: BoxesIcon,
|
||||
component: SpacesSection,
|
||||
},
|
||||
{
|
||||
key: "access-token",
|
||||
scope: "basic",
|
||||
|
|
|
|||
35
web/src/components/SpaceMark.tsx
Normal file
35
web/src/components/SpaceMark.tsx
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
import { cn } from "@/lib/utils";
|
||||
import type { Space } from "@/types/proto/api/v1/space_service_pb";
|
||||
|
||||
const MARK_SCALE = {
|
||||
xl: "size-11 rounded-lg text-base",
|
||||
lg: "size-9 rounded-[7px] text-sm",
|
||||
md: "size-7 rounded-[7px] text-[13px]",
|
||||
sm: "size-5 rounded-[5px] text-[11px]",
|
||||
} as const;
|
||||
|
||||
interface Props {
|
||||
space?: Pick<Space, "title">;
|
||||
size?: keyof typeof MARK_SCALE;
|
||||
className?: string;
|
||||
}
|
||||
|
||||
const SpaceMark = ({ space, size = "md", className }: Props) => {
|
||||
const label = space?.title.trim() || "S";
|
||||
const initial = Array.from(label)[0]?.toLocaleUpperCase() ?? "S";
|
||||
|
||||
return (
|
||||
<span
|
||||
aria-hidden
|
||||
className={cn(
|
||||
"flex shrink-0 items-center justify-center bg-sidebar-accent font-semibold text-sidebar-accent-foreground",
|
||||
MARK_SCALE[size],
|
||||
className,
|
||||
)}
|
||||
>
|
||||
{initial}
|
||||
</span>
|
||||
);
|
||||
};
|
||||
|
||||
export default SpaceMark;
|
||||
|
|
@ -4,6 +4,7 @@ import { getRequestToken, refreshAccessToken } from "@/connect";
|
|||
import { useAuth } from "@/contexts/AuthContext";
|
||||
import { attachmentKeys } from "@/hooks/useAttachmentQueries";
|
||||
import { memoKeys } from "@/hooks/useMemoQueries";
|
||||
import { spaceKeys } from "@/hooks/useSpaceQueries";
|
||||
import { userKeys } from "@/hooks/useUserQueries";
|
||||
|
||||
/**
|
||||
|
|
@ -18,7 +19,8 @@ const HIDDEN_DISCONNECT_DELAY_MS = 30_000;
|
|||
const SSE_CONNECTION_LOCK_NAME = "memos-sse-connection";
|
||||
const SSE_SYNC_CHANNEL_NAME = "memos-sse-sync";
|
||||
|
||||
const SSE_EVENT_TYPE = "memo.changed" as const;
|
||||
const MEMO_CHANGED_SSE_EVENT_TYPE = "memo.changed" as const;
|
||||
const SPACE_CHANGED_SSE_EVENT_TYPE = "space.changed" as const;
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Shared connection status store (singleton)
|
||||
|
|
@ -56,7 +58,7 @@ export function useSSEConnectionStatus(): SSEConnectionStatus {
|
|||
}
|
||||
|
||||
interface SSEChangeEvent {
|
||||
type: typeof SSE_EVENT_TYPE;
|
||||
type: typeof MEMO_CHANGED_SSE_EVENT_TYPE | typeof SPACE_CHANGED_SSE_EVENT_TYPE;
|
||||
}
|
||||
|
||||
type SSESyncMessage =
|
||||
|
|
@ -69,8 +71,8 @@ type SSESyncMessage =
|
|||
// ---------------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* useLiveMemoRefresh connects to the server's SSE endpoint and
|
||||
* invalidates memo-backed React Query caches when a change event is received.
|
||||
* useLiveMemoRefresh connects to the server's SSE endpoint and invalidates
|
||||
* Space- and memo-backed React Query caches when a change event is received.
|
||||
*
|
||||
* This enables real-time updates across all open instances of the app.
|
||||
*/
|
||||
|
|
@ -152,7 +154,7 @@ export function useLiveMemoRefresh() {
|
|||
if (hasConnectedOnceRef.current) {
|
||||
// Resync active collaborative views after reconnect because the server may have
|
||||
// dropped events while the client was disconnected or backpressured.
|
||||
invalidateLiveMemoQueries(queryClient);
|
||||
invalidateAllLiveQueries(queryClient);
|
||||
}
|
||||
hasConnectedOnceRef.current = true;
|
||||
|
||||
|
|
@ -276,7 +278,7 @@ export function useLiveMemoRefresh() {
|
|||
}
|
||||
if (message.status === "connected") {
|
||||
if (hasConnectedOnceRef.current) {
|
||||
invalidateLiveMemoQueries(queryClient);
|
||||
invalidateAllLiveQueries(queryClient);
|
||||
}
|
||||
hasConnectedOnceRef.current = true;
|
||||
}
|
||||
|
|
@ -458,9 +460,18 @@ async function consumeSSEStream(body: ReadableStream<Uint8Array>, signal: AbortS
|
|||
}
|
||||
|
||||
function handleSSEEvent(event: SSEChangeEvent, queryClient: ReturnType<typeof useQueryClient>) {
|
||||
if (event.type !== SSE_EVENT_TYPE) {
|
||||
return;
|
||||
switch (event.type) {
|
||||
case MEMO_CHANGED_SSE_EVENT_TYPE:
|
||||
invalidateLiveMemoQueries(queryClient);
|
||||
break;
|
||||
case SPACE_CHANGED_SSE_EVENT_TYPE:
|
||||
invalidateAllLiveQueries(queryClient);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
function invalidateAllLiveQueries(queryClient: ReturnType<typeof useQueryClient>) {
|
||||
queryClient.invalidateQueries({ queryKey: spaceKeys.all, refetchType: "active" });
|
||||
invalidateLiveMemoQueries(queryClient);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,19 +1,107 @@
|
|||
import { create } from "@bufbuild/protobuf";
|
||||
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
||||
import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";
|
||||
import { type QueryClient, type QueryKey, useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
||||
import { spaceServiceClient } from "@/connect";
|
||||
import { type Space, SpaceSchema } from "@/types/proto/api/v1/space_service_pb";
|
||||
import { attachmentKeys } from "@/hooks/useAttachmentQueries";
|
||||
import { memoKeys } from "@/hooks/useMemoQueries";
|
||||
import { userKeys } from "@/hooks/useUserQueries";
|
||||
import {
|
||||
type Space,
|
||||
type SpaceInvitation,
|
||||
SpaceInvitationSchema,
|
||||
type SpaceMember,
|
||||
SpaceMemberSchema,
|
||||
SpaceSchema,
|
||||
} from "@/types/proto/api/v1/space_service_pb";
|
||||
|
||||
const SPACE_LIST_PAGE_SIZE = 1000;
|
||||
const SPACE_LIST_STALE_TIME = 1000 * 60 * 5;
|
||||
|
||||
export interface SpaceQueryOptions {
|
||||
enabled?: boolean;
|
||||
}
|
||||
|
||||
export type UpdateSpaceVariables = {
|
||||
space: Partial<Space> & Pick<Space, "name">;
|
||||
updateMask: string[];
|
||||
};
|
||||
|
||||
export type DeleteSpaceVariables = {
|
||||
name: string;
|
||||
};
|
||||
|
||||
export type CreateSpaceInvitationVariables = {
|
||||
parent: string;
|
||||
spaceInvitation: Pick<SpaceInvitation, "invitee" | "role">;
|
||||
};
|
||||
|
||||
export type SpaceInvitationNameVariables = {
|
||||
name: string;
|
||||
};
|
||||
|
||||
export type UpdateSpaceMemberVariables = {
|
||||
spaceMember: Partial<SpaceMember> & Pick<SpaceMember, "name">;
|
||||
updateMask: string[];
|
||||
};
|
||||
|
||||
export type DeleteSpaceMemberVariables = {
|
||||
name: string;
|
||||
};
|
||||
|
||||
export const spaceKeys = {
|
||||
all: ["spaces"] as const,
|
||||
lists: () => [...spaceKeys.all, "list"] as const,
|
||||
list: (userName: string) => [...spaceKeys.lists(), userName] as const,
|
||||
list: (viewerName: string) => [...spaceKeys.lists(), viewerName] as const,
|
||||
space: (viewerName: string, spaceName: string) => [...spaceKeys.all, "space", viewerName, spaceName] as const,
|
||||
members: (viewerName: string, spaceName: string) => [...spaceKeys.space(viewerName, spaceName), "members"] as const,
|
||||
spaceInvitations: (viewerName: string, spaceName: string) => [...spaceKeys.space(viewerName, spaceName), "invitations"] as const,
|
||||
userInvitations: (viewerName: string) => [...spaceKeys.all, "user-invitations", viewerName] as const,
|
||||
};
|
||||
|
||||
export function useSpaces(userName: string | undefined) {
|
||||
const queryEnabled = (viewerName: string | undefined, resourceName: string | undefined, options?: SpaceQueryOptions) =>
|
||||
Boolean(viewerName && resourceName) && (options?.enabled ?? true);
|
||||
|
||||
const spaceNameFromChildResource = (name: string): string | undefined => {
|
||||
const [collection, spaceID] = name.split("/");
|
||||
return collection === "spaces" && spaceID ? `${collection}/${spaceID}` : undefined;
|
||||
};
|
||||
|
||||
const resourceID = (name: string): string | undefined => name.split("/").filter(Boolean).pop();
|
||||
|
||||
const upsertByName = <T extends { name: string }>(items: T[], item: T): T[] => {
|
||||
const index = items.findIndex(({ name }) => name === item.name);
|
||||
if (index === -1) {
|
||||
return [...items, item];
|
||||
}
|
||||
|
||||
const next = [...items];
|
||||
next[index] = item;
|
||||
return next;
|
||||
};
|
||||
|
||||
const removeByName = <T extends { name: string }>(items: T[], name: string): T[] => items.filter((item) => item.name !== name);
|
||||
|
||||
const updateCachedList = <T>(queryClient: QueryClient, queryKey: QueryKey, update: (items: T[]) => T[]) => {
|
||||
const items = queryClient.getQueryData<T[]>(queryKey);
|
||||
if (items !== undefined) {
|
||||
queryClient.setQueryData<T[]>(queryKey, update(items));
|
||||
}
|
||||
};
|
||||
|
||||
const removeSpaceFromViewerCache = (queryClient: QueryClient, viewerName: string, spaceName: string) => {
|
||||
updateCachedList<Space>(queryClient, spaceKeys.list(viewerName), (spaces) => removeByName(spaces, spaceName));
|
||||
queryClient.removeQueries({ queryKey: spaceKeys.space(viewerName, spaceName) });
|
||||
};
|
||||
|
||||
const invalidateMembershipSensitiveQueries = (queryClient: QueryClient) => {
|
||||
void queryClient.invalidateQueries({ queryKey: memoKeys.all });
|
||||
void queryClient.invalidateQueries({ queryKey: attachmentKeys.lists() });
|
||||
void queryClient.invalidateQueries({ queryKey: userKeys.stats() });
|
||||
};
|
||||
|
||||
export function useSpaces(viewerName: string | undefined, options?: SpaceQueryOptions) {
|
||||
return useQuery({
|
||||
queryKey: spaceKeys.list(userName ?? ""),
|
||||
queryKey: spaceKeys.list(viewerName ?? ""),
|
||||
queryFn: async () => {
|
||||
const spaces: Space[] = [];
|
||||
let pageToken = "";
|
||||
|
|
@ -29,15 +117,84 @@ export function useSpaces(userName: string | undefined) {
|
|||
|
||||
return spaces;
|
||||
},
|
||||
enabled: Boolean(userName),
|
||||
enabled: Boolean(viewerName) && (options?.enabled ?? true),
|
||||
// SpaceProvider wraps the whole route tree, so this drains every page on boot.
|
||||
// Space membership is near-static, so don't re-run that loop on each tab return.
|
||||
staleTime: 1000 * 60 * 5,
|
||||
staleTime: SPACE_LIST_STALE_TIME,
|
||||
refetchOnWindowFocus: false,
|
||||
});
|
||||
}
|
||||
|
||||
export function useCreateSpace(userName: string) {
|
||||
export function useSpaceMembers(viewerName: string | undefined, spaceName: string | undefined, options?: SpaceQueryOptions) {
|
||||
return useQuery({
|
||||
queryKey: spaceKeys.members(viewerName ?? "", spaceName ?? ""),
|
||||
queryFn: async () => {
|
||||
const members: SpaceMember[] = [];
|
||||
let pageToken = "";
|
||||
|
||||
do {
|
||||
const response = await spaceServiceClient.listSpaceMembers({
|
||||
parent: spaceName!,
|
||||
pageSize: SPACE_LIST_PAGE_SIZE,
|
||||
pageToken,
|
||||
});
|
||||
members.push(...response.spaceMembers);
|
||||
pageToken = response.nextPageToken;
|
||||
} while (pageToken);
|
||||
|
||||
return members;
|
||||
},
|
||||
enabled: queryEnabled(viewerName, spaceName, options),
|
||||
});
|
||||
}
|
||||
|
||||
export function useSpaceInvitations(viewerName: string | undefined, spaceName: string | undefined, options?: SpaceQueryOptions) {
|
||||
return useQuery({
|
||||
queryKey: spaceKeys.spaceInvitations(viewerName ?? "", spaceName ?? ""),
|
||||
queryFn: async () => {
|
||||
const invitations: SpaceInvitation[] = [];
|
||||
let pageToken = "";
|
||||
|
||||
do {
|
||||
const response = await spaceServiceClient.listSpaceInvitations({
|
||||
parent: spaceName!,
|
||||
pageSize: SPACE_LIST_PAGE_SIZE,
|
||||
pageToken,
|
||||
});
|
||||
invitations.push(...response.spaceInvitations);
|
||||
pageToken = response.nextPageToken;
|
||||
} while (pageToken);
|
||||
|
||||
return invitations;
|
||||
},
|
||||
enabled: queryEnabled(viewerName, spaceName, options),
|
||||
});
|
||||
}
|
||||
|
||||
export function useUserSpaceInvitations(viewerName: string | undefined, options?: SpaceQueryOptions) {
|
||||
return useQuery({
|
||||
queryKey: spaceKeys.userInvitations(viewerName ?? ""),
|
||||
queryFn: async () => {
|
||||
const invitations: SpaceInvitation[] = [];
|
||||
let pageToken = "";
|
||||
|
||||
do {
|
||||
const response = await spaceServiceClient.listUserSpaceInvitations({
|
||||
parent: viewerName!,
|
||||
pageSize: SPACE_LIST_PAGE_SIZE,
|
||||
pageToken,
|
||||
});
|
||||
invitations.push(...response.spaceInvitations);
|
||||
pageToken = response.nextPageToken;
|
||||
} while (pageToken);
|
||||
|
||||
return invitations;
|
||||
},
|
||||
enabled: Boolean(viewerName) && (options?.enabled ?? true),
|
||||
});
|
||||
}
|
||||
|
||||
export function useCreateSpace(viewerName: string) {
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
return useMutation({
|
||||
|
|
@ -46,7 +203,175 @@ export function useCreateSpace(userName: string) {
|
|||
space: create(SpaceSchema, { title, description }),
|
||||
}),
|
||||
onSuccess: (space) => {
|
||||
queryClient.setQueryData<Space[]>(spaceKeys.list(userName), (spaces = []) => [...spaces, space]);
|
||||
queryClient.setQueryData<Space[]>(spaceKeys.list(viewerName), (spaces = []) => upsertByName(spaces, space));
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
export function useUpdateSpace(viewerName: string) {
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
return useMutation({
|
||||
mutationFn: ({ space, updateMask }: UpdateSpaceVariables) =>
|
||||
spaceServiceClient.updateSpace({
|
||||
space: create(SpaceSchema, space as Record<string, unknown>),
|
||||
updateMask: create(FieldMaskSchema, { paths: updateMask }),
|
||||
}),
|
||||
onSuccess: (space) => {
|
||||
updateCachedList<Space>(queryClient, spaceKeys.list(viewerName), (spaces) => upsertByName(spaces, space));
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
export function useDeleteSpace(viewerName: string) {
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
return useMutation({
|
||||
mutationFn: async ({ name }: DeleteSpaceVariables) => {
|
||||
await spaceServiceClient.deleteSpace({ name });
|
||||
return name;
|
||||
},
|
||||
onSuccess: (spaceName) => {
|
||||
removeSpaceFromViewerCache(queryClient, viewerName, spaceName);
|
||||
invalidateMembershipSensitiveQueries(queryClient);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
export function useCreateSpaceInvitation(viewerName: string) {
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
return useMutation({
|
||||
mutationFn: ({ parent, spaceInvitation }: CreateSpaceInvitationVariables) =>
|
||||
spaceServiceClient.createSpaceInvitation({
|
||||
parent,
|
||||
spaceInvitation: create(SpaceInvitationSchema, spaceInvitation),
|
||||
}),
|
||||
onSuccess: (invitation, { parent }) => {
|
||||
updateCachedList<SpaceInvitation>(queryClient, spaceKeys.spaceInvitations(viewerName, parent), (invitations) =>
|
||||
upsertByName(invitations, invitation),
|
||||
);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
export function useDeleteSpaceInvitation(viewerName: string) {
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
return useMutation({
|
||||
mutationFn: async ({ name }: SpaceInvitationNameVariables) => {
|
||||
await spaceServiceClient.deleteSpaceInvitation({ name });
|
||||
return name;
|
||||
},
|
||||
onSuccess: (name) => {
|
||||
const spaceName = spaceNameFromChildResource(name);
|
||||
if (spaceName) {
|
||||
updateCachedList<SpaceInvitation>(queryClient, spaceKeys.spaceInvitations(viewerName, spaceName), (invitations) =>
|
||||
removeByName(invitations, name),
|
||||
);
|
||||
}
|
||||
updateCachedList<SpaceInvitation>(queryClient, spaceKeys.userInvitations(viewerName), (invitations) =>
|
||||
removeByName(invitations, name),
|
||||
);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
export function useAcceptSpaceInvitation(viewerName: string) {
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
return useMutation({
|
||||
mutationFn: ({ name }: SpaceInvitationNameVariables) => spaceServiceClient.acceptSpaceInvitation({ name }),
|
||||
onSuccess: (member, { name }) => {
|
||||
const userInvitationKey = spaceKeys.userInvitations(viewerName);
|
||||
const spaceName = spaceNameFromChildResource(member.name) ?? spaceNameFromChildResource(name);
|
||||
|
||||
updateCachedList<SpaceInvitation>(queryClient, userInvitationKey, (invitations) => removeByName(invitations, name));
|
||||
if (spaceName) {
|
||||
updateCachedList<SpaceInvitation>(queryClient, spaceKeys.spaceInvitations(viewerName, spaceName), (invitations) =>
|
||||
removeByName(invitations, name),
|
||||
);
|
||||
updateCachedList<SpaceMember>(queryClient, spaceKeys.members(viewerName, spaceName), (members) => upsertByName(members, member));
|
||||
}
|
||||
|
||||
// Invitation summaries deliberately omit membership-only Space fields. Never
|
||||
// promote that summary into the member list; refresh the authoritative list.
|
||||
void queryClient.invalidateQueries({ queryKey: spaceKeys.list(viewerName), exact: true });
|
||||
invalidateMembershipSensitiveQueries(queryClient);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
export function useDeclineSpaceInvitation(viewerName: string) {
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
return useMutation({
|
||||
mutationFn: async ({ name }: SpaceInvitationNameVariables) => {
|
||||
await spaceServiceClient.declineSpaceInvitation({ name });
|
||||
return name;
|
||||
},
|
||||
onSuccess: (name) => {
|
||||
updateCachedList<SpaceInvitation>(queryClient, spaceKeys.userInvitations(viewerName), (invitations) =>
|
||||
removeByName(invitations, name),
|
||||
);
|
||||
const spaceName = spaceNameFromChildResource(name);
|
||||
if (spaceName) {
|
||||
updateCachedList<SpaceInvitation>(queryClient, spaceKeys.spaceInvitations(viewerName, spaceName), (invitations) =>
|
||||
removeByName(invitations, name),
|
||||
);
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
export function useUpdateSpaceMember(viewerName: string) {
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
return useMutation({
|
||||
mutationFn: ({ spaceMember, updateMask }: UpdateSpaceMemberVariables) =>
|
||||
spaceServiceClient.updateSpaceMember({
|
||||
spaceMember: create(SpaceMemberSchema, spaceMember as Record<string, unknown>),
|
||||
updateMask: create(FieldMaskSchema, { paths: updateMask }),
|
||||
}),
|
||||
onSuccess: (member) => {
|
||||
const spaceName = spaceNameFromChildResource(member.name);
|
||||
if (spaceName) {
|
||||
updateCachedList<SpaceMember>(queryClient, spaceKeys.members(viewerName, spaceName), (members) => upsertByName(members, member));
|
||||
}
|
||||
if (member.user === viewerName) {
|
||||
void queryClient.invalidateQueries({ queryKey: spaceKeys.list(viewerName), exact: true });
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
export function useDeleteSpaceMember(viewerName: string) {
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
return useMutation({
|
||||
mutationFn: async ({ name }: DeleteSpaceMemberVariables) => {
|
||||
await spaceServiceClient.deleteSpaceMember({ name });
|
||||
return name;
|
||||
},
|
||||
onSuccess: (name) => {
|
||||
const spaceName = spaceNameFromChildResource(name);
|
||||
if (!spaceName) {
|
||||
return;
|
||||
}
|
||||
|
||||
const memberKey = spaceKeys.members(viewerName, spaceName);
|
||||
const deletedMember = queryClient.getQueryData<SpaceMember[]>(memberKey)?.find((member) => member.name === name);
|
||||
const viewerIsDeletedMember =
|
||||
deletedMember?.user === viewerName || (resourceID(name) !== undefined && resourceID(name) === resourceID(viewerName));
|
||||
|
||||
updateCachedList<SpaceMember>(queryClient, memberKey, (members) => removeByName(members, name));
|
||||
if (viewerIsDeletedMember) {
|
||||
removeSpaceFromViewerCache(queryClient, viewerName, spaceName);
|
||||
invalidateMembershipSensitiveQueries(queryClient);
|
||||
}
|
||||
// Membership counts (and, for self-removal, membership-derived fields) are
|
||||
// authoritative list output. Refresh them without relying on those fields here.
|
||||
void queryClient.invalidateQueries({ queryKey: spaceKeys.list(viewerName), exact: true });
|
||||
},
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -670,6 +670,87 @@
|
|||
"my-account": {
|
||||
"label": "My Account"
|
||||
},
|
||||
"spaces": {
|
||||
"accept": "Accept",
|
||||
"accept-success": "Invitation accepted. {{space}} is now in Your spaces.",
|
||||
"active-user": "Active Memos user",
|
||||
"admin-role-description": "Can edit this space, invite users, and manage members.",
|
||||
"already-invited": "Invitation already pending",
|
||||
"already-member": "Already a member",
|
||||
"cancel-invitation": "Cancel invitation",
|
||||
"cancel-invitation-confirm-description": "The user will no longer be able to accept this invitation. You can invite them again later.",
|
||||
"cancel-invitation-confirm-title": "Cancel the invitation for @{{username}}?",
|
||||
"cancel-invitation-success": "Invitation cancelled.",
|
||||
"change-role": "Change @{{username}}'s role",
|
||||
"create-scope-note": "You'll become the first admin. Creating it here will not change your current browsing scope.",
|
||||
"create-space": "Create space",
|
||||
"decline": "Decline",
|
||||
"decline-success": "Invitation declined.",
|
||||
"delete-confirm-description": "This permanently deletes the space and the memos placed in it. This action cannot be undone.",
|
||||
"delete-confirm-title": "Delete {{space}}?",
|
||||
"delete-description": "Permanently delete this space and the memos placed in it.",
|
||||
"delete-space": "Delete space",
|
||||
"delete-success": "{{space}} was deleted.",
|
||||
"description": "View spaces you belong to and manage members and invitations.",
|
||||
"description-help": "Explain what this space is for.",
|
||||
"general": "General",
|
||||
"invitation-pending": "Invitation pending",
|
||||
"invitations": "Invitations",
|
||||
"invite-description": "Invite an existing Memos user. They must accept before joining the space.",
|
||||
"invite-member": "Invite member",
|
||||
"invite-success": "Invitation sent to @{{username}}.",
|
||||
"invite-to": "Invite to {{space}}",
|
||||
"invite-yourself": "This is you",
|
||||
"invited-to-join": "You have been invited to join this space.",
|
||||
"label": "Spaces",
|
||||
"last-admin-leave-description": "Assign another Space admin before you leave.",
|
||||
"leave": "Leave",
|
||||
"leave-confirm-description": "You will lose access to the memos and attachments in this space.",
|
||||
"leave-confirm-title": "Leave {{space}}?",
|
||||
"leave-description": "You will lose access to its memos and attachments.",
|
||||
"leave-space": "Leave space",
|
||||
"leave-success": "You left {{space}}.",
|
||||
"load-error": "Failed to load your spaces.",
|
||||
"loading": "Loading spaces...",
|
||||
"loading-invitations": "Loading invitations...",
|
||||
"loading-members": "Loading members...",
|
||||
"manage-space": "Manage {{space}}",
|
||||
"member-count": "{{count}} member",
|
||||
"members": "Members",
|
||||
"members-count": "{{count}} members",
|
||||
"members-description": "People who can view and contribute to this space.",
|
||||
"members-load-error": "Failed to load members.",
|
||||
"memos-user": "Memos user",
|
||||
"no-description": "No description yet.",
|
||||
"no-pending-invitations": "No pending invitations.",
|
||||
"no-spaces": "No spaces yet",
|
||||
"no-spaces-description": "Create a shared place for memos and members. Creating it here will not change your current browsing scope.",
|
||||
"pending-count": "{{count}} pending",
|
||||
"pending-invitations": "Pending invitations",
|
||||
"remove": "Remove",
|
||||
"remove-confirm-description": "They will lose access to the memos and attachments in this space.",
|
||||
"remove-confirm-title": "Remove @{{username}} from this space?",
|
||||
"remove-success": "@{{username}} was removed from the space.",
|
||||
"role-in-space": "Role in this space",
|
||||
"role-update-success": "Member role updated.",
|
||||
"save-changes": "Save changes",
|
||||
"save-success": "Space details saved.",
|
||||
"search-user-placeholder": "Search by exact username",
|
||||
"send-invitation": "Send invitation",
|
||||
"space-admin": "Space admin",
|
||||
"space-count": "{{count}} space",
|
||||
"space-details": "Space details",
|
||||
"space-details-description": "These details are visible to everyone in this space.",
|
||||
"space-user": "Space user",
|
||||
"spaces-count": "{{count}} spaces",
|
||||
"title": "Spaces",
|
||||
"untitled": "Untitled space",
|
||||
"user-not-found": "No active Memos user found for @{{username}}.",
|
||||
"user-role-description": "Can view and contribute to this space.",
|
||||
"you": "You",
|
||||
"your-access": "Your access",
|
||||
"your-spaces": "Your spaces"
|
||||
},
|
||||
"notification": {
|
||||
"email-description": "Send email copies for memo comments and mentions. Gmail works with smtp.gmail.com, port 587, STARTTLS, and an app password.",
|
||||
"email-enabled": "Enable email notifications",
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -5,7 +5,7 @@ import CreateSpaceDialog from "@/components/CreateSpaceDialog";
|
|||
const mocks = vi.hoisted(() => ({
|
||||
mutateAsync: vi.fn(),
|
||||
onOpenChange: vi.fn(),
|
||||
selectSpace: vi.fn(),
|
||||
onCreated: vi.fn(),
|
||||
toastSuccess: vi.fn(),
|
||||
isPending: false,
|
||||
}));
|
||||
|
|
@ -14,10 +14,6 @@ vi.mock("react-hot-toast", () => ({
|
|||
toast: { error: vi.fn(), success: mocks.toastSuccess },
|
||||
}));
|
||||
|
||||
vi.mock("@/contexts/SpaceContext", () => ({
|
||||
useSpaceContext: () => ({ selectSpace: mocks.selectSpace }),
|
||||
}));
|
||||
|
||||
vi.mock("@/hooks/useCurrentUser", () => ({
|
||||
default: () => ({ name: "users/test" }),
|
||||
}));
|
||||
|
|
@ -34,20 +30,31 @@ describe("CreateSpaceDialog", () => {
|
|||
beforeEach(() => {
|
||||
mocks.mutateAsync.mockReset().mockResolvedValue({ name: "spaces/product", title: "Product", description: "Plans" });
|
||||
mocks.onOpenChange.mockClear();
|
||||
mocks.selectSpace.mockClear();
|
||||
mocks.onCreated.mockClear();
|
||||
mocks.toastSuccess.mockClear();
|
||||
mocks.isPending = false;
|
||||
});
|
||||
|
||||
it("creates and immediately selects the new Space", async () => {
|
||||
render(<CreateSpaceDialog open onOpenChange={mocks.onOpenChange} />);
|
||||
it("creates and reports the new Space to the caller", async () => {
|
||||
render(<CreateSpaceDialog open onOpenChange={mocks.onOpenChange} onCreated={mocks.onCreated} />);
|
||||
|
||||
fireEvent.change(screen.getByLabelText("common.name"), { target: { value: " Product " } });
|
||||
fireEvent.change(screen.getByLabelText("common.description"), { target: { value: " Plans " } });
|
||||
fireEvent.click(screen.getByRole("button", { name: "common.create" }));
|
||||
|
||||
await waitFor(() => expect(mocks.mutateAsync).toHaveBeenCalledWith({ title: "Product", description: "Plans" }));
|
||||
expect(mocks.selectSpace).toHaveBeenCalledWith({ name: "spaces/product", title: "Product", description: "Plans" });
|
||||
expect(mocks.onCreated).toHaveBeenCalledWith({ name: "spaces/product", title: "Product", description: "Plans" });
|
||||
expect(mocks.onOpenChange).toHaveBeenCalledWith(false);
|
||||
});
|
||||
|
||||
it("can create without activating the new Space", async () => {
|
||||
render(<CreateSpaceDialog open onOpenChange={mocks.onOpenChange} />);
|
||||
|
||||
fireEvent.change(screen.getByLabelText("common.name"), { target: { value: "Product" } });
|
||||
fireEvent.click(screen.getByRole("button", { name: "common.create" }));
|
||||
|
||||
await waitFor(() => expect(mocks.mutateAsync).toHaveBeenCalledOnce());
|
||||
expect(mocks.onCreated).not.toHaveBeenCalled();
|
||||
expect(mocks.onOpenChange).toHaveBeenCalledWith(false);
|
||||
});
|
||||
|
||||
|
|
@ -58,12 +65,12 @@ describe("CreateSpaceDialog", () => {
|
|||
resolveCreate = resolve;
|
||||
}),
|
||||
);
|
||||
const view = render(<CreateSpaceDialog open onOpenChange={mocks.onOpenChange} />);
|
||||
const view = render(<CreateSpaceDialog open onOpenChange={mocks.onOpenChange} onCreated={mocks.onCreated} />);
|
||||
fireEvent.change(screen.getByLabelText("common.name"), { target: { value: "Product" } });
|
||||
fireEvent.click(screen.getByRole("button", { name: "common.create" }));
|
||||
|
||||
mocks.isPending = true;
|
||||
view.rerender(<CreateSpaceDialog open onOpenChange={mocks.onOpenChange} />);
|
||||
view.rerender(<CreateSpaceDialog open onOpenChange={mocks.onOpenChange} onCreated={mocks.onCreated} />);
|
||||
fireEvent.click(screen.getByRole("button", { name: "Close" }));
|
||||
expect(mocks.onOpenChange).not.toHaveBeenCalled();
|
||||
expect(screen.getByRole("dialog")).toBeInTheDocument();
|
||||
|
|
@ -71,7 +78,7 @@ describe("CreateSpaceDialog", () => {
|
|||
await act(async () => {
|
||||
resolveCreate({ name: "spaces/product", title: "Product", description: "" });
|
||||
});
|
||||
expect(mocks.selectSpace).toHaveBeenCalledWith({ name: "spaces/product", title: "Product", description: "" });
|
||||
expect(mocks.onCreated).toHaveBeenCalledWith({ name: "spaces/product", title: "Product", description: "" });
|
||||
expect(mocks.onOpenChange).toHaveBeenCalledWith(false);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
144
web/tests/invite-space-member-dialog.test.tsx
Normal file
144
web/tests/invite-space-member-dialog.test.tsx
Normal file
|
|
@ -0,0 +1,144 @@
|
|||
import { act, fireEvent, render, screen } from "@testing-library/react";
|
||||
import type { ReactNode } from "react";
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import InviteSpaceMemberDialog from "@/components/Settings/InviteSpaceMemberDialog";
|
||||
import { State } from "@/types/proto/api/v1/common_pb";
|
||||
import { type Space, SpaceMember_Role } from "@/types/proto/api/v1/space_service_pb";
|
||||
import type { User } from "@/types/proto/api/v1/user_service_pb";
|
||||
|
||||
const state = vi.hoisted(() => ({
|
||||
candidate: undefined as User | undefined,
|
||||
requestedUsernames: [] as string[][],
|
||||
mutateAsync: vi.fn(),
|
||||
onOpenChange: vi.fn(),
|
||||
}));
|
||||
|
||||
vi.mock("react-hot-toast", () => ({
|
||||
default: { error: vi.fn(), success: vi.fn() },
|
||||
}));
|
||||
|
||||
vi.mock("@/hooks/useSpaceQueries", () => ({
|
||||
useCreateSpaceInvitation: () => ({ isPending: false, mutateAsync: state.mutateAsync }),
|
||||
}));
|
||||
|
||||
vi.mock("@/hooks/useUserQueries", () => ({
|
||||
useUsersByUsernames: (usernames: string[]) => {
|
||||
state.requestedUsernames.push(usernames);
|
||||
const username = usernames[0];
|
||||
return {
|
||||
data: new Map(username && state.candidate?.username === username ? [[username, state.candidate]] : []),
|
||||
isFetching: false,
|
||||
isSuccess: true,
|
||||
};
|
||||
},
|
||||
}));
|
||||
|
||||
vi.mock("@/components/UserAvatar", () => ({
|
||||
default: () => <span aria-hidden />,
|
||||
}));
|
||||
|
||||
vi.mock("@/components/ui/dialog", () => ({
|
||||
Dialog: ({ open, children }: { open: boolean; children: ReactNode }) => (open ? children : null),
|
||||
DialogContent: ({ children }: { children: ReactNode }) => <div role="dialog">{children}</div>,
|
||||
DialogDescription: ({ children }: { children: ReactNode }) => <p>{children}</p>,
|
||||
DialogFooter: ({ children }: { children: ReactNode }) => <div>{children}</div>,
|
||||
DialogHeader: ({ children }: { children: ReactNode }) => <div>{children}</div>,
|
||||
DialogTitle: ({ children }: { children: ReactNode }) => <h2>{children}</h2>,
|
||||
}));
|
||||
|
||||
vi.mock("@/components/ui/select", () => ({
|
||||
Select: ({ value, onValueChange }: { value: string; onValueChange: (value: string) => void }) => (
|
||||
<select aria-label="role-select" value={value} onChange={(event) => onValueChange(event.target.value)}>
|
||||
<option value="2">Space user</option>
|
||||
<option value="1">Space admin</option>
|
||||
</select>
|
||||
),
|
||||
SelectContent: () => null,
|
||||
SelectItem: () => null,
|
||||
SelectTrigger: () => null,
|
||||
SelectValue: () => null,
|
||||
}));
|
||||
|
||||
vi.mock("@/utils/i18n", () => ({
|
||||
useTranslate: () => (key: string) => {
|
||||
const copy: Record<string, string> = {
|
||||
"setting.spaces.active-user": "Active Memos user",
|
||||
"setting.spaces.invite-description": "Invite an existing Memos user. They must accept before joining the space.",
|
||||
"setting.spaces.memos-user": "Memos user",
|
||||
"setting.spaces.search-user-placeholder": "Search by exact username",
|
||||
"setting.spaces.send-invitation": "Send invitation",
|
||||
};
|
||||
return copy[key] ?? key;
|
||||
},
|
||||
}));
|
||||
|
||||
const productSpace: Space = {
|
||||
$typeName: "memos.api.v1.Space",
|
||||
name: "spaces/product",
|
||||
title: "Product",
|
||||
description: "Product decisions",
|
||||
currentUserRole: SpaceMember_Role.ADMIN,
|
||||
memberCount: 1,
|
||||
};
|
||||
|
||||
const alice: User = {
|
||||
$typeName: "memos.api.v1.User",
|
||||
name: "users/alice",
|
||||
username: "alice",
|
||||
displayName: "Alice",
|
||||
email: "",
|
||||
avatarUrl: "",
|
||||
description: "",
|
||||
password: "",
|
||||
role: 3,
|
||||
state: State.NORMAL,
|
||||
};
|
||||
|
||||
describe("InviteSpaceMemberDialog", () => {
|
||||
beforeEach(() => {
|
||||
vi.useFakeTimers();
|
||||
state.candidate = alice;
|
||||
state.requestedUsernames = [];
|
||||
state.mutateAsync.mockReset().mockResolvedValue(undefined);
|
||||
state.onOpenChange.mockReset();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
vi.useRealTimers();
|
||||
});
|
||||
|
||||
it("invites an exact active Memos user with the chosen role and explains consent", async () => {
|
||||
render(
|
||||
<InviteSpaceMemberDialog
|
||||
open
|
||||
onOpenChange={state.onOpenChange}
|
||||
space={productSpace}
|
||||
viewerName="users/steven"
|
||||
memberUserNames={new Set(["users/steven"])}
|
||||
pendingInviteeNames={new Set()}
|
||||
/>,
|
||||
);
|
||||
|
||||
expect(screen.getByText("Invite an existing Memos user. They must accept before joining the space.")).toBeInTheDocument();
|
||||
|
||||
fireEvent.change(screen.getByLabelText("Memos user"), { target: { value: " @alice " } });
|
||||
act(() => vi.advanceTimersByTime(300));
|
||||
|
||||
expect(state.requestedUsernames.at(-1)).toEqual(["alice"]);
|
||||
expect(screen.getByText(/@alice · Active Memos user/)).toBeInTheDocument();
|
||||
|
||||
fireEvent.click(screen.getByRole("button", { name: /Alice/ }));
|
||||
fireEvent.change(screen.getByLabelText("role-select"), { target: { value: String(SpaceMember_Role.ADMIN) } });
|
||||
fireEvent.click(screen.getByRole("button", { name: "Send invitation" }));
|
||||
await act(async () => Promise.resolve());
|
||||
|
||||
expect(state.mutateAsync).toHaveBeenCalledWith({
|
||||
parent: "spaces/product",
|
||||
spaceInvitation: expect.objectContaining({
|
||||
invitee: "users/alice",
|
||||
role: SpaceMember_Role.ADMIN,
|
||||
}),
|
||||
});
|
||||
expect(state.onOpenChange).toHaveBeenCalledWith(false);
|
||||
});
|
||||
});
|
||||
|
|
@ -29,6 +29,12 @@ vi.mock("@/hooks/useMemoQueries", () => ({
|
|||
},
|
||||
}));
|
||||
|
||||
vi.mock("@/hooks/useSpaceQueries", () => ({
|
||||
spaceKeys: {
|
||||
all: ["spaces"],
|
||||
},
|
||||
}));
|
||||
|
||||
vi.mock("@/hooks/useUserQueries", () => ({
|
||||
userKeys: {
|
||||
stats: () => ["users", "stats"],
|
||||
|
|
@ -239,6 +245,23 @@ describe("useLiveMemoRefresh", () => {
|
|||
expect(firstInvalidate).toHaveBeenCalledWith({ queryKey: ["attachments", "list"], refetchType: "active" });
|
||||
expect(secondInvalidate).toHaveBeenCalledWith({ queryKey: ["attachments", "list"], refetchType: "active" });
|
||||
});
|
||||
expect(firstInvalidate).not.toHaveBeenCalledWith({ queryKey: ["spaces"], refetchType: "active" });
|
||||
expect(secondInvalidate).not.toHaveBeenCalledWith({ queryKey: ["spaces"], refetchType: "active" });
|
||||
|
||||
firstInvalidate.mockClear();
|
||||
secondInvalidate.mockClear();
|
||||
act(() => {
|
||||
streamControllers[0].enqueue(new TextEncoder().encode('data: {"type":"space.changed"}\n\n'));
|
||||
});
|
||||
|
||||
await waitFor(() => {
|
||||
for (const invalidate of [firstInvalidate, secondInvalidate]) {
|
||||
expect(invalidate).toHaveBeenCalledWith({ queryKey: ["spaces"], refetchType: "active" });
|
||||
expect(invalidate).toHaveBeenCalledWith({ queryKey: ["memos"], refetchType: "active" });
|
||||
expect(invalidate).toHaveBeenCalledWith({ queryKey: ["users", "stats"], refetchType: "active" });
|
||||
expect(invalidate).toHaveBeenCalledWith({ queryKey: ["attachments", "list"], refetchType: "active" });
|
||||
}
|
||||
});
|
||||
|
||||
first.unmount();
|
||||
second.unmount();
|
||||
|
|
@ -289,13 +312,16 @@ describe("useLiveMemoRefresh", () => {
|
|||
const fetchMock = vi.fn().mockImplementation(() => new Response(new Uint8Array(), { status: 200 }));
|
||||
vi.stubGlobal("fetch", fetchMock);
|
||||
|
||||
const hook = renderHook(() => useLiveMemoRefresh(), { wrapper: createWrapper(createQueryClient()) });
|
||||
const queryClient = createQueryClient();
|
||||
const invalidate = vi.spyOn(queryClient, "invalidateQueries");
|
||||
const hook = renderHook(() => useLiveMemoRefresh(), { wrapper: createWrapper(queryClient) });
|
||||
await flushAsyncWork();
|
||||
expect(fetchMock).toHaveBeenCalledTimes(1);
|
||||
|
||||
await act(async () => vi.advanceTimersByTimeAsync(1000));
|
||||
await flushAsyncWork();
|
||||
expect(fetchMock).toHaveBeenCalledTimes(2);
|
||||
expect(invalidate).toHaveBeenCalledWith({ queryKey: ["spaces"], refetchType: "active" });
|
||||
|
||||
await act(async () => vi.advanceTimersByTimeAsync(1000));
|
||||
await flushAsyncWork();
|
||||
|
|
|
|||
|
|
@ -3,18 +3,48 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
|
|||
import { act, renderHook, waitFor } from "@testing-library/react";
|
||||
import type { ReactNode } from "react";
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import { spaceKeys, useCreateSpace, useSpaces } from "@/hooks/useSpaceQueries";
|
||||
import { SpaceSchema } from "@/types/proto/api/v1/space_service_pb";
|
||||
import {
|
||||
spaceKeys,
|
||||
useAcceptSpaceInvitation,
|
||||
useCreateSpace,
|
||||
useCreateSpaceInvitation,
|
||||
useDeclineSpaceInvitation,
|
||||
useDeleteSpace,
|
||||
useDeleteSpaceInvitation,
|
||||
useDeleteSpaceMember,
|
||||
useSpaceInvitations,
|
||||
useSpaceMembers,
|
||||
useSpaces,
|
||||
useUpdateSpace,
|
||||
useUpdateSpaceMember,
|
||||
useUserSpaceInvitations,
|
||||
} from "@/hooks/useSpaceQueries";
|
||||
import { SpaceInvitationSchema, SpaceMember_Role, SpaceMemberSchema, SpaceSchema } from "@/types/proto/api/v1/space_service_pb";
|
||||
|
||||
const clients = vi.hoisted(() => ({
|
||||
acceptSpaceInvitation: vi.fn(),
|
||||
createSpace: vi.fn(),
|
||||
createSpaceInvitation: vi.fn(),
|
||||
declineSpaceInvitation: vi.fn(),
|
||||
deleteSpace: vi.fn(),
|
||||
deleteSpaceInvitation: vi.fn(),
|
||||
deleteSpaceMember: vi.fn(),
|
||||
listSpaceInvitations: vi.fn(),
|
||||
listSpaceMembers: vi.fn(),
|
||||
listSpaces: vi.fn(),
|
||||
listUserSpaceInvitations: vi.fn(),
|
||||
updateSpace: vi.fn(),
|
||||
updateSpaceMember: vi.fn(),
|
||||
}));
|
||||
|
||||
vi.mock("@/connect", () => ({
|
||||
spaceServiceClient: clients,
|
||||
}));
|
||||
|
||||
const VIEWER = "users/test";
|
||||
const OTHER_VIEWER = "users/other";
|
||||
const SPACE_NAME = "spaces/product";
|
||||
|
||||
const createQueryClient = () =>
|
||||
new QueryClient({
|
||||
defaultOptions: {
|
||||
|
|
@ -30,8 +60,9 @@ const createWrapper = (queryClient: QueryClient) =>
|
|||
|
||||
describe("Space queries", () => {
|
||||
beforeEach(() => {
|
||||
clients.createSpace.mockReset();
|
||||
clients.listSpaces.mockReset();
|
||||
for (const client of Object.values(clients)) {
|
||||
client.mockReset();
|
||||
}
|
||||
});
|
||||
|
||||
it("loads every page so the switcher can show all available Spaces", async () => {
|
||||
|
|
@ -46,26 +77,302 @@ describe("Space queries", () => {
|
|||
});
|
||||
|
||||
const queryClient = createQueryClient();
|
||||
const { result } = renderHook(() => useSpaces("users/test"), { wrapper: createWrapper(queryClient) });
|
||||
const { result } = renderHook(() => useSpaces(VIEWER), { wrapper: createWrapper(queryClient) });
|
||||
|
||||
await waitFor(() => expect(result.current.data?.map((space) => space.name)).toEqual(["spaces/one", "spaces/two"]));
|
||||
expect(clients.listSpaces).toHaveBeenNthCalledWith(1, { pageSize: 1000, pageToken: "" });
|
||||
expect(clients.listSpaces).toHaveBeenNthCalledWith(2, { pageSize: 1000, pageToken: "next" });
|
||||
});
|
||||
|
||||
it("adds a created Space to the current user's cache", async () => {
|
||||
const createdSpace = create(SpaceSchema, { name: "spaces/product", title: "Product", description: "Plans" });
|
||||
clients.createSpace.mockResolvedValue(createdSpace);
|
||||
it("drains member and invitation pages with viewer-scoped cache keys", async () => {
|
||||
const admin = create(SpaceMemberSchema, {
|
||||
name: `${SPACE_NAME}/members/admin`,
|
||||
user: "users/admin",
|
||||
role: SpaceMember_Role.ADMIN,
|
||||
});
|
||||
const member = create(SpaceMemberSchema, {
|
||||
name: `${SPACE_NAME}/members/member`,
|
||||
user: "users/member",
|
||||
role: SpaceMember_Role.USER,
|
||||
});
|
||||
const firstInvitation = create(SpaceInvitationSchema, {
|
||||
name: `${SPACE_NAME}/invitations/first`,
|
||||
invitee: "users/first",
|
||||
role: SpaceMember_Role.USER,
|
||||
});
|
||||
const secondInvitation = create(SpaceInvitationSchema, {
|
||||
name: `${SPACE_NAME}/invitations/second`,
|
||||
invitee: "users/second",
|
||||
role: SpaceMember_Role.ADMIN,
|
||||
});
|
||||
|
||||
clients.listSpaceMembers
|
||||
.mockResolvedValueOnce({ spaceMembers: [admin], nextPageToken: "member-next" })
|
||||
.mockResolvedValueOnce({ spaceMembers: [member], nextPageToken: "" });
|
||||
clients.listSpaceInvitations
|
||||
.mockResolvedValueOnce({ spaceInvitations: [firstInvitation], nextPageToken: "invitation-next" })
|
||||
.mockResolvedValueOnce({ spaceInvitations: [secondInvitation], nextPageToken: "" });
|
||||
clients.listUserSpaceInvitations
|
||||
.mockResolvedValueOnce({ spaceInvitations: [firstInvitation], nextPageToken: "user-next" })
|
||||
.mockResolvedValueOnce({ spaceInvitations: [secondInvitation], nextPageToken: "" });
|
||||
|
||||
const queryClient = createQueryClient();
|
||||
const { result } = renderHook(() => useCreateSpace("users/test"), { wrapper: createWrapper(queryClient) });
|
||||
const { result } = renderHook(
|
||||
() => ({
|
||||
members: useSpaceMembers(VIEWER, SPACE_NAME),
|
||||
spaceInvitations: useSpaceInvitations(VIEWER, SPACE_NAME),
|
||||
userInvitations: useUserSpaceInvitations(VIEWER),
|
||||
}),
|
||||
{ wrapper: createWrapper(queryClient) },
|
||||
);
|
||||
|
||||
await waitFor(() => {
|
||||
expect(result.current.members.data).toHaveLength(2);
|
||||
expect(result.current.spaceInvitations.data).toHaveLength(2);
|
||||
expect(result.current.userInvitations.data).toHaveLength(2);
|
||||
});
|
||||
expect(clients.listSpaceMembers).toHaveBeenNthCalledWith(1, {
|
||||
parent: SPACE_NAME,
|
||||
pageSize: 1000,
|
||||
pageToken: "",
|
||||
});
|
||||
expect(clients.listSpaceMembers).toHaveBeenNthCalledWith(2, {
|
||||
parent: SPACE_NAME,
|
||||
pageSize: 1000,
|
||||
pageToken: "member-next",
|
||||
});
|
||||
expect(clients.listSpaceInvitations).toHaveBeenNthCalledWith(2, {
|
||||
parent: SPACE_NAME,
|
||||
pageSize: 1000,
|
||||
pageToken: "invitation-next",
|
||||
});
|
||||
expect(clients.listUserSpaceInvitations).toHaveBeenNthCalledWith(2, {
|
||||
parent: VIEWER,
|
||||
pageSize: 1000,
|
||||
pageToken: "user-next",
|
||||
});
|
||||
expect(spaceKeys.members(VIEWER, SPACE_NAME)).not.toEqual(spaceKeys.members(OTHER_VIEWER, SPACE_NAME));
|
||||
expect(spaceKeys.spaceInvitations(VIEWER, SPACE_NAME)).not.toEqual(spaceKeys.spaceInvitations(OTHER_VIEWER, SPACE_NAME));
|
||||
expect(spaceKeys.userInvitations(VIEWER)).not.toEqual(spaceKeys.userInvitations(OTHER_VIEWER));
|
||||
});
|
||||
|
||||
it("honors disabled query options without calling the service", async () => {
|
||||
const queryClient = createQueryClient();
|
||||
const { result } = renderHook(
|
||||
() => ({
|
||||
members: useSpaceMembers(VIEWER, SPACE_NAME, { enabled: false }),
|
||||
spaceInvitations: useSpaceInvitations(VIEWER, SPACE_NAME, { enabled: false }),
|
||||
userInvitations: useUserSpaceInvitations(VIEWER, { enabled: false }),
|
||||
}),
|
||||
{ wrapper: createWrapper(queryClient) },
|
||||
);
|
||||
|
||||
await waitFor(() => expect(result.current.members.fetchStatus).toBe("idle"));
|
||||
expect(clients.listSpaceMembers).not.toHaveBeenCalled();
|
||||
expect(clients.listSpaceInvitations).not.toHaveBeenCalled();
|
||||
expect(clients.listUserSpaceInvitations).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("creates, updates, and deletes Spaces in the current viewer cache", async () => {
|
||||
const originalSpace = create(SpaceSchema, { name: SPACE_NAME, title: "Product", description: "Plans" });
|
||||
const updatedSpace = create(SpaceSchema, { name: SPACE_NAME, title: "Roadmap", description: "Plans" });
|
||||
const createdSpace = create(SpaceSchema, { name: "spaces/research", title: "Research", description: "Notes" });
|
||||
const cachedMember = create(SpaceMemberSchema, {
|
||||
name: `${SPACE_NAME}/members/test`,
|
||||
user: VIEWER,
|
||||
role: SpaceMember_Role.ADMIN,
|
||||
});
|
||||
clients.createSpace.mockResolvedValue(createdSpace);
|
||||
clients.updateSpace.mockResolvedValue(updatedSpace);
|
||||
clients.deleteSpace.mockResolvedValue({});
|
||||
|
||||
const queryClient = createQueryClient();
|
||||
queryClient.setQueryData(spaceKeys.list(VIEWER), [originalSpace]);
|
||||
queryClient.setQueryData(spaceKeys.members(VIEWER, SPACE_NAME), [cachedMember]);
|
||||
const { result } = renderHook(
|
||||
() => ({
|
||||
create: useCreateSpace(VIEWER),
|
||||
update: useUpdateSpace(VIEWER),
|
||||
remove: useDeleteSpace(VIEWER),
|
||||
}),
|
||||
{ wrapper: createWrapper(queryClient) },
|
||||
);
|
||||
|
||||
await act(async () => {
|
||||
await result.current.mutateAsync({ title: "Product", description: "Plans" });
|
||||
await result.current.create.mutateAsync({ title: "Research", description: "Notes" });
|
||||
});
|
||||
|
||||
expect(clients.createSpace).toHaveBeenCalledWith({
|
||||
space: expect.objectContaining({ title: "Product", description: "Plans" }),
|
||||
space: expect.objectContaining({ title: "Research", description: "Notes" }),
|
||||
});
|
||||
expect(queryClient.getQueryData(spaceKeys.list("users/test"))).toEqual([createdSpace]);
|
||||
expect(queryClient.getQueryData(spaceKeys.list(VIEWER))).toEqual([originalSpace, createdSpace]);
|
||||
|
||||
await act(async () => {
|
||||
await result.current.update.mutateAsync({
|
||||
space: { name: SPACE_NAME, title: "Roadmap" },
|
||||
updateMask: ["title"],
|
||||
});
|
||||
});
|
||||
expect(clients.updateSpace).toHaveBeenCalledWith({
|
||||
space: expect.objectContaining({ name: SPACE_NAME, title: "Roadmap" }),
|
||||
updateMask: expect.objectContaining({ paths: ["title"] }),
|
||||
});
|
||||
expect(queryClient.getQueryData(spaceKeys.list(VIEWER))).toEqual([updatedSpace, createdSpace]);
|
||||
|
||||
await act(async () => {
|
||||
await result.current.remove.mutateAsync({ name: SPACE_NAME });
|
||||
});
|
||||
expect(clients.deleteSpace).toHaveBeenCalledWith({ name: SPACE_NAME });
|
||||
expect(queryClient.getQueryData(spaceKeys.list(VIEWER))).toEqual([createdSpace]);
|
||||
expect(queryClient.getQueryState(spaceKeys.members(VIEWER, SPACE_NAME))).toBeUndefined();
|
||||
});
|
||||
|
||||
it("synchronizes admin invitation caches after create and delete", async () => {
|
||||
const invitation = create(SpaceInvitationSchema, {
|
||||
name: `${SPACE_NAME}/invitations/member`,
|
||||
invitee: "users/member",
|
||||
role: SpaceMember_Role.USER,
|
||||
});
|
||||
clients.createSpaceInvitation.mockResolvedValue(invitation);
|
||||
clients.deleteSpaceInvitation.mockResolvedValue({});
|
||||
|
||||
const queryClient = createQueryClient();
|
||||
queryClient.setQueryData(spaceKeys.spaceInvitations(VIEWER, SPACE_NAME), []);
|
||||
queryClient.setQueryData(spaceKeys.userInvitations(VIEWER), [invitation]);
|
||||
const { result } = renderHook(
|
||||
() => ({
|
||||
create: useCreateSpaceInvitation(VIEWER),
|
||||
remove: useDeleteSpaceInvitation(VIEWER),
|
||||
}),
|
||||
{ wrapper: createWrapper(queryClient) },
|
||||
);
|
||||
|
||||
await act(async () => {
|
||||
await result.current.create.mutateAsync({
|
||||
parent: SPACE_NAME,
|
||||
spaceInvitation: { invitee: "users/member", role: SpaceMember_Role.USER },
|
||||
});
|
||||
});
|
||||
expect(clients.createSpaceInvitation).toHaveBeenCalledWith({
|
||||
parent: SPACE_NAME,
|
||||
spaceInvitation: expect.objectContaining({ invitee: "users/member", role: SpaceMember_Role.USER }),
|
||||
});
|
||||
expect(queryClient.getQueryData(spaceKeys.spaceInvitations(VIEWER, SPACE_NAME))).toEqual([invitation]);
|
||||
|
||||
await act(async () => {
|
||||
await result.current.remove.mutateAsync({ name: invitation.name });
|
||||
});
|
||||
expect(clients.deleteSpaceInvitation).toHaveBeenCalledWith({ name: invitation.name });
|
||||
expect(queryClient.getQueryData(spaceKeys.spaceInvitations(VIEWER, SPACE_NAME))).toEqual([]);
|
||||
expect(queryClient.getQueryData(spaceKeys.userInvitations(VIEWER))).toEqual([]);
|
||||
});
|
||||
|
||||
it("refreshes Spaces and members while clearing accepted or declined invitations", async () => {
|
||||
const acceptedSpace = create(SpaceSchema, { name: SPACE_NAME, title: "Product" });
|
||||
const acceptedInvitation = create(SpaceInvitationSchema, {
|
||||
name: `${SPACE_NAME}/invitations/test`,
|
||||
invitee: VIEWER,
|
||||
role: SpaceMember_Role.USER,
|
||||
space: acceptedSpace,
|
||||
});
|
||||
const declinedInvitation = create(SpaceInvitationSchema, {
|
||||
name: "spaces/research/invitations/test",
|
||||
invitee: VIEWER,
|
||||
role: SpaceMember_Role.USER,
|
||||
});
|
||||
const acceptedMember = create(SpaceMemberSchema, {
|
||||
name: `${SPACE_NAME}/members/test`,
|
||||
user: VIEWER,
|
||||
role: SpaceMember_Role.USER,
|
||||
});
|
||||
clients.acceptSpaceInvitation.mockResolvedValue(acceptedMember);
|
||||
clients.declineSpaceInvitation.mockResolvedValue({});
|
||||
|
||||
const queryClient = createQueryClient();
|
||||
queryClient.setQueryData(spaceKeys.list(VIEWER), []);
|
||||
queryClient.setQueryData(spaceKeys.members(VIEWER, SPACE_NAME), []);
|
||||
queryClient.setQueryData(spaceKeys.spaceInvitations(VIEWER, SPACE_NAME), [acceptedInvitation]);
|
||||
queryClient.setQueryData(spaceKeys.userInvitations(VIEWER), [acceptedInvitation, declinedInvitation]);
|
||||
const { result } = renderHook(
|
||||
() => ({
|
||||
accept: useAcceptSpaceInvitation(VIEWER),
|
||||
decline: useDeclineSpaceInvitation(VIEWER),
|
||||
}),
|
||||
{ wrapper: createWrapper(queryClient) },
|
||||
);
|
||||
|
||||
await act(async () => {
|
||||
await result.current.accept.mutateAsync({ name: acceptedInvitation.name });
|
||||
});
|
||||
expect(clients.acceptSpaceInvitation).toHaveBeenCalledWith({ name: acceptedInvitation.name });
|
||||
// Invitation Space summaries omit membership-only fields and must not be
|
||||
// promoted into the authoritative list while its refetch is in flight.
|
||||
expect(queryClient.getQueryData(spaceKeys.list(VIEWER))).toEqual([]);
|
||||
expect(queryClient.getQueryData(spaceKeys.members(VIEWER, SPACE_NAME))).toEqual([acceptedMember]);
|
||||
expect(queryClient.getQueryData(spaceKeys.spaceInvitations(VIEWER, SPACE_NAME))).toEqual([]);
|
||||
expect(queryClient.getQueryData(spaceKeys.userInvitations(VIEWER))).toEqual([declinedInvitation]);
|
||||
expect(queryClient.getQueryState(spaceKeys.list(VIEWER))?.isInvalidated).toBe(true);
|
||||
|
||||
await act(async () => {
|
||||
await result.current.decline.mutateAsync({ name: declinedInvitation.name });
|
||||
});
|
||||
expect(clients.declineSpaceInvitation).toHaveBeenCalledWith({ name: declinedInvitation.name });
|
||||
expect(queryClient.getQueryData(spaceKeys.userInvitations(VIEWER))).toEqual([]);
|
||||
});
|
||||
|
||||
it("updates members and evicts a Space when the current viewer leaves", async () => {
|
||||
const space = create(SpaceSchema, { name: SPACE_NAME, title: "Product" });
|
||||
const originalMember = create(SpaceMemberSchema, {
|
||||
name: `${SPACE_NAME}/members/member`,
|
||||
user: "users/member",
|
||||
role: SpaceMember_Role.USER,
|
||||
});
|
||||
const updatedMember = create(SpaceMemberSchema, {
|
||||
...originalMember,
|
||||
role: SpaceMember_Role.ADMIN,
|
||||
});
|
||||
const viewerMember = create(SpaceMemberSchema, {
|
||||
name: `${SPACE_NAME}/members/test`,
|
||||
user: VIEWER,
|
||||
role: SpaceMember_Role.ADMIN,
|
||||
});
|
||||
clients.updateSpaceMember.mockResolvedValue(updatedMember);
|
||||
clients.deleteSpaceMember.mockResolvedValue({});
|
||||
|
||||
const queryClient = createQueryClient();
|
||||
queryClient.setQueryData(spaceKeys.list(VIEWER), [space]);
|
||||
queryClient.setQueryData(spaceKeys.members(VIEWER, SPACE_NAME), [originalMember, viewerMember]);
|
||||
const { result } = renderHook(
|
||||
() => ({
|
||||
update: useUpdateSpaceMember(VIEWER),
|
||||
remove: useDeleteSpaceMember(VIEWER),
|
||||
}),
|
||||
{ wrapper: createWrapper(queryClient) },
|
||||
);
|
||||
|
||||
await act(async () => {
|
||||
await result.current.update.mutateAsync({
|
||||
spaceMember: { name: originalMember.name, role: SpaceMember_Role.ADMIN },
|
||||
updateMask: ["role"],
|
||||
});
|
||||
});
|
||||
expect(clients.updateSpaceMember).toHaveBeenCalledWith({
|
||||
spaceMember: expect.objectContaining({ name: originalMember.name, role: SpaceMember_Role.ADMIN }),
|
||||
updateMask: expect.objectContaining({ paths: ["role"] }),
|
||||
});
|
||||
expect(queryClient.getQueryData(spaceKeys.members(VIEWER, SPACE_NAME))).toEqual([updatedMember, viewerMember]);
|
||||
|
||||
await act(async () => {
|
||||
await result.current.remove.mutateAsync({ name: originalMember.name });
|
||||
});
|
||||
expect(queryClient.getQueryData(spaceKeys.members(VIEWER, SPACE_NAME))).toEqual([viewerMember]);
|
||||
expect(queryClient.getQueryData(spaceKeys.list(VIEWER))).toEqual([space]);
|
||||
expect(queryClient.getQueryState(spaceKeys.list(VIEWER))?.isInvalidated).toBe(true);
|
||||
|
||||
await act(async () => {
|
||||
await result.current.remove.mutateAsync({ name: viewerMember.name });
|
||||
});
|
||||
expect(clients.deleteSpaceMember).toHaveBeenLastCalledWith({ name: viewerMember.name });
|
||||
expect(queryClient.getQueryData(spaceKeys.list(VIEWER))).toEqual([]);
|
||||
expect(queryClient.getQueryState(spaceKeys.members(VIEWER, SPACE_NAME))).toBeUndefined();
|
||||
});
|
||||
});
|
||||
|
|
|
|||
21
web/tests/space-settings-shell.test.ts
Normal file
21
web/tests/space-settings-shell.test.ts
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
import { describe, expect, it } from "vitest";
|
||||
import { isSettingSectionKey, SETTINGS_SECTIONS } from "@/components/Settings/settingSections";
|
||||
import enTranslation from "@/locales/en.json";
|
||||
|
||||
describe("Spaces settings shell", () => {
|
||||
it("registers Spaces as a basic settings section", () => {
|
||||
expect(isSettingSectionKey("spaces")).toBe(true);
|
||||
expect(SETTINGS_SECTIONS.find((section) => section.key === "spaces")).toMatchObject({
|
||||
scope: "basic",
|
||||
labelKey: "setting.spaces.label",
|
||||
});
|
||||
});
|
||||
|
||||
it("defines the English settings copy used as the locale fallback", () => {
|
||||
expect(enTranslation.setting.spaces).toMatchObject({
|
||||
description: "View spaces you belong to and manage members and invitations.",
|
||||
label: "Spaces",
|
||||
title: "Spaces",
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
@ -18,7 +18,15 @@ vi.mock("@/components/MemosLogo", () => ({
|
|||
}));
|
||||
|
||||
vi.mock("@/components/CreateSpaceDialog", () => ({
|
||||
default: ({ open }: { open: boolean }) => (open ? <div role="dialog">Create Space dialog</div> : null),
|
||||
default: ({ open, onCreated }: { open: boolean; onCreated?: (space: (typeof spaceState.spaces)[number]) => void }) =>
|
||||
open ? (
|
||||
<div role="dialog">
|
||||
Create Space dialog
|
||||
<button type="button" onClick={() => onCreated?.(spaceState.spaces[0])}>
|
||||
Complete create
|
||||
</button>
|
||||
</div>
|
||||
) : null,
|
||||
}));
|
||||
|
||||
vi.mock("@/contexts/SpaceContext", () => ({
|
||||
|
|
@ -86,5 +94,7 @@ describe("SpaceSwitcher", () => {
|
|||
fireEvent.click(screen.getByRole("button", { name: "space.switch: common.memos" }));
|
||||
fireEvent.click(await screen.findByRole("menuitem", { name: "space.create" }));
|
||||
expect(screen.getByRole("dialog", { name: "" })).toHaveTextContent("Create Space dialog");
|
||||
fireEvent.click(screen.getByRole("button", { name: "Complete create" }));
|
||||
expect(spaceState.selectSpace).toHaveBeenCalledWith(spaceState.spaces[0]);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
260
web/tests/spaces-section.test.tsx
Normal file
260
web/tests/spaces-section.test.tsx
Normal file
|
|
@ -0,0 +1,260 @@
|
|||
import { fireEvent, render, screen, waitFor, within } from "@testing-library/react";
|
||||
import { MemoryRouter, useLocation } from "react-router-dom";
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import SpacesSection from "@/components/Settings/SpacesSection";
|
||||
import type { Space, SpaceInvitation, SpaceMember } from "@/types/proto/api/v1/space_service_pb";
|
||||
|
||||
const state = vi.hoisted(() => ({
|
||||
viewerName: "users/alice",
|
||||
viewerInstanceRole: 3,
|
||||
spaces: [] as Space[],
|
||||
receivedInvitations: [] as SpaceInvitation[],
|
||||
members: [] as SpaceMember[],
|
||||
managedInvitations: [] as SpaceInvitation[],
|
||||
usersByName: new Map(),
|
||||
acceptInvitation: vi.fn(),
|
||||
declineInvitation: vi.fn(),
|
||||
updateSpace: vi.fn(),
|
||||
deleteSpace: vi.fn(),
|
||||
updateMember: vi.fn(),
|
||||
deleteMember: vi.fn(),
|
||||
deleteInvitation: vi.fn(),
|
||||
selectAmbientSpace: vi.fn(),
|
||||
}));
|
||||
|
||||
vi.mock("react-hot-toast", () => ({
|
||||
default: { error: vi.fn(), success: vi.fn() },
|
||||
}));
|
||||
|
||||
vi.mock("@/hooks/useCurrentUser", () => ({
|
||||
default: () => ({ name: state.viewerName, role: state.viewerInstanceRole }),
|
||||
}));
|
||||
|
||||
vi.mock("@/hooks/useSpaceQueries", () => ({
|
||||
useSpaces: () => ({ data: state.spaces, isError: false, isLoading: false, isSuccess: true }),
|
||||
useUserSpaceInvitations: () => ({ data: state.receivedInvitations, isLoading: false }),
|
||||
useAcceptSpaceInvitation: () => ({ isPending: false, mutateAsync: state.acceptInvitation }),
|
||||
useDeclineSpaceInvitation: () => ({ isPending: false, mutateAsync: state.declineInvitation }),
|
||||
useSpaceMembers: () => ({ data: state.members, isError: false, isLoading: false }),
|
||||
useSpaceInvitations: () => ({ data: state.managedInvitations, isLoading: false }),
|
||||
useUpdateSpace: () => ({ isPending: false, mutateAsync: state.updateSpace }),
|
||||
useDeleteSpace: () => ({ isPending: false, mutateAsync: state.deleteSpace }),
|
||||
useUpdateSpaceMember: () => ({ isPending: false, mutateAsync: state.updateMember }),
|
||||
useDeleteSpaceMember: () => ({ isPending: false, mutateAsync: state.deleteMember }),
|
||||
useDeleteSpaceInvitation: () => ({ isPending: false, mutateAsync: state.deleteInvitation }),
|
||||
}));
|
||||
|
||||
vi.mock("@/hooks/useUserQueries", () => ({
|
||||
useUsersByUsernames: () => ({ data: state.usersByName }),
|
||||
}));
|
||||
|
||||
vi.mock("@/contexts/SpaceContext", () => ({
|
||||
useSpaceContext: () => ({ selectSpace: state.selectAmbientSpace }),
|
||||
}));
|
||||
|
||||
vi.mock("@/components/SpaceMark", () => ({
|
||||
default: ({ space }: { space?: { title?: string } }) => <span aria-hidden>{space?.title?.slice(0, 1) ?? "S"}</span>,
|
||||
}));
|
||||
|
||||
vi.mock("@/components/UserAvatar", () => ({
|
||||
default: () => <span aria-hidden data-testid="user-avatar" />,
|
||||
}));
|
||||
|
||||
vi.mock("@/components/CreateSpaceDialog", () => ({
|
||||
default: ({ open, onCreated }: { open: boolean; onCreated?: (space: Space) => void }) =>
|
||||
open ? (
|
||||
<div role="dialog" aria-label="create-space-dialog">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
const createdSpace: Space = {
|
||||
$typeName: "memos.api.v1.Space",
|
||||
name: "spaces/created",
|
||||
title: "Created",
|
||||
description: "",
|
||||
currentUserRole: 1,
|
||||
memberCount: 1,
|
||||
};
|
||||
state.spaces = [...state.spaces, createdSpace];
|
||||
onCreated?.(createdSpace);
|
||||
}}
|
||||
>
|
||||
complete-create
|
||||
</button>
|
||||
</div>
|
||||
) : null,
|
||||
}));
|
||||
|
||||
vi.mock("@/components/Settings/InviteSpaceMemberDialog", () => ({
|
||||
default: ({ open }: { open: boolean }) => (open ? <div role="dialog">invite-member-dialog</div> : null),
|
||||
}));
|
||||
|
||||
vi.mock("@/components/ConfirmDialog", () => ({
|
||||
default: ({ open, confirmLabel, onConfirm }: { open: boolean; confirmLabel: string; onConfirm: () => void | Promise<void> }) =>
|
||||
open ? (
|
||||
<div role="dialog">
|
||||
<button type="button" onClick={() => void onConfirm()}>
|
||||
{confirmLabel}
|
||||
</button>
|
||||
</div>
|
||||
) : null,
|
||||
}));
|
||||
|
||||
vi.mock("@/utils/i18n", () => ({
|
||||
useTranslate: () => (key: string) => key,
|
||||
}));
|
||||
|
||||
const adminSpace: Space = {
|
||||
$typeName: "memos.api.v1.Space",
|
||||
name: "spaces/product",
|
||||
title: "Product",
|
||||
description: "Product decisions",
|
||||
currentUserRole: 1,
|
||||
memberCount: 2,
|
||||
};
|
||||
|
||||
const userSpace: Space = {
|
||||
...adminSpace,
|
||||
currentUserRole: 2,
|
||||
};
|
||||
|
||||
const adminMember: SpaceMember = {
|
||||
$typeName: "memos.api.v1.SpaceMember",
|
||||
name: "spaces/product/members/alice",
|
||||
user: "users/alice",
|
||||
role: 1,
|
||||
};
|
||||
|
||||
const ordinaryMember: SpaceMember = {
|
||||
$typeName: "memos.api.v1.SpaceMember",
|
||||
name: "spaces/product/members/bob",
|
||||
user: "users/bob",
|
||||
role: 2,
|
||||
};
|
||||
|
||||
const receivedInvitation: SpaceInvitation = {
|
||||
$typeName: "memos.api.v1.SpaceInvitation",
|
||||
name: "spaces/research/invitations/alice",
|
||||
invitee: "users/alice",
|
||||
role: 2,
|
||||
space: {
|
||||
$typeName: "memos.api.v1.Space",
|
||||
name: "spaces/research",
|
||||
title: "Research",
|
||||
description: "Research notes",
|
||||
currentUserRole: 0,
|
||||
memberCount: 0,
|
||||
},
|
||||
};
|
||||
|
||||
const pendingInvitation: SpaceInvitation = {
|
||||
$typeName: "memos.api.v1.SpaceInvitation",
|
||||
name: "spaces/product/invitations/carol",
|
||||
invitee: "users/carol",
|
||||
role: 2,
|
||||
space: adminSpace,
|
||||
};
|
||||
|
||||
const LocationProbe = () => {
|
||||
const location = useLocation();
|
||||
return <output data-testid="location">{`${location.pathname}${location.search}${location.hash}`}</output>;
|
||||
};
|
||||
|
||||
const renderSection = (entry = "/setting#spaces") =>
|
||||
render(
|
||||
<MemoryRouter initialEntries={[entry]}>
|
||||
<SpacesSection />
|
||||
<LocationProbe />
|
||||
</MemoryRouter>,
|
||||
);
|
||||
|
||||
describe("SpacesSection", () => {
|
||||
beforeEach(() => {
|
||||
state.spaces = [];
|
||||
state.viewerInstanceRole = 3;
|
||||
state.receivedInvitations = [];
|
||||
state.members = [];
|
||||
state.managedInvitations = [];
|
||||
state.usersByName = new Map();
|
||||
state.acceptInvitation.mockReset().mockResolvedValue(undefined);
|
||||
state.declineInvitation.mockReset().mockResolvedValue(undefined);
|
||||
state.updateSpace.mockReset().mockResolvedValue(undefined);
|
||||
state.deleteSpace.mockReset().mockResolvedValue(undefined);
|
||||
state.updateMember.mockReset().mockResolvedValue(undefined);
|
||||
state.deleteMember.mockReset().mockResolvedValue(undefined);
|
||||
state.deleteInvitation.mockReset().mockResolvedValue(undefined);
|
||||
state.selectAmbientSpace.mockReset();
|
||||
});
|
||||
|
||||
it("separates pending invitations from joined spaces and uses exact invitation resource names", async () => {
|
||||
state.spaces = [adminSpace];
|
||||
state.receivedInvitations = [receivedInvitation];
|
||||
|
||||
renderSection();
|
||||
|
||||
const invitationsSection = screen.getByRole("heading", { name: "setting.spaces.invitations" }).closest("section");
|
||||
const joinedSection = screen.getByRole("heading", { name: "setting.spaces.your-spaces" }).closest("section");
|
||||
expect(invitationsSection).not.toBeNull();
|
||||
expect(joinedSection).not.toBeNull();
|
||||
expect(within(invitationsSection!).getByText("Research")).toBeInTheDocument();
|
||||
expect(within(invitationsSection!).queryByText("Product")).not.toBeInTheDocument();
|
||||
expect(within(joinedSection!).getByText("Product")).toBeInTheDocument();
|
||||
expect(within(joinedSection!).queryByText("Research")).not.toBeInTheDocument();
|
||||
|
||||
fireEvent.click(within(invitationsSection!).getByRole("button", { name: "setting.spaces.accept" }));
|
||||
await waitFor(() => expect(state.acceptInvitation).toHaveBeenCalledWith({ name: "spaces/research/invitations/alice" }));
|
||||
|
||||
fireEvent.click(within(invitationsSection!).getByRole("button", { name: "setting.spaces.decline" }));
|
||||
await waitFor(() => expect(state.declineInvitation).toHaveBeenCalledWith({ name: "spaces/research/invitations/alice" }));
|
||||
});
|
||||
|
||||
it("shows governance controls to Space admins and cancels the exact pending invitation", async () => {
|
||||
state.spaces = [adminSpace];
|
||||
state.members = [adminMember, ordinaryMember];
|
||||
state.managedInvitations = [pendingInvitation];
|
||||
|
||||
renderSection("/setting?space=spaces%2Fproduct#spaces");
|
||||
|
||||
expect(screen.getByLabelText("common.name")).not.toHaveAttribute("readonly");
|
||||
expect(screen.getByRole("button", { name: "setting.spaces.save-changes" })).toBeInTheDocument();
|
||||
expect(screen.getByRole("button", { name: "setting.spaces.delete-space" })).toBeInTheDocument();
|
||||
|
||||
fireEvent.click(screen.getByRole("tab", { name: /setting\.spaces\.members/ }));
|
||||
expect(screen.getByRole("button", { name: "setting.spaces.invite-member" })).toBeInTheDocument();
|
||||
expect(screen.getByRole("button", { name: "setting.spaces.remove" })).toBeInTheDocument();
|
||||
expect(screen.getByRole("heading", { name: "setting.spaces.pending-invitations" })).toBeInTheDocument();
|
||||
fireEvent.click(screen.getByRole("button", { name: "setting.spaces.cancel-invitation" }));
|
||||
fireEvent.click(within(screen.getByRole("dialog")).getByRole("button", { name: "setting.spaces.cancel-invitation" }));
|
||||
await waitFor(() => expect(state.deleteInvitation).toHaveBeenCalledWith({ name: "spaces/product/invitations/carol" }));
|
||||
});
|
||||
|
||||
it("keeps ordinary Space members read-only and hides governance controls", () => {
|
||||
// Instance administrators do not implicitly receive Space governance rights.
|
||||
state.viewerInstanceRole = 2;
|
||||
state.spaces = [userSpace];
|
||||
state.members = [{ ...ordinaryMember, name: "spaces/product/members/alice", user: "users/alice" }, adminMember];
|
||||
state.managedInvitations = [pendingInvitation];
|
||||
|
||||
renderSection("/setting?space=spaces%2Fproduct#spaces");
|
||||
|
||||
expect(screen.getByLabelText("common.name")).toHaveAttribute("readonly");
|
||||
expect(screen.queryByRole("button", { name: "setting.spaces.save-changes" })).not.toBeInTheDocument();
|
||||
expect(screen.queryByRole("button", { name: "setting.spaces.delete-space" })).not.toBeInTheDocument();
|
||||
expect(screen.getByRole("button", { name: "setting.spaces.leave-space" })).toBeInTheDocument();
|
||||
|
||||
fireEvent.click(screen.getByRole("tab", { name: /setting\.spaces\.members/ }));
|
||||
expect(screen.queryByRole("button", { name: "setting.spaces.invite-member" })).not.toBeInTheDocument();
|
||||
expect(screen.queryByRole("button", { name: "setting.spaces.remove" })).not.toBeInTheDocument();
|
||||
expect(screen.queryByRole("heading", { name: "setting.spaces.pending-invitations" })).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("navigates to a newly created Space for management without switching ambient Space", async () => {
|
||||
renderSection();
|
||||
|
||||
fireEvent.click(screen.getAllByRole("button", { name: "setting.spaces.create-space" })[0]);
|
||||
fireEvent.click(screen.getByRole("button", { name: "complete-create" }));
|
||||
|
||||
await waitFor(() => expect(screen.getByTestId("location")).toHaveTextContent("/setting?space=spaces%2Fcreated#spaces"));
|
||||
expect(state.selectAmbientSpace).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
Loading…
Reference in a new issue