Usertype removal - part 1 (PalisadoesFoundation#1858)

* delete org fix * refactor duplicate code files * refactor userType code in Users.tsx * userType fix App.test * fix leftdrawer * settings test * events n profile dropdown * rename file * Fix import casing in OrganizationScreen and SuperAdminScreen * Rename profileDropdown.module.css to ProfileDropdown.module.css * Rename profileDropdown.test.tsx to ProfileDropdown.test.tsx * Rename profileDropdown.tsx to ProfileDropdown.tsx * variable rename * remove unused code * fix test and remove userType in OrgSettings * Remove unnecessary beforeEach block in LeftDrawerOrg.test.tsx * superadmin screen test * unused code * login test data fix * unused * unused * fixed userType to userRole * Remove InterfaceQueryRequestListItem interface * deleteOrg test fix * typos * Update OrganizationDashboard.test.tsx * added files with eslint issue * Update pre-commit
akhilender-bongirwar · Apr 3, 2024 · 1d057d9 · 1d057d9
1 parent c328cfc
commit 1d057d9
Show file tree

Hide file tree

Showing 24 changed files with 53 additions and 247 deletions.
diff --git a/src/App.test.tsx b/src/App.test.tsx
@@ -48,7 +48,6 @@ const MOCKS = [
           phone: {
             mobile: '+8912313112',
           },
-          userType: 'SUPERADMIN',
         },
       },
     },

diff --git a/src/components/DeleteOrg/DeleteOrg.test.tsx b/src/components/DeleteOrg/DeleteOrg.test.tsx
@@ -116,7 +116,7 @@ afterEach(() => {
 describe('Delete Organization Component', () => {
   test('should be able to Toggle Delete Organization Modal', async () => {
     mockURL = '456';
-    setItem('UserType', 'SUPERADMIN');
+    setItem('SuperAdmin', true);
     render(
       <MockedProvider addTypename={false} link={link}>
         <BrowserRouter>
@@ -140,7 +140,7 @@ describe('Delete Organization Component', () => {
 
   test('should be able to Toggle Delete Organization Modal When Organization is Sample Organization', async () => {
     mockURL = '123';
-    setItem('UserType', 'SUPERADMIN');
+    setItem('SuperAdmin', true);
     render(
       <MockedProvider addTypename={false} link={link}>
         <BrowserRouter>
@@ -164,7 +164,7 @@ describe('Delete Organization Component', () => {
 
   test('Delete organization functionality should work properly', async () => {
     mockURL = '456';
-    setItem('UserType', 'SUPERADMIN');
+    setItem('SuperAdmin', true);
     render(
       <MockedProvider addTypename={false} link={link}>
         <BrowserRouter>
@@ -183,7 +183,7 @@ describe('Delete Organization Component', () => {
 
   test('Delete organization functionality should work properly for sample org', async () => {
     mockURL = '123';
-    setItem('UserType', 'SUPERADMIN');
+    setItem('SuperAdmin', true);
     render(
       <MockedProvider addTypename={false} link={link}>
         <BrowserRouter>
@@ -204,7 +204,7 @@ describe('Delete Organization Component', () => {
 
   test('Error handling for IS_SAMPLE_ORGANIZATION_QUERY mock', async () => {
     mockURL = '123';
-    setItem('UserType', 'SUPERADMIN');
+    setItem('SuperAdmin', true);
     jest.spyOn(toast, 'error');
     render(
       <MockedProvider addTypename={false} link={link2}>
@@ -228,7 +228,7 @@ describe('Delete Organization Component', () => {
 
   test('Error handling for DELETE_ORGANIZATION_MUTATION mock', async () => {
     mockURL = '456';
-    setItem('UserType', 'SUPERADMIN');
+    setItem('SuperAdmin', true);
     render(
       <MockedProvider addTypename={false} link={link2}>
         <BrowserRouter>

diff --git a/src/components/DeleteOrg/DeleteOrg.tsx b/src/components/DeleteOrg/DeleteOrg.tsx
@@ -21,7 +21,7 @@ function deleteOrg(): JSX.Element {
   const navigate = useNavigate();
   const [showDeleteModal, setShowDeleteModal] = useState(false);
   const { getItem } = useLocalStorage();
-  const canDelete = getItem('UserType') === 'SUPERADMIN';
+  const canDelete = getItem('SuperAdmin');
   const toggleDeleteModal = (): void => setShowDeleteModal(!showDeleteModal);
 
   const [del] = useMutation(DELETE_ORGANIZATION_MUTATION);
@@ -55,7 +55,7 @@ function deleteOrg(): JSX.Element {
           },
         });
         navigate('/orglist');
-      } catch (error: any) {
+      } catch (error) {
         errorHandler(t, error);
       }
     }

diff --git a/src/components/LeftDrawer/LeftDrawer.test.tsx b/src/components/LeftDrawer/LeftDrawer.test.tsx
@@ -62,9 +62,6 @@ afterEach(() => {
 });
 
 describe('Testing Left Drawer component for SUPERADMIN', () => {
-  beforeEach(() => {
-    setItem('UserType', 'SUPERADMIN');
-  });
   test('Component should be rendered properly', () => {
     setItem('UserImage', '');
     setItem('UserImage', '');
@@ -134,9 +131,6 @@ describe('Testing Left Drawer component for SUPERADMIN', () => {
 });
 
 describe('Testing Left Drawer component for ADMIN', () => {
-  beforeEach(() => {
-    setItem('UserType', 'ADMIN');
-  });
   test('Components should be rendered properly', () => {
     render(
       <MockedProvider addTypename={false} link={link}>

diff --git a/src/components/LeftDrawer/LeftDrawer.tsx b/src/components/LeftDrawer/LeftDrawer.tsx
@@ -19,7 +19,6 @@ const leftDrawer = ({ hideDrawer }: InterfaceLeftDrawerProps): JSX.Element => {
   const { t } = useTranslation('translation', { keyPrefix: 'leftDrawer' });
 
   const { getItem } = useLocalStorage();
-  const userType = getItem('UserType');
   const superAdmin = getItem('SuperAdmin');
   const role = superAdmin ? 'SuperAdmin' : 'Admin';
 

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
@@ -259,10 +259,6 @@ const linkImage = new StaticMockLink(MOCKS_WITH_IMAGE, true);
 const linkEmpty = new StaticMockLink(MOCKS_EMPTY, true);
 
 describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
-  beforeEach(() => {
-    setItem('UserType', 'SUPERADMIN');
-  });
-
   test('Component should be rendered properly', async () => {
     setItem('UserImage', '');
     setItem('SuperAdmin', true);

diff --git a/src/components/OrganizationScreen/OrganizationScreen.tsx b/src/components/OrganizationScreen/OrganizationScreen.tsx
@@ -7,7 +7,7 @@ import { updateTargets } from 'state/action-creators';
 import type { RootState } from 'state/reducers';
 import type { TargetsType } from 'state/reducers/routesReducer';
 import styles from './OrganizationScreen.module.css';
-import ProfileDropdown from 'components/ProfileDropdown/profileDropdown';
+import ProfileDropdown from 'components/ProfileDropdown/ProfileDropdown';
 
 const OrganizationScreen = (): JSX.Element => {
   const location = useLocation();

diff --git a/...rofileDropdown/profileDropdown.module.css → ...rofileDropdown/ProfileDropdown.module.css b/...rofileDropdown/profileDropdown.module.css → ...rofileDropdown/ProfileDropdown.module.css
diff --git a/.../ProfileDropdown/profileDropdown.test.tsx → .../ProfileDropdown/ProfileDropdown.test.tsx b/.../ProfileDropdown/profileDropdown.test.tsx → .../ProfileDropdown/ProfileDropdown.test.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { BrowserRouter } from 'react-router-dom';
-import ProfileDropdown from './profileDropdown';
+import ProfileDropdown from './ProfileDropdown';
 import 'jest-localstorage-mock';
 import { MockedProvider } from '@apollo/react-testing';
 import { REVOKE_REFRESH_TOKEN } from 'GraphQl/Mutations/mutations';

diff --git a/...nents/ProfileDropdown/profileDropdown.tsx → ...nents/ProfileDropdown/ProfileDropdown.tsx b/...nents/ProfileDropdown/profileDropdown.tsx → ...nents/ProfileDropdown/ProfileDropdown.tsx
@@ -1,9 +1,9 @@
 import Avatar from 'components/Avatar/Avatar';
 import React from 'react';
 import { ButtonGroup, Dropdown } from 'react-bootstrap';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
 import useLocalStorage from 'utils/useLocalstorage';
-import styles from './profileDropdown.module.css';
+import styles from './ProfileDropdown.module.css';
 import { REVOKE_REFRESH_TOKEN } from 'GraphQl/Mutations/mutations';
 import { useMutation } from '@apollo/client';
 
@@ -12,7 +12,7 @@ const profileDropdown = (): JSX.Element => {
   const { getItem } = useLocalStorage();
   const superAdmin = getItem('SuperAdmin');
   const adminFor = getItem('AdminFor');
-  const userType = superAdmin
+  const userRole = superAdmin
     ? 'SuperAdmin'
     : adminFor?.length > 0
       ? 'Admin'
@@ -67,7 +67,7 @@ const profileDropdown = (): JSX.Element => {
             {displayedName}
           </span>
           <span className={styles.secondaryText} data-testid="display-type">
-            {`${userType}`}
+            {`${userRole}`}
           </span>
         </div>
       </div>

diff --git a/src/components/RequestsTableItem/RequestsTableItem.test.tsx b/src/components/RequestsTableItem/RequestsTableItem.test.tsx
@@ -32,7 +32,6 @@ jest.mock('react-toastify', () => ({
 }));
 
 beforeEach(() => {
-  setItem('UserType', 'ADMIN');
   setItem('id', '123');
 });
 

diff --git a/src/components/SuperAdminScreen/SuperAdminScreen.test.tsx b/src/components/SuperAdminScreen/SuperAdminScreen.test.tsx
@@ -23,8 +23,6 @@ const clickToggleMenuBtn = (toggleButton: HTMLElement): void => {
 
 describe('Testing LeftDrawer in SuperAdminScreen', () => {
   test('Testing LeftDrawer in page functionality', async () => {
-    setItem('UserType', 'SUPERADMIN');
-
     render(
       <MockedProvider addTypename={false}>
         <BrowserRouter>

diff --git a/src/components/SuperAdminScreen/SuperAdminScreen.tsx b/src/components/SuperAdminScreen/SuperAdminScreen.tsx
@@ -4,7 +4,7 @@ import Button from 'react-bootstrap/Button';
 import { useTranslation } from 'react-i18next';
 import { Outlet, useLocation } from 'react-router-dom';
 import styles from './SuperAdminScreen.module.css';
-import ProfileDropdown from 'components/ProfileDropdown/profileDropdown';
+import ProfileDropdown from 'components/ProfileDropdown/ProfileDropdown';
 
 const superAdminScreen = (): JSX.Element => {
   const location = useLocation();
@@ -71,7 +71,10 @@ const superAdminScreen = (): JSX.Element => {
 
 export default superAdminScreen;
 
-const map: any = {
+const map: Record<
+  string,
+  'orgList' | 'requests' | 'users' | 'memberDetail' | 'communityProfile'
+> = {
   orglist: 'orgList',
   requests: 'requests',
   users: 'users',

diff --git a/src/components/UserPortal/Login/Login.test.tsx b/src/components/UserPortal/Login/Login.test.tsx
@@ -61,13 +61,15 @@ const MOCKS = [
         login: {
           user: {
             _id: '1',
-            userType: 'ADMIN',
-            adminApproved: false,
             firstName: 'firstname',
             lastName: 'secondname',
             email: '[email protected]',
             image: 'image',
           },
+          appUserProfile: {
+            adminFor: {},
+            isSuperAdmin: false,
+          },
           accessToken: 'accessToken',
           refreshToken: 'refreshToken',
         },

diff --git a/src/components/UserPortal/StartPostModal/StartPostModal.test.tsx b/src/components/UserPortal/StartPostModal/StartPostModal.test.tsx
@@ -72,7 +72,6 @@ const renderStartPostModal = (
         lastName: 'dsza',
         email: '[email protected]',
         appLanguageCode: 'en',
-        userType: 'USER',
         pluginCreationAllowed: true,
         adminApproved: true,
         createdAt: '2023-02-18T09:22:27.969Z',

diff --git a/src/screens/MemberDetail/MemberDetail.test.tsx b/src/screens/MemberDetail/MemberDetail.test.tsx
@@ -12,11 +12,6 @@ import { BrowserRouter } from 'react-router-dom';
 import { Provider } from 'react-redux';
 import { store } from 'state/store';
 import { I18nextProvider } from 'react-i18next';
-import {
-  ADD_ADMIN_MUTATION,
-  UPDATE_USERTYPE_MUTATION,
-  UPDATE_USER_MUTATION,
-} from 'GraphQl/Mutations/mutations';
 import { USER_DETAILS } from 'GraphQl/Queries/Queries';
 import i18nForTest from 'utils/i18nForTest';
 import { StaticMockLink } from 'utils/StaticMockLink';
@@ -120,20 +115,6 @@ const MOCKS1 = [
       },
     },
   },
-  {
-    request: {
-      query: ADD_ADMIN_MUTATION,
-      variables: {
-        userid: '123',
-        orgid: '456',
-      },
-    },
-    result: {
-      data: {
-        success: true,
-      },
-    },
-  },
 ];
 
 const MOCKS2 = [
@@ -224,20 +205,6 @@ const MOCKS2 = [
       },
     },
   },
-  {
-    request: {
-      query: ADD_ADMIN_MUTATION,
-      variables: {
-        userid: '123',
-        orgid: '456',
-      },
-    },
-    result: {
-      data: {
-        success: true,
-      },
-    },
-  },
 ];
 const MOCKS3 = [
   {
@@ -327,20 +294,6 @@ const MOCKS3 = [
       },
     },
   },
-  {
-    request: {
-      query: ADD_ADMIN_MUTATION,
-      variables: {
-        userid: '123',
-        orgid: '456',
-      },
-    },
-    result: {
-      data: {
-        success: true,
-      },
-    },
-  },
 ];
 
 const link1 = new StaticMockLink(MOCKS1, true);

diff --git a/src/screens/MemberDetail/MemberDetail.tsx b/src/screens/MemberDetail/MemberDetail.tsx
@@ -28,7 +28,7 @@ import {
   maritalStatusEnum,
   genderEnum,
   employmentStatusEnum,
-} from 'utils/memberFields';
+} from 'utils/formEnumFields';
 import DynamicDropDown from 'components/DynamicDropDown/DynamicDropDown';
 
 type MemberDetailProps = {

diff --git a/src/screens/OrgSettings/OrgSettings.test.tsx b/src/screens/OrgSettings/OrgSettings.test.tsx
@@ -112,7 +112,7 @@ describe('Organisation Settings Page', () => {
 
   test('should render props and text elements test for the screen', async () => {
     window.location.assign('/orgsetting/id=123');
-    setItem('UserType', 'SUPERADMIN');
+    setItem('SuperAdmin', true);
     render(
       <MockedProvider addTypename={false} link={link}>
         <BrowserRouter>
@@ -140,7 +140,7 @@ describe('Organisation Settings Page', () => {
 
   test('should render appropriate settings based on the orgSetting state', async () => {
     window.location.assign('/orgsetting/id=123');
-    setItem('UserType', 'SUPERADMIN');
+    setItem('SuperAdmin', true);
 
     const { queryByText } = render(
       <MockedProvider addTypename={false} link={link}>

diff --git a/src/screens/OrganizationEvents/OrganizationEvents.tsx b/src/screens/OrganizationEvents/OrganizationEvents.tsx
@@ -114,7 +114,13 @@ function organizationEvents(): JSX.Element {
   });
 
   const userId = getItem('id') as string;
-  const userRole = getItem('UserType') as string;
+  const superAdmin = getItem('SuperAdmin');
+  const adminFor = getItem('AdminFor');
+  const userRole = superAdmin
+    ? 'SUPERADMIN'
+    : adminFor?.length > 0
+      ? 'ADMIN'
+      : 'USER';
 
   const [create, { loading: loading2 }] = useMutation(CREATE_EVENT_MUTATION);
 

diff --git a/src/screens/Requests/Requests.test.tsx b/src/screens/Requests/Requests.test.tsx
@@ -69,7 +69,6 @@ describe('Testing Requests screen', () => {
 
   test(`Component should be rendered properly when user is not Admin
   and or userId does not exists in localstorage`, async () => {
-    setItem('UserType', 'SUPERADMIN');
     setItem('id', '');
     render(
       <MockedProvider addTypename={false} link={link}>

diff --git a/src/screens/UserPortal/Settings/Settings.test.tsx b/src/screens/UserPortal/Settings/Settings.test.tsx
@@ -65,7 +65,6 @@ const Mocks1 = [
             mobile: '+174567890',
           },
           image: 'https://api.dicebear.com/5.x/initials/svg?seed=John%20Doe',
-          userType: 'user',
           _id: '65ba1621b7b00c20e5f1d8d2',
         },
       },
@@ -98,7 +97,6 @@ const Mocks2 = [
             mobile: '',
           },
           image: '',
-          userType: 'user',
           _id: '65ba1621b7b00c20e5f1d8d2',
         },
       },