Merge pull request #628 from tekdi/main-learner

Main learner qa

Author: rushi-tekdi

apps/learner-web-app/src/app/profile/page.tsx

@@ -17,8 +17,10 @@ type FilterDetails = {
 const ProfilePage = () => {
   const [filters] = useState<FilterDetails>({
     status: ['completed', 'viewCertificate'],
-    tenantId: localStorage.getItem('tenantId') || '',
-    userId: localStorage.getItem('userId') || '',
+    tenantId:
+      (typeof window !== 'undefined' && localStorage.getItem('tenantId')) || '',
+    userId:
+      (typeof window !== 'undefined' && localStorage.getItem('userId')) || '',
   });
   const [showCertificate, setShowCertificate] = useState(false);
   const [certificateId, setCertificateId] = useState('');

libs/shared-lib-v2/src/lib/Header/TopAppBar.tsx

@@ -13,7 +13,8 @@ import {
 } from '@mui/material';
 import MenuIcon from '@mui/icons-material/Menu';
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
-import { CommonDrawer, DrawerItemProp } from '../Drawer/CommonDrawer';
+import { CommonDrawer } from '../Drawer/CommonDrawer';
+import type { DrawerItemProp } from '../Drawer/CommonDrawer';
 
 interface NewDrawerItemProp extends DrawerItemProp {
   variant?: 'contained' | 'text';

libs/shared-lib/src/lib/Drawer/CommonDrawer.tsx

@@ -11,7 +11,11 @@ interface DrawerItem {
   icon?: React.ReactNode;
   to: string;
 }
-
+export interface DrawerItemProp {
+  title: React.ReactNode;
+  icon?: React.ReactNode;
+  to: string | ((event: React.MouseEvent<HTMLAnchorElement>) => void);
+}
 interface CommonDrawerProps {
   open: boolean;
   onDrawerClose: () => void;

libs/shared-lib/src/lib/Header/TopAppBar.tsx

@@ -12,7 +12,8 @@ import {
 } from '@mui/material';
 import MenuIcon from '@mui/icons-material/Menu';
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
-import { CommonDrawer, DrawerItemProp } from '../Drawer/CommonDrawer';
+import { CommonDrawer } from '../Drawer/CommonDrawer';
+import type { DrawerItemProp } from '../Drawer/CommonDrawer';
 
 interface NewDrawerItemProp extends DrawerItemProp {
   variant?: 'contained' | 'text';
@@ -147,6 +148,8 @@ const DesktopBar = ({
           return (
             <Button
               key={index}
+              // @ts-ignore
+
               variant={
                 link.variant ??
                 (link.isActive ? 'top-bar-link-button' : 'top-bar-link-text')
@@ -240,12 +243,14 @@ const MobileTopBar = ({
       <CommonDrawer
         open={isDrawerOpen}
         onDrawerClose={() => setIsDrawerOpen(false)}
+        // @ts-ignore
+
         items={navLinks}
         onItemClick={(to) => {
           setIsDrawerOpen(false);
         }}
         topElement={<Brand {..._brand} />}
-      />
+    />
     </Box>
   );
 };