From 9747af5ed7b7d77ceafa83849e17a93a0bc76707 Mon Sep 17 00:00:00 2001
From: Ben Silverman <bsilverm@mit.edu>
Date: Tue, 29 Dec 2020 11:10:51 -0500
Subject: [PATCH] #106 Handle empty group prop

---
 src/pages/groups/[id]/edit.jsx  | 12 ++++++------
 src/pages/groups/[id]/index.jsx |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/groups/[id]/edit.jsx b/src/pages/groups/[id]/edit.jsx
index 9e08feb9..2bc6718c 100644
--- a/src/pages/groups/[id]/edit.jsx
+++ b/src/pages/groups/[id]/edit.jsx
@@ -59,9 +59,9 @@ const EditGroup = ({
     showModal: false,
     editingGroupName: false,
     showTooltip: false,
-    groupName: group.name,
-    inviteUrl: group.inviteUrl,
-    members: group.members,
+    groupName: group ? group.name : '',
+    inviteUrl: group ? group.inviteUrl : '',
+    members: group ? group.members : '',
   });
   const handleCloseModal = () => setState({ ...state, showModal: false });
   const handleShowModal = () => setState({ ...state, showModal: true });
@@ -88,15 +88,15 @@ const EditGroup = ({
   };
 
   return (
-    <Layout alerts={alerts} type="group" title={`Manage Group: ${group.name}`} statefulSession={statefulSession}>
+    <Layout alerts={alerts} type="group" title={`Manage Group: ${group ? group.name : ''}`} statefulSession={statefulSession}>
       <Card>
         {((!session && loading) || (session && pageLoading)) && (
           <LoadingSpinner />
         )}
-        {((!session && !loading) || (session && roleInGroup(session) === 'unauthorized')) && (
+        {((!session && !loading) || (session && group && roleInGroup(session) === 'unauthorized')) && (
           <UnauthorizedCard />
         )}
-        {session && !loading && !pageLoading
+        {session && !loading && !pageLoading && group
           && (session.user.role === 'admin'
             || roleInGroup(session) === 'owner'
             || roleInGroup(session) === 'manager')
diff --git a/src/pages/groups/[id]/index.jsx b/src/pages/groups/[id]/index.jsx
index 26229d10..d3e13778 100644
--- a/src/pages/groups/[id]/index.jsx
+++ b/src/pages/groups/[id]/index.jsx
@@ -33,15 +33,15 @@ const ViewGroup = ({ group, statefulSession }) => {
   };
 
   return (
-    <Layout alerts={alerts} type="group" title={group.name} statefulSession={statefulSession}>
+    <Layout alerts={alerts} type="group" title={group ? group.name : ''} statefulSession={statefulSession}>
       <Card>
         {!session && loading && (
           <LoadingSpinner />
         )}
-        {((!session && !loading) || (session && roleInGroup(session) === 'unauthorized')) && (
+        {((!session && !loading) || (session && group && roleInGroup(session) === 'unauthorized')) && (
           <UnauthorizedCard />
         )}
-        {session && !loading && (
+        {session && !loading && group && (
           <>
             <Card.Header>
               {group.name}