Merging develop-userTypeFix in develop #1761

AVtheking · 2024-03-22T22:29:06Z

What kind of change does this PR introduce?

Feature

Issue Number:

Fixes PalisadoesFoundation/talawa-api#1965

Did you add tests for your changes?

Yes

Summary

Merging the develop-userTypeFix branch in develop.

Does this PR introduce a breaking change?
Yes

Have you read the contributing guide?

Yes

…nto develop

github-actions · 2024-03-22T22:29:27Z

Our Pull Request Approval Process

We have these basic policies to make the approval process smoother for our volunteer team.

Testing Your Code

Please make sure your code passes all tests. Our test code coverage system will fail if these conditions occur:

The overall code coverage drops below the target threshold of the repository
Any file in the pull request has code coverage levels below the repository threshold
Merge conflicts

The process helps maintain the overall reliability of the code base and is a prerequisite for getting your PR approved. Assigned reviewers regularly review the PR queue and tend to focus on PRs that are passing.

Reviewers

Do not assign reviewers. Our Queue Monitors will review your PR and assign them.
When your PR has been assigned reviewers contact them to get your code reviewed and approved via:

comments in this PR or
our slack channel

Reviewing Your Code

Your reviewer(s) will have the following roles:

arbitrators of future discussions with other contributors about the validity of your changes
point of contact for evaluating the validity of your work
person who verifies matching issues by others that should be closed.
person who gives general guidance in fixing your tests

CONTRIBUTING.md

Read our CONTRIBUTING.md file. Most importantly:

PRs with issues not assigned to you will be closed by the reviewer
Fix the first comment in the PR so that each issue listed automatically closes

Other

🎯 Please be considerate of our volunteers' time. Contacting the person who assigned the reviewers is not advised unless they ask for your input. Do not @ the person who did the assignment otherwise.
Read the CONTRIBUTING.md file make

palisadoes · 2024-03-22T22:32:20Z

@AVtheking I'm going to close this PR. Use another source branch tests are going to fail

pranshugupta54 · 2024-03-22T22:40:44Z

src/screens/OrgList/OrgList.tsx

-  function openDialogModal(redirectOrgId: string): void {
+
+  /* eslint-disable @typescript-eslint/explicit-function-return-type */
+  function openDialogModal(redirectOrgId: string) {


Make the function void and remove eslint-disable

pranshugupta54 · 2024-03-22T22:41:01Z

src/screens/OrgList/OrgList.tsx


-  function closeDialogModal(): void {
+  /* eslint-disable @typescript-eslint/explicit-function-return-type */
+  function closeDialogModal() {


Make the function void and remove eslint-disable

pranshugupta54 · 2024-03-22T22:41:43Z

src/screens/OrgList/OrgList.tsx

-          userData.user.userType === 'ADMIN' &&
-          userData.user.adminFor.length === 0)) ? (
+        (userData && adminFor.length === 0)) ? (
+        // eslint-disable-next-line


Remove eslint and wrap the complete div in <> </>

pranshugupta54 · 2024-03-22T22:42:19Z

src/screens/Users/Users.tsx

@@ -352,6 +359,7 @@ const Users = (): JSX.Element => {
          </h4>
        </div>
      ) : isLoading == false && usersData && displayedUsers.length === 0 ? (
+        // eslint-disable-next-line react/jsx-indent


Remove disable and wrap complete in <> </>

… into fix/develop

palisadoes · 2024-03-22T23:40:36Z

@varshith257 It's failing

https://github.com/PalisadoesFoundation/talawa-admin/actions/runs/8397580202/job/23001165157?pr=1761
It looks like it's only one file at fault.

palisadoes · 2024-03-22T23:58:24Z

@varshith257 Please fix the linting.

… into fix/develop

codecov · 2024-03-23T07:11:55Z

Codecov Report

Attention: Patch coverage is 74.21384% with 41 lines in your changes are missing coverage. Please review.

Project coverage is 96.31%. Comparing base (9a64e7e) to head (b19d3ae).

❗ Current head b19d3ae differs from pull request most recent head 01a5f97. Consider uploading reports for the commit 01a5f97 to get more accurate results

Files	Patch %	Lines
src/screens/MemberDetail/MemberDetail.tsx	13.04%	20 Missing ⚠️
src/screens/UserPortal/Home/Home.tsx	70.90%	15 Missing and 1 partial ⚠️
src/screens/Users/Users.tsx	81.25%	3 Missing ⚠️
src/components/UsersTableItem/UsersTableItem.tsx	93.75%	1 Missing ⚠️
src/screens/OrgList/OrgList.tsx	85.71%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #1761      +/-   ##
===========================================
- Coverage    97.94%   96.31%   -1.64%     
===========================================
  Files          178      178              
  Lines         4382     4447      +65     
  Branches      1259     1287      +28     
===========================================
- Hits          4292     4283       -9     
- Misses          86      155      +69     
- Partials         4        9       +5

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

varshith257

LGTM
Except low test coverage

pranshugupta54 · 2024-03-23T07:55:44Z

For MemberDetail page, I already have the re-designed page with 100% coverage. We can merge that first, currently this file has very bad coverage so instead of fixing it for old design we can use the new one.
Ref: #1667

varshith257 · 2024-03-23T08:04:41Z

@pranshugupta54 Okay, Thanks

palisadoes · 2024-03-23T11:37:13Z

@pranshugupta54

We have to approve the GitHub action because you've never merged a PR before. This is going to be time consuming and cause delays.
Can you create a trivial PR in Admin that I can merge so that I don't have to approve subsequent workflows for you? For example add a space to a file

… into fix/develop

AVtheking and others added 24 commits March 23, 2024 01:36

merged develop

c813d2a

fixed conflicts

d0a2ddb

fixed conflicts

06d4254

fix

49511c6

merged

e9fd0f9

Merge branch 'develop' into develop

f7aa899

fix

129b472

fix count of lines test

4c239fc

fix linting error

15e8f00

Merge branch 'develop' of https://github.com/AVtheking/talawa-admin i…

aa95575

…nto develop

Update LoginPage.tsx

4eae604

Update MemberDetail.test.tsx

bf1da01

Update MemberDetail.tsx

2ac964f

Update OrganizationPeople.test.tsx

447d5f3

Update OrganizationPeople.tsx

7f9b91c

Update Organizations.tsx

697bb4d

Merge branch 'develop' into develop

cca9571

fixed linting error

db44591

fixed linting error

518732c

fixed linting error

06a43c3

fixed formatting error

c117417

uncommented husky file

59792ce

fix same branch name

ede29c0

fix

36efe60

AVtheking requested a review from palisadoes as a code owner March 22, 2024 22:29

palisadoes closed this Mar 22, 2024

palisadoes reopened this Mar 22, 2024

pranshugupta54 requested changes Mar 22, 2024

View reviewed changes

AVtheking and others added 5 commits March 23, 2024 04:23

removed eslint-disable

de93c2e

fix query

4978032

fix test

ac0f29b

Merge branch 'fix/develop' of https://github.com/AVtheking/talawa-admin…

158202b

… into fix/develop

fix test

b5a67d0

varshith257 and others added 11 commits March 23, 2024 05:41

fix lint

34b06f5

Add image and email fields to LOGIN_MUTATION

2c93820

fix home test

22e4f02

Remove adminApproved field and update login test

e8b4213

Add adminApproved field to LOGIN_MUTATION

9a0e0c8

fix

a576b18

Merge branch 'fix/develop' of https://github.com/AVtheking/talawa-admin…

de6313e

… into fix/develop

fixed organization test

bddd212

fixed member detail test

29280ad

fix

4c3da95

fixed remaining test

f42a545

varshith257 approved these changes Mar 23, 2024

View reviewed changes

Added more test for partial coverage

b731d79

AVtheking and others added 5 commits March 23, 2024 18:34

removed logs

ac637ad

Merge branch 'fix/develop' of https://github.com/AVtheking/talawa-admin…

f95607b

… into fix/develop

removed logs

76a5cf3

removed logs

b19d3ae

Update adminApproved field in Queries.ts and UserTableItem.test.tsx

01a5f97

palisadoes merged commit 6bcb24c into PalisadoesFoundation:develop Mar 23, 2024
7 of 10 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merging develop-userTypeFix in develop #1761

Merging develop-userTypeFix in develop #1761

AVtheking commented Mar 22, 2024

github-actions bot commented Mar 22, 2024

palisadoes commented Mar 22, 2024

pranshugupta54 Mar 22, 2024

pranshugupta54 Mar 22, 2024

pranshugupta54 Mar 22, 2024

pranshugupta54 Mar 22, 2024

palisadoes commented Mar 22, 2024

palisadoes commented Mar 22, 2024

codecov bot commented Mar 23, 2024 •

edited

Loading

varshith257 left a comment

pranshugupta54 commented Mar 23, 2024

varshith257 commented Mar 23, 2024

palisadoes commented Mar 23, 2024

Merging develop-userTypeFix in develop #1761

Merging develop-userTypeFix in develop #1761

Conversation

AVtheking commented Mar 22, 2024

github-actions bot commented Mar 22, 2024

Our Pull Request Approval Process

Testing Your Code

Reviewers

Reviewing Your Code

CONTRIBUTING.md

Other

palisadoes commented Mar 22, 2024

pranshugupta54 Mar 22, 2024

Choose a reason for hiding this comment

pranshugupta54 Mar 22, 2024

Choose a reason for hiding this comment

pranshugupta54 Mar 22, 2024

Choose a reason for hiding this comment

pranshugupta54 Mar 22, 2024

Choose a reason for hiding this comment

palisadoes commented Mar 22, 2024

palisadoes commented Mar 22, 2024

codecov bot commented Mar 23, 2024 • edited Loading

Codecov Report

varshith257 left a comment

Choose a reason for hiding this comment

pranshugupta54 commented Mar 23, 2024

varshith257 commented Mar 23, 2024

palisadoes commented Mar 23, 2024

codecov bot commented Mar 23, 2024 •

edited

Loading