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

Plan and Pop inbox fix #1881

Merged
merged 7 commits into from
Nov 22, 2024
Merged

Plan and Pop inbox fix #1881

merged 7 commits into from
Nov 22, 2024

Conversation

rachana-egov
Copy link
Contributor

@rachana-egov rachana-egov commented Nov 22, 2024

Summary by CodeRabbit

Release Notes

  • New Features

    • Enhanced ConfirmationPopUp with updated button prominence for improved user interaction.
    • SearchJurisdiction now allows initialization with predefined values and submits additional context.
    • PlanInbox, PopInbox, and FacilityPopup components now manage default selections for hierarchy and boundaries, improving search and filter functionalities.
  • Bug Fixes

    • Improved error handling in the fetchStatusCount function with better toast notifications.
  • Chores

    • Streamlined loading state management across components for a more responsive UI.

@rachana-egov rachana-egov requested a review from a team as a code owner November 22, 2024 10:44
Copy link
Contributor

coderabbitai bot commented Nov 22, 2024

📝 Walkthrough
📝 Walkthrough

Walkthrough

The changes involve modifications to several components within the micro-ui framework. The ConfirmationPopUp component's button configurations have been altered, changing their visual prominence. The SearchJurisdiction, PlanInbox, and PopInbox components have been enhanced with new props and state management features, allowing for improved initialization and submission of values. These updates also include adjustments to API interactions and error handling, ensuring a more robust user experience.

Changes

File Change Summary
.../ConfirmationPopUp.js Updated button configurations: "close" button changed from secondary to primary, "submit" button changed from primary to secondary.
.../SearchJurisdiction.js Added defaultHierarchy and defaultBoundaries props; updated initial state management; introduced useRef for initial load tracking; modified onSubmit to include selectedHierarchy.
.../PlanInbox.js Introduced state variables for totalStatusCount, defaultHierarchy, and defaultBoundaries; implemented API mutation for fetching status counts; updated onSearch and onClear functions to handle new parameters and states.
.../PopInbox.js Added defaultHierarchy and defaultBoundaries state variables; updated onSearch and onClear functions; modified useSearchPlanConfig hook to always fetch data; improved error handling in fetchStatusCount.
.../FacilityPopup.js Introduced defaultHierarchy and defaultBoundaries state variables; added onSearch and onClear functions; updated props for SearchJurisdiction to include new state variables.

Possibly related PRs

  • Update SetupMaster.js #1422: Modifications in SetupMaster.js involve changing button configurations similar to those in ConfirmationPopUp.js.
  • Added confirmation pop up to finalise actions #1832: Introduction of the ConfirmationPopUp component directly relates to the modifications in this PR.
  • Plan Inbox patch fix #1847: Enhancements in PlanInbox.js include user interaction improvements and button states relevant to ConfirmationPopUp.js.
  • Po finding fixes2 #1845: Updates in PlanInbox.js regarding handling of selected rows and display of data improve user experience, aligning with the goals of the main PR's updates.
  • qquickfix #1878: Modifications in PlanInbox.js refine logic for managing selected rows and user interactions, related to overall improvements in user feedback and action handling.

Suggested reviewers

  • nipunarora-eGov

🐰 "In the UI where buttons play,
A change in colors brightens the day.
With new props and states in view,
Our components now have much more to do!
Hopping along with joy and cheer,
We celebrate these changes, oh so dear!" 🐇

Warning

Rate limit exceeded

@rachana-egov has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 11 minutes and 43 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 e42dcb4 and cb1955e.


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE

📥 Commits

Reviewing files that changed from the base of the PR and between e42dcb4 and cb1955e.

📒 Files selected for processing (1)
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js (14 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js (1)

Pattern **/*.js: check

📓 Learnings (1)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js (1)
Learnt from: rachana-egov
PR: egovernments/DIGIT-Frontend#1847
File: health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js:308-314
Timestamp: 2024-11-18T04:35:51.535Z
Learning: In `PlanInbox.js`, the variable `planWithCensus?.StatusCount[selectedFilter]` is always defined in the given context, so null checks are unnecessary.
🔇 Additional comments (5)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js (5)

Line range hint 227-239: Search handler updates state appropriately

The onSearch function correctly handles the case when boundaries are selected and updates the relevant state variables (activeLink, defaultSelectedHierarchy, and defaultBoundaries) accordingly.


305-306: Clear function resets default selections

The onClear function properly resets defaultBoundaries and defaultSelectedHierarchy, ensuring that the search filters are cleared and the census jurisdiction is reset.


348-356: Status count reordering is correctly implemented

The code effectively filters out the PENDING_FOR_APPROVAL status and reorders the StatusCount to prioritize PENDING_FOR_VALIDATION. This ensures that the statuses are displayed in the desired order.


733-734: Passing default selections to SearchJurisdiction

The defaultHierarchy and defaultBoundaries props are accurately passed to the SearchJurisdiction component, which will initialize the search filters with these default values.


842-842: Refreshing status count after workflow action

Calling fetchStatusCount() after a successful workflow action ensures that the status counts are updated to reflect any changes resulting from the action.


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

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

Line range hint 28-43: Consider extracting boundary filtering logic into a separate utility function.

The boundary filtering logic could be moved to a utility function to improve maintainability and reusability. This would also make the useEffect hook cleaner and more focused.

+const filterAndGroupBoundaries = (boundaries, jurisdiction, selectedHierarchy) => {
+  const userBoundaries = Digit.Utils.microplanv1.filterBoundariesByJurisdiction(
+    boundaries,
+    jurisdiction.boundaryCodes
+  );
+  const filteredBoundaries = userBoundaries.filter(
+    (row) => row.type === selectedHierarchy.boundaryType
+  );
+  return Digit.Utils.microplanv1.groupByParent(filteredBoundaries);
+};

 useEffect(() => {
   if (!selectedHierarchy) {
     setBoundaryOptions([]);
     return;
   }
-  const userBoundaries = Digit.Utils.microplanv1.filterBoundariesByJurisdiction(boundaries, jurisdiction.boundaryCodes);
-  const filteredBoundaries = userBoundaries.filter((row) => row.type === selectedHierarchy.boundaryType);
-  const filteredBoundariesGroupedByParent = Digit.Utils.microplanv1.groupByParent(filteredBoundaries);
+  const filteredBoundariesGroupedByParent = filterAndGroupBoundaries(
+    boundaries,
+    jurisdiction,
+    selectedHierarchy
+  );
   setBoundaryOptions(filteredBoundariesGroupedByParent);

   if (!isInitialLoad.current) {
     setSelectedBoundaries([]);
   } else {
     isInitialLoad.current = false;
   }
 }, [selectedHierarchy]);
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js (1)

Line range hint 878-897: Simplify complex conditional rendering expressions

The conditional expressions for rendering the ActionBar components are complex and may reduce readability. Consider extracting these conditions into well-named variables to enhance clarity.

Apply this diff to simplify the conditional rendering:

+ const shouldShowFinalizeActionBar = isRootApprover && isStatusConditionMet(totalStatusCount);
+ const shouldShowBackButtonActionBar = (!isRootApprover && isStatusConditionMet(totalStatusCount) && planObject?.status === "RESOURCE_ESTIMATION_IN_PROGRESS") || disabledAction;

...

{shouldShowFinalizeActionBar && (
  <ActionBar
    actionFields={[
      <Button
        icon="CheckCircle"
        label={t(`HCM_MICROPLAN_FINALIZE_MICROPLAN`)}
        onClick={handleActionBarClick}
        type="button"
        variation="primary"
      />,
    ]}
    className=""
    maxActionFieldsAllowed={5}
    setactionFieldsToRight
    sortActionFields
    style={{}}
  />
)}

{shouldShowBackButtonActionBar && (
  <ActionBar
    actionFields={[
      <Button
        label={t(`HCM_MICROPLAN_PLAN_INBOX_BACK_BUTTON`)}
        onClick={() => {
          history.push(`/${window.contextPath}/employee`);
        }}
        type="button"
        variation="primary"
      />,
    ]}
    className=""
    maxActionFieldsAllowed={5}
    setactionFieldsToRight
    sortActionFields
    style={{}}
  />
)}
📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE

📥 Commits

Reviewing files that changed from the base of the PR and between 0343381 and bacfc33.

📒 Files selected for processing (4)
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/ConfirmationPopUp.js (2 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/SearchJurisdiction.js (4 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js (13 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js (7 hunks)
🧰 Additional context used
📓 Path-based instructions (4)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/ConfirmationPopUp.js (1)

Pattern **/*.js: check

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

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js (1)

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js (1)

Pattern **/*.js: check

📓 Learnings (2)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js (1)
Learnt from: rachana-egov
PR: egovernments/DIGIT-Frontend#1847
File: health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js:308-314
Timestamp: 2024-11-18T04:35:51.535Z
Learning: In `PlanInbox.js`, the variable `planWithCensus?.StatusCount[selectedFilter]` is always defined in the given context, so null checks are unnecessary.
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js (1)
Learnt from: rachana-egov
PR: egovernments/DIGIT-Frontend#1832
File: health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js:592-594
Timestamp: 2024-11-14T12:48:23.024Z
Learning: In `PopInbox.js`, when integrating the `ConfirmationPopUp` component, error handling for API failures is managed internally within the component, so explicitly passing an `onError` prop is not necessary.
🔇 Additional comments (15)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/ConfirmationPopUp.js (1)

Line range hint 1-85: LGTM! Well-structured component with proper error handling

The component demonstrates good practices:

  • Proper loading state management with isSubmitting
  • Error handling with Toast notifications
  • API mutation handling with success/error callbacks
  • Button disable states during submission
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/SearchJurisdiction.js (2)

21-26: LGTM! Clean state management implementation.

The state initialization with default props and the use of useRef for tracking the initial load state is well implemented and follows React best practices.


112-112: Verify that all callers handle the updated onSubmit signature.

The onSubmit function now includes selectedHierarchy as a second parameter. Ensure that all parent components using this component handle both parameters correctly.

✅ Verification successful

All callers correctly handle the updated onSubmit signature

The verification shows that all three components using SearchJurisdiction (PlanInbox.js, PopInbox.js, and FacilityPopup.js) properly handle both parameters:

  • PlanInbox.js and PopInbox.js both define onSearch(selectedBoundaries, selectedHierarchy) with identical parameter handling
  • FacilityPopup.js uses censusSearch which only needs the boundaries parameter, which is a valid subset usage
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for components using SearchJurisdiction to verify onSubmit usage
rg -l "SearchJurisdiction" | xargs rg -A 5 "onSubmit={" 

Length of output: 139


Script:

#!/bin/bash
# Search for components using SearchJurisdiction
rg -l "SearchJurisdiction"

Length of output: 422


Script:

#!/bin/bash
# Search for usage of SearchJurisdiction component with context
rg -B 3 -A 10 "<SearchJurisdiction"

Length of output: 5510


Script:

#!/bin/bash
# Search for onSubmit prop in files containing SearchJurisdiction
ast-grep --pattern 'onSubmit={$_}'

Length of output: 36


Script:

#!/bin/bash
# Search for onSearch function definition in PlanInbox.js
rg -B 5 -A 15 "const onSearch" health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js

# Search for onSearch function definition in PopInbox.js
rg -B 5 -A 15 "const onSearch" health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js

# Search for censusSearch function definition in FacilityPopup.js
rg -B 5 -A 15 "const censusSearch" health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FacilityPopup.js

Length of output: 3163

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js (5)

45-46: LGTM! State management implementation looks good.

The new state variables are well-named and properly initialized with appropriate default values.


Line range hint 158-169: LGTM! Search functionality is well implemented.

The search implementation includes proper validation for empty boundaries and appropriate state updates. The warning toast for empty boundaries provides good user feedback.


245-246: LGTM! Clear functionality properly resets states.

The clear implementation correctly resets both boundary and hierarchy states to their initial values.


528-528: LGTM! Loading state handling is comprehensive.

The loading check properly includes all relevant async operations, ensuring a consistent loading experience.


561-566: Verify prop handling in SearchJurisdiction component.

New props have been added to SearchJurisdiction. Ensure that the SearchJurisdiction component properly handles these props, especially for initialization and updates.

✅ Verification successful

Props are properly handled in SearchJurisdiction component

The SearchJurisdiction component correctly implements and handles both defaultHierarchy and defaultBoundaries props:

  • Props are properly declared with default values (null and [] respectively)
  • Values are correctly used to initialize the component's state using useState
  • Component includes proper state management and update logic for both hierarchy and boundaries
  • Initial load is tracked using useRef to prevent unwanted boundary resets
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check SearchJurisdiction component implementation
ast-grep --pattern 'const SearchJurisdiction = ({ defaultHierarchy, defaultBoundaries, $$$_ }) => {
  $$$
}'

Length of output: 110


Script:

#!/bin/bash
# Let's try to find the SearchJurisdiction component file first
fd SearchJurisdiction

# Then let's look for any file containing SearchJurisdiction component definition
rg -l "SearchJurisdiction.*=.*{" 

# As a backup, search for files containing SearchJurisdiction
rg -l "SearchJurisdiction"

Length of output: 696


Script:

#!/bin/bash
# Let's examine the SearchJurisdiction component implementation
cat health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/SearchJurisdiction.js

# Also check for any usages of defaultHierarchy and defaultBoundaries props
rg "defaultHierarchy|defaultBoundaries" health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/SearchJurisdiction.js

Length of output: 5203

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js (7)

160-160: LGTM!

The addition of isFetching to manage the loading state is appropriate.


Line range hint 227-239: Update 'onSearch' function to handle default selections

The changes to the onSearch function correctly handle the default hierarchy and boundaries selections.


305-306: LGTM!

Resetting defaultBoundaries and defaultSelectedHierarchy in the onClear function is appropriate.


680-680: Include 'mutation.isLoading' in loading state check

Adding mutation.isLoading to the loading condition ensures that the loader is displayed during the mutation process.


729-730: Passing default values to 'SearchJurisdiction' component

Providing defaultHierarchy and defaultBoundaries as props enhances the functionality of the SearchJurisdiction component.


838-838: Refresh status count after workflow action success

Calling fetchStatusCount() after a successful workflow action ensures that the status count is updated accordingly.


848-848: Display loader during data fetching

Using isFetching to display the loader provides a better user experience while data is being fetched.

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

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

Line range hint 227-239: Remove unnecessary null checks for planWithCensus?.StatusCount[selectedFilter]

Based on previous learnings, planWithCensus?.StatusCount[selectedFilter] is always defined in this context. Remove redundant null checks to simplify the code.

Apply this diff to remove unnecessary null checks:

- if (selectedFilter === null || selectedFilter === undefined || selectedFilter === "" || !activeFilterKeys.includes(selectedFilter)) {
+ if (!selectedFilter || !activeFilterKeys.includes(selectedFilter)) {
📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE

📥 Commits

Reviewing files that changed from the base of the PR and between bacfc33 and 6a31fcb.

📒 Files selected for processing (2)
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js (13 hunks)
  • health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js (7 hunks)
🧰 Additional context used
📓 Path-based instructions (2)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js (1)

Pattern **/*.js: check

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js (1)

Pattern **/*.js: check

📓 Learnings (2)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js (1)
Learnt from: rachana-egov
PR: egovernments/DIGIT-Frontend#1847
File: health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js:308-314
Timestamp: 2024-11-18T04:35:51.535Z
Learning: In `PlanInbox.js`, the variable `planWithCensus?.StatusCount[selectedFilter]` is always defined in the given context, so null checks are unnecessary.
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js (2)
Learnt from: rachana-egov
PR: egovernments/DIGIT-Frontend#1832
File: health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js:592-594
Timestamp: 2024-11-14T12:48:23.024Z
Learning: In `PopInbox.js`, when integrating the `ConfirmationPopUp` component, error handling for API failures is managed internally within the component, so explicitly passing an `onError` prop is not necessary.
Learnt from: rachana-egov
PR: egovernments/DIGIT-Frontend#1837
File: health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js:559-561
Timestamp: 2024-11-15T10:15:57.370Z
Learning: In `PopInbox.js`, error handling for the `onError` callback in `WorkflowCommentPopUp` is handled within the component, so explicit error handling in the parent component is unnecessary.
🔇 Additional comments (12)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js (6)

45-46: LGTM! State management for hierarchy and boundaries.

The new state variables are properly initialized and follow consistent naming conventions.


Line range hint 158-169: LGTM! Enhanced search functionality with proper validation.

The search function correctly validates the boundary selection and updates the hierarchy and boundary states appropriately.


245-246: LGTM! Proper state reset in clear functionality.

The clear function correctly resets the hierarchy and boundary states to their initial values.


528-528: LGTM! Comprehensive loading state handling.

The loading check properly includes all asynchronous operations, including mutations.


561-566: LGTM! Proper prop passing to SearchJurisdiction.

The defaultHierarchy and defaultBoundaries props are correctly passed to the SearchJurisdiction component.


69-69: 🧹 Nitpick (assertive)

Consider conditional fetching of plan configuration.

Setting enabled: true unconditionally might lead to unnecessary API calls. Consider keeping it conditional based on when the plan configuration is actually needed.

-      enabled: true,
+      enabled: microplanId ? true : false,

Likely invalid or redundant comment.

health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js (6)

305-306: Initialize state variables consistently

The state setters setDefaultBoundaries and setDefaultSelectedHierarchy are being reset in onClear. Ensure consistent initialization by setting setDefaultSelectedHierarchy to null, similar to how setDefaultBoundaries is set to an empty array.


838-838: Redundant call to fetchStatusCount after refetch

After calling refetchPlanWithCensus(), calling fetchStatusCount() may be redundant if the data fetched by refetchPlanWithCensus() includes updated status counts. Verify if both calls are necessary.


89-116: Simplify fetchStatusCount by handling success directly

When using await mutation.mutateAsync(), the onSuccess and onError callbacks within the options may not be effective. Since you're awaiting the promise, handle the success and error directly in the try and catch blocks.


739-739: Extract complex inline styles into a variable

The inline style for marginBottom is complex and affects readability. Extract the condition into a separate variable for clarity.


729-730: Ensure SearchJurisdiction accepts new props

The defaultHierarchy and defaultBoundaries props are being passed to SearchJurisdiction. Verify that the SearchJurisdiction component is updated to accept and handle these new props appropriately.

Run the following script to check the SearchJurisdiction component's prop definitions:

✅ Verification successful

SearchJurisdiction component properly accepts and handles the new props

The component definition in SearchJurisdiction.js shows that both defaultHierarchy and defaultBoundaries props are properly declared and handled:

  • Props are defined in the component signature (lines 7-10)
  • Default values are set appropriately:
    • defaultHierarchy = null
    • defaultBoundaries = []
  • Props are used correctly in the component:
    • Line 21: useState(defaultBoundaries)
    • Line 22: useState(defaultHierarchy)
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify that `SearchJurisdiction` accepts `defaultHierarchy` and `defaultBoundaries` props.

# Search for the prop definitions in `SearchJurisdiction` component.
rg --type js 'SearchJurisdiction.*props' -A 10

Length of output: 48


Script:

#!/bin/bash
# Let's try different approaches to locate the SearchJurisdiction component and its props

# First, find all files that might contain SearchJurisdiction
fd -e js -e jsx SearchJurisdiction

# Then search for SearchJurisdiction component definition using ast-grep
ast-grep --pattern 'const SearchJurisdiction = $_'

# Also try to find any usage of SearchJurisdiction as a component
ast-grep --pattern '<SearchJurisdiction $$$>'

# Backup search using ripgrep for any mention of SearchJurisdiction
rg "SearchJurisdiction"

Length of output: 17826


Line range hint 227-239: Verify that all usages of onSearch are updated

The onSearch function now accepts an additional parameter selectedHierarchy. Ensure that all components invoking onSearch are updated to pass the new parameter to prevent potential runtime errors.

Run the following script to verify all calls to onSearch:

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

📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE

📥 Commits

Reviewing files that changed from the base of the PR and between 6a31fcb and e42dcb4.

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

Pattern **/*.js: check

🔇 Additional comments (1)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FacilityPopup.js (1)

34-35: LGTM: State variables properly initialized

The new state variables follow React conventions and have appropriate initial values.

@nipunarora-eGov nipunarora-eGov merged commit cfda909 into console Nov 22, 2024
3 checks passed
@nipunarora-eGov nipunarora-eGov deleted the patch_fix_2 branch November 22, 2024 11:41
jagankumar-egov added a commit that referenced this pull request Dec 9, 2024
* fixed assumption audit fixes (#1758)

* fixed draft issue of Setup campaign (#1757)

Co-authored-by: Jagankumar <[email protected]>

* Summary css fix (#1755)

* updated css for summary screen

* removed log

* added null check

---------

Co-authored-by: rachana-egov <[email protected]>

* Breadcrumb for usermanagement (#1761)

* Breadcrumb changes

* console.log removed

* indentations

* Finalised microplan download (#1762)

* Feat : Added download button for finalised microplans

* Added Todo

* fixed HCMPRE-776 and removed updated old validation (#1763)

* fixed HCMPRE-776 and removed updated old validation

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/MapView.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update MyCampaign.js

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignDates.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update CampaignDates.js

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update SetupCampaign.js

---------

Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix key (#1764)

Co-authored-by: NabeelAyubee <[email protected]>

* Fixed UiCustomisation Digit issue (#1766)

Checking UisCustomisation

* Fixed double selection of boundaries (#1765)

Update MultiSelectDropdown.js

* Fixed loader,breadcrumb,table cells css and added placeholder text fo… (#1769)

Fixed loader,breadcrumb,table cells css and added placeholder text for assumption fields

* fixed targetvalidation and added no results in boundary (#1768)

* Dynamic column pop inbox (#1770)

* Added dynamic column inside pop inbox

* updated status to action in status logs

* updated status log

* added comment logs for edit population

* updated css version

* updated code rabbit comment and css version

---------

Co-authored-by: rachana-egov <[email protected]>

* Feature/bug (#1773)

* z-index and camapaign-name in preview

* ui-ux-demo-review

* version updates

* ver

* Update ViewHierarchy.js

---------

Co-authored-by: Jagankumar <[email protected]>

* Updated the search dropdown (#1776)

updated the search dropdown

Co-authored-by: rachana-egov <[email protected]>

* Info ToolTip added (#1775)

* Added info icon on formula and assumptions

* Incremented CSS version

* Vesrion update (#1778)

* updated react-components version to fix icon issues in inbox screen

* updated versions everywhere

* myMicroplanFixes (#1777)

* My microplan data fixes, localisation fixes

* setup response screen fixes, breadcrumb localisation code correctify

* search bar fix

* fixes

* ADD NEW LOCALE

* roletable fixes for mobile number search, qa issue fix

* FIXES

* quickfixes

* quick fixes/ Tagging UI UX fixes

* fix

* added locale

* census table assignee issue fixes

* role table pop up css fix and my microplan click fix

* fixes and stepper click enable for back

* added user tag fixes

* UserAccessfixes

* Custom Assumption - Custom Formula

* Update health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: NabeelAyubee <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Updated date formate (#1779)

* updated date formate and css

* updated css

---------

Co-authored-by: rachana-egov <[email protected]>

* Fix for cycle draft ::changes for the draft flow (#1780)

* Fixed assumption form multi save (#1781)

Update SetupMicroplan.js

* user tagging fixes (#1782)

Co-authored-by: NabeelAyubee <[email protected]>

* Usermanagement row on click redirect (#1783)

* Changes to usermanagement redirext on row click

* changes to onRow click in userManagement

* console removed

* changes

* null check

* changes

* removing extra mdms call

* changing useState

* removed var

* changes

* changes

* Plan and Pop inbox changes (#1784)

* removed popup for facilitya and population upload

* updated plan inbox

---------

Co-authored-by: rachana-egov <[email protected]>

* Feature/bugs (#1785)

* bug/boundary

* changed field name

* added something

* Update checklistSearchConfig.js

* Update ViewHierarchy.js

* fixes

* fixes1

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/ViewHierarchy.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fixed order in boundary details and changed hierarchy master (#1786)

* added the checks for the update campaign flow (#1788)

* Open Boundary Management ui Info pending changes  (#1789)

* pending changes

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useBoundaryHome.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/GeoPode.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/GeoPode.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Reverted action in assign to all, updated the column heading with pro… (#1790)

* reverted action in assign to all, updated the column heading with projecttype

* removed logs

---------

Co-authored-by: rachana-egov <[email protected]>

* Usermanagement css and boundaryScreen css (#1791)

Changes to userManagement, css for boundary

* Vehicle Change Assumptions & Formula (#1787)

* user tagging fixes

* Vehicle Assumptions and Vehicle Formula

* Update health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* yarn

---------

Co-authored-by: NabeelAyubee <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* css fixes (#1792)

Co-authored-by: Jagankumar <[email protected]>

* LCOALISATION FIXES (#1793)

* user tagging fixes

* Vehicle Assumptions and Vehicle Formula

* Update health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* yarn

* locaisaton code fixes

---------

Co-authored-by: NabeelAyubee <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* some-ui-fixes (#1794)

* some-ui-fixes

* version updates

* fixed boundary selection dropdown issue (#1796)

* fixed boundary selection dropdown issue

* fixed search juridiction dropdown

---------

Co-authored-by: rachana-egov <[email protected]>

* Allowed to update the name of microplan (#1795)

* Allowed to update the name of microplan

* changed hardcoded date to 30 from 100

---------

Co-authored-by: rachana-egov <[email protected]>

* demo issue fixes (#1797)

Co-authored-by: rachana-egov <[email protected]>

* ui fixes (#1798)

* Added retry of failed campaign

* stepper rvert back (#1799)

* ESTIMATION & FORMULA FIXES (#1804)

* user tagging fixes

* Vehicle Assumptions and Vehicle Formula

* Update health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* yarn

* locaisaton code fixes

* estimationa and formula fixes

---------

Co-authored-by: NabeelAyubee <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* error toast and checklist updates (#1805)

error taost and cehcklist updates

* HCMPRE 1131 (#1807)

* user tagging fixes

* Vehicle Assumptions and Vehicle Formula

* Update health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* yarn

* locaisaton code fixes

* estimationa and formula fixes

* my microplan fix

* fixes

---------

Co-authored-by: NabeelAyubee <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Updated sidebar for microplan (#1802)

* Updated sidebar for microplan

* Update index.scss

---------

Co-authored-by: rachana-egov <[email protected]>
Co-authored-by: Nipun Arora <[email protected]>

* style change of toolTip (#1806)

* toast and minor ui (#1809)

* ui/ux fixes (#1810)

* Changes to AssummptionList and stepper disable in setupConfig (#1811)

* Changes to assumptions list

* setupCompleted changes

* Formula View, and Select Acitivity Screen CSS changes (#1803)

* select-activity-commit

* Hover over formulaConfigView

* margin adjust

* removed console

* css changes

* package update

* changes to css

* package css update

* Revert "Allowed to update the name of microplan (#1795)" (#1812)

This reverts commit e32aad6.

Co-authored-by: Nipun Arora <[email protected]>

* updated message for header and label and added validation for max length (#1813)

* Cleaned up boundary Management code and add some validations

* redirect and ui (#1814)

* Assumptionlist fix (#1815)

changes

* changes in the delivery type and selection of boundary (#1816)

* to be picked (#1819)

* to be picked

* checklist and other changes

* role table fixes, drop down fix, pop up fix, use tag fix (#1820)

* user tagging fixes

* Vehicle Assumptions and Vehicle Formula

* Update health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/Hypothesis.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* yarn

* locaisaton code fixes

* estimationa and formula fixes

* my microplan fix

* fixes

* pull fixes

* user tag changes

* fixes

---------

Co-authored-by: NabeelAyubee <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fetch data type from mdms (#1822)

* fixed app delivery condition (#1825)

* not selected added in single value list (#1824)

* not selected added in single value list

* isActive added

* one more fix

* Facility dropdown (#1817)

* Added single dropdown in facilityCatchment

* tenantId fix

* Hierarchies fix

* Microplan name update (#1821)

* updated start date for campaign

* added update microplan name changes

---------

Co-authored-by: rachana-egov <[email protected]>

* Internal demo fixes (#1827)

* disabled the viewer card

* updated suggested microplan name formate

* updated assignee to assigner in timeline wrapper

* updated button side in my microplan screen

* updated sucurity and accessibility edit buttons

* commented tranportation mode from accessibility details

* added assignee next to village updated comment

* updated plan inbox

---------

Co-authored-by: rachana-egov <[email protected]>

* tenant logo css fix (#1828)

* Facility data fix (#1829)

FacilityData Fix

* Added boundary manager access to the home card

* Updated activity selection screen to have view also (#1830)

updated activity selection screen to have view also

Co-authored-by: rachana-egov <[email protected]>

* Added confirmation pop up to finalise actions (#1832)

added confimation pop up to finalize actions

Co-authored-by: rachana-egov <[email protected]>

* Popup for userAccess boundary area and toast message for assign unassign (#1831)

* Changed localization

* Loc

* Changes for popup in userAccess

* changes

* My MICROPLAN fixes, formula fixes (#1835)

* Hcmpre 1290 (#1834)

* fixed app delivery condition

* added my microplan screen

* changes in the url

* changes

---------

Co-authored-by: Jagankumar <[email protected]>

* Inbox (#1838)

* fixed app delivery condition

* fixed hover issue on search screen

* demo review changes in boudnary management (#1836)

* demo review changes in boudnary management

* different download template for hierarchy from geopode and completely new

* info cards added

* code clean

* Update searchSavedPlansWithCampaign.js (#1839)

Co-authored-by: Nipun Arora <[email protected]>

* Space (#1840)

* fixed app delivery condition

* added space

* fixed miner issues (#1837)

* fixed miner issues

* fixed pop inbox issue

* fixed status log issue

* Update PopInbox.js

---------

Co-authored-by: rachana-egov <[email protected]>
Co-authored-by: Nipun Arora <[email protected]>

* Update searchSavedPlansWithCampaign.js (#1841)

Co-authored-by: Nipun Arora <[email protected]>

* Gepspatial map view (#1842)

* added minor css changes and basic logic for geospatial view

* updated css version

* updated chooseactivity screen

* fixed syntax issue

* PO finding fixes (#1843)

* Fix campaign Type in draft (#1846)

* Plan Inbox patch fix (#1847)

* added workflow for toast message

* updated workflow button color

* added count for assign to me and all tabs

* added back button

---------

Co-authored-by: rachana-egov <[email protected]>

* Go Back button and microplan name quotes fix (#1844)

* Updated the core and other component version for landing page card  override

* Po finding fixes2 (#1845)

* added tooltip for residing boundary

* registered hierarchy tooltip inside component

* added different workflow message and alert header

* updated button color for workflow actions

* added info icons in select activity card

* added back button

* fixed action for facility

* updated css version

---------

Co-authored-by: rachana-egov <[email protected]>

* Summary user role tagging and Response Screen (#1852)

* Changes ro userAccessTableWrapper

* Response Screen

* comment removed

* minor updates (#1853)

Co-authored-by: Nipun Arora <[email protected]>

* toast localistaion (#1855)

* updated core component & css version

* updating the module versions

* Reverting the libraries version update

* Updated all the core component version from 1.8.3 to 1.8.10

* PO fixes (#1857)

* reverted column freeze as it was causing issues (#1858)

reverted column fix as it was causing issues

* Added column in sorted way, added assignee, added total pop (#1859)

Co-authored-by: NabeelAyubee <[email protected]>

* added serving facility (#1860)

Co-authored-by: NabeelAyubee <[email protected]>

* updated code (#1861)

* Formcomposer action bar fixes (#1862)

* added serving facility

* form composer action bar fix

---------

Co-authored-by: NabeelAyubee <[email protected]>

* Updated few localisation messages

* added loader screen to ftech data from microplan integration screen

* Updated UI Customizations file

* Approved microplan integration

* Added toast & success for api response

* plan inbox assignee fix (#1863)

* added serving facility

* form composer action bar fix

* plan inbox assignee fix

---------

Co-authored-by: NabeelAyubee <[email protected]>

* formula and assumption refresh issue (#1864)

* added serving facility

* form composer action bar fix

* plan inbox assignee fix

* formula and assumption refresh issue

---------

Co-authored-by: NabeelAyubee <[email protected]>

* minor changes (#1866)

* Action bar fixes, session fixes (#1867)

* added serving facility

* form composer action bar fix

* plan inbox assignee fix

* formula and assumption refresh issue

* action bar hidden fixes, session fixes

* Update index.js

* Update index.js

---------

Co-authored-by: NabeelAyubee <[email protected]>

* Download Button  (#1865)

* Loc changes to popInbox

* Loc

* Changes

* UICust update

* css package update

* Changes

* changes

* Update UICustomizations.js

* Name of file

* For Download update

* UI cust changes

* added return in UI

* Changes

---------

Co-authored-by: Nipun Arora <[email protected]>

* User Role being displayed in Pop, Plan and Fac (#1854)

* changes localizations

* Adding userName and their roles

* resolved conflict

* css package update

* UIcustomization dropdown changes

* pop-inbox changes

* package update

* loc added

* loc changes

* dropdown options changed

* UICust making same as in example

* UnassignPopup

* comments

* loc

* Loader added

* changes

* changes to roletablecomposer for unassign popup

* changes

* Facility Catchment

* reverted facility popup

* Changes

* KPI Card

* package update

* Facility data keys

* changes according to comments

* Changes

* rowOn click redirection

* Dummy Data removed

* removed import

* removed for residing boundary

* removed 5000

* package update for css

---------

Co-authored-by: Nipun Arora <[email protected]>

* fixes (#1869)

* added serving facility

* form composer action bar fix

* plan inbox assignee fix

* formula and assumption refresh issue

* action bar hidden fixes, session fixes

* fixes

* Update health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js

---------

Co-authored-by: NabeelAyubee <[email protected]>

* patch fix (#1868)

* route back to home on back

* fixed refresh issue for pop inbox

---------

Co-authored-by: rachana-egov <[email protected]>

* polling fix (#1870)

* polling fix

* Update TimelineComponent.js

* assumptions fixes (#1871)

Co-authored-by: Nipun Arora <[email protected]>

* Facility pop up fix (#1872)

* Localizations and Actions being cut (#1874)

* Changes

* Package update

* Disabled updating security and accessibility details after finalize  … (#1873)

Disabled updating security and accessibility details after finalize  facility catchment

Co-authored-by: rachana-egov <[email protected]>

* Update PopInbox.js (#1875)

Co-authored-by: Nipun Arora <[email protected]>

* scroll (#1876)

Co-authored-by: Nipun Arora <[email protected]>

* Update FacilityPopup.js (#1877)

* qquickfix (#1878)

* added serving facility

* form composer action bar fix

* plan inbox assignee fix

* formula and assumption refresh issue

* action bar hidden fixes, session fixes

* fixes

* fix

---------

Co-authored-by: NabeelAyubee <[email protected]>

* Updated the microplan integration piece

* adhoc changes (#1879)

* some fixes

* Update PlanInbox.js

* added checklist redirection (#1880)

* added checklist redirection

* removed console

* Updated workbench module version

* Plan and Pop inbox fix (#1881)

* fixed pop inbox boundary getting empty issue

* fixed back button issue

* updated search juridiction component

* fixed facility pop up boundary refresh

* removed pending for approval from status filter

---------

Co-authored-by: rachana-egov <[email protected]>

* updated table and other fixes (#1882)

* updated table and other fixes

* fixed table issue

* Latest KPI values and Heading change (#1883)

* Popup changed to alert type

* UserName to name

* userName to name

* changes to heading font wieght

* css package
update

* Removed i icon

* changes

* removed comments

* removed comments

* changes

* isLoading removed

* updated css

---------

Co-authored-by: Nipun Arora <[email protected]>

* Added count of villages and facilities in confirmation messages (#1885)

Co-authored-by: rachana-egov <[email protected]>

* Update UserUpload.js (#1886)

* fixed localization issue (#1888)

Co-authored-by: rachana-egov <[email protected]>

* Removed  Core HRMS and updated the timeout of fetch from microplan

* changed residing-boundary to multiselect dropdown, fixed table scroll… (#1889)

* changed residing-boundary to multiselect dropdown, fixed table scroll styles, made boundary selection popup dropdown searcheable

* fixed dropdown alignment

* fixed validation in boundary create and timeline button in the summary (#1890)

* fixed validation in boundary create and timeline button in the summary

* changed localisation condition

* Added missing the translation

* Added list of assignee for pop and plan inbox (#1887)

* added list of assignee for pop and plan inbox

* updated comments

* updated assignee for plan inbox

---------

Co-authored-by: rachana-egov <[email protected]>

* Re render assumption fix, atleast one mdms check, blank custom name check, (#1884)

* added serving facility

* form composer action bar fix

* plan inbox assignee fix

* formula and assumption refresh issue

* action bar hidden fixes, session fixes

* fixes

* fix

* action bar fix, formula next back issue

* assumption and formula one mdms check and refetch blank label check

* remove status log column

* fix

* adhoc fix

* fix

* fix

* del session

---------

Co-authored-by: NabeelAyubee <[email protected]>

* fixed validation cond for app (#1891)

* fixed filestore call issue (#1895)

* toast fix, user tagging table dropdown fix and added comment toast (#1896)

* FIXES (#1893)

* added serving facility

* form composer action bar fix

* plan inbox assignee fix

* formula and assumption refresh issue

* action bar hidden fixes, session fixes

* fixes

* fix

* action bar fix, formula next back issue

* assumption and formula one mdms check and refetch blank label check

* remove status log column

* fix

* adhoc fix

* fix

* fix

* del session

* FIXES
1. After clicking on nextin vehicle after addinginvalid valu3 it redirects me to 1st assumption page
2. yes no buttton ki jagah same rakho na dono pop up me in formula and assumption pop up
3. User can add same duplicate text assumption and same value comess. similary for same dropdowns can be selected multiple times(in vehicle). Applies for formula and assumption
4. cache issue in pop of add new in assumption and formula. Entered value is not reset if they close and reopen the popup. Applies for formula and assumption
5. need different loc code for description for vehicle assumption and vehicle estimation

* revert

* a

---------

Co-authored-by: NabeelAyubee <[email protected]>

* ui fixes. (#1897)

* ui fixes.

* review changes

* review changes1

* Fetch microplan related changes (#1898)

* mychange

* added changes for fetch from microplan screen

* updated packege

* added back button, redirected checklist success and fixed null issue … (#1894)

added back button, redirected checklist success and fixed null issue for app

* fixed finalized button issue (#1899)

* added fixes for the campaign update and fetch from mp

* added timeout cleaned up & fetch will start after the data template download

* Employee search fix (#1892)

* button change

* Changes

* Formula name validation

* Changes

* console log removed

* changes

* changes

* changes

* Original formula config

* Formula config change for toast

* Update FormulaConfiguration.js

---------

Co-authored-by: Nipun Arora <[email protected]>

* Bug fix (#1900)

* fixed decimal issue and total not getting validated issue

* fixed user tagging multiselect dropdown issue

---------

Co-authored-by: rachana-egov <[email protected]>

* Added few extra waiting steps for templates

* KPI card fix, and css change (#1903)

* Heading added

* changes to query, for kpi card

* css change

* css package update

* update to inbox codes (#1904)

updates

* Added dynamic columns in facility screen (#1902)

* Added dynamic columns in facility screen

* changed the filter condition

* Update FacilityPopup.js

---------

Co-authored-by: rachana-egov <[email protected]>
Co-authored-by: Nipun Arora <[email protected]>

* validations done for assumptions and formula (#1906)

Co-authored-by: Nipun Arora <[email protected]>

* localisation and error codes (#1905)

* Added fixes for timeout and redirection for fetch microplan (#1901)

* Added fixes for timeout and redirection for fetch microplan

* Update useFetchFromMicroplan.js

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/fetchFromMicroplan.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/fetchFromMicroplan.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Added fixes for the template generation

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/fetchFromMicroplan.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/fetchFromMicroplan.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* updated

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* wait and retry message (#1909)

* Updated toast wran to warning message toast type

* checking popup issue in facility screen (#1910)

Co-authored-by: Swathi-eGov <[email protected]>

* Adhoc fixes 91 (#1912)

* updates to validation

* Update health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfiguration.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* updated regex

---------

Co-authored-by: Nipun Arora <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Pop inbox Pagination fix (#1907)

Co-authored-by: rachana-egov <[email protected]>

* Facility Pagination Fix (#1908)

Co-authored-by: rachana-egov <[email protected]>

* Feature/er (#1914)

* wait and retry message

* type of structure changed for irs

* fixed plan inbox issues (#1915)

Co-authored-by: rachana-egov <[email protected]>

* Table changes (#1913)

* a lot of changes

* small change

* changes

* loc

* removed

* added fixes for sort, view summary issue, no results in dropdown (#1916)

added fixes

* fixed facility catchment pop up issue (#1917)

Co-authored-by: rachana-egov <[email protected]>

* Fixed Audit issues (#1918)

Co-authored-by: rachana-egov <[email protected]>

* removed alphanumeric valiadtion (#1922)

Co-authored-by: Nipun Arora <[email protected]>

* updated the loader screen loader styles as per ux audit

* Kpis integrate (#1919)

* Kpis integration

* Some style changes

* Some validations

* Remove console

* Removed merged changes

* Data null handled

* Data null handled

* Assumption Toast Validation and Irs removed 1 (#1921)

* changes

* changes

* changes

* Fixed accessibility dropdown issue (#1923)

Co-authored-by: rachana-egov <[email protected]>

* Added extra steps and styles updated

* Added toast and changes primary, seccondary in Assumption,Formula (#1924)

* changes

* changes

* changes

* changes

* Changed hierarchy schema for microplan (#1925)

* Changed hierarchy schema for microplan

* Update UserUpload.js

* removed duplicate campaignId

---------

Co-authored-by: rachana-egov <[email protected]>

* Fixed small issues (#1927)

Co-authored-by: rachana-egov <[email protected]>

* Audit fixes main (#1926)

* audit fixes

* fixed campaign details css issue

* Update health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* updated core, react-components,ui-components and releated css versions

* added icon for download and changed primary to secondary for action button

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* width fix for module card (#1929)

* Formula Checking Fix (#1930)

* small changes

* changes

* changes

* Edit Size button changed (#1931)

changes

* Update HypothesisWrapper.js (#1932)

Co-authored-by: Nipun Arora <[email protected]>

* Feature/fixes (#1928)

* microplan hover and campign fixes with checklist minor improvements

* bottom margin below add levels

* review changes

* Updates to formula (#1933)

* Update HypothesisWrapper.js

* Update FormulaConfigWrapper.js

---------

Co-authored-by: Nipun Arora <[email protected]>

* fixed pop issue (#1934)

Co-authored-by: rachana-egov <[email protected]>

* css fix on card comp (#1935)

* Updated the campaign Card for the roles mapping

* Fixed screen breaking issue (#1936)

Co-authored-by: rachana-egov <[email protected]>

* validation update (#1937)

Update HypothesisWrapper.js

* Fixed assignee count for pop and plan inbox (#1938)

* Fixed assignee count for pop and plan inbox

* fixed back button issue in plan inbox

* removed logs

---------

Co-authored-by: rachana-egov <[email protected]>

* Changes in facility kpis (#1939)

* Changes in facility kpis

* Some changes

* fixed product chip and summary issue (#1941)

fixed productchip and summary issue

* Mdms kpi (#1942)

* Kpis from mdms

* Some optimizations

* Update health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/hooks/useKpiDssSearch.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Dropdown popup fixes (#1943)

* removed custom loader, updated dropdown styles inside popup,fixed action drodpown css

* updated css version

* Added inline validations (#1944)

Co-authored-by: rachana-egov <[email protected]>

* Added refetch (#1945)

* Assumption formula fixes (#1946)

* added a toast on back button

* updated formula source to CUSTOM when any custom assumption is used in

---------

Co-authored-by: Nipun Arora <[email protected]>

* Update createUpdatePlanProject.js (#1948)

Co-authored-by: Nipun Arora <[email protected]>

* Fixed back button and edit population error message logic (#1949)

* fixed back button and edit population error message logic

* updated back button in facility screen

* added show on ui conditions on fields

* added translation function

---------

Co-authored-by: rachana-egov <[email protected]>

* localizations for user management and user tag (#1950)

* Loc in userManagement

* Changes to user tag loc

* added status filters (#1952)

* additional validations on assumptions + showing formulas in plan inbox based on show on estimation dashboard (#1953)

additional validations

* Updated Bread crumbs (#1954)

* fixed back button and edit population error message logic

* Updated breadcrumbs

* removed unused import

---------

Co-authored-by: rachana-egov <[email protected]>

* sort issue fix, title for buttons, actionbar fix (#1955)

* Patch fix (#1956)

* added list of roles for assigner

* added null check

---------

Co-authored-by: rachana-egov <[email protected]>

* Popup fix (#1958)

* fixed popup scroll issue

* updated versions

* Changes for kpis (#1960)

* Fixed toast issue + fixed invalidation of assumption and formula (#1963)

Co-authored-by: Nipun Arora <[email protected]>

* Updated the loader text, updated the icon information, change log updated

* fixed error message issue (#1964)

Co-authored-by: rachana-egov <[email protected]>

* Adhoc fixes 13: Fixed formula custom cascading changes + validations  (#1966)

* updated toast error in formulas

* Update createUpdatePlanProject.js

* updated mdms paths (#1968)

* Update searchDssChartV2.js (#1969)

* fixed resources,delivery screen issue and added campaign name (#1965)

* fixed resources,delivery screen issue and added campaign name

* added classname

* Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundarySummary.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* removed logs

---------

Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* bug bash bug of download popup openinng again and again (#1961)

* bug bash bug of download popup openinng again and again

* review changes

* Update UploadData.js

---------

Co-authored-by: Jagankumar <[email protected]>

* changes from count to quantity (#1970)

* changes from count to quantity

* removed logs

* Feature/time (#1971)

* timeline fix for microplan

* ui

* Update campaign.scss

---------

Co-authored-by: Jagankumar <[email protected]>

* added campaign name in update (#1973)

* Updated loc codes (#1976)

Update Module.js

* Revert module changes for localisation (#1977)

Revert "Updated loc codes (#1976)"

This reverts commit cf596aa.

* Added fix for the buil issue for trying out the optional deepndency #1974 (#1978)

Added fix for the buil issue for trying out the optional deepndency

* Some handlings (#1980)

* Updated hrms path (#1979)

updated hrms path

Co-authored-by: rachana-egov <[email protected]>

* removed commented code

* fixed usermanagement toast issue (#1982)

* removed commented code

* Added core ui build to check performance

* Fixed error issue (#1983)

* updated the package version of campaign manager modules

* adding utils and remove hardcoding module name (#1984)

* adding utils and remove hardcoding module name

* Update UICustomizations.js

* Update index.js

---------

Co-authored-by: NabeelAyubee <[email protected]>
Co-authored-by: Jagankumar <[email protected]>

* added title for all buttons (#1985)

* updated package versions

* filtering fixes (#1986)

Co-authored-by: NabeelAyubee <[email protected]>

* Updated the config for the core app

* updated directory

* Feature/hcmpre1418 (#1988)

rounding off to nearest integer in attributes

* formatted

* Update health/micro-ui/web/core/install-deps.sh

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update health/micro-ui/web/core/install-deps.sh

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* updated changeQueryName for planfacilityserach as residingBoundaries … (#1989)

* updated changeQueryName for planfacilityserach as residingBoundaries is changed to multiselect dropdown

* fixed length change issue

* fixed page responsiveness issue for formula configuration screen (#1990)

* clearing console (#1991)

Co-authored-by: NabeelAyubee <[email protected]>

* fixed rerendering of summary screen in update dates (#1992)

---------

Co-authored-by: Swathi-eGov <[email protected]>
Co-authored-by: Bhavya-egov <[email protected]>
Co-authored-by: rachana-egov <[email protected]>
Co-authored-by: rachana-egov <[email protected]>
Co-authored-by: abishekTa-egov <[email protected]>
Co-authored-by: ashish-egov <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: nabeelmd-eGov <[email protected]>
Co-authored-by: NabeelAyubee <[email protected]>
Co-authored-by: suryansh-egov <[email protected]>
Co-authored-by: Nipun Arora <[email protected]>
Co-authored-by: Swathi-eGov <[email protected]>
Co-authored-by: Shashwat Mishra <[email protected]>
Co-authored-by: Anuraj <[email protected]>
Co-authored-by: Bhavya-egov <[email protected]>
@nabeelmd-eGov nabeelmd-eGov mentioned this pull request Dec 10, 2024
@coderabbitai coderabbitai bot mentioned this pull request Dec 17, 2024
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