Merge pull request NIUANULP#340 from ManojNathIC/Bug-fixes

Task #0000: Workspace visibility option logic and user domain wise content
ManojNathIC · Jul 6, 2024 · 59060c7 · 59060c7
2 parents b64a22c + cb2af89
commit 59060c7
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 44 deletions.
diff --git a/packages/nulp_elite/src/App.js b/packages/nulp_elite/src/App.js
@@ -197,6 +197,18 @@ function App() {
         const data = await response.json();
         const rootOrgId = data.result.response.rootOrgId;
         sessionStorage.setItem("rootOrgId", rootOrgId);
+        sessionStorage.setItem(
+          "userDomain",
+          data.result.response.framework.board
+        );
+        const rolesData = data.result.response.roles;
+        const roles = rolesData?.map((roleObject) => roleObject.role);
+
+        // Convert the roles array to a JSON string
+        const rolesJson = JSON.stringify(roles);
+
+        // Save the JSON string to sessionStorage
+        sessionStorage.setItem("roles", rolesJson);
         console.log(data.result.response.framework.board);
         localStorage.setItem(
           "defaultFramework",

diff --git a/packages/nulp_elite/src/components/domainCarousel.js b/packages/nulp_elite/src/components/domainCarousel.js
@@ -47,6 +47,12 @@ export default function DomainCarousel({
   const [activeDomain, setActiveDomain] = useState(null);
   const [scrolled, setScrolled] = useState(false);
   // const navigate = useNavigate();
+  const [userDomain, setUserDomain] = useState(null);
+
+  useEffect(() => {
+    const domain = sessionStorage.getItem("userDomain");
+    setUserDomain(domain);
+  }, []);
 
   const handleResize = () => {
     setIsMobile(window.innerWidth <= 767);
@@ -124,9 +130,9 @@ export default function DomainCarousel({
           <Carousel
             swipeable={true}
             draggable={true}
-            showDots={["mobile"]} // Show dots only if there are more than 4 items
+            showDots={["mobile"]}
             responsive={responsive}
-            ssr={true} // means to render carousel on server-side.
+            ssr={true}
             infinite={true}
             autoPlaySpeed={1000}
             keyBoardControl={true}
@@ -140,7 +146,11 @@ export default function DomainCarousel({
               itemsArray?.slice(0, 10).map((domain, index) => (
                 <Box
                   className={`my-class ${
-                    activeStates === index ? "carousel-active-ui" : ""
+                    activeStates === index
+                      ? "carousel-active-ui"
+                      : userDomain === domain.code
+                      ? "carousel-active-ui"
+                      : ""
                   }`}
                   onClick={(e) =>
                     handleDomainClick(domain.code, index, domain.name)
@@ -175,10 +185,7 @@ export default function DomainCarousel({
                   <Box sx={{ alignSelf: "center" }} className="cursor-pointer">
                     <Typography
                       level="title-md"
-                      style={{
-                        fontSize: "12px",
-                        textAlign: "center",
-                      }}
+                      style={{ fontSize: "12px", textAlign: "center" }}
                       className="domainText"
                     >
                       {domain.name}
@@ -192,7 +199,7 @@ export default function DomainCarousel({
         <>
           <Box className="carousel-bx scrolled">
             <Box className="text-white h5-title pl-20 pb-15">
-              Select your prefered domain :
+              Select your preferred domain:
             </Box>
 
             <Box
@@ -206,7 +213,11 @@ export default function DomainCarousel({
                 itemsArray?.slice(0, 10).map((domain, index) => (
                   <Box
                     className={`my-class ${
-                      activeStates === index ? "carousel-active-ui" : ""
+                      activeStates === index
+                        ? "carousel-active-ui"
+                        : userDomain === domain.code
+                        ? "carousel-active-ui"
+                        : ""
                     }`}
                     onClick={(e) =>
                       handleDomainClick(domain.code, index, domain.name)
@@ -219,24 +230,15 @@ export default function DomainCarousel({
                     onMouseEnter={(event) => handleMouseEnter(index)}
                     onMouseLeave={handleMouseLeave}
                   >
-                    <Box className=" cursor-pointer">
-                      <Box className=" cursor-pointer">
-                        {/* {(domain.image != undefined) && <img src={require(baseImgUrl+domain.image)}  style={{width:'40px',objectFit:'contain'}} alt={domain.name} />}
-                {(domain.image == undefined)&& <img src={require("../assets/swm.png")}  style={{width:'40px',objectFit:'contain'}} alt={domain.name} />} */}
-                        {/* <Tooltip title={domain.description}> */}
+                    <Box className="cursor-pointer">
+                      <Box className="cursor-pointer">
                         <img
                           className="domainHover"
                           src={require(`../assets/domainImgs${domain.image}`)}
                           alt={domain.name}
                         />
-
-                        {/* </Tooltip> */}
-
-                        {/* <img src={require("../assets/swm.png")}  style={{width:'40px',objectFit:'contain'}} alt={domain.name} /> */}
                       </Box>
-
-                      {/* {(activeDomain === index || activeStates === index) && ( */}
-                      <span className=" cursor-pointer domainText">
+                      <span className="cursor-pointer domainText">
                         {domain.name}
                       </span>
                       {/* )} */}

diff --git a/packages/nulp_elite/src/components/header.js b/packages/nulp_elite/src/components/header.js
@@ -55,7 +55,15 @@ function Header({ globalSearchQuery }) {
   const navigate = useNavigate();
   const _userId = util.userId();
   const [userData, setUserData] = useState(null);
-
+  const [roles, setRoles] = useState([]);
+  // Retrieve roles from sessionStorage
+  const rolesJson = sessionStorage.getItem("roles");
+  useEffect(() => {
+    if (rolesJson) {
+      const parsedRoles = JSON.parse(rolesJson);
+      setRoles(parsedRoles);
+    }
+  }, []);
   const handleOpenNavMenu = (event) => {
     setAnchorElNav(event.currentTarget);
   };
@@ -496,16 +504,20 @@ function Header({ globalSearchQuery }) {
                     {t("PROFILE")}
                   </Link>
                 </MenuItem>
-                <MenuItem>
-                  <Link
-                    target="_blank"
-                    href="https://nulp.niua.org/workspace/content/create"
-                    underline="none"
-                    textAlign="center"
-                  >
-                    {t("WORKSPACE")}
-                  </Link>
-                </MenuItem>
+                {/* Check if roles array is empty or contains "PUBLIC" */}
+                {(roles && roles.length === 0) ||
+                (roles.length === 1 && roles.includes("PUBLIC")) ? null : (
+                  <MenuItem>
+                    <Link
+                      target="_blank"
+                      href="/workspace/content/create"
+                      underline="none"
+                      textAlign="center"
+                    >
+                      {t("WORKSPACE")}
+                    </Link>
+                  </MenuItem>
+                )}
                 <MenuItem>
                   <Link
                     href={routeConfig.ROUTES.HELP_PAGE.HELP}
@@ -746,16 +758,20 @@ function Header({ globalSearchQuery }) {
                         {t("PROFILE")}
                       </Link>
                     </MenuItem>
-                    <MenuItem>
-                      <Link
-                        target="_blank"
-                        href="https://nulp.niua.org/workspace/content/create"
-                        underline="none"
-                        textAlign="center"
-                      >
-                        {t("WORKSPACE")}
-                      </Link>
-                    </MenuItem>
+                    {/* Check if roles array is empty or contains "PUBLIC" */}
+                    {(roles && roles.length === 0) ||
+                    (roles.length === 1 && roles.includes("PUBLIC")) ? null : (
+                      <MenuItem>
+                        <Link
+                          target="_blank"
+                          href="/workspace/content/create"
+                          underline="none"
+                          textAlign="center"
+                        >
+                          {t("WORKSPACE")}
+                        </Link>
+                      </MenuItem>
+                    )}
                     <MenuItem>
                       <Link
                         href={routeConfig.ROUTES.HELP_PAGE.HELP}

diff --git a/packages/nulp_elite/src/pages/content/AllContent.js b/packages/nulp_elite/src/pages/content/AllContent.js
@@ -36,7 +36,6 @@ import SkeletonLoader from "components/skeletonLoader";
 import NoResult from "./noResultFound";
 const routeConfig = require("../../configs/routeConfig.json");
 
-
 const responsiveCard = {
   superLargeDesktop: {
     breakpoint: { max: 4000, min: 3000 },
@@ -101,6 +100,11 @@ const AllContent = () => {
   };
 
   useEffect(() => {
+    const userDomain = sessionStorage.getItem("userDomain");
+    if (userDomain) {
+      setSelectedDomain(userDomain);
+      setDomainName(userDomain);
+    }
     fetchData();
     fetchDomains();
   }, []);
@@ -435,7 +439,7 @@ const AllContent = () => {
             );
           })
         ) : (
-         <NoResult />
+          <NoResult />
         )}
       </Container>
       <FloatingChatIcon />