Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop : fixed birthdate update at user portal for all users #3497

Conversation

bandhan-majumder
Copy link
Contributor

@bandhan-majumder bandhan-majumder commented Jan 31, 2025

What kind of change does this PR introduce?

a bugfix

Issue Number:

#3405

Snapshots/Videos:

  1. user profile updated successfully

https://www.loom.com/share/8b5ef692ca614679be9a46e3ed127550

  1. admin and superadmin profile updated successfully

https://www.loom.com/share/6d258c571d304c9db097fd447b91249d?sid=bd718d23-595a-404a-9476-e25dd2934776

If relevant, did you update the documentation?

No

Summary

Fixed the mutation call.

Does this PR introduce a breaking change?

Not sure.

Checklist

CodeRabbit AI Review

  • I have reviewed and addressed all critical issues flagged by CodeRabbit AI
  • I have implemented or provided justification for each non-critical suggestion
  • I have documented my reasoning in the PR comments where CodeRabbit AI suggestions were not implemented

Test Coverage

  • I have written tests for all new changes/features
  • I have verified that test coverage meets or exceeds 95%
  • I have run the test suite locally and all tests pass

Other information

Have you read the contributing guide?

Summary by CodeRabbit

  • New Features

    • None
  • Bug Fixes

    • Improved error handling by adding console logging for debugging.
  • Refactor

    • Modified birth date initialization to be more flexible.
    • Adjusted mutation variable structure for user update process.
    • Updated test scenarios to reflect changes in mutation input structure.
  • Chores

    • Minor formatting improvements in code structure.

Copy link
Contributor

coderabbitai bot commented Jan 31, 2025

Warning

Rate limit exceeded

@bandhan-majumder has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 18 minutes and 45 seconds before requesting another review.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

📥 Commits

Reviewing files that changed from the base of the PR and between e52c489 and 09bddd7.

📒 Files selected for processing (1)
  • src/screens/UserPortal/Settings/Settings.tsx (3 hunks)

Walkthrough

The pull request introduces modifications to two React components: MemberDetail and Settings. The primary changes involve adjusting the initialization of the birthDate field and restructuring the GraphQL mutation variables. In both components, the mutation input is now wrapped within a data object, suggesting a standardized approach to handling user detail updates. Additionally, error handling in the Settings component has been enhanced with logging.

Changes

File Change Summary
src/screens/MemberDetail/MemberDetail.tsx - Changed birthDate initialization from fixed date to empty string
- Restructured mutation variables to use data object
src/screens/UserPortal/Settings/Settings.tsx - Modified mutation variables structure with data wrapper
- Enhanced error handling with logging
src/screens/UserPortal/Settings/Settings.spec.tsx - Updated mock variables structure to use data wrapper
- Changed expected _id value in result object

Possibly related PRs

Suggested reviewers

  • palisadoes
  • noman2002

Poem

🐰 A rabbit's tale of code so neat,
Mutations wrapped in data's seat,
Birth dates freed from static might,
Refactoring with gentle care, 🔧
In the code, we hop and share! 🌟


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

Our Pull Request Approval Process

Thanks for contributing!

Testing Your Code

Remember, your PRs won't be reviewed until these criteria are met:

  1. We don't merge PRs with poor code quality.
    1. Follow coding best practices such that CodeRabbit.ai approves your PR.
  2. We don't merge PRs with failed tests.
    1. When tests fail, click on the Details link to learn more.
    2. Write sufficient tests for your changes (CodeCov Patch Test). Your testing level must be better than the target threshold of the repository
    3. Tests may fail if you edit sensitive files. Ask to add the ignore-sensitive-files-pr label if the edits are necessary.
  3. We cannot merge PRs with conflicting files. These must be fixed.

Our policies make our code better.

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:

  1. comments in this PR or
  2. our slack channel

Reviewing Your Code

Your reviewer(s) will have the following roles:

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

CONTRIBUTING.md

Read our CONTRIBUTING.md file. Most importantly:

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

Other

  1. 🎯 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.
  2. Read the CONTRIBUTING.md file make

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (2)
src/screens/UserPortal/Settings/Settings.tsx (1)

261-266: Fix template literal formatting.

The template literal formatting doesn't match Prettier standards.

Apply this diff to fix the formatting:

-        className={`d-flex flex-row ${styles.containerHeight} ${hideDrawer === null
-            ? ''
-            : hideDrawer
-              ? styles.expand
-              : styles.contract
-          }`}
+        className={`d-flex flex-row ${styles.containerHeight} ${
+          hideDrawer === null
+            ? ''
+            : hideDrawer
+            ? styles.expand
+            : styles.contract
+        }`}
🧰 Tools
🪛 ESLint

[error] 261-261: Insert ⏎··········

(prettier/prettier)


[error] 266-266: Delete ··

(prettier/prettier)

🪛 GitHub Actions: PR Workflow

[error] Contains code coverage disable statement. Please remove it and add the appropriate tests.

src/screens/MemberDetail/MemberDetail.tsx (1)

244-247: Fix mutation input formatting.

The mutation input structure is correct, but there's a missing comma after the object.

Apply this diff to fix the formatting:

            data: {
              id: currentUrl,
              ...formState,
-            }
+            },
🧰 Tools
🪛 ESLint

[error] 247-247: Insert ,

(prettier/prettier)

🪛 GitHub Actions: PR Workflow

[warning] Code formatting does not match Prettier standards. Run Prettier with --write to fix.

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 8b003eb and 4c21353.

📒 Files selected for processing (2)
  • src/screens/MemberDetail/MemberDetail.tsx (2 hunks)
  • src/screens/UserPortal/Settings/Settings.tsx (4 hunks)
🧰 Additional context used
🪛 ESLint
src/screens/MemberDetail/MemberDetail.tsx

[error] 247-247: Insert ,

(prettier/prettier)

src/screens/UserPortal/Settings/Settings.tsx

[error] 261-261: Insert ⏎··········

(prettier/prettier)


[error] 266-266: Delete ··

(prettier/prettier)

🪛 GitHub Actions: PR Workflow
src/screens/MemberDetail/MemberDetail.tsx

[warning] Code formatting does not match Prettier standards. Run Prettier with --write to fix.

src/screens/UserPortal/Settings/Settings.tsx

[error] Contains code coverage disable statement. Please remove it and add the appropriate tests.

🔇 Additional comments (4)
src/screens/UserPortal/Settings/Settings.tsx (3)

102-104: LGTM! Consistent mutation input structure.

The change standardizes the mutation input structure by wrapping updatedUserDetails within a data object, aligning with the structure used in other components.

🧰 Tools
🪛 GitHub Actions: PR Workflow

[error] Contains code coverage disable statement. Please remove it and add the appropriate tests.


117-117: LGTM! Enhanced error visibility.

Adding error logging before error handling improves debugging capabilities.

🧰 Tools
🪛 GitHub Actions: PR Workflow

[error] Contains code coverage disable statement. Please remove it and add the appropriate tests.


460-462: LGTM! Proper birthdate validation.

The implementation correctly handles birthdate changes and includes validation to prevent future dates.

🧰 Tools
🪛 GitHub Actions: PR Workflow

[error] Contains code coverage disable statement. Please remove it and add the appropriate tests.

src/screens/MemberDetail/MemberDetail.tsx (1)

76-76: LGTM! Proper initialization.

Initializing birthdate as an empty string instead of a hardcoded value is the correct approach.

🧰 Tools
🪛 GitHub Actions: PR Workflow

[warning] Code formatting does not match Prettier standards. Run Prettier with --write to fix.

coderabbitai[bot]
coderabbitai bot previously approved these changes Jan 31, 2025
@bandhan-majumder
Copy link
Contributor Author

bandhan-majumder commented Jan 31, 2025

working on the failing steps.

coderabbitai[bot]
coderabbitai bot previously approved these changes Jan 31, 2025
@bandhan-majumder
Copy link
Contributor Author

@palisadoes PTAL

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Nitpick comments (1)
src/screens/UserPortal/Settings/Settings.tsx (1)

461-463: Optimize birthdate validation.

The date validation in the onChange handler is redundant since handleFieldChange already includes date validation. The max attribute effectively prevents future date selection.

-                        onChange={(e) => {
-                          handleFieldChange('birthDate', e.target.value);
-                        }}
+                        onChange={(e) => handleFieldChange('birthDate', e.target.value)}
🧰 Tools
🪛 GitHub Actions: PR Workflow

[error] Contains code coverage disable statement. Please remove it and add the appropriate tests.

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between f387164 and 0912a65.

📒 Files selected for processing (1)
  • src/screens/UserPortal/Settings/Settings.tsx (3 hunks)
🧰 Additional context used
🪛 GitHub Actions: PR Workflow
src/screens/UserPortal/Settings/Settings.tsx

[error] Contains code coverage disable statement. Please remove it and add the appropriate tests.

🔇 Additional comments (1)
src/screens/UserPortal/Settings/Settings.tsx (1)

102-104: LGTM! Standardized mutation input structure.

The change to wrap user details in a data object aligns with the structure used in other components, ensuring consistent mutation calls.

Let's verify the mutation structure consistency across the codebase:

✅ Verification successful

✓ Mutation structure change is correct and consistent

The change to wrap user details in a data object aligns with:

  • The mutation's internal structure in mutations.ts
  • Similar usage patterns in other components like MemberDetail.tsx
  • GraphQL schema expectations for the updateUserProfile mutation
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for similar UPDATE_USER_MUTATION usage patterns
ast-grep --pattern 'updateUserDetails({
  variables: {
    $$$
  }
})'

Length of output: 444


Script:

#!/bin/bash
# Search for UPDATE_USER_MUTATION definition
ast-grep --pattern 'const UPDATE_USER_MUTATION = gql`
  $$$
`'

# Find all imports and usages of UPDATE_USER_MUTATION
rg "UPDATE_USER_MUTATION" -A 2

Length of output: 4942


Script:

#!/bin/bash
# View the mutation definition
cat src/GraphQl/Mutations/mutations.ts

Length of output: 15821


Script:

#!/bin/bash
# View the mutation usage in MemberDetail.tsx
rg -A 5 "updateUser\(" src/screens/MemberDetail/MemberDetail.tsx

Length of output: 226

🧰 Tools
🪛 GitHub Actions: PR Workflow

[error] Contains code coverage disable statement. Please remove it and add the appropriate tests.

src/screens/UserPortal/Settings/Settings.tsx Outdated Show resolved Hide resolved
coderabbitai[bot]
coderabbitai bot previously approved these changes Jan 31, 2025
Copy link

codecov bot commented Feb 1, 2025

Codecov Report

Attention: Patch coverage is 60.00000% with 2 lines in your changes missing coverage. Please review.

Project coverage is 89.51%. Comparing base (8b003eb) to head (09bddd7).
Report is 1 commits behind head on develop.

Files with missing lines Patch % Lines
src/screens/UserPortal/Settings/Settings.tsx 60.00% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##           develop    #3497       +/-   ##
============================================
+ Coverage     3.70%   89.51%   +85.81%     
============================================
  Files          315      337       +22     
  Lines         8270     8714      +444     
  Branches      1859     1937       +78     
============================================
+ Hits           306     7800     +7494     
+ Misses        7926      640     -7286     
- Partials        38      274      +236     
Flag Coverage Δ
combined 89.51% <60.00%> (?)
jest 3.68% <0.00%> (?)
vitest 89.51% <60.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

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

coderabbitai[bot]
coderabbitai bot previously approved these changes Feb 1, 2025
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🔭 Outside diff range comments (1)
src/screens/UserPortal/Settings/Settings.spec.tsx (1)

Line range hint 31-63: Update the initial mock to use the new structure.

The initial MOCKS array also needs to be updated to use the new data wrapper structure for consistency.

Apply this diff to fix the mock data structure:

  {
    request: {
      query: UPDATE_USER_MUTATION,
      variables: {
-       firstName: 'Noble',
-       lastName: 'Mittal',
-       createdAt: '2021-03-01',
-       gender: 'MALE',
-       phoneNumber: '+174567890',
-       birthDate: '2024-03-01',
-       grade: 'GRADE_1',
-       empStatus: 'UNEMPLOYED',
-       maritalStatus: 'SINGLE',
-       address: 'random',
-       state: 'random',
-       country: 'IN',
+       data: {
+         firstName: 'Noble',
+         lastName: 'Mittal',
+         createdAt: '2021-03-01',
+         gender: 'MALE',
+         phoneNumber: '+174567890',
+         birthDate: '2024-03-01',
+         grade: 'GRADE_1',
+         empStatus: 'UNEMPLOYED',
+         maritalStatus: 'SINGLE',
+         address: 'random',
+         state: 'random',
+         country: 'IN',
+       },
      },
      result: {
        data: {
          updateUserProfile: {
            _id: '453',
          },
        },
      },
    },
  },
📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 15cd8df and e52c489.

📒 Files selected for processing (2)
  • src/screens/UserPortal/Settings/Settings.spec.tsx (1 hunks)
  • src/screens/UserPortal/Settings/Settings.tsx (4 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • src/screens/UserPortal/Settings/Settings.tsx
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: Test Application
🔇 Additional comments (1)
src/screens/UserPortal/Settings/Settings.spec.tsx (1)

132-148: LGTM! The mutation variables structure has been updated correctly.

The variables are now properly wrapped in a data object, which aligns with the API changes for user profile updates. The structure includes all necessary fields including birthDate, which is relevant to the bug fix.

coderabbitai[bot]
coderabbitai bot previously approved these changes Feb 1, 2025
@bandhan-majumder
Copy link
Contributor Author

@palisadoes the check is failing as the base branch is not develop-postgres . It's a fix for develop branch as we discussed before.

@palisadoes
Copy link
Contributor

No. I meant, will this change affect the develop branch of Talawa Admin so that its code will have to be modified?

It has implications for us running our cloud demo instance

@bandhan-majumder
Copy link
Contributor Author

@palisadoes Sorry I did not get you. If you are asking for talawa-api, no, no change is needed in api. In talawa-admin, I changed the mutation call so that it matches the format it needs to be sent. Database is getting updated. Nothing else is affected. I have attached videos as proof. Please let me know if I am missing something.

@palisadoes
Copy link
Contributor

Thanks, that's what I wanted to know

@palisadoes palisadoes merged commit 3104525 into PalisadoesFoundation:develop Feb 1, 2025
18 of 19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants