#106 Handle empty group prop

mitaai · Dec 29, 2020 · 9747af5 · 9747af5
1 parent 693f788
commit 9747af5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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}