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

updated code #1861

Merged
merged 1 commit into from
Nov 19, 2024
Merged

updated code #1861

merged 1 commit into from
Nov 19, 2024

Conversation

nipunarora-eGov
Copy link
Contributor

@nipunarora-eGov nipunarora-eGov commented Nov 19, 2024

Choose the appropriate template for your PR:

Summary by CodeRabbit

  • New Features

    • Updated button label from "WBH_DOWNLOAD" to "WBH_DOWNLOAD_MICROPLAN" for improved clarity in both Microplan configurations.
    • Introduced mobile number validation in User Management for enhanced data integrity.
    • Added a facility search request method to streamline facility-related queries.
  • Improvements

    • Enhanced UI with tooltips for village hierarchy in Facility Mapping.
    • Improved role-based button enabling/disabling for better user experience.

@nipunarora-eGov nipunarora-eGov requested a review from a team as a code owner November 19, 2024 11:43
Copy link
Contributor

coderabbitai bot commented Nov 19, 2024

📝 Walkthrough

Walkthrough

The changes in this pull request involve multiple updates to the UICustomizations object across various configurations in the UICustomizations.js file. Key modifications include renaming a button label in the MicroplanSearchConfig and MyMicroplanSearchConfig, enhancing mobile number validation in UserManagementConfig, and refining the additionalCustomizations methods to improve user interface behavior. Additionally, a new method for facility search requests has been introduced in FacilityMappingConfig, contributing to a more coherent user experience and validation process.

Changes

File Path Change Summary
health/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js - Updated button label from "WBH_DOWNLOAD" to "WBH_DOWNLOAD_MICROPLAN" in MicroplanSearchConfig and MyMicroplanSearchConfig.
- Added mobile number validation in UserManagementConfig.
- Updated preProcess method in UserManagementConfig for role handling.
- Minor adjustments in FacilityMappingConfig for village hierarchy tooltips.
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js - Updated button label from "WBH_DOWNLOAD" to "WBH_DOWNLOAD_MICROPLAN" in MyMicroplanSearchConfig and MicroplanSearchConfig.
- Added role check for enabling/disabling the "START" button in MyMicroplanSearchConfig.
- Changed default value handling for several keys to "ES_COMMON_NA".
- Added getFacilitySearchRequest method in FacilityMappingConfig.
- Enhanced mobile number validation in UserManagementConfig.

Possibly related PRs

  • added new hook for microplans search screen #1587: This PR modifies the UICustomizations object, specifically updating the customValidationCheck method in UserManagementConfig to include regex validation for mobile numbers, which aligns with the main PR's enhancements to validation logic.
  • Microplansearch changes #1629: Changes in this PR also involve updates to the UICustomizations object, particularly in the MicroplanSearchConfig and UserManagementConfig, which relate to the same configurations modified in the main PR.
  • Finalised microplan download #1762: This PR introduces significant changes to the additionalCustomizations method in MicroplanSearchConfig, including the addition of a download button based on the microplan's status, which is relevant to the main PR's focus on UI enhancements.
  • Facility data fix #1829: This PR adds a new case for MICROPLAN_FACILITY_SERVINGPOPULATION in the additionalCustomizations method, enhancing the FacilityMappingConfig, which is consistent with the main PR's updates to similar configurations.

🐰 In the land of code where rabbits play,
New buttons and checks brighten the day.
With labels that shine and roles that align,
Our UI is spruced up, oh how divine!
Validation now dances, mobile numbers in line,
Hopping through changes, everything’s fine! 🐇✨


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 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.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

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
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

🧹 Outside diff range comments (1)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js (1)

Line range hint 502-527: Add error handling and null checks

The new facility search request implementation has a few areas for improvement:

  1. Add error handling for API failures
  2. Add null checks in the select function
  3. Remove empty params object if not needed

Consider this implementation:

 getFacilitySearchRequest: (prop) => {
   const tenantId = Digit.ULBService.getCurrentTenantId();
   const {campaignId} = Digit.Hooks.useQueryParams();
   return {
     url: `/project-factory/v1/project-type/search`,
-    params: {  },
     body: {
       CampaignDetails: {
         "tenantId": tenantId,
         "ids": [
           campaignId
         ]
     }
     },
     changeQueryName: `boundarySearchForPlanFacility`,
     config: {
       enabled: true,
       select: (data) => {
+        if (!data?.CampaignDetails?.length) {
+          return [];
+        }
         const result = data?.CampaignDetails?.[0]?.boundaries?.filter((item) => item.type == prop.lowestHierarchy) || [];
         return result
       },
+      onError: (error) => {
+        console.error('Facility search failed:', error);
+        return [];
+      }
     },
   };
 },
📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE

📥 Commits

Reviewing files that changed from the base of the PR and between c72dd14 and b1e53ce.

📒 Files selected for processing (2)
  • health/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js (2 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js (2 hunks)
🧰 Additional context used
📓 Path-based instructions (2)
health/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js (1)

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js (1)

Pattern **/*.js: check

🔇 Additional comments (5)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js (3)

102-102: LGTM! Button label standardization

The label change to "WBH_DOWNLOAD_MICROPLAN" improves consistency across the UI.


277-277: LGTM! Consistent button labeling

The label change maintains consistency with MicroplanSearchConfig implementation.


Line range hint 445-458: LGTM! Robust mobile number validation

The validation implementation is well-structured:

  • Properly validates 10-digit numbers
  • Correctly handles empty values as valid
  • Returns clear error messages
health/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js (2)

818-818: Consistent button label update.

The button label has been updated from "WBH_DOWNLOAD" to "WBH_DOWNLOAD_MICROPLAN" for better clarity and consistency.


993-993: Consistent button label update.

The button label has been updated from "WBH_DOWNLOAD" to "WBH_DOWNLOAD_MICROPLAN" to maintain consistency with the same change in MicroplanSearchConfig.

Let's verify if this label key exists in the translation files:

@nipunarora-eGov nipunarora-eGov merged commit 01451ee into console Nov 19, 2024
3 checks passed
@nipunarora-eGov nipunarora-eGov deleted the button-code branch November 19, 2024 11:50
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