fixes for redirect from /discussions route to particular discussion

api/server/api/team-member.ts

@@ -23,6 +23,10 @@ router.use((req, res, next) => {
 async function loadDiscussionsData(team, userId, body) {
   const { discussionSlug } = body;
 
+  if (!discussionSlug) {
+    return {};
+  }
+
   const { discussions } = await Discussion.getList({
     userId,
     teamId: team._id,
@@ -43,10 +47,6 @@ async function loadDiscussionsData(team, userId, body) {
     }
   }
 
-  if (discussionSlug) {
-    data.currentDiscussionSlug = discussionSlug;
-  }
-
   return data;
 }
 

app/components/discussions/DiscussionList.tsx

@@ -8,16 +8,22 @@ import ActiveLink from '../common/ActiveLink';
 import CreateDiscussionForm from './CreateDiscussionForm';
 import DiscussionListItem from './DiscussionListItem';
 
+import notify from '../../lib/notifier';
+
 type Props = { store?: Store; team: Team };
 
 class DiscussionList extends React.Component<Props> {
   public state = {
     discussionFormOpen: false,
   };
 
+  public componentDidMount() {
+    this.props.team.loadDiscussions().catch(err => notify(err));
+  }
+
   public componentDidUpdate(prevProps: Props) {
     if (this.props.team._id !== prevProps.team._id) {
-      this.props.team.loadDiscussions();
+      this.props.team.loadDiscussions().catch(err => notify(err));
     }
   }
 
@@ -30,8 +36,8 @@ class DiscussionList extends React.Component<Props> {
           hasIcon
           linkText="Discussions"
           href={`/discussion?teamSlug=${team.slug}`}
-          as={`/team/${team.slug}/d`}
-          highlighterSlug={`/${team.slug}/d`}
+          as={`/team/${team.slug}/discussions`}
+          highlighterSlug={`/team/${team.slug}/discussions`}
         />
 
         <Tooltip title="Add Discussion" placement="right" disableFocusListener disableTouchListener>

app/components/posts/PostForm.tsx

@@ -8,7 +8,7 @@ import NProgress from 'nprogress';
 import React from 'react';
 
 import notify from '../../lib/notifier';
-import { Post, Store, User } from '../../lib/store';
+import { Discussion, Post, Store, User } from '../../lib/store';
 
 import PostEditor from './PostEditor';
 
@@ -26,6 +26,7 @@ type MyProps = {
   onFinished?: () => void;
   open?: boolean;
   classes: { paper: string };
+  discussion: Discussion;
 };
 
 type MyState = {
@@ -101,7 +102,7 @@ class PostForm extends React.Component<MyProps, MyState> {
 
     const { content } = this.state;
     const htmlContent = marked(he.decode(content));
-    const { post, onFinished, store } = this.props;
+    const { post, onFinished, store, discussion } = this.props;
     const isEditing = !!post;
 
     if (!content) {
@@ -133,26 +134,20 @@ class PostForm extends React.Component<MyProps, MyState> {
 
     const { currentTeam } = store;
     if (!currentTeam) {
-      notify('Team have not selected');
-      return;
-    }
-
-    const { currentDiscussion } = currentTeam;
-    if (!currentDiscussion) {
-      notify('Discussion have not selected');
+      notify('Team is not selected or does not exist.');
       return;
     }
 
     NProgress.start();
     this.setState({ disabled: true });
 
     try {
-      await currentDiscussion.addPost(content);
+      await discussion.addPost(content);
 
       this.setState({ content: '' });
       NProgress.done();
       this.setState({ disabled: false });
-      notify('You successfully published Post');
+      notify('You successfully published Post.');
     } catch (error) {
       console.log(error);
       notify(error);

app/lib/store/team.ts

@@ -76,6 +76,8 @@ class Team {
 
     if (params.initialDiscussions) {
       this.setInitialDiscussions(params.initialDiscussions);
+    } else {
+      this.loadDiscussions();
     }
   }
 
@@ -225,7 +227,7 @@ class Team {
             `/team/${this.slug}/discussions/${d.slug}`,
           );
         } else {
-          Router.push(`/discussion?teamSlug=${this.slug}`, `/team/${this.slug}/d`);
+          Router.push(`/discussion?teamSlug=${this.slug}`, `/team/${this.slug}/discussions`);
         }
       }
     });

app/lib/withAuth.tsx

@@ -37,7 +37,7 @@ export default function withAuth(
           asUrl = '/create-team';
         } else {
           redirectUrl = `/discussion?teamSlug=${user.defaultTeamSlug}`;
-          asUrl = `/team/${user.defaultTeamSlug}/d`;
+          asUrl = `/team/${user.defaultTeamSlug}/discussions`;
         }
       }
 

app/lib/withStore.tsx

@@ -32,14 +32,14 @@ export default function withStore(BaseComponent) {
         Object.assign(props, (await BaseComponent.getInitialProps(ctx)) || {});
       }
 
-      const { teamSlug, topicSlug, discussionSlug } = props;
+      const { teamSlug, discussionSlug } = props;
       let initialData = {};
 
       if (user) {
         try {
           initialData = await getInitialData({
             request: ctx.req,
-            data: { teamSlug, topicSlug, discussionSlug },
+            data: { teamSlug, discussionSlug },
           });
         } catch (error) {
           console.log(error);

app/pages/discussion.tsx

@@ -214,6 +214,7 @@ class DiscussionComp extends React.Component<Props> {
         <p />
         <br />
         <PostForm
+          discussion={discussion}
           post={selectedPost}
           open={drawerState}
           members={discussion.members}

app/pages/invitation.tsx

@@ -36,7 +36,7 @@ class Invitation extends React.Component<{ store: Store; team: Team; token: stri
     if (user && team) {
       if (team.memberIds.includes(user._id)) {
         removeInvitationIfMemberAdded(token);
-        Router.push(`/discussion?teamSlug=${team.slug}`, `/team/${team.slug}/d`);
+        Router.push(`/discussion?teamSlug=${team.slug}`, `/team/${team.slug}/discussions`);
       } else {
         Router.push('/');
       }
@@ -78,7 +78,7 @@ class Invitation extends React.Component<{ store: Store; team: Team; token: stri
           Join <b>{team.name}</b> by logging in with your Google account.
         </p>
         <br />
-        <LoginButton next={`/team/${team.slug}/d`} invitationToken={token} />
+        <LoginButton next={`/team/${team.slug}/discussions`} invitationToken={token} />
       </div>
     );
   }

app/server/app.ts

@@ -58,22 +58,22 @@ app.prepare().then(() => {
     let redirectUrl = 'login';
 
     if (req.user) {
-      if (!req.user.defaultTeamSlug) {
-        redirectUrl = 'settings/create-team';
+      if (!req.user.isAdmin && !req.user.defaultTeamSlug) {
+        redirectUrl = 'create-team';
       } else {
-        redirectUrl = `team/${req.user.defaultTeamSlug}/d`;
+        redirectUrl = `team/${req.user.defaultTeamSlug}/discussions`;
       }
     }
 
     res.redirect(`${ROOT_URL}/${redirectUrl}`);
   });
 
+  routesWithSlug({ server, app });
+
   server.get('/robots.txt', (_, res) => {
     res.sendFile(path.join(__dirname, '../static', 'robots.txt'));
   });
 
-  routesWithSlug({ server, app });
-
   server.get('*', (req, res) => {
     handle(req, res);
   });