Merge pull request #615 from mahajanmahesh935/domainCard

TASK : #0000 [Desktop => User Prefence] Popup gets closed without any alert/intimation , [Desktop] [Mobile] Showing red color error message in the popup, After 1st time login, [Content Detail Page] Data missing on the content detail page
NIUANULP · Sep 16, 2024 · 8f9878b · 8f9878b
2 parents 83a1a26 + 8e54d72
commit 8f9878b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/packages/nulp_elite/src/components/Card.js b/packages/nulp_elite/src/components/Card.js
@@ -197,6 +197,15 @@ export default function BoxCard({ items, index, onClick, continueLearning }) {
           </Typography>
         )}
         {items.organisation && items.organisation.length > 0 && (
+          <Tooltip
+            title={
+              items.organisation.length > 1 
+              ? items.organisation.join(', ')  
+              : items.organisation[0]           
+            }
+            arrow 
+            placement="top" 
+          >
           <Typography
             variant="body2"
             color="#5B5B5B"
@@ -208,6 +217,7 @@ export default function BoxCard({ items, index, onClick, continueLearning }) {
                 : `${items.organisation[0]} + ${items.organisation.length - 1}`}
             </Box>
           </Typography>
+        </Tooltip>
         )}
       </CardContent>
       {(items?.board ||

diff --git a/packages/nulp_elite/src/pages/SelectPreference.js b/packages/nulp_elite/src/pages/SelectPreference.js
@@ -236,7 +236,7 @@ const SelectPreference = ({ isOpen, onClose }) => {
       }
 
       const responseData = await response.json();
-      if (Object.entries(responseData?.result?.response.framework).length === 0 ) {
+      if (Object.entries(responseData?.result?.response?.framework).length === 0 ) {
         setIsEmptyPreference(false);
       } else {
         setSelectedCategory(
@@ -261,7 +261,7 @@ const SelectPreference = ({ isOpen, onClose }) => {
         );
       }
 
-      if (responseData?.result?.response.framework?.id[0] === "nulp") {
+      if (responseData?.result?.response?.framework?.id?.length > 0 && responseData.result.response.framework.id[0] === "nulp") {
         setframworkname(true);
       }
 
@@ -384,7 +384,7 @@ const SelectPreference = ({ isOpen, onClose }) => {
       {toasterMessage && <ToasterCommon response={toasterMessage} />}
       <DialogTitle>{t("SELECT_PREF")}</DialogTitle>
       {framworkname && (
-        <DialogTitle onClick={handleClose}>
+        <DialogTitle>
           {t("CHANGE_PREF_OLD_USER")}
         </DialogTitle>
       )}

diff --git a/packages/nulp_elite/src/pages/content/Player.js b/packages/nulp_elite/src/pages/content/Player.js
@@ -535,4 +535,4 @@ const attemptid = ()=>{
   );
 };
 
-export default Player;
+export default Player;
-Original file line number
+Diff line change
@@ Expand Up / @@ -535,4 +535,4 @@ const attemptid = ()=>{ @@
       );
     };
-    export default Player;
+    export default Player;