From 191011e1089a72501701e60e8118cd1c9532d1ab Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <muhammed@freecodecamp.org>
Date: Thu, 20 Apr 2023 18:13:05 +0200
Subject: [PATCH] refactor(client): profile component into sub components
 (#49956)

* refactor(client): profile component into sub components

* Clean the future PR changes

* fix the broken if statement cased by prettier and clean change log

* Better variable name for boolean variable

Co-authored-by: Mrugesh Mohapatra <1884376+raisedadead@users.noreply.github.com>

* Revert the removing of vistor

Co-authored-by: ahmad abdolsaheb <ahmad.abdolsaheb@gmail.com>

* better naming for the component

* fix typo in message components

Co-authored-by: sembauke <semboot699@gmail.com>

---------

Co-authored-by: Mrugesh Mohapatra <1884376+raisedadead@users.noreply.github.com>
Co-authored-by: ahmad abdolsaheb <ahmad.abdolsaheb@gmail.com>
Co-authored-by: sembauke <semboot699@gmail.com>
---
 client/src/components/profile/profile.tsx | 101 ++++++++++++----------
 1 file changed, 56 insertions(+), 45 deletions(-)

diff --git a/client/src/components/profile/profile.tsx b/client/src/components/profile/profile.tsx
index 14333227995..97cbed938bc 100644
--- a/client/src/components/profile/profile.tsx
+++ b/client/src/components/profile/profile.tsx
@@ -16,51 +16,58 @@ interface ProfileProps {
   isSessionUser: boolean;
   user: User;
 }
-
-function renderMessage(
-  isSessionUser: boolean,
-  username: string,
-  t: TFunction
-): JSX.Element {
-  return isSessionUser ? (
-    <>
-      <FullWidthRow>
-        <h2 className='text-center'>{t('profile.you-not-public')}</h2>
-      </FullWidthRow>
-      <FullWidthRow>
-        <p className='alert alert-info'>{t('profile.you-change-privacy')}</p>
-      </FullWidthRow>
-      <Spacer size='medium' />
-    </>
-  ) : (
-    <>
-      <FullWidthRow>
-        <h2 className='text-center' style={{ overflowWrap: 'break-word' }}>
-          {t('profile.username-not-public', { username: username })}
-        </h2>
-      </FullWidthRow>
-      <FullWidthRow>
-        <p className='alert alert-info'>
-          {t('profile.username-change-privacy', { username: username })}
-        </p>
-      </FullWidthRow>
-      <Spacer size='medium' />
-    </>
-  );
+interface MessageProps {
+  isSessionUser: boolean;
+  t: TFunction;
+  username: string;
 }
 
-function renderProfile(user: ProfileProps['user']): JSX.Element {
+const UserMessage = ({ t }: Pick<MessageProps, 't'>) => {
+  return (
+    <FullWidthRow>
+      <h2 className='text-center'>{t('profile.you-not-public')}</h2>
+      <p className='alert alert-info'>{t('profile.you-change-privacy')}</p>
+      <Spacer size='medium' />
+    </FullWidthRow>
+  );
+};
+
+const VisitorMessage = ({
+  t,
+  username
+}: Omit<MessageProps, 'isSessionUser'>) => {
+  return (
+    <FullWidthRow>
+      <h2 className='text-center' style={{ overflowWrap: 'break-word' }}>
+        {t('profile.username-not-public', { username: username })}
+      </h2>
+      <p className='alert alert-info'>
+        {t('profile.username-change-privacy', { username: username })}
+      </p>
+      <Spacer size='medium' />
+    </FullWidthRow>
+  );
+};
+
+const Message = ({ isSessionUser, t, username }: MessageProps) => {
+  if (isSessionUser) {
+    return <UserMessage t={t} />;
+  }
+  return <VisitorMessage t={t} username={username} />;
+};
+
+function UserProfile({ user }: { user: ProfileProps['user'] }): JSX.Element {
   const {
     profileUI: {
-      showAbout = false,
-      showCerts = false,
-      showDonation = false,
-      showHeatMap = false,
-      showLocation = false,
-      showName = false,
-      showPoints = false,
-      showPortfolio = false,
-      showTimeLine = false
+      showAbout,
+      showCerts,
+      showDonation,
+      showHeatMap,
+      showLocation,
+      showName,
+      showPoints,
+      showPortfolio,
+      showTimeLine
     },
     calendar,
     completedChallenges,
@@ -112,10 +119,12 @@ function renderProfile(user: ProfileProps['user']): JSX.Element {
 function Profile({ user, isSessionUser }: ProfileProps): JSX.Element {
   const { t } = useTranslation();
   const {
-    profileUI: { isLocked = true },
+    profileUI: { isLocked },
     username
   } = user;
 
+  const showUserProfile = !isLocked || isSessionUser;
+
   return (
     <>
       <Helmet>
@@ -124,9 +133,11 @@ function Profile({ user, isSessionUser }: ProfileProps): JSX.Element {
       <Spacer size='medium' />
       <Grid>
         <Spacer size='medium' />
-        {isLocked ? renderMessage(isSessionUser, username, t) : null}
-        {!isLocked || isSessionUser ? renderProfile(user) : null}
-        {isSessionUser ? null : (
+        {isLocked && (
+          <Message username={username} isSessionUser={isSessionUser} t={t} />
+        )}
+        {showUserProfile && <UserProfile user={user} />}
+        {!isSessionUser && (
           <Row className='text-center'>
             <Link to={`/user/${username}/report-user`}>
               {t('buttons.flag-user')}