make sure reports always show reliably

BehshadBabai · Dec 4, 2023 · 473c9c5 · 473c9c5
1 parent f27adda
commit 473c9c5
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 32 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -24,37 +24,40 @@ import {
   getAllReports,
   getFileUrls
 } from './Utilities/Util';
-import { useAppDispatch } from './Redux/hooks';
+import { useAppDispatch, useAppSelector } from './Redux/hooks';
 import { changeReports } from './Redux/features/report/report-slice';
 import Loading from './Components/Loading';
 
 const { Content } = Layout;
 
 const App = () => {
   const [pending, setPending] = React.useState(true);
+  const account = useAppSelector((state) => state.account);
   const dispatch = useAppDispatch();
 
   React.useEffect(() => {
     auth.onAuthStateChanged(async (user) => {
       if (user) {
         dispatch(changeLoggedIn(true));
-        dispatch(changeUserId(user.uid));
-        const docs = await fetchAllDocuments('users');
-        docs.forEach((doc) => {
-          const id = doc.id;
-          const data = doc.data();
-          const name = data.name as string;
-          const email = data.email as string;
-          const connectionId = data.connectionId as string;
-          const type = data.type as AccountType;
-          const view = data.view as ReportsViewType;
-          if (id === user.uid) {
-            dispatch(changeInfo({ name, email }));
-            dispatch(changeType(type));
-            dispatch(changeReportsViewType(view));
-            dispatch(changeConnectionId(connectionId));
-          }
-        });
+        if (!account.loggedIn) {
+          dispatch(changeUserId(user.uid));
+          const docs = await fetchAllDocuments('users');
+          docs.forEach((doc) => {
+            const id = doc.id;
+            const data = doc.data();
+            const name = data.name as string;
+            const email = data.email as string;
+            const connectionId = data.connectionId as string;
+            const type = data.type as AccountType;
+            const view = data.view as ReportsViewType;
+            if (id === user.uid) {
+              dispatch(changeInfo({ name, email }));
+              dispatch(changeType(type));
+              dispatch(changeReportsViewType(view));
+              dispatch(changeConnectionId(connectionId));
+            }
+          });
+        }
         setPending(false);
       } else {
         dispatch(changeLoggedIn(false));

diff --git a/src/Components/HomeParts/LoggedOut.tsx b/src/Components/HomeParts/LoggedOut.tsx
@@ -12,17 +12,26 @@ import {
 import { auth } from '../../Firebase/firebase';
 import { signInWithEmailAndPassword } from 'firebase/auth';
 import { useNavigate } from 'react-router-dom';
-import { AccountType } from '../../Redux/features/account/account-slice';
+import {
+  AccountType,
+  ReportsViewType,
+  changeConnectionId,
+  changeInfo,
+  changeReportsViewType,
+  changeType,
+  changeUserId
+} from '../../Redux/features/account/account-slice';
 import { firebaseErrorCodes } from '../../Utilities/Constants';
 import useScreenSize from '../../Hooks/useScreenSize';
 import { useAppDispatch } from '../../Redux/hooks';
+import { fetchAllDocuments } from '../../Utilities/Util';
 
 const LoggedOut: React.FC = () => {
   const [loginType, setLoginType] = React.useState<AccountType>(null);
   const [loginLoading, setLoginLoading] = React.useState(false);
   const screenSize = useScreenSize();
-  const dispatch = useAppDispatch();
   const navigate = useNavigate();
+  const dispatch = useAppDispatch();
 
   return (
     <Row style={{ width: '100%' }} justify={'center'} gutter={[0, 40]}>
@@ -127,7 +136,29 @@ const LoggedOut: React.FC = () => {
                       ? 'manager@gmail.com'
                       : 'supervisor@yahoo.com';
                   const password = '111111';
-                  await signInWithEmailAndPassword(auth, email, password);
+                  const res = await signInWithEmailAndPassword(
+                    auth,
+                    email,
+                    password
+                  );
+                  const user = res.user;
+                  dispatch(changeUserId(user.uid));
+                  const docs = await fetchAllDocuments('users');
+                  docs.forEach((doc) => {
+                    const id = doc.id;
+                    const data = doc.data();
+                    const name = data.name as string;
+                    const email = data.email as string;
+                    const connectionId = data.connectionId as string;
+                    const type = data.type as AccountType;
+                    const view = data.view as ReportsViewType;
+                    if (id === user.uid) {
+                      dispatch(changeInfo({ name, email }));
+                      dispatch(changeType(type));
+                      dispatch(changeReportsViewType(view));
+                      dispatch(changeConnectionId(connectionId));
+                    }
+                  });
                   message.success('Login Successful');
                   navigate('./reports');
                 } catch (error) {

diff --git a/src/Pages/Reports.tsx b/src/Pages/Reports.tsx
@@ -24,16 +24,8 @@ const Reports: React.FC = () => {
   const navigate = useNavigate();
   const [selectLoading, setSelectLoading] = React.useState(false);
   const [pageLoading, setPageLoading] = React.useState(true);
-  const initialReports = reports?.filter((report) => {
-    if (
-      report.creatorId === account.id ||
-      report.creatorId === account.connectionId
-    ) {
-      return true;
-    }
-    return false;
-  });
-  const [reportsToShow, setReportsToShow] = React.useState(initialReports);
+  const [reportsToShow, setReportsToShow] = React.useState([]);
+  const [initialReports, setInitialReports] = React.useState([]);
 
   React.useEffect(() => {
     if (!loggedIn) {
@@ -42,8 +34,31 @@ const Reports: React.FC = () => {
   }, []);
 
   React.useEffect(() => {
-    setReportsToShow(initialReports);
     if (reports) {
+      if (initialReports.length === 0) {
+        setInitialReports(
+          reports.filter((report) => {
+            if (
+              report.creatorId === account.id ||
+              report.creatorId === account.connectionId
+            ) {
+              return true;
+            }
+            return false;
+          })
+        );
+      }
+      setReportsToShow(
+        reports.filter((report) => {
+          if (
+            report.creatorId === account.id ||
+            report.creatorId === account.connectionId
+          ) {
+            return true;
+          }
+          return false;
+        })
+      );
       setPageLoading(false);
     }
   }, [reports]);