Skip to content

Commit

Permalink
Merge branch 'develop-postgres' into fixed-3040
Browse files Browse the repository at this point in the history
  • Loading branch information
palisadoes authored Jan 28, 2025
2 parents ae2294c + a7f3771 commit 9fc8102
Show file tree
Hide file tree
Showing 88 changed files with 945 additions and 1,427 deletions.
4 changes: 0 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"extends": [
"plugin:react/recommended",
"eslint:recommended",
"plugin:jest/recommended",
"plugin:prettier/recommended",
"plugin:@typescript-eslint/recommended",
"eslint-config-prettier",
Expand All @@ -30,7 +29,6 @@
"plugins": [
"react",
"@typescript-eslint",
"jest",
"import",
"eslint-plugin-tsdoc",
"prettier"
Expand Down Expand Up @@ -128,8 +126,6 @@
"react/jsx-equals-spacing": ["warn", "never"],
"react/no-this-in-sfc": "error",

"jest/expect-expect": 0,

"react/no-unstable-nested-components": ["error", { "allowAsProps": true }],
"react/function-component-definition": [
0,
Expand Down
39 changes: 4 additions & 35 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -243,51 +243,20 @@ jobs:
- name: Get changed TypeScript files
id: changed-files
uses: tj-actions/changed-files@v45

- name: Run Jest Tests
if: steps.changed-files.outputs.any_changed == 'true'
env:
NODE_V8_COVERAGE: './coverage/jest'
run: |
npm run test -- --watchAll=false --coverage
- name: Upload Jest Coverage to Codecov
if: steps.changed-files.outputs.any_changed == 'true'
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./coverage/jest/lcov.info
flags: jest
fail_ci_if_error: true

- name: Run Vitest Tests
if: steps.changed-files.outputs.any_changed == 'true'
env:
NODE_V8_COVERAGE: './coverage/vitest'
run: |
npm run test:vitest:coverage
- name: Upload Vitest Coverage to Codecov
if: steps.changed-files.outputs.any_changed == 'true'
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./coverage/vitest/lcov.info
flags: vitest
fail_ci_if_error: true

- name: Merge Jest and Vitest Coverage Reports
run: |
mkdir -p ./coverage
npx lcov-result-merger './coverage/*/lcov.info' './coverage/lcov.info'
- name: Upload Combined Coverage to Codecov
- name: Upload Coverage to Codecov
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
gcov_ignore: 'docs/'
files: ./coverage/lcov.info
flags: combined
exclude: 'docs/'
files: ./coverage/vitest/lcov.info
fail_ci_if_error: true

- name: TypeScript compilation for changed files
Expand All @@ -301,7 +270,7 @@ jobs:
- name: Test acceptable level of code coverage
uses: VeryGoodOpenSource/very_good_coverage@v3
with:
path: "./coverage/lcov.info"
path: "./coverage/vitest/lcov.info"
min_coverage: 0

# Graphql-Inspector:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scripts/countline.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def _valid_filename(filepath):
"""
# Initialize key variables
invalid_filenames = [".test.", ".spec."]
invalid_filenames = [".spec."]
result = True

# Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `JSX.Element`
Defined in: [src/screens/EventVolunteers/Requests/Requests.tsx:64](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/EventVolunteers/Requests/Requests.tsx#L64)
Defined in: [src/screens/EventVolunteers/Requests/Requests.tsx:65](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/EventVolunteers/Requests/Requests.tsx#L65)

Component for managing and displaying Volunteer Membership requests for an event.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `JSX.Element`
Defined in: [src/screens/EventVolunteers/VolunteerGroups/VolunteerGroups.tsx:69](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/EventVolunteers/VolunteerGroups/VolunteerGroups.tsx#L69)
Defined in: [src/screens/EventVolunteers/VolunteerGroups/VolunteerGroups.tsx:70](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/EventVolunteers/VolunteerGroups/VolunteerGroups.tsx#L70)

Component for managing volunteer groups for an event.
This component allows users to view, filter, sort, and create action items. It also provides a modal for creating and editing action items.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `JSX.Element`
Defined in: [src/screens/EventVolunteers/Volunteers/Volunteers.tsx:76](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/EventVolunteers/Volunteers/Volunteers.tsx#L76)
Defined in: [src/screens/EventVolunteers/Volunteers/Volunteers.tsx:77](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/EventVolunteers/Volunteers/Volunteers.tsx#L77)

Component for managing and displaying event volunteers related to an event.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `JSX.Element`
Defined in: [src/screens/ManageTag/ManageTag.tsx:64](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/ManageTag/ManageTag.tsx#L64)
Defined in: [src/screens/ManageTag/ManageTag.tsx:65](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/ManageTag/ManageTag.tsx#L65)

Component that renders the Manage Tag screen when the app navigates to '/orgtags/:orgId/manageTag/:tagId'.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `JSX.Element`
Defined in: [src/screens/OrgList/OrgList.tsx:58](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/OrgList/OrgList.tsx#L58)
Defined in: [src/screens/OrgList/OrgList.tsx:57](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/OrgList/OrgList.tsx#L57)

## CSS Strategy Explanation:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `JSX.Element`
Defined in: [src/screens/OrganizationActionItems/OrganizationActionItems.tsx:51](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/OrganizationActionItems/OrganizationActionItems.tsx#L51)
Defined in: [src/screens/OrganizationActionItems/OrganizationActionItems.tsx:52](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/OrganizationActionItems/OrganizationActionItems.tsx#L52)

Component for managing and displaying action items within an organization.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `Element`
Defined in: [src/screens/OrganizationFundCampaign/OrganizationFundCampagins.tsx:102](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/OrganizationFundCampaign/OrganizationFundCampagins.tsx#L102)
Defined in: [src/screens/OrganizationFundCampaign/OrganizationFundCampagins.tsx:103](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/OrganizationFundCampaign/OrganizationFundCampagins.tsx#L103)

`orgFundCampaign` component displays a list of fundraising campaigns for a specific fund within an organization.
It allows users to search, sort, view and edit campaigns.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `Element`
Defined in: [src/screens/OrganizationFunds/OrganizationFunds.tsx:102](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/OrganizationFunds/OrganizationFunds.tsx#L102)
Defined in: [src/screens/OrganizationFunds/OrganizationFunds.tsx:103](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/OrganizationFunds/OrganizationFunds.tsx#L103)

`organizationFunds` component displays a list of funds for a specific organization,
allowing users to search, sort, view and edit funds.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `JSX.Element`
Defined in: [src/screens/OrganizationPeople/OrganizationPeople.tsx:31](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/OrganizationPeople/OrganizationPeople.tsx#L31)
Defined in: [src/screens/OrganizationPeople/OrganizationPeople.tsx:32](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/OrganizationPeople/OrganizationPeople.tsx#L32)

OrganizationPeople component is used to display the list of members, admins and users of the organization.
It also provides the functionality to search the members, admins and users by their full name.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `JSX.Element`
Defined in: [src/screens/OrganizationTags/OrganizationTags.tsx:58](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/OrganizationTags/OrganizationTags.tsx#L58)
Defined in: [src/screens/OrganizationTags/OrganizationTags.tsx:60](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/OrganizationTags/OrganizationTags.tsx#L60)

Component that renders the Organization Tags screen when the app navigates to '/orgtags/:orgId'.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `JSX.Element`
Defined in: [src/screens/OrganizationVenues/OrganizationVenues.tsx:23](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/OrganizationVenues/OrganizationVenues.tsx#L23)
Defined in: [src/screens/OrganizationVenues/OrganizationVenues.tsx:21](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/OrganizationVenues/OrganizationVenues.tsx#L21)

Component to manage and display the list of organization venues.
Handles searching, sorting, and CRUD operations for venues.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `Element`
Defined in: [src/screens/Requests/Requests.tsx:34](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/Requests/Requests.tsx#L34)
Defined in: [src/screens/Requests/Requests.tsx:33](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/Requests/Requests.tsx#L33)

The `Requests` component fetches and displays a paginated list of membership requests
for an organization, with functionality for searching, filtering, and infinite scrolling.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `JSX.Element`
Defined in: [src/screens/SubTags/SubTags.tsx:60](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/SubTags/SubTags.tsx#L60)
Defined in: [src/screens/SubTags/SubTags.tsx:61](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/SubTags/SubTags.tsx#L61)

Component that renders the SubTags screen when the app navigates to '/orgtags/:orgId/subtags/:tagId'.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `Element`
Defined in: [src/screens/UserPortal/Campaigns/Campaigns.tsx:53](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/UserPortal/Campaigns/Campaigns.tsx#L53)
Defined in: [src/screens/UserPortal/Campaigns/Campaigns.tsx:54](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/UserPortal/Campaigns/Campaigns.tsx#L54)

The `Campaigns` component displays a list of fundraising campaigns for a specific organization.
It allows users to search, sort, and view details about each campaign. Users can also add pledges to active campaigns.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `Element`
Defined in: [src/screens/UserPortal/Pledges/Pledges.tsx:89](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/UserPortal/Pledges/Pledges.tsx#L89)
Defined in: [src/screens/UserPortal/Pledges/Pledges.tsx:90](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/UserPortal/Pledges/Pledges.tsx#L90)

The `Pledges` component is responsible for rendering a user's pledges within a campaign.
It fetches pledges data using Apollo Client's `useQuery` hook and displays the data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `JSX.Element`
Defined in: [src/screens/UserPortal/Volunteer/Actions/Actions.tsx:79](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/UserPortal/Volunteer/Actions/Actions.tsx#L79)
Defined in: [src/screens/UserPortal/Volunteer/Actions/Actions.tsx:80](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/UserPortal/Volunteer/Actions/Actions.tsx#L80)

Component for managing and displaying action items within an organization.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `JSX.Element`
Defined in: [src/screens/UserPortal/Volunteer/Groups/Groups.tsx:72](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/UserPortal/Volunteer/Groups/Groups.tsx#L72)
Defined in: [src/screens/UserPortal/Volunteer/Groups/Groups.tsx:73](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/UserPortal/Volunteer/Groups/Groups.tsx#L73)

Component for managing volunteer groups for an event.
This component allows users to view, filter, sort, and create action items. It also provides a modal for creating and editing action items.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `Element`
Defined in: [src/screens/UserPortal/Volunteer/Invitations/Invitations.tsx:49](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/UserPortal/Volunteer/Invitations/Invitations.tsx#L49)
Defined in: [src/screens/UserPortal/Volunteer/Invitations/Invitations.tsx:50](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/UserPortal/Volunteer/Invitations/Invitations.tsx#L50)

The `Invitations` component displays list of invites for the user to volunteer.
It allows the user to search, sort, and accept/reject invites.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `Element`
Defined in: [src/screens/UserPortal/Volunteer/UpcomingEvents/UpcomingEvents.tsx:65](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/UserPortal/Volunteer/UpcomingEvents/UpcomingEvents.tsx#L65)
Defined in: [src/screens/UserPortal/Volunteer/UpcomingEvents/UpcomingEvents.tsx:66](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/UserPortal/Volunteer/UpcomingEvents/UpcomingEvents.tsx#L66)

The `UpcomingEvents` component displays list of upcoming events for the user to volunteer.
It allows the user to search, sort, and volunteer for events/volunteer groups.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

> **default**(): `Element`
Defined in: [src/screens/Users/Users.tsx:84](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/Users/Users.tsx#L84)
Defined in: [src/screens/Users/Users.tsx:83](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/Users/Users.tsx#L83)

The `Users` component is responsible for displaying a list of users in a paginated and sortable format.
It supports search functionality, filtering, and sorting of users. The component integrates with GraphQL
Expand Down
36 changes: 36 additions & 0 deletions docs/docs/auto-docs/subComponents/SearchBar/functions/default.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
[Admin Docs](/)

***

# Function: default()

> **default**(`props`, `deprecatedLegacyContext`?): `ReactNode`
Defined in: [src/subComponents/SearchBar.tsx:27](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/subComponents/SearchBar.tsx#L27)

SearchBar component renders a search input with a button.
It allows users to enter a search term and triggers a callback on search.

## Parameters

### props

`InterfaceSearchBarProps`

The properties for the SearchBar component.

### deprecatedLegacyContext?

`any`

**Deprecated**

**See**

[React Docs](https://legacy.reactjs.org/docs/legacy-context.html#referencing-context-in-lifecycle-methods)

## Returns

`ReactNode`

The rendered SearchBar component.
5 changes: 0 additions & 5 deletions jest-preview.config.ts

This file was deleted.

Loading

0 comments on commit 9fc8102

Please sign in to comment.