From 70bede9bb02ffa77a8121740d5fe4cedacdb7149 Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <oleshko.ilya@gmail.com>
Date: Mon, 5 Aug 2019 13:22:17 +0300
Subject: [PATCH 1/2] Web: People: Profile: Render optimization

---
 .../pages/Profile/Section/Body/index.js       | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js b/products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
index f8b8fc53cf..2a02d83c64 100644
--- a/products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
+++ b/products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
@@ -126,6 +126,13 @@ const createContacts = (contacts) => {
 const SectionBodyContent = (props) => {
   const { profile, history, isSelf, settings } = props;
   const contacts = profile.contacts && getContacts(profile.contacts);
+  const role = getUserRole(profile);
+  const workFrom = getFormattedDate(profile.workFrom);
+  const birthDay = getFormattedDate(profile.birthday);
+  const formatedSex = capitalizeFirstLetter(profile.sex);
+  const formatedDepartments = getFormattedDepartments(profile.department);
+  const socialContacts = createContacts(contacts.social);
+  const infoContacts = createContacts(contacts.contact);
 
   const onEmailClick = useCallback(
     () => window.open('mailto:' + profile.email),
@@ -147,17 +154,10 @@ const SectionBodyContent = (props) => {
     [history, settings.homepage, profile.userName]
   );
 
-  console.log(profile);
-
   return (
     <div style={profileWrapper}>
       <div style={avatarWrapper}>
-        <Avatar
-          size="max"
-          role={getUserRole(profile)}
-          source={profile.avatarMax}
-          userName={profile.displayName}
-        />
+        <Avatar size="max" role={role} source={profile.avatarMax} userName={profile.displayName} />
         <Button style={editButtonWrapper} size="big" label="Edit profile" onClick={onEditProfileClick} />
       </div>
       <div style={infoWrapper}>
@@ -176,13 +176,18 @@ const SectionBodyContent = (props) => {
         </div>
         <div>
           <Text.Body style={restMargins}>{profile.isVisitor ? "Guest" : "Employee"}</Text.Body>
-          <Text.Body style={restMargins}><Link type="page" fontSize={13} isHovered={true} onClick={onEmailClick} >{profile.email}</Link>{profile.activationStatus === 2 && ' (Pending)'}</Text.Body>
-          <Text.Body style={restMargins}>{getFormattedDepartments(profile.department)}</Text.Body>
+          <Text.Body style={restMargins}>
+            <Link type="page" fontSize={13} isHovered={true} onClick={onEmailClick} >
+              {profile.email}
+            </Link>
+            {profile.activationStatus === 2 && ' (Pending)'}
+          </Text.Body>
+          <Text.Body style={restMargins}>{formatedDepartments}</Text.Body>
           <Text.Body style={restMargins}>{profile.title}</Text.Body>
           <Text.Body style={restMargins}>{profile.mobilePhone}</Text.Body>
-          <Text.Body style={restMargins}>{capitalizeFirstLetter(profile.sex)}</Text.Body>
-          <Text.Body style={restMargins}>{getFormattedDate(profile.workFrom)}</Text.Body>
-          <Text.Body style={restMargins}>{getFormattedDate(profile.birthday)}</Text.Body>
+          <Text.Body style={restMargins}>{formatedSex}</Text.Body>
+          <Text.Body style={restMargins}>{workFrom}</Text.Body>
+          <Text.Body style={restMargins}>{birthDay}</Text.Body>
           <Text.Body style={restMargins}>{profile.location}</Text.Body>
           {isSelf && <Text.Body style={restMargins}>{profile.cultureName}</Text.Body>}
           {isSelf && <Button style={marginTop22} size="base" label="Become our Affiliate" onClick={onBecomeAffiliateClick} />}
@@ -223,7 +228,7 @@ const SectionBodyContent = (props) => {
         <div style={contactsToggleWrapper}>
           <ToggleContent label="Contact information" style={notesWrapper} isOpen={true}>
             <Text.Body tag="span">
-              {createContacts(contacts.contact)}
+              {infoContacts}
             </Text.Body>
           </ToggleContent>
         </div>
@@ -232,7 +237,7 @@ const SectionBodyContent = (props) => {
         <div style={contactsToggleWrapper}>
           <ToggleContent label="Social profiles" style={notesWrapper} isOpen={true}>
             <Text.Body tag="span">
-              {createContacts(contacts.social)}
+              {socialContacts}
             </Text.Body>
           </ToggleContent>
         </div>

From 7e6edd52143b51a1844eeb95d5b46fee233444dc Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <oleshko.ilya@gmail.com>
Date: Mon, 5 Aug 2019 13:43:36 +0300
Subject: [PATCH 2/2] Web: People: Profile: Fixed empty contacts and culture
 issue

---
 .../src/components/pages/Profile/Section/Body/index.js     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js b/products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
index 2a02d83c64..e5deee5dc5 100644
--- a/products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
+++ b/products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
@@ -125,14 +125,15 @@ const createContacts = (contacts) => {
 
 const SectionBodyContent = (props) => {
   const { profile, history, isSelf, settings } = props;
+  //console.log(profile, settings);
   const contacts = profile.contacts && getContacts(profile.contacts);
   const role = getUserRole(profile);
   const workFrom = getFormattedDate(profile.workFrom);
   const birthDay = getFormattedDate(profile.birthday);
   const formatedSex = capitalizeFirstLetter(profile.sex);
   const formatedDepartments = getFormattedDepartments(profile.department);
-  const socialContacts = createContacts(contacts.social);
-  const infoContacts = createContacts(contacts.contact);
+  const socialContacts = contacts && createContacts(contacts.social);
+  const infoContacts = contacts && createContacts(contacts.contact);
 
   const onEmailClick = useCallback(
     () => window.open('mailto:' + profile.email),
@@ -189,7 +190,7 @@ const SectionBodyContent = (props) => {
           <Text.Body style={restMargins}>{workFrom}</Text.Body>
           <Text.Body style={restMargins}>{birthDay}</Text.Body>
           <Text.Body style={restMargins}>{profile.location}</Text.Body>
-          {isSelf && <Text.Body style={restMargins}>{profile.cultureName}</Text.Body>}
+          {isSelf && <Text.Body style={restMargins}>{profile.cultureName || settings.currentCulture}</Text.Body>}
           {isSelf && <Button style={marginTop22} size="base" label="Become our Affiliate" onClick={onBecomeAffiliateClick} />}
         </div>
       </div>