Merge branch 'master' of github.com:async-labs/saas

labtests · Jul 4, 2019 · 8b542fe · 8b542fe
2 parents bf372b1 + 86bd096
commit 8b542fe
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/api/server/api/team-member.ts b/api/server/api/team-member.ts
@@ -33,16 +33,14 @@ async function loadDiscussionsData(team, userId, body) {
   const { discussionSlug } = body;
 
   if (!discussionSlug) {
-    return {};
+    return [];
   }
 
   const { discussions } = await Discussion.getList({
     userId,
     teamId: team._id,
   });
 
-  const data: any = { initialDiscussions: discussions };
-
   for (const discussion of discussions) {
     if (discussion.slug === discussionSlug) {
       Object.assign(discussion, {
@@ -56,7 +54,7 @@ async function loadDiscussionsData(team, userId, body) {
     }
   }
 
-  return data;
+  return discussions;
 }
 
 async function loadTeamData(team, userId, body) {
@@ -73,9 +71,9 @@ async function loadTeamData(team, userId, body) {
     });
   }
 
-  Object.assign(team, await loadDiscussionsData(team, userId, body));
+  const initialDiscussions = await loadDiscussionsData(team, userId, body);
 
-  const data: any = { initialMembers, initialInvitations };
+  const data: any = { initialMembers, initialInvitations, initialDiscussions };
 
   return data;
 }