Introduce Membership type

This commit is contained in:
Stanislav Demydiuk 2024-03-11 17:16:53 +00:00 committed by Andy Balaam
parent 3c6fd58628
commit da99bad7b9
115 changed files with 582 additions and 526 deletions

View file

@ -61,8 +61,8 @@ describe("EventListSummary", function () {
interface MembershipEventParams {
senderId?: string;
userId?: string;
membership: string;
prevMembership?: string;
membership: Membership;
prevMembership?: Membership;
}
const generateMembershipEvent = (
eventId: string,
@ -145,7 +145,9 @@ describe("EventListSummary", function () {
});
it("renders expanded events if there are less than props.threshold", function () {
const events = generateEvents([{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" }]);
const events = generateEvents([
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
]);
const props = {
events: events,
children: generateTiles(events),
@ -163,8 +165,8 @@ describe("EventListSummary", function () {
it("renders expanded events if there are less than props.threshold for join and leave", function () {
const events = generateEvents([
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
]);
const props = {
events: events,
@ -184,9 +186,9 @@ describe("EventListSummary", function () {
it("renders collapsed events if events.length = props.threshold", function () {
const events = generateEvents([
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
]);
const props = {
events: events,
@ -203,20 +205,20 @@ describe("EventListSummary", function () {
it("truncates long join,leave repetitions", function () {
const events = generateEvents([
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
]);
const props = {
events: events,
@ -235,28 +237,28 @@ describe("EventListSummary", function () {
const events = generateEvents([
{
userId: "@user_1:some.domain",
prevMembership: "ban",
membership: "leave",
prevMembership: Membership.Ban,
membership: Membership.Leave,
senderId: "@some_other_user:some.domain",
},
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{
userId: "@user_1:some.domain",
prevMembership: "leave",
membership: "invite",
prevMembership: Membership.Leave,
membership: Membership.Invite,
senderId: "@some_other_user:some.domain",
},
]);
@ -277,30 +279,30 @@ describe("EventListSummary", function () {
const events = generateEvents([
{
userId: "@user_1:some.domain",
prevMembership: "ban",
membership: "leave",
prevMembership: Membership.Ban,
membership: Membership.Leave,
senderId: "@some_other_user:some.domain",
},
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{
userId: "@user_1:some.domain",
prevMembership: "leave",
membership: "ban",
prevMembership: Membership.Leave,
membership: Membership.Ban,
senderId: "@some_other_user:some.domain",
},
{ userId: "@user_1:some.domain", prevMembership: "ban", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: Membership.Ban, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{
userId: "@user_1:some.domain",
prevMembership: "leave",
membership: "invite",
prevMembership: Membership.Leave,
membership: Membership.Invite,
senderId: "@some_other_user:some.domain",
},
]);
@ -324,35 +326,35 @@ describe("EventListSummary", function () {
// user_1
{
userId: "@user_1:some.domain",
prevMembership: "ban",
membership: "leave",
prevMembership: Membership.Ban,
membership: Membership.Leave,
senderId: "@some_other_user:some.domain",
},
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{
userId: "@user_1:some.domain",
prevMembership: "leave",
membership: "ban",
prevMembership: Membership.Leave,
membership: Membership.Ban,
senderId: "@some_other_user:some.domain",
},
// user_2
{
userId: "@user_2:some.domain",
prevMembership: "ban",
membership: "leave",
prevMembership: Membership.Ban,
membership: Membership.Leave,
senderId: "@some_other_user:some.domain",
},
{ userId: "@user_2:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_2:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_2:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_2:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_2:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_2:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_2:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_2:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{
userId: "@user_2:some.domain",
prevMembership: "leave",
membership: "ban",
prevMembership: Membership.Leave,
membership: Membership.Ban,
senderId: "@some_other_user:some.domain",
},
]);
@ -374,17 +376,17 @@ describe("EventListSummary", function () {
it("handles many users following the same sequence of memberships", function () {
const events = generateEventsForUsers("@user_$:some.domain", 20, [
{
prevMembership: "ban",
membership: "leave",
prevMembership: Membership.Ban,
membership: Membership.Leave,
senderId: "@some_other_user:some.domain",
},
{ prevMembership: "leave", membership: "join" },
{ prevMembership: "join", membership: "leave" },
{ prevMembership: "leave", membership: "join" },
{ prevMembership: "join", membership: "leave" },
{ prevMembership: Membership.Leave, membership: Membership.Join },
{ prevMembership: Membership.Join, membership: Membership.Leave },
{ prevMembership: Membership.Leave, membership: Membership.Join },
{ prevMembership: Membership.Join, membership: Membership.Leave },
{
prevMembership: "leave",
membership: "ban",
prevMembership: Membership.Leave,
membership: Membership.Ban,
senderId: "@some_other_user:some.domain",
},
]);
@ -407,30 +409,30 @@ describe("EventListSummary", function () {
const events = generateEvents([
{
userId: "@user_2:some.domain",
prevMembership: "ban",
membership: "leave",
prevMembership: Membership.Ban,
membership: Membership.Leave,
senderId: "@some_other_user:some.domain",
},
{
userId: "@user_1:some.domain",
prevMembership: "ban",
membership: "leave",
prevMembership: Membership.Ban,
membership: Membership.Leave,
senderId: "@some_other_user:some.domain",
},
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_1:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{
userId: "@user_1:some.domain",
prevMembership: "leave",
membership: "ban",
prevMembership: Membership.Leave,
membership: Membership.Ban,
senderId: "@some_other_user:some.domain",
},
{ userId: "@user_2:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_2:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_2:some.domain", prevMembership: "leave", membership: "join" },
{ userId: "@user_2:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_2:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_2:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
{ userId: "@user_2:some.domain", prevMembership: Membership.Leave, membership: Membership.Join },
{ userId: "@user_2:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
]);
const props = {
events: events,
@ -451,52 +453,52 @@ describe("EventListSummary", function () {
it("correctly identifies transitions", function () {
const events = generateEvents([
// invited
{ userId: "@user_1:some.domain", membership: "invite" },
{ userId: "@user_1:some.domain", membership: Membership.Invite },
// banned
{ userId: "@user_1:some.domain", membership: "ban" },
{ userId: "@user_1:some.domain", membership: Membership.Ban },
// joined
{ userId: "@user_1:some.domain", membership: "join" },
{ userId: "@user_1:some.domain", membership: Membership.Join },
// invite_reject
{
userId: "@user_1:some.domain",
prevMembership: "invite",
membership: "leave",
prevMembership: Membership.Invite,
membership: Membership.Leave,
},
// left
{ userId: "@user_1:some.domain", prevMembership: "join", membership: "leave" },
{ userId: "@user_1:some.domain", prevMembership: Membership.Join, membership: Membership.Leave },
// invite_withdrawal
{
userId: "@user_1:some.domain",
prevMembership: "invite",
membership: "leave",
prevMembership: Membership.Invite,
membership: Membership.Leave,
senderId: "@some_other_user:some.domain",
},
// unbanned
{
userId: "@user_1:some.domain",
prevMembership: "ban",
membership: "leave",
prevMembership: Membership.Ban,
membership: Membership.Leave,
senderId: "@some_other_user:some.domain",
},
// kicked
{
userId: "@user_1:some.domain",
prevMembership: "join",
membership: "leave",
prevMembership: Membership.Join,
membership: Membership.Leave,
senderId: "@some_other_user:some.domain",
},
// default for sender=target (leave)
{
userId: "@user_1:some.domain",
prevMembership: "????",
membership: "leave",
prevMembership: "????" as Membership,
membership: Membership.Leave,
senderId: "@user_1:some.domain",
},
// default for sender<>target (kicked)
{
userId: "@user_1:some.domain",
prevMembership: "????",
membership: "leave",
prevMembership: "????" as Membership,
membership: Membership.Leave,
senderId: "@some_other_user:some.domain",
},
]);
@ -520,24 +522,24 @@ describe("EventListSummary", function () {
const events = generateEvents([
{
userId: "@user_1:some.domain",
prevMembership: "invite",
membership: "leave",
prevMembership: Membership.Invite,
membership: Membership.Leave,
},
{
userId: "@user_1:some.domain",
prevMembership: "invite",
membership: "leave",
prevMembership: Membership.Invite,
membership: Membership.Leave,
senderId: "@some_other_user:some.domain",
},
{
userId: "@user_2:some.domain",
prevMembership: "invite",
membership: "leave",
prevMembership: Membership.Invite,
membership: Membership.Leave,
},
{
userId: "@user_2:some.domain",
prevMembership: "invite",
membership: "leave",
prevMembership: Membership.Invite,
membership: Membership.Leave,
senderId: "@some_other_user:some.domain",
},
]);
@ -560,13 +562,13 @@ describe("EventListSummary", function () {
const events = generateEvents([
{
userId: "@user_1:some.domain",
prevMembership: "invite",
membership: "leave",
prevMembership: Membership.Invite,
membership: Membership.Leave,
},
{
userId: "@user_1:some.domain",
prevMembership: "invite",
membership: "leave",
prevMembership: Membership.Invite,
membership: Membership.Leave,
},
]);
const props = {
@ -584,10 +586,10 @@ describe("EventListSummary", function () {
it('handles a summary length = 2, with no "others"', function () {
const events = generateEvents([
{ userId: "@user_1:some.domain", membership: "join" },
{ userId: "@user_1:some.domain", membership: "join" },
{ userId: "@user_2:some.domain", membership: "join" },
{ userId: "@user_2:some.domain", membership: "join" },
{ userId: "@user_1:some.domain", membership: Membership.Join },
{ userId: "@user_1:some.domain", membership: Membership.Join },
{ userId: "@user_2:some.domain", membership: Membership.Join },
{ userId: "@user_2:some.domain", membership: Membership.Join },
]);
const props = {
events: events,
@ -604,9 +606,9 @@ describe("EventListSummary", function () {
it('handles a summary length = 2, with 1 "other"', function () {
const events = generateEvents([
{ userId: "@user_1:some.domain", membership: "join" },
{ userId: "@user_2:some.domain", membership: "join" },
{ userId: "@user_3:some.domain", membership: "join" },
{ userId: "@user_1:some.domain", membership: Membership.Join },
{ userId: "@user_2:some.domain", membership: Membership.Join },
{ userId: "@user_3:some.domain", membership: Membership.Join },
]);
const props = {
events: events,
@ -622,7 +624,7 @@ describe("EventListSummary", function () {
});
it('handles a summary length = 2, with many "others"', function () {
const events = generateEventsForUsers("@user_$:some.domain", 20, [{ membership: "join" }]);
const events = generateEventsForUsers("@user_$:some.domain", 20, [{ membership: Membership.Join }]);
const props = {
events: events,
children: generateTiles(events),

View file

@ -21,7 +21,7 @@ import { mkRoomMember } from "../../../test-utils";
describe("<FacePile />", () => {
it("renders with a tooltip", () => {
const member = mkRoomMember("123", "456", "join");
const member = mkRoomMember("123", "456", Membership.Join);
const { asFragment } = render(
<FacePile members={[member]} size="36px" overflow={false} tooltipLabel="tooltip" />,

View file

@ -27,7 +27,9 @@ describe("<RoomFacePile />", () => {
DMRoomMap.makeShared(cli);
const room = mkRoom(cli, "!123");
jest.spyOn(room, "getJoinedMembers").mockReturnValue([mkRoomMember(room.roomId, "@bob:example.org", "join")]);
jest.spyOn(room, "getJoinedMembers").mockReturnValue([
mkRoomMember(room.roomId, "@bob:example.org", Membership.Join),
]);
const { asFragment } = render(
<TooltipProvider>