Merge pull request #447 from ManojNathIC/polls

Task #0000:Bug fixes-organization name on profile, join course issue
NIUANULP · Aug 6, 2024 · d68f06c · d68f06c
2 parents 1c7f543 + 83cd013
commit d68f06c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/packages/nulp_elite/src/components/Card.js b/packages/nulp_elite/src/components/Card.js
@@ -191,11 +191,10 @@ export default function BoxCard({ items, index, onClick }) {
                 title={
                   Array.isArray(items?.board) && items.board.length === 1
                     ? items.board.join(", ")
-                    : items.se_boards[0] ||
-                      (Array.isArray(items?.se_boards) &&
-                      items?.se_boards.length > 1
-                        ? items.se_boards.join(", ")
-                        : items.se_boards?.[0] || "")
+                    : Array.isArray(items?.se_boards) &&
+                      items.se_boards.length > 1
+                    ? items.se_boards.join(", ")
+                    : items?.se_boards?.[0] || ""
                 }
                 placement="top"
                 className="labelOne cardLabelEllips"

diff --git a/packages/nulp_elite/src/pages/content/joinCourse.js b/packages/nulp_elite/src/pages/content/joinCourse.js
@@ -958,7 +958,7 @@ const JoinCourse = () => {
                   {t("CONTENT_TAGS")}:{" "}
                 </Typography>
 
-                {courseData?.result?.content?.board &&
+                {Array.isArray(courseData?.result?.content?.board) &&
                   courseData?.result?.content?.board?.map((item, index) => (
                     <Button
                       key={`board-${index}`}

diff --git a/packages/nulp_elite/src/pages/profile/Profile.js b/packages/nulp_elite/src/pages/profile/Profile.js
@@ -705,12 +705,14 @@ const Profile = () => {
                                   }
                                 </Box>
                               </Typography>
-                              <Typography className="h6-title d-flex">
-                                <Box className="h6-title d-flex">
-                                  Organization Name :
-                                  {userData?.result?.response?.rootOrg?.orgName}
-                                </Box>
-                              </Typography>
+                              {userInfo && userInfo?.length && (
+                                <Typography className="h6-title d-flex">
+                                  <Box className="h6-title d-flex">
+                                    Organization Name :
+                                    {userInfo?.[0]?.organisation || "NA"}
+                                  </Box>
+                                </Typography>
+                              )}
                               <Typography className="h6-title d-flex">
                                 <Box className="h6-title d-flex">
                                   Role :{" "}
@@ -986,7 +988,7 @@ const Profile = () => {
                               </Select>
                             </FormControl>
                           </Box>
-                          {editedUserInfo.designation === "Other" && (
+                          {editedUserInfo.designation === "Others" && (
                             <Box py={1}>
                               <CssTextField
                                 id="otherDesignation"