-
{t('pHeading')}
- {searchText ? ( -- Search results for {searchText} -
- ) : null} +
+ {
+ if (eventKey) {
+ updateSelectedTab(eventKey);
+ }
+ }}
+ >
+
+
+
-
- {data.getPlugins.filter(
- (val: {
- _id: string;
- pluginName: string | undefined;
- pluginDesc: string | undefined;
- pluginCreatedBy: string;
- pluginInstallStatus: boolean | undefined;
- getInstalledPlugins: () => any;
- }) => {
- if (searchText == '') {
- return val;
- } else if (
- val.pluginName
- ?.toLowerCase()
- .includes(searchText.toLowerCase())
- ) {
- return val;
- }
- },
- ).length === 0 ? (
-
-
- {data.getPlugins
- .filter(
- (plugin: any) => !plugin.uninstalledOrgs.includes(orgId),
- )
- .filter(
- (val: {
- _id: string;
- pluginName: string | undefined;
- pluginDesc: string | undefined;
- pluginCreatedBy: string;
- pluginInstallStatus: boolean | undefined;
- getInstalledPlugins: () => any;
- }) => {
- if (searchText == '') {
- return val;
- } else if (
- val.pluginName
- ?.toLowerCase()
- .includes(searchText.toLowerCase())
- ) {
- return val;
- }
- },
- ).length === 0 ? (
-
-
-
-
+
+ {(() => {
+ const filteredPlugins = filterPlugins(
+ data?.getPlugins || [],
+ searchText,
+ );
- {t('pMessage')};
+ }
+
+ return (
+
+
+ {filteredPlugins.map((plug, i) => (
+
+ );
+ })()}
+
+
+ ))}
+ {t('pMessage')}
- ) : ( - data.getPlugins - .filter( - (val: { - _id: string; - pluginName: string | undefined; - pluginDesc: string | undefined; - pluginCreatedBy: string; - pluginInstallStatus: boolean | undefined; - getInstalledPlugins: () => any; - }) => { - if (searchText == '') { - return val; - } else if ( - val.pluginName - ?.toLowerCase() - .includes(searchText.toLowerCase()) - ) { - return val; - } - }, - ) - .map( - ( - plug: { - _id: string; - pluginName: string | undefined; - pluginDesc: string | undefined; - pluginCreatedBy: string; - uninstalledOrgs: string[]; - getInstalledPlugins: () => any; - }, - i: React.Key | null | undefined, - ): JSX.Element => ( -{t('pMessage')}
- ) : ( - data.getPlugins - .filter( - (plugin: any) => !plugin.uninstalledOrgs.includes(orgId), - ) - .filter( - (val: { - _id: string; - pluginName: string | undefined; - pluginDesc: string | undefined; - pluginCreatedBy: string; - pluginInstallStatus: boolean | undefined; - getInstalledPlugins: () => any; - }) => { - if (searchText == '') { - return val; - } else if ( - val.pluginName - ?.toLowerCase() - .includes(searchText.toLowerCase()) - ) { - return val; - } - }, - ) - .map( - ( - plug: { - _id: string; - pluginName: string | undefined; - pluginDesc: string | undefined; - pluginCreatedBy: string; - uninstalledOrgs: string[]; - pluginInstallStatus: boolean | undefined; - getInstalledPlugins: () => any; - }, - i: React.Key | null | undefined, - ): JSX.Element => ( -
+ {(() => {
+ const installedPlugins = (data?.getPlugins || []).filter(
+ (plugin) => !plugin.uninstalledOrgs.includes(orgId ?? ''),
+ );
+ const filteredPlugins = filterPlugins(
+ installedPlugins,
+ searchText,
+ );
+
+ if (filteredPlugins.length === 0) {
+ return
+
+
+ {t('pMessage')}
; + } + + return filteredPlugins.map((plug, i) => ( +
+
+ ));
+ })()}
+
- {/* Component for registering a new advertisement */}
-
- {/* Tab for active advertisements */}
-
+
-
- {/* Tab for archived advertisements */}
new Date(ad.endDate) < new Date(),
).length !== 0 && (
{Array.from({ length: 1 }).map((_, idx) => (
+
=> {
+ const useParamsMock = vi.fn(() => ({ orgId: undefined }));
+ vi.doMock('react-router-dom', async () => {
+ const actual = await vi.importActual('react-router-dom');
+ return {
+ ...actual,
+ useParams: useParamsMock,
+ };
+ });
+ const orgSettingsModule = await import('./OrgSettings');
+ return
+
-
}
+ element={
+
+ setSearchText("search")}
+ />
+
+
+
-
)
}
diff --git a/src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.module.css b/src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.module.css
index 879d96a0a0..e4f244807f 100644
--- a/src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.module.css
+++ b/src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.module.css
@@ -20,7 +20,7 @@
.admedia {
object-fit: cover;
- height: 20rem;
+ height: 16rem;
}
.buttons {
@@ -28,6 +28,10 @@
justify-content: flex-end;
}
+.card {
+ width: 28rem;
+}
+
.dropdownButton {
background-color: transparent;
color: #000;
diff --git a/src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.tsx b/src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.tsx
index 7368ded68e..7656f1f0cf 100644
--- a/src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.tsx
+++ b/src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.tsx
@@ -38,6 +38,7 @@ function AdvertisementEntry({
startDate = new Date(),
setAfter,
}: InterfaceAddOnEntryProps): JSX.Element {
+ console.log(id, type);
const { t } = useTranslation('translation', { keyPrefix: 'advertisement' });
const { t: tCommon } = useTranslation('common');
@@ -98,7 +99,7 @@ function AdvertisementEntry({
{tCommon('endOfResults')}
+{t('endOfResults')}
)}
- {name}
+ {name}
+
+ Starts on {startDate?.toDateString()}
+
Ends on {endDate?.toDateString()}
+
{type}
diff --git a/src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.module.css b/src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.module.css
index 0c5678676b..9d009cf021 100644
--- a/src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.module.css
+++ b/src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.module.css
@@ -7,7 +7,8 @@
.modalbtn i,
.button i {
- margin-right: 8px;
+ height: min-content;
+ margin-right: 4px;
}
.preview {
From f1e8c32f6519d9f4691f240418a0a78d6764b3ab Mon Sep 17 00:00:00 2001
From: Devender singh shekhawat <50149675+devender18@users.noreply.github.com>
Date: Sat, 7 Dec 2024 22:48:29 +0530
Subject: [PATCH 003/133] refactored: CSS files in
src/screens/OrgSettings(fixes: #2523) (#2610)
* refactored: CSS files in src/screens/OrgSettings(fixes: #2523)
* refactored: CSS files in src/screens/OrgSettings(fixes: #2523)
* refactored: CSS files in src/screens/OrgSettings(fixes: #2523)
* refactored: CSS files in src/screens/OrgSettings(fixes: #2523)
---
.../OrgSettings/General/GeneralSettings.tsx | 2 +-
.../OrgSettings/OrgSettings.module.css | 55 ----------------
src/screens/OrgSettings/OrgSettings.tsx | 6 +-
src/style/app.module.css | 62 ++++++++++++++++++-
4 files changed, 63 insertions(+), 62 deletions(-)
delete mode 100644 src/screens/OrgSettings/OrgSettings.module.css
diff --git a/src/components/OrgSettings/General/GeneralSettings.tsx b/src/components/OrgSettings/General/GeneralSettings.tsx
index 4dbca1b6eb..739456150a 100644
--- a/src/components/OrgSettings/General/GeneralSettings.tsx
+++ b/src/components/OrgSettings/General/GeneralSettings.tsx
@@ -1,6 +1,6 @@
import React, { type FC } from 'react';
import { Card, Col, Form, Row } from 'react-bootstrap';
-import styles from 'screens/OrgSettings/OrgSettings.module.css';
+import styles from '../../../../src/style/app.module.css';
import OrgProfileFieldSettings from './OrgProfileFieldSettings/OrgProfileFieldSettings';
import ChangeLanguageDropDown from 'components/ChangeLanguageDropdown/ChangeLanguageDropDown';
import DeleteOrg from './DeleteOrg/DeleteOrg';
diff --git a/src/screens/OrgSettings/OrgSettings.module.css b/src/screens/OrgSettings/OrgSettings.module.css
deleted file mode 100644
index 9952a9a459..0000000000
--- a/src/screens/OrgSettings/OrgSettings.module.css
+++ /dev/null
@@ -1,55 +0,0 @@
-.headerBtn {
- box-shadow: rgba(0, 0, 0, 0.2) 0px 2px 2px;
-}
-.settingsContainer {
- min-height: 100vh;
-}
-
-.settingsBody {
- min-height: 100vh;
- margin: 2.5rem 1rem;
-}
-
-.cardHeader {
- padding: 1.25rem 1rem 1rem 1rem;
- border-bottom: 1px solid var(--bs-gray-200);
- display: flex;
- justify-content: space-between;
- align-items: center;
-}
-
-.cardHeader .cardTitle {
- font-size: 1.2rem;
- font-weight: 600;
-}
-
-.cardBody {
- min-height: 180px;
-}
-
-.cardBody .textBox {
- margin: 0 0 3rem 0;
- color: var(--bs-secondary);
-}
-
-hr {
- border: none;
- height: 1px;
- background-color: var(--bs-gray-500);
-}
-
-.settingsTabs {
- display: none;
-}
-
-@media (min-width: 577px) {
- .settingsDropdown {
- display: none;
- }
-}
-
-@media (min-width: 577px) {
- .settingsTabs {
- display: block;
- }
-}
diff --git a/src/screens/OrgSettings/OrgSettings.tsx b/src/screens/OrgSettings/OrgSettings.tsx
index e4ae5424a6..c7b01138ae 100644
--- a/src/screens/OrgSettings/OrgSettings.tsx
+++ b/src/screens/OrgSettings/OrgSettings.tsx
@@ -1,7 +1,7 @@
import React, { useState } from 'react';
import { Button, Dropdown, Row, Col } from 'react-bootstrap';
import { useTranslation } from 'react-i18next';
-import styles from './OrgSettings.module.css';
+import styles from 'style/app.module.css';
import OrgActionItemCategories from 'components/OrgSettings/ActionItemCategories/OrgActionItemCategories';
import OrganizationAgendaCategory from 'components/OrgSettings/AgendaItemCategories/OrganizationAgendaCategory';
import { Navigate, useParams } from 'react-router-dom';
@@ -26,7 +26,7 @@ const settingtabs: SettingType[] = [
*
* @returns The rendered component displaying the organization settings.
*/
-function orgSettings(): JSX.Element {
+function OrgSettings(): JSX.Element {
// Translation hook for internationalization
const { t } = useTranslation('translation', {
keyPrefix: 'orgSettings',
@@ -126,4 +126,4 @@ function orgSettings(): JSX.Element {
);
}
-export default orgSettings;
+export default OrgSettings;
diff --git a/src/style/app.module.css b/src/style/app.module.css
index eb6f370861..fc8a389145 100644
--- a/src/style/app.module.css
+++ b/src/style/app.module.css
@@ -1,3 +1,8 @@
+:root {
+ --high-contrast-text: #494949;
+ --high-contrast-border: #2c2c2c;
+}
+
.noOutline input {
outline: none;
}
@@ -234,7 +239,7 @@
.editButton {
background-color: var(--search-button-bg);
border-color: var(--search-button-border);
- color: #555555;
+ color: var(--high-contrast-text);
margin-left: 2;
}
@@ -242,7 +247,7 @@
margin-bottom: 10px;
background-color: var(--search-button-bg);
border-color: var(--grey-bg-color);
- color: #555555;
+ color: var(--high-contrast-text);
}
.addButton:hover {
@@ -443,7 +448,7 @@ hr {
flex-direction: row;
font-weight: 900;
font-size: 16px;
- color: rgb(80, 80, 80);
+ color: var(--high-contrast-text);
}
.rankings {
@@ -556,6 +561,57 @@ hr {
flex-direction: column;
}
+.headerBtn {
+ box-shadow: rgba(0, 0, 0, 0.2) 0px 2px 2px;
+}
+
+.settingsContainer {
+ min-height: 100vh;
+}
+
+.settingsBody {
+ min-height: 100vh;
+ margin: 2.5rem 1rem;
+}
+
+.cardHeader {
+ padding: 1.25rem 1rem 1rem 1rem;
+ border-bottom: 1px solid var(--bs-gray-200);
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.cardHeader .cardTitle {
+ font-size: 1.2rem;
+ font-weight: 600;
+}
+
+.cardBody {
+ min-height: 180px;
+}
+
+.cardBody .textBox {
+ margin: 0 0 3rem 0;
+ color: var(--high-contrast-text);
+}
+
+.settingsTabs {
+ display: none;
+}
+
+@media (min-width: 576px) {
+ .settingsDropdown {
+ display: none;
+ }
+}
+
+@media (min-width: 576px) {
+ .settingsTabs {
+ display: block;
+ }
+}
+
@media (max-width: 1020px) {
.btnsContainer {
flex-direction: column;
From afa614aeafb8af077780b65149699aed1c106cad Mon Sep 17 00:00:00 2001
From: Peter Harrison <16875803+palisadoes@users.noreply.github.com>
Date: Sat, 7 Dec 2024 09:41:05 -0800
Subject: [PATCH 004/133] Update pull-request.yml
---
.github/workflows/pull-request.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 7cb9c10f69..668d618fdf 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -101,6 +101,7 @@ jobs:
.node-version
.husky/**
scripts/**
+ src/style/**
schema.graphql
package.json
tsconfig.json
From 0630cffe07e78db56787fd1d58b46537672f5a83 Mon Sep 17 00:00:00 2001
From: NISHANT SINGH <151461374+NishantSinghhhhh@users.noreply.github.com>
Date: Sun, 8 Dec 2024 22:34:57 +0530
Subject: [PATCH 005/133] Refactor: Adding vitest to Avatar component (#2622)
---
src/components/Avatar/Avatar.spec.tsx | 92 +++++++++++++++++++++++++++
src/components/Avatar/Avatar.test.tsx | 50 ---------------
2 files changed, 92 insertions(+), 50 deletions(-)
create mode 100644 src/components/Avatar/Avatar.spec.tsx
delete mode 100644 src/components/Avatar/Avatar.test.tsx
diff --git a/src/components/Avatar/Avatar.spec.tsx b/src/components/Avatar/Avatar.spec.tsx
new file mode 100644
index 0000000000..2721595304
--- /dev/null
+++ b/src/components/Avatar/Avatar.spec.tsx
@@ -0,0 +1,92 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { describe, test, expect, vi } from 'vitest';
+import Avatar from './Avatar';
+
+/**
+ * Unit tests for the `Avatar` component.
+ *
+ * The tests ensure the `Avatar` component renders correctly with various props.
+ * Mocked dependencies are used to isolate the component and verify its behavior.
+ *
+ */
+
+vi.mock('state/store', () => ({
+ store: {
+ getState: vi.fn(() => ({
+ auth: {
+ user: null,
+ loading: false,
+ },
+ })),
+ subscribe: vi.fn(),
+ dispatch: vi.fn(),
+ },
+}));
+
+vi.mock('utils/i18nForTest', () => ({
+ __esModule: true,
+ default: vi.fn(() => ({
+ t: (key: string) => key,
+ })),
+}));
+
+describe('Avatar component', () => {
+ /**
+ * Test: Verifies the `Avatar` component renders correctly with the `name` and `alt` attributes.
+ *
+ * Steps:
+ * 1. Render the `Avatar` component with `name`, `alt`, and `size` props.
+ * 2. Check if the avatar image is present in the document.
+ * 3. Validate the `src` attribute is defined.
+ */
+ test('renders with name and alt attribute', () => {
+ const testName = 'John Doe';
+ const testAlt = 'Test Alt Text';
+ const testSize = 64;
+
+ const { getByAltText } = render(
+
-
-
- ,
- );
- const avatarElement = getByAltText(testAlt);
-
- expect(avatarElement).toBeInTheDocument();
- expect(avatarElement.getAttribute('src')).toBeDefined();
- });
-
- test('renders with custom style and data-testid', () => {
- const testName = 'Jane Doe';
- const testStyle = 'custom-avatar-style';
- const testDataTestId = 'custom-avatar-test-id';
-
- const { getByAltText } = render(
-
-
-
- ,
- );
- const avatarElement = getByAltText('Dummy Avatar');
-
- expect(avatarElement).toBeInTheDocument();
- expect(avatarElement.getAttribute('src')).toBeDefined();
- expect(avatarElement.getAttribute('class')).toContain(testStyle);
- expect(avatarElement.getAttribute('data-testid')).toBe(testDataTestId);
- });
-});
From cb5c25502192d9e9827cecce3740c7163e357e38 Mon Sep 17 00:00:00 2001
From: Bandhan Majumder <133476557+bandhan-majumder@users.noreply.github.com>
Date: Thu, 12 Dec 2024 20:56:59 +0530
Subject: [PATCH 006/133] Refactor: jest to vitest : Fixes #2547 (#2641)
* Refactor: jest to vitest : Fixes #2547
* Refactor: jest to vitest : Fixes #2547
* updated src/screens/EventVolunteers/Requests.spec.tsx
---------
Co-authored-by: bandhan-majumder
Co-authored-by: Bandhan Majumder
---
.../{Requests.test.tsx => Requests.spec.tsx} | 25 +++++++++++--------
1 file changed, 15 insertions(+), 10 deletions(-)
rename src/screens/EventVolunteers/Requests/{Requests.test.tsx => Requests.spec.tsx} (92%)
diff --git a/src/screens/EventVolunteers/Requests/Requests.test.tsx b/src/screens/EventVolunteers/Requests/Requests.spec.tsx
similarity index 92%
rename from src/screens/EventVolunteers/Requests/Requests.test.tsx
rename to src/screens/EventVolunteers/Requests/Requests.spec.tsx
index 3b55ea872c..e51e28ab3f 100644
--- a/src/screens/EventVolunteers/Requests/Requests.test.tsx
+++ b/src/screens/EventVolunteers/Requests/Requests.spec.tsx
@@ -1,3 +1,10 @@
+/**
+ * Testing component for managing and displaying Volunteer Membership requests for an event.
+ *
+ * This component allows users to view, filter, sort, and create action items. It also allows users to accept or reject volunteer membership requests.
+ *
+ *
+ */
import React, { act } from 'react';
import { MockedProvider } from '@apollo/react-testing';
import { LocalizationProvider } from '@mui/x-date-pickers';
@@ -20,11 +27,12 @@ import {
UPDATE_ERROR_MOCKS,
} from './Requests.mocks';
import { toast } from 'react-toastify';
+import { vi } from 'vitest';
-jest.mock('react-toastify', () => ({
+vi.mock('react-toastify', () => ({
toast: {
- success: jest.fn(),
- error: jest.fn(),
+ success: vi.fn(),
+ error: vi.fn(),
},
}));
@@ -74,14 +82,14 @@ const renderRequests = (link: ApolloLink): RenderResult => {
describe('Testing Requests Screen', () => {
beforeAll(() => {
- jest.mock('react-router-dom', () => ({
- ...jest.requireActual('react-router-dom'),
+ vi.mock('react-router-dom', async () => ({
+ ...(await vi.importActual('react-router-dom')),
useParams: () => ({ orgId: 'orgId', eventId: 'eventId' }),
}));
});
afterAll(() => {
- jest.clearAllMocks();
+ vi.clearAllMocks();
});
it('should redirect to fallback URL if URL params are undefined', async () => {
@@ -102,10 +110,7 @@ describe('Testing Requests Screen', () => {
,
);
-
- await waitFor(() => {
- expect(screen.getByTestId('paramsError')).toBeInTheDocument();
- });
+ expect(window.location.pathname).toBe('/');
});
it('should render Requests screen', async () => {
From 316c3cb051451dda6e6f3e35bfec5f5d78331bdb Mon Sep 17 00:00:00 2001
From: Vedant Gupta <115912707+im-vedant@users.noreply.github.com>
Date: Thu, 12 Dec 2024 22:38:53 +0530
Subject: [PATCH 007/133] chore: migrate
src/screens/UserPortal/Donate/Donate.test.tsx from Jest to Vitest (#2636)
Co-authored-by: im-vedant <194vedantgutpa@gmail.com>
---
.../{Donate.test.tsx => Donate.spec.tsx} | 34 +++++++++++--------
1 file changed, 20 insertions(+), 14 deletions(-)
rename src/screens/UserPortal/Donate/{Donate.test.tsx => Donate.spec.tsx} (93%)
diff --git a/src/screens/UserPortal/Donate/Donate.test.tsx b/src/screens/UserPortal/Donate/Donate.spec.tsx
similarity index 93%
rename from src/screens/UserPortal/Donate/Donate.test.tsx
rename to src/screens/UserPortal/Donate/Donate.spec.tsx
index c4d435415e..b13056f5f9 100644
--- a/src/screens/UserPortal/Donate/Donate.test.tsx
+++ b/src/screens/UserPortal/Donate/Donate.spec.tsx
@@ -1,8 +1,14 @@
+/**
+ * Unit tests for the Donate component.
+ *
+ * This file contains tests for the Donate component to ensure it behaves as expected
+ * under various scenarios.
+ */
import React, { act } from 'react';
import { render, screen } from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import { I18nextProvider } from 'react-i18next';
-
+import { vi } from 'vitest';
import {
ORGANIZATION_DONATION_CONNECTION_LIST,
USER_ORGANIZATION_CONNECTION,
@@ -132,35 +138,35 @@ async function wait(ms = 100): Promise {
});
}
-jest.mock('react-router-dom', () => ({
- ...jest.requireActual('react-router-dom'),
- useParams: () => ({ orgId: '' }),
+vi.mock('react-router-dom', async () => ({
+ ...(await vi.importActual('react-router-dom')),
+ useParams: vi.fn(() => ({ orgId: '' })),
}));
-jest.mock('react-toastify', () => ({
+vi.mock('react-toastify', () => ({
toast: {
- error: jest.fn(),
- success: jest.fn(),
+ error: vi.fn(),
+ success: vi.fn(),
},
}));
describe('Testing Donate Screen [User Portal]', () => {
Object.defineProperty(window, 'matchMedia', {
writable: true,
- value: jest.fn().mockImplementation((query) => ({
+ value: vi.fn().mockImplementation((query) => ({
matches: false,
media: query,
onchange: null,
- addListener: jest.fn(), // Deprecated
- removeListener: jest.fn(), // Deprecated
- addEventListener: jest.fn(),
- removeEventListener: jest.fn(),
- dispatchEvent: jest.fn(),
+ addListener: vi.fn(), // Deprecated
+ removeListener: vi.fn(), // Deprecated
+ addEventListener: vi.fn(),
+ removeEventListener: vi.fn(),
+ dispatchEvent: vi.fn(),
})),
});
beforeEach(() => {
- jest.clearAllMocks();
+ vi.clearAllMocks();
});
test('Screen should be rendered properly', async () => {
From a5c9d97d210d53e78e74bc5f119cb9634de58581 Mon Sep 17 00:00:00 2001
From: prathmesh703 <146568950+prathmesh703@users.noreply.github.com>
Date: Fri, 13 Dec 2024 08:39:31 +0530
Subject: [PATCH 008/133] github worflow format fix (#2650)
---
.github/workflows/pull-request.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 668d618fdf..5096758ea5 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -49,7 +49,7 @@ jobs:
- name: Run formatting if check fails
if: failure()
- run: npm run format
+ run: npm run format:fix
- name: Check for type errors
if: steps.changed-files.outputs.only_changed != 'true'
From 11ece4a4d1829f2682ed4433555c5d2bb79dc96a Mon Sep 17 00:00:00 2001
From: Rafiul Hasan <67283985+rafidoth@users.noreply.github.com>
Date: Fri, 13 Dec 2024 21:38:29 +0600
Subject: [PATCH 009/133] Refactored: src/screens/UserPortal/Campaigns from
Jest to Vitest (#2640)
* Refactored: src/screens/UserPortal/Campaigns from Jest to Vitest
* Refactored: src/screens/UserPortal/Campaigns from Jest to Vitest
* Refactored: src/screens/UserPortal/Campaigns from Jest to Vitest
---
...{Campaigns.test.tsx => Campaigns.spec.tsx} | 61 +++++++++++++++----
1 file changed, 49 insertions(+), 12 deletions(-)
rename src/screens/UserPortal/Campaigns/{Campaigns.test.tsx => Campaigns.spec.tsx} (88%)
diff --git a/src/screens/UserPortal/Campaigns/Campaigns.test.tsx b/src/screens/UserPortal/Campaigns/Campaigns.spec.tsx
similarity index 88%
rename from src/screens/UserPortal/Campaigns/Campaigns.test.tsx
rename to src/screens/UserPortal/Campaigns/Campaigns.spec.tsx
index 17b7eec4d5..09cde6b25d 100644
--- a/src/screens/UserPortal/Campaigns/Campaigns.test.tsx
+++ b/src/screens/UserPortal/Campaigns/Campaigns.spec.tsx
@@ -20,39 +20,57 @@ import i18nForTest from 'utils/i18nForTest';
import type { ApolloLink } from '@apollo/client';
import useLocalStorage from 'utils/useLocalstorage';
import Campaigns from './Campaigns';
+import { vi, it, expect, describe } from 'vitest';
import {
EMPTY_MOCKS,
MOCKS,
USER_FUND_CAMPAIGNS_ERROR,
} from './CampaignsMocks';
-jest.mock('react-toastify', () => ({
+/* Mocking 'react-toastify` */
+vi.mock('react-toastify', () => ({
toast: {
- success: jest.fn(),
- error: jest.fn(),
+ success: vi.fn(),
+ error: vi.fn(),
},
}));
-jest.mock('@mui/x-date-pickers/DateTimePicker', () => {
+
+/* Mocking `@mui/x-date-pickers/DateTimePicker` */
+vi.mock('@mui/x-date-pickers/DateTimePicker', async () => {
+ const actual = await vi.importActual(
+ '@mui/x-date-pickers/DesktopDateTimePicker',
+ );
return {
- DateTimePicker: jest.requireActual(
- '@mui/x-date-pickers/DesktopDateTimePicker',
- ).DesktopDateTimePicker,
+ DateTimePicker: actual.DesktopDateTimePicker,
};
});
+
const { setItem } = useLocalStorage();
+/**
+ * Creates a mocked Apollo link for testing.
+ */
const link1 = new StaticMockLink(MOCKS);
const link2 = new StaticMockLink(USER_FUND_CAMPAIGNS_ERROR);
const link3 = new StaticMockLink(EMPTY_MOCKS);
+
const cTranslations = JSON.parse(
JSON.stringify(
i18nForTest.getDataByLanguage('en')?.translation.userCampaigns,
),
);
+
const pTranslations = JSON.parse(
JSON.stringify(i18nForTest.getDataByLanguage('en')?.translation.pledges),
);
+/*
+ * Renders the `Campaigns` component for testing.
+ *
+ * @param link - The mocked Apollo link used for testing.
+ * @returns The rendered result of the `Campaigns` component.
+ */
+
const renderCampaigns = (link: ApolloLink): RenderResult => {
return render(
@@ -79,26 +97,38 @@ const renderCampaigns = (link: ApolloLink): RenderResult => {
);
};
+/**
+ * Test suite for the User Campaigns screen.
+ */
describe('Testing User Campaigns Screen', () => {
beforeEach(() => {
setItem('userId', 'userId');
});
beforeAll(() => {
- jest.mock('react-router-dom', () => ({
- ...jest.requireActual('react-router-dom'),
- useParams: () => ({ orgId: 'orgId' }),
- }));
+ /**
+ * Mocks the `useParams` function from `react-router-dom` to simulate URL parameters.
+ */
+ vi.mock('react-router-dom', async () => {
+ const actual = await vi.importActual('react-router-dom');
+ return {
+ ...actual,
+ useParams: vi.fn(() => ({ orgId: 'orgId' })), // Mock `useParams`
+ };
+ });
});
afterAll(() => {
- jest.clearAllMocks();
+ vi.clearAllMocks();
});
afterEach(() => {
cleanup();
});
+ /**
+ * Verifies that the User Campaigns screen renders correctly with mock data.
+ */
it('should render the User Campaigns screen', async () => {
renderCampaigns(link1);
await waitFor(() => {
@@ -108,6 +138,9 @@ describe('Testing User Campaigns Screen', () => {
});
});
+ /**
+ * Ensures the app redirects to the fallback URL if `userId` is null in LocalStorage.
+ */
it('should redirect to fallback URL if userId is null in LocalStorage', async () => {
setItem('userId', null);
renderCampaigns(link1);
@@ -116,7 +149,11 @@ describe('Testing User Campaigns Screen', () => {
});
});
+ /**
+ * Ensures the app redirects to the fallback URL if URL parameters are undefined.
+ */
it('should redirect to fallback URL if URL params are undefined', async () => {
+ vi.unmock('react-router-dom'); // unmocking to get real behavior from useParams
render(
From a3183901d16d200095ce46dc1de357693dd14511 Mon Sep 17 00:00:00 2001
From: Purnendu Mishra <91306791+PurnenduMIshra129th@users.noreply.github.com>
Date: Fri, 13 Dec 2024 21:09:40 +0530
Subject: [PATCH 010/133] New Commit for Develop-postgress branch (#2632)
---
...serScreen.test.tsx => UserScreen.spec.tsx} | 57 +++++++++++++------
vitest.config.ts | 2 +
2 files changed, 43 insertions(+), 16 deletions(-)
rename src/screens/UserPortal/UserScreen/{UserScreen.test.tsx => UserScreen.spec.tsx} (73%)
diff --git a/src/screens/UserPortal/UserScreen/UserScreen.test.tsx b/src/screens/UserPortal/UserScreen/UserScreen.spec.tsx
similarity index 73%
rename from src/screens/UserPortal/UserScreen/UserScreen.test.tsx
rename to src/screens/UserPortal/UserScreen/UserScreen.spec.tsx
index 642b231a66..65c5e6a650 100644
--- a/src/screens/UserPortal/UserScreen/UserScreen.test.tsx
+++ b/src/screens/UserPortal/UserScreen/UserScreen.spec.tsx
@@ -1,8 +1,19 @@
+/**
+ * This file contains unit tests for the UserScreen component.
+ *
+ * The tests cover:
+ * - Rendering of the correct title based on the location.
+ * - Functionality of the LeftDrawer component.
+ * - Behavior when the orgId is undefined.
+ *
+ * These tests use Vitest for test execution and MockedProvider for mocking GraphQL queries.
+ */
+
import React from 'react';
+import { render, screen, fireEvent } from '@testing-library/react';
+import { describe, it, vi, beforeEach, expect } from 'vitest';
import { MockedProvider } from '@apollo/react-testing';
-import { fireEvent, render, screen } from '@testing-library/react';
import { I18nextProvider } from 'react-i18next';
-import 'jest-location-mock';
import { Provider } from 'react-redux';
import { BrowserRouter, useNavigate } from 'react-router-dom';
import { store } from 'state/store';
@@ -10,15 +21,20 @@ import i18nForTest from 'utils/i18nForTest';
import UserScreen from './UserScreen';
import { ORGANIZATIONS_LIST } from 'GraphQl/Queries/Queries';
import { StaticMockLink } from 'utils/StaticMockLink';
+import '@testing-library/jest-dom';
let mockID: string | undefined = '123';
let mockLocation: string | undefined = '/user/organization/123';
-jest.mock('react-router-dom', () => ({
- ...jest.requireActual('react-router-dom'),
- useParams: () => ({ orgId: mockID }),
- useLocation: () => ({ pathname: mockLocation }),
-}));
+vi.mock('react-router-dom', async () => {
+ const actual = await vi.importActual('react-router-dom');
+ return {
+ ...actual,
+ useParams: () => ({ orgId: mockID }),
+ useLocation: () => ({ pathname: mockLocation }),
+ useNavigate: vi.fn(), // Mock only the necessary parts
+ };
+});
const MOCKS = [
{
@@ -72,8 +88,13 @@ const clickToggleMenuBtn = (toggleButton: HTMLElement): void => {
fireEvent.click(toggleButton);
};
-describe('Testing LeftDrawer in OrganizationScreen', () => {
- test('renders the correct title based on the titleKey for posts', () => {
+describe('UserScreen tests with LeftDrawer functionality', () => {
+ beforeEach(() => {
+ mockID = '123';
+ mockLocation = '/user/organization/123';
+ });
+
+ it('renders the correct title for posts', () => {
render(
@@ -90,7 +111,7 @@ describe('Testing LeftDrawer in OrganizationScreen', () => {
expect(titleElement).toHaveTextContent('Posts');
});
- test('renders the correct title based on the titleKey', () => {
+ it('renders the correct title for people', () => {
mockLocation = '/user/people/123';
render(
@@ -109,7 +130,7 @@ describe('Testing LeftDrawer in OrganizationScreen', () => {
expect(titleElement).toHaveTextContent('People');
});
- test('LeftDrawer should toggle correctly based on window size and user interaction', async () => {
+ it('toggles LeftDrawer correctly based on window size and user interaction', () => {
render(
@@ -121,27 +142,30 @@ describe('Testing LeftDrawer in OrganizationScreen', () => {
,
);
+
const toggleButton = screen.getByTestId('closeMenu') as HTMLElement;
const icon = toggleButton.querySelector('i');
- // Resize window to a smaller width
+ // Resize to small screen and check toggle state
resizeWindow(800);
clickToggleMenuBtn(toggleButton);
expect(icon).toHaveClass('fa fa-angle-double-left');
- // Resize window back to a larger width
+ // Resize to large screen and check toggle state
resizeWindow(1000);
clickToggleMenuBtn(toggleButton);
expect(icon).toHaveClass('fa fa-angle-double-right');
+ // Check state on re-click
clickToggleMenuBtn(toggleButton);
expect(icon).toHaveClass('fa fa-angle-double-left');
});
- test('should be redirected to root when orgId is undefined', async () => {
+ it('redirects to root when orgId is undefined', () => {
mockID = undefined;
- const navigate = jest.fn();
- jest.spyOn({ useNavigate }, 'useNavigate').mockReturnValue(navigate);
+ const navigate = vi.fn();
+ vi.spyOn({ useNavigate }, 'useNavigate').mockReturnValue(navigate);
+
render(
@@ -153,6 +177,7 @@ describe('Testing LeftDrawer in OrganizationScreen', () => {
,
);
+
expect(window.location.pathname).toEqual('/');
});
});
diff --git a/vitest.config.ts b/vitest.config.ts
index ad85276111..c158cf9c2a 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -2,6 +2,7 @@ import { defineConfig } from 'vitest/config';
import react from '@vitejs/plugin-react';
import { nodePolyfills } from 'vite-plugin-node-polyfills';
import tsconfigPaths from 'vite-tsconfig-paths';
+import svgrPlugin from 'vite-plugin-svgr';
export default defineConfig({
plugins: [
@@ -10,6 +11,7 @@ export default defineConfig({
include: ['events'],
}),
tsconfigPaths(),
+ svgrPlugin(),
],
test: {
include: ['src/**/*.spec.{js,jsx,ts,tsx}'],
From 77b45615c487f8ef3470de7df52e88209628c472 Mon Sep 17 00:00:00 2001
From: Devender singh shekhawat <50149675+devender18@users.noreply.github.com>
Date: Fri, 13 Dec 2024 21:15:05 +0530
Subject: [PATCH 011/133] refactored: src/screens/OrgSettings from Jest to
Vitest(fixes: #2567) (#2625)
* refactored: src/screens/OrgSettings from Jest to Vitest(fixes: #2567)
* refactored: src/screens/OrgSettings from Jest to Vitest(fixes: #2567)
* refactored: src/screens/OrgSettings from Jest to Vitest(fixes: #2567)
* refactored: src/screens/OrgSettings from Jest to Vitest(fixes: #2567)
* refactored: src/screens/OrgSettings from Jest to Vitest(fixes: #2567)
* refactored: src/screens/OrgSettings from Jest to Vitest(fixes: #2567)
* refactored: src/screens/OrgSettings from Jest to Vitest(fixes: #2567)
* updated check-tsdoc to ignore .spec.tsx
---
.github/workflows/check-tsdoc.js | 1 +
...Settings.test.tsx => OrgSettings.spec.tsx} | 100 ++++++++++++------
2 files changed, 71 insertions(+), 30 deletions(-)
rename src/screens/OrgSettings/{OrgSettings.test.tsx => OrgSettings.spec.tsx} (54%)
diff --git a/.github/workflows/check-tsdoc.js b/.github/workflows/check-tsdoc.js
index d5c3b33b90..0400f5a108 100644
--- a/.github/workflows/check-tsdoc.js
+++ b/.github/workflows/check-tsdoc.js
@@ -23,6 +23,7 @@ async function findTsxFiles(dir) {
} else if (
filePath.endsWith('.tsx') &&
!filePath.endsWith('.test.tsx') &&
+ !filePath.endsWith('.spec.tsx') &&
!filesToSkip.includes(path.relative(dir, filePath))
) {
results.push(filePath);
diff --git a/src/screens/OrgSettings/OrgSettings.test.tsx b/src/screens/OrgSettings/OrgSettings.spec.tsx
similarity index 54%
rename from src/screens/OrgSettings/OrgSettings.test.tsx
rename to src/screens/OrgSettings/OrgSettings.spec.tsx
index a9aec5f33d..5b5179d644 100644
--- a/src/screens/OrgSettings/OrgSettings.test.tsx
+++ b/src/screens/OrgSettings/OrgSettings.spec.tsx
@@ -1,28 +1,38 @@
+import type { ReactElement } from 'react';
import React from 'react';
-import { MockedProvider } from '@apollo/react-testing';
-import type { RenderResult } from '@testing-library/react';
+import { describe, it, expect, vi } from 'vitest';
import { render, screen, waitFor } from '@testing-library/react';
-import 'jest-location-mock';
-import { I18nextProvider } from 'react-i18next';
-import { Provider } from 'react-redux';
+import userEvent from '@testing-library/user-event';
import { MemoryRouter, Route, Routes } from 'react-router-dom';
-
+import { Provider } from 'react-redux';
+import { I18nextProvider } from 'react-i18next';
+import { LocalizationProvider } from '@mui/x-date-pickers';
+import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
+import { MockedProvider } from '@apollo/react-testing';
import { store } from 'state/store';
-import { StaticMockLink } from 'utils/StaticMockLink';
import i18nForTest from 'utils/i18nForTest';
+import { StaticMockLink } from 'utils/StaticMockLink';
import OrgSettings from './OrgSettings';
-import userEvent from '@testing-library/user-event';
-import type { ApolloLink } from '@apollo/client';
-import { LocalizationProvider } from '@mui/x-date-pickers';
-import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
import { MOCKS } from './OrgSettings.mocks';
const link1 = new StaticMockLink(MOCKS);
-
-const renderOrganisationSettings = (link: ApolloLink): RenderResult => {
+const mockRouterParams = (orgId: string | undefined): void => {
+ vi.doMock('react-router-dom', async () => {
+ const actual = await vi.importActual('react-router-dom');
+ return {
+ ...actual,
+ useParams: () => ({ orgId }),
+ };
+ });
+};
+const renderOrganisationSettings = (
+ link = link1,
+ orgId = 'orgId',
+): ReturnType => {
+ mockRouterParams(orgId);
return render(
-
+
@@ -30,7 +40,9 @@ const renderOrganisationSettings = (link: ApolloLink): RenderResult => {
}
+ element={
+ Redirected to Home
+ }
/>
@@ -42,28 +54,37 @@ const renderOrganisationSettings = (link: ApolloLink): RenderResult => {
};
describe('Organisation Settings Page', () => {
- beforeAll(() => {
- jest.mock('react-router-dom', () => ({
- ...jest.requireActual('react-router-dom'),
- useParams: () => ({ orgId: 'orgId' }),
- }));
+ afterEach(() => {
+ vi.unmock('react-router-dom');
});
- afterAll(() => {
- jest.clearAllMocks();
- });
+ const SetupRedirectTest = async (): PromiseRedirected to Home
+ }
/>
@@ -71,13 +92,16 @@ describe('Organisation Settings Page', () => {
,
);
+
await waitFor(() => {
- expect(screen.getByTestId('paramsError')).toBeInTheDocument();
+ const paramsErrorElement = screen.getByTestId('paramsError');
+ expect(paramsErrorElement).toBeInTheDocument();
+ expect(paramsErrorElement.textContent).toBe('Redirected to Home');
});
});
- test('should render the organisation settings page', async () => {
- renderOrganisationSettings(link1);
+ it('should render the organisation settings page', async () => {
+ renderOrganisationSettings();
await waitFor(() => {
expect(screen.getByTestId('generalSettings')).toBeInTheDocument();
@@ -88,10 +112,11 @@ describe('Organisation Settings Page', () => {
screen.getByTestId('agendaItemCategoriesSettings'),
).toBeInTheDocument();
});
- userEvent.click(screen.getByTestId('generalSettings'));
+ userEvent.click(screen.getByTestId('generalSettings'));
await waitFor(() => {
expect(screen.getByTestId('generalTab')).toBeInTheDocument();
+ expect(screen.getByTestId('generalTab')).toBeVisible();
});
userEvent.click(screen.getByTestId('actionItemCategoriesSettings'));
@@ -104,4 +129,19 @@ describe('Organisation Settings Page', () => {
expect(screen.getByTestId('agendaItemCategoriesTab')).toBeInTheDocument();
});
});
+
+ it('should render dropdown for settings tabs', async () => {
+ renderOrganisationSettings();
+
+ await waitFor(() => {
+ expect(screen.getByTestId('settingsDropdownToggle')).toBeInTheDocument();
+ });
+
+ userEvent.click(screen.getByTestId('settingsDropdownToggle'));
+
+ const dropdownItems = screen.getAllByRole('button', {
+ name: /general|actionItemCategories|agendaItemCategories/i,
+ });
+ expect(dropdownItems).toHaveLength(3);
+ });
});
From a16118e5f3bafa95b701293525941049342a9d01 Mon Sep 17 00:00:00 2001
From: Shiva <148421597+shivasankaran18@users.noreply.github.com>
Date: Fri, 13 Dec 2024 21:26:27 +0530
Subject: [PATCH 012/133] Refactor: Added Vitest To Requests Screen (#2655)
* refactor:request screen to vitest
* refactor:vitest to Requests Screen
* implement codreabbit suggestions
---
.../{Requests.test.tsx => Requests.spec.tsx} | 39 +++++++++++++++++--
1 file changed, 36 insertions(+), 3 deletions(-)
rename src/screens/Requests/{Requests.test.tsx => Requests.spec.tsx} (91%)
diff --git a/src/screens/Requests/Requests.test.tsx b/src/screens/Requests/Requests.spec.tsx
similarity index 91%
rename from src/screens/Requests/Requests.test.tsx
rename to src/screens/Requests/Requests.spec.tsx
index 4606fdae08..820b24c40d 100644
--- a/src/screens/Requests/Requests.test.tsx
+++ b/src/screens/Requests/Requests.spec.tsx
@@ -1,8 +1,6 @@
import React, { act } from 'react';
import { MockedProvider } from '@apollo/react-testing';
import { render, screen } from '@testing-library/react';
-import 'jest-localstorage-mock';
-import 'jest-location-mock';
import { I18nextProvider } from 'react-i18next';
import { Provider } from 'react-redux';
import { BrowserRouter } from 'react-router-dom';
@@ -22,6 +20,34 @@ import {
MOCKS4,
} from './RequestsMocks';
import useLocalStorage from 'utils/useLocalstorage';
+import { vi } from 'vitest';
+
+/**
+ * Set up `localStorage` stubs for testing.
+ */
+
+vi.stubGlobal('localStorage', {
+ getItem: vi.fn(),
+ setItem: vi.fn(),
+ clear: vi.fn(),
+ removeItem: vi.fn(),
+});
+
+/**
+ * Mock `window.location` for testing redirection behavior.
+ */
+
+Object.defineProperty(window, 'location', {
+ value: {
+ href: 'http://localhost/',
+ assign: vi.fn(),
+ reload: vi.fn(),
+ pathname: '/',
+ search: '',
+ hash: '',
+ origin: 'http://localhost',
+ },
+});
const { setItem, removeItem } = useLocalStorage();
@@ -33,6 +59,14 @@ const link5 = new StaticMockLink(MOCKS_WITH_ERROR, true);
const link6 = new StaticMockLink(MOCKS3, true);
const link7 = new StaticMockLink(MOCKS4, true);
+/**
+ * Utility function to wait for a specified amount of time.
+ * Wraps `setTimeout` in an `act` block for testing purposes.
+ *
+ * @param ms - The duration to wait in milliseconds. Default is 100ms.
+ * @returns A promise that resolves after the specified time.
+ */
+
async function wait(ms = 100): Promise
+
+
) : isLoading == false &&
usersData === undefined &&
displayedUsers.length === 0 ? (
- {tCommon('noResultsFoundFor')} "{searchByName}"
-
+
) : (
diff --git a/src/style/app.module.css b/src/style/app.module.css
index fc8a389145..461e2cc260 100644
--- a/src/style/app.module.css
+++ b/src/style/app.module.css
@@ -81,7 +81,6 @@
align-items: center;
gap: 10px;
/* Adjust spacing between items */
- margin: 2.5rem 0;
}
.btnsContainer .btnsBlock {
@@ -95,15 +94,28 @@
align-items: center;
}
-.btnsContainer .input {
+.btnsContainer .inputContainer {
flex: 1;
position: relative;
}
-.btnsContainer .input button {
+.btnsContainer .input {
+ width: 70%;
+}
+
+.btnsContainer input {
+ outline: 1px solid var(--bs-gray-400);
+}
+
+.btnsContainer .inputContainer button {
width: 52px;
}
+.listBox {
+ width: 100%;
+ flex: 1;
+}
+
.inputField {
margin-top: 10px;
margin-bottom: 10px;
@@ -499,37 +511,6 @@ hr {
outline-offset: -2px;
}
-@media (max-width: 520px) {
- .btnsContainer {
- margin-bottom: 0;
- }
-
- .btnsContainer .btnsBlock {
- display: block;
- margin-top: 1rem;
- margin-right: 0;
- }
-
- .btnsContainer .btnsBlock div {
- flex: 1;
- }
-
- .btnsContainer .btnsBlock div[title='Sort organizations'] {
- margin-right: 0.5rem;
- }
-
- .btnsContainer .btnsBlock button {
- margin-bottom: 1rem;
- margin-right: 0;
- width: 100%;
- }
-}
-
-.listBox {
- width: 100%;
- flex: 1;
-}
-
.listTable {
width: 100%;
box-sizing: border-box;
@@ -636,6 +617,31 @@ hr {
}
}
+@media (max-width: 520px) {
+ .btnsContainer {
+ margin-bottom: 0;
+ }
+
+ .btnsContainer .btnsBlock {
+ display: block;
+ margin-top: 1rem;
+ }
+
+ .btnsContainer .btnsBlock div {
+ flex: 1;
+ }
+
+ .btnsContainer .btnsBlock div[title='Sort organizations'] {
+ margin-right: 0.5rem;
+ }
+
+ .btnsContainer .btnsBlock button {
+ margin-bottom: 1rem;
+ margin-right: 0;
+ width: 100%;
+ }
+}
+
@media (max-width: 1120px) {
.contract {
padding-left: calc(250px + 2rem + 1.5rem);
From 880f6f3140fc500829f2c8eb545fa602f742ee27 Mon Sep 17 00:00:00 2001
From: Devender singh shekhawat <50149675+devender18@users.noreply.github.com>
Date: Fri, 13 Dec 2024 21:30:49 +0530
Subject: [PATCH 014/133] refactored OrganizationDashboard css/ closes #2513
(#2593)
* refactored OrganizationDashboard css/ closes #2513
* refactor:OrganizationDashboard_css(fixes #2513)
* Plugin and advertisement screen revamp (#2006)
* advertisement and plugin screen
* added revamped design
* fixes added
* fixed testcases
* chore(deps): bump sass from 1.80.6 to 1.80.7 (#2433)
Bumps [sass](https://github.com/sass/dart-sass) from 1.80.6 to 1.80.7.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.80.6...1.80.7)
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump eslint-plugin-import from 2.30.0 to 2.31.0 (#2434)
Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.30.0 to 2.31.0.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.30.0...v2.31.0)
---
updated-dependencies:
- dependency-name: eslint-plugin-import
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump @mui/x-charts from 7.22.1 to 7.22.2 (#2435)
Bumps [@mui/x-charts](https://github.com/mui/mui-x/tree/HEAD/packages/x-charts) from 7.22.1 to 7.22.2.
- [Release notes](https://github.com/mui/mui-x/releases)
- [Changelog](https://github.com/mui/mui-x/blob/v7.22.2/CHANGELOG.md)
- [Commits](https://github.com/mui/mui-x/commits/v7.22.2/packages/x-charts)
---
updated-dependencies:
- dependency-name: "@mui/x-charts"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump @types/react from 18.3.3 to 18.3.12 (#2436)
Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.3.3 to 18.3.12.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)
---
updated-dependencies:
- dependency-name: "@types/react"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Update pull-request.yml
* Update dependabot.yaml
* added docker check to workflow (#2414)
* added docker check to workflow
* made recommended changes to docker check in workflow
* added changes to docker check inn workflow as recommended
* added changes
* updated indentation in pull-request.yml file
* updated indentation in pull-request.yml file
* added Dockerfile and Docker-compose.yml file
* added Dockerfile and Docker-compose.yml file
* updated .docker-ignore file
* added recommended changes by code rabbit
* added recommended changes by code rabbit
* added recommended changes by code rabbit
* added recommended changes by code rabbit
* added recommended changes by code rabbit
* added recommended changes by code rabbit
* properly formatted code
* trying to make docker check pass
* trying to make docker check pass
* updated INSTALLATION.md
* updated INSTALLATION.md
* added recommended changes to INSTALLATION.md
* added recommended changes to INSTALLATION.md
* added recommended changes to INSTALLATION.md
* updated docker workflow
* updated INSTALLATION.md
* eslint-rule-no_unused_vars (#2428)
* Updated pr template with checklist (#2454)
* Updated pr template with checklist
* Additional changes for the PR template
* Changed the url for the PR template
* refactored addOnStore
* refactored addOnEntry v1
---------
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Peter Harrison <16875803+palisadoes@users.noreply.github.com>
Co-authored-by: Vanshika Sabharwal <143436704+VanshikaSabharwal@users.noreply.github.com>
Co-authored-by: prayansh_chhablani <135210710+prayanshchh@users.noreply.github.com>
Co-authored-by: Dhiraj Udhani
* refactored: CSS files in src/screens/OrgSettings(fixes: #2523) (#2610)
* refactored: CSS files in src/screens/OrgSettings(fixes: #2523)
* refactored: CSS files in src/screens/OrgSettings(fixes: #2523)
* refactored: CSS files in src/screens/OrgSettings(fixes: #2523)
* refactored: CSS files in src/screens/OrgSettings(fixes: #2523)
* Update pull-request.yml
* refactored: CSS files in src/screens/OrganizationDashboard(fixes: #2513)
* refactored: CSS files in src/screens/OrganizationDashboard(fixes: #2513)
* improve import for global css
---------
Signed-off-by: dependabot[bot]
Co-authored-by: Shekhar Patel <90516956+duplixx@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Peter Harrison <16875803+palisadoes@users.noreply.github.com>
Co-authored-by: Vanshika Sabharwal <143436704+VanshikaSabharwal@users.noreply.github.com>
Co-authored-by: prayansh_chhablani <135210710+prayanshchh@users.noreply.github.com>
Co-authored-by: Dhiraj Udhani
---
.../OrganizationDashboard.module.css | 35 ----------------
.../OrganizationDashboard.tsx | 17 ++++----
src/style/app.module.css | 40 ++++++++++++++++++-
3 files changed, 49 insertions(+), 43 deletions(-)
delete mode 100644 src/screens/OrganizationDashboard/OrganizationDashboard.module.css
diff --git a/src/screens/OrganizationDashboard/OrganizationDashboard.module.css b/src/screens/OrganizationDashboard/OrganizationDashboard.module.css
deleted file mode 100644
index 3ffe274196..0000000000
--- a/src/screens/OrganizationDashboard/OrganizationDashboard.module.css
+++ /dev/null
@@ -1,35 +0,0 @@
-.cardHeader {
- padding: 1.25rem 1rem 1rem 1rem;
- border-bottom: 1px solid var(--bs-gray-200);
- display: flex;
- justify-content: space-between;
- align-items: center;
- margin-bottom: 10px;
-}
-
-.cardHeader .cardTitle {
- font-size: 1.2rem;
- font-weight: 600;
-}
-
-.cardBody {
- min-height: 180px;
- padding-top: 0;
- max-height: 570px;
- overflow-y: scroll;
- width: 100%;
- max-width: 400px;
-}
-
-.cardBody .emptyContainer {
- display: flex;
- height: 180px;
- justify-content: center;
- align-items: center;
-}
-
-.rankings {
- aspect-ratio: 1;
- border-radius: 50%;
- width: 35px;
-}
diff --git a/src/screens/OrganizationDashboard/OrganizationDashboard.tsx b/src/screens/OrganizationDashboard/OrganizationDashboard.tsx
index ebea874d2e..abc712289c 100644
--- a/src/screens/OrganizationDashboard/OrganizationDashboard.tsx
+++ b/src/screens/OrganizationDashboard/OrganizationDashboard.tsx
@@ -31,7 +31,7 @@ import type {
InterfaceQueryOrganizationsListObject,
InterfaceVolunteerRank,
} from 'utils/interfaces';
-import styles from './OrganizationDashboard.module.css';
+import styles from 'style/app.module.css';
import { VOLUNTEER_RANKING } from 'GraphQl/Queries/EventVolunteerQueries';
/**
@@ -41,7 +41,7 @@ import { VOLUNTEER_RANKING } from 'GraphQl/Queries/EventVolunteerQueries';
*
* @returns The rendered component.
*/
-function organizationDashboard(): JSX.Element {
+function OrganizationDashboard(): JSX.Element {
const { t } = useTranslation('translation', { keyPrefix: 'dashboard' });
const { t: tCommon } = useTranslation('common');
const { t: tErrors } = useTranslation('errors');
@@ -299,7 +299,7 @@ function organizationDashboard(): JSX.Element {
{t('viewAll')}
- {t('noUserFound')}
- {t('recentContribution')}: $ {props.recentAmount} + {t('recentContribution')}: $ {recentAmount}
- {t('highestContribution')}: $ {props.highestAmount} + {t('highestContribution')}: $ {highestAmount}
- {t('totalContribution')}: $ {props.totalAmount} + {t('totalContribution')}: $ {totalAmount}
); } + export default ContriStats; diff --git a/src/components/OrgContriCards/OrgContriCards.module.css b/src/components/OrgContriCards/OrgContriCards.module.css deleted file mode 100644 index d20b696621..0000000000 --- a/src/components/OrgContriCards/OrgContriCards.module.css +++ /dev/null @@ -1,22 +0,0 @@ -.cards { - width: 45%; - background: #fcfcfc; - margin: 10px 20px; - padding: 20px 30px; - border-radius: 5px; - border: 1px solid #e8e8e8; - box-shadow: 0 3px 5px #c9c9c9; - margin-right: 40px; - color: #737373; -} -.cards > h2 { - font-size: 19px; -} -.cards > h3 { - font-size: 17px; -} -.cards > p { - font-size: 14px; - margin-top: -5px; - margin-bottom: 7px; -} diff --git a/src/components/OrgContriCards/OrgContriCards.tsx b/src/components/OrgContriCards/OrgContriCards.tsx index 6635be09b8..84237013c8 100644 --- a/src/components/OrgContriCards/OrgContriCards.tsx +++ b/src/components/OrgContriCards/OrgContriCards.tsx @@ -3,7 +3,7 @@ import Row from 'react-bootstrap/Row'; import Col from 'react-bootstrap/Col'; import { useTranslation } from 'react-i18next'; -import styles from './OrgContriCards.module.css'; +import styles from '../../style/app.module.css'; /** * Props for the OrgContriCards component diff --git a/src/screens/OrgContribution/OrgContribution.module.css b/src/screens/OrgContribution/OrgContribution.module.css deleted file mode 100644 index 7ca9333bf7..0000000000 --- a/src/screens/OrgContribution/OrgContribution.module.css +++ /dev/null @@ -1,261 +0,0 @@ -.navbarbg { - height: 60px; - background-color: white; - display: flex; - margin-bottom: 30px; - z-index: 1; - position: relative; - flex-direction: row; - justify-content: space-between; - box-shadow: 0px 0px 8px 2px #c8c8c8; -} - -.logo { - color: #707070; - margin-left: 0; - display: flex; - align-items: center; - text-decoration: none; -} - -.logo img { - margin-top: 0px; - margin-left: 10px; - height: 64px; - width: 70px; -} - -.logo > strong { - line-height: 1.5rem; - margin-left: -5px; - font-family: sans-serif; - font-size: 19px; - color: #707070; -} -.mainpage { - display: flex; - flex-direction: row; -} -.sidebar { - z-index: 0; - padding-top: 5px; - margin: 0; - height: 100%; -} -.sidebar:after { - background-color: #f7f7f7; - position: absolute; - width: 2px; - height: 600px; - top: 10px; - left: 94%; - display: block; -} -.sidebarsticky { - padding-left: 45px; - margin-top: 7px; -} -.sidebarsticky > p { - margin-top: -10px; -} - -.navitem { - padding-left: 27%; - padding-top: 12px; - padding-bottom: 12px; - cursor: pointer; -} - -.logintitle { - color: #707070; - font-weight: 600; - font-size: 20px; - margin-bottom: 30px; - padding-bottom: 5px; - border-bottom: 3px solid #31bb6b; - width: 15%; -} -.searchtitle { - color: #707070; - font-weight: 600; - font-size: 18px; - margin-bottom: 20px; - padding-bottom: 5px; - border-bottom: 3px solid #31bb6b; - width: 60%; -} -.logintitleadmin { - color: #707070; - font-weight: 600; - font-size: 18px; - margin-top: 50px; - margin-bottom: 40px; - padding-bottom: 5px; - border-bottom: 3px solid #31bb6b; - width: 30%; -} -.admindetails { - display: flex; - justify-content: space-between; -} -.admindetails > p { - margin-top: -12px; - margin-right: 30px; -} - -.mainpageright > hr { - margin-top: 20px; - width: 100%; - margin-left: -15px; - margin-right: -15px; - margin-bottom: 20px; -} -.justifysp { - display: flex; - justify-content: space-between; -} -@media screen and (max-width: 575.5px) { - .justifysp { - padding-left: 55px; - display: flex; - justify-content: space-between; - width: 100%; - } -} -.addbtn { - border: 1px solid #e8e5e5; - box-shadow: 0 2px 2px #e8e5e5; - border-radius: 5px; - background-color: #31bb6b; - width: 15%; - height: 40px; - font-size: 16px; - color: white; - outline: none; - font-weight: 600; - cursor: pointer; - transition: - transform 0.2s, - box-shadow 0.2s; -} -.flexdir { - display: flex; - flex-direction: row; - justify-content: space-between; - border: none; -} - -.form_wrapper { - margin-top: 27px; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - position: absolute; - display: flex; - flex-direction: column; - width: 30%; - padding: 40px 30px; - background: #ffffff; - border-color: #e8e5e5; - border-width: 5px; - border-radius: 10px; -} - -.form_wrapper form { - display: flex; - align-items: left; - justify-content: left; - flex-direction: column; -} -.logintitleinvite { - color: #707070; - font-weight: 600; - font-size: 20px; - margin-bottom: 20px; - padding-bottom: 5px; - border-bottom: 3px solid #31bb6b; - width: 40%; -} -.cancel > i { - margin-top: 5px; - transform: scale(1.2); - cursor: pointer; - color: #707070; -} -.modalbody { - width: 50px; -} -.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%; -} -.sidebarsticky > input { - text-decoration: none; - margin-bottom: 50px; - border-color: #e8e5e5; - width: 80%; - border-radius: 7px; - padding-top: 5px; - padding-bottom: 5px; - padding-right: 10px; - padding-left: 10px; - box-shadow: none; -} - -.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); - } -} diff --git a/src/screens/OrgContribution/OrgContribution.tsx b/src/screens/OrgContribution/OrgContribution.tsx index db155cdb47..e2061f5587 100644 --- a/src/screens/OrgContribution/OrgContribution.tsx +++ b/src/screens/OrgContribution/OrgContribution.tsx @@ -2,11 +2,10 @@ import React from 'react'; import Col from 'react-bootstrap/Col'; import Row from 'react-bootstrap/Row'; import { useTranslation } from 'react-i18next'; - import ContriStats from 'components/ContriStats/ContriStats'; import OrgContriCards from 'components/OrgContriCards/OrgContriCards'; import { Form } from 'react-bootstrap'; -import styles from './OrgContribution.module.css'; +import styles from '../../style/app.module.css'; /** * The `orgContribution` component displays the contributions to an organization. @@ -14,7 +13,7 @@ import styles from './OrgContribution.module.css'; * Additionally, it shows recent contribution statistics and a list of contribution cards. * */ -function orgContribution(): JSX.Element { +function OrgContribution(): JSX.Element { // Hook to get translation functions and translation text const { t } = useTranslation('translation', { keyPrefix: 'orgContribution', @@ -83,4 +82,4 @@ function orgContribution(): JSX.Element { ); } -export default orgContribution; +export default OrgContribution; diff --git a/src/style/app.module.css b/src/style/app.module.css index 3bc2e1fd6c..e2ad209d3b 100644 --- a/src/style/app.module.css +++ b/src/style/app.module.css @@ -1,12 +1,142 @@ :root { - /* Color contrast ratio: 7.5:1 (exceeds WCAG AAA) */ - --high-contrast-text: #494949; - /* Color contrast ratio: 9:1 (exceeds WCAG AAA) */ - --high-contrast-border: #2c2c2c; + --brown-color: #555555; + --dropdown-hover-color: #eff1f7; + --grey-bg-color: #eaebef; + --subtle-blue-grey: #7c9beb; + --subtle-blue-grey-hover: #5f7e91; + --modal-width: 670px; + --modal-max-width: 680px; + --input-shadow-color: #dddddd; + --delete-button-bg: #f8d6dc; + --delete-button-color: #ff4d4f; + --search-button-bg: #a8c7fa; + --search-button-border: #555555; + --table-image-size: 50px; + --table-head-bg: var( + --bs-primary, + blue + ); /* Assuming var(--bs-primary) is defined elsewhere */ + --table-head-color: white; + --table-header-color: var(--bs-greyish-black, black); + --table-head-radius: 20px; + --table-bg-color: #eaebef; + --tablerow-bg-color: #eff1f7; + --row-background: var(--bs-white, white); + --font-size-header: 16px; +} +.fonts { + color: #707070; +} + +.fonts > span { + font-weight: 600; } -.noOutline input { - outline: none; +.cards { + width: 45%; + background: #fcfcfc; + margin: 10px 20px; + padding: 20px 30px; + border-radius: 5px; + border: 1px solid #e8e8e8; + box-shadow: 0 3px 5px #c9c9c9; + margin-right: 40px; + color: #737373; +} +.cards > h2 { + font-size: 19px; +} +.cards > h3 { + font-size: 17px; +} +.cards > p { + font-size: 14px; + margin-top: -5px; + margin-bottom: 7px; +} + +.sidebar { + z-index: 0; + padding-top: 5px; + margin: 0; + height: 100%; +} +.sidebar:after { + background-color: #f7f7f7; + position: absolute; + width: 2px; + height: 600px; + top: 10px; + left: 94%; + display: block; +} +.sidebarsticky { + padding-left: 45px; + margin-top: 7px; +} +.sidebarsticky > p { + margin-top: -10px; +} + +.logintitle { + color: #707070; + font-weight: 600; + font-size: 20px; + margin-bottom: 30px; + padding-bottom: 5px; + border-bottom: 3px solid #31bb6b; + width: 15%; +} +.searchtitle { + color: #707070; + font-weight: 600; + font-size: 18px; + margin-bottom: 20px; + padding-bottom: 5px; + border-bottom: 3px solid #31bb6b; + width: 60%; +} + +.admindetails { + display: flex; + justify-content: space-between; +} +.admindetails > p { + margin-top: -12px; + margin-right: 30px; +} + +.mainpageright > hr { + margin-top: 20px; + width: 100%; + margin-left: -15px; + margin-right: -15px; + margin-bottom: 20px; +} +.justifysp { + display: flex; + justify-content: space-between; +} +@media screen and (max-width: 575.5px) { + .justifysp { + padding-left: 55px; + display: flex; + justify-content: space-between; + width: 100%; + } +} + +.sidebarsticky > input { + text-decoration: none; + margin-bottom: 50px; + border-color: #e8e5e5; + width: 80%; + border-radius: 7px; + padding-top: 5px; + padding-bottom: 5px; + padding-right: 10px; + padding-left: 10px; + box-shadow: none; } .noOutline:is(:hover, :focus, :active, :focus-visible, .show) { @@ -43,8 +173,8 @@ .dropdown { background-color: white; - border: 1px solid var(--dropdown-border-color); - color: var(--dropdown-text-color); + border: 1px solid var(--brown-color); + color: var(--brown-color); position: relative; display: inline-block; margin-top: 10px; @@ -53,13 +183,13 @@ .dropdown:is(:hover, :focus, :active, :focus-visible, .show) { background-color: transparent !important; - border: 1px solid var(--dropdown-border-color); - color: var(--dropdown-text-color) !important; + border: 1px solid var(--brown-color); + color: var(--brown-color) !important; } .dropdownItem { background-color: white !important; - color: var(--dropdown-text-color) !important; + color: var(--brown-color) !important; border: none !important; } @@ -67,22 +197,20 @@ .dropdownItem:focus, .dropdownItem:active { background-color: var(--dropdown-hover-color) !important; - color: var(--dropdown-text-color) !important; + color: var(--brown-color) !important; outline: none !important; box-shadow: none !important; } .input { - flex: 3; + flex: 1; + position: relative; } .btnsContainer { display: flex; margin: 2.5rem 0; - align-items: center; - gap: 10px; - /* Adjust spacing between items */ } .btnsContainer .btnsBlock { @@ -96,74 +224,15 @@ align-items: center; } -.btnsContainer .inputContainer { - flex: 1; - position: relative; -} - .btnsContainer .input { - width: 70%; -} - -.btnsContainer input { - outline: 1px solid var(--bs-gray-400); -} - -.btnsContainer .inputContainer button { - width: 52px; -} - -.listBox { - width: 100%; flex: 1; -} - -.inputField { - margin-top: 10px; - margin-bottom: 10px; - - background-color: white; - box-shadow: 0 1px 1px var(--input-shadow-color); -} - -.btnsContainerBlockAndUnblock { - display: flex; - margin: 2.5rem 0 2.5rem 0; -} - -.btnsContainerBlockAndUnblock .btnsBlockBlockAndUnblock { - display: flex; -} - -.btnsContainerBlockAndUnblock .btnsBlockBlockAndUnblock button { - margin-left: 1rem; - display: flex; - justify-content: center; - align-items: center; -} - -.btnsContainerBlockAndUnblock .inputContainerBlockAndUnblock { - flex: 1; - position: relative; -} - -.btnsContainerBlockAndUnblock .inputBlockAndUnblock { - width: 70%; position: relative; } -.btnsContainerBlockAndUnblock input { - outline: 1px solid var(--bs-gray-400); -} - -.btnsContainerBlockAndUnblock .inputContainerBlockAndUnblock button { +.btnsContainer .input button { width: 52px; } -.largeBtnsWrapper { - display: flex; -} - .deleteButton { background-color: var(--delete-button-bg); color: var(--delete-button-color); @@ -188,13 +257,13 @@ color: black !important; margin-top: 10px; margin-left: 5px; - border: 1px solid var(--dropdown-border-color); + border: 1px solid var(--brown-color); } .createButton:hover { background-color: var(--grey-bg-color) !important; color: black !important; - border: 1px solid var(--dropdown-border-color) !important; + border: 1px solid var(--brown-color) !important; } .visuallyHidden { @@ -208,6 +277,13 @@ border: 0; } +.inputField { + margin-top: 10px; + margin-bottom: 10px; + background-color: white; + box-shadow: 0 1px 1px var(--input-shadow-color); +} + .inputFieldModal { margin-bottom: 10px; background-color: white; @@ -232,52 +308,16 @@ align-items: center; } -.searchButton:hover { - background-color: var(--search-button-bg); - border-color: var(--search-button-border); -} - -.search { - position: absolute; - z-index: 10; - background-color: var(--search-button-bg); - border-color: var(--search-button-border); - bottom: 0; - right: 0; - height: 100%; - display: flex; - justify-content: center; - align-items: center; -} - -.editButton { - background-color: var(--search-button-bg); - border-color: var(--search-button-border); - color: var(--high-contrast-text); - margin-left: 2; -} - .addButton { margin-bottom: 10px; background-color: var(--search-button-bg); border-color: var(--grey-bg-color); - color: var(--high-contrast-text); + color: #555555; } .addButton:hover { background-color: #286fe0; border-color: var(--search-button-border); - /* color: #555555; */ -} - -.modalbtn { - margin-top: 1rem; - display: flex !important; - margin-left: auto; - align-items: center; - background-color: var(--grey-bg-color) !important; - color: black !important; - border: 1px solid var(--dropdown-border-color) !important; } .yesButton { @@ -285,14 +325,14 @@ border-color: var(--search-button-border); } -.mainpageright { - color: var(--dropdown-text-color); +.searchIcon { + color: var(--brown-color); } .infoButton { background-color: var(--search-button-bg); border-color: var(--search-button-border); - color: var(--dropdown-text-color); + color: var(--brown-color); margin-right: 0.5rem; border-radius: 0.25rem; } @@ -318,14 +358,6 @@ margin-top: 20px; } -.mainpageright > hr { - margin-top: 10px; - width: 100%; - margin-left: -15px; - margin-right: -15px; - margin-bottom: 20px; -} - .rowBackground { background-color: var(--row-background); } @@ -397,6 +429,15 @@ position: sticky; } +/* .checkboxButton{ + background-color: transparent; +} + +.checkboxButton:checked{ + background-color: var(--subtle-blue-grey); + color:white +} */ + input[type='checkbox']:checked + label { background-color: var(--subtle-blue-grey) !important; } @@ -444,7 +485,6 @@ hr { display: flex; justify-content: flex-end; } - .icon { margin: 1px; } @@ -462,7 +502,7 @@ hr { flex-direction: row; font-weight: 900; font-size: 16px; - color: var(--high-contrast-text); + color: rgb(80, 80, 80); } .rankings { @@ -489,172 +529,6 @@ hr { color: var(--bs-primary) !important; } -.custom_table { - border-radius: 20px; - background-color: var(--grey-bg-color); -} - -.custom_table tbody tr { - background-color: var(--dropdown-hover-color); -} - -.custom_table tbody tr:hover { - background-color: var(--grey-bg-color); - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); -} - -.custom_table tbody tr:focus-within { - outline: 2px solid #000; - outline-offset: -2px; -} - -.custom_table tbody td:focus { - outline: 2px solid #000; - outline-offset: -2px; -} - -.listTable { - width: 100%; - box-sizing: border-box; - background: #ffffff; - border: 1px solid #0000001f; - border-radius: 24px; -} - -.listBox .customTable { - margin-bottom: 0%; -} - -.requestsTable thead th { - font-size: 20px; - font-weight: 400; - line-height: 24px; - letter-spacing: 0em; - text-align: left; - color: #000000; - border-bottom: 1px solid #dddddd; - padding: 1.5rem; -} - -.notFound { - flex: 1; - display: flex; - justify-content: center; - align-items: center; - flex-direction: column; -} - -.headerBtn { - box-shadow: rgba(0, 0, 0, 0.2) 0px 2px 2px; -} - -.settingsContainer { - min-height: 100vh; -} - -.settingsBody { - min-height: 100vh; - margin: 2.5rem 1rem; -} - -.cardHeader { - padding: 1.25rem 1rem 1rem 1rem; - border-bottom: 1px solid var(--bs-gray-200); - display: flex; - justify-content: space-between; - align-items: center; - margin-bottom: 10px; -} -.cardHeader .cardTitle { - font-size: 1.2rem; - font-weight: 600; -} - -.containerBody { - min-height: 180px; - padding-top: 0; - max-height: 570px; - overflow-y: auto; - width: 100%; - max-width: min(400px, 90vw); - scrollbar-width: thin; - scrollbar-color: rgba(0, 0, 0, 0.3) transparent; - - &::-webkit-scrollbar { - width: thin; - } - - &::-webkit-scrollbar-track { - background: transparent; - } - - &::-webkit-scrollbar-thumb { - background-color: rgba(0, 0, 0, 0.3); - } -} - -.containerBody .emptyContainer { - display: flex; - min-height: 180px; - justify-content: center; - align-items: center; -} - -.containerBody .rankings { - aspect-ratio: 1; - border-radius: 50%; - width: 35px; -} - -.cardBody { - min-height: 180px; -} - -.cardBody .textBox { - margin: 0 0 3rem 0; - color: var(--high-contrast-text); -} - -.settingsTabs { - display: none; -} - -@media (min-width: 576px) { - .settingsDropdown { - display: none; - } -} - -@media (min-width: 576px) { - .settingsTabs { - display: block; - } -} - -@media (max-width: 1020px) { - .btnsContainer { - flex-direction: column; - margin: 1.5rem 0; - } - - .btnsContainer .input { - width: 100%; - } - - .btnsContainer .btnsBlock { - margin: 1.5rem 0 0 0; - justify-content: space-between; - } - - .btnsContainer .btnsBlock button { - margin: 0; - } - - .btnsContainer .btnsBlock div button { - margin-right: 1.5rem; - } -} - @media (max-width: 520px) { .btnsContainer { margin-bottom: 0; @@ -663,6 +537,7 @@ hr { .btnsContainer .btnsBlock { display: block; margin-top: 1rem; + margin-right: 0; } .btnsContainer .btnsBlock div { @@ -690,12 +565,31 @@ hr { } } +@media (max-width: 1020px) { + .btnsContainer { + flex-direction: column; + margin: 1.5rem 0; + } + + .btnsContainer .btnsBlock { + margin: 1.5rem 0 0 0; + justify-content: space-between; + } + + .btnsContainer .btnsBlock button { + margin: 0; + } + + .btnsContainer .btnsBlock div button { + margin-right: 1.5rem; + } +} + @-webkit-keyframes load8 { 0% { -webkit-transform: rotate(0deg); transform: rotate(0deg); } - 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); @@ -707,7 +601,6 @@ hr { -webkit-transform: rotate(0deg); transform: rotate(0deg); } - 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); From d9dc57d62aa6fa46bf2a703bc271a27aa7575e64 Mon Sep 17 00:00:00 2001 From: NISHANT SINGH <151461374+NishantSinghhhhh@users.noreply.github.com> Date: Fri, 20 Dec 2024 06:48:34 +0530 Subject: [PATCH 023/133] refactor l: chat.jsx to vitest (#2649) --- jest.config.js | 1 + .../EventCalendar/EventCalendar.tsx | 42 ++-- .../EventCalendar/YearlyEventCalender.tsx | 29 ++- .../OrgActionItemCategories.test.tsx | 12 +- .../OrganizationScreen.test.tsx | 1 + src/screens/LoginPage/LoginPage.tsx | 15 +- src/screens/OrgList/OrgList.tsx | 12 +- .../Chat/{Chat.test.tsx => Chat.spec.tsx} | 184 ++++++++---------- src/utils/getRefreshToken.ts | 2 +- 9 files changed, 120 insertions(+), 178 deletions(-) rename src/screens/UserPortal/Chat/{Chat.test.tsx => Chat.spec.tsx} (94%) diff --git a/jest.config.js b/jest.config.js index a3c6bbecbf..75e0cc5b4d 100644 --- a/jest.config.js +++ b/jest.config.js @@ -36,6 +36,7 @@ export default { '
@@ -405,7 +396,7 @@ const Calendar: React.FC = ({
: styles.event_list
}
>
- {/*istanbul ignore next*/}
+ {}
{expanded === index
? timeEventsList
: timeEventsList?.slice(0, 1)}
@@ -465,14 +456,13 @@ const Calendar: React.FC = ({
styles.day,
].join(' ');
const toggleExpand = (index: number): void => {
- /*istanbul ignore next*/
if (expanded === index) {
setExpanded(-1);
} else {
setExpanded(index);
}
};
- /*istanbul ignore next*/
+
const allEventsList: JSX.Element[] =
events
?.filter((datas) => {
@@ -536,38 +526,28 @@ const Calendar: React.FC = ({
>
{(allEventsList?.length > 2 ||
(windowWidth <= 700 && allEventsList?.length > 0)) && (
- /*istanbul ignore next*/
)}
diff --git a/src/components/EventCalendar/YearlyEventCalender.tsx b/src/components/EventCalendar/YearlyEventCalender.tsx
index 63870ded3c..facf75038c 100644
--- a/src/components/EventCalendar/YearlyEventCalender.tsx
+++ b/src/components/EventCalendar/YearlyEventCalender.tsx
@@ -46,11 +46,11 @@ interface InterfaceCalendarProps {
viewType?: ViewType;
}
-enum Status {
- ACTIVE = 'ACTIVE',
- BLOCKED = 'BLOCKED',
- DELETED = 'DELETED',
-}
+// enum Status {
+// ACTIVE = 'ACTIVE',
+// BLOCKED = 'BLOCKED',
+// DELETED = 'DELETED',
+// }
/**
* Enum for different user roles.
@@ -63,13 +63,13 @@ enum Role {
/**
* Interface for event attendees.
- */
-interface InterfaceIEventAttendees {
- userId: string;
- user?: string;
- status?: Status;
- createdAt?: Date;
-}
+// */
+// interface InterfaceIEventAttendees {
+// userId: string;
+// user?: string;
+// status?: Status;
+// createdAt?: Date;
+// }
/**
* Interface for organization list.
@@ -177,7 +177,6 @@ const Calendar: React.FC{holidayList}
- {
- /*istanbul ignore next*/
- expanded === index
- ? allEventsList
- : holidayList?.length > 0
- ? /*istanbul ignore next*/
- allEventsList?.slice(0, 1)
- : allEventsList?.slice(0, 2)
- }
+ {expanded === index
+ ? allEventsList
+ : holidayList?.length > 0
+ ? allEventsList?.slice(0, 1)
+ : allEventsList?.slice(0, 2)}
{
const searchInput = await screen.findByTestId('searchByName');
expect(searchInput).toBeInTheDocument();
- userEvent.type(searchInput, 'Category 1');
- userEvent.type(searchInput, '{enter}');
+ // Simulate typing and pressing ENTER
+ userEvent.type(searchInput, 'Category 1{enter}');
+
+ // Wait for the filtering to complete
await waitFor(() => {
- expect(screen.getByText('Category 1')).toBeInTheDocument();
- expect(screen.queryByText('Category 2')).toBeNull();
+ // Assert only "Category 1" is visible
+ const categories = screen.getAllByTestId('categoryName');
+ expect(categories).toHaveLength(1);
+ expect(categories[0]).toHaveTextContent('Category 1');
});
});
diff --git a/src/components/OrganizationScreen/OrganizationScreen.test.tsx b/src/components/OrganizationScreen/OrganizationScreen.test.tsx
index 6293562a5a..0dfb6d7a14 100644
--- a/src/components/OrganizationScreen/OrganizationScreen.test.tsx
+++ b/src/components/OrganizationScreen/OrganizationScreen.test.tsx
@@ -79,6 +79,7 @@ describe('Testing OrganizationScreen', () => {
const closeButton = screen.getByTestId('closeMenu');
fireEvent.click(closeButton);
+
expect(screen.getByTestId('mainpageright')).toHaveClass(styles.expand);
const openButton = screen.getByTestId('openMenu');
diff --git a/src/screens/LoginPage/LoginPage.tsx b/src/screens/LoginPage/LoginPage.tsx
index c68ecaceb0..180009926c 100644
--- a/src/screens/LoginPage/LoginPage.tsx
+++ b/src/screens/LoginPage/LoginPage.tsx
@@ -153,7 +153,6 @@ const loginPage = (): JSX.Element => {
try {
await fetch(BACKEND_URL as string);
} catch (error) {
- /* istanbul ignore next */
errorHandler(t, error);
}
}
@@ -165,7 +164,6 @@ const loginPage = (): JSX.Element => {
recaptchaToken: string | null,
): Promise => {
try {
- /* istanbul ignore next */
if (REACT_APP_USE_RECAPTCHA !== 'yes') {
return true;
}
@@ -177,7 +175,6 @@ const loginPage = (): JSX.Element => {
return data.recaptcha;
} catch {
- /* istanbul ignore next */
toast.error(t('captchaError') as string);
}
};
@@ -199,7 +196,7 @@ const loginPage = (): JSX.Element => {
} = signformState;
const isVerified = await verifyRecaptcha(recaptchaToken);
- /* istanbul ignore next */
+
if (!isVerified) {
toast.error(t('Please_check_the_captcha') as string);
return;
@@ -242,7 +239,6 @@ const loginPage = (): JSX.Element => {
},
});
- /* istanbul ignore next */
if (signUpData) {
toast.success(
t(
@@ -260,7 +256,6 @@ const loginPage = (): JSX.Element => {
});
}
} catch (error) {
- /* istanbul ignore next */
errorHandler(t, error);
}
} else {
@@ -285,7 +280,7 @@ const loginPage = (): JSX.Element => {
const loginLink = async (e: ChangeEvent): Promise => {
e.preventDefault();
const isVerified = await verifyRecaptcha(recaptchaToken);
- /* istanbul ignore next */
+
if (!isVerified) {
toast.error(t('Please_check_the_captcha') as string);
return;
@@ -299,7 +294,6 @@ const loginPage = (): JSX.Element => {
},
});
- /* istanbul ignore next */
if (loginData) {
i18n.changeLanguage(loginData.login.appUserProfile.appLanguageCode);
const { login } = loginData;
@@ -336,7 +330,6 @@ const loginPage = (): JSX.Element => {
toast.warn(tErrors('notFound') as string);
}
} catch (error) {
- /* istanbul ignore next */
errorHandler(t, error);
}
};
@@ -494,14 +487,12 @@ const loginPage = (): JSX.Element => {
) : (
- /* istanbul ignore next */
<>
)}
{tCommon('noResultsFoundFor')} "{searchByName}"
diff --git a/src/screens/UserPortal/Chat/Chat.test.tsx b/src/screens/UserPortal/Chat/Chat.spec.tsx
similarity index 94%
rename from src/screens/UserPortal/Chat/Chat.test.tsx
rename to src/screens/UserPortal/Chat/Chat.spec.tsx
index 660eeaa236..ec8243c823 100644
--- a/src/screens/UserPortal/Chat/Chat.test.tsx
+++ b/src/screens/UserPortal/Chat/Chat.spec.tsx
@@ -1,27 +1,55 @@
import React from 'react';
import {
- act,
- fireEvent,
render,
+ fireEvent,
screen,
waitFor,
+ act,
} from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
-import { I18nextProvider } from 'react-i18next';
-
-import {
- USERS_CONNECTION_LIST,
- USER_JOINED_ORGANIZATIONS,
-} from 'GraphQl/Queries/Queries';
import { BrowserRouter } from 'react-router-dom';
import { Provider } from 'react-redux';
+import { expect, describe, test, vi } from 'vitest';
import { store } from 'state/store';
import i18nForTest from 'utils/i18nForTest';
+import { I18nextProvider } from 'react-i18next';
import Chat from './Chat';
-import useLocalStorage from 'utils/useLocalstorage';
+import {
+ USERS_CONNECTION_LIST,
+ USER_JOINED_ORGANIZATIONS,
+} from 'GraphQl/Queries/Queries';
import { MESSAGE_SENT_TO_CHAT } from 'GraphQl/Mutations/OrganizationMutations';
import { CHATS_LIST, CHAT_BY_ID } from 'GraphQl/Queries/PlugInQueries';
+import useLocalStorage from 'utils/useLocalstorage';
+/**
+ * Unit tests for the ChatScreen component.
+ * These tests covers all areas
+ * Covers:
+ * - Rendering of UI elements.
+ * - Contact selection functionality.
+ * - Direct and group chat creation workflows.
+ * - Sidebar behavior in desktop and mobile views.
+ *
+ * Uses Vitest for testing and Apollo MockedProvider for mocking GraphQL queries.
+ */
+
+vi.mock('../../../components/UserPortal/ChatRoom/ChatRoom', () => ({
+ default: () => Mocked ChatRoom,
+}));
+
+const resizeWindow = (width: number): void => {
+ window.innerWidth = width;
+ fireEvent(window, new Event('resize'));
+};
+
+async function wait(ms = 100): Promise {
+ await act(() => {
+ return new Promise((resolve) => {
+ setTimeout(resolve, ms);
+ });
+ });
+}
const { setItem } = useLocalStorage();
const USER_JOINED_ORG_MOCK = [
@@ -1457,47 +1485,45 @@ const GROUP_CHAT_BY_ID_QUERY_MOCK = [
},
];
-const resizeWindow = (width: number): void => {
- window.innerWidth = width;
- fireEvent(window, new Event('resize'));
-};
-
-async function wait(ms = 100): Promise {
- await act(() => {
- return new Promise((resolve) => {
- setTimeout(resolve, ms);
- });
- });
-}
-
describe('Testing Chat Screen [User Portal]', () => {
- window.HTMLElement.prototype.scrollIntoView = jest.fn();
-
Object.defineProperty(window, 'matchMedia', {
writable: true,
- value: jest.fn().mockImplementation((query) => ({
+ value: vi.fn().mockImplementation((query) => ({
matches: false,
media: query,
onchange: null,
- addListener: jest.fn(), // Deprecated
- removeListener: jest.fn(), // Deprecated
- addEventListener: jest.fn(),
- removeEventListener: jest.fn(),
- dispatchEvent: jest.fn(),
+ addListener: vi.fn(),
+ removeListener: vi.fn(),
+ addEventListener: vi.fn(),
+ removeEventListener: vi.fn(),
+ dispatchEvent: vi.fn(),
})),
});
- test('Screen should be rendered properly', async () => {
- const mock = [
- ...USER_JOINED_ORG_MOCK,
- ...GROUP_CHAT_BY_ID_QUERY_MOCK,
- ...MESSAGE_SENT_TO_CHAT_MOCK,
- ...UserConnectionListMock,
- ...CHAT_BY_ID_QUERY_MOCK,
- ...CHATS_LIST_MOCK,
- ...UserConnectionListMock,
- ];
+ // Define mock data outside of tests to reuse
+ const mock = [
+ ...USER_JOINED_ORG_MOCK,
+ ...GROUP_CHAT_BY_ID_QUERY_MOCK,
+ ...MESSAGE_SENT_TO_CHAT_MOCK,
+ ...MESSAGE_SENT_TO_CHAT_MOCK,
+ ...UserConnectionListMock,
+ ...CHAT_BY_ID_QUERY_MOCK,
+ ...CHATS_LIST_MOCK,
+ ...UserConnectionListMock,
+ ];
+
+ beforeEach(() => {
+ setItem('userId', '1');
+ vi.clearAllMocks();
+ localStorage.clear();
+ vi.resetModules();
+ });
+ afterEach(() => {
+ localStorage.clear();
+ });
+
+ test('Screen should be rendered properly', async () => {
render(
@@ -1512,18 +1538,7 @@ describe('Testing Chat Screen [User Portal]', () => {
await wait();
});
- test('User is able to select a contact', async () => {
- const mock = [
- ...USER_JOINED_ORG_MOCK,
- ...GROUP_CHAT_BY_ID_QUERY_MOCK,
- ...MESSAGE_SENT_TO_CHAT_MOCK,
- ...MESSAGE_SENT_TO_CHAT_MOCK,
- ...UserConnectionListMock,
- ...CHAT_BY_ID_QUERY_MOCK,
- ...CHATS_LIST_MOCK,
- ...UserConnectionListMock,
- ];
-
+ it('User is able to select a contact', async () => {
render(
@@ -1537,24 +1552,13 @@ describe('Testing Chat Screen [User Portal]', () => {
);
await wait();
-
expect(await screen.findByText('Messages')).toBeInTheDocument();
-
expect(
await screen.findByTestId('contactCardContainer'),
).toBeInTheDocument();
});
test('create new direct chat', async () => {
- const mock = [
- ...USER_JOINED_ORG_MOCK,
- ...GROUP_CHAT_BY_ID_QUERY_MOCK,
- ...MESSAGE_SENT_TO_CHAT_MOCK,
- ...MESSAGE_SENT_TO_CHAT_MOCK,
- ...CHAT_BY_ID_QUERY_MOCK,
- ...CHATS_LIST_MOCK,
- ...UserConnectionListMock,
- ];
render(
@@ -1572,6 +1576,7 @@ describe('Testing Chat Screen [User Portal]', () => {
const dropdown = await screen.findByTestId('dropdown');
expect(dropdown).toBeInTheDocument();
fireEvent.click(dropdown);
+
const newDirectChatBtn = await screen.findByTestId('newDirectChat');
expect(newDirectChatBtn).toBeInTheDocument();
fireEvent.click(newDirectChatBtn);
@@ -1586,16 +1591,6 @@ describe('Testing Chat Screen [User Portal]', () => {
});
test('create new group chat', async () => {
- const mock = [
- ...USER_JOINED_ORG_MOCK,
- ...GROUP_CHAT_BY_ID_QUERY_MOCK,
- ...MESSAGE_SENT_TO_CHAT_MOCK,
- ...UserConnectionListMock,
- ...MESSAGE_SENT_TO_CHAT_MOCK,
- ...CHAT_BY_ID_QUERY_MOCK,
- ...CHATS_LIST_MOCK,
- ...UserConnectionListMock,
- ];
render(
@@ -1618,6 +1613,7 @@ describe('Testing Chat Screen [User Portal]', () => {
expect(newGroupChatBtn).toBeInTheDocument();
fireEvent.click(newGroupChatBtn);
+
const closeButton = screen.getByRole('button', { name: /close/i });
expect(closeButton).toBeInTheDocument();
@@ -1625,18 +1621,6 @@ describe('Testing Chat Screen [User Portal]', () => {
});
test('sidebar', async () => {
- const mock = [
- ...USER_JOINED_ORG_MOCK,
- ...GROUP_CHAT_BY_ID_QUERY_MOCK,
- ...MESSAGE_SENT_TO_CHAT_MOCK,
- ...UserConnectionListMock,
- ...MESSAGE_SENT_TO_CHAT_MOCK,
- ...CHAT_BY_ID_QUERY_MOCK,
- ...CHATS_LIST_MOCK,
- ...UserConnectionListMock,
- ];
- setItem('userId', '1');
-
render(
@@ -1661,18 +1645,9 @@ describe('Testing Chat Screen [User Portal]', () => {
});
test('Testing sidebar when the screen size is less than or equal to 820px', async () => {
- setItem('userId', '1');
- const mock = [
- ...USER_JOINED_ORG_MOCK,
- ...GROUP_CHAT_BY_ID_QUERY_MOCK,
- ...MESSAGE_SENT_TO_CHAT_MOCK,
- ...UserConnectionListMock,
- ...MESSAGE_SENT_TO_CHAT_MOCK,
- ...CHAT_BY_ID_QUERY_MOCK,
- ...CHATS_LIST_MOCK,
- ...UserConnectionListMock,
- ];
+ // Resize window for mobile view (<= 820px)
resizeWindow(800);
+
render(
@@ -1684,12 +1659,17 @@ describe('Testing Chat Screen [User Portal]', () => {
,
);
- await wait();
- expect(screen.getByText('My Organizations')).toBeInTheDocument();
- expect(screen.getByText('Talawa User Portal')).toBeInTheDocument();
- expect(await screen.findByTestId('openMenu')).toBeInTheDocument();
- fireEvent.click(screen.getByTestId('openMenu'));
- expect(await screen.findByTestId('closeMenu')).toBeInTheDocument();
+ await waitFor(() => {
+ expect(screen.getByText('My Organizations')).toBeInTheDocument();
+ expect(screen.getByText('Talawa User Portal')).toBeInTheDocument();
+ });
+
+ const openMenuBtn = await screen.findByTestId('openMenu');
+ expect(openMenuBtn).toBeInTheDocument();
+ fireEvent.click(openMenuBtn);
+
+ const closeMenuBtn = await screen.findByTestId('closeMenu');
+ expect(closeMenuBtn).toBeInTheDocument();
});
});
diff --git a/src/utils/getRefreshToken.ts b/src/utils/getRefreshToken.ts
index 5d6f8aa2ce..90b1b55ef1 100644
--- a/src/utils/getRefreshToken.ts
+++ b/src/utils/getRefreshToken.ts
@@ -14,7 +14,7 @@ export async function refreshToken(): Promise {
const { getItem, setItem } = useLocalStorage();
const refreshToken = getItem('refreshToken');
- /* istanbul ignore next */
+
try {
const { data } = await client.mutate({
mutation: REFRESH_TOKEN_MUTATION,
From 371327e1e2340e4b12879044a9f0c780b0d34bac Mon Sep 17 00:00:00 2001
From: Abhishek Raj <113784630+abbi4code@users.noreply.github.com>
Date: Fri, 20 Dec 2024 06:52:30 +0530
Subject: [PATCH 024/133] Refactor:src/screens/UserPortal/Events from Jest to
Vitest (#2639)
* migrated UpcomingEvents tests from Jest to Vitest
* Rename UpcomingEvents.test.tsx to UpcomingEvents.spec.tsx
* add header comments for UpcomingEvents component tests
* migrated Events tests from jest to vitest
* Using hardcoded dates instead of dynamic dates to ensure
consistent behavior
* Fix: Make dates dynamic for Vitest compatibility with DatePicker
---
.../{Events.test.tsx => Events.spec.tsx} | 106 +++++++++++-------
1 file changed, 65 insertions(+), 41 deletions(-)
rename src/screens/UserPortal/Events/{Events.test.tsx => Events.spec.tsx} (83%)
diff --git a/src/screens/UserPortal/Events/Events.test.tsx b/src/screens/UserPortal/Events/Events.spec.tsx
similarity index 83%
rename from src/screens/UserPortal/Events/Events.test.tsx
rename to src/screens/UserPortal/Events/Events.spec.tsx
index 8c0b7c6912..646f5052f0 100644
--- a/src/screens/UserPortal/Events/Events.test.tsx
+++ b/src/screens/UserPortal/Events/Events.spec.tsx
@@ -1,5 +1,5 @@
import React, { act } from 'react';
-import { fireEvent, render, screen } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import { I18nextProvider } from 'react-i18next';
@@ -19,35 +19,51 @@ import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
import { ThemeProvider } from 'react-bootstrap';
import { createTheme } from '@mui/material';
import useLocalStorage from 'utils/useLocalstorage';
+import { vi } from 'vitest';
-const { setItem, getItem } = useLocalStorage();
+/**
+ * Unit tests for the Events component.
+ *
+ * This file contains tests to verify the functionality and behavior of the Events component
+ * under various scenarios, including successful event creation, date/time picker handling,
+ * calendar view toggling, and error handling. Mocked dependencies are used to ensure isolated testing.
+ */
-jest.mock('react-toastify', () => ({
+const { setItem } = useLocalStorage();
+
+vi.mock('react-toastify', () => ({
toast: {
- error: jest.fn(),
- info: jest.fn(),
- success: jest.fn(),
+ error: vi.fn(),
+ info: vi.fn(),
+ success: vi.fn(),
},
}));
-jest.mock('@mui/x-date-pickers/DatePicker', () => {
+vi.mock('@mui/x-date-pickers/DatePicker', async () => {
+ const desktopDatePickerModule = await vi.importActual(
+ '@mui/x-date-pickers/DesktopDatePicker',
+ );
return {
- DatePicker: jest.requireActual('@mui/x-date-pickers/DesktopDatePicker')
- .DesktopDatePicker,
+ DatePicker: desktopDatePickerModule.DesktopDatePicker,
};
});
-jest.mock('@mui/x-date-pickers/TimePicker', () => {
+vi.mock('@mui/x-date-pickers/TimePicker', async () => {
+ const timePickerModule = await vi.importActual(
+ '@mui/x-date-pickers/DesktopTimePicker',
+ );
return {
- TimePicker: jest.requireActual('@mui/x-date-pickers/DesktopTimePicker')
- .DesktopTimePicker,
+ TimePicker: timePickerModule.DesktopTimePicker,
};
});
-jest.mock('react-router-dom', () => ({
- ...jest.requireActual('react-router-dom'),
- useParams: () => ({ orgId: '' }),
-}));
+vi.mock('react-router-dom', async () => {
+ const actual = await vi.importActual('react-router-dom');
+ return {
+ ...actual,
+ useParams: () => ({ orgId: '' }),
+ };
+});
const theme = createTheme({
palette: {
@@ -252,19 +268,19 @@ async function wait(ms = 100): Promise {
describe('Testing Events Screen [User Portal]', () => {
Object.defineProperty(window, 'matchMedia', {
writable: true,
- value: jest.fn().mockImplementation((query) => ({
+ value: vi.fn().mockImplementation((query) => ({
matches: false,
media: query,
onchange: null,
- addListener: jest.fn(), // Deprecated
- removeListener: jest.fn(), // Deprecated
- addEventListener: jest.fn(),
- removeEventListener: jest.fn(),
- dispatchEvent: jest.fn(),
+ addListener: vi.fn(), // Deprecated
+ removeListener: vi.fn(), // Deprecated
+ addEventListener: vi.fn(),
+ removeEventListener: vi.fn(),
+ dispatchEvent: vi.fn(),
})),
});
- test('Screen should be rendered properly', async () => {
+ it('Screen should be rendered properly', async () => {
render(
@@ -283,7 +299,7 @@ describe('Testing Events Screen [User Portal]', () => {
await wait();
});
- test('Create event works as expected when event is not an all day event.', async () => {
+ it('Create event works as expected when event is not an all day event.', async () => {
render(
@@ -341,7 +357,7 @@ describe('Testing Events Screen [User Portal]', () => {
);
});
- test('Create event works as expected when event is an all day event.', async () => {
+ it('Create event works as expected when event is an all day event.', async () => {
render(
@@ -384,7 +400,7 @@ describe('Testing Events Screen [User Portal]', () => {
);
});
- test('Switch to calendar view works as expected.', async () => {
+ it('Switch to calendar view works as expected.', async () => {
render(
@@ -413,7 +429,7 @@ describe('Testing Events Screen [User Portal]', () => {
expect(screen.getByText('Sun')).toBeInTheDocument();
});
- test('Testing DatePicker and TimePicker', async () => {
+ it('Testing DatePicker and TimePicker', async () => {
render(
@@ -430,31 +446,39 @@ describe('Testing Events Screen [User Portal]', () => {
,
);
- await wait();
-
- const startDate = '03/23/2024';
- const endDate = '04/23/2024';
- const startTime = '02:00 PM';
- const endTime = '06:00 PM';
-
userEvent.click(screen.getByTestId('createEventModalBtn'));
+ // MM/DD/YYYY
+ const startDate = new Date();
+ const endDate = new Date();
+ const startTime = '08:00 AM';
+ const endTime = '10:00 AM';
+
+ await waitFor(() => {
+ expect(screen.getByLabelText('Start Date')).toBeInTheDocument();
+ expect(screen.getByLabelText('End Date')).toBeInTheDocument();
+ });
expect(endDate).not.toBeNull();
const endDateDatePicker = screen.getByLabelText('End Date');
expect(startDate).not.toBeNull();
const startDateDatePicker = screen.getByLabelText('Start Date');
+ const startDateDayjs = dayjs(startDate);
+ const endDateDayjs = dayjs(endDate);
+
fireEvent.change(startDateDatePicker, {
- target: { value: startDate },
+ target: { value: startDateDayjs.format('MM/DD/YYYY') },
});
fireEvent.change(endDateDatePicker, {
- target: { value: endDate },
+ target: { value: endDateDayjs.format('MM/DD/YYYY') },
});
- await wait();
-
- expect(endDateDatePicker).toHaveValue(endDate);
- expect(startDateDatePicker).toHaveValue(startDate);
+ await waitFor(() => {
+ expect(startDateDatePicker).toHaveValue(
+ startDateDayjs.format('MM/DD/YYYY'),
+ );
+ expect(endDateDatePicker).toHaveValue(endDateDayjs.format('MM/DD/YYYY'));
+ });
userEvent.click(screen.getByTestId('allDayEventCheck'));
@@ -475,7 +499,7 @@ describe('Testing Events Screen [User Portal]', () => {
expect(startTimePicker).toHaveValue(startTime);
});
- test('EndDate null', async () => {
+ it('EndDate null', async () => {
render(
From b1f4903d50aaea775b89b7ace361b348295b5279 Mon Sep 17 00:00:00 2001
From: Amit Bora
Date: Sat, 21 Dec 2024 05:45:08 +0530
Subject: [PATCH 025/133] Refactor styles: move SubTags.module.css styles to
app.module.css (#2538)
* Refactor styles: move SubTags.module.css styles to app.module.css
* Enhance keyboard navigation accessibility
* Color contrast issue
* Refactor styles: move SubTags.module.css styles to app.module.css
* Enhance keyboard navigation accessibility
* Color contrast issue
---
src/screens/SubTags/SubTags.module.css | 145 -----------------------
src/style/app.module.css | 156 ++++++++++++++++++++++++-
2 files changed, 154 insertions(+), 147 deletions(-)
delete mode 100644 src/screens/SubTags/SubTags.module.css
diff --git a/src/screens/SubTags/SubTags.module.css b/src/screens/SubTags/SubTags.module.css
deleted file mode 100644
index 0a210bdfa4..0000000000
--- a/src/screens/SubTags/SubTags.module.css
+++ /dev/null
@@ -1,145 +0,0 @@
-.btnsContainer {
- display: flex;
- margin: 2rem 0;
-}
-
-.btnsContainer .btnsBlock {
- display: flex;
- width: max-content;
-}
-
-.btnsContainer .btnsBlock button {
- margin-left: 1rem;
- display: flex;
- justify-content: center;
- align-items: center;
-}
-
-.btnsContainer .input {
- flex: 1;
- position: relative;
- max-width: 60%;
- justify-content: space-between;
-}
-
-.btnsContainer input {
- outline: 1px solid var(--bs-gray-400);
-}
-
-.btnsContainer .input button {
- width: 52px;
-}
-
-@media (max-width: 1020px) {
- .btnsContainer {
- flex-direction: column;
- margin: 1.5rem 0;
- }
-
- .btnsContainer .btnsBlock {
- margin: 1.5rem 0 0 0;
- justify-content: space-between;
- }
-
- .btnsContainer .btnsBlock button {
- margin: 0;
- }
-
- .btnsContainer .btnsBlock div button {
- margin-right: 1.5rem;
- }
-}
-
-/* For mobile devices */
-
-@media (max-width: 520px) {
- .btnsContainer {
- margin-bottom: 0;
- }
-
- .btnsContainer .btnsBlock {
- display: block;
- margin-top: 1rem;
- margin-right: 0;
- }
-
- .btnsContainer .btnsBlock div {
- flex: 1;
- }
-
- .btnsContainer .btnsBlock div[title='Sort organizations'] {
- margin-right: 0.5rem;
- }
-
- .btnsContainer .btnsBlock button {
- margin-bottom: 1rem;
- margin-right: 0;
- width: 100%;
- }
-}
-
-.errorContainer {
- min-height: 100vh;
-}
-
-.errorMessage {
- margin-top: 25%;
- display: flex;
- justify-content: center;
- align-items: center;
- flex-direction: column;
-}
-
-.errorIcon {
- transform: scale(1.5);
- color: var(--bs-danger);
- margin-bottom: 1rem;
-}
-
-.tableHeader {
- background-color: var(--bs-primary);
- color: var(--bs-white);
- font-size: 1rem;
-}
-.rowBackground {
- background-color: var(--bs-white);
- max-height: 120px;
-}
-
-.subTagsLink {
- color: var(--bs-blue);
- font-weight: 500;
- cursor: pointer;
-}
-
-.subTagsLink i {
- visibility: hidden;
-}
-
-.subTagsLink:hover {
- font-weight: 600;
- text-decoration: underline;
-}
-
-.subTagsLink:hover i {
- visibility: visible;
-}
-
-.tagsBreadCrumbs {
- color: var(--bs-gray);
- cursor: pointer;
-}
-
-.tagsBreadCrumbs:hover {
- color: var(--bs-blue);
- font-weight: 600;
- text-decoration: underline;
-}
-
-.subTagsScrollableDiv {
- scrollbar-width: auto;
- scrollbar-color: var(--bs-gray-400) var(--bs-white);
-
- max-height: calc(100vh - 18rem);
- overflow: auto;
-}
diff --git a/src/style/app.module.css b/src/style/app.module.css
index e2ad209d3b..982cec9672 100644
--- a/src/style/app.module.css
+++ b/src/style/app.module.css
@@ -210,7 +210,10 @@
.btnsContainer {
display: flex;
+ /* Adjust spacing between items */
margin: 2.5rem 0;
+ align-items: center;
+ gap: 10px;
}
.btnsContainer .btnsBlock {
@@ -393,6 +396,11 @@
transform: scale(1.5);
color: var(--bs-danger);
margin-bottom: 1rem;
+ /* Add error icon for non-color indication */
+ &::before {
+ content: '⚠️';
+ margin-right: 0.5rem;
+ }
}
.subTagsLink {
@@ -405,13 +413,15 @@
visibility: hidden;
}
-.subTagsLink:hover {
+.subTagsLink:hover,
+.subTagsLink:focus {
color: var(--subtle-blue-grey-hover);
font-weight: 600;
text-decoration: underline;
}
-.subTagsLink:hover i {
+.subTagsLink:hover i,
+.subTagsLink:focus i {
visibility: visible;
}
@@ -606,3 +616,145 @@ hr {
transform: rotate(360deg);
}
}
+
+.btnsContainer .btnsBlock {
+ display: flex;
+ width: max-content;
+}
+
+.btnsContainer .btnsBlock button {
+ margin-left: 1rem;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.btnsContainer .input {
+ flex: 1;
+ position: relative;
+ max-width: 60%;
+ justify-content: space-between;
+}
+
+.btnsContainer input {
+ outline: 1px solid var(--bs-gray-400);
+}
+
+.btnsContainer .input button {
+ width: 52px;
+}
+
+@media (max-width: 1020px) {
+ .btnsContainer {
+ flex-direction: column;
+ margin: 1.5rem 0;
+ }
+
+ .btnsContainer .btnsBlock {
+ margin: 1.5rem 0 0 0;
+ justify-content: space-between;
+ }
+
+ .btnsContainer .btnsBlock button {
+ margin: 0;
+ }
+
+ .btnsContainer .btnsBlock div button {
+ margin-right: 1.5rem;
+ }
+}
+
+/* For mobile devices */
+
+@media (max-width: 520px) {
+ .btnsContainer {
+ margin-bottom: 0;
+ }
+
+ .btnsContainer .btnsBlock {
+ display: block;
+ margin-top: 1rem;
+ margin-right: 0;
+ }
+
+ .btnsContainer .btnsBlock div {
+ flex: 1;
+ }
+
+ .btnsContainer .btnsBlock div[title='Sort organizations'] {
+ margin-right: 0.5rem;
+ }
+
+ .btnsContainer .btnsBlock button {
+ margin-bottom: 1rem;
+ margin-right: 0;
+ width: 100%;
+ }
+}
+
+.errorMessage {
+ margin-top: 25%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-direction: column;
+}
+
+.tableHeader {
+ background-color: var(--bs-primary-text-emphasis);
+ color: var(--bs-white);
+ font-size: 1rem;
+}
+.rowBackground {
+ background-color: var(--bs-white);
+ max-height: 120px;
+ overflow-y: auto;
+}
+
+.subTagsLink {
+ color: var(--bs-blue);
+ font-weight: 500;
+ cursor: pointer;
+ /* Prevent layout shift */
+ &::after {
+ display: block;
+ content: attr(data-text);
+ font-weight: 600;
+ height: 0;
+ overflow: hidden;
+ visibility: hidden;
+ }
+}
+
+.subTagsLink i {
+ visibility: hidden;
+}
+
+.tagsBreadCrumbs {
+ color: var(--bs-gray);
+ cursor: pointer;
+ /* Prevent layout shift */
+ &::after {
+ display: block;
+ content: attr(data-text);
+ font-weight: 600;
+ height: 0;
+ overflow: hidden;
+ visibility: hidden;
+ }
+}
+
+.tagsBreadCrumbs:hover,
+.tagsBreadCrumbs:focus {
+ color: var(--bs-blue);
+ font-weight: 600;
+ text-decoration: underline;
+}
+
+.subTagsScrollableDiv {
+ scrollbar-width: auto;
+ scrollbar-color: var(--bs-gray-400) var(--bs-white);
+
+ max-height: calc(100vh - 18rem);
+ overflow: auto;
+}
From c843926aa6f9b7cac5a4c43ddb889c07e03168be Mon Sep 17 00:00:00 2001
From: Shiva <148421597+shivasankaran18@users.noreply.github.com>
Date: Sat, 21 Dec 2024 23:27:31 +0530
Subject: [PATCH 026/133] refactor:vitest to EventVolunteers/Volunteers (#2695)
* refactor:vitest to EventVolunteers/Volunteers
* fix:coderabbit sugg
---
...test.tsx => VolunteerCreateModal.spec.tsx} | 17 +++--
...test.tsx => VolunteerDeleteModal.spec.tsx} | 17 +++--
...l.test.tsx => VolunteerViewModal.spec.tsx} | 5 +-
...olunteers.test.tsx => Volunteers.spec.tsx} | 64 +++++++++++++++++--
4 files changed, 85 insertions(+), 18 deletions(-)
rename src/screens/EventVolunteers/Volunteers/{VolunteerCreateModal.test.tsx => VolunteerCreateModal.spec.tsx} (91%)
rename src/screens/EventVolunteers/Volunteers/{VolunteerDeleteModal.test.tsx => VolunteerDeleteModal.spec.tsx} (91%)
rename src/screens/EventVolunteers/Volunteers/{VolunteerViewModal.test.tsx => VolunteerViewModal.spec.tsx} (97%)
rename src/screens/EventVolunteers/Volunteers/{Volunteers.test.tsx => Volunteers.spec.tsx} (83%)
diff --git a/src/screens/EventVolunteers/Volunteers/VolunteerCreateModal.test.tsx b/src/screens/EventVolunteers/Volunteers/VolunteerCreateModal.spec.tsx
similarity index 91%
rename from src/screens/EventVolunteers/Volunteers/VolunteerCreateModal.test.tsx
rename to src/screens/EventVolunteers/Volunteers/VolunteerCreateModal.spec.tsx
index cac8fe94f0..77fe028655 100644
--- a/src/screens/EventVolunteers/Volunteers/VolunteerCreateModal.test.tsx
+++ b/src/screens/EventVolunteers/Volunteers/VolunteerCreateModal.spec.tsx
@@ -22,11 +22,18 @@ import { toast } from 'react-toastify';
import type { InterfaceVolunteerCreateModal } from './VolunteerCreateModal';
import VolunteerCreateModal from './VolunteerCreateModal';
import userEvent from '@testing-library/user-event';
+import { vi } from 'vitest';
-jest.mock('react-toastify', () => ({
+/**
+ * Mock implementation of the `react-toastify` module.
+ * Mocks the `toast` object with `success` and `error` methods to allow testing
+ * without triggering actual toast notifications.
+ */
+
+vi.mock('react-toastify', () => ({
toast: {
- success: jest.fn(),
- error: jest.fn(),
+ success: vi.fn(),
+ error: vi.fn(),
},
}));
@@ -45,10 +52,10 @@ const t = {
const itemProps: InterfaceVolunteerCreateModal[] = [
{
isOpen: true,
- hide: jest.fn(),
+ hide: vi.fn(),
eventId: 'eventId',
orgId: 'orgId',
- refetchVolunteers: jest.fn(),
+ refetchVolunteers: vi.fn(),
},
];
diff --git a/src/screens/EventVolunteers/Volunteers/VolunteerDeleteModal.test.tsx b/src/screens/EventVolunteers/Volunteers/VolunteerDeleteModal.spec.tsx
similarity index 91%
rename from src/screens/EventVolunteers/Volunteers/VolunteerDeleteModal.test.tsx
rename to src/screens/EventVolunteers/Volunteers/VolunteerDeleteModal.spec.tsx
index dd9d6d5985..575670a887 100644
--- a/src/screens/EventVolunteers/Volunteers/VolunteerDeleteModal.test.tsx
+++ b/src/screens/EventVolunteers/Volunteers/VolunteerDeleteModal.spec.tsx
@@ -15,11 +15,18 @@ import { toast } from 'react-toastify';
import type { InterfaceDeleteVolunteerModal } from './VolunteerDeleteModal';
import VolunteerDeleteModal from './VolunteerDeleteModal';
import userEvent from '@testing-library/user-event';
+import { vi } from 'vitest';
-jest.mock('react-toastify', () => ({
+/**
+ * Mock implementation of the `react-toastify` module.
+ * Mocks the `toast` object with `success` and `error` methods to allow testing
+ * without triggering actual toast notifications.
+ */
+
+vi.mock('react-toastify', () => ({
toast: {
- success: jest.fn(),
- error: jest.fn(),
+ success: vi.fn(),
+ error: vi.fn(),
},
}));
@@ -38,8 +45,8 @@ const t = {
const itemProps: InterfaceDeleteVolunteerModal[] = [
{
isOpen: true,
- hide: jest.fn(),
- refetchVolunteers: jest.fn(),
+ hide: vi.fn(),
+ refetchVolunteers: vi.fn(),
volunteer: {
_id: 'volunteerId1',
hasAccepted: true,
diff --git a/src/screens/EventVolunteers/Volunteers/VolunteerViewModal.test.tsx b/src/screens/EventVolunteers/Volunteers/VolunteerViewModal.spec.tsx
similarity index 97%
rename from src/screens/EventVolunteers/Volunteers/VolunteerViewModal.test.tsx
rename to src/screens/EventVolunteers/Volunteers/VolunteerViewModal.spec.tsx
index 155dba8464..e99fb47d20 100644
--- a/src/screens/EventVolunteers/Volunteers/VolunteerViewModal.test.tsx
+++ b/src/screens/EventVolunteers/Volunteers/VolunteerViewModal.spec.tsx
@@ -10,6 +10,7 @@ import { store } from 'state/store';
import i18n from 'utils/i18nForTest';
import type { InterfaceVolunteerViewModal } from './VolunteerViewModal';
import VolunteerViewModal from './VolunteerViewModal';
+import { vi } from 'vitest';
const t = {
...JSON.parse(
@@ -24,7 +25,7 @@ const t = {
const itemProps: InterfaceVolunteerViewModal[] = [
{
isOpen: true,
- hide: jest.fn(),
+ hide: vi.fn(),
volunteer: {
_id: 'volunteerId1',
hasAccepted: true,
@@ -51,7 +52,7 @@ const itemProps: InterfaceVolunteerViewModal[] = [
},
{
isOpen: true,
- hide: jest.fn(),
+ hide: vi.fn(),
volunteer: {
_id: 'volunteerId2',
hasAccepted: false,
diff --git a/src/screens/EventVolunteers/Volunteers/Volunteers.test.tsx b/src/screens/EventVolunteers/Volunteers/Volunteers.spec.tsx
similarity index 83%
rename from src/screens/EventVolunteers/Volunteers/Volunteers.test.tsx
rename to src/screens/EventVolunteers/Volunteers/Volunteers.spec.tsx
index 2af25b0b84..be08ec61fb 100644
--- a/src/screens/EventVolunteers/Volunteers/Volunteers.test.tsx
+++ b/src/screens/EventVolunteers/Volunteers/Volunteers.spec.tsx
@@ -7,13 +7,14 @@ import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { I18nextProvider } from 'react-i18next';
import { Provider } from 'react-redux';
-import { MemoryRouter, Route, Routes } from 'react-router-dom';
+import { MemoryRouter, Route, Routes, useParams } from 'react-router-dom';
import { store } from 'state/store';
import { StaticMockLink } from 'utils/StaticMockLink';
import i18n from 'utils/i18nForTest';
import Volunteers from './Volunteers';
import type { ApolloLink } from '@apollo/client';
import { MOCKS, MOCKS_EMPTY, MOCKS_ERROR } from './Volunteers.mocks';
+import { vi } from 'vitest';
const link1 = new StaticMockLink(MOCKS);
const link2 = new StaticMockLink(MOCKS_ERROR);
@@ -58,19 +59,25 @@ const renderVolunteers = (link: ApolloLink): RenderResult => {
);
};
+/** Mock useParams to provide consistent test data */
+
describe('Testing Volunteers Screen', () => {
beforeAll(() => {
- jest.mock('react-router-dom', () => ({
- ...jest.requireActual('react-router-dom'),
- useParams: () => ({ orgId: 'orgId', eventId: 'eventId' }),
- }));
+ vi.mock('react-router-dom', async () => {
+ const actualDom = await vi.importActual('react-router-dom');
+ return {
+ ...actualDom,
+ useParams: vi.fn(),
+ };
+ });
});
afterAll(() => {
- jest.clearAllMocks();
+ vi.clearAllMocks();
});
it('should redirect to fallback URL if URL params are undefined', async () => {
+ vi.mocked(useParams).mockReturnValue({ orgId: '', eventId: '' });
render(
@@ -95,12 +102,21 @@ describe('Testing Volunteers Screen', () => {
});
it('should render Volunteers screen', async () => {
+ vi.mocked(useParams).mockReturnValue({
+ orgId: 'orgId',
+ eventId: 'eventId',
+ });
+
renderVolunteers(link1);
const searchInput = await screen.findByTestId('searchBy');
expect(searchInput).toBeInTheDocument();
});
it('Check Sorting Functionality', async () => {
+ vi.mocked(useParams).mockReturnValue({
+ orgId: 'orgId',
+ eventId: 'eventId',
+ });
renderVolunteers(link1);
const searchInput = await screen.findByTestId('searchBy');
expect(searchInput).toBeInTheDocument();
@@ -134,6 +150,10 @@ describe('Testing Volunteers Screen', () => {
});
it('Filter Volunteers by status (All)', async () => {
+ vi.mocked(useParams).mockReturnValue({
+ orgId: 'orgId',
+ eventId: 'eventId',
+ });
renderVolunteers(link1);
const filterBtn = await screen.findByTestId('filter');
@@ -151,6 +171,10 @@ describe('Testing Volunteers Screen', () => {
});
it('Filter Volunteers by status (Pending)', async () => {
+ vi.mocked(useParams).mockReturnValue({
+ orgId: 'orgId',
+ eventId: 'eventId',
+ });
renderVolunteers(link1);
const filterBtn = await screen.findByTestId('filter');
@@ -168,6 +192,10 @@ describe('Testing Volunteers Screen', () => {
});
it('Filter Volunteers by status (Accepted)', async () => {
+ vi.mocked(useParams).mockReturnValue({
+ orgId: 'orgId',
+ eventId: 'eventId',
+ });
renderVolunteers(link1);
const filterBtn = await screen.findByTestId('filter');
@@ -185,6 +213,10 @@ describe('Testing Volunteers Screen', () => {
});
it('Search', async () => {
+ vi.mocked(useParams).mockReturnValue({
+ orgId: 'orgId',
+ eventId: 'eventId',
+ });
renderVolunteers(link1);
const searchInput = await screen.findByTestId('searchBy');
expect(searchInput).toBeInTheDocument();
@@ -197,6 +229,10 @@ describe('Testing Volunteers Screen', () => {
});
it('should render screen with No Volunteers', async () => {
+ vi.mocked(useParams).mockReturnValue({
+ orgId: 'orgId',
+ eventId: 'eventId',
+ });
renderVolunteers(link3);
await waitFor(() => {
@@ -206,6 +242,10 @@ describe('Testing Volunteers Screen', () => {
});
it('Error while fetching volunteers data', async () => {
+ vi.mocked(useParams).mockReturnValue({
+ orgId: 'orgId',
+ eventId: 'eventId',
+ });
renderVolunteers(link2);
await waitFor(() => {
@@ -214,6 +254,10 @@ describe('Testing Volunteers Screen', () => {
});
it('Open and close Volunteer Modal (View)', async () => {
+ vi.mocked(useParams).mockReturnValue({
+ orgId: 'orgId',
+ eventId: 'eventId',
+ });
renderVolunteers(link1);
const viewItemBtn = await screen.findAllByTestId('viewItemBtn');
@@ -224,6 +268,10 @@ describe('Testing Volunteers Screen', () => {
});
it('Open and Close Volunteer Modal (Delete)', async () => {
+ vi.mocked(useParams).mockReturnValue({
+ orgId: 'orgId',
+ eventId: 'eventId',
+ });
renderVolunteers(link1);
const deleteItemBtn = await screen.findAllByTestId('deleteItemBtn');
@@ -234,6 +282,10 @@ describe('Testing Volunteers Screen', () => {
});
it('Open and close Volunteer Modal (Create)', async () => {
+ vi.mocked(useParams).mockReturnValue({
+ orgId: 'orgId',
+ eventId: 'eventId',
+ });
renderVolunteers(link1);
const addVolunteerBtn = await screen.findByTestId('addVolunteerBtn');
From 651aa71c9f8973ad7dd860a2264d3f183e136d03 Mon Sep 17 00:00:00 2001
From: Abhishek Raj <113784630+abbi4code@users.noreply.github.com>
Date: Sat, 21 Dec 2024 23:30:48 +0530
Subject: [PATCH 027/133] Refactor: src/screens/Leaderboard from Jest to Vitest
(#2694)
* chore: migrated leaderboard tests jest to vitest
* docs: Added comments for leaderboard tests
---
...derboard.test.tsx => Leaderboard.spec.tsx} | 47 ++++++++++++++++---
1 file changed, 41 insertions(+), 6 deletions(-)
rename src/screens/Leaderboard/{Leaderboard.test.tsx => Leaderboard.spec.tsx} (81%)
diff --git a/src/screens/Leaderboard/Leaderboard.test.tsx b/src/screens/Leaderboard/Leaderboard.spec.tsx
similarity index 81%
rename from src/screens/Leaderboard/Leaderboard.test.tsx
rename to src/screens/Leaderboard/Leaderboard.spec.tsx
index d2f12a9052..b4c73bef5c 100644
--- a/src/screens/Leaderboard/Leaderboard.test.tsx
+++ b/src/screens/Leaderboard/Leaderboard.spec.tsx
@@ -7,13 +7,34 @@ import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { I18nextProvider } from 'react-i18next';
import { Provider } from 'react-redux';
-import { MemoryRouter, Route, Routes } from 'react-router-dom';
+import { MemoryRouter, Route, Routes, useParams } from 'react-router-dom';
import { store } from 'state/store';
import { StaticMockLink } from 'utils/StaticMockLink';
import i18n from 'utils/i18nForTest';
import Leaderboard from './Leaderboard';
import type { ApolloLink } from '@apollo/client';
import { MOCKS, EMPTY_MOCKS, ERROR_MOCKS } from './Leaderboard.mocks';
+import { vi } from 'vitest';
+
+/**
+ * Unit tests for the Leaderboard component.
+ *
+ * This file verifies the Leaderboard's functionality in scenarios like URL handling, sorting, filtering,
+ * user interactions, and error states. Mocked dependencies and Apollo links ensure isolated testing
+ * of Redux, React Router, and internationalization integration.
+ *
+ * Key tests include:
+ * - Redirecting when parameters are missing.
+ * - Rendering with mock data, empty states, and errors.
+ * - Sorting and filtering for various timeframes.
+ * - Searching volunteers and navigating to the Member screen.
+ * - Handling errors during data fetching.
+ *
+ * Mock setups:
+ * - StaticMockLink for GraphQL responses.
+ * - Mocked `useParams` for route parameters.
+ * - Redux store and i18n for consistent state and translations.
+ */
const link1 = new StaticMockLink(MOCKS);
const link2 = new StaticMockLink(ERROR_MOCKS);
@@ -62,17 +83,21 @@ const renderLeaderboard = (link: ApolloLink): RenderResult => {
describe('Testing Leaderboard Screen', () => {
beforeAll(() => {
- jest.mock('react-router-dom', () => ({
- ...jest.requireActual('react-router-dom'),
- useParams: () => ({ orgId: 'orgId' }),
- }));
+ vi.mock('react-router-dom', async () => {
+ const originalModule = await vi.importActual('react-router-dom');
+ return {
+ ...originalModule,
+ useParams: vi.fn(),
+ };
+ });
});
afterAll(() => {
- jest.clearAllMocks();
+ vi.clearAllMocks();
});
it('should redirect to fallback URL if URL params are undefined', async () => {
+ vi.mocked(useParams).mockReturnValue({ orgId: '' });
render(
@@ -96,6 +121,7 @@ describe('Testing Leaderboard Screen', () => {
});
it('should render Leaderboard screen', async () => {
+ vi.mocked(useParams).mockReturnValue({ orgId: 'orgId' });
renderLeaderboard(link1);
await waitFor(() => {
@@ -104,6 +130,7 @@ describe('Testing Leaderboard Screen', () => {
});
it('Check Sorting Functionality', async () => {
+ vi.mocked(useParams).mockReturnValue({ orgId: 'orgId' });
renderLeaderboard(link1);
await waitFor(() => {
@@ -134,6 +161,7 @@ describe('Testing Leaderboard Screen', () => {
});
it('Check Timeframe filter Functionality (All Time)', async () => {
+ vi.mocked(useParams).mockReturnValue({ orgId: 'orgId' });
renderLeaderboard(link1);
await waitFor(() => {
@@ -154,6 +182,7 @@ describe('Testing Leaderboard Screen', () => {
});
it('Check Timeframe filter Functionality (Weekly)', async () => {
+ vi.mocked(useParams).mockReturnValue({ orgId: 'orgId' });
renderLeaderboard(link1);
await waitFor(() => {
@@ -176,6 +205,7 @@ describe('Testing Leaderboard Screen', () => {
});
it('Check Timeframe filter Functionality (Monthly)', async () => {
+ vi.mocked(useParams).mockReturnValue({ orgId: 'orgId' });
renderLeaderboard(link1);
await waitFor(() => {
@@ -196,6 +226,7 @@ describe('Testing Leaderboard Screen', () => {
});
it('Check Timeframe filter Functionality (Yearly)', async () => {
+ vi.mocked(useParams).mockReturnValue({ orgId: 'orgId' });
renderLeaderboard(link1);
await waitFor(() => {
@@ -216,6 +247,7 @@ describe('Testing Leaderboard Screen', () => {
});
it('Search Volunteers', async () => {
+ vi.mocked(useParams).mockReturnValue({ orgId: 'orgId' });
renderLeaderboard(link1);
const searchInput = await screen.findByTestId('searchBy');
@@ -232,6 +264,7 @@ describe('Testing Leaderboard Screen', () => {
});
it('OnClick of Member navigate to Member Screen', async () => {
+ vi.mocked(useParams).mockReturnValue({ orgId: 'orgId' });
renderLeaderboard(link1);
const searchInput = await screen.findByTestId('searchBy');
@@ -246,6 +279,7 @@ describe('Testing Leaderboard Screen', () => {
});
it('should render Leaderboard screen with No Volunteers', async () => {
+ vi.mocked(useParams).mockReturnValue({ orgId: 'orgId' });
renderLeaderboard(link3);
await waitFor(() => {
@@ -255,6 +289,7 @@ describe('Testing Leaderboard Screen', () => {
});
it('Error while fetching volunteer data', async () => {
+ vi.mocked(useParams).mockReturnValue({ orgId: 'orgId' });
renderLeaderboard(link2);
await waitFor(() => {
From 4144fe7c29a1a69f2adc6cde8ae91d60c38721d9 Mon Sep 17 00:00:00 2001
From: Mayank Jha <132004139+MayankJha014@users.noreply.github.com>
Date: Sat, 21 Dec 2024 23:52:27 +0530
Subject: [PATCH 028/133] Refactor: src/screens/UserPortal/Volunteer/Actions
from Jest to Vitest (#2619)
* migrate jest to vitetst
* migrate jest to vitetst
* migrate jest to vitetst ignore
* migrate jest to vitetst eslint fix
* ignore action.tsx
* migrate jest to vitetst vite config change
* coderabbitai asked changes
* revert vitest.config.ts
* fixing merge issue
* tsdoc issue fix
* Enhance the useNavigate mock implementation.
* trying to inc code range
* test failing fix
* test fix
* test fail fix trying
* fix organization issue ts
* action.spec waitfor issue fix
* excluded uncessary file
* fix test failed issue
* yearlyEvent calender coverage increase
* inc code cov
* setting revert back
* setting revert
* organisation covergae
* unwanted file
* ignoring covergae for setup.ts
* ignoring setup.ts
* revert back changes
* removing ignore comment
* schema fix
* schema fix
* test to spec
* revert test to spec
* revert pull req change
* codeai to resole
* codeai to resole
* removing spec file from jest
* code coverage fix
* code coverage fix
* code coverage fix
* code patch inc
* code patch inc
* inc path coverage for eventstatiscs
---------
Co-authored-by: Vamshi Maskuri <117595548+varshith257@users.noreply.github.com>
Co-authored-by: Mayankpulse333
---
package-lock.json | 220 ++++++++++++++++++
.../EventAttendance/EventStatistics.tsx | 7 +-
.../OrganizationScreen.test.tsx | 1 -
src/screens/UserPortal/Settings/Settings.tsx | 1 +
.../{Actions.test.tsx => Actions.spec.tsx} | 137 +++++++----
vitest.config.ts | 1 +
6 files changed, 314 insertions(+), 53 deletions(-)
rename src/screens/UserPortal/Volunteer/Actions/{Actions.test.tsx => Actions.spec.tsx} (56%)
diff --git a/package-lock.json b/package-lock.json
index d227ca252c..24478f4f69 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -99,6 +99,7 @@
"@typescript-eslint/eslint-plugin": "^8.11.0",
"@typescript-eslint/parser": "^8.5.0",
"@vitest/coverage-istanbul": "^2.1.5",
+ "@vitest/eslint-plugin": "^1.1.14",
"babel-jest": "^29.7.0",
"cross-env": "^7.0.3",
"eslint": "^8.49.0",
@@ -108,6 +109,7 @@
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.37.1",
"eslint-plugin-tsdoc": "^0.3.0",
+ "eslint-plugin-vitest": "^0.5.4",
"husky": "^9.1.6",
"identity-obj-proxy": "^3.0.0",
"jest": "^27.4.5",
@@ -6377,6 +6379,27 @@
"node": ">=18"
}
},
+ "node_modules/@vitest/eslint-plugin": {
+ "version": "1.1.14",
+ "resolved": "https://registry.npmjs.org/@vitest/eslint-plugin/-/eslint-plugin-1.1.14.tgz",
+ "integrity": "sha512-ej0cT5rUt7uvwxuu7Qxkm7fI+eaOq8vD34qGpuRoXCdvOybOlE5GDqtgvVCYbxLANkcRJfm5VDU1TnJmQRHi9g==",
+ "dev": true,
+ "license": "MIT",
+ "peerDependencies": {
+ "@typescript-eslint/utils": ">= 8.0",
+ "eslint": ">= 8.57.0",
+ "typescript": ">= 5.0.0",
+ "vitest": "*"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ },
+ "vitest": {
+ "optional": true
+ }
+ }
+ },
"node_modules/@vitest/expect": {
"version": "2.1.8",
"resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.8.tgz",
@@ -6757,6 +6780,16 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/array-union": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/array.prototype.findlast": {
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
@@ -8996,6 +9029,19 @@
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg=="
},
+ "node_modules/dir-glob": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+ "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "path-type": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/doctrine": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -9869,6 +9915,159 @@
"@microsoft/tsdoc-config": "0.17.0"
}
},
+ "node_modules/eslint-plugin-vitest": {
+ "version": "0.5.4",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-vitest/-/eslint-plugin-vitest-0.5.4.tgz",
+ "integrity": "sha512-um+odCkccAHU53WdKAw39MY61+1x990uXjSPguUCq3VcEHdqJrOb8OTMrbYlY6f9jAKx7x98kLVlIe3RJeJqoQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@typescript-eslint/utils": "^7.7.1"
+ },
+ "engines": {
+ "node": "^18.0.0 || >= 20.0.0"
+ },
+ "peerDependencies": {
+ "eslint": "^8.57.0 || ^9.0.0",
+ "vitest": "*"
+ },
+ "peerDependenciesMeta": {
+ "@typescript-eslint/eslint-plugin": {
+ "optional": true
+ },
+ "vitest": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/eslint-plugin-vitest/node_modules/@typescript-eslint/scope-manager": {
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
+ "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@typescript-eslint/types": "7.18.0",
+ "@typescript-eslint/visitor-keys": "7.18.0"
+ },
+ "engines": {
+ "node": "^18.18.0 || >=20.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/eslint-plugin-vitest/node_modules/@typescript-eslint/types": {
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+ "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": "^18.18.0 || >=20.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/eslint-plugin-vitest/node_modules/@typescript-eslint/typescript-estree": {
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
+ "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "dependencies": {
+ "@typescript-eslint/types": "7.18.0",
+ "@typescript-eslint/visitor-keys": "7.18.0",
+ "debug": "^4.3.4",
+ "globby": "^11.1.0",
+ "is-glob": "^4.0.3",
+ "minimatch": "^9.0.4",
+ "semver": "^7.6.0",
+ "ts-api-utils": "^1.3.0"
+ },
+ "engines": {
+ "node": "^18.18.0 || >=20.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/eslint-plugin-vitest/node_modules/@typescript-eslint/utils": {
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
+ "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@eslint-community/eslint-utils": "^4.4.0",
+ "@typescript-eslint/scope-manager": "7.18.0",
+ "@typescript-eslint/types": "7.18.0",
+ "@typescript-eslint/typescript-estree": "7.18.0"
+ },
+ "engines": {
+ "node": "^18.18.0 || >=20.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "eslint": "^8.56.0"
+ }
+ },
+ "node_modules/eslint-plugin-vitest/node_modules/@typescript-eslint/visitor-keys": {
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
+ "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@typescript-eslint/types": "7.18.0",
+ "eslint-visitor-keys": "^3.4.3"
+ },
+ "engines": {
+ "node": "^18.18.0 || >=20.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/eslint-plugin-vitest/node_modules/brace-expansion": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "balanced-match": "^1.0.0"
+ }
+ },
+ "node_modules/eslint-plugin-vitest/node_modules/minimatch": {
+ "version": "9.0.5",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+ "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "brace-expansion": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=16 || 14 >=14.17"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
"node_modules/eslint-visitor-keys": {
"version": "3.4.3",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
@@ -10863,6 +11062,27 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/globby": {
+ "version": "11.1.0",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+ "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "array-union": "^2.1.0",
+ "dir-glob": "^3.0.1",
+ "fast-glob": "^3.2.9",
+ "ignore": "^5.2.0",
+ "merge2": "^1.4.1",
+ "slash": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/globrex": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
diff --git a/src/components/EventManagement/EventAttendance/EventStatistics.tsx b/src/components/EventManagement/EventAttendance/EventStatistics.tsx
index 5dda9e88a8..686ad049fa 100644
--- a/src/components/EventManagement/EventAttendance/EventStatistics.tsx
+++ b/src/components/EventManagement/EventAttendance/EventStatistics.tsx
@@ -119,9 +119,8 @@ export const AttendanceStatisticsModal: React.FC<
try {
const eventDate = new Date(event.startDate);
if (Number.isNaN(eventDate.getTime())) {
- /*istanbul ignore next*/
console.error(`Invalid date for event: ${event._id}`);
- /*istanbul ignore next*/
+
return 'Invalid date';
}
return eventDate.toLocaleDateString('en-US', {
@@ -129,12 +128,11 @@ export const AttendanceStatisticsModal: React.FC<
day: 'numeric',
});
} catch (error) {
- /*istanbul ignore next*/
console.error(
`Error formatting date for event: ${event._id}`,
error,
);
- /*istanbul ignore next*/
+
return 'Invalid date';
}
})();
@@ -325,7 +323,6 @@ export const AttendanceStatisticsModal: React.FC<
exportToCSV(data, `${selectedCategory.toLowerCase()}_demographics.csv`);
}, [selectedCategory, categoryLabels, categoryData]);
- /*istanbul ignore next*/
const handleExport = (eventKey: string | null): void => {
switch (eventKey) {
case 'trends':
diff --git a/src/components/OrganizationScreen/OrganizationScreen.test.tsx b/src/components/OrganizationScreen/OrganizationScreen.test.tsx
index 0dfb6d7a14..913c038ab9 100644
--- a/src/components/OrganizationScreen/OrganizationScreen.test.tsx
+++ b/src/components/OrganizationScreen/OrganizationScreen.test.tsx
@@ -85,7 +85,6 @@ describe('Testing OrganizationScreen', () => {
const openButton = screen.getByTestId('openMenu');
fireEvent.click(openButton);
- // Check for expand class after opening
expect(screen.getByTestId('mainpageright')).toHaveClass(styles.contract);
});
diff --git a/src/screens/UserPortal/Settings/Settings.tsx b/src/screens/UserPortal/Settings/Settings.tsx
index 6038879b7f..cc222468fc 100644
--- a/src/screens/UserPortal/Settings/Settings.tsx
+++ b/src/screens/UserPortal/Settings/Settings.tsx
@@ -91,6 +91,7 @@ export default function settings(): JSX.Element {
* This function sends a mutation request to update the user details
* and reloads the page on success.
*/
+
/*istanbul ignore next*/
const handleUpdateUserDetails = async (): Promise => {
try {
diff --git a/src/screens/UserPortal/Volunteer/Actions/Actions.test.tsx b/src/screens/UserPortal/Volunteer/Actions/Actions.spec.tsx
similarity index 56%
rename from src/screens/UserPortal/Volunteer/Actions/Actions.test.tsx
rename to src/screens/UserPortal/Volunteer/Actions/Actions.spec.tsx
index ce64d98adf..dea26c5fe1 100644
--- a/src/screens/UserPortal/Volunteer/Actions/Actions.test.tsx
+++ b/src/screens/UserPortal/Volunteer/Actions/Actions.spec.tsx
@@ -1,3 +1,10 @@
+/**
+ * Unit tests for the Actions component.
+ *
+ * This file contains tests for the Actions component to ensure it behaves as expected
+ * under various scenarios.
+ */
+
import React, { act } from 'react';
import { MockedProvider } from '@apollo/react-testing';
import { LocalizationProvider } from '@mui/x-date-pickers';
@@ -15,6 +22,7 @@ import Actions from './Actions';
import type { ApolloLink } from '@apollo/client';
import { MOCKS, EMPTY_MOCKS, ERROR_MOCKS } from './Actions.mocks';
import useLocalStorage from 'utils/useLocalstorage';
+import { describe, it, beforeAll, beforeEach, afterAll, vi } from 'vitest';
const { setItem } = useLocalStorage();
@@ -39,6 +47,18 @@ const debounceWait = async (ms = 300): Promise => {
});
});
};
+const mockNavigate = vi.fn();
+
+const expectVitestToBeInTheDocument = (element: HTMLElement): void => {
+ expect(element).toBeInTheDocument();
+};
+
+const expectElementToHaveTextContent = (
+ element: HTMLElement,
+ text: string,
+): void => {
+ expect(element).toHaveTextContent(text);
+};
const renderActions = (link: ApolloLink): RenderResult => {
return render(
@@ -64,10 +84,13 @@ const renderActions = (link: ApolloLink): RenderResult => {
describe('Testing Actions Screen', () => {
beforeAll(() => {
- jest.mock('react-router-dom', () => ({
- ...jest.requireActual('react-router-dom'),
- useParams: () => ({ orgId: 'orgId' }),
- }));
+ vi.mock('react-router-dom', async () => {
+ const actual = await vi.importActual('react-router-dom'); // Import the actual implementation
+ return {
+ ...actual,
+ useNavigate: () => mockNavigate, // Replace useNavigate with the mock
+ };
+ });
});
beforeEach(() => {
@@ -75,7 +98,7 @@ describe('Testing Actions Screen', () => {
});
afterAll(() => {
- jest.clearAllMocks();
+ vi.restoreAllMocks();
});
it('should redirect to fallback URL if URL params are undefined', async () => {
@@ -99,95 +122,109 @@ describe('Testing Actions Screen', () => {
);
await waitFor(() => {
- expect(screen.getByTestId('paramsError')).toBeInTheDocument();
+ expectVitestToBeInTheDocument(screen.getByTestId('paramsError'));
});
});
it('should render Actions screen', async () => {
renderActions(link1);
- const searchInput = await screen.findByTestId('searchBy');
- expect(searchInput).toBeInTheDocument();
+ await waitFor(async () => {
+ const searchInput = await screen.findByTestId('searchBy');
+ expectVitestToBeInTheDocument(searchInput);
- const assigneeName = await screen.findAllByTestId('assigneeName');
- expect(assigneeName[0]).toHaveTextContent('Teresa Bradley');
+ const assigneeName = await screen.findAllByTestId('assigneeName');
+ expectElementToHaveTextContent(assigneeName[0], 'Teresa Bradley');
+ });
});
it('Check Sorting Functionality', async () => {
renderActions(link1);
+
const searchInput = await screen.findByTestId('searchBy');
- expect(searchInput).toBeInTheDocument();
+ expectVitestToBeInTheDocument(searchInput);
let sortBtn = await screen.findByTestId('sort');
- expect(sortBtn).toBeInTheDocument();
+ expectVitestToBeInTheDocument(sortBtn);
// Sort by dueDate_DESC
fireEvent.click(sortBtn);
const dueDateDESC = await screen.findByTestId('dueDate_DESC');
- expect(dueDateDESC).toBeInTheDocument();
+ expectVitestToBeInTheDocument(dueDateDESC);
fireEvent.click(dueDateDESC);
- let assigneeName = await screen.findAllByTestId('assigneeName');
- expect(assigneeName[0]).toHaveTextContent('Group 1');
+ await waitFor(() => {
+ const assigneeName = screen.getAllByTestId('assigneeName');
+ expectElementToHaveTextContent(assigneeName[0], 'Group 1');
+ });
// Sort by dueDate_ASC
sortBtn = await screen.findByTestId('sort');
- expect(sortBtn).toBeInTheDocument();
+ expectVitestToBeInTheDocument(sortBtn);
fireEvent.click(sortBtn);
const dueDateASC = await screen.findByTestId('dueDate_ASC');
- expect(dueDateASC).toBeInTheDocument();
+ expectVitestToBeInTheDocument(dueDateASC);
fireEvent.click(dueDateASC);
- assigneeName = await screen.findAllByTestId('assigneeName');
- expect(assigneeName[0]).toHaveTextContent('Teresa Bradley');
+ await waitFor(() => {
+ const assigneeName = screen.getAllByTestId('assigneeName');
+ expectElementToHaveTextContent(assigneeName[0], 'Teresa Bradley');
+ });
});
it('Search by Assignee name', async () => {
renderActions(link1);
- const searchInput = await screen.findByTestId('searchBy');
- expect(searchInput).toBeInTheDocument();
+ await waitFor(async () => {
+ const searchInput = await screen.findByTestId('searchBy');
+ expectVitestToBeInTheDocument(searchInput);
- const searchToggle = await screen.findByTestId('searchByToggle');
- expect(searchToggle).toBeInTheDocument();
- userEvent.click(searchToggle);
+ const searchToggle = await screen.findByTestId('searchByToggle');
+ expectVitestToBeInTheDocument(searchToggle);
+ userEvent.click(searchToggle);
- const searchByAssignee = await screen.findByTestId('assignee');
- expect(searchByAssignee).toBeInTheDocument();
- userEvent.click(searchByAssignee);
+ const searchByAssignee = await screen.findByTestId('assignee');
+ expectVitestToBeInTheDocument(searchByAssignee);
+ userEvent.click(searchByAssignee);
- userEvent.type(searchInput, '1');
+ userEvent.type(searchInput, '1');
+ });
await debounceWait();
- const assigneeName = await screen.findAllByTestId('assigneeName');
- expect(assigneeName[0]).toHaveTextContent('Group 1');
+ await waitFor(async () => {
+ const assigneeName = await screen.findAllByTestId('assigneeName');
+ expectElementToHaveTextContent(assigneeName[0], 'Group 1');
+ });
});
it('Search by Category name', async () => {
renderActions(link1);
- const searchInput = await screen.findByTestId('searchBy');
- expect(searchInput).toBeInTheDocument();
+ await waitFor(async () => {
+ const searchInput = await screen.findByTestId('searchBy');
+ expectVitestToBeInTheDocument(searchInput);
- const searchToggle = await screen.findByTestId('searchByToggle');
- expect(searchToggle).toBeInTheDocument();
- userEvent.click(searchToggle);
+ const searchToggle = await screen.findByTestId('searchByToggle');
+ expectVitestToBeInTheDocument(searchToggle);
+ userEvent.click(searchToggle);
- const searchByCategory = await screen.findByTestId('category');
- expect(searchByCategory).toBeInTheDocument();
- userEvent.click(searchByCategory);
+ const searchByCategory = await screen.findByTestId('category');
+ expectVitestToBeInTheDocument(searchByCategory);
+ userEvent.click(searchByCategory);
- // Search by name on press of ENTER
- userEvent.type(searchInput, '1');
+ userEvent.type(searchInput, '1');
+ });
await debounceWait();
- const assigneeName = await screen.findAllByTestId('assigneeName');
- expect(assigneeName[0]).toHaveTextContent('Teresa Bradley');
+ await waitFor(() => {
+ const assigneeName = screen.getAllByTestId('assigneeName');
+ expectElementToHaveTextContent(assigneeName[0], 'Teresa Bradley');
+ });
});
it('should render screen with No Actions', async () => {
renderActions(link3);
await waitFor(() => {
- expect(screen.getByTestId('searchBy')).toBeInTheDocument();
- expect(screen.getByText(t.noActionItems)).toBeInTheDocument();
+ expectVitestToBeInTheDocument(screen.getByTestId('searchBy'));
+ expectVitestToBeInTheDocument(screen.getByText(t.noActionItems));
});
});
@@ -195,7 +232,7 @@ describe('Testing Actions Screen', () => {
renderActions(link2);
await waitFor(() => {
- expect(screen.getByTestId('errorMsg')).toBeInTheDocument();
+ expectVitestToBeInTheDocument(screen.getByTestId('errorMsg'));
});
});
@@ -205,7 +242,10 @@ describe('Testing Actions Screen', () => {
const checkbox = await screen.findAllByTestId('statusCheckbox');
userEvent.click(checkbox[0]);
- expect(await screen.findByText(t.actionItemStatus)).toBeInTheDocument();
+ await waitFor(async () => {
+ const element = await screen.findByText(t.actionItemStatus); // Resolve the promise
+ expectVitestToBeInTheDocument(element); // Now assert the resolved element
+ });
userEvent.click(await screen.findByTestId('modalCloseBtn'));
});
@@ -215,7 +255,10 @@ describe('Testing Actions Screen', () => {
const viewItemBtn = await screen.findAllByTestId('viewItemBtn');
userEvent.click(viewItemBtn[0]);
- expect(await screen.findByText(t.actionItemDetails)).toBeInTheDocument();
+ await waitFor(() => {
+ expectVitestToBeInTheDocument(screen.getByText(t.actionItemDetails));
+ });
+
userEvent.click(await screen.findByTestId('modalCloseBtn'));
});
});
diff --git a/vitest.config.ts b/vitest.config.ts
index c158cf9c2a..3d071e7534 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -31,6 +31,7 @@ export default defineConfig({
'**/*.d.ts',
'src/test/**',
'vitest.config.ts',
+ 'vitest.setup.ts', // Exclude from coverage if necessary
],
reporter: ['text', 'html', 'text-summary', 'lcov'],
},
From 4831b84174e7bb669fa00cba80f066bcf151c250 Mon Sep 17 00:00:00 2001
From: Peter Harrison <16875803+palisadoes@users.noreply.github.com>
Date: Sat, 21 Dec 2024 10:23:25 -0800
Subject: [PATCH 029/133] Update pull-request.yml
---
.github/workflows/pull-request.yml | 49 +++++++++++++++---------------
1 file changed, 25 insertions(+), 24 deletions(-)
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 5096758ea5..fb6505324e 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -253,33 +253,34 @@ jobs:
path: "./coverage/lcov.info"
min_coverage: 0.0
- Graphql-Inspector:
- if: ${{ github.actor != 'dependabot[bot]' }}
- name: Runs Introspection on the GitHub talawa-api repo on the schema.graphql file
- runs-on: ubuntu-latest
- steps:
- - name: Checkout the Repository
- uses: actions/checkout@v4
-
- - name: Set up Node.js
- uses: actions/setup-node@v4
- with:
- node-version: '22.x'
-
- - name: resolve dependency
- run: npm install -g @graphql-inspector/cli
+ # Graphql-Inspector:
+ # if: ${{ github.actor != 'dependabot[bot]' }}
+ # name: Runs Introspection on the GitHub talawa-api repo on the schema.graphql file
+ # runs-on: ubuntu-latest
+ # steps:
+ # - name: Checkout the Repository
+ # uses: actions/checkout@v4
+
+ # - name: Set up Node.js
+ # uses: actions/setup-node@v4
+ # with:
+ # node-version: '22.x'
+
+ # - name: resolve dependency
+ # run: npm install -g @graphql-inspector/cli
- - name: Clone API Repository
- run: |
- # Retrieve the complete branch name directly from the GitHub context
- FULL_BRANCH_NAME=${{ github.base_ref }}
- echo "FULL_Branch_NAME: $FULL_BRANCH_NAME"
+ # - name: Clone API Repository
+ # run: |
+ # # Retrieve the complete branch name directly from the GitHub context
+ # FULL_BRANCH_NAME=${{ github.base_ref }}
+ # echo "FULL_Branch_NAME: $FULL_BRANCH_NAME"
- # Clone the specified repository using the extracted branch name
- git clone --branch $FULL_BRANCH_NAME https://github.com/PalisadoesFoundation/talawa-api && ls -a
+ # # Clone the specified repository using the extracted branch name
+ # git clone --branch $FULL_BRANCH_NAME https://github.com/PalisadoesFoundation/talawa-api && ls -a
- - name: Validate Documents
- run: graphql-inspector validate './src/GraphQl/**/*.ts' './talawa-api/schema.graphql'
+ # - name: Validate Documents
+ # run: graphql-inspector validate './src/GraphQl/**/*.ts' './talawa-api/schema.graphql'
+
Start-App-Without-Docker:
name: Check if Talawa Admin app starts (No Docker)
runs-on: ubuntu-latest
From 7bf7ab14f082723697bb6c8663e63854fd5409a3 Mon Sep 17 00:00:00 2001
From: Abhishek Raj <113784630+abbi4code@users.noreply.github.com>
Date: Sun, 22 Dec 2024 00:07:24 +0530
Subject: [PATCH 030/133] Refactor: src/screens/OrganizationDashboard from Jest
to Vitest (#2678)
* migrate OrganizationDashboard tests from Jest to Vitest and fixed all the failing tests
* chore: Removed debug console.log statements
---------
Co-authored-by: Vamshi Maskuri <117595548+varshith257@users.noreply.github.com>
---
.../OrganizationScreen.test.tsx | 2 -
...est.tsx => OrganizationDashboard.spec.tsx} | 56 +++++++++++++++----
2 files changed, 45 insertions(+), 13 deletions(-)
rename src/screens/OrganizationDashboard/{OrganizationDashboard.test.tsx => OrganizationDashboard.spec.tsx} (81%)
diff --git a/src/components/OrganizationScreen/OrganizationScreen.test.tsx b/src/components/OrganizationScreen/OrganizationScreen.test.tsx
index 913c038ab9..9bb95bbd4a 100644
--- a/src/components/OrganizationScreen/OrganizationScreen.test.tsx
+++ b/src/components/OrganizationScreen/OrganizationScreen.test.tsx
@@ -90,10 +90,8 @@ describe('Testing OrganizationScreen', () => {
test('handles window resize', () => {
renderComponent();
-
window.innerWidth = 800;
fireEvent(window, new Event('resize'));
-
expect(screen.getByTestId('mainpageright')).toHaveClass(styles.expand);
});
});
diff --git a/src/screens/OrganizationDashboard/OrganizationDashboard.test.tsx b/src/screens/OrganizationDashboard/OrganizationDashboard.spec.tsx
similarity index 81%
rename from src/screens/OrganizationDashboard/OrganizationDashboard.test.tsx
rename to src/screens/OrganizationDashboard/OrganizationDashboard.spec.tsx
index 88db2aa737..b7b4e05a37 100644
--- a/src/screens/OrganizationDashboard/OrganizationDashboard.test.tsx
+++ b/src/screens/OrganizationDashboard/OrganizationDashboard.spec.tsx
@@ -7,7 +7,7 @@ import { render, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { I18nextProvider } from 'react-i18next';
import { Provider } from 'react-redux';
-import { MemoryRouter, Route, Routes } from 'react-router-dom';
+import { MemoryRouter, Route, Routes, useParams } from 'react-router-dom';
import { store } from 'state/store';
import { StaticMockLink } from 'utils/StaticMockLink';
import i18n from 'utils/i18nForTest';
@@ -15,11 +15,25 @@ import OrganizationDashboard from './OrganizationDashboard';
import type { ApolloLink } from '@apollo/client';
import { MOCKS, EMPTY_MOCKS, ERROR_MOCKS } from './OrganizationDashboardMocks';
import { toast } from 'react-toastify';
-
-jest.mock('react-toastify', () => ({
+import { vi } from 'vitest';
+
+/**
+ * This file contains unit tests for the OrganizationDashboard component.
+ *
+ * The tests cover:
+ * - Behavior when URL parameters are undefined, including redirection to fallback URLs.
+ * - Rendering of key sections, such as dashboard cards, upcoming events, latest posts, membership requests, and volunteer rankings.
+ * - Functionality of user interactions with dashboard elements (e.g., navigation via clicks on cards and buttons).
+ * - Handling of scenarios with empty data or errors in GraphQL responses.
+ * - Integration with mocked GraphQL queries and toast notifications.
+ *
+ * These tests are implemented using Vitest for test execution and MockedProvider for mocking GraphQL queries.
+ */
+
+vi.mock('react-toastify', () => ({
toast: {
- success: jest.fn(),
- error: jest.fn(),
+ success: vi.fn(),
+ error: vi.fn(),
},
}));
@@ -89,40 +103,48 @@ const renderOrganizationDashboard = (link: ApolloLink): RenderResult => {
describe('Testing Organization Dashboard Screen', () => {
beforeAll(() => {
- jest.mock('react-router-dom', () => ({
- ...jest.requireActual('react-router-dom'),
- useParams: () => ({ orgId: 'orgId' }),
- }));
+ vi.mock('react-router-dom', async () => {
+ const originalModule = await vi.importActual('react-router-dom');
+ return {
+ ...originalModule,
+ useParams: vi.fn(),
+ };
+ });
});
afterAll(() => {
- jest.clearAllMocks();
+ vi.clearAllMocks();
});
it('should redirect to fallback URL if URL params are undefined', async () => {
+ vi.mocked(useParams).mockReturnValue({});
render(
-
{/* Header with search, filter and Create Button */}
-
+
{
setSearchValue(e.target.value);
@@ -282,7 +282,7 @@ function requests(): JSX.Element {
= ({
src={leader.image}
alt="Volunteer"
data-testid="leader_image"
- className={styles.TableImage}
+ className={styles.TableImages}
/>
) : (
= ({
src={creator.image}
alt="Volunteer"
data-testid="creator_image"
- className={styles.TableImage}
+ className={styles.TableImages}
/>
) : (
{
return (
{
const { _id, firstName, lastName, image } = params.row.leader;
return (
@@ -194,14 +194,14 @@ function volunteerGroups(): JSX.Element {
src={image}
alt="Assignee"
data-testid={`image${_id + 1}`}
- className={styles.TableImage}
+ className={styles.TableImages}
/>
) : (
@@ -235,7 +235,7 @@ function volunteerGroups(): JSX.Element {
align: 'center',
headerAlign: 'center',
sortable: false,
- headerClassName: `${styles.tableHeader}`,
+ headerClassName: `${styles.tableHeaders}`,
renderCell: (params: GridCellParams) => {
return (
@@ -252,7 +252,7 @@ function volunteerGroups(): JSX.Element {
minWidth: 100,
headerAlign: 'center',
sortable: false,
- headerClassName: `${styles.tableHeader}`,
+ headerClassName: `${styles.tableHeaders}`,
renderCell: (params: GridCellParams) => {
return (
<>
@@ -293,7 +293,7 @@ function volunteerGroups(): JSX.Element {
return (
{/* Header with search, filter and Create Button */}
-
+
{
setSearchValue(e.target.value);
@@ -325,7 +325,7 @@ function volunteerGroups(): JSX.Element {
= ({
src={user.image}
alt="Volunteer"
data-testid="volunteer_image"
- className={styles.TableImage}
+ className={styles.TableImages}
/>
) : (
{
const { _id, firstName, lastName, image } = params.row.user;
return (
@@ -192,7 +192,7 @@ function volunteers(): JSX.Element {
src={image}
alt="volunteer"
data-testid="volunteer_image"
- className={styles.TableImage}
+ className={styles.TableImages}
/>
) : (
@@ -200,7 +200,7 @@ function volunteers(): JSX.Element {
key={_id + '1'}
dataTestId="volunteer_avatar"
containerStyle={styles.imageContainer}
- avatarStyle={styles.TableImage}
+ avatarStyle={styles.TableImages}
name={firstName + ' ' + lastName}
alt={firstName + ' ' + lastName}
/>
@@ -219,7 +219,7 @@ function volunteers(): JSX.Element {
minWidth: 100,
headerAlign: 'center',
sortable: false,
- headerClassName: `${styles.tableHeader}`,
+ headerClassName: `${styles.tableHeaders}`,
renderCell: (params: GridCellParams) => {
return (
{
return (
{
return (
@@ -278,7 +278,7 @@ function volunteers(): JSX.Element {
minWidth: 100,
headerAlign: 'center',
sortable: false,
- headerClassName: `${styles.tableHeader}`,
+ headerClassName: `${styles.tableHeaders}`,
renderCell: (params: GridCellParams) => {
return (
<>
@@ -310,7 +310,7 @@ function volunteers(): JSX.Element {
return (
{/* Header with search, filter and Create Button */}
-
+
{
setSearchValue(e.target.value);
@@ -341,7 +341,7 @@ function volunteers(): JSX.Element {
From 685a12c3566e4d32f02da96a7e8a65bdaee2bed9 Mon Sep 17 00:00:00 2001
From: Mayank Jha <132004139+MayankJha014@users.noreply.github.com>
Date: Mon, 23 Dec 2024 03:46:05 +0530
Subject: [PATCH 039/133] manage tag css to app.module (#2722)
* manage tag css to app.module
* coderaddit ai chnages
---
src/screens/ManageTag/ManageTag.module.css | 127 ---------------------
src/style/app.module.css | 40 ++++---
2 files changed, 23 insertions(+), 144 deletions(-)
delete mode 100644 src/screens/ManageTag/ManageTag.module.css
diff --git a/src/screens/ManageTag/ManageTag.module.css b/src/screens/ManageTag/ManageTag.module.css
deleted file mode 100644
index deecd4a9b7..0000000000
--- a/src/screens/ManageTag/ManageTag.module.css
+++ /dev/null
@@ -1,127 +0,0 @@
-.btnsContainer {
- display: flex;
- margin: 2rem 0;
-}
-
-.btnsContainer .btnsBlock {
- display: flex;
- width: max-content;
-}
-
-.btnsContainer .btnsBlock button {
- margin-left: 1rem;
- display: flex;
- justify-content: center;
- align-items: center;
-}
-
-.btnsContainer .input {
- flex: 1;
- position: relative;
- max-width: 60%;
- justify-content: space-between;
-}
-
-.btnsContainer input {
- outline: 1px solid var(--bs-gray-400);
-}
-
-.btnsContainer .input button {
- width: 52px;
-}
-
-@media (max-width: 1020px) {
- .btnsContainer {
- flex-direction: column;
- margin: 1.5rem 0;
- }
-
- .btnsContainer .btnsBlock {
- margin: 1.5rem 0 0 0;
- justify-content: space-between;
- }
-
- .btnsContainer .btnsBlock button {
- margin: 0;
- }
-
- .btnsContainer .btnsBlock div button {
- margin-right: 1.5rem;
- }
-}
-
-/* For mobile devices */
-
-@media (max-width: 520px) {
- .btnsContainer {
- margin-bottom: 0;
- }
-
- .btnsContainer .btnsBlock {
- display: block;
- margin-top: 1rem;
- margin-right: 0;
- }
-
- .btnsContainer .btnsBlock div {
- flex: 1;
- }
-
- .btnsContainer .btnsBlock div[title='Sort organizations'] {
- margin-right: 0.5rem;
- }
-
- .btnsContainer .btnsBlock button {
- margin-bottom: 1rem;
- margin-right: 0;
- width: 100%;
- }
-}
-
-.errorContainer {
- min-height: 100vh;
-}
-
-.errorMessage {
- margin-top: 25%;
- display: flex;
- justify-content: center;
- align-items: center;
- flex-direction: column;
-}
-
-.errorIcon {
- transform: scale(1.5);
- color: var(--bs-danger);
- margin-bottom: 1rem;
-}
-
-.tableHeader {
- background-color: var(--bs-primary);
- color: var(--bs-white);
- font-size: 1rem;
-}
-
-.rowBackground {
- background-color: var(--bs-white);
- max-height: 120px;
-}
-
-.tagsBreadCrumbs {
- color: var(--bs-gray);
- cursor: pointer;
-}
-
-.tagsBreadCrumbs:hover {
- color: var(--bs-blue);
- font-weight: 600;
- text-decoration: underline;
-}
-
-.manageTagScrollableDiv {
- scrollbar-width: thin;
- scrollbar-color: var(--bs-gray-400) var(--bs-white);
-
- max-height: calc(100vh - 18rem);
- overflow: auto;
-}
diff --git a/src/style/app.module.css b/src/style/app.module.css
index 365b00556b..56dc7e8854 100644
--- a/src/style/app.module.css
+++ b/src/style/app.module.css
@@ -218,6 +218,7 @@
.btnsContainer .btnsBlock {
display: flex;
+ width: max-content;
}
.btnsContainer .btnsBlock button {
@@ -230,6 +231,12 @@
.btnsContainer .input {
flex: 1;
position: relative;
+ max-width: 60%;
+ justify-content: space-between;
+}
+
+.btnsContainer input {
+ outline: 1px solid var(--bs-gray-400);
}
.btnsContainer .input button {
@@ -363,6 +370,8 @@
.rowBackground {
background-color: var(--row-background);
+ max-height: 120px;
+ overflow-y: auto;
}
.tableHeader {
@@ -430,6 +439,20 @@
cursor: pointer;
}
+.manageTagScrollableDiv {
+ scrollbar-width: thin;
+ scrollbar-color: var(--bs-gray-400) var(--bs-white);
+
+ max-height: calc(100vh - 18rem);
+ overflow: auto;
+}
+
+.tagsBreadCrumbs:hover {
+ color: var(--bs-blue);
+ font-weight: 600;
+ text-decoration: underline;
+}
+
.orgUserTagsScrollableDiv {
scrollbar-width: auto;
scrollbar-color: var(--bs-gray-400) var(--bs-white);
@@ -727,11 +750,6 @@ hr {
}
}
-.btnsContainer .btnsBlock {
- display: flex;
- width: max-content;
-}
-
.btnsContainer .btnsBlock button {
margin-left: 1rem;
display: flex;
@@ -739,13 +757,6 @@ hr {
align-items: center;
}
-.btnsContainer .input {
- flex: 1;
- position: relative;
- max-width: 60%;
- justify-content: space-between;
-}
-
.btnsContainer input {
outline: 1px solid var(--bs-gray-400);
}
@@ -815,11 +826,6 @@ hr {
color: var(--bs-white);
font-size: 1rem;
}
-.rowBackground {
- background-color: var(--bs-white);
- max-height: 120px;
- overflow-y: auto;
-}
.subTagsLink {
color: var(--bs-blue);
From e31ccf655d122726fef4d87a29f9dcf85d966763 Mon Sep 17 00:00:00 2001
From: Syed Ali Ul Hasan
Date: Mon, 23 Dec 2024 03:55:50 +0530
Subject: [PATCH 040/133] refactored
src/screens/UserPortal/Volunteer/Invitations from jest to vitest (#2723)
---
...itations.test.tsx => Invitations.spec.tsx} | 25 +++++++++++--------
1 file changed, 14 insertions(+), 11 deletions(-)
rename src/screens/UserPortal/Volunteer/Invitations/{Invitations.test.tsx => Invitations.spec.tsx} (96%)
diff --git a/src/screens/UserPortal/Volunteer/Invitations/Invitations.test.tsx b/src/screens/UserPortal/Volunteer/Invitations/Invitations.spec.tsx
similarity index 96%
rename from src/screens/UserPortal/Volunteer/Invitations/Invitations.test.tsx
rename to src/screens/UserPortal/Volunteer/Invitations/Invitations.spec.tsx
index 2c0cafc6a9..867f95c1aa 100644
--- a/src/screens/UserPortal/Volunteer/Invitations/Invitations.test.tsx
+++ b/src/screens/UserPortal/Volunteer/Invitations/Invitations.spec.tsx
@@ -21,14 +21,24 @@ import {
} from './Invitations.mocks';
import { toast } from 'react-toastify';
import useLocalStorage from 'utils/useLocalstorage';
+import { vi, expect } from 'vitest';
-jest.mock('react-toastify', () => ({
+vi.mock('react-toastify', () => ({
toast: {
- success: jest.fn(),
- error: jest.fn(),
+ success: vi.fn(),
+ error: vi.fn(),
},
}));
+vi.mock('react-router-dom', async () => {
+ const actual = await vi.importActual('react-router-dom');
+ return {
+ ...actual,
+ useParams: () => ({ orgId: 'orgId' }),
+ useNavigate: vi.fn(),
+ };
+});
+
const { setItem } = useLocalStorage();
const link1 = new StaticMockLink(MOCKS);
@@ -79,19 +89,12 @@ const renderInvitations = (link: ApolloLink): RenderResult => {
};
describe('Testing Invvitations Screen', () => {
- beforeAll(() => {
- jest.mock('react-router-dom', () => ({
- ...jest.requireActual('react-router-dom'),
- useParams: () => ({ orgId: 'orgId' }),
- }));
- });
-
beforeEach(() => {
setItem('userId', 'userId');
});
afterAll(() => {
- jest.clearAllMocks();
+ vi.clearAllMocks();
});
it('should redirect to fallback URL if URL params are undefined', async () => {
From cda28369f4a71e8a7175b9bd4c7916251e647792 Mon Sep 17 00:00:00 2001
From: khushi santosh patil
<143253539+khushipatil1523@users.noreply.github.com>
Date: Mon, 23 Dec 2024 04:02:55 +0530
Subject: [PATCH 041/133] convert from jest to vitest #2486 (#2705)
* convert from jest to vitest
* changes done
* changes done
* changes done
---
...ments.test.tsx => Advertisements.spec.tsx} | 41 +++++++++++--------
1 file changed, 24 insertions(+), 17 deletions(-)
rename src/components/Advertisements/{Advertisements.test.tsx => Advertisements.spec.tsx} (96%)
diff --git a/src/components/Advertisements/Advertisements.test.tsx b/src/components/Advertisements/Advertisements.spec.tsx
similarity index 96%
rename from src/components/Advertisements/Advertisements.test.tsx
rename to src/components/Advertisements/Advertisements.spec.tsx
index 88bbb1255c..1e2d92b392 100644
--- a/src/components/Advertisements/Advertisements.test.tsx
+++ b/src/components/Advertisements/Advertisements.spec.tsx
@@ -1,4 +1,6 @@
import React, { act } from 'react';
+import { describe, test, expect, vi } from 'vitest';
+
import {
ApolloClient,
ApolloLink,
@@ -7,25 +9,28 @@ import {
InMemoryCache,
} from '@apollo/client';
import { MockedProvider } from '@apollo/client/testing';
+
import { fireEvent, render, screen } from '@testing-library/react';
-import 'jest-location-mock';
import type { DocumentNode, NormalizedCacheObject } from '@apollo/client';
import userEvent from '@testing-library/user-event';
import { BACKEND_URL } from 'Constant/constant';
-import { ADD_ADVERTISEMENT_MUTATION } from 'GraphQl/Mutations/mutations';
+
+import { ADD_ADVERTISEMENT_MUTATION } from '../../GraphQl/Mutations/mutations';
import {
ORGANIZATIONS_LIST,
ORGANIZATION_ADVERTISEMENT_LIST,
PLUGIN_GET,
-} from 'GraphQl/Queries/Queries';
+} from '../../GraphQl/Queries/Queries';
+
import { I18nextProvider } from 'react-i18next';
+
import { Provider } from 'react-redux';
import { BrowserRouter } from 'react-router-dom';
import { ToastContainer } from 'react-toastify';
-import { store } from 'state/store';
-import i18nForTest from 'utils/i18nForTest';
-import useLocalStorage from 'utils/useLocalstorage';
+import { store } from '../../state/store';
+import i18nForTest from '../../utils/i18nForTest';
+import useLocalStorage from '../../utils/useLocalstorage';
import Advertisement from './Advertisements';
const { getItem } = useLocalStorage();
@@ -50,18 +55,22 @@ const client: ApolloClient = new ApolloClient({
link: ApolloLink.from([httpLink]),
});
-jest.mock('components/AddOn/support/services/Plugin.helper', () => ({
+vi.mock('components/AddOn/support/services/Plugin.helper', () => ({
__esModule: true,
- default: jest.fn().mockImplementation(() => ({
- fetchInstalled: jest.fn().mockResolvedValue([]),
- fetchStore: jest.fn().mockResolvedValue([]),
+ default: vi.fn().mockImplementation(() => ({
+ fetchInstalled: vi.fn().mockResolvedValue([]),
+ fetchStore: vi.fn().mockResolvedValue([]),
})),
}));
let mockID: string | undefined = '1';
-jest.mock('react-router-dom', () => ({
- ...jest.requireActual('react-router-dom'),
- useParams: () => ({ orgId: mockID }),
-}));
+
+vi.mock('react-router-dom', async () => {
+ const actual = await vi.importActual('react-router-dom');
+ return {
+ ...actual,
+ useParams: () => ({ orgId: mockID }),
+ };
+});
const today = new Date();
const tomorrow = today;
@@ -466,18 +475,16 @@ describe('Testing Advertisement Component', () => {
/\b(?:Sun|Mon|Tue|Wed|Thu|Fri|Sat)\s+(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+(\d{1,2})\s+(\d{4})\b/,
);
let dateObject = new Date();
-
if (dateMatch) {
const monthName = dateMatch[1];
const day = parseInt(dateMatch[2], 10);
const year = parseInt(dateMatch[3], 10);
-
const monthIndex =
'JanFebMarAprMayJunJulAugSepOctNovDec'.indexOf(monthName) / 3;
dateObject = new Date(year, monthIndex, day);
}
-
+ console.log(dateObject);
expect(dateObject.getTime()).toBeLessThan(new Date().getTime());
});
From 986bef80972fef714745a932d77f890cf3d1dbf7 Mon Sep 17 00:00:00 2001
From: Peter Harrison <16875803+palisadoes@users.noreply.github.com>
Date: Sun, 22 Dec 2024 14:33:24 -0800
Subject: [PATCH 042/133] Revert "convert from jest to vitest #2486 (#2705)"
(#2731)
This reverts commit cda28369f4a71e8a7175b9bd4c7916251e647792.
---
...ments.spec.tsx => Advertisements.test.tsx} | 41 ++++++++-----------
1 file changed, 17 insertions(+), 24 deletions(-)
rename src/components/Advertisements/{Advertisements.spec.tsx => Advertisements.test.tsx} (96%)
diff --git a/src/components/Advertisements/Advertisements.spec.tsx b/src/components/Advertisements/Advertisements.test.tsx
similarity index 96%
rename from src/components/Advertisements/Advertisements.spec.tsx
rename to src/components/Advertisements/Advertisements.test.tsx
index 1e2d92b392..88bbb1255c 100644
--- a/src/components/Advertisements/Advertisements.spec.tsx
+++ b/src/components/Advertisements/Advertisements.test.tsx
@@ -1,6 +1,4 @@
import React, { act } from 'react';
-import { describe, test, expect, vi } from 'vitest';
-
import {
ApolloClient,
ApolloLink,
@@ -9,28 +7,25 @@ import {
InMemoryCache,
} from '@apollo/client';
import { MockedProvider } from '@apollo/client/testing';
-
import { fireEvent, render, screen } from '@testing-library/react';
+import 'jest-location-mock';
import type { DocumentNode, NormalizedCacheObject } from '@apollo/client';
import userEvent from '@testing-library/user-event';
import { BACKEND_URL } from 'Constant/constant';
-
-import { ADD_ADVERTISEMENT_MUTATION } from '../../GraphQl/Mutations/mutations';
+import { ADD_ADVERTISEMENT_MUTATION } from 'GraphQl/Mutations/mutations';
import {
ORGANIZATIONS_LIST,
ORGANIZATION_ADVERTISEMENT_LIST,
PLUGIN_GET,
-} from '../../GraphQl/Queries/Queries';
-
+} from 'GraphQl/Queries/Queries';
import { I18nextProvider } from 'react-i18next';
-
import { Provider } from 'react-redux';
import { BrowserRouter } from 'react-router-dom';
import { ToastContainer } from 'react-toastify';
-import { store } from '../../state/store';
-import i18nForTest from '../../utils/i18nForTest';
-import useLocalStorage from '../../utils/useLocalstorage';
+import { store } from 'state/store';
+import i18nForTest from 'utils/i18nForTest';
+import useLocalStorage from 'utils/useLocalstorage';
import Advertisement from './Advertisements';
const { getItem } = useLocalStorage();
@@ -55,22 +50,18 @@ const client: ApolloClient = new ApolloClient({
link: ApolloLink.from([httpLink]),
});
-vi.mock('components/AddOn/support/services/Plugin.helper', () => ({
+jest.mock('components/AddOn/support/services/Plugin.helper', () => ({
__esModule: true,
- default: vi.fn().mockImplementation(() => ({
- fetchInstalled: vi.fn().mockResolvedValue([]),
- fetchStore: vi.fn().mockResolvedValue([]),
+ default: jest.fn().mockImplementation(() => ({
+ fetchInstalled: jest.fn().mockResolvedValue([]),
+ fetchStore: jest.fn().mockResolvedValue([]),
})),
}));
let mockID: string | undefined = '1';
-
-vi.mock('react-router-dom', async () => {
- const actual = await vi.importActual('react-router-dom');
- return {
- ...actual,
- useParams: () => ({ orgId: mockID }),
- };
-});
+jest.mock('react-router-dom', () => ({
+ ...jest.requireActual('react-router-dom'),
+ useParams: () => ({ orgId: mockID }),
+}));
const today = new Date();
const tomorrow = today;
@@ -475,16 +466,18 @@ describe('Testing Advertisement Component', () => {
/\b(?:Sun|Mon|Tue|Wed|Thu|Fri|Sat)\s+(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+(\d{1,2})\s+(\d{4})\b/,
);
let dateObject = new Date();
+
if (dateMatch) {
const monthName = dateMatch[1];
const day = parseInt(dateMatch[2], 10);
const year = parseInt(dateMatch[3], 10);
+
const monthIndex =
'JanFebMarAprMayJunJulAugSepOctNovDec'.indexOf(monthName) / 3;
dateObject = new Date(year, monthIndex, day);
}
- console.log(dateObject);
+
expect(dateObject.getTime()).toBeLessThan(new Date().getTime());
});
From 3c6f6dae1f1aa00dc64a99331a167669b8a52375 Mon Sep 17 00:00:00 2001
From: IITI-tushar <165766280+IITI-tushar@users.noreply.github.com>
Date: Mon, 23 Dec 2024 04:05:16 +0530
Subject: [PATCH 043/133] Add AdvertisementEntry.spec.tsx for Vitest migration
(#2680)
* Add AdvertisementEntry.spec.tsx for Vitest migration
* Update AdvertisementEntry.spec.tsx removes eslint-disable
* Update AdvertisementEntry.spec.tsx
* Update AdvertisementEntry.spec.tsx
* Update AdvertisementEntry.spec.tsx
* Update AdvertisementEntry.spec.tsx
* Update AdvertisementEntry.spec.tsx
* Update AdvertisementEntry.spec.tsx
* Update AdvertisementEntry.spec.tsx
* Update AdvertisementEntry.spec.tsx
* Update AdvertisementEntry.spec.tsx
* Update AdvertisementEntry.spec.tsx
---
.../AdvertisementEntry.spec.tsx | 649 ++++++++++++++++++
1 file changed, 649 insertions(+)
create mode 100644 src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.spec.tsx
diff --git a/src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.spec.tsx b/src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.spec.tsx
new file mode 100644
index 0000000000..4d27df6e22
--- /dev/null
+++ b/src/components/Advertisements/core/AdvertisementEntry/AdvertisementEntry.spec.tsx
@@ -0,0 +1,649 @@
+import React from 'react';
+import { render, fireEvent, waitFor, screen } from '@testing-library/react';
+import {
+ ApolloClient,
+ ApolloProvider,
+ InMemoryCache,
+ ApolloLink,
+ HttpLink,
+} from '@apollo/client';
+import type { NormalizedCacheObject } from '@apollo/client';
+import { BrowserRouter } from 'react-router-dom';
+import AdvertisementEntry from './AdvertisementEntry';
+import AdvertisementRegister from '../AdvertisementRegister/AdvertisementRegister';
+import { Provider } from 'react-redux';
+import { store } from 'state/store';
+import { BACKEND_URL } from 'Constant/constant';
+import i18nForTest from 'utils/i18nForTest';
+import { I18nextProvider } from 'react-i18next';
+import dayjs from 'dayjs';
+import useLocalStorage from 'utils/useLocalstorage';
+import { MockedProvider } from '@apollo/client/testing';
+import { ORGANIZATION_ADVERTISEMENT_LIST } from 'GraphQl/Queries/OrganizationQueries';
+import { DELETE_ADVERTISEMENT_BY_ID } from 'GraphQl/Mutations/mutations';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import '@testing-library/jest-dom';
+
+const { getItem } = useLocalStorage();
+
+const httpLink = new HttpLink({
+ uri: BACKEND_URL,
+ headers: {
+ authorization: 'Bearer ' + getItem('token') || '',
+ },
+});
+const translations = JSON.parse(
+ JSON.stringify(
+ i18nForTest.getDataByLanguage('en')?.translation?.advertisement ?? null,
+ ),
+);
+
+const client: ApolloClient = new ApolloClient({
+ cache: new InMemoryCache(),
+ link: ApolloLink.from([httpLink]),
+});
+
+const mockUseMutation = vi.fn();
+vi.mock('@apollo/client', async () => {
+ const actual = await vi.importActual('@apollo/client');
+ return {
+ ...actual,
+ useMutation: () => mockUseMutation(),
+ };
+});
+
+vi.mock('react-router-dom', async () => {
+ const actual = await vi.importActual('react-router-dom');
+ return {
+ ...actual,
+ useParams: () => ({ orgId: '1' }),
+ };
+});
+
+describe('Testing Advertisement Entry Component', () => {
+ beforeEach(() => {
+ vi.clearAllMocks();
+ });
+
+ it('Testing rendering and deleting of advertisement', async () => {
+ const deleteAdByIdMock = vi.fn();
+ mockUseMutation.mockReturnValue([deleteAdByIdMock]);
+ const { getByTestId, getAllByText } = render(
+
+
+
+
+
+
+
+ ,
+ );
+
+ //Testing rendering
+ expect(getByTestId('AdEntry')).toBeInTheDocument();
+ expect(getAllByText('POPUP')[0]).toBeInTheDocument();
+ expect(getAllByText('Advert1')[0]).toBeInTheDocument();
+ expect(screen.getByTestId('media')).toBeInTheDocument();
+
+ //Testing successful deletion
+ fireEvent.click(getByTestId('moreiconbtn'));
+ fireEvent.click(getByTestId('deletebtn'));
+
+ await waitFor(() => {
+ expect(screen.getByTestId('delete_title')).toBeInTheDocument();
+ expect(screen.getByTestId('delete_body')).toBeInTheDocument();
+ });
+
+ fireEvent.click(getByTestId('delete_yes'));
+
+ await waitFor(() => {
+ expect(deleteAdByIdMock).toHaveBeenCalledWith({
+ variables: {
+ id: '1',
+ },
+ });
+ const deletedMessage = screen.queryByText('Advertisement Deleted');
+ expect(deletedMessage).toBeNull();
+ });
+
+ //Testing unsuccessful deletion
+ deleteAdByIdMock.mockRejectedValueOnce(new Error('Deletion Failed'));
+
+ fireEvent.click(getByTestId('moreiconbtn'));
+
+ fireEvent.click(getByTestId('delete_yes'));
+
+ await waitFor(() => {
+ expect(deleteAdByIdMock).toHaveBeenCalledWith({
+ variables: {
+ id: '1',
+ },
+ });
+ const deletionFailedText = screen.queryByText((content, element) => {
+ return (
+ element?.textContent === 'Deletion Failed' &&
+ element.tagName.toLowerCase() === 'div'
+ );
+ });
+ expect(deletionFailedText).toBeNull();
+ });
+ });
+
+ it('should use default props when none are provided', () => {
+ render(
+ ,
+ : void {
+ throw new Error('Function not implemented.');
+ }}
+ />,
+ );
+
+ //Check if component renders with default ''(empty string)
+ const elements = screen.getAllByText(''); // This will return an array of matching elements
+ elements.forEach((element) => expect(element).toBeInTheDocument());
+
+ // Check that the component renders with default `mediaUrl` (empty string)
+ const mediaElement = screen.getByTestId('media');
+ expect(mediaElement).toHaveAttribute('src', '');
+
+ // Check that the component renders with default `endDate`
+ const defaultEndDate = new Date().toDateString();
+ expect(screen.getByText(`Ends on ${defaultEndDate}`)).toBeInTheDocument();
+
+ // Check that the component renders with default `startDate`
+ const defaultStartDate = new Date().toDateString();
+ expect(screen.getByText(`Ends on ${defaultStartDate}`)).toBeInTheDocument(); //fix text "Ends on"?
+ });
+
+ it('should correctly override default props when values are provided', () => {
+ const mockName = 'Test Ad';
+ const mockType = 'Banner';
+ const mockMediaUrl = 'https://example.com/media.png';
+ const mockEndDate = new Date(2025, 11, 31);
+ const mockStartDate = new Date(2024, 0, 1);
+ const mockOrganizationId = 'org123';
+
+ const { getByText } = render(
+ ,
+ : void {
+ throw new Error('Function not implemented.');
+ }}
+ />,
+ );
+
+ // Check that the component renders with provided values
+ expect(getByText(mockName)).toBeInTheDocument();
+ expect(getByText(mockType)).toBeInTheDocument();
+ expect(screen.getByTestId('media')).toHaveAttribute('src', mockMediaUrl);
+ expect(
+ getByText(`Ends on ${mockEndDate.toDateString()}`),
+ ).toBeInTheDocument();
+ });
+
+ it('should open and close the dropdown when options button is clicked', () => {
+ const { getByTestId, queryByText, getAllByText } = render(
+
+
+
+
+
+
+
+ ,
+ );
+
+ // Test initial rendering
+ expect(getByTestId('AdEntry')).toBeInTheDocument();
+ expect(getAllByText('POPUP')[0]).toBeInTheDocument();
+ expect(getAllByText('Advert1')[0]).toBeInTheDocument();
+
+ // Test dropdown functionality
+ const optionsButton = getByTestId('moreiconbtn');
+
+ // Initially, the dropdown should not be visible
+ expect(queryByText('Edit')).toBeNull();
+
+ // Click to open the dropdown
+ fireEvent.click(optionsButton);
+
+ // After clicking the button, the dropdown should be visible
+ expect(queryByText('Edit')).toBeInTheDocument();
+
+ // Click again to close the dropdown
+ fireEvent.click(optionsButton);
+
+ // After the second click, the dropdown should be hidden again
+ expect(queryByText('Edit')).toBeNull();
+ });
+
+ it('Updates the advertisement and shows success toast on successful update', async () => {
+ const updateAdByIdMock = vi.fn().mockResolvedValue({
+ data: {
+ updateAdvertisement: {
+ advertisement: {
+ _id: '1',
+ name: 'Updated Advertisement',
+ mediaUrl: '',
+ startDate: dayjs(new Date()).add(1, 'day').format('YYYY-MM-DD'),
+ endDate: dayjs(new Date()).add(2, 'days').format('YYYY-MM-DD'),
+ type: 'BANNER',
+ },
+ },
+ },
+ });
+
+ mockUseMutation.mockReturnValue([updateAdByIdMock]);
+
+ render(
+
+
+
+
+
+
+
+ ,
+ );
+
+ const optionsButton = screen.getByTestId('moreiconbtn');
+ fireEvent.click(optionsButton);
+ fireEvent.click(screen.getByTestId('editBtn'));
+
+ fireEvent.change(screen.getByLabelText('Enter name of Advertisement'), {
+ target: { value: 'Updated Advertisement' },
+ });
+
+ expect(screen.getByLabelText('Enter name of Advertisement')).toHaveValue(
+ 'Updated Advertisement',
+ );
+
+ fireEvent.change(screen.getByLabelText(translations.Rtype), {
+ target: { value: 'BANNER' },
+ });
+ expect(screen.getByLabelText(translations.Rtype)).toHaveValue('BANNER');
+
+ fireEvent.change(screen.getByLabelText(translations.RstartDate), {
+ target: { value: dayjs().add(1, 'day').format('YYYY-MM-DD') },
+ });
+
+ fireEvent.change(screen.getByLabelText(translations.RendDate), {
+ target: { value: dayjs().add(2, 'days').format('YYYY-MM-DD') },
+ });
+
+ fireEvent.click(screen.getByTestId('addonupdate'));
+
+ expect(updateAdByIdMock).toHaveBeenCalledWith({
+ variables: {
+ id: '1',
+ name: 'Updated Advertisement',
+ type: 'BANNER',
+ startDate: dayjs().add(1, 'day').format('YYYY-MM-DD'),
+ endDate: dayjs().add(2, 'days').format('YYYY-MM-DD'),
+ },
+ });
+ });
+
+ it('Simulating if the mutation doesnt have data variable while updating', async () => {
+ const updateAdByIdMock = vi.fn().mockResolvedValue({
+ updateAdvertisement: {
+ _id: '1',
+ name: 'Updated Advertisement',
+ type: 'BANNER',
+ },
+ });
+
+ mockUseMutation.mockReturnValue([updateAdByIdMock]);
+
+ render(
+
+
+
+
+
+
+
+ ,
+ );
+
+ const optionsButton = screen.getByTestId('moreiconbtn');
+ fireEvent.click(optionsButton);
+ fireEvent.click(screen.getByTestId('editBtn'));
+
+ fireEvent.change(screen.getByLabelText('Enter name of Advertisement'), {
+ target: { value: 'Updated Advertisement' },
+ });
+
+ expect(screen.getByLabelText('Enter name of Advertisement')).toHaveValue(
+ 'Updated Advertisement',
+ );
+
+ fireEvent.change(screen.getByLabelText(translations.Rtype), {
+ target: { value: 'BANNER' },
+ });
+ expect(screen.getByLabelText(translations.Rtype)).toHaveValue('BANNER');
+
+ fireEvent.click(screen.getByTestId('addonupdate'));
+
+ expect(updateAdByIdMock).toHaveBeenCalledWith({
+ variables: {
+ id: '1',
+ name: 'Updated Advertisement',
+ type: 'BANNER',
+ },
+ });
+ });
+
+ it('Simulating if the mutation does not have data variable while registering', async () => {
+ vi.stubGlobal('location', {
+ reload: vi.fn(),
+ href: 'https://example.com/page/id=1',
+ });
+
+ const createAdByIdMock = vi.fn().mockResolvedValue({
+ data1: {
+ createAdvertisement: {
+ _id: '1',
+ },
+ },
+ });
+
+ mockUseMutation.mockReturnValue([createAdByIdMock]);
+
+ render(
+
+
+
+
+ {
+
+
+
+ ,
+ );
+
+ fireEvent.click(screen.getByTestId('createAdvertisement'));
+
+ fireEvent.change(screen.getByLabelText('Enter name of Advertisement'), {
+ target: { value: 'Updated Advertisement' },
+ });
+
+ expect(screen.getByLabelText('Enter name of Advertisement')).toHaveValue(
+ 'Updated Advertisement',
+ );
+
+ fireEvent.change(screen.getByLabelText(translations.Rtype), {
+ target: { value: 'BANNER' },
+ });
+ expect(screen.getByLabelText(translations.Rtype)).toHaveValue('BANNER');
+
+ fireEvent.change(screen.getByLabelText(translations.RstartDate), {
+ target: { value: '2023-01-01' },
+ });
+ expect(screen.getByLabelText(translations.RstartDate)).toHaveValue(
+ '2023-01-01',
+ );
+
+ fireEvent.change(screen.getByLabelText(translations.RendDate), {
+ target: { value: '2023-02-01' },
+ });
+ expect(screen.getByLabelText(translations.RendDate)).toHaveValue(
+ '2023-02-01',
+ );
+
+ fireEvent.click(screen.getByTestId('addonregister'));
+
+ expect(createAdByIdMock).toHaveBeenCalledWith({
+ variables: {
+ organizationId: '1',
+ name: 'Updated Advertisement',
+ file: '',
+ type: 'BANNER',
+ startDate: dayjs(new Date('2023-01-01')).format('YYYY-MM-DD'),
+ endDate: dayjs(new Date('2023-02-01')).format('YYYY-MM-DD'),
+ },
+ });
+ });
+
+ it('delete advertisement', async () => {
+ const deleteAdByIdMock = vi.fn();
+ const mocks = [
+ {
+ request: {
+ query: ORGANIZATION_ADVERTISEMENT_LIST,
+ variables: {
+ id: '1',
+ first: 2,
+ after: null,
+ last: null,
+ before: null,
+ },
+ },
+ result: {
+ data: {
+ organizations: [
+ {
+ _id: '1',
+ advertisements: {
+ edges: [
+ {
+ node: {
+ _id: '1',
+ name: 'Advertisement1',
+ startDate: '2022-01-01',
+ endDate: '2023-01-01',
+ mediaUrl: 'http://example1.com',
+ },
+ cursor: 'cursor1',
+ },
+ {
+ node: {
+ _id: '2',
+ name: 'Advertisement2',
+ startDate: '2024-02-01',
+ endDate: '2025-02-01',
+ mediaUrl: 'http://example2.com',
+ },
+ cursor: 'cursor2',
+ },
+ {
+ node: {
+ _id: '3',
+ name: 'Advertisement1',
+ startDate: '2022-01-01',
+ endDate: '2023-01-01',
+ mediaUrl: 'http://example1.com',
+ },
+ cursor: 'cursor3',
+ },
+ {
+ node: {
+ _id: '4',
+ name: 'Advertisement2',
+ startDate: '2024-02-01',
+ endDate: '2025-02-01',
+ mediaUrl: 'http://example2.com',
+ },
+ cursor: 'cursor4',
+ },
+ {
+ node: {
+ _id: '5',
+ name: 'Advertisement1',
+ startDate: '2022-01-01',
+ endDate: '2023-01-01',
+ mediaUrl: 'http://example1.com',
+ },
+ cursor: 'cursor5',
+ },
+ {
+ node: {
+ _id: '6',
+ name: 'Advertisement2',
+ startDate: '2024-02-01',
+ endDate: '2025-02-01',
+ mediaUrl: 'http://example2.com',
+ },
+ cursor: 'cursor6',
+ },
+ ],
+ pageInfo: {
+ startCursor: 'cursor1',
+ endCursor: 'cursor6',
+ hasNextPage: true,
+ hasPreviousPage: false,
+ },
+ totalCount: 8,
+ },
+ },
+ ],
+ },
+ },
+ },
+ {
+ request: {
+ query: DELETE_ADVERTISEMENT_BY_ID,
+ variables: {
+ id: '1',
+ },
+ },
+ result: {
+ data: {
+ advertisements: {
+ _id: null,
+ },
+ },
+ },
+ },
+ ];
+ mockUseMutation.mockReturnValue([deleteAdByIdMock]);
+ const { getByTestId, getAllByText } = render(
+
+
+
+
+
+
+
+
+
+ ,
+ );
+
+ //Testing rendering
+ expect(getByTestId('AdEntry')).toBeInTheDocument();
+ expect(getAllByText('POPUP')[0]).toBeInTheDocument();
+ expect(getAllByText('Advert1')[0]).toBeInTheDocument();
+ expect(screen.getByTestId('media')).toBeInTheDocument();
+
+ //Testing successful deletion
+ fireEvent.click(getByTestId('moreiconbtn'));
+ fireEvent.click(getByTestId('deletebtn'));
+
+ await waitFor(() => {
+ expect(screen.getByTestId('delete_title')).toBeInTheDocument();
+ expect(screen.getByTestId('delete_body')).toBeInTheDocument();
+ });
+
+ fireEvent.click(getByTestId('delete_yes'));
+
+ await waitFor(() => {
+ expect(deleteAdByIdMock).toHaveBeenCalledWith({
+ variables: {
+ id: '1',
+ },
+ });
+ const deletedMessage = screen.queryByText('Advertisement Deleted');
+ expect(deletedMessage).toBeNull();
+ });
+
+ //Testing unsuccessful deletion
+ deleteAdByIdMock.mockRejectedValueOnce(new Error('Deletion Failed'));
+
+ fireEvent.click(getByTestId('moreiconbtn'));
+
+ fireEvent.click(getByTestId('delete_yes'));
+
+ await waitFor(() => {
+ expect(deleteAdByIdMock).toHaveBeenCalledWith({
+ variables: {
+ id: '1',
+ },
+ });
+ const deletionFailedText = screen.queryByText((content, element) => {
+ return (
+ element?.textContent === 'Deletion Failed' &&
+ element.tagName.toLowerCase() === 'div'
+ );
+ });
+ expect(deletionFailedText).toBeNull();
+ });
+ });
+});
From 8633bc67eb4cfbcdeb9dc0b608683fcf17f715a6 Mon Sep 17 00:00:00 2001
From: IITI-tushar <165766280+IITI-tushar@users.noreply.github.com>
Date: Mon, 23 Dec 2024 04:06:27 +0530
Subject: [PATCH 044/133] update and rename Settings.test.tsx to
Settings.spec.tsx fixes #2579 (#2718)
* Update and rename Settings.test.tsx to Settings.spec.tsx
* Update Settings.spec.tsx- removed-deprecated-methods-suggested-by-coderabbit
---
.../{Settings.test.tsx => Settings.spec.tsx} | 38 +++++++++----------
1 file changed, 17 insertions(+), 21 deletions(-)
rename src/screens/UserPortal/Settings/{Settings.test.tsx => Settings.spec.tsx} (92%)
diff --git a/src/screens/UserPortal/Settings/Settings.test.tsx b/src/screens/UserPortal/Settings/Settings.spec.tsx
similarity index 92%
rename from src/screens/UserPortal/Settings/Settings.test.tsx
rename to src/screens/UserPortal/Settings/Settings.spec.tsx
index fd9e1ed350..39d853862f 100644
--- a/src/screens/UserPortal/Settings/Settings.test.tsx
+++ b/src/screens/UserPortal/Settings/Settings.spec.tsx
@@ -1,5 +1,6 @@
-import React, { act } from 'react';
-import { fireEvent, render, screen } from '@testing-library/react';
+import React from 'react';
+import { describe, expect, beforeAll, vi } from 'vitest';
+import { render, screen, fireEvent, act } from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import { I18nextProvider } from 'react-i18next';
import { UPDATE_USER_MUTATION } from 'GraphQl/Mutations/mutations';
@@ -119,31 +120,27 @@ const resizeWindow = (width: number): void => {
async function wait(ms = 100): Promise {
await act(async () => {
- return new Promise((resolve) => {
- setTimeout(resolve, ms);
- });
+ vi.advanceTimersByTime(ms);
});
}
describe('Testing Settings Screen [User Portal]', () => {
- // Mock implementation of matchMedia
beforeAll(() => {
+ vi.useFakeTimers();
Object.defineProperty(window, 'matchMedia', {
writable: true,
- value: jest.fn().mockImplementation((query) => ({
+ value: vi.fn().mockImplementation((query) => ({
matches: false,
media: query,
onchange: null,
- addListener: jest.fn(), // Deprecated
- removeListener: jest.fn(), // Deprecated
- addEventListener: jest.fn(),
- removeEventListener: jest.fn(),
- dispatchEvent: jest.fn(),
+ addEventListener: vi.fn(),
+ removeEventListener: vi.fn(),
+ dispatchEvent: vi.fn(),
})),
});
});
- test('Screen should be rendered properly', async () => {
+ it('Screen should be rendered properly', async () => {
await act(async () => {
render(
@@ -163,7 +160,7 @@ describe('Testing Settings Screen [User Portal]', () => {
expect(screen.queryAllByText('Settings')).not.toBe([]);
});
- test('input works properly', async () => {
+ it('input works properly', async () => {
await act(async () => {
render(
@@ -220,7 +217,7 @@ describe('Testing Settings Screen [User Portal]', () => {
expect(screen.getByTestId('profile-picture')).toBeInTheDocument();
});
- test('resetChangesBtn works properly', async () => {
+ it('resetChangesBtn works properly', async () => {
await act(async () => {
render(
@@ -253,7 +250,7 @@ describe('Testing Settings Screen [User Portal]', () => {
expect(screen.getByLabelText('Birth Date')).toHaveValue('2024-03-01');
});
- test('resetChangesBtn works properly when the details are empty', async () => {
+ it('resetChangesBtn works properly when the details are empty', async () => {
await act(async () => {
render(
@@ -286,7 +283,7 @@ describe('Testing Settings Screen [User Portal]', () => {
expect(screen.getByLabelText('Birth Date')).toHaveValue('');
});
- test('sidebar', async () => {
+ it('sidebar', async () => {
await act(async () => {
render(
@@ -311,7 +308,7 @@ describe('Testing Settings Screen [User Portal]', () => {
act(() => openMenuBtn.click());
});
- test('Testing sidebar when the screen size is less than or equal to 820px', async () => {
+ it('Testing sidebar when the screen size is less than or equal to 820px', async () => {
resizeWindow(800);
await act(async () => {
render(
@@ -328,7 +325,6 @@ describe('Testing Settings Screen [User Portal]', () => {
});
await wait();
-
screen.debug();
const openMenuBtn = screen.queryByTestId('openMenu');
@@ -348,7 +344,7 @@ describe('Testing Settings Screen [User Portal]', () => {
}
});
- test('renders events attended card correctly', async () => {
+ it('renders events attended card correctly', async () => {
render(
@@ -368,7 +364,7 @@ describe('Testing Settings Screen [User Portal]', () => {
expect(screen.getByText('No Events Attended')).toBeInTheDocument();
});
- test('renders events attended card correctly with events', async () => {
+ it('renders events attended card correctly with events', async () => {
const mockEventsAttended = [
{ _id: '1', title: 'Event 1' },
{ _id: '2', title: 'Event 2' },
From 8a21cbbcb27a954820266a02bcd5e83a194ec5b0 Mon Sep 17 00:00:00 2001
From: Nikhil Raj <125121367+hustlernik@users.noreply.github.com>
Date: Mon, 23 Dec 2024 04:08:04 +0530
Subject: [PATCH 045/133] fix:smooth infinite scroll for users list (#2726)
---
src/screens/Users/Users.tsx | 112 ++++++++++++++++++------------------
1 file changed, 56 insertions(+), 56 deletions(-)
diff --git a/src/screens/Users/Users.tsx b/src/screens/Users/Users.tsx
index 3ea165d7b0..b046679a00 100644
--- a/src/screens/Users/Users.tsx
+++ b/src/screens/Users/Users.tsx
@@ -70,6 +70,7 @@ const Users = (): JSX.Element => {
const { getItem } = useLocalStorage();
const perPageResult = 12;
+ const tableLoaderRowLength = 4;
const [isLoading, setIsLoading] = useState(true);
const [hasMore, setHasMore] = useState(true);
const [isLoadingMore, setIsLoadingMore] = useState(false);
@@ -432,67 +433,66 @@ const Users = (): JSX.Element => {
) : (
@@ -24,15 +24,15 @@ describe('Testing Page not found component', () => {
,
);
- expect(screen.getByText(/Talawa User/i)).toBeTruthy();
- expect(screen.getByText(/404/i)).toBeTruthy();
+ expect(screen.getByText(/Talawa User/i)).toBeInTheDocument();
+ expect(screen.getByText(/404/i)).toBeInTheDocument();
expect(
screen.getByText(/Oops! The Page you requested was not found!/i),
- ).toBeTruthy();
- expect(screen.getByText(/Back to Home/i)).toBeTruthy();
+ ).toBeInTheDocument();
+ expect(screen.getByText(/Back to Home/i)).toBeInTheDocument();
});
- test('Component should be rendered properly for ADMIN or SUPERADMIN', () => {
+ it('should render properly for ADMIN or SUPERADMIN', () => {
setItem('AdminFor', [
{
_id: '6537904485008f171cf29924',
@@ -49,11 +49,11 @@ describe('Testing Page not found component', () => {
,
);
- expect(screen.getByText(/Talawa Admin Portal/i)).toBeTruthy();
- expect(screen.getByText(/404/i)).toBeTruthy();
+ expect(screen.getByText(/Talawa Admin Portal/i)).toBeInTheDocument();
+ expect(screen.getByText(/404/i)).toBeInTheDocument();
expect(
screen.getByText(/Oops! The Page you requested was not found!/i),
- ).toBeTruthy();
- expect(screen.getByText(/Back to Home/i)).toBeTruthy();
+ ).toBeInTheDocument();
+ expect(screen.getByText(/Back to Home/i)).toBeInTheDocument();
});
});
From d5a790d262477fd1a79cc0acfbcccfad20bea969 Mon Sep 17 00:00:00 2001
From: Vedant Gupta <115912707+im-vedant@users.noreply.github.com>
Date: Mon, 23 Dec 2024 04:12:07 +0530
Subject: [PATCH 047/133] Refactor: src/screens/OrganizationVenues from Jest to
Vitest (#2665)
* Refactored some code
* Migrate src/screens/OrganizationVenues from jest to vitest
* Revert "Refactored some code"
This reverts commit 02eb9d4fa59009ba81d93d5b137ba2d0f95eae23.
* replaced vi.mock with vi.doMock
* Add comments
* Suppressed Css error
* Fix customTableCell issue
* add data-testid attributes for toggle state for improved testability
* feat: updated jest config and package-lock.json to include identity-obj-proxy to mock Css modules
* Fix linting errors
* refactor : src\components\MemberDetail\customTableCell.test.tsx and src\components\OrganizationScreen\OrganizationScreen.test.tsx from jest to vitest
* Removed data-expanded attribute from mainpageright div
* Add test cases in src/components/MemberDetail/CustomTableCell
---------
Co-authored-by: im-vedant <194vedantgutpa@gmail.com>
Co-authored-by: Peter Harrison <16875803+palisadoes@users.noreply.github.com>
---
.../MemberDetail/customTableCell.spec.tsx | 160 ++++++++++++++++
.../MemberDetail/customTableCell.test.tsx | 171 ------------------
...n.test.tsx => OrganizationScreen.spec.tsx} | 7 +-
...s.test.tsx => OrganizationVenues.spec.tsx} | 38 ++--
4 files changed, 187 insertions(+), 189 deletions(-)
create mode 100644 src/components/MemberDetail/customTableCell.spec.tsx
delete mode 100644 src/components/MemberDetail/customTableCell.test.tsx
rename src/components/OrganizationScreen/{OrganizationScreen.test.tsx => OrganizationScreen.spec.tsx} (95%)
rename src/screens/OrganizationVenues/{OrganizationVenues.test.tsx => OrganizationVenues.spec.tsx} (92%)
diff --git a/src/components/MemberDetail/customTableCell.spec.tsx b/src/components/MemberDetail/customTableCell.spec.tsx
new file mode 100644
index 0000000000..81a088d5bb
--- /dev/null
+++ b/src/components/MemberDetail/customTableCell.spec.tsx
@@ -0,0 +1,160 @@
+import React from 'react';
+import { render, screen, waitFor } from '@testing-library/react';
+import { MockedProvider } from '@apollo/client/testing';
+import { BrowserRouter } from 'react-router-dom';
+import { CustomTableCell } from './customTableCell';
+import { EVENT_DETAILS } from 'GraphQl/Queries/Queries';
+import { vi } from 'vitest';
+vi.mock('react-toastify', () => ({
+ toast: {
+ success: vi.fn(),
+ error: vi.fn(),
+ },
+}));
+
+const mocks = [
+ {
+ request: {
+ query: EVENT_DETAILS,
+ variables: { id: 'event123' },
+ },
+ result: {
+ data: {
+ event: {
+ _id: 'event123',
+ title: 'Test Event',
+ description: 'This is a test event description',
+ startDate: '2023-05-01',
+ endDate: '2023-05-02',
+ startTime: '09:00:00',
+ endTime: '17:00:00',
+ allDay: false,
+ location: 'Test Location',
+ recurring: true,
+ baseRecurringEvent: {
+ _id: 'recurringEvent123',
+ },
+ organization: {
+ _id: 'org456',
+ members: [
+ { _id: 'member1', firstName: 'John', lastName: 'Doe' },
+ { _id: 'member2', firstName: 'Jane', lastName: 'Smith' },
+ ],
+ },
+ attendees: [{ _id: 'user1' }, { _id: 'user2' }],
+ },
+ },
+ },
+ },
+];
+
+describe('CustomTableCell', () => {
+ it('renders event details correctly', async () => {
+ render(
+
+
+
+
+
+
+ ,
+ );
+
+ await waitFor(() => screen.getByTestId('custom-row'));
+
+ expect(screen.getByText('Test Event')).toBeInTheDocument();
+ expect(
+ screen.getByText(
+ new Date('2023-05-01').toLocaleDateString(undefined, {
+ year: 'numeric',
+ month: 'long',
+ day: 'numeric',
+ timeZone: 'UTC',
+ }),
+ ),
+ ).toBeInTheDocument();
+ expect(screen.getByText('Yes')).toBeInTheDocument();
+ expect(screen.getByText('2')).toBeInTheDocument();
+
+ const link = screen.getByRole('link', { name: 'Test Event' });
+ expect(link).toHaveAttribute('href', '/event/org456/event123');
+ });
+
+ it('displays loading state', () => {
+ render(
+
+
+
+
+ ,
+ );
+
+ expect(screen.getByRole('progressbar')).toBeInTheDocument();
+ });
+
+ it('displays error state', async () => {
+ const errorMock = [
+ {
+ request: {
+ query: EVENT_DETAILS,
+ variables: { id: 'event123' },
+ },
+ error: new Error('An error occurred'),
+ },
+ ];
+
+ render(
+
+
+
+
+ ,
+ );
+
+ await waitFor(() => {
+ expect(
+ screen.getByText(
+ 'Unable to load event details. Please try again later.',
+ ),
+ ).toBeInTheDocument();
+ });
+ });
+
+ it('displays no event found message', async () => {
+ const noEventMock = [
+ {
+ request: {
+ query: EVENT_DETAILS,
+ variables: { id: 'event123' },
+ },
+ result: {
+ data: {
+ event: null,
+ },
+ },
+ },
+ ];
+
+ render(
+
+
+
+
+ ,
+ );
+
+ await waitFor(() => {
+ expect(
+ screen.getByText('Event not found or has been deleted'),
+ ).toBeInTheDocument();
+ });
+ });
+});
diff --git a/src/components/MemberDetail/customTableCell.test.tsx b/src/components/MemberDetail/customTableCell.test.tsx
deleted file mode 100644
index bc296a74f3..0000000000
--- a/src/components/MemberDetail/customTableCell.test.tsx
+++ /dev/null
@@ -1,171 +0,0 @@
-import React from 'react';
-import { render, screen, waitFor } from '@testing-library/react';
-import { MockedProvider } from '@apollo/client/testing';
-import { BrowserRouter } from 'react-router-dom';
-import { CustomTableCell } from './customTableCell';
-import { EVENT_DETAILS } from 'GraphQl/Queries/Queries';
-
-jest.mock('react-toastify', () => ({
- toast: {
- success: jest.fn(),
- error: jest.fn(),
- },
-}));
-
-const mocks = [
- {
- request: {
- query: EVENT_DETAILS,
- variables: { id: 'event123' },
- },
- result: {
- data: {
- event: {
- _id: 'event123',
- title: 'Test Event',
- description: 'This is a test event description',
- startDate: '2023-05-01',
- endDate: '2023-05-02',
- startTime: '09:00:00',
- endTime: '17:00:00',
- allDay: false,
- location: 'Test Location',
- recurring: true,
- baseRecurringEvent: {
- _id: 'recurringEvent123',
- },
- organization: {
- _id: 'org456',
- members: [
- { _id: 'member1', firstName: 'John', lastName: 'Doe' },
- { _id: 'member2', firstName: 'Jane', lastName: 'Smith' },
- ],
- },
- attendees: [{ _id: 'user1' }, { _id: 'user2' }],
- },
- },
- },
- },
-];
-
-describe('CustomTableCell', () => {
- it('renders event details correctly', async () => {
- render(
-
-
-
-
-
-
- ,
- );
-
- await waitFor(() => screen.getByTestId('custom-row'));
-
- expect(screen.getByText('Test Event')).toBeInTheDocument();
- expect(screen.getByText('May 1, 2023')).toBeInTheDocument();
- expect(screen.getByText('Yes')).toBeInTheDocument();
- expect(screen.getByText('2')).toBeInTheDocument();
-
- const link = screen.getByRole('link', { name: 'Test Event' });
- expect(link).toHaveAttribute('href', '/event/org456/event123');
- });
-
- it('displays loading state', () => {
- render(
-
-
-
-
- ,
- );
-
- expect(screen.getByRole('progressbar')).toBeInTheDocument();
- });
-
- // it('displays error state', async () => {
- // const errorMock = [
- // {
- // request: {
- // query: EVENT_DETAILS,
- // variables: { id: 'event123' },
- // },
- // error: new Error('An error occurred'),
- // },
- // ];
-
- // render(
- //
- //
- //
- //
- // ,
- // );
-
- // await waitFor(
- // () => {
- // expect(
- // screen.getByText('Error loading event details'),
- // ).toBeInTheDocument();
- // },
- // { timeout: 2000 },
- // );
-
- // // Check if the error message from toast has been called
- // expect(toast.error).toHaveBeenCalledWith('An error occurred');
- // });
-
- // it('displays no event found message', async () => {
- // const noEventMock = [
- // {
- // request: {
- // query: EVENT_DETAILS,
- // variables: { id: 'event123' },
- // },
- // result: {
- // data: {
- // event: {
- // _id: null,
- // title: null,
- // startDate: null,
- // description: null,
- // endDate: null,
- // startTime: null,
- // endTime: null,
- // allDay: false,
- // location: null,
- // recurring: null,
- // organization: {
- // _id: null,
- // members: [],
- // },
- // baseRecurringEvent: {
- // _id: 'recurringEvent123',
- // },
- // attendees: [],
- // },
- // },
- // },
- // },
- // ];
-
- // render(
- //
- //
- //
- //
- // ,
- // );
-
- // await waitFor(() => screen.getByText('No event found'));
- // expect(screen.getByText('No event found')).toBeInTheDocument();
- // });
-});
diff --git a/src/components/OrganizationScreen/OrganizationScreen.test.tsx b/src/components/OrganizationScreen/OrganizationScreen.spec.tsx
similarity index 95%
rename from src/components/OrganizationScreen/OrganizationScreen.test.tsx
rename to src/components/OrganizationScreen/OrganizationScreen.spec.tsx
index d1c4c81c27..e6a75c46d8 100644
--- a/src/components/OrganizationScreen/OrganizationScreen.test.tsx
+++ b/src/components/OrganizationScreen/OrganizationScreen.spec.tsx
@@ -2,7 +2,6 @@ import React from 'react';
import { MockedProvider } from '@apollo/react-testing';
import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import { I18nextProvider } from 'react-i18next';
-import 'jest-location-mock';
import { Provider } from 'react-redux';
import { BrowserRouter } from 'react-router-dom';
import { store } from 'state/store';
@@ -11,10 +10,10 @@ import OrganizationScreen from './OrganizationScreen';
import { ORGANIZATION_EVENT_LIST } from 'GraphQl/Queries/Queries';
import { StaticMockLink } from 'utils/StaticMockLink';
import styles from './OrganizationScreen.module.css';
-
+import { vi } from 'vitest';
const mockID: string | undefined = '123';
-jest.mock('react-router-dom', () => ({
- ...jest.requireActual('react-router-dom'),
+vi.mock('react-router-dom', async () => ({
+ ...(await vi.importActual('react-router-dom')),
useParams: () => ({ orgId: mockID }),
useMatch: () => ({ params: { eventId: 'event123', orgId: '123' } }),
}));
diff --git a/src/screens/OrganizationVenues/OrganizationVenues.test.tsx b/src/screens/OrganizationVenues/OrganizationVenues.spec.tsx
similarity index 92%
rename from src/screens/OrganizationVenues/OrganizationVenues.test.tsx
rename to src/screens/OrganizationVenues/OrganizationVenues.spec.tsx
index 5b8b9933a1..e306c56cfc 100644
--- a/src/screens/OrganizationVenues/OrganizationVenues.test.tsx
+++ b/src/screens/OrganizationVenues/OrganizationVenues.spec.tsx
@@ -1,3 +1,15 @@
+/**
+ * Tests for the OrganizationVenues component.
+ * These tests include:
+ * - Ensuring the component renders correctly with default props.
+ * - Handling the absence of `orgId` by redirecting to the homepage.
+ * - Fetching and displaying venues via Apollo GraphQL queries.
+ * - Allowing users to search venues by name or description.
+ * - Sorting venues by capacity in ascending or descending order.
+ * - Verifying that long venue names or descriptions are handled gracefully.
+ * - Testing loading states and edge cases for Apollo queries.
+ * - Mocking GraphQL mutations for venue-related actions and validating their behavior.
+ */
import React from 'react';
import { MockedProvider } from '@apollo/react-testing';
import type { RenderResult } from '@testing-library/react';
@@ -10,7 +22,6 @@ import {
} from '@testing-library/react';
import { Provider } from 'react-redux';
import { MemoryRouter, Route, Routes } from 'react-router-dom';
-import 'jest-location-mock';
import { I18nextProvider } from 'react-i18next';
import OrganizationVenues from './OrganizationVenues';
import { store } from 'state/store';
@@ -19,7 +30,7 @@ import { StaticMockLink } from 'utils/StaticMockLink';
import { VENUE_LIST } from 'GraphQl/Queries/OrganizationQueries';
import type { ApolloLink } from '@apollo/client';
import { DELETE_VENUE_MUTATION } from 'GraphQl/Mutations/VenueMutations';
-
+import { vi } from 'vitest';
const MOCKS = [
{
request: {
@@ -239,11 +250,11 @@ async function wait(ms = 100): Promise {
});
}
-jest.mock('react-toastify', () => ({
+vi.mock('react-toastify', () => ({
toast: {
- success: jest.fn(),
- warning: jest.fn(),
- error: jest.fn(),
+ success: vi.fn(),
+ warning: vi.fn(),
+ error: vi.fn(),
},
}));
@@ -272,14 +283,14 @@ const renderOrganizationVenue = (link: ApolloLink): RenderResult => {
describe('OrganizationVenue with missing orgId', () => {
beforeAll(() => {
- jest.mock('react-router-dom', () => ({
- ...jest.requireActual('react-router-dom'),
+ vi.doMock('react-router-dom', async () => ({
+ ...(await vi.importActual('react-router-dom')),
useParams: () => ({ orgId: undefined }),
}));
});
afterAll(() => {
- jest.clearAllMocks();
+ vi.clearAllMocks();
});
test('Redirect to /orglist when orgId is falsy/undefined', async () => {
render(
@@ -299,7 +310,6 @@ describe('OrganizationVenue with missing orgId', () => {
,
);
-
await waitFor(() => {
const paramsError = screen.getByTestId('paramsError');
expect(paramsError).toBeInTheDocument();
@@ -308,17 +318,17 @@ describe('OrganizationVenue with missing orgId', () => {
});
describe('Organisation Venues', () => {
- global.alert = jest.fn();
+ global.alert = vi.fn();
beforeAll(() => {
- jest.mock('react-router-dom', () => ({
- ...jest.requireActual('react-router-dom'),
+ vi.doMock('react-router-dom', async () => ({
+ ...(await vi.importActual('react-router-dom')),
useParams: () => ({ orgId: 'orgId' }),
}));
});
afterAll(() => {
- jest.clearAllMocks();
+ vi.clearAllMocks();
});
test('searches the venue list correctly by Name', async () => {
From 9108753fc80fb7014fda74caa9419a5e33d0179e Mon Sep 17 00:00:00 2001
From: Aaditya Agarwal
Date: Mon, 23 Dec 2024 04:14:58 +0530
Subject: [PATCH 048/133] Upgrade inquirer version to 11.0.2 (#2720)
* upgraded inqurier version
* updated custom port tests
* chaged isnan with number.isnan
* added tests for invalid port
* added reserved ports functionality
* improved type safety, maintainability and organisation
* added clear all mocks
---
package-lock.json | 1015 +++++++----------
package.json | 2 +-
.../askForCustomPort/askForCustomPort.test.ts | 112 +-
.../askForCustomPort/askForCustomPort.ts | 65 +-
.../askForTalawaApiUrl.test.ts | 14 +-
.../askForTalawaApiUrl/askForTalawaApiUrl.ts | 2 +-
6 files changed, 577 insertions(+), 633 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 24478f4f69..07a65a79c6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,7 +41,7 @@
"i18next": "^23.15.1",
"i18next-browser-languagedetector": "^8.0.0",
"i18next-http-backend": "^2.6.1",
- "inquirer": "^8.0.0",
+ "inquirer": "^11.0.2",
"js-cookie": "^3.0.1",
"lcov-result-merger": "^5.0.1",
"markdown-toc": "^1.2.0",
@@ -99,7 +99,6 @@
"@typescript-eslint/eslint-plugin": "^8.11.0",
"@typescript-eslint/parser": "^8.5.0",
"@vitest/coverage-istanbul": "^2.1.5",
- "@vitest/eslint-plugin": "^1.1.14",
"babel-jest": "^29.7.0",
"cross-env": "^7.0.3",
"eslint": "^8.49.0",
@@ -109,7 +108,6 @@
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.37.1",
"eslint-plugin-tsdoc": "^0.3.0",
- "eslint-plugin-vitest": "^0.5.4",
"husky": "^9.1.6",
"identity-obj-proxy": "^3.0.0",
"jest": "^27.4.5",
@@ -3159,6 +3157,239 @@
"dev": true,
"license": "BSD-3-Clause"
},
+ "node_modules/@inquirer/checkbox": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-3.0.1.tgz",
+ "integrity": "sha512-0hm2nrToWUdD6/UHnel/UKGdk1//ke5zGUpHIvk5ZWmaKezlGxZkOJXNSWsdxO/rEqTkbB3lNC2J6nBElV2aAQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@inquirer/core": "^9.2.1",
+ "@inquirer/figures": "^1.0.6",
+ "@inquirer/type": "^2.0.0",
+ "ansi-escapes": "^4.3.2",
+ "yoctocolors-cjs": "^2.1.2"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@inquirer/confirm": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-4.0.1.tgz",
+ "integrity": "sha512-46yL28o2NJ9doViqOy0VDcoTzng7rAb6yPQKU7VDLqkmbCaH4JqK4yk4XqlzNWy9PVC5pG1ZUXPBQv+VqnYs2w==",
+ "license": "MIT",
+ "dependencies": {
+ "@inquirer/core": "^9.2.1",
+ "@inquirer/type": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@inquirer/core": {
+ "version": "9.2.1",
+ "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.2.1.tgz",
+ "integrity": "sha512-F2VBt7W/mwqEU4bL0RnHNZmC/OxzNx9cOYxHqnXX3MP6ruYvZUZAW9imgN9+h/uBT/oP8Gh888J2OZSbjSeWcg==",
+ "license": "MIT",
+ "dependencies": {
+ "@inquirer/figures": "^1.0.6",
+ "@inquirer/type": "^2.0.0",
+ "@types/mute-stream": "^0.0.4",
+ "@types/node": "^22.5.5",
+ "@types/wrap-ansi": "^3.0.0",
+ "ansi-escapes": "^4.3.2",
+ "cli-width": "^4.1.0",
+ "mute-stream": "^1.0.0",
+ "signal-exit": "^4.1.0",
+ "strip-ansi": "^6.0.1",
+ "wrap-ansi": "^6.2.0",
+ "yoctocolors-cjs": "^2.1.2"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@inquirer/core/node_modules/signal-exit": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+ "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+ "license": "ISC",
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/@inquirer/core/node_modules/wrap-ansi": {
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+ "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+ "license": "MIT",
+ "dependencies": {
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/@inquirer/editor": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-3.0.1.tgz",
+ "integrity": "sha512-VA96GPFaSOVudjKFraokEEmUQg/Lub6OXvbIEZU1SDCmBzRkHGhxoFAVaF30nyiB4m5cEbDgiI2QRacXZ2hw9Q==",
+ "license": "MIT",
+ "dependencies": {
+ "@inquirer/core": "^9.2.1",
+ "@inquirer/type": "^2.0.0",
+ "external-editor": "^3.1.0"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@inquirer/expand": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-3.0.1.tgz",
+ "integrity": "sha512-ToG8d6RIbnVpbdPdiN7BCxZGiHOTomOX94C2FaT5KOHupV40tKEDozp12res6cMIfRKrXLJyexAZhWVHgbALSQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@inquirer/core": "^9.2.1",
+ "@inquirer/type": "^2.0.0",
+ "yoctocolors-cjs": "^2.1.2"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@inquirer/figures": {
+ "version": "1.0.9",
+ "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.9.tgz",
+ "integrity": "sha512-BXvGj0ehzrngHTPTDqUoDT3NXL8U0RxUk2zJm2A66RhCEIWdtU1v6GuUqNAgArW4PQ9CinqIWyHdQgdwOj06zQ==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@inquirer/input": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-3.0.1.tgz",
+ "integrity": "sha512-BDuPBmpvi8eMCxqC5iacloWqv+5tQSJlUafYWUe31ow1BVXjW2a5qe3dh4X/Z25Wp22RwvcaLCc2siHobEOfzg==",
+ "license": "MIT",
+ "dependencies": {
+ "@inquirer/core": "^9.2.1",
+ "@inquirer/type": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@inquirer/number": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-2.0.1.tgz",
+ "integrity": "sha512-QpR8jPhRjSmlr/mD2cw3IR8HRO7lSVOnqUvQa8scv1Lsr3xoAMMworcYW3J13z3ppjBFBD2ef1Ci6AE5Qn8goQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@inquirer/core": "^9.2.1",
+ "@inquirer/type": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@inquirer/password": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-3.0.1.tgz",
+ "integrity": "sha512-haoeEPUisD1NeE2IanLOiFr4wcTXGWrBOyAyPZi1FfLJuXOzNmxCJPgUrGYKVh+Y8hfGJenIfz5Wb/DkE9KkMQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@inquirer/core": "^9.2.1",
+ "@inquirer/type": "^2.0.0",
+ "ansi-escapes": "^4.3.2"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@inquirer/prompts": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-6.0.1.tgz",
+ "integrity": "sha512-yl43JD/86CIj3Mz5mvvLJqAOfIup7ncxfJ0Btnl0/v5TouVUyeEdcpknfgc+yMevS/48oH9WAkkw93m7otLb/A==",
+ "license": "MIT",
+ "dependencies": {
+ "@inquirer/checkbox": "^3.0.1",
+ "@inquirer/confirm": "^4.0.1",
+ "@inquirer/editor": "^3.0.1",
+ "@inquirer/expand": "^3.0.1",
+ "@inquirer/input": "^3.0.1",
+ "@inquirer/number": "^2.0.1",
+ "@inquirer/password": "^3.0.1",
+ "@inquirer/rawlist": "^3.0.1",
+ "@inquirer/search": "^2.0.1",
+ "@inquirer/select": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@inquirer/rawlist": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-3.0.1.tgz",
+ "integrity": "sha512-VgRtFIwZInUzTiPLSfDXK5jLrnpkuSOh1ctfaoygKAdPqjcjKYmGh6sCY1pb0aGnCGsmhUxoqLDUAU0ud+lGXQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@inquirer/core": "^9.2.1",
+ "@inquirer/type": "^2.0.0",
+ "yoctocolors-cjs": "^2.1.2"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@inquirer/search": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-2.0.1.tgz",
+ "integrity": "sha512-r5hBKZk3g5MkIzLVoSgE4evypGqtOannnB3PKTG9NRZxyFRKcfzrdxXXPcoJQsxJPzvdSU2Rn7pB7lw0GCmGAg==",
+ "license": "MIT",
+ "dependencies": {
+ "@inquirer/core": "^9.2.1",
+ "@inquirer/figures": "^1.0.6",
+ "@inquirer/type": "^2.0.0",
+ "yoctocolors-cjs": "^2.1.2"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@inquirer/select": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-3.0.1.tgz",
+ "integrity": "sha512-lUDGUxPhdWMkN/fHy1Lk7pF3nK1fh/gqeyWXmctefhxLYxlDsc7vsPBEpxrfVGDsVdyYJsiJoD4bJ1b623cV1Q==",
+ "license": "MIT",
+ "dependencies": {
+ "@inquirer/core": "^9.2.1",
+ "@inquirer/figures": "^1.0.6",
+ "@inquirer/type": "^2.0.0",
+ "ansi-escapes": "^4.3.2",
+ "yoctocolors-cjs": "^2.1.2"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@inquirer/type": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-2.0.0.tgz",
+ "integrity": "sha512-XvJRx+2KR3YXyYtPUUy+qd9i7p+GO9Ko6VIIpWlBrpWwXDv8WLFeHTxz35CfQFUiBMLXlGHhGzys7lqit9gWag==",
+ "license": "MIT",
+ "dependencies": {
+ "mute-stream": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
"node_modules/@isaacs/cliui": {
"version": "8.0.2",
"resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -5706,11 +5937,19 @@
"@types/unist": "*"
}
},
+ "node_modules/@types/mute-stream": {
+ "version": "0.0.4",
+ "resolved": "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.4.tgz",
+ "integrity": "sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==",
+ "license": "MIT",
+ "dependencies": {
+ "@types/node": "*"
+ }
+ },
"node_modules/@types/node": {
"version": "22.9.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz",
"integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==",
- "devOptional": true,
"dependencies": {
"undici-types": "~6.19.8"
}
@@ -5908,6 +6147,12 @@
"resolved": "https://registry.npmjs.org/@types/warning/-/warning-3.0.3.tgz",
"integrity": "sha512-D1XC7WK8K+zZEveUPY+cf4+kgauk8N4eHr/XIHXGlGYkHLud6hK9lYfZk1ry1TNh798cZUCgb6MqGEG8DkJt6Q=="
},
+ "node_modules/@types/wrap-ansi": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz",
+ "integrity": "sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==",
+ "license": "MIT"
+ },
"node_modules/@types/yargs": {
"version": "16.0.5",
"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.5.tgz",
@@ -6379,36 +6624,15 @@
"node": ">=18"
}
},
- "node_modules/@vitest/eslint-plugin": {
- "version": "1.1.14",
- "resolved": "https://registry.npmjs.org/@vitest/eslint-plugin/-/eslint-plugin-1.1.14.tgz",
- "integrity": "sha512-ej0cT5rUt7uvwxuu7Qxkm7fI+eaOq8vD34qGpuRoXCdvOybOlE5GDqtgvVCYbxLANkcRJfm5VDU1TnJmQRHi9g==",
- "dev": true,
- "license": "MIT",
- "peerDependencies": {
- "@typescript-eslint/utils": ">= 8.0",
- "eslint": ">= 8.57.0",
- "typescript": ">= 5.0.0",
- "vitest": "*"
- },
- "peerDependenciesMeta": {
- "typescript": {
- "optional": true
- },
- "vitest": {
- "optional": true
- }
- }
- },
"node_modules/@vitest/expect": {
- "version": "2.1.8",
- "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.8.tgz",
- "integrity": "sha512-8ytZ/fFHq2g4PJVAtDX57mayemKgDR6X3Oa2Foro+EygiOJHUXhCqBAAKQYYajZpFoIfvBCF1j6R6IYRSIUFuw==",
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.5.tgz",
+ "integrity": "sha512-nZSBTW1XIdpZvEJyoP/Sy8fUg0b8od7ZpGDkTUcfJ7wz/VoZAFzFfLyxVxGFhUjJzhYqSbIpfMtl/+k/dpWa3Q==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@vitest/spy": "2.1.8",
- "@vitest/utils": "2.1.8",
+ "@vitest/spy": "2.1.5",
+ "@vitest/utils": "2.1.5",
"chai": "^5.1.2",
"tinyrainbow": "^1.2.0"
},
@@ -6417,13 +6641,13 @@
}
},
"node_modules/@vitest/mocker": {
- "version": "2.1.8",
- "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.8.tgz",
- "integrity": "sha512-7guJ/47I6uqfttp33mgo6ga5Gr1VnL58rcqYKyShoRK9ebu8T5Rs6HN3s1NABiBeVTdWNrwUMcHH54uXZBN4zA==",
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.5.tgz",
+ "integrity": "sha512-XYW6l3UuBmitWqSUXTNXcVBUCRytDogBsWuNXQijc00dtnU/9OqpXWp4OJroVrad/gLIomAq9aW8yWDBtMthhQ==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@vitest/spy": "2.1.8",
+ "@vitest/spy": "2.1.5",
"estree-walker": "^3.0.3",
"magic-string": "^0.30.12"
},
@@ -6457,13 +6681,13 @@
}
},
"node_modules/@vitest/runner": {
- "version": "2.1.8",
- "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.8.tgz",
- "integrity": "sha512-17ub8vQstRnRlIU5k50bG+QOMLHRhYPAna5tw8tYbj+jzjcspnwnwtPtiOlkuKC4+ixDPTuLZiqiWWQ2PSXHVg==",
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.5.tgz",
+ "integrity": "sha512-pKHKy3uaUdh7X6p1pxOkgkVAFW7r2I818vHDthYLvUyjRfkKOU6P45PztOch4DZarWQne+VOaIMwA/erSSpB9g==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@vitest/utils": "2.1.8",
+ "@vitest/utils": "2.1.5",
"pathe": "^1.1.2"
},
"funding": {
@@ -6471,13 +6695,13 @@
}
},
"node_modules/@vitest/snapshot": {
- "version": "2.1.8",
- "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.8.tgz",
- "integrity": "sha512-20T7xRFbmnkfcmgVEz+z3AU/3b0cEzZOt/zmnvZEctg64/QZbSDJEVm9fLnnlSi74KibmRsO9/Qabi+t0vCRPg==",
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.5.tgz",
+ "integrity": "sha512-zmYw47mhfdfnYbuhkQvkkzYroXUumrwWDGlMjpdUr4jBd3HZiV2w7CQHj+z7AAS4VOtWxI4Zt4bWt4/sKcoIjg==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@vitest/pretty-format": "2.1.8",
+ "@vitest/pretty-format": "2.1.5",
"magic-string": "^0.30.12",
"pathe": "^1.1.2"
},
@@ -6485,10 +6709,23 @@
"url": "https://opencollective.com/vitest"
}
},
+ "node_modules/@vitest/snapshot/node_modules/@vitest/pretty-format": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.5.tgz",
+ "integrity": "sha512-4ZOwtk2bqG5Y6xRGHcveZVr+6txkH7M2e+nPFd6guSoN638v/1XQ0K06eOpi0ptVU/2tW/pIU4IoPotY/GZ9fw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "tinyrainbow": "^1.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/vitest"
+ }
+ },
"node_modules/@vitest/spy": {
- "version": "2.1.8",
- "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.8.tgz",
- "integrity": "sha512-5swjf2q95gXeYPevtW0BLk6H8+bPlMb4Vw/9Em4hFxDcaOxS+e0LOX4yqNxoHzMR2akEB2xfpnWUzkZokmgWDg==",
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.5.tgz",
+ "integrity": "sha512-aWZF3P0r3w6DiYTVskOYuhBc7EMc3jvn1TkBg8ttylFFRqNN2XGD7V5a4aQdk6QiUzZQ4klNBSpCLJgWNdIiNw==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -6499,13 +6736,13 @@
}
},
"node_modules/@vitest/utils": {
- "version": "2.1.8",
- "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.8.tgz",
- "integrity": "sha512-dwSoui6djdwbfFmIgbIjX2ZhIoG7Ex/+xpxyiEgIGzjliY8xGkcpITKTlp6B4MgtGkF2ilvm97cPM96XZaAgcA==",
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.5.tgz",
+ "integrity": "sha512-yfj6Yrp0Vesw2cwJbP+cl04OC+IHFsuQsrsJBL9pyGeQXE56v1UAOQco+SR55Vf1nQzfV0QJg1Qum7AaWUwwYg==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@vitest/pretty-format": "2.1.8",
+ "@vitest/pretty-format": "2.1.5",
"loupe": "^3.1.2",
"tinyrainbow": "^1.2.0"
},
@@ -6513,6 +6750,19 @@
"url": "https://opencollective.com/vitest"
}
},
+ "node_modules/@vitest/utils/node_modules/@vitest/pretty-format": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.5.tgz",
+ "integrity": "sha512-4ZOwtk2bqG5Y6xRGHcveZVr+6txkH7M2e+nPFd6guSoN638v/1XQ0K06eOpi0ptVU/2tW/pIU4IoPotY/GZ9fw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "tinyrainbow": "^1.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/vitest"
+ }
+ },
"node_modules/@wry/caches": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@wry/caches/-/caches-1.0.1.tgz",
@@ -6780,16 +7030,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/array-union": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
- "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/array.prototype.findlast": {
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
@@ -7364,39 +7604,6 @@
"node": ">=8"
}
},
- "node_modules/bl": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
- "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
- "dependencies": {
- "buffer": "^5.5.0",
- "inherits": "^2.0.4",
- "readable-stream": "^3.4.0"
- }
- },
- "node_modules/bl/node_modules/buffer": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
- "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/feross"
- },
- {
- "type": "patreon",
- "url": "https://www.patreon.com/feross"
- },
- {
- "type": "consulting",
- "url": "https://feross.org/support"
- }
- ],
- "dependencies": {
- "base64-js": "^1.3.1",
- "ieee754": "^1.1.13"
- }
- },
"node_modules/bn.js": {
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
@@ -7914,7 +8121,8 @@
"node_modules/chardet": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
- "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
+ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+ "license": "MIT"
},
"node_modules/chart.js": {
"version": "4.4.6",
@@ -8030,17 +8238,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/cli-spinners": {
- "version": "2.9.2",
- "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
- "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
- "engines": {
- "node": ">=6"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/cli-truncate": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
@@ -8108,11 +8305,12 @@
}
},
"node_modules/cli-width": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
- "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
+ "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
+ "license": "ISC",
"engines": {
- "node": ">= 10"
+ "node": ">= 12"
}
},
"node_modules/cliui": {
@@ -8859,25 +9057,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/defaults": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
- "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
- "dependencies": {
- "clone": "^1.0.2"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/defaults/node_modules/clone": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
- "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
- "engines": {
- "node": ">=0.8"
- }
- },
"node_modules/defer-to-connect": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
@@ -9029,19 +9208,6 @@
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg=="
},
- "node_modules/dir-glob": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
- "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "path-type": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/doctrine": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -9851,221 +10017,68 @@
"string.prototype.matchall": "^4.0.11",
"string.prototype.repeat": "^1.0.0"
},
- "engines": {
- "node": ">=4"
- },
- "peerDependencies": {
- "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7"
- }
- },
- "node_modules/eslint-plugin-react/node_modules/doctrine": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
- "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
- "dev": true,
- "dependencies": {
- "esutils": "^2.0.2"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/eslint-plugin-react/node_modules/estraverse": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
- "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
- "dev": true,
- "engines": {
- "node": ">=4.0"
- }
- },
- "node_modules/eslint-plugin-react/node_modules/resolve": {
- "version": "2.0.0-next.5",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
- "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
- "dev": true,
- "dependencies": {
- "is-core-module": "^2.13.0",
- "path-parse": "^1.0.7",
- "supports-preserve-symlinks-flag": "^1.0.0"
- },
- "bin": {
- "resolve": "bin/resolve"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
- "node_modules/eslint-plugin-react/node_modules/semver": {
- "version": "6.3.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
- "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
- "dev": true,
- "bin": {
- "semver": "bin/semver.js"
- }
- },
- "node_modules/eslint-plugin-tsdoc": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-tsdoc/-/eslint-plugin-tsdoc-0.3.0.tgz",
- "integrity": "sha512-0MuFdBrrJVBjT/gyhkP2BqpD0np1NxNLfQ38xXDlSs/KVVpKI2A6vN7jx2Rve/CyUsvOsMGwp9KKrinv7q9g3A==",
- "dev": true,
- "dependencies": {
- "@microsoft/tsdoc": "0.15.0",
- "@microsoft/tsdoc-config": "0.17.0"
- }
- },
- "node_modules/eslint-plugin-vitest": {
- "version": "0.5.4",
- "resolved": "https://registry.npmjs.org/eslint-plugin-vitest/-/eslint-plugin-vitest-0.5.4.tgz",
- "integrity": "sha512-um+odCkccAHU53WdKAw39MY61+1x990uXjSPguUCq3VcEHdqJrOb8OTMrbYlY6f9jAKx7x98kLVlIe3RJeJqoQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@typescript-eslint/utils": "^7.7.1"
- },
- "engines": {
- "node": "^18.0.0 || >= 20.0.0"
- },
- "peerDependencies": {
- "eslint": "^8.57.0 || ^9.0.0",
- "vitest": "*"
- },
- "peerDependenciesMeta": {
- "@typescript-eslint/eslint-plugin": {
- "optional": true
- },
- "vitest": {
- "optional": true
- }
- }
- },
- "node_modules/eslint-plugin-vitest/node_modules/@typescript-eslint/scope-manager": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
- "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@typescript-eslint/types": "7.18.0",
- "@typescript-eslint/visitor-keys": "7.18.0"
- },
- "engines": {
- "node": "^18.18.0 || >=20.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- }
- },
- "node_modules/eslint-plugin-vitest/node_modules/@typescript-eslint/types": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
- "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "^18.18.0 || >=20.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- }
- },
- "node_modules/eslint-plugin-vitest/node_modules/@typescript-eslint/typescript-estree": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
- "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
- "dev": true,
- "license": "BSD-2-Clause",
- "dependencies": {
- "@typescript-eslint/types": "7.18.0",
- "@typescript-eslint/visitor-keys": "7.18.0",
- "debug": "^4.3.4",
- "globby": "^11.1.0",
- "is-glob": "^4.0.3",
- "minimatch": "^9.0.4",
- "semver": "^7.6.0",
- "ts-api-utils": "^1.3.0"
- },
- "engines": {
- "node": "^18.18.0 || >=20.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- },
- "peerDependenciesMeta": {
- "typescript": {
- "optional": true
- }
- }
- },
- "node_modules/eslint-plugin-vitest/node_modules/@typescript-eslint/utils": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
- "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@eslint-community/eslint-utils": "^4.4.0",
- "@typescript-eslint/scope-manager": "7.18.0",
- "@typescript-eslint/types": "7.18.0",
- "@typescript-eslint/typescript-estree": "7.18.0"
- },
- "engines": {
- "node": "^18.18.0 || >=20.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- },
+ "engines": {
+ "node": ">=4"
+ },
"peerDependencies": {
- "eslint": "^8.56.0"
+ "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7"
}
},
- "node_modules/eslint-plugin-vitest/node_modules/@typescript-eslint/visitor-keys": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
- "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
+ "node_modules/eslint-plugin-react/node_modules/doctrine": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+ "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
"dev": true,
- "license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "7.18.0",
- "eslint-visitor-keys": "^3.4.3"
+ "esutils": "^2.0.2"
},
"engines": {
- "node": "^18.18.0 || >=20.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
+ "node": ">=0.10.0"
}
},
- "node_modules/eslint-plugin-vitest/node_modules/brace-expansion": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
- "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "node_modules/eslint-plugin-react/node_modules/estraverse": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
"dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^1.0.0"
+ "engines": {
+ "node": ">=4.0"
}
},
- "node_modules/eslint-plugin-vitest/node_modules/minimatch": {
- "version": "9.0.5",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
- "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+ "node_modules/eslint-plugin-react/node_modules/resolve": {
+ "version": "2.0.0-next.5",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
+ "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
"dev": true,
- "license": "ISC",
"dependencies": {
- "brace-expansion": "^2.0.1"
+ "is-core-module": "^2.13.0",
+ "path-parse": "^1.0.7",
+ "supports-preserve-symlinks-flag": "^1.0.0"
},
- "engines": {
- "node": ">=16 || 14 >=14.17"
+ "bin": {
+ "resolve": "bin/resolve"
},
"funding": {
- "url": "https://github.com/sponsors/isaacs"
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/eslint-plugin-react/node_modules/semver": {
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver.js"
+ }
+ },
+ "node_modules/eslint-plugin-tsdoc": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-tsdoc/-/eslint-plugin-tsdoc-0.3.0.tgz",
+ "integrity": "sha512-0MuFdBrrJVBjT/gyhkP2BqpD0np1NxNLfQ38xXDlSs/KVVpKI2A6vN7jx2Rve/CyUsvOsMGwp9KKrinv7q9g3A==",
+ "dev": true,
+ "dependencies": {
+ "@microsoft/tsdoc": "0.15.0",
+ "@microsoft/tsdoc-config": "0.17.0"
}
},
"node_modules/eslint-visitor-keys": {
@@ -10508,6 +10521,7 @@
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
"integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+ "license": "MIT",
"dependencies": {
"chardet": "^0.7.0",
"iconv-lite": "^0.4.24",
@@ -10521,6 +10535,7 @@
"version": "0.4.24",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+ "license": "MIT",
"dependencies": {
"safer-buffer": ">= 2.1.2 < 3"
},
@@ -10606,28 +10621,6 @@
"bser": "2.1.1"
}
},
- "node_modules/figures": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
- "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
- "dependencies": {
- "escape-string-regexp": "^1.0.5"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/figures/node_modules/escape-string-regexp": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
- "engines": {
- "node": ">=0.8.0"
- }
- },
"node_modules/file-entry-cache": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -11062,27 +11055,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/globby": {
- "version": "11.1.0",
- "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
- "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "array-union": "^2.1.0",
- "dir-glob": "^3.0.1",
- "fast-glob": "^3.2.9",
- "ignore": "^5.2.0",
- "merge2": "^1.4.1",
- "slash": "^3.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/globrex": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
@@ -11242,6 +11214,7 @@
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true,
"engines": {
"node": ">=8"
}
@@ -11744,79 +11717,22 @@
"dev": true
},
"node_modules/inquirer": {
- "version": "8.2.6",
- "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz",
- "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==",
- "dependencies": {
- "ansi-escapes": "^4.2.1",
- "chalk": "^4.1.1",
- "cli-cursor": "^3.1.0",
- "cli-width": "^3.0.0",
- "external-editor": "^3.0.3",
- "figures": "^3.0.0",
- "lodash": "^4.17.21",
- "mute-stream": "0.0.8",
- "ora": "^5.4.1",
- "run-async": "^2.4.0",
- "rxjs": "^7.5.5",
- "string-width": "^4.1.0",
- "strip-ansi": "^6.0.0",
- "through": "^2.3.6",
- "wrap-ansi": "^6.0.1"
- },
- "engines": {
- "node": ">=12.0.0"
- }
- },
- "node_modules/inquirer/node_modules/chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "dependencies": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/chalk?sponsor=1"
- }
- },
- "node_modules/inquirer/node_modules/cli-cursor": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
- "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
- "dependencies": {
- "restore-cursor": "^3.1.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/inquirer/node_modules/restore-cursor": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
- "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
- "dependencies": {
- "onetime": "^5.1.0",
- "signal-exit": "^3.0.2"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/inquirer/node_modules/wrap-ansi": {
- "version": "6.2.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
- "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+ "version": "11.1.0",
+ "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-11.1.0.tgz",
+ "integrity": "sha512-CmLAZT65GG/v30c+D2Fk8+ceP6pxD6RL+hIUOWAltCmeyEqWYwqu9v76q03OvjyZ3AB0C1Ala2stn1z/rMqGEw==",
+ "license": "MIT",
"dependencies": {
- "ansi-styles": "^4.0.0",
- "string-width": "^4.1.0",
- "strip-ansi": "^6.0.0"
+ "@inquirer/core": "^9.2.1",
+ "@inquirer/prompts": "^6.0.1",
+ "@inquirer/type": "^2.0.0",
+ "@types/mute-stream": "^0.0.4",
+ "ansi-escapes": "^4.3.2",
+ "mute-stream": "^1.0.0",
+ "run-async": "^3.0.0",
+ "rxjs": "^7.8.1"
},
"engines": {
- "node": ">=8"
+ "node": ">=18"
}
},
"node_modules/internal-slot": {
@@ -12122,14 +12038,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/is-interactive": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
- "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/is-map": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
@@ -12344,17 +12252,6 @@
"integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
"dev": true
},
- "node_modules/is-unicode-supported": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
- "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/is-weakmap": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
@@ -14688,7 +14585,8 @@
"node_modules/lodash": {
"version": "4.17.21",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
- "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+ "dev": true
},
"node_modules/lodash._reinterpolate": {
"version": "3.0.0",
@@ -14735,36 +14633,6 @@
"lodash._reinterpolate": "^3.0.0"
}
},
- "node_modules/log-symbols": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
- "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
- "dependencies": {
- "chalk": "^4.1.0",
- "is-unicode-supported": "^0.1.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/log-symbols/node_modules/chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "dependencies": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/chalk?sponsor=1"
- }
- },
"node_modules/log-update": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
@@ -15277,6 +15145,7 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+ "dev": true,
"engines": {
"node": ">=6"
}
@@ -15377,9 +15246,13 @@
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
},
"node_modules/mute-stream": {
- "version": "0.0.8",
- "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
- "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
+ "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
+ "license": "ISC",
+ "engines": {
+ "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+ }
},
"node_modules/nanoid": {
"version": "3.3.7",
@@ -15793,6 +15666,7 @@
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+ "dev": true,
"dependencies": {
"mimic-fn": "^2.1.0"
},
@@ -15870,66 +15744,6 @@
"node": ">= 0.8.0"
}
},
- "node_modules/ora": {
- "version": "5.4.1",
- "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
- "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
- "dependencies": {
- "bl": "^4.1.0",
- "chalk": "^4.1.0",
- "cli-cursor": "^3.1.0",
- "cli-spinners": "^2.5.0",
- "is-interactive": "^1.0.0",
- "is-unicode-supported": "^0.1.0",
- "log-symbols": "^4.1.0",
- "strip-ansi": "^6.0.0",
- "wcwidth": "^1.0.1"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/ora/node_modules/chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "dependencies": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/chalk?sponsor=1"
- }
- },
- "node_modules/ora/node_modules/cli-cursor": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
- "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
- "dependencies": {
- "restore-cursor": "^3.1.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/ora/node_modules/restore-cursor": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
- "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
- "dependencies": {
- "onetime": "^5.1.0",
- "signal-exit": "^3.0.2"
- },
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/os-browserify": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
@@ -15939,6 +15753,7 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
"integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+ "license": "MIT",
"engines": {
"node": ">=0.10.0"
}
@@ -17642,9 +17457,10 @@
]
},
"node_modules/run-async": {
- "version": "2.4.1",
- "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
- "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz",
+ "integrity": "sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==",
+ "license": "MIT",
"engines": {
"node": ">=0.12.0"
}
@@ -17980,7 +17796,8 @@
"node_modules/signal-exit": {
"version": "3.0.7",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
- "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+ "dev": true
},
"node_modules/simple-swizzle": {
"version": "0.2.2",
@@ -18438,6 +18255,7 @@
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "dev": true,
"dependencies": {
"has-flag": "^4.0.0"
},
@@ -18586,11 +18404,6 @@
"node": ">=8"
}
},
- "node_modules/through": {
- "version": "2.3.8",
- "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
- "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
- },
"node_modules/through2": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
@@ -18697,6 +18510,7 @@
"version": "0.0.33",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+ "license": "MIT",
"dependencies": {
"os-tmpdir": "~1.0.2"
},
@@ -19537,8 +19351,7 @@
"node_modules/undici-types": {
"version": "6.19.8",
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
- "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
- "devOptional": true
+ "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
},
"node_modules/unicode-canonical-property-names-ecmascript": {
"version": "2.0.1",
@@ -19958,9 +19771,9 @@
}
},
"node_modules/vite-node": {
- "version": "2.1.8",
- "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.8.tgz",
- "integrity": "sha512-uPAwSr57kYjAUux+8E2j0q0Fxpn8M9VoyfGiRI8Kfktz9NcYMCenwY5RnZxnF1WTu3TGiYipirIzacLL3VVGFg==",
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.5.tgz",
+ "integrity": "sha512-rd0QIgx74q4S1Rd56XIiL2cYEdyWn13cunYBIuqh9mpmQr7gGS0IxXoP8R6OaZtNQQLyXSWbd4rXKYUbhFpK5w==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -20292,19 +20105,19 @@
}
},
"node_modules/vitest": {
- "version": "2.1.8",
- "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.8.tgz",
- "integrity": "sha512-1vBKTZskHw/aosXqQUlVWWlGUxSJR8YtiyZDJAFeW2kPAeX6S3Sool0mjspO+kXLuxVWlEDDowBAeqeAQefqLQ==",
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.5.tgz",
+ "integrity": "sha512-P4ljsdpuzRTPI/kbND2sDZ4VmieerR2c9szEZpjc+98Z9ebvnXmM5+0tHEKqYZumXqlvnmfWsjeFOjXVriDG7A==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@vitest/expect": "2.1.8",
- "@vitest/mocker": "2.1.8",
- "@vitest/pretty-format": "^2.1.8",
- "@vitest/runner": "2.1.8",
- "@vitest/snapshot": "2.1.8",
- "@vitest/spy": "2.1.8",
- "@vitest/utils": "2.1.8",
+ "@vitest/expect": "2.1.5",
+ "@vitest/mocker": "2.1.5",
+ "@vitest/pretty-format": "^2.1.5",
+ "@vitest/runner": "2.1.5",
+ "@vitest/snapshot": "2.1.5",
+ "@vitest/spy": "2.1.5",
+ "@vitest/utils": "2.1.5",
"chai": "^5.1.2",
"debug": "^4.3.7",
"expect-type": "^1.1.0",
@@ -20316,7 +20129,7 @@
"tinypool": "^1.0.1",
"tinyrainbow": "^1.2.0",
"vite": "^5.0.0",
- "vite-node": "2.1.8",
+ "vite-node": "2.1.5",
"why-is-node-running": "^2.3.0"
},
"bin": {
@@ -20331,8 +20144,8 @@
"peerDependencies": {
"@edge-runtime/vm": "*",
"@types/node": "^18.0.0 || >=20.0.0",
- "@vitest/browser": "2.1.8",
- "@vitest/ui": "2.1.8",
+ "@vitest/browser": "2.1.5",
+ "@vitest/ui": "2.1.5",
"happy-dom": "*",
"jsdom": "*"
},
@@ -20409,14 +20222,6 @@
"loose-envify": "^1.0.0"
}
},
- "node_modules/wcwidth": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
- "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
- "dependencies": {
- "defaults": "^1.0.3"
- }
- },
"node_modules/web-vitals": {
"version": "4.2.4",
"resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-4.2.4.tgz",
@@ -20758,6 +20563,18 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/yoctocolors-cjs": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz",
+ "integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/zen-observable": {
"version": "0.8.15",
"resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz",
diff --git a/package.json b/package.json
index aee85b5772..a922f88205 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
"i18next": "^23.15.1",
"i18next-browser-languagedetector": "^8.0.0",
"i18next-http-backend": "^2.6.1",
- "inquirer": "^8.0.0",
+ "inquirer": "^11.0.2",
"js-cookie": "^3.0.1",
"lcov-result-merger": "^5.0.1",
"markdown-toc": "^1.2.0",
diff --git a/src/setup/askForCustomPort/askForCustomPort.test.ts b/src/setup/askForCustomPort/askForCustomPort.test.ts
index 0df6259ba1..c46f7b3f91 100644
--- a/src/setup/askForCustomPort/askForCustomPort.test.ts
+++ b/src/setup/askForCustomPort/askForCustomPort.test.ts
@@ -1,24 +1,110 @@
import inquirer from 'inquirer';
-import { askForCustomPort } from './askForCustomPort';
+import { askForCustomPort, validatePort } from './askForCustomPort';
jest.mock('inquirer');
describe('askForCustomPort', () => {
- test('should return default port if user provides no input', async () => {
- jest
- .spyOn(inquirer, 'prompt')
- .mockResolvedValueOnce({ customPort: '4321' });
+ beforeEach(() => {
+ jest.clearAllMocks();
+ });
+
+ describe('basic port validation', () => {
+ test('should return default port if user provides no input', async () => {
+ jest
+ .spyOn(inquirer, 'prompt')
+ .mockResolvedValueOnce({ customPort: '4321' });
+
+ const result = await askForCustomPort();
+ expect(result).toBe(4321);
+ });
+
+ test('should return user-provided port', async () => {
+ jest
+ .spyOn(inquirer, 'prompt')
+ .mockResolvedValueOnce({ customPort: '8080' });
+
+ const result = await askForCustomPort();
+ expect(result).toBe(8080);
+ });
+
+ test('should return validation error if port not between 1 and 65535', () => {
+ expect(validatePort('abcd')).toBe(
+ 'Please enter a valid port number between 1 and 65535.',
+ );
+ expect(validatePort('-1')).toBe(
+ 'Please enter a valid port number between 1 and 65535.',
+ );
+ expect(validatePort('70000')).toBe(
+ 'Please enter a valid port number between 1 and 65535.',
+ );
+ });
+ });
- const result = await askForCustomPort();
- expect(result).toBe('4321');
+ describe('retry mechanism', () => {
+ test('should handle invalid port input and prompt again', async () => {
+ jest
+ .spyOn(inquirer, 'prompt')
+ .mockResolvedValueOnce({ customPort: 'abcd' })
+ .mockResolvedValueOnce({ customPort: '8080' });
+
+ const result = await askForCustomPort();
+ expect(result).toBe(8080);
+ });
+
+ test('should return default port after maximum retry attempts', async () => {
+ jest
+ .spyOn(inquirer, 'prompt')
+ .mockResolvedValueOnce({ customPort: 'invalid-port-attempt1' })
+ .mockResolvedValueOnce({ customPort: 'invalid-port-attempt2' })
+ .mockResolvedValueOnce({ customPort: 'invalid-port-attempt3' })
+ .mockResolvedValueOnce({ customPort: 'invalid-port-attempt4' })
+ .mockResolvedValueOnce({ customPort: 'invalid-port-attempt5' })
+ .mockResolvedValueOnce({ customPort: 'invalid-port-attempt6' });
+
+ const result = await askForCustomPort();
+ expect(result).toBe(4321);
+ });
});
- test('should return user-provided port', async () => {
- jest
- .spyOn(inquirer, 'prompt')
- .mockResolvedValueOnce({ customPort: '8080' });
+ describe('reserved ports', () => {
+ test('should return user-provided port after confirming reserved port', async () => {
+ jest
+ .spyOn(inquirer, 'prompt')
+ .mockResolvedValueOnce({ customPort: '80' })
+ .mockResolvedValueOnce({ confirmPort: true });
+
+ const result = await askForCustomPort();
+ expect(result).toBe(80);
+ });
+
+ test('should re-prompt user for port if reserved port confirmation is denied', async () => {
+ jest
+ .spyOn(inquirer, 'prompt')
+ .mockResolvedValueOnce({ customPort: '80' })
+ .mockResolvedValueOnce({ confirmPort: false })
+ .mockResolvedValueOnce({ customPort: '8080' });
+
+ const result = await askForCustomPort();
+ expect(result).toBe(8080);
+ });
+
+ test('should return default port if reserved port confirmation is denied after maximum retry attempts', async () => {
+ jest
+ .spyOn(inquirer, 'prompt')
+ .mockResolvedValueOnce({ customPort: '80' })
+ .mockResolvedValueOnce({ confirmPort: false })
+ .mockResolvedValueOnce({ customPort: '80' })
+ .mockResolvedValueOnce({ confirmPort: false })
+ .mockResolvedValueOnce({ customPort: '80' })
+ .mockResolvedValueOnce({ confirmPort: false })
+ .mockResolvedValueOnce({ customPort: '80' })
+ .mockResolvedValueOnce({ confirmPort: false })
+ .mockResolvedValueOnce({ customPort: '80' })
+ .mockResolvedValueOnce({ confirmPort: false })
+ .mockResolvedValueOnce({ customPort: '80' });
- const result = await askForCustomPort();
- expect(result).toBe('8080');
+ const result = await askForCustomPort();
+ expect(result).toBe(4321);
+ });
});
});
diff --git a/src/setup/askForCustomPort/askForCustomPort.ts b/src/setup/askForCustomPort/askForCustomPort.ts
index 8a923f678f..dd0fd51854 100644
--- a/src/setup/askForCustomPort/askForCustomPort.ts
+++ b/src/setup/askForCustomPort/askForCustomPort.ts
@@ -1,14 +1,63 @@
import inquirer from 'inquirer';
-export async function askForCustomPort(): Promise {
- const { customPort } = await inquirer.prompt([
+const DEFAULT_PORT = 4321;
+const MAX_RETRY_ATTEMPTS = 5;
+
+export function validatePort(input: string): string | boolean {
+ const port = Number(input);
+ if (
+ Number.isNaN(port) ||
+ !Number.isInteger(port) ||
+ port <= 0 ||
+ port > 65535
+ ) {
+ return 'Please enter a valid port number between 1 and 65535.';
+ }
+ return true;
+}
+
+export async function reservedPortWarning(port: number): Promise {
+ const { confirmPort } = await inquirer.prompt<{ confirmPort: boolean }>([
{
- type: 'input',
- name: 'customPort',
- message:
- 'Enter custom port for development server (leave blank for default 4321):',
- default: 4321,
+ type: 'confirm',
+ name: 'confirmPort',
+ message: `Port ${port} is a reserved port. Are you sure you want to use it?`,
+ default: false,
},
]);
- return customPort;
+
+ return confirmPort;
+}
+
+export async function askForCustomPort(): Promise {
+ let remainingAttempts = MAX_RETRY_ATTEMPTS;
+
+ while (remainingAttempts--) {
+ const { customPort } = await inquirer.prompt<{ customPort: string }>([
+ {
+ type: 'input',
+ name: 'customPort',
+ message: `Enter custom port for development server (leave blank for default ${DEFAULT_PORT}):`,
+ default: DEFAULT_PORT.toString(),
+ validate: validatePort,
+ },
+ ]);
+
+ if (customPort && validatePort(customPort) === true) {
+ if (Number(customPort) >= 1024) {
+ return Number(customPort);
+ }
+
+ if (
+ Number(customPort) < 1024 &&
+ (await reservedPortWarning(Number(customPort)))
+ ) {
+ return Number(customPort);
+ }
+ }
+ }
+ console.log(
+ `\nMaximum attempts reached. Using default port ${DEFAULT_PORT}.`,
+ );
+ return DEFAULT_PORT;
}
diff --git a/src/setup/askForTalawaApiUrl/askForTalawaApiUrl.test.ts b/src/setup/askForTalawaApiUrl/askForTalawaApiUrl.test.ts
index b1490222b4..3a11a0d799 100644
--- a/src/setup/askForTalawaApiUrl/askForTalawaApiUrl.test.ts
+++ b/src/setup/askForTalawaApiUrl/askForTalawaApiUrl.test.ts
@@ -30,17 +30,9 @@ describe('askForTalawaApiUrl', () => {
});
test('should return the default endpoint when the user does not enter anything', async () => {
- const mockPrompt = jest
- .spyOn(inquirer, 'prompt')
- .mockImplementation(async (questions: any) => {
- const answers: Record = {};
- questions.forEach(
- (question: { name: string | number; default: any }) => {
- answers[question.name] = question.default;
- },
- );
- return answers;
- });
+ const mockPrompt = jest.spyOn(inquirer, 'prompt').mockResolvedValueOnce({
+ endpoint: 'http://localhost:4000/graphql/',
+ });
const result = await askForTalawaApiUrl();
diff --git a/src/setup/askForTalawaApiUrl/askForTalawaApiUrl.ts b/src/setup/askForTalawaApiUrl/askForTalawaApiUrl.ts
index 97daa1ac89..713ed7dc68 100644
--- a/src/setup/askForTalawaApiUrl/askForTalawaApiUrl.ts
+++ b/src/setup/askForTalawaApiUrl/askForTalawaApiUrl.ts
@@ -1,7 +1,7 @@
import inquirer from 'inquirer';
export async function askForTalawaApiUrl(): Promise {
- const { endpoint } = await inquirer.prompt([
+ const { endpoint } = await inquirer.prompt<{ endpoint: string }>([
{
type: 'input',
name: 'endpoint',
From 705dcbc98755fe231f9b9cf636701c2c1b132625 Mon Sep 17 00:00:00 2001
From: Akshat Gupta <88035400+Akshat76845@users.noreply.github.com>
Date: Mon, 23 Dec 2024 04:16:07 +0530
Subject: [PATCH 049/133] Refactor : src/screens/OrgContribution component from
Jest to Vitest (#2729)
* Converted from Jest to Vitest
* Converted the code from Jest to Vitest
* Converted from Jest to Vitest
---------
Co-authored-by: Akshat
---
...tion.test.tsx => OrgContribution.spec.tsx} | 20 +++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
rename src/screens/OrgContribution/{OrgContribution.test.tsx => OrgContribution.spec.tsx} (80%)
diff --git a/src/screens/OrgContribution/OrgContribution.test.tsx b/src/screens/OrgContribution/OrgContribution.spec.tsx
similarity index 80%
rename from src/screens/OrgContribution/OrgContribution.test.tsx
rename to src/screens/OrgContribution/OrgContribution.spec.tsx
index f9f63c6807..f12057a626 100644
--- a/src/screens/OrgContribution/OrgContribution.test.tsx
+++ b/src/screens/OrgContribution/OrgContribution.spec.tsx
@@ -1,9 +1,9 @@
-import React, { act } from 'react';
+import React from 'react';
import { MockedProvider } from '@apollo/react-testing';
import { render } from '@testing-library/react';
import { Provider } from 'react-redux';
import { BrowserRouter } from 'react-router-dom';
-import 'jest-location-mock';
+import { vi, describe, test, expect } from 'vitest';
import { I18nextProvider } from 'react-i18next';
import OrgContribution from './OrgContribution';
@@ -12,15 +12,20 @@ import i18nForTest from 'utils/i18nForTest';
import { StaticMockLink } from 'utils/StaticMockLink';
const link = new StaticMockLink([], true);
async function wait(ms = 100): Promise {
- await act(() => {
- return new Promise((resolve) => {
- setTimeout(resolve, ms);
- });
+ await new Promise((resolve) => {
+ setTimeout(resolve, ms);
});
}
describe('Organisation Contribution Page', () => {
test('should render props and text elements test for the screen', async () => {
+ Object.defineProperty(window, 'location', {
+ value: {
+ assign: vi.fn(),
+ },
+ writable: true,
+ });
+
window.location.assign('/orglist');
const { container } = render(
@@ -37,11 +42,10 @@ describe('Organisation Contribution Page', () => {
expect(container.textContent).not.toBe('Loading data...');
await wait();
-
expect(container.textContent).toMatch('Filter by Name');
expect(container.textContent).toMatch('Filter by Trans. ID');
expect(container.textContent).toMatch('Recent Stats');
expect(container.textContent).toMatch('Contribution');
- expect(window.location).toBeAt('/orglist');
+ expect(window.location.assign).toHaveBeenCalledWith('/orglist');
});
});
From 92ce58dfd00128a722943f4e38f739eaaa1eb1f1 Mon Sep 17 00:00:00 2001
From: Gurram Karthik <167804249+gurramkarthiknetha@users.noreply.github.com>
Date: Mon, 23 Dec 2024 04:21:39 +0530
Subject: [PATCH 050/133] fixed:#1887 Event and Holiday Calendar View (#2676)
* fixed-1887
* changed acc to bot
* final change
* gitpush final change
* 1 conflict resloved
* 1 conflict reslove
* 2nd conflict resloved
* changed css acc to gautam-divyanshu
* decreased time
* changed in event calendar
---------
Co-authored-by: Peter Harrison <16875803+palisadoes@users.noreply.github.com>
---
.../EventCalendar/EventCalendar.module.css | 177 ++++++++++++-
.../EventCalendar/EventCalendar.tsx | 240 +++++++-----------
src/screens/UserPortal/Posts/Posts.test.tsx | 5 +-
src/setupTests.ts | 2 +-
4 files changed, 265 insertions(+), 159 deletions(-)
diff --git a/src/components/EventCalendar/EventCalendar.module.css b/src/components/EventCalendar/EventCalendar.module.css
index 921af48bae..607d750f85 100644
--- a/src/components/EventCalendar/EventCalendar.module.css
+++ b/src/components/EventCalendar/EventCalendar.module.css
@@ -271,14 +271,6 @@
.expand_event_list {
display: block;
}
-
-.list_container {
- padding: 5px;
- width: fit-content;
- display: flex;
- flex-direction: row;
-}
-
.event_list_hour {
display: flex;
flex-direction: row;
@@ -316,7 +308,8 @@
flex-grow: 1;
}
-@media only screen and (max-width: 700px) {
+@media only screen and (max-width: var(--mobile-breakpoint)) {
+ /** @breakpoint --mobile-breakpoint: 768px */
.event_list {
display: none;
}
@@ -331,7 +324,7 @@
}
}
-@media only screen and (max-width: 500px) {
+@media only screen and (max-width: var(--small-mobile-breakpoint)) {
.btn__more {
font-size: 12px;
}
@@ -344,7 +337,22 @@
gap: 10px;
margin-top: 35px;
}
+.base_card {
+ flex: 1;
+ padding: 20px;
+ border-radius: 10px;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15);
+}
+
+.holidays_card {
+ composes: base_card;
+ background-color: var(--holiday-card-bg);
+}
+.events_card {
+ composes: base_card;
+ background-color: #ffffff;
+}
.card__holidays {
background-color: rgba(246, 242, 229, 1);
display: flex;
@@ -415,9 +423,150 @@
border-radius: 10px;
}
-.userEvents__color {
- height: 15px;
- width: 40px;
- background: rgba(146, 200, 141, 0.5);
+.baseIndicator {
+ border-radius: 5px;
+ width: 20px;
+ height: 12px;
+ display: inline-block;
+}
+
+.holidayText {
+ font-size: 14px;
+ color: #555555;
+}
+.eventsLegend {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+}
+
+.list_container {
+ padding: 5px;
+ width: fit-content;
+ display: flex;
+ align-items: center;
+ gap: var(--indicator-spacing);
+}
+
+.holidayIndicator {
+ composes: baseIndicator;
+ background-color: rgba(0, 0, 0, 0.15);
+}
+
+:root {
+ /* Color scheme for holiday-related elements */
+ --color-user-event: rgba(139, 195, 74, 1);
+ /* Holiday colors */
+ --color-holiday-indicator: rgba(0, 0, 0, 0.15);
+ --color-holiday-date: rgba(255, 152, 0, 1);
+ /* Breakpoints for responsive design */
+ --mobile-breakpoint: 700px;
+ --small-mobile-breakpoint: 480px;
+ --text-color-primary: rgba(51, 51, 51, 1);
+ --text-color-secondary: rgba(85, 85, 85, 1);
+ /* Card styles */
+ --card-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+ --holiday-card-bg: #f6f2e5;
+ --holiday-date-color: #d35400;
+ --indicator-spacing: 8px;
+ /* Interactive states */
+ --hover-bg-color: rgba(0, 0, 0, 0.05);
+}
+.organizationIndicator {
+ composes: baseIndicator;
+ background-color: rgba(82, 172, 255, 0.5);
+}
+
+.legendText {
+ font-size: 14px;
+ color: #555555;
+}
+@media only screen and (max-width: var(--mobile-breakpoint)) {
+ .list_container,
+ .eventsLegend {
+ gap: 4px;
+ }
+
+ .holidayIndicator,
+ .organizationIndicator {
+ width: 16px;
+ height: 10px;
+ }
+
+ .holidayText,
+ .legendText {
+ font-size: 12px;
+ }
+}
+.card_title {
+ font-size: 16px;
+ font-weight: 600;
+ color: var(--text-color-primary);
+ margin-bottom: 15px;
+}
+
+.card_list {
+ list-style: none;
+ padding: 0;
+ margin: 0;
+}
+
+.card_list_item {
+ display: flex;
+ align-items: center;
+ margin-bottom: 10px;
+ font-size: 14px;
+ color: var(--text-color-secondary);
+}
+
+.holiday_date {
+ font-weight: 500;
+ margin-right: 10px;
+ color: var(--holiday-date-color);
+}
+
+.calendar_infocards {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: flex-start;
+ gap: 20px;
+ padding: 20px;
+ background-color: var(--grey-bg-color);
+}
+.holidays_card,
+.events_card {
+ flex: 1;
+ padding: 20px;
border-radius: 10px;
+ box-shadow: var(--card-shadow);
+}
+
+.holidays_card {
+ background-color: var(--holiday-card-bg);
+}
+
+.events_card {
+ background-color: white;
+}
+
+.legend {
+ display: flex;
+ flex-direction: column;
+ gap: 12px;
+}
+
+.userEvents__color {
+ composes: baseIndicator;
+ display: inline-block;
+ background-color: rgba(139, 195, 74, 1);
+}
+
+.card_list_item:hover {
+ background-color: var(--hover-bg-color);
+ transition: background-color 0.2s ease;
+}
+.card_list_item:focus-visible {
+ background-color: var(--hover-bg-color);
+ transition: background-color 0.2s ease;
}
diff --git a/src/components/EventCalendar/EventCalendar.tsx b/src/components/EventCalendar/EventCalendar.tsx
index 575bda391e..ebcf8be942 100644
--- a/src/components/EventCalendar/EventCalendar.tsx
+++ b/src/components/EventCalendar/EventCalendar.tsx
@@ -1,16 +1,14 @@
import EventListCard from 'components/EventListCard/EventListCard';
import dayjs from 'dayjs';
+import React, { useState, useEffect, useMemo } from 'react';
import Button from 'react-bootstrap/Button';
-import React, { useState, useEffect } from 'react';
import styles from './EventCalendar.module.css';
import { ChevronLeft, ChevronRight } from '@mui/icons-material';
-import CurrentHourIndicator from 'components/CurrentHourIndicator/CurrentHourIndicator';
import { ViewType } from 'screens/OrganizationEvents/OrganizationEvents';
import HolidayCard from '../HolidayCards/HolidayCard';
-import { holidays, hours, months, weekdays } from './constants';
+import { holidays, months, weekdays } from './constants';
import type { InterfaceRecurrenceRule } from 'utils/recurrenceUtils';
import YearlyEventCalender from './YearlyEventCalender';
-
interface InterfaceEventListCardProps {
userRole?: string;
key?: string;
@@ -75,7 +73,6 @@ const Calendar: React.FC = ({
);
const [expanded, setExpanded] = useState(-1);
const [windowWidth, setWindowWidth] = useState(window.screen.width);
-
useEffect(() => {
function handleResize(): void {
setWindowWidth(window.screen.width);
@@ -138,9 +135,21 @@ const Calendar: React.FC = ({
}
};
- /**
- * Moves the calendar view to the next month.
- */
+ const filteredHolidays = useMemo(() => {
+ return Array.isArray(holidays)
+ ? holidays.filter((holiday) => {
+ if (!holiday.date) {
+ if (process.env.NODE_ENV !== 'test') {
+ console.warn(`Holiday "${holiday.name}" has no date specified.`);
+ }
+ return false;
+ }
+ const holidayMonth = dayjs(holiday.date, 'MM-DD', true).month();
+ return holidayMonth === currentMonth;
+ })
+ : [];
+ }, [holidays, currentMonth]);
+
const handleNextMonth = (): void => {
if (currentMonth === 11) {
setCurrentMonth(0);
@@ -149,10 +158,6 @@ const Calendar: React.FC = ({
setCurrentMonth(currentMonth + 1);
}
};
-
- /**
- * Moves the calendar view to the previous date.
- */
const handlePrevDate = (): void => {
if (currentDate > 1) {
setCurrentDate(currentDate - 1);
@@ -193,9 +198,6 @@ const Calendar: React.FC = ({
}
};
- /**
- * Moves the calendar view to today's date.
- */
const handleTodayButton = (): void => {
setCurrentYear(today.getFullYear());
setCurrentMonth(today.getMonth());
@@ -264,6 +266,17 @@ const Calendar: React.FC = ({
);
}) || [];
+ const shouldShowViewMore = useMemo(() => {
+ return (
+ allDayEventsList.length > 2 ||
+ (windowWidth <= 700 && allDayEventsList.length > 0)
+ );
+ }, [allDayEventsList.length, windowWidth]);
+
+ const handleExpandClick: () => void = () => {
+ toggleExpand(-100);
+ };
+
return (
<>
- {hours.map((hour, index) => {
- const timeEventsList: JSX.Element[] =
- events
- ?.filter((datas) => {
- const currDate = new Date(
- currentYear,
- currentMonth,
- currentDate,
- );
-
- if (
- parseInt(datas.startTime?.slice(0, 2) as string).toString() ==
- (index % 24).toString() &&
- datas.startDate == dayjs(currDate).format('YYYY-MM-DD')
- ) {
- return datas;
- }
- })
- .map((datas: InterfaceEventListCardProps) => {
- const attendees: { _id: string }[] = [];
- datas.attendees?.forEach((attendee: { _id: string }) => {
- const r = {
- _id: attendee._id,
- };
-
- attendees.push(r);
- });
-
- return (
-
- {isLoading ? (
-
-
-
+
)}
);
};
-
export default Users;
From a295db30220035bbd00ef60c7977ae63c325436c Mon Sep 17 00:00:00 2001
From: Rafiul Hasan <67283985+rafidoth@users.noreply.github.com>
Date: Mon, 23 Dec 2024 04:40:07 +0600
Subject: [PATCH 046/133] Fixes #2670 : Refactored src/screen/PageNotFound
component test from jest to vitest (#2708)
* Refactored Refactor: src/screens/PageNotFound from Jest to Vitest
* Refactored :src/screens/PageNotFound from Jest to Vitest
* Refactored :src/screens/PageNotFound from Jest to Vitest
* Refactored :src/screens/PageNotFound from Jest to Vitest
---
...otFound.test.tsx => PageNotFound.spec.tsx} | 22 +++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
rename src/screens/PageNotFound/{PageNotFound.test.tsx => PageNotFound.spec.tsx} (68%)
diff --git a/src/screens/PageNotFound/PageNotFound.test.tsx b/src/screens/PageNotFound/PageNotFound.spec.tsx
similarity index 68%
rename from src/screens/PageNotFound/PageNotFound.test.tsx
rename to src/screens/PageNotFound/PageNotFound.spec.tsx
index 501d9f7ef3..4557eb5af4 100644
--- a/src/screens/PageNotFound/PageNotFound.test.tsx
+++ b/src/screens/PageNotFound/PageNotFound.spec.tsx
@@ -8,11 +8,11 @@ import { store } from 'state/store';
import PageNotFound from './PageNotFound';
import i18nForTest from 'utils/i18nForTest';
import useLocalStorage from 'utils/useLocalstorage';
-
+import { it, expect, describe } from 'vitest';
const { setItem } = useLocalStorage();
describe('Testing Page not found component', () => {
- test('Component should be rendered properly for User', () => {
+ it('should render component properly for User', () => {
//setItem('AdminFor', undefined);
render(
-
- }
- >
- {tCommon('endOfResults')}
-| + {title} + | + ); + })} +- {title} - | +
|---|
@@ -284,7 +297,6 @@ const Calendar: React.FC = ({
? styles.expand_list_container
: styles.list_container
}
- style={{ width: 'fit-content' }}
>
= ({
: styles.event_list_hour
}
>
- {expanded === -100
- ? allDayEventsList
- : allDayEventsList?.slice(0, 1)}
+ {Array.isArray(allDayEventsList) &&
+ allDayEventsList.length > 0 ? (
+ expanded === -100 ? (
+ allDayEventsList
+ ) : (
+ allDayEventsList.slice(0, 1)
+ )
+ ) : (
+
- {(allDayEventsList?.length > 2 ||
- (windowWidth <= 700 && allDayEventsList?.length > 0)) && (
+ {Array.isArray(allDayEventsList) && (
)}
+ No events available +
+ )}
-
-
{`${hour}`}
+
+ = ({
return days.map((date, index) => {
const className = [
date.getDay() === 0 || date.getDay() === 6 ? styles.day_weekends : '',
- date.toLocaleDateString() === today.toLocaleDateString() //Styling for today day cell
+ date.toLocaleDateString() === today.toLocaleDateString()
? styles.day__today
: '',
- date.getMonth() !== currentMonth ? styles.day__outside : '', //Styling for days outside the current month
+ date.getMonth() !== currentMonth ? styles.day__outside : '',
selectedDate?.getTime() === date.getTime() ? styles.day__selected : '',
styles.day,
].join(' ');
@@ -504,13 +463,12 @@ const Calendar: React.FC = ({
);
}) || [];
- const holidayList: JSX.Element[] = holidays
- .filter((holiday) => {
- if (holiday.date == dayjs(date).format('MM-DD')) return holiday;
- })
+ const holidayList: JSX.Element[] = filteredHolidays
+ .filter((holiday) => holiday.date === dayjs(date).format('MM-DD'))
.map((holiday) => {
return
+
+
+ Holidays
+-
+ {filteredHolidays.map((holiday, index) => (
+
- + + {months[parseInt(holiday.date.slice(0, 2), 10) - 1]}{' '} + {holiday.date.slice(3)} + + {holiday.name} + + ))} +
+
);
};
@@ -448,10 +407,10 @@ const Calendar: React.FCEvents
+
+
+
+
+ Holidays
-
- 0
- ? styles.event_list_parent_current
- : styles.event_list_parent
- }
- >
- {index % 24 == new Date().getHours() &&
- new Date().getDate() == currentDate && (
-
- );
- })}
+
-
+
- {}
- {expanded === index
- ? timeEventsList
- : timeEventsList?.slice(0, 1)}
-
- {(timeEventsList?.length > 1 ||
- (windowWidth <= 700 && timeEventsList?.length > 0)) && (
-
- )}
-
+
+
+ Events Created by Organization
+
+
+
+
+
+ Events Created by User
+
= ({
)}
-
{viewType == ViewType.MONTH ? (
- = new ApolloClient({
});
describe('Testing Contribution Stats', () => {
+ /**
+ * Props to be passed to the `SidePanel` component during the test.
+ */
const props = {
collapse: true,
children: '234',
};
-
+ /**
+ * Verifies that the `SidePanel` component renders correctly with given props.
+ */
test('should render props and text elements test for the SidePanel component', () => {
render(
From 23a5f6300ab5e6403ab8347b52347d8c917b2ea9 Mon Sep 17 00:00:00 2001
From: Shiva <148421597+shivasankaran18@users.noreply.github.com>
Date: Mon, 23 Dec 2024 22:42:45 +0530
Subject: [PATCH 053/133] refactor:vitest to checkInModal (#2734)
---
.../{CheckInModal.test.tsx => CheckInModal.spec.tsx} | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
rename src/components/CheckIn/{CheckInModal.test.tsx => CheckInModal.spec.tsx} (89%)
diff --git a/src/components/CheckIn/CheckInModal.test.tsx b/src/components/CheckIn/CheckInModal.spec.tsx
similarity index 89%
rename from src/components/CheckIn/CheckInModal.test.tsx
rename to src/components/CheckIn/CheckInModal.spec.tsx
index 1660c7c4bb..4f5a05328e 100644
--- a/src/components/CheckIn/CheckInModal.test.tsx
+++ b/src/components/CheckIn/CheckInModal.spec.tsx
@@ -12,6 +12,7 @@ import { LocalizationProvider } from '@mui/x-date-pickers';
import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
import { checkInQueryMock } from './mocks';
import { StaticMockLink } from 'utils/StaticMockLink';
+import { vi } from 'vitest';
const link = new StaticMockLink(checkInQueryMock, true);
@@ -19,9 +20,14 @@ describe('Testing Check In Attendees Modal', () => {
const props = {
show: true,
eventId: 'event123',
- handleClose: jest.fn(),
+ handleClose: vi.fn(),
};
+ /**
+ * Test case for rendering the CheckInModal component and verifying functionality.
+ * It checks that the modal renders fetched users and verifies the filtering mechanism.
+ */
+
test('The modal should be rendered, and all the fetched users should be shown properly and user filtering should work', async () => {
const { queryByText, queryByLabelText } = render(
From 86d59c211a7d914120f54051f2e9e9708b1a46dc Mon Sep 17 00:00:00 2001
From: MANDEEP N H <146331633+mandeepnh5@users.noreply.github.com>
Date: Mon, 23 Dec 2024 22:54:52 +0530
Subject: [PATCH 054/133] Refactoring CSS files: merged FundCompaignPledge
styles into global app.module.css (#2706)
* Update fundcomapignpledge
* deleted fundcompaignpledge local css file
* Fix linting issues
* fixed type check
* Update src/style/app.module.css
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
* fixed some coderabbit issue
* Fixed testing issue
* Update src/style/app.module.css
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
* Fix coderabbit suggestion
---------
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
.../FundCampaignPledge.module.css | 273 ------------------
.../FundCampaignPledge/FundCampaignPledge.tsx | 28 +-
.../FundCampaignPledge/PledgeDeleteModal.tsx | 2 +-
.../FundCampaignPledge/PledgeModal.tsx | 12 +-
src/style/app.module.css | 223 ++++++++++++++
5 files changed, 244 insertions(+), 294 deletions(-)
delete mode 100644 src/screens/FundCampaignPledge/FundCampaignPledge.module.css
diff --git a/src/screens/FundCampaignPledge/FundCampaignPledge.module.css b/src/screens/FundCampaignPledge/FundCampaignPledge.module.css
deleted file mode 100644
index cdf4476267..0000000000
--- a/src/screens/FundCampaignPledge/FundCampaignPledge.module.css
+++ /dev/null
@@ -1,273 +0,0 @@
-.pledgeContainer {
- margin: 0.6rem 0;
-}
-
-.container {
- min-height: 100vh;
-}
-
-.pledgeModal {
- max-width: 80vw;
- margin-top: 2vh;
- margin-left: 13vw;
-}
-
-.titlemodal {
- color: #707070;
- font-weight: 600;
- font-size: 32px;
- width: 65%;
- margin-bottom: 0px;
-}
-
-.modalCloseBtn {
- width: 40px;
- height: 40px;
- padding: 1rem;
- display: flex;
- justify-content: center;
- align-items: center;
-}
-
-.greenregbtn {
- margin: 1rem 0 0;
- margin-top: 15px;
- 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%;
-}
-.message {
- margin-top: 25%;
- display: flex;
- justify-content: center;
- align-items: center;
- flex-direction: column;
-}
-
-.errorIcon {
- transform: scale(1.5);
- color: var(--bs-danger);
- margin-bottom: 1rem;
-}
-
-.btnsContainer {
- display: flex;
- gap: 0.8rem;
- margin: 2.2rem 0 0.8rem 0;
-}
-
-.btnsContainer .input {
- flex: 1;
- min-width: 18rem;
- position: relative;
-}
-
-.btnsContainer input {
- outline: 1px solid var(--bs-gray-400);
-}
-
-.btnsContainer .input button {
- width: 52px;
-}
-
-.inputField {
- background-color: white;
- box-shadow: 0 1px 1px #31bb6b;
-}
-
-.dropdown {
- background-color: white;
- border: 1px solid #31bb6b;
- position: relative;
- display: inline-block;
- color: #31bb6b;
-}
-
-.tableHeader {
- background-color: var(--bs-primary);
- color: var(--bs-white);
- font-size: 1rem;
-}
-
-.rowBackground {
- background-color: var(--bs-white);
- max-height: 120px;
-}
-
-.TableImage {
- object-fit: cover;
- width: 25px !important;
- height: 25px !important;
- border-radius: 100% !important;
-}
-
-.avatarContainer {
- width: 28px;
- height: 26px;
-}
-
-.imageContainer {
- display: flex;
- align-items: center;
- justify-content: center;
-}
-
-.pledgerContainer {
- display: flex;
- align-items: center;
- justify-content: center;
- margin: 0.1rem 0.25rem;
- gap: 0.25rem;
- padding: 0.25rem 0.45rem;
- border-radius: 0.35rem;
- background-color: #31bb6b33;
- height: 2.2rem;
- margin-top: 0.75rem;
-}
-
-.noOutline input {
- outline: none;
-}
-
-.overviewContainer {
- display: flex;
- gap: 7rem;
- width: 100%;
- justify-content: space-between;
- margin: 1.5rem 0 0 0;
- padding: 1.25rem 2rem;
- background-color: rgba(255, 255, 255, 0.591);
-
- box-shadow: rgba(0, 0, 0, 0.16) 0px 1px 4px;
- border-radius: 0.5rem;
-}
-
-.titleContainer {
- display: flex;
- flex-direction: column;
- gap: 0.6rem;
-}
-
-.titleContainer h3 {
- font-size: 1.75rem;
- font-weight: 750;
- color: #5e5e5e;
- margin-top: 0.2rem;
-}
-
-.titleContainer span {
- font-size: 0.9rem;
- margin-left: 0.5rem;
- font-weight: lighter;
- color: #707070;
-}
-
-.raisedAmount {
- display: flex;
- justify-content: center;
- align-items: center;
- font-size: 1.25rem;
- font-weight: 750;
- color: #5e5e5e;
-}
-
-.progressContainer {
- display: flex;
- flex-direction: column;
- gap: 0.5rem;
- flex-grow: 1;
-}
-
-.progress {
- margin-top: 0.2rem;
- display: flex;
- flex-direction: column;
- gap: 0.3rem;
-}
-
-.endpoints {
- display: flex;
- position: relative;
- font-size: 0.85rem;
-}
-
-.start {
- position: absolute;
- top: 0px;
-}
-
-.end {
- position: absolute;
- top: 0px;
- right: 0px;
-}
-
-.moreContainer {
- display: flex;
- align-items: center;
-}
-
-.moreContainer:hover {
- text-decoration: underline;
- cursor: pointer;
-}
-
-.popup {
- z-index: 50;
- border-radius: 0.5rem;
- font-family: sans-serif;
- font-weight: 500;
- font-size: 0.875rem;
- margin-top: 0.5rem;
- padding: 0.75rem;
- border: 1px solid #e2e8f0;
- background-color: white;
- color: #1e293b;
- box-shadow: 0 0.5rem 1rem rgb(0 0 0 / 0.15);
- display: flex;
- flex-direction: column;
- gap: 0.5rem;
-}
-
-.popupExtra {
- max-height: 15rem;
- overflow-y: auto;
-}
-
-.toggleGroup {
- width: 50%;
- min-width: 27.75rem;
- margin: 0.5rem 0rem;
-}
-
-.toggleBtn {
- padding: 0rem;
- height: 30px;
- display: flex;
- justify-content: center;
- align-items: center;
-}
-
-.toggleBtn:hover {
- color: #31bb6b !important;
-}
-
-input[type='radio']:checked + label {
- background-color: #31bb6a50 !important;
-}
-
-input[type='radio']:checked + label:hover {
- color: black !important;
-}
diff --git a/src/screens/FundCampaignPledge/FundCampaignPledge.tsx b/src/screens/FundCampaignPledge/FundCampaignPledge.tsx
index d14ee9de06..8942265eea 100644
--- a/src/screens/FundCampaignPledge/FundCampaignPledge.tsx
+++ b/src/screens/FundCampaignPledge/FundCampaignPledge.tsx
@@ -9,7 +9,7 @@ import { Button, Dropdown, Form } from 'react-bootstrap';
import { useTranslation } from 'react-i18next';
import { Navigate, useParams } from 'react-router-dom';
import { currencySymbols } from 'utils/currency';
-import styles from './FundCampaignPledge.module.css';
+import styles from '../../style/app.module.css';
import PledgeDeleteModal from './PledgeDeleteModal';
import PledgeModal from './PledgeModal';
import { Breadcrumbs, Link, Stack, Typography } from '@mui/material';
@@ -233,14 +233,14 @@ const fundCampaignPledge = (): JSX.Element => {
src={user.image}
alt="pledge"
data-testid={`image${index + 1}`}
- className={styles.TableImage}
+ className={styles.TableImagePledge}
/>
) : (
+ <>
+
{weekdays.map((weekday, index) => (
+
+ ) : viewType == ViewType.YEAR ? (
+
@@ -611,18 +569,14 @@ const Calendar: React.FC = ({
))}
{renderDays()}
-
- {viewType == ViewType.YEAR ? (
-
+ {renderHours()}
- )}
- {renderHours()}
)}
{viewType == ViewType.YEAR ? (
= ({
if (isDefault != fund?.isDefault) {
updatedFields.isDefault = isDefault;
}
-
+ if (Object.keys(updatedFields).length === 0) {
+ return;
+ }
await updateFund({
variables: {
id: fund?._id,
@@ -157,9 +159,7 @@ const FundModal: React.FC = ({
hide();
toast.success(t('fundUpdated') as string);
} catch (error: unknown) {
- if (error instanceof Error) {
- toast.error(error.message);
- }
+ toast.error((error as Error).message);
}
};
diff --git a/src/screens/OrganizationFunds/OrganizationFunds.test.tsx b/src/screens/OrganizationFunds/OrganizationFunds.spec.tsx
similarity index 85%
rename from src/screens/OrganizationFunds/OrganizationFunds.test.tsx
rename to src/screens/OrganizationFunds/OrganizationFunds.spec.tsx
index c6983e1d6d..b259b7da65 100644
--- a/src/screens/OrganizationFunds/OrganizationFunds.test.tsx
+++ b/src/screens/OrganizationFunds/OrganizationFunds.spec.tsx
@@ -11,7 +11,7 @@ import {
import userEvent from '@testing-library/user-event';
import { I18nextProvider } from 'react-i18next';
import { Provider } from 'react-redux';
-import { MemoryRouter, Route, Routes } from 'react-router-dom';
+import { MemoryRouter, Route, Routes, useParams } from 'react-router-dom';
import { store } from 'state/store';
import { StaticMockLink } from 'utils/StaticMockLink';
import i18nForTest from 'utils/i18nForTest';
@@ -20,11 +20,12 @@ import { MOCKS, MOCKS_ERROR, NO_FUNDS } from './OrganizationFundsMocks';
import type { ApolloLink } from '@apollo/client';
import { LocalizationProvider } from '@mui/x-date-pickers';
import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
+import { vi } from 'vitest';
-jest.mock('react-toastify', () => ({
+vi.mock('react-toastify', () => ({
toast: {
- success: jest.fn(),
- error: jest.fn(),
+ success: vi.fn(),
+ error: vi.fn(),
},
}));
@@ -67,21 +68,22 @@ const renderOrganizationFunds = (link: ApolloLink): RenderResult => {
describe('OrganizationFunds Screen =>', () => {
beforeEach(() => {
- jest.mock('react-router-dom', () => ({
- ...jest.requireActual('react-router-dom'),
- useParams: () => ({ orgId: 'orgId' }),
- }));
- });
-
- afterEach(() => {
- jest.clearAllMocks();
+ vi.mock('react-router-dom', async () => {
+ const actual = await vi.importActual('react-router-dom');
+ return {
+ ...actual,
+ useParams: vi.fn(),
+ };
+ });
});
afterEach(() => {
+ vi.clearAllMocks();
cleanup();
});
it('should render the Campaign Pledge screen', async () => {
+ vi.mocked(useParams).mockReturnValue({ orgId: 'orgId' });
renderOrganizationFunds(link1);
await waitFor(() => {
expect(screen.getByTestId('searchByName')).toBeInTheDocument();
@@ -89,29 +91,34 @@ describe('OrganizationFunds Screen =>', () => {
});
it('should redirect to fallback URL if URL params are undefined', async () => {
+ vi.mocked(useParams).mockReturnValue({});
render(
-
}
/>
+
-
+
+
setSearchTerm(e.target.value)}
data-testid="searchPledger"
@@ -557,7 +557,7 @@ const fundCampaignPledge = (): JSX.Element => {
),
}}
sx={dataGridStyle}
- getRowClassName={() => `${styles.rowBackground}`}
+ getRowClassName={() => `${styles.rowBackgroundPledge}`}
autoHeight
rowHeight={65}
rows={pledges.map((pledge) => ({
@@ -607,14 +607,14 @@ const fundCampaignPledge = (): JSX.Element => {
src={user.image}
alt="pledger"
data-testid={`extraImage${index + 1}`}
- className={styles.TableImage}
+ className={styles.TableImagePledge}
/>
) : (
= ({
= ({
format="DD/MM/YYYY"
label={tCommon('startDate')}
value={dayjs(pledgeStartDate)}
- className={styles.noOutline}
+ className={styles.noOutlinePledge}
onChange={(date: Dayjs | null): void => {
if (date) {
setFormState({
@@ -280,7 +280,7 @@ const PledgeModal: React.FC = ({
{
if (date) {
@@ -327,7 +327,7 @@ const PledgeModal: React.FC = ({
{
if (parseInt(e.target.value) > 0) {
@@ -343,7 +343,7 @@ const PledgeModal: React.FC = ({
{/* Button to submit the pledge form */}
@@ -469,7 +471,7 @@ function ManageTag(): JSX.Element {
hasMore={
userTagAssignedMembersData?.getAssignedUsers
.usersAssignedTo.pageInfo.hasNextPage ??
- /* istanbul ignore next */ false
+ /* istanbul ignore next -- @preserve */ false
}
loader={
- {t('noAssignedMembersFound')}
-
- ),
+ noRowsOverlay:
+ /* istanbul ignore next -- @preserve */ () => (
+
+ {t('noAssignedMembersFound')}
+
+ ),
}}
sx={dataGridStyle}
getRowClassName={() => `${styles.rowBackground}`}
From e1b49d244a0c3fa76d41ad2387cac9c3a92db11d Mon Sep 17 00:00:00 2001
From: MANDEEP N H <146331633+mandeepnh5@users.noreply.github.com>
Date: Tue, 24 Dec 2024 13:33:21 +0530
Subject: [PATCH 060/133] Refactoring CSS files: merged CommunityProfile styles
into global app.module.css (#2738)
* Refactor Community Profile css
* Fix linting issues
* Fix explicit lint issue
---
.../CommunityProfile.module.css | 41 ------------------
.../CommunityProfile/CommunityProfile.tsx | 5 ++-
src/style/app.module.css | 42 +++++++++++++++++++
3 files changed, 45 insertions(+), 43 deletions(-)
delete mode 100644 src/screens/CommunityProfile/CommunityProfile.module.css
diff --git a/src/screens/CommunityProfile/CommunityProfile.module.css b/src/screens/CommunityProfile/CommunityProfile.module.css
deleted file mode 100644
index 1e6eac2bae..0000000000
--- a/src/screens/CommunityProfile/CommunityProfile.module.css
+++ /dev/null
@@ -1,41 +0,0 @@
-.card {
- width: fit-content;
-}
-
-.cardHeader {
- padding: 1.25rem 1rem 1rem 1rem;
- border-bottom: 1px solid var(--bs-gray-200);
- display: flex;
- justify-content: space-between;
- align-items: center;
-}
-
-.cardHeader .cardTitle {
- font-size: 1.5rem;
-}
-
-.formLabel {
- font-weight: normal;
- padding-bottom: 0;
- font-size: 1rem;
- color: black;
-}
-.cardBody {
- min-height: 180px;
-}
-
-.cardBody .textBox {
- margin: 0 0 3rem 0;
- color: var(--bs-secondary);
-}
-
-.socialInput {
- height: 2.5rem;
-}
-
-@media (max-width: 520px) {
- .btn {
- flex-direction: column;
- justify-content: center;
- }
-}
diff --git a/src/screens/CommunityProfile/CommunityProfile.tsx b/src/screens/CommunityProfile/CommunityProfile.tsx
index d96c923eb3..05f328ced0 100644
--- a/src/screens/CommunityProfile/CommunityProfile.tsx
+++ b/src/screens/CommunityProfile/CommunityProfile.tsx
@@ -18,7 +18,7 @@ import {
SlackLogo,
} from 'assets/svgs/social-icons';
import convertToBase64 from 'utils/convertToBase64';
-import styles from './CommunityProfile.module.css';
+import styles from '../../style/app.module.css';
import { errorHandler } from 'utils/errorHandler';
import UpdateSession from '../../components/UpdateSession/UpdateSession';
@@ -90,7 +90,7 @@ const CommunityProfile = (): JSX.Element => {
React.useEffect(() => {
const preLoginData: PreLoginImageryDataType | undefined =
data?.getCommunityData;
- preLoginData &&
+ if (preLoginData) {
setProfileVariable({
name: preLoginData.name ?? '',
websiteLink: preLoginData.websiteLink ?? '',
@@ -104,6 +104,7 @@ const CommunityProfile = (): JSX.Element => {
reddit: preLoginData.socialMediaUrls.reddit ?? '',
slack: preLoginData.socialMediaUrls.slack ?? '',
});
+ }
}, [data]);
/**
diff --git a/src/style/app.module.css b/src/style/app.module.css
index 6d6413aa86..3d161b52b1 100644
--- a/src/style/app.module.css
+++ b/src/style/app.module.css
@@ -831,6 +831,48 @@ hr {
color: #31bb6b !important;
}
+.card {
+ width: fit-content;
+}
+
+.cardHeader {
+ padding: 1.25rem 1rem 1rem 1rem;
+ border-bottom: 1px solid var(--bs-gray-200);
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.cardHeader .cardTitle {
+ font-size: 1.5rem;
+}
+
+.formLabel {
+ font-weight: normal;
+ padding-bottom: 0;
+ font-size: 1rem;
+ color: black;
+}
+.cardBody {
+ min-height: 180px;
+}
+
+.cardBody .textBox {
+ margin: 0 0 3rem 0;
+ color: var(--bs-secondary);
+}
+
+.socialInput {
+ height: 2.5rem;
+}
+
+@media (max-width: 520px) {
+ .btn {
+ flex-direction: column;
+ justify-content: center;
+ }
+}
+
@media (max-width: 1024px) {
.pageNotFound h1.head {
font-size: 200px;
From 3b681362d935e222373555c35959801c19d18aba Mon Sep 17 00:00:00 2001
From: Gurram Karthik <167804249+gurramkarthiknetha@users.noreply.github.com>
Date: Tue, 24 Dec 2024 14:46:43 +0530
Subject: [PATCH 061/133] fixed : #2516 Refactor CSS files in
src/screens/OrganizationFunds (#2743)
* issue-2516-fixed
* test
* removed commented lines
* deleted file
---
.../OrganizationFunds.module.css | 142 ------------------
.../OrganizationFunds/OrganizationFunds.tsx | 20 +--
src/style/app.module.css | 131 ++++++----------
3 files changed, 56 insertions(+), 237 deletions(-)
delete mode 100644 src/screens/OrganizationFunds/OrganizationFunds.module.css
diff --git a/src/screens/OrganizationFunds/OrganizationFunds.module.css b/src/screens/OrganizationFunds/OrganizationFunds.module.css
deleted file mode 100644
index aa9d89dfb1..0000000000
--- a/src/screens/OrganizationFunds/OrganizationFunds.module.css
+++ /dev/null
@@ -1,142 +0,0 @@
-.list_box {
- height: auto;
- overflow-y: auto;
- width: 100%;
-}
-
-.inputField {
- margin-top: 10px;
- margin-bottom: 10px;
- background-color: white;
- box-shadow: 0 1px 1px #31bb6b;
-}
-
-.inputField > button {
- padding-top: 10px;
- padding-bottom: 10px;
-}
-
-.dropdown {
- background-color: white;
- border: 1px solid #31bb6b;
- position: relative;
- display: inline-block;
- color: #31bb6b;
-}
-
-.fundName {
- font-weight: 600;
- cursor: pointer;
-}
-
-.modalHeader {
- border: none;
- padding-bottom: 0;
-}
-
-.label {
- color: var(--bs-emphasis-color);
-}
-
-.fundModal {
- max-width: 80vw;
- margin-top: 2vh;
- margin-left: 13vw;
-}
-
-.titlemodal {
- color: #707070;
- font-weight: 600;
- font-size: 32px;
- width: 65%;
- margin-bottom: 0px;
-}
-
-.noOutline input {
- outline: none;
-}
-
-.modalCloseBtn {
- width: 40px;
- height: 40px;
- padding: 1rem;
- display: flex;
- justify-content: center;
- align-items: center;
-}
-
-.greenregbtn {
- margin: 1rem 0 0;
- margin-top: 15px;
- 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%;
-}
-
-.manageBtn {
- margin: 1rem 0 0;
- margin-top: 15px;
- border: 1px solid #e8e5e5;
- box-shadow: 0 2px 2px #e8e5e5;
- padding: 10px 10px;
- border-radius: 5px;
- font-size: 16px;
- color: white;
- outline: none;
- font-weight: 600;
- cursor: pointer;
- width: 45%;
- transition:
- transform 0.2s,
- box-shadow 0.2s;
-}
-
-.btnsContainer {
- display: flex;
- margin: 2rem 0 2.5rem 0;
-}
-
-.btnsContainer .input {
- flex: 1;
- min-width: 18rem;
- position: relative;
-}
-
-.btnsContainer input {
- outline: 1px solid var(--bs-gray-400);
-}
-
-.btnsContainer .input button {
- width: 52px;
-}
-
-.mainpageright > hr {
- margin-top: 20px;
- width: 100%;
- margin-left: -15px;
- margin-right: -15px;
- margin-bottom: 20px;
-}
-
-.rowBackground {
- background-color: var(--bs-white);
- max-height: 120px;
-}
-
-.tableHeader {
- background-color: var(--bs-primary);
- color: var(--bs-white);
- font-size: 1rem;
-}
diff --git a/src/screens/OrganizationFunds/OrganizationFunds.tsx b/src/screens/OrganizationFunds/OrganizationFunds.tsx
index 2c352c1693..ec9409fbe0 100644
--- a/src/screens/OrganizationFunds/OrganizationFunds.tsx
+++ b/src/screens/OrganizationFunds/OrganizationFunds.tsx
@@ -160,7 +160,7 @@ const organizationFunds = (): JSX.Element => {
minWidth: 100,
align: 'center',
headerAlign: 'center',
- headerClassName: `${styles.tableHeader}`,
+ headerClassName: `${styles.tableHeaders}`,
sortable: false,
renderCell: (params: GridCellParams) => {
return
{params.row.id}
;
@@ -174,7 +174,7 @@ const organizationFunds = (): JSX.Element => {
minWidth: 100,
headerAlign: 'center',
sortable: false,
- headerClassName: `${styles.tableHeader}`,
+ headerClassName: `${styles.tableHeaders}`,
renderCell: (params: GridCellParams) => {
return (
{
minWidth: 100,
headerAlign: 'center',
sortable: false,
- headerClassName: `${styles.tableHeader}`,
+ headerClassName: `${styles.tableHeaders}`,
renderCell: (params: GridCellParams) => {
return params.row.creator.firstName + ' ' + params.row.creator.lastName;
},
@@ -207,7 +207,7 @@ const organizationFunds = (): JSX.Element => {
minWidth: 100,
headerAlign: 'center',
sortable: false,
- headerClassName: `${styles.tableHeader}`,
+ headerClassName: `${styles.tableHeaders}`,
flex: 2,
renderCell: (params: GridCellParams) => {
return (
@@ -225,7 +225,7 @@ const organizationFunds = (): JSX.Element => {
minWidth: 100,
headerAlign: 'center',
sortable: false,
- headerClassName: `${styles.tableHeader}`,
+ headerClassName: `${styles.tableHeaders}`,
renderCell: (params: GridCellParams) => {
return params.row.isArchived ? 'Archived' : 'Active';
},
@@ -238,7 +238,7 @@ const organizationFunds = (): JSX.Element => {
minWidth: 100,
headerAlign: 'center',
sortable: false,
- headerClassName: `${styles.tableHeader}`,
+ headerClassName: `${styles.tableHeaders}`,
renderCell: (params: GridCellParams) => {
return (
<>
@@ -266,7 +266,7 @@ const organizationFunds = (): JSX.Element => {
minWidth: 100,
headerAlign: 'center',
sortable: false,
- headerClassName: `${styles.tableHeader}`,
+ headerClassName: `${styles.tableHeaders}`,
renderCell: (params: GridCellParams) => {
return (