Admin dev2

src/common/Header.jsx

@@ -208,7 +208,7 @@ const Header = () => {
                 <>
                   <Typography variant="body1">
                     <NavLink
-                      to={`/my-organization/${userData?.organization?.id}`}
+                      to={`/my-organization/${localStorage.getItem("id")}`}
                       className={({ isActive }) =>
                         isActive
                           ? `${classes.highlightedMenu} organizations`
@@ -220,7 +220,7 @@ const Header = () => {
                   </Typography>
                   <Typography variant="body1">
                   <NavLink
-                    to={`/task-list`}
+                    to={`/task-list/${localStorage.getItem("id")?localStorage.getItem("id"):1}`}
                     className={({ isActive }) =>
                       isActive
                         ? `${classes.highlightedMenu} task-list`

src/common/MobileNavbar.jsx

@@ -30,14 +30,14 @@ function MobileNavbar({ UserMenu, SettingsMenu, userData }) {
     {
       name: "Organizations",
       onClick: () => {
-        navigate(`/my-organization/${userData?.organization?.id}`);
+        navigate(`/my-organization/${localStorage.getItem("id")}`);
         setOpenDrawer(false);
       },
     },
     {
       name: "Tasks",
       onClick: () => {
-        navigate(`/task-list`);
+        navigate(`/task-list/${localStorage.getItem("id")}`);
         setOpenDrawer(false);
       },
     },

src/containers/Organization/MyOrganization.jsx

@@ -17,8 +17,6 @@ import {
 
 //Styles
 import { DatasetStyle } from "styles";
-
-//Components
 import {
   Box,
   Card,
@@ -76,6 +74,7 @@ const MyOrganization = () => {
   const organizationDetails = useSelector(
     (state) => state.getOrganizationDetails.data
   );
+  localStorage.setItem("id",id)
   const projectList = useSelector((state) => state.getProjectList.data);
   const userData = useSelector((state) => state.getLoggedInUserDetails.data);
   const usersList = useSelector((state) => state.getOrganizatioUsers.data);

src/containers/Organization/OrgLevelTaskList.jsx

@@ -155,7 +155,6 @@ const OrgLevelTaskList = () => {
   const [bulkSubtitleAlert, setBulkSubtitleAlert] = useState(false);
   const [bulkSubtitleAlertData, setBulkSubtitleAlertData] = useState({});
 
-  //Server Side Pagination States
   const [offset, setOffset] = useState(0);
   const [limit, setLimit] = useState(10);
   const [searchAnchor, setSearchAnchor] = useState(null);
@@ -175,7 +174,6 @@ const OrgLevelTaskList = () => {
 
   const apiStatus = useSelector((state) => state.apiStatus);
 
-  //Fiters and Search
   const orgSelectedFilters = useSelector(
     (state) => state.orgTaskFilters.orgSelectedFilters
   );
@@ -352,7 +350,7 @@ const OrgLevelTaskList = () => {
     }, {});
 
     const apiObj = new FetchPaginatedOrgTaskListAPI(
-      orgId,
+      localStorage.getItem("id"),
       offset + 1,
       limit,
       searchRequest,

src/containers/Organization/Video/RightPanel.jsx

@@ -73,8 +73,7 @@ const RightPanel = ({ currentIndex, currentSubs,setCurrentIndex, showTimeline, s
 
   const [selection, setselection] = useState(false);
   const taskData = useSelector((state) => state.getTaskDetails.data);
-  const assignedOrgId = JSON.parse(localStorage.getItem("userData"))
-    ?.organization?.id;
+  const assignedOrgId = JSON.parse(localStorage.getItem("id"))
   const subtitles = useSelector((state) => state.commonReducer.subtitles);
   const player = useSelector((state) => state.commonReducer.player);
   const totalPages = useSelector((state) => state.commonReducer.totalPages);

src/containers/Organization/Video/TranslationRightPanel.jsx

@@ -63,8 +63,7 @@ const TranslationRightPanel = ({ currentIndex, currentSubs,setCurrentIndex, show
   const textboxes = useRef([]);
 
   const taskData = useSelector((state) => state.getTaskDetails.data);
-  const assignedOrgId = JSON.parse(localStorage.getItem("userData"))
-    ?.organization?.id;
+  const assignedOrgId = JSON.parse(localStorage.getItem("id"));
   const subtitles = useSelector((state) => state.commonReducer.subtitles);
   const player = useSelector((state) => state.commonReducer.player);
   const totalPages = useSelector((state) => state.commonReducer.totalPages);

src/containers/Organization/Video/VoiceOverRightPanel.jsx

@@ -61,8 +61,7 @@ const VoiceOverRightPanel = ({ setCurrentIndex }) => {
   const $audioRef = useRef([]);
 
   const taskData = useSelector((state) => state.getTaskDetails.data);
-  const assignedOrgId = JSON.parse(localStorage.getItem("userData"))
-    ?.organization?.id;
+  const assignedOrgId = JSON.parse(localStorage.getItem("id"))
   const subtitles = useSelector((state) => state.commonReducer.subtitles);
   const player = useSelector((state) => state.commonReducer.player);
   const subtitlesForCheck = useSelector(

src/containers/Organization/Video/VoiceOverRightPanel1.jsx

@@ -74,8 +74,7 @@ const VoiceOverRightPanel1 = ({ currentIndex, setCurrentIndex, showTimeline, seg
   const $audioRef = useRef([]);
 
   const taskData = useSelector((state) => state.getTaskDetails.data);
-  const assignedOrgId = JSON.parse(localStorage.getItem("userData"))
-    ?.organization?.id;
+  const assignedOrgId = JSON.parse(localStorage.getItem("id"))
   const subtitles = useSelector((state) => state.commonReducer.subtitles);
   const player = useSelector((state) => state.commonReducer.player);
   const subtitlesForCheck = useSelector(

src/utils/userDetails.js

@@ -1,4 +1,4 @@
-import ganavi from "../assets/profileImages/Ganavi.png";
+// import ganavi from "../assets/profileImages/Ganavi.png";
 
 const teamDetails = [
   // {

src/web.route.js

@@ -84,7 +84,7 @@ const RootRouter = () => {
           )}
         />
         <Route
-          path="/task-list"
+          path="/task-list/:id"
           element={ProtectedRouteWrapper(
             <Layout component={<OrgLevelTaskList />} />
           )}