Skip to content

Commit 3afbc47

Browse files
palisadoespalisadoes
authored
Merge branch 'develop' into fix/xss-cors
2 parents bbfbadc + ceab2c9 commit 3afbc47

File tree

357 files changed

+7494
-3664
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

357 files changed

+7494
-3664
lines changed

‎.github/dependabot.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ updates:
55
- package-ecosystem: 'npm'
66
# Specify the root directory
77
directory: '/'
8-
# Schedule automated updates to run weekly
8+
# Schedule automated updates
99
schedule:
10-
interval: 'monthly'
10+
interval: 'cron'
11+
cronjob: '0 0 1 * *'
1112
# Labels to apply to Dependabot PRs
1213
labels:
1314
- 'dependencies'

‎.github/workflows/config/check-pr-issue-skip-usernames.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
dependabot
2+
noman2002
13
palisadoes
2-
noman2002

‎.github/workflows/pull-request-target.yml‎

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,34 @@ jobs:
3131
message: |
3232
## Our Pull Request Approval Process
3333
34-
This PR will be reviewed according to the [Palisadoes Contributing Guidelines](https://developer.palisadoes.org/docs/contributor-guide/contributing)
34+
This PR will be reviewed according to our:
35+
36+
1. [Palisadoes Contributing Guidelines](https://developer.palisadoes.org/docs/contributor-guide/contributing)
37+
38+
2. [AI Usage Policy](https://developer.palisadoes.org/docs/contributor-guide/ai)
39+
40+
Your PR may be automatically closed if:
41+
42+
1. Our PR template isn't filled in correctly
43+
44+
1. [You haven't correctly linked your PR to an issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue)
3545
3646
Thanks for contributing!
3747
38-
# Check-PR-Issue:
39-
# name: Check Correct PR Issue Assignment
40-
# runs-on: ubuntu-latest
41-
# needs: [PR-Greeting]
42-
# steps:
43-
# - uses: actions/checkout@v4
44-
# - name: Check PR linked issue and assignee
45-
# uses: arkid15r/check-pr-issue-action@f2c2ac3b8c73b5da96294af9ac3ec174098cf513
46-
# with:
47-
# close_pr_on_failure: 'true'
48-
# github_token: ${{ secrets.GITHUB_TOKEN }}
49-
# no_assignee_message: 'The linked issue must be assigned to the PR author.'
50-
# no_issue_message: 'The PR must be linked to an issue assigned to the PR author.'
51-
# require_assignee: 'true'
52-
# # List of usernames who can create PRs without having an assigned issue
53-
# skip_users_file_path: '.github/workflows/config/check-pr-issue-skip-usernames.txt'
48+
Check-PR-Issue:
49+
name: Check Correct PR Issue Assignment
50+
runs-on: ubuntu-latest
51+
needs: [PR-Greeting]
52+
steps:
53+
- uses: actions/checkout@v4
54+
- name: Check PR linked issue and assignee
55+
uses: arkid15r/[email protected]
56+
with:
57+
close_pr_on_failure: 'true'
58+
github_token: ${{ secrets.GITHUB_TOKEN }}
59+
no_assignee_message: 'The linked issue must be assigned to the PR author.'
60+
no_issue_message: 'The PR must be linked to an issue assigned to the PR author.'
61+
check_issue_reference: 'true'
62+
require_assignee: 'true'
63+
# List of usernames who can create PRs without having an assigned issue
64+
skip_users_file_path: '.github/workflows/config/check-pr-issue-skip-usernames.txt'

‎.github/workflows/pull-request.yml‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,18 @@ jobs:
114114
- name: Check for unused files and exports in src/ and docs/src
115115
run: pnpm knip --include files,exports
116116

117+
Check-Mock-Isolation:
118+
name: Check for proper mock cleanup in test files
119+
runs-on: ubuntu-latest
120+
steps:
121+
- name: Checkout the Repository
122+
uses: actions/checkout@v4
123+
124+
- name: Check for proper mock cleanup
125+
run: |
126+
chmod +x scripts/githooks/check-mock-cleanup.sh
127+
./scripts/githooks/check-mock-cleanup.sh
128+
117129
Check-AutoDocs:
118130
name: Generate and Validate Documentation
119131
runs-on: ubuntu-latest
@@ -427,13 +439,14 @@ jobs:
427439
Check-ESlint-Disable,
428440
Check-Code-Coverage-Disable,
429441
Check-ItSkip-Disable,
442+
Check-Mock-Isolation,
430443
]
431444
env:
432-
TOTAL_SHARDS: 4
445+
TOTAL_SHARDS: 12
433446
strategy:
434447
fail-fast: false
435448
matrix:
436-
shard: [1, 2, 3, 4]
449+
shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
437450
steps:
438451
- name: Checkout the Repository
439452
uses: actions/checkout@v4
@@ -486,9 +499,10 @@ jobs:
486499
if: steps.changed-files.outputs.any_changed == 'true'
487500
env:
488501
NODE_V8_COVERAGE: './coverage/vitest'
489-
NODE_OPTIONS: '--max-old-space-size=4096'
502+
NODE_OPTIONS: '--max-old-space-size=4096 --disable-warning=ExperimentalWarning'
490503
SHARD_INDEX: ${{ matrix.shard }}
491504
SHARD_COUNT: ${{ env.TOTAL_SHARDS }}
505+
CI: true
492506
run: pnpm test:shard:coverage
493507
- name: Upload coverage artifact
494508
if: always() && steps.changed-files.outputs.any_changed == 'true'
@@ -690,7 +704,7 @@ jobs:
690704
uses: VeryGoodOpenSource/very_good_coverage@v3
691705
with:
692706
path: './coverage/vitest/lcov.info'
693-
min_coverage: 94.0
707+
min_coverage: 94.5
694708

695709
# Graphql-Inspector:
696710
# if: ${{ github.actor != 'dependabot[bot]' }}

‎CODE_STYLE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ code style should not be changed and must be followed.
3737

3838
- GraphQL
3939

40-
- Jest & React Testing Library for testing
40+
- Vitest & React Testing Library for testing
4141

4242
## Component Structure
4343

‎ISSUE_GUIDELINES.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
# Issue Reporting Guidelines
22

33
Please read our Organization's [Issue Reporting Guidelines](https://developer.palisadoes.org/docs/contributor-guide/issues).
4-

‎docker/Dockerfile.deploy‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ ARG PORT=4321
1111
ENV PORT=${PORT}
1212

1313
WORKDIR /usr/src/app
14-
COPY package*.json ./
15-
RUN corepack enable && corepack prepare pnpm@latest --activate && pnpm install
14+
RUN corepack enable && corepack prepare [email protected] --activate
15+
COPY package.json pnpm-lock.yaml ./
16+
RUN pnpm install --frozen-lockfile
1617
COPY . .
1718
RUN pnpm run build
1819
ENV NODE_ENV=production

‎docker/Dockerfile.dev‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ ENV PORT=${PORT}
55

66
WORKDIR /usr/src/app
77

8-
COPY package*.json ./
9-
RUN corepack enable && corepack prepare [email protected] --activate && pnpm install
8+
RUN corepack enable && corepack prepare [email protected] --activate
9+
COPY package.json pnpm-lock.yaml ./
10+
RUN pnpm install --frozen-lockfile
1011

1112
COPY . .
1213

‎docker/Dockerfile.prod‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
FROM node:24-slim AS builder
33
WORKDIR /talawa-admin
44

5-
COPY package*.json ./
6-
RUN corepack enable && corepack prepare [email protected] --activate && pnpm install
5+
RUN corepack enable && corepack prepare [email protected] --activate
6+
COPY package.json pnpm-lock.yaml ./
7+
RUN pnpm install --frozen-lockfile
78

89
COPY . .
910

‎docs/docs/auto-docs/components/AgendaItems/AgendaItemsMocks/variables/MOCKS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
# Variable: MOCKS
66

7-
> `const` **MOCKS**: (\{ `request`: \{ `query`: `DocumentNode`; `variables`: \{ `input`: \{ `description`: `string`; `title`: `string`; \}; `removeAgendaItemId?`: `undefined`; `updateAgendaItemId`: `string`; \}; \}; `result`: \{ `data`: \{ `removeAgendaItem?`: `undefined`; `updateAgendaItem`: \{ `_id`: `string`; \}; \}; \}; \} \| \{ `request`: \{ `query`: `DocumentNode`; `variables`: \{ `input?`: `undefined`; `removeAgendaItemId`: `string`; `updateAgendaItemId?`: `undefined`; \}; \}; `result`: \{ `data`: \{ `removeAgendaItem`: \{ `_id`: `string`; \}; `updateAgendaItem?`: `undefined`; \}; \}; \})[]
7+
> `const` **MOCKS**: (\{ `request`: \{ `query`: `DocumentNode`; `variables`: \{ `input`: \{ `description`: `string`; `title`: `string`; \}; `removeAgendaItemId?`: `undefined`; `updateAgendaItemId`: `string`; \}; \}; `result`: \{ `data`: \{ `removeAgendaItem?`: `undefined`; `updateAgendaItem`: \{ `__typename`: `string`; `_id`: `string`; \}; \}; \}; \} \| \{ `request`: \{ `query`: `DocumentNode`; `variables`: \{ `input?`: `undefined`; `removeAgendaItemId`: `string`; `updateAgendaItemId?`: `undefined`; \}; \}; `result`: \{ `data`: \{ `removeAgendaItem`: \{ `__typename`: `string`; `_id`: `string`; \}; `updateAgendaItem?`: `undefined`; \}; \}; \})[]
88
99
Defined in: [src/components/AgendaItems/AgendaItemsMocks.ts:109](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/AgendaItems/AgendaItemsMocks.ts#L109)

0 commit comments

Comments
 (0)