Skip to content

Commit

Permalink
Merge branch 'issue-2516-fixed' of https://github.com/gurramkarthikne…
Browse files Browse the repository at this point in the history
…tha/talawa-admin into issue-2516-fixed
  • Loading branch information
gurramkarthiknetha committed Dec 23, 2024
2 parents 5379880 + 96b9645 commit 82970a7
Show file tree
Hide file tree
Showing 138 changed files with 5,086 additions and 3,499 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ Fixes #<!--Add related issue number here.-->

**Have you read the [contributing guide](https://github.com/PalisadoesFoundation/talawa-admin/blob/master/CONTRIBUTING.md)?**

<!--Yes or No-->
<!--Yes or No-->
1 change: 1 addition & 0 deletions .github/workflows/check-tsdoc.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
52 changes: 27 additions & 25 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -101,6 +101,7 @@ jobs:
.node-version
.husky/**
scripts/**
src/style/**
schema.graphql
package.json
tsconfig.json
Expand Down Expand Up @@ -252,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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Talawa Admin

[💬 Join the community on Slack](https://github.com/PalisadoesFoundation/)
💬 Join the community on Slack from our [Palisadoes Foundation GitHub Home Page](https://github.com/PalisadoesFoundation)

![talawa-logo-lite-200x200](https://github.com/PalisadoesFoundation/talawa-admin/assets/16875803/26291ec5-d3c1-4135-8bc7-80885dff613d)

Expand Down
5 changes: 4 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ export default {
'!**/index.{js,ts}',
'!**/*.d.ts',
'!src/test/**',
'!vitest.config.ts',],
'!vitest.config.ts',
],
// setupFiles: ['react-app-polyfill/jsdom'],
setupFiles: ['whatwg-fetch'],
setupFilesAfterEnv: ['<rootDir>/src/setupTests.ts'],
Expand All @@ -35,13 +36,15 @@ export default {
'<rootDir>/src',
],
moduleNameMapper: {
'\\.(css|scss|sass|less)$': 'identity-obj-proxy',
'^react-native$': 'react-native-web',
'^@dicebear/core$': '<rootDir>/scripts/__mocks__/@dicebear/core.ts',
'^@dicebear/collection$':
'<rootDir>/scripts/__mocks__/@dicebear/collection.ts',
'\\.svg\\?react$': '<rootDir>/scripts/__mocks__/fileMock.js',
'\\.svg$': '<rootDir>/scripts/__mocks__/fileMock.js',
'^@pdfme/generator$': '<rootDir>/scripts/__mocks__/@pdfme/generator.ts',
'\\.(css|less|scss|sass)$': 'identity-obj-proxy',
},
moduleFileExtensions: [
'web.js',
Expand Down
Loading

0 comments on commit 82970a7

Please sign in to comment.