+ {!isLoading &&
+ (!orgsData?.organizationsConnection ||
+ orgsData.organizationsConnection.length === 0) &&
+ searchByName.length === 0 &&
+ (!userData || adminFor.length === 0 || superAdmin) ? (
+
+ );
+};
+
+export default MemberOrganization;
diff --git a/src/components/OrgListCard/OrgListCard.test.tsx b/src/components/OrgListCard/OrgListCard.test.tsx
index 4072265ea4..be780fb402 100644
--- a/src/components/OrgListCard/OrgListCard.test.tsx
+++ b/src/components/OrgListCard/OrgListCard.test.tsx
@@ -71,6 +71,8 @@ const props: InterfaceOrgListCardProps = {
firstName: 'John',
lastName: 'Doe',
},
+ blockedUsers: [],
+ description: '',
},
};
diff --git a/src/components/OrgListCard/OrgListCard.tsx b/src/components/OrgListCard/OrgListCard.tsx
index 10365d2364..47440b6880 100644
--- a/src/components/OrgListCard/OrgListCard.tsx
+++ b/src/components/OrgListCard/OrgListCard.tsx
@@ -61,8 +61,6 @@ function orgListCard(props: InterfaceOrgListCardProps): JSX.Element {
// Handle click event to navigate to the organization dashboard
function handleClick(): void {
const url = '/orgdash/' + _id;
-
- // Dont change the below two lines
navigate(url);
}
diff --git a/src/components/OrgMemberDetail/OrgMemberDetail.module.css b/src/components/OrgMemberDetail/OrgMemberDetail.module.css
new file mode 100644
index 0000000000..85e8465349
--- /dev/null
+++ b/src/components/OrgMemberDetail/OrgMemberDetail.module.css
@@ -0,0 +1,217 @@
+.mainpage {
+ display: flex;
+ flex-direction: row;
+}
+
+form label {
+ font-weight: bold;
+ padding-bottom: 1px;
+ font-size: 14px;
+ color: #707070;
+}
+
+form > input {
+ display: block;
+ margin-bottom: 20px;
+ border: 1px solid #e8e5e5;
+ box-shadow: 2px 1px #e8e5e5;
+ padding: 10px 20px;
+ border-radius: 5px;
+ background: none;
+ width: 100%;
+ transition: all 0.3s ease-in-out;
+ -webkit-transition: all 0.3s ease-in-out;
+ -moz-transition: all 0.3s ease-in-out;
+ -ms-transition: all 0.3s ease-in-out;
+ -o-transition: all 0.3s ease-in-out;
+}
+
+.mainpageright > hr {
+ margin-top: 20px;
+ width: 100%;
+ margin-left: -15px;
+ margin-right: -15px;
+ margin-bottom: 20px;
+}
+
+@media screen and (max-width: 1200px) {
+ .mainpageright {
+ width: 100%;
+ }
+}
+
+.orgphoto {
+ margin-top: 5px;
+}
+
+.orgphoto > input {
+ margin-top: 10px;
+ cursor: pointer;
+ margin-bottom: 5px;
+}
+
+.greenregbtn {
+ margin: 1rem 0 0;
+ margin-top: 10px;
+ border: 1px solid #e8e5e5;
+ box-shadow: 0 2px 2px #e8e5e5;
+ padding: 10px 10px;
+ border-radius: 5px;
+ background-color: #31bb6b;
+ width: 100%;
+ font-size: 16px;
+ color: white;
+ outline: none;
+ font-weight: 600;
+ cursor: pointer;
+ transition:
+ transform 0.2s,
+ box-shadow 0.2s;
+ width: 100%;
+}
+
+.loader,
+.loader:after {
+ border-radius: 50%;
+ width: 10em;
+ height: 10em;
+}
+
+.loader {
+ margin: 60px auto;
+ margin-top: 35vh !important;
+ font-size: 10px;
+ position: relative;
+ text-indent: -9999em;
+ border-top: 1.1em solid rgba(255, 255, 255, 0.2);
+ border-right: 1.1em solid rgba(255, 255, 255, 0.2);
+ border-bottom: 1.1em solid rgba(255, 255, 255, 0.2);
+ border-left: 1.1em solid #febc59;
+ -webkit-transform: translateZ(0);
+ -ms-transform: translateZ(0);
+ transform: translateZ(0);
+ -webkit-animation: load8 1.1s infinite linear;
+ animation: load8 1.1s infinite linear;
+}
+
+@-webkit-keyframes load8 {
+ 0% {
+ -webkit-transform: rotate(0deg);
+ transform: rotate(0deg);
+ }
+
+ 100% {
+ -webkit-transform: rotate(360deg);
+ transform: rotate(360deg);
+ }
+}
+
+@keyframes load8 {
+ 0% {
+ -webkit-transform: rotate(0deg);
+ transform: rotate(0deg);
+ }
+
+ 100% {
+ -webkit-transform: rotate(360deg);
+ transform: rotate(360deg);
+ }
+}
+
+.dispflex {
+ display: flex;
+}
+
+.dispflex > input {
+ width: 20%;
+ border: none;
+ box-shadow: none;
+ margin-top: 5px;
+}
+
+.userImage {
+ width: 180px;
+ height: 180px;
+ object-fit: cover;
+ border-radius: 8px;
+}
+
+@media only screen and (max-width: 1200px) {
+ .userImage {
+ width: 100px;
+ height: 100px;
+ }
+}
+
+.topRadius {
+ border-top-left-radius: 16px;
+ border-top-right-radius: 16px;
+}
+
+.inputColor {
+ background: #f1f3f6;
+}
+
+.width60 {
+ width: 60%;
+}
+
+.maxWidth40 {
+ max-width: 40%;
+}
+
+.allRound {
+ border-radius: 16px;
+}
+
+.WidthFit {
+ width: fit-content;
+}
+
+.datebox {
+ border-radius: 7px;
+ border-color: #e8e5e5;
+ outline: none;
+ box-shadow: none;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ padding-right: 5px;
+ padding-left: 5px;
+ margin-right: 5px;
+ margin-left: 5px;
+}
+
+.datebox > div > input {
+ padding: 0.5rem 0 0.5rem 0.5rem !important; /* top, right, bottom, left */
+ background-color: #f1f3f6;
+ border-radius: var(--bs-border-radius) !important;
+ border: none !important;
+}
+
+.datebox > div > div {
+ margin-left: 0px !important;
+}
+
+.datebox > div > fieldset {
+ border: none !important;
+ /* background-color: #f1f3f6; */
+ border-radius: var(--bs-border-radius) !important;
+}
+
+.datebox > div {
+ margin: 0.5rem !important;
+ background-color: #f1f3f6;
+}
+
+input::file-selector-button {
+ background-color: black;
+ color: white;
+}
+
+.noOutline {
+ outline: none;
+}
+
+.Outline {
+ outline: 1px solid var(--bs-gray-400);
+}
diff --git a/src/components/OrgMemberDetail/OrgMemberDetails.test.tsx b/src/components/OrgMemberDetail/OrgMemberDetails.test.tsx
new file mode 100644
index 0000000000..fc89f2e075
--- /dev/null
+++ b/src/components/OrgMemberDetail/OrgMemberDetails.test.tsx
@@ -0,0 +1,606 @@
+import React from 'react';
+import {
+ act,
+ fireEvent,
+ render,
+ screen,
+ waitFor,
+} from '@testing-library/react';
+import { MockedProvider } from '@apollo/react-testing';
+import userEvent from '@testing-library/user-event';
+import { BrowserRouter } from 'react-router-dom';
+import { Provider } from 'react-redux';
+import { store } from 'state/store';
+import { I18nextProvider } from 'react-i18next';
+import { USER_DETAILS } from 'GraphQl/Queries/Queries';
+import i18nForTest from 'utils/i18nForTest';
+import { StaticMockLink } from 'utils/StaticMockLink';
+import OrgMemberDetail, {
+ getLanguageName,
+ prettyDate,
+} from './OrgMemberDetails';
+import { toast } from 'react-toastify';
+
+const MOCKS1 = [
+ {
+ request: {
+ query: USER_DETAILS,
+ variables: {
+ id: 'rishav-jha-mech',
+ },
+ },
+ result: {
+ data: {
+ user: {
+ __typename: 'UserData',
+ appUserProfile: {
+ _id: '1',
+ __typename: 'AppUserProfile',
+ adminFor: [
+ {
+ __typename: 'Organization',
+ _id: '65e0df0906dd1228350cfd4a',
+ },
+ {
+ __typename: 'Organization',
+ _id: '65e0e2abb92c9f3e29503d4e',
+ },
+ ],
+ isSuperAdmin: false,
+ appLanguageCode: 'en',
+ createdEvents: [
+ {
+ __typename: 'Event',
+ _id: '65e32a5b2a1f4288ca1f086a',
+ },
+ ],
+ createdOrganizations: [
+ {
+ __typename: 'Organization',
+ _id: '65e0df0906dd1228350cfd4a',
+ },
+ {
+ __typename: 'Organization',
+ _id: '65e0e2abb92c9f3e29503d4e',
+ },
+ ],
+ eventAdmin: [
+ {
+ __typename: 'Event',
+ _id: '65e32a5b2a1f4288ca1f086a',
+ },
+ ],
+ pluginCreationAllowed: true,
+ },
+ user: {
+ _id: '1',
+ __typename: 'User',
+ createdAt: '2024-02-26T10:36:33.098Z',
+ email: 'adi790u@gmail.com',
+ firstName: 'Aditya',
+ image: null,
+ lastName: 'Agarwal',
+ gender: '',
+ birthDate: '2024-03-14',
+ educationGrade: '',
+ employmentStatus: '',
+ maritalStatus: '',
+ address: {
+ line1: '',
+ countryCode: '',
+ city: '',
+ state: '',
+ },
+ phone: {
+ mobile: '',
+ },
+ joinedOrganizations: [
+ {
+ __typename: 'Organization',
+ _id: '65e0df0906dd1228350cfd4a',
+ },
+ {
+ __typename: 'Organization',
+ _id: '65e0e2abb92c9f3e29503d4e',
+ },
+ ],
+ membershipRequests: [],
+ organizationsBlockedBy: [],
+ registeredEvents: [
+ {
+ __typename: 'Event',
+ _id: '65e32a5b2a1f4288ca1f086a',
+ },
+ ],
+ },
+ },
+ },
+ },
+ },
+];
+
+const MOCKS2 = [
+ {
+ request: {
+ query: USER_DETAILS,
+ variables: {
+ id: 'rishav-jha-mech',
+ },
+ },
+ result: {
+ data: {
+ user: {
+ __typename: 'UserData',
+ appUserProfile: {
+ _id: '1',
+ __typename: 'AppUserProfile',
+ adminFor: [],
+ isSuperAdmin: false,
+ appLanguageCode: 'en',
+ createdEvents: [
+ {
+ __typename: 'Event',
+ _id: '65e32a5b2a1f4288ca1f086a',
+ },
+ ],
+ createdOrganizations: [
+ {
+ __typename: 'Organization',
+ _id: '65e0df0906dd1228350cfd4a',
+ },
+ {
+ __typename: 'Organization',
+ _id: '65e0e2abb92c9f3e29503d4e',
+ },
+ ],
+ eventAdmin: [
+ {
+ __typename: 'Event',
+ _id: '65e32a5b2a1f4288ca1f086a',
+ },
+ ],
+ pluginCreationAllowed: true,
+ },
+ user: {
+ _id: '1',
+ __typename: 'User',
+ createdAt: '2024-02-26T10:36:33.098Z',
+ email: 'adi790u@gmail.com',
+ firstName: 'Aditya',
+ image: 'https://placeholder.com/200x200',
+ lastName: 'Agarwal',
+ gender: '',
+ birthDate: '2024-03-14',
+ educationGrade: '',
+ employmentStatus: '',
+ maritalStatus: '',
+ address: {
+ line1: '',
+ countryCode: '',
+ city: '',
+ state: '',
+ },
+ phone: {
+ mobile: '',
+ },
+ joinedOrganizations: [
+ {
+ __typename: 'Organization',
+ _id: '65e0df0906dd1228350cfd4a',
+ },
+ {
+ __typename: 'Organization',
+ _id: '65e0e2abb92c9f3e29503d4e',
+ },
+ ],
+ membershipRequests: [],
+ organizationsBlockedBy: [],
+ registeredEvents: [
+ {
+ __typename: 'Event',
+ _id: '65e32a5b2a1f4288ca1f086a',
+ },
+ ],
+ },
+ },
+ },
+ },
+ },
+];
+
+const MOCKS3 = [
+ {
+ request: {
+ query: USER_DETAILS,
+ variables: {
+ id: 'rishav-jha-mech',
+ },
+ },
+ result: {
+ data: {
+ user: {
+ __typename: 'UserData',
+ appUserProfile: {
+ _id: '1',
+ __typename: 'AppUserProfile',
+ adminFor: [],
+ isSuperAdmin: true,
+ appLanguageCode: 'en',
+ createdEvents: [
+ {
+ __typename: 'Event',
+ _id: '65e32a5b2a1f4288ca1f086a',
+ },
+ ],
+ createdOrganizations: [
+ {
+ __typename: 'Organization',
+ _id: '65e0df0906dd1228350cfd4a',
+ },
+ {
+ __typename: 'Organization',
+ _id: '65e0e2abb92c9f3e29503d4e',
+ },
+ ],
+ eventAdmin: [
+ {
+ __typename: 'Event',
+ _id: '65e32a5b2a1f4288ca1f086a',
+ },
+ ],
+ pluginCreationAllowed: true,
+ },
+ user: {
+ _id: '1',
+ __typename: 'User',
+ createdAt: '2024-02-26T10:36:33.098Z',
+ email: 'adi790u@gmail.com',
+ firstName: 'Aditya',
+ image: 'https://placeholder.com/200x200',
+ lastName: 'Agarwal',
+ gender: '',
+ birthDate: '2024-03-14',
+ educationGrade: '',
+ employmentStatus: '',
+ maritalStatus: '',
+ address: {
+ line1: '',
+ countryCode: '',
+ city: '',
+ state: '',
+ },
+ phone: {
+ mobile: '',
+ },
+ joinedOrganizations: [
+ {
+ __typename: 'Organization',
+ _id: '65e0df0906dd1228350cfd4a',
+ },
+ {
+ __typename: 'Organization',
+ _id: '65e0e2abb92c9f3e29503d4e',
+ },
+ ],
+ membershipRequests: [],
+ organizationsBlockedBy: [],
+ registeredEvents: [
+ {
+ __typename: 'Event',
+ _id: '65e32a5b2a1f4288ca1f086a',
+ },
+ ],
+ },
+ },
+ },
+ },
+ },
+];
+
+const link1 = new StaticMockLink(MOCKS1, true);
+const link2 = new StaticMockLink(MOCKS2, true);
+const link3 = new StaticMockLink(MOCKS3, true);
+
+async function wait(ms = 20): Promise
+
+ ) : !isLoading &&
+ orgsData?.organizationsConnection.length == 0 &&
+ /* istanbul ignore next */
+ searchByName.length > 0 ? (
+ /* istanbul ignore next */
+ {t('noOrgErrorTitle')}
+{t('noOrgErrorDescription')}
+
+
+ ) : (
+ + {tCommon('noResultsFoundFor')} "{searchByName}" +
+
+
+ {[...Array(perPageResult)].map((_, index) => (
+
+ {isLoading && (
+ <>
+ {[...Array(perPageResult)].map((_, index) => (
+
+ )}
+
+
+ ))}
+
+ }
+ hasMore={hasMore}
+ className={styles.listBox}
+ data-testid="organizations-list"
+ endMessage={
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+ >
+ {userData && superAdmin
+ ? orgsData?.organizationsConnection.map((item) => {
+ return (
+ {tCommon('endOfResults')}
+
+ {/*
+ );
+ })
+ : userData &&
+ adminFor.length > 0 &&
+ orgsData?.organizationsConnection.map((item) => {
+ if (isAdminForCurrentOrg(item) && item._id == currentUrl) {
+ return (
+
+
+ );
+ }
+ })}
+
+
+ ))}
+
+ )}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {/* Personal */}
+
+
+
+ {/* Contact Info */}
+
+
+ {t('personalInfoHeading')}
+
+
+
+
+ {tCommon('firstName')}
+ +
+
+ {tCommon('lastName')}
+ +
+
+ {t('gender')}
+
+
+
+
+ {t('birthDate')}
+
+
+
+
+ {t('educationGrade')}
+
+
+ {t('employmentStatus')}
+
+
+ {t('maritalStatus')}
++ +
+
+
+
+
+ {t('contactInfoHeading')}
+
+
+
+
+ {tCommon('phone')}
+ +
+
+ {tCommon('email')}
+ +
+
+ {tCommon('address')}
+ +
+
+ {t('countryCode')}
+ +
+
+ {tCommon('city')}
+ +
+
+ {tCommon('state')}
+ +
+ {/* Personal */}
+
+
+
+
+ {/* Actions */}
+
+
+ {t('personalDetailsHeading')}
+
+
+
+ {formState.image ? (
+ 
+ ) : (
+ <>
+
+
+
+ {formState?.firstName}
+
+
+ + {userData?.appUserProfile?.isSuperAdmin + ? 'Super Admin' + : userData?.appUserProfile?.adminFor.length > 0 + ? 'Admin' + : 'User'} +
+{formState.email}
+
+
+
+
+
+ {t('actionsHeading')}
+
+
+
+
+
+
+
+ + {`${t('pluginCreationAllowed')} (API not supported yet)`} +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
+export default OrgPeopleOrganizationsCard;
diff --git a/src/components/OrganizationScreen/OrganizationScreen.test.tsx b/src/components/OrganizationScreen/OrganizationScreen.test.tsx
index d31511ea1e..e1bb505169 100644
--- a/src/components/OrganizationScreen/OrganizationScreen.test.tsx
+++ b/src/components/OrganizationScreen/OrganizationScreen.test.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { MockedProvider } from '@apollo/react-testing';
-import { fireEvent, render, screen } from '@testing-library/react';
+import { act, fireEvent, render, screen } from '@testing-library/react';
import { I18nextProvider } from 'react-i18next';
import 'jest-location-mock';
import { Provider } from 'react-redux';
@@ -10,13 +10,22 @@ import i18nForTest from 'utils/i18nForTest';
import OrganizationScreen from './OrganizationScreen';
import { ORGANIZATIONS_LIST } from 'GraphQl/Queries/Queries';
import { StaticMockLink } from 'utils/StaticMockLink';
+import useLocalStorage from 'utils/useLocalstorage';
let mockID: string | undefined = '123';
+
jest.mock('react-router-dom', () => ({
...jest.requireActual('react-router-dom'),
useParams: () => ({ orgId: mockID }),
}));
+const { setItem } = useLocalStorage();
+async function wait(ms = 1000): Promise
+
+
+
+
+ {image ? (
+ 
+ ) : (
+
+
+
+
+
+
+ {name}
++ {userData?.organizations[0].description} +
+ ++ {tCommon('admins')}: {admins.length} +
+ ++ {tCommon('members')}: {members.length} +
+
-
{t('title')}
+{title}
-
- {
await act(() => {
return new Promise((resolve) => {
@@ -605,6 +535,13 @@ jest.mock('react-router-dom', () => ({
// FOR THE FIRST TEST WHICH CAME OUT OF NOWHERE
console.error = jest.fn();
+jest.mock('react-toastify', () => ({
+ toast: {
+ success: jest.fn(),
+ error: jest.fn(),
+ },
+}));
+
describe('Organization People Page', () => {
const searchData = {
fullNameMember: 'Aditya Memberguy',
@@ -1334,12 +1271,9 @@ describe('Organization People Page', () => {
await wait();
const dataGrid = screen.getByRole('grid');
expect(dataGrid).toBeInTheDocument();
- const removeButtons = screen.getAllByTestId('removeMemberModalBtn');
- userEvent.click(removeButtons[0]);
});
- test('Datagrid renders with admin data', async () => {
- window.location.assign('/orgpeople/orgid');
+ test('Datagrid row should direct to user profile', async () => {
render(
@@ -1351,35 +1285,35 @@ describe('Organization People Page', () => {
);
await wait();
- const dropdownToggles = screen.getAllByTestId('role');
- dropdownToggles.forEach((dropdownToggle) => {
- userEvent.click(dropdownToggle);
+ const dataGrid = screen.getByRole('grid');
+ expect(dataGrid).toBeInTheDocument();
+
+ const rows = screen.getAllByRole('row');
+ rows.forEach((row) => {
+ userEvent.click(row);
});
- const adminDropdownItem = screen.getByTestId('admins');
- userEvent.click(adminDropdownItem);
- await wait();
- const removeButtons = screen.getAllByTestId('removeAdminModalBtn');
- userEvent.click(removeButtons[0]);
});
- test('No Mock Data test', async () => {
+ test('Datagrid renders with admin data', async () => {
window.location.assign('/orgpeople/orgid');
-
render(
-
+
-
-
-
-
+
+
,
);
await wait();
- expect(window.location).toBeAt('/orgpeople/orgid');
- expect(screen.queryByText(/Nothing Found !!/i)).toBeInTheDocument();
+ const dropdownToggles = screen.getAllByTestId('role');
+ dropdownToggles.forEach((dropdownToggle) => {
+ userEvent.click(dropdownToggle);
+ });
+ const adminDropdownItem = screen.getByTestId('admins');
+ userEvent.click(adminDropdownItem);
+ await wait();
});
});
diff --git a/src/screens/OrganizationPeople/OrganizationPeople.tsx b/src/screens/OrganizationPeople/OrganizationPeople.tsx
index 1d230ed058..9b66f87289 100644
--- a/src/screens/OrganizationPeople/OrganizationPeople.tsx
+++ b/src/screens/OrganizationPeople/OrganizationPeople.tsx
@@ -6,14 +6,12 @@ import {
USER_LIST_FOR_TABLE,
} from 'GraphQl/Queries/Queries';
import Loader from 'components/Loader/Loader';
-import OrgAdminListCard from 'components/OrgAdminListCard/OrgAdminListCard';
-import OrgPeopleListCard from 'components/OrgPeopleListCard/OrgPeopleListCard';
import dayjs from 'dayjs';
import React, { useEffect, useState } from 'react';
import { Button, Dropdown, Form } from 'react-bootstrap';
import Row from 'react-bootstrap/Row';
import { useTranslation } from 'react-i18next';
-import { Link, useLocation, useParams } from 'react-router-dom';
+import { useLocation, useParams, useNavigate } from 'react-router-dom';
import { toast } from 'react-toastify';
import AddMember from './AddMember';
import styles from './OrganizationPeople.module.css';
@@ -34,7 +32,7 @@ function organizationPeople(): JSX.Element {
});
const { t: tCommon } = useTranslation('common');
- document.title = t('title');
+ const navigate = useNavigate();
const location = useLocation();
const role = location?.state;
@@ -50,26 +48,6 @@ function organizationPeople(): JSX.Element {
const [adminFilteredData, setAdminFilteredData] = useState();
const [userName, setUserName] = useState('');
- const [showRemoveModal, setShowRemoveModal] = React.useState(false);
- const [selectedAdminId, setSelectedAdminId] = React.useState<
- string | undefined
- >();
- const [selectedMemId, setSelectedMemId] = React.useState<
- string | undefined
- >();
- const toggleRemoveModal = (): void => {
- setShowRemoveModal((prev) => !prev);
- };
- const toggleRemoveMemberModal = (id: string): void => {
- setSelectedMemId(id);
- setSelectedAdminId(undefined);
- toggleRemoveModal();
- };
- const toggleRemoveAdminModal = (id: string): void => {
- setSelectedAdminId(id);
- setSelectedMemId(undefined);
- toggleRemoveModal();
- };
const {
data: memberData,
@@ -210,15 +188,7 @@ function organizationPeople(): JSX.Element {
headerClassName: `${styles.tableHeader}`,
sortable: false,
renderCell: (params: GridCellParams) => {
- return (
-
- {params.row?.firstName + ' ' + params.row?.lastName}
-
- );
+ return
)}
- {showRemoveModal && selectedMemId && (
-
- {/* Personal */}
-
-
-
- {/* Contact Info */}
-
-
- {t('personalInfoHeading')}
-
-
-
-
- {tCommon('firstName')}
- -
-
- {tCommon('lastName')}
- -
-
- {t('gender')}
-
-
-
-
- {t('birthDate')}
-
-
-
-
- {t('educationGrade')}
-
-
- {t('employmentStatus')}
-
-
- {t('maritalStatus')}
-- -
-
-
-
-
- {t('contactInfoHeading')}
-
-
-
-
- {t('phone')}
- -
-
- {tCommon('email')}
- -
-
- {tCommon('address')}
- -
-
- {t('countryCode')}
- -
-
- {t('city')}
- -
-
- {t('state')}
- -
- {/* Personal */}
-
);
diff --git a/src/screens/OrgList/OrgListMocks.ts b/src/screens/OrgList/OrgListMocks.ts
index 380313ffd5..7a2d8b9757 100644
--- a/src/screens/OrgList/OrgListMocks.ts
+++ b/src/screens/OrgList/OrgListMocks.ts
@@ -54,6 +54,8 @@ const organizations: InterfaceOrgConnectionInfoType[] = [
sortingCode: 'ABC-123',
state: 'Kingston Parish',
},
+ blockedUsers: [],
+ description: '',
},
];
@@ -88,6 +90,8 @@ for (let x = 0; x < 1; x++) {
sortingCode: 'ABC-123',
state: 'Kingston Parish',
},
+ blockedUsers: [],
+ description: '',
});
}
diff --git a/src/screens/OrganizationPeople/AddMember.tsx b/src/screens/OrganizationPeople/AddMember.tsx
index 4c1f15106e..ff5811b519 100644
--- a/src/screens/OrganizationPeople/AddMember.tsx
+++ b/src/screens/OrganizationPeople/AddMember.tsx
@@ -26,6 +26,7 @@ import { useTranslation } from 'react-i18next';
import { Link, useParams } from 'react-router-dom';
import { toast } from 'react-toastify';
import { errorHandler } from 'utils/errorHandler';
+import { getItem } from 'utils/useLocalstorage';
import type {
InterfaceQueryOrganizationsListObject,
InterfaceQueryUserListItem,
@@ -67,10 +68,15 @@ function AddMember(): JSX.Element {
keyPrefix: 'addMember',
});
+ const isSuperAdmin = getItem('SuperAdmin', '');
const { t: tCommon } = useTranslation('common');
-
document.title = translateOrgPeople('title');
+ const updateDocumentTitle = () => {
+ const titleKey = isSuperAdmin ? 'title_superadmin' : 'title';
+ document.title = translateOrgPeople(titleKey);
+ };
+ updateDocumentTitle();
const [addUserModalisOpen, setAddUserModalIsOpen] = useState(false);
function openAddUserModal(): void {
diff --git a/src/screens/OrganizationPeople/OrganizationPeople.test.tsx b/src/screens/OrganizationPeople/OrganizationPeople.test.tsx
index a840f1e1f0..d7f715a7e8 100644
--- a/src/screens/OrganizationPeople/OrganizationPeople.test.tsx
+++ b/src/screens/OrganizationPeople/OrganizationPeople.test.tsx
@@ -517,77 +517,7 @@ const MOCKS: TestMock[] = [
},
];
-const EMPTYMOCKS: TestMock[] = [
- {
- request: {
- query: ORGANIZATIONS_LIST,
- variables: {
- id: 'orgid',
- },
- },
- result: {
- data: {
- organizations: [],
- },
- },
- },
-
- {
- //These are mocks for 1st query (member list)
- request: {
- query: ORGANIZATIONS_MEMBER_CONNECTION_LIST,
- variables: {
- orgId: 'orgid',
- firstName_contains: '',
- lastName_contains: '',
- },
- },
- result: {
- data: {
- organizationsMemberConnection: {
- edges: [],
- },
- },
- },
- },
-
- {
- request: {
- query: ORGANIZATIONS_MEMBER_CONNECTION_LIST,
- variables: {
- orgId: 'orgid',
- firstName_contains: '',
- lastName_contains: '',
- },
- },
- result: {
- data: {
- organizationsMemberConnection: {
- edges: [],
- },
- },
- },
- },
-
- {
- //This is mock for user list
- request: {
- query: USER_LIST_FOR_TABLE,
- variables: {
- firstName_contains: '',
- lastName_contains: '',
- },
- },
- result: {
- data: {
- users: [],
- },
- },
- },
-];
-
const link = new StaticMockLink(MOCKS, true);
-const link2 = new StaticMockLink(EMPTYMOCKS, true);
async function wait(ms = 2): Promise
-
+
-
- {t('personalDetailsHeading')}
-
-
-
- {formState.image ? (
-
- ) : (
- <>
-
-
-
- {formState?.firstName}
-
-
- - {userData?.appUserProfile?.isSuperAdmin - ? 'Super Admin' - : userData?.appUserProfile?.adminFor.length > 0 - ? 'Admin' - : 'User'} -
-{formState.email}
-
-
+
+ );
+ case 'events':
+ return (
+
+ );
+ case 'tags':
+ return (
+
+ );
+ }
+ })()}
+ {topNavButtons.map(renderButton)}
+
- {/* Actions */}
-
-
-
-
- {t('actionsHeading')}
-
-
-
-
-
-
-
- - {`${t('pluginCreationAllowed')} (API not supported yet)`} -
-
-
-
-
-
-
-
-
-
-
-
+ {(() => {
+ switch (activeTab) {
+ case 'overview':
+ return (
+
+
+ );
+ case 'organizations':
+ return (
+
+
-
-
-
- {params.row?.firstName + ' ' + params.row?.lastName}
;
},
},
{
@@ -244,33 +214,6 @@ function organizationPeople(): JSX.Element {
return dayjs(params.row.createdAt).format('DD/MM/YYYY');
},
},
- {
- field: 'action',
- headerName: tCommon('action'),
- flex: 1,
- minWidth: 100,
- align: 'center',
- headerAlign: 'center',
- headerClassName: `${styles.tableHeader}`,
- sortable: false,
- renderCell: (params: GridCellParams) => {
- return state === 1 ? (
-
- ) : (
-
- );
- },
- },
];
return (
<>
@@ -409,21 +352,13 @@ function organizationPeople(): JSX.Element {
}
columns={columns}
isRowSelectable={() => false}
+ onRowClick={(row: unknown) => {
+ const id = (row as { id: string }).id;
+ navigate(`/member/${currentUrl}`, { state: { id } });
+ }}
/>