bugfix(con): display mentors occupation in their profile (#766)

* Display mentors occupation section in their profile * Add comment * Add comment --------- Co-authored-by: Kate <kateryna@redi-school.org>
ReDI-School · Aug 18, 2023 · 901fd31 · 901fd31
1 parent 98ebb6b
commit 901fd31
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/apps/redi-connect/src/pages/app/me/Me.tsx b/apps/redi-connect/src/pages/app/me/Me.tsx
@@ -125,13 +125,16 @@ function Me() {
         </Element>
       )}
 
-      {/* <Element className="block-separator">
-        <Columns>
-          <Columns.Column size={6}>
-            <EditableOccupation />
-          </Columns.Column>
-        </Columns>
-      </Element> */}
+      {/* When ReDI course is re-implemented, remove userIsMentor condition from here & EditableOccupation component above */}
+      {userIsMentor && (
+        <Element className="block-separator">
+          <Columns>
+            <Columns.Column size={6}>
+              <EditableOccupation />
+            </Columns.Column>
+          </Columns>
+        </Element>
+      )}
     </LoggedIn>
   )
 }

diff --git a/apps/redi-connect/src/pages/app/profile/Profile.tsx b/apps/redi-connect/src/pages/app/profile/Profile.tsx
@@ -1,12 +1,12 @@
 import {
   MentorshipMatchStatus,
   useLoadMyProfileQuery,
-  UserType
+  UserType,
 } from '@talent-connect/data-access'
 import {
   Button,
   Heading,
-  Icon
+  Icon,
 } from '@talent-connect/shared-atomic-design-components'
 import { REDI_LOCATION_NAMES } from '@talent-connect/shared-config'
 import { Columns, Content, Element, Notification } from 'react-bulma-components'
@@ -18,12 +18,13 @@ import {
   ReadLanguages,
   ReadMentoringTopics,
   ReadOccupation,
-  ReadPersonalDetail, ReadSocialMedia
+  ReadPersonalDetail,
+  ReadSocialMedia,
 } from '../../../components/molecules'
 import {
   ApplyForMentor,
   Avatar,
-  ConfirmMentorship
+  ConfirmMentorship,
 } from '../../../components/organisms'
 import DeclineMentorshipButton from '../../../components/organisms/DeclineMentorshipButton'
 import { LoggedIn } from '../../../components/templates'
@@ -212,7 +213,8 @@ function Profile() {
           )}
 
           {profile.mentor_occupation && (
-          // || profile.mentee_occupationCategoryId) 
+            // When ReDI course is re-implemented, uncomment this & remove ReadOccupation component above
+            // || profile.mentee_occupationCategoryId)
             <Element className="block-separator">
               <Columns>
                 <Columns.Column>