Merge branch 'main' into convert-remaining-js-files-to-ts

Author: jescalada

src/routes.tsx

@@ -21,7 +21,7 @@ import RouteGuard from './ui/components/RouteGuard/RouteGuard';
 import Person from '@material-ui/icons/Person';
 import OpenPushRequests from './ui/views/OpenPushRequests/OpenPushRequests';
 import PushDetails from './ui/views/PushDetails/PushDetails';
-import User from './ui/views/User/User';
+import User from './ui/views/User/UserProfile';
 import UserList from './ui/views/UserList/UserList';
 import RepoDetails from './ui/views/RepoDetails/RepoDetails';
 import RepoList from './ui/views/RepoList/RepoList';

src/ui/services/user.ts

@@ -17,7 +17,6 @@ const getUser = async (
   if (id) {
     url = `${API_BASE}/api/v1/user/${id}`;
   }
-  console.log(url);
 
   try {
     const response: AxiosResponse<UserData> = await axios(url, getAxiosConfig());
@@ -80,29 +79,4 @@ const updateUser = async (data: UserData): Promise<void> => {
   }
 };
 
-const getUserLoggedIn = async (
-  setIsLoading: SetStateCallback<boolean>,
-  setIsAdmin: SetStateCallback<boolean>,
-  setIsError: SetStateCallback<boolean>,
-  setAuth: SetStateCallback<boolean>,
-): Promise<void> => {
-  try {
-    const response: AxiosResponse<UserData> = await axios(
-      `${API_BASE}/api/auth/me`,
-      getAxiosConfig(),
-    );
-    const data = response.data;
-    setIsLoading(false);
-    setIsAdmin(data.admin || false);
-  } catch (error) {
-    setIsLoading(false);
-    const axiosError = error as AxiosError;
-    if (axiosError.response?.status === 401) {
-      setAuth(false);
-    } else {
-      setIsError(true);
-    }
-  }
-};
-
-export { getUser, getUsers, updateUser, getUserLoggedIn };
+export { getUser, getUsers, updateUser };

src/ui/views/User/User.tsx renamed to src/ui/views/User/UserProfile.tsx

@@ -1,12 +1,13 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useContext } from 'react';
 import { Navigate, useNavigate, useParams } from 'react-router-dom';
 import GridItem from '../../components/Grid/GridItem';
 import GridContainer from '../../components/Grid/GridContainer';
 import Card from '../../components/Card/Card';
 import CardBody from '../../components/Card/CardBody';
 import Button from '../../components/CustomButtons/Button';
 import FormLabel from '@material-ui/core/FormLabel';
-import { getUser, updateUser, getUserLoggedIn } from '../../services/user';
+import { getUser, updateUser } from '../../services/user';
+import { UserContext } from '../../../context';
 
 import { UserData } from '../../../types/models';
 import { makeStyles } from '@material-ui/core/styles';
@@ -15,6 +16,7 @@ import { LogoGithubIcon } from '@primer/octicons-react';
 import CloseRounded from '@material-ui/icons/CloseRounded';
 import { Check, Save } from '@material-ui/icons';
 import { TextField, Theme } from '@material-ui/core';
+import { UserContextType } from '../RepoDetails/RepoDetails';
 
 const useStyles = makeStyles((theme: Theme) => ({
   root: {
@@ -31,42 +33,23 @@ export default function UserProfile(): React.ReactElement {
   const [auth, setAuth] = useState<boolean>(true);
   const [isLoading, setIsLoading] = useState<boolean>(true);
   const [isError, setIsError] = useState<boolean>(false);
-  const [isProfile, setIsProfile] = useState<boolean>(false);
-  const [isAdmin, setIsAdmin] = useState<boolean>(false);
   const [gitAccount, setGitAccount] = useState<string>('');
   const navigate = useNavigate();
   const { id } = useParams<{ id?: string }>();
+  const { user: loggedInUser } = useContext<UserContextType>(UserContext);
+  const isOwnProfile = !id;
 
   useEffect(() => {
-    if (id == null) {
-      setIsProfile(true);
-    }
-
-    if (id) {
-      getUser(
-        setIsLoading,
-        (userData: UserData) => {
-          setData(userData);
-          setGitAccount(userData.gitAccount || '');
-        },
-        setAuth,
-        setIsError,
-        id,
-      );
-      getUserLoggedIn(setIsLoading, setIsAdmin, setIsError, setAuth);
-    } else {
-      console.log('getting user data');
-      setIsProfile(true);
-      getUser(
-        setIsLoading,
-        (userData: UserData) => {
-          setData(userData);
-          setGitAccount(userData.gitAccount || '');
-        },
-        setAuth,
-        setIsError,
-      );
-    }
+    getUser(
+      setIsLoading,
+      (userData: UserData) => {
+        setData(userData);
+        setGitAccount(userData.gitAccount || '');
+      },
+      setAuth,
+      setIsError,
+      id,
+    );
   }, [id]);
 
   if (isLoading) return <div>Loading...</div>;
@@ -169,7 +152,7 @@ export default function UserProfile(): React.ReactElement {
                   )}
                 </GridItem>
               </GridContainer>
-              {isProfile || isAdmin ? (
+              {isOwnProfile || loggedInUser.admin ? (
                 <div style={{ marginTop: '50px' }}>
                   <hr style={{ opacity: 0.2 }} />
                   <div style={{ marginTop: '25px' }}>