#163 redirect, class -> functional, smaller tasks

Author: tima101

Diff for: book/11-end/app/components/discussions/CreateDiscussionForm.tsx

@@ -4,7 +4,6 @@ import DialogContent from '@mui/material/DialogContent';
 import DialogTitle from '@mui/material/DialogTitle';
 import FormControl from '@mui/material/FormControl';
 import FormHelperText from '@mui/material/FormHelperText';
-import InputLabel from '@mui/material/InputLabel';
 import Select from '@mui/material/Select';
 import MenuItem from '@mui/material/MenuItem';
 import TextField from '@mui/material/TextField';
@@ -207,10 +206,10 @@ class CreateDiscussionForm extends React.Component<Props, State> {
       return;
     }
 
-    if (!memberIds || memberIds.length < 1) {
-      notify('Please assign at least one person to this Discussion.');
-      return;
-    }
+    // if (!memberIds || memberIds.length < 1) {
+    //   notify('Please assign at least one person to this Discussion.');
+    //   return;
+    // }
 
     if (!notificationType) {
       notify('Please select notification type.');

Diff for: book/11-end/app/components/discussions/EditDiscussionForm.tsx

@@ -6,7 +6,6 @@ import DialogContentText from '@mui/material/DialogContentText';
 import DialogTitle from '@mui/material/DialogTitle';
 import FormControl from '@mui/material/FormControl';
 import FormHelperText from '@mui/material/FormHelperText';
-import InputLabel from '@mui/material/InputLabel';
 import Select from '@mui/material/Select';
 import MenuItem from '@mui/material/MenuItem';
 import TextField from '@mui/material/TextField';
@@ -174,10 +173,10 @@ class EditDiscussionForm extends React.Component<Props, State> {
       memberIds.push(discussion.store.currentUser._id);
     }
 
-    if (!memberIds || memberIds.length < 1) {
-      notify('Please assign at least one person to this Discussion.');
-      return;
-    }
+    // if (!memberIds || memberIds.length < 1) {
+    //   notify('Please assign at least one person to this Discussion.');
+    //   return;
+    // }
 
     if (!notificationType) {
       notify('Please select notification type.');

Diff for: book/11-end/app/components/layout/index.tsx

@@ -182,7 +182,7 @@ class Layout extends React.Component<Props> {
 
     // console.log(isMobile);
 
-    // console.log(currentTeam);
+    console.log(store, currentUser, currentTeam);
 
     if (!currentUser) {
       return (

Diff for: book/11-end/app/lib/store/index.ts

@@ -51,16 +51,7 @@ class Store {
 
     this.currentUrl = initialState.currentUrl || '';
 
-    // console.log(initialState.user);
-
-    // if (initialState.teamSlug || (initialState.user && initialState.user.defaultTeamSlug)) {
-    //   this.setCurrentTeam(
-    //     initialState.teamSlug || initialState.user.defaultTeamSlug,
-    //     initialState.teams,
-    //   );
-    // }
-
-    // console.log(initialState.team);
+    console.log(initialState);
 
     this.setCurrentTeam(initialState.team);
 

Diff for: book/11-end/app/lib/withAuth.tsx

@@ -69,8 +69,8 @@ export default function withAuth(Component, { loginRequired = true, logoutRequir
           redirectUrl = '/create-team';
           asUrl = '/create-team';
         } else {
-          redirectUrl = `/your-settings`;
-          asUrl = `/your-settings`;
+          redirectUrl = `/your-settings?teamSlug=${user.defaultTeamSlug}`;
+          asUrl = `/teams/${user.defaultTeamSlug}/your-settings`;
         }
       }
 

Diff for: book/11-end/app/pages/_app.tsx

@@ -27,7 +27,7 @@ class MyApp extends App {
     }
 
     if (
-      ctx.pathname.includes('/your-settings') || // because of MenuWithLinks inside `Layout` HOC
+      ctx.pathname.includes('/your-settings') ||
       ctx.pathname.includes('/team-settings') ||
       ctx.pathname.includes('/discussion') ||
       ctx.pathname.includes('/billing')
@@ -52,6 +52,8 @@ class MyApp extends App {
 
     const appProps = { pageProps };
 
+    console.log('before getStore');
+
     const store = getStore();
     if (store) {
       return appProps;
@@ -80,8 +82,6 @@ class MyApp extends App {
 
     // console.log(initialData);
 
-    // console.log(teamSlug);
-
     let selectedTeamSlug = '';
 
     if (teamRequired) {
@@ -93,24 +93,18 @@ class MyApp extends App {
     let team;
     if (initialData && initialData.teams) {
       team = initialData.teams.find((t) => {
-        return t.slug === selectedTeamSlug;
+        return t.slug === selectedTeamSlug || userObj.defaultTeamSlug;
       });
     }
 
+    console.log(initialData.teams, team);
+
     return {
       ...appProps,
       initialState: { user: userObj, currentUrl: ctx.asPath, team, teamSlug, ...initialData },
     };
   }
 
-  public componentDidMount() {
-    // Remove the server-side injected CSS.
-    const jssStyles = document.querySelector('#jss-server-side');
-    if (jssStyles && jssStyles.parentNode) {
-      jssStyles.parentNode.removeChild(jssStyles);
-    }
-  }
-
   private store: Store;
 
   constructor(props) {