use immutable for Carpools

src/components/Carpool/Carpool.tsx

@@ -1,5 +1,11 @@
-import { useMemo } from 'react';
+import * as immutable from 'immutable';
-import { createContext, useCallback, useEffect, useState } from 'react';
+import {
+	createContext,
+	useCallback,
+	useEffect,
+	useMemo,
+	useState,
+} from 'react';
 import {
 	cancelCarpoolInvite,
 	getCarpool,
@@ -7,14 +13,33 @@ import {
 	sendCarpoolInvite,
 } from '../api';
 import { useMe } from '../hooks';
-import { ICarpool } from '../types';
 import UISecondaryBox from '../UI/UISecondaryBox';
 import CarpoolDetails from './CarpoolDetails';
 import InvitationsAndRequests from './InvitationsAndRequests';
 import MemberList from './MemberList';
 
+class CarpoolState extends immutable.Record({
+	id: 0,
+	name: '',
+	eventId: -1,
+	event: {
+		id: -1,
+		name: '',
+		formattedAddress: '',
+		latitude: 0,
+		longitude: 0,
+		placeId: '',
+	},
+	members: immutable.List<{ id: number; name: string }>(),
+	invitations:
+		immutable.Map<
+			number,
+			{ isRequest: boolean; user: { id: number; name: string } }
+		>(),
+}) {}
+
 export const CarpoolContext = createContext({
-	carpool: null! as ICarpool,
+	carpool: new CarpoolState(),
 	sendInvite: (user: { id: number; name: string }) => {
 		console.error('not implemented: sendInvite');
 	},
@@ -27,10 +52,23 @@ export const CarpoolContext = createContext({
 });
 
 export default function Carpool({ id }: { id: number }) {
-	const [carpool, setCarpool] = useState<ICarpool | null>(null);
+	const [carpool, setCarpool] = useState(new CarpoolState());
 
 	useEffect(() => {
-		getCarpool(id).then(setCarpool);
+		getCarpool(id).then((carpool) => {
+			setCarpool(
+				new CarpoolState({
+					id: carpool.id,
+					name: carpool.name,
+					eventId: carpool.eventId || carpool.event.id,
+					event: carpool.event,
+					members: immutable.List(carpool.members),
+					invitations: immutable.Map(
+						carpool.invitations.map((invite) => [invite.user.id, invite])
+					),
+				})
+			);
+		});
 	}, [id]);
 
 	const sendInvite = useCallback(
@@ -38,15 +76,11 @@ export default function Carpool({ id }: { id: number }) {
 			if (carpool) {
 				sendCarpoolInvite(id, user.id)
 					.then(() => {
-						setCarpool(
+						setCarpool((carpool) =>
-							(carpool) =>
+							carpool.set(
-								carpool && {
+								'invitations',
-									...carpool,
+								carpool.invitations.set(user.id, { isRequest: false, user })
-									invitations: [
+							)
-										...carpool.invitations,
-										{ isRequest: false, user },
-									],
-								}
 						);
 					})
 					.catch(console.error);
@@ -78,7 +112,7 @@ export default function Carpool({ id }: { id: number }) {
 		[id]
 	);
 
-	const eventId = carpool?.eventId;
+	const eventId = carpool.eventId;
 
 	const leave = useCallback(() => {
 		if (eventId) {
@@ -93,8 +127,8 @@ export default function Carpool({ id }: { id: number }) {
 	const me = useMe();
 
 	const isMember = useMemo(
-		() => carpool?.members.some((m) => m.id === me?.id),
+		() => carpool.members.some((m) => m.id === me?.id),
-		[carpool?.members, me?.id]
+		[carpool.members, me?.id]
 	);
 
 	if (!carpool) {
@@ -116,8 +150,8 @@ export default function Carpool({ id }: { id: number }) {
 						<h1 style={{ marginBottom: '0rem' }}>{carpool.name}</h1>
 						<h2 style={{ marginBottom: '0rem' }}>{carpool.event.name}</h2>
 						{isMember && <InvitationsAndRequests />}
-						<CarpoolDetails carpool={carpool} />
+						<CarpoolDetails />
-						<MemberList members={carpool.members} />
+						<MemberList />
 					</>
 				) : (
 					<h2>Loading</h2>

src/components/Carpool/CarpoolDetails.tsx

@@ -1,9 +1,11 @@
 import EventIcon from '@material-ui/icons/Event';
 import LocationOnIcon from '@material-ui/icons/LocationOn';
+import { useContext } from 'react';
 
-import { ICarpool } from '../types';
+import { CarpoolContext } from './Carpool';
 
-export default function CarpoolDetails({ carpool }: { carpool: ICarpool }) {
+export default function CarpoolDetails() {
+	const { carpool } = useContext(CarpoolContext);
 	return (
 		<div style={{ fontSize: '1.5rem', fontWeight: 400 }}>
 			<div

src/components/Carpool/InvitationList.tsx

@@ -61,6 +61,7 @@ export default function InvitationList() {
 			new Set(
 				carpool.invitations
 					.filter((invitation) => !invitation.isRequest)
+					.valueSeq()
 					.map((invitation) => invitation.user.id)
 			),
 		[carpool.invitations]
@@ -68,11 +69,9 @@ export default function InvitationList() {
 
 	const availableSignupsAlreadyInvited = useMemo(
 		() =>
-			availableSignups
+			availableSignups?.filter((signup) =>
-				? availableSignups.filter((signup) =>
+				invitedUserIDs.has(signup.user.id)
-						invitedUserIDs.has(signup.user.id)
+			) ?? null,
-				  )
-				: null,
 		[availableSignups, invitedUserIDs]
 	);
 

src/components/Carpool/MemberList.tsx

@@ -18,22 +18,13 @@ function MemberRow({ member }: { member: { id: number; name: string } }) {
 	);
 }
 
-export default function MemberList({
+const shownMembersCount = 2;
-	members,
-}: {
-	members: {
-		id: number;
-		name: string;
-	}[];
-}) {
-	const { leave, carpool } = useContext(CarpoolContext);
-	const membersToShow = members.slice(0, 2);
-	const hiddenMemberCount = members.length - membersToShow.length;
-	const me = useMe()!;
 
-	const isMember = useMemo(() => {
+export default function MemberList() {
-		return members.some(({ id }) => id === me.id);
+	const { leave, carpool } = useContext(CarpoolContext);
-	}, [me.id, members]);
+	const members = carpool.members;
+	const membersToShow = members.slice(0, shownMembersCount);
+	const hiddenMemberCount = members.size - membersToShow.size;
 
 	const { sendCarpoolRequest, cancelCarpoolRequest } =
 		useContext(NotificationsContext);
@@ -47,6 +38,12 @@ export default function MemberList({
 		cancelCarpoolRequest(carpool.id);
 	}, [carpool.id, cancelCarpoolRequest]);
 
+	const me = useMe()!;
+
+	const isMember = useMemo(() => {
+		return members.some(({ id }) => id === me?.id);
+	}, [me?.id, members]);
+
 	return (
 		<div
 			style={{
@@ -57,7 +54,7 @@ export default function MemberList({
 			}}
 		>
 			<h3 style={{ marginBlockEnd: '0' }}>Members</h3>
-			{members.length > 0 ? (
+			{members.size > 0 ? (
 				<div style={{ display: 'flex', flexDirection: 'column' }}>
 					{membersToShow.map((member) => (
 						<MemberRow member={member} key={member.id} />