-
Notifications
You must be signed in to change notification settings - Fork 20
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
Po finding fixes2 #1845
Po finding fixes2 #1845
Conversation
Caution Review failedThe pull request is closed. 📝 Walkthrough📝 WalkthroughWalkthroughThe changes in this pull request introduce several enhancements to the user interface and functionality within the microplan module. Key updates include the integration of a new tooltip component for displaying residing boundaries, the addition of a facility search request method, and modifications to various component rendering logic. CSS styles have been added to improve layout, while several components have been adjusted to enhance user interactions and feedback mechanisms. Overall, these modifications aim to refine the user experience related to facility mapping and activity selection. Changes
Possibly related PRs
Suggested reviewers
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? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
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)
Other keywords and placeholders
CodeRabbit Configuration File (
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 10
🧹 Outside diff range comments (6)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/ConfirmationPopUp.js (1)
Line range hint
8-81
: Consider the following improvements to enhance component robustness:
- The
comment
state is declared but never used. Consider removing it if not needed.- Add a loading indicator during submission for better UX.
- Consider implementing an error boundary for better error handling.
- Add cleanup for toast state on component unmount.
Here's a suggested implementation:
const ConfirmationPopUp = ({ onClose, alertHeading, alertMessage, submitLabel, url, requestPayload, onSuccess, onError, cancelLabel }) => { const { t } = useTranslation(); - const [comment, setComment] = useState(null); const [showToast, setShowToast] = useState(null); const [isSubmitting, setIsSubmitting] = useState(false); + + useEffect(() => { + return () => { + // Cleanup toast state on unmount + setShowToast(null); + }; + }, []); // Rest of the implementation... return ( <> <PopUp type="alert" onClose={onClose} alertMessage={alertMessage} alertHeading={alertHeading} onOverlayClick={onClose} equalWidthButtons={true} + children={isSubmitting && ( + <div className="loading-indicator"> + <Loader /> + </div> + )} footerChildren={[ // ... existing buttons ]} /> {/* ... existing toast */} </> ); }; + +// Error boundary wrapper +const ConfirmationPopUpWithErrorBoundary = (props) => ( + <ErrorBoundary fallback={<div>Something went wrong</div>}> + <ConfirmationPopUp {...props} /> + </ErrorBoundary> +); + +export default ConfirmationPopUpWithErrorBoundary;health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/FacilityCatchmentMapping.js (1)
Line range hint
201-217
: Consider extracting workflow logic to a custom hook.The workflow update logic and navigation handling could be moved to a custom hook for better separation of concerns and reusability.
Consider creating a hook like this:
const useFacilityAssignmentWorkflow = (planObject) => { const history = useHistory(); const { t } = useTranslation(); const updateWorkflow = () => ({ ...planObject, workflow: { ...planObject?.workflow, action: "FINALIZE_CATCHMENT_MAPPING", }, }); const handleSuccess = (data) => { history.push(`/${window.contextPath}/employee/microplan/village-finalise-success`, { fileName: data?.PlanConfiguration?.[0]?.name, message: t(`VILLAGE_ASSIGNED_TO_FACILITIES_SUCCESSFUL`), back: t(`GO_BACK_TO_HOME`), backlink: `/${window.contextPath}/employee` }); }; return { updateWorkflow, handleSuccess }; };health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/ChooseActivity.js (1)
Line range hint
70-99
: Consider implementing a centralized i18n configurationThe systematic removal of translations across all activities suggests a need for a more robust i18n strategy. Consider:
- Implementing a centralized translation management system
- Adding i18n key validation during the build process
- Creating a shared constants file for all translation keys
- Adding type safety for translation keys using TypeScript
This will help maintain consistency and catch missing translations early in the development cycle.
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js (3)
Line range hint
432-472
: Consider memoizing table columns definitionThe table columns configuration is recreated on every render. Consider using useMemo to optimize performance.
-const columns = [ +const columns = useMemo(() => [ { name: t(`INBOX_VILLAGE`), cell: (row) => ( <div style={{ display: "flex", alignItems: "center", gap: ".5rem" }}> <span>{t(`${row?.village}`)}</span> <VillageHierarchyTooltipWrapper boundaryCode={row?.village} /> </div> ), sortable: true, width: "180px", }, // ... other columns -]; +], [t, getSecurityDetailsColumns, getAdditionalFieldsColumns, getResourceColumns]);
Line range hint
182-196
: Consider combining related state updatesMultiple state updates in the useEffect could be combined to reduce renders.
useEffect(() => { if (planWithCensus) { - setCensusData(planWithCensus?.censusData); - setTotalRows(planWithCensus?.TotalCount); const reorderedStatusCount = Object.fromEntries( Object.entries(planWithCensus?.StatusCount || {}).sort(([keyA], [keyB]) => { if (keyA === "PENDING_FOR_VALIDATION") return -1; if (keyB === "PENDING_FOR_VALIDATION") return 1; return 0; }) ); - setActiveFilter(reorderedStatusCount); - setVillagesSelected(0); - setSelectedRows([]); + setState(prev => ({ + ...prev, + censusData: planWithCensus?.censusData, + totalRows: planWithCensus?.TotalCount, + activeFilter: reorderedStatusCount, + villagesSelected: 0, + selectedRows: [] + })); } }, [planWithCensus, selectedFilter, activeLink]);
Line range hint
638-641
: Enhance error handling with more specific error messagesThe error handling could be more specific and provide better guidance to users.
onError={(data) => { closePopUp(); - setShowToast({ key: "error", label: t(error?.response?.data?.Errors?.[0]?.code) }); + const errorCode = error?.response?.data?.Errors?.[0]?.code; + const errorMessage = error?.response?.data?.Errors?.[0]?.message; + setShowToast({ + key: "error", + label: t(errorCode || 'UNKNOWN_ERROR'), + labelParams: { details: errorMessage }, + transitionTime: 5000 + }); }}
📜 Review details
Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
📒 Files selected for processing (10)
health/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js
(1 hunks)health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/microplanInbox.scss
(1 hunks)health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/Module.js
(2 hunks)health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/ActivityCard.js
(3 hunks)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/configs/UICustomizations.js
(1 hunks)health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/ChooseActivity.js
(1 hunks)health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/FacilityCatchmentMapping.js
(1 hunks)health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js
(2 hunks)health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js
(7 hunks)
🧰 Additional context used
📓 Path-based instructions (9)
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/Module.js (1)
Pattern **/*.js
: check
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/ActivityCard.js (1)
Pattern **/*.js
: check
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/configs/UICustomizations.js (1)
Pattern **/*.js
: check
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/ChooseActivity.js (1)
Pattern **/*.js
: check
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/FacilityCatchmentMapping.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/components/ActivityCard.js (2)
Learnt from: Ramkrishna-egov
PR: egovernments/DIGIT-Frontend#1545
File: health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/ActivityCard.js:30-35
Timestamp: 2024-11-12T10:40:17.779Z
Learning: In our codebase, the 'Card' component is commonly used by passing children via the 'children' prop.
Learnt from: Ramkrishna-egov
PR: egovernments/DIGIT-Frontend#1545
File: health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/ActivityCard.js:1-1
Timestamp: 2024-11-10T20:01:49.000Z
Learning: In `ActivityCard.js`, `React.Fragment` is used in the code.
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.
🪛 Biome
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js
[error] 709-711: Missing key property for this element in iterable.
The order of the items may change, and having a key can help React identify which item was moved.
Check the React documentation.
(lint/correctness/useJsxKeyInIterable)
🔇 Additional comments (18)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/ActivityCard.js (3)
4-5
: LGTM! Import statements are properly structured.
The new imports for InfoIconOutline and TooltipWrapper are correctly added from their respective DIGIT UI packages.
53-54
: LGTM! Layout structure is well-organized.
The placement of icon and label after the tooltip provides a clear visual hierarchy.
29-32
: Verify the Card styling changes align with design system.
The removal of justifyContent
and setting padding
to 0 might affect content spacing. Please ensure these changes:
- Maintain proper vertical content alignment without
justifyContent: "center"
- Provide adequate spacing for card content with
padding: "0px"
✅ Verification successful
Let me try a different approach to find styling patterns and design system references. The previous regex had syntax issues.
Based on the search results, I can now generate a final response regarding the Card styling changes.
Card styling changes appear to be consistent with design patterns
The removal of justifyContent: "center"
and setting padding: "0px"
aligns with the codebase patterns where:
- Cards often use flexible alignment based on content needs rather than enforcing center alignment
- Zero padding is commonly used when the card's content handles its own spacing or when the card acts as a container for other styled components
Looking at similar components in the codebase:
- Many cards use specific padding values or no padding based on their content requirements
- Vertical alignment is often handled by the child components rather than the card container
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Search for other Card components' styling patterns
rg -U "Card.*style.*=.*{[\s\S]*?}" --type js
Length of output: 172
Script:
#!/bin/bash
# Search for Card styling patterns with proper regex
rg -U 'Card.*style.*=.*\{[^}]*\}' --type js
# Also search for any design system related files
fd -e js -e ts design-system
Length of output: 51092
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/ConfirmationPopUp.js (2)
49-49
: LGTM! Prop correctly passed to PopUp component.
The alertHeading
prop is properly forwarded to the underlying PopUp component.
5-5
: Verify all usages of ConfirmationPopUp component.
The component signature has been updated to include the alertHeading
prop. Let's ensure all component usages are updated accordingly.
✅ Verification successful
All usages of ConfirmationPopUp component have been updated with the alertHeading prop
The verification shows that all three usages of the ConfirmationPopUp component in the codebase:
- PlanInbox.js
- PopInbox.js
- FacilityCatchmentMapping.js
have been properly updated to include the new alertHeading
prop with appropriate translation keys.
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Description: Find all usages of ConfirmationPopUp component to verify they include the new alertHeading prop
# Search for ConfirmationPopUp component usage
rg -l "ConfirmationPopUp" | while read -r file; do
if [[ "$file" != *"ConfirmationPopUp.js"* ]]; then
echo "=== $file ==="
rg -A 5 "<ConfirmationPopUp" "$file"
fi
done
Length of output: 3054
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/Module.js (2)
98-98
: LGTM! Component properly registered.
The VillageHierarchyTooltipWrapper
component is correctly registered in the componentsToRegister
object, maintaining alphabetical order with other UI components.
37-37
: LGTM! Verify component existence.
The import statement follows the established pattern and uses correct relative path syntax.
✅ Verification successful
Component exists at the expected location ✓
The VillageHierarchyTooltipWrapper
component is correctly placed in the components directory and matches the relative import path used in Module.js
.
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Verify the VillageHierarchyTooltipWrapper component exists
fd "VillageHierarchyTooltipWrapper.js" --type f
Length of output: 162
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/FacilityCatchmentMapping.js (2)
203-203
: LGTM! The alertHeading addition improves user feedback.
The new prop enhances the confirmation popup by providing a clear, translated heading for the facility-to-village assignment finalization.
Line range hint 1-220
: Consider component decomposition and error handling improvements.
The component has grown complex with multiple responsibilities. Consider these architectural improvements:
-
Break down into smaller components:
- SearchSection
- ActionSection
- PopupManager
-
Add proper error handling for API calls:
- planEmployeeError
- errorCampaign
- errorPlan
-
Optimize API calls:
- Consider using React Query's built-in caching
- Implement proper loading states for better UX
Let's verify the component's complexity:
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/ChooseActivity.js (1)
Line range hint 94-99
: Restore i18n translation for activity name
The activity name has been hardcoded, removing the translation function.
Apply this diff to restore i18n support:
- name: "GEOSPATIAL_MAP_VIEW",
+ name: t("GEOSPATIAL_MAP_VIEW"),
Let's verify that all these translation keys exist in the translation files:
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js (2)
532-533
: LGTM: Component registration looks good.
The VillageHierarchyTooltipWrapper component is properly imported from the ComponentRegistryService.
538-541
: 🧹 Nitpick (assertive)
Verify tooltip accessibility and styling.
The tooltip implementation looks good, but consider the following:
- The tooltip should be keyboard accessible for users relying on screen readers
- The gap of 0.5rem between text and tooltip might need adjustment based on UI/UX guidelines
Consider adding ARIA attributes for better accessibility:
-<VillageHierarchyTooltipWrapper boundaryCode={row?.residingBoundary}/>
+<VillageHierarchyTooltipWrapper
+ boundaryCode={row?.residingBoundary}
+ aria-label={`Additional information for ${row?.residingBoundary}`}
+/>
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js (1)
Line range hint 696-700
: LGTM! Clear and descriptive alert messages
The alert messages are well-structured and provide clear information to the user.
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js (4)
491-504
: LGTM! Well-structured button state management.
The getButtonState
function effectively manages button states based on filter and action combinations, making the UI behavior predictable and maintainable.
666-666
: LGTM! Dynamic submit label based on user role.
The submit label is correctly configured to display different text based on the user's role.
723-724
: LGTM! Clear and descriptive alert messages.
The alert heading and message are well-structured using translation keys for internationalization.
592-629
:
Add key prop to Button component in map function.
React requires a unique key prop for elements rendered in an array to optimize rendering and maintain component state correctly.
return (
<Button
+ key={`action-button-${index}`}
variation={isPrimary ? "primary" : "secondary"}
label={t(action.action)}
type="button"
onClick={() => handleActionClick(action.action)}
size="large"
icon={actionIconMap[action.action]?.icon}
isSuffix={actionIconMap[action.action]?.isSuffix}
/>
);
Likely invalid or redundant comment.
health/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js (1)
1224-1224
: LGTM: Component import for tooltip functionality.
The VillageHierarchyTooltipWrapper component is correctly imported from the component registry.
health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/microplanInbox.scss
Show resolved
Hide resolved
...th/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/ActivityCard.js
Show resolved
Hide resolved
...ro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/ChooseActivity.js
Show resolved
Hide resolved
...ro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/ChooseActivity.js
Show resolved
Hide resolved
...ro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/ChooseActivity.js
Show resolved
Hide resolved
...h/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js
Outdated
Show resolved
Hide resolved
...th/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js
Show resolved
Hide resolved
...th/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js
Show resolved
Hide resolved
...th/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PopInbox.js
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 2
🧹 Outside diff range comments (1)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/FacilityCatchmentMapping.js (1)
Line range hint
1-224
: Consider component decomposition for better maintainabilityThe component handles multiple responsibilities including data fetching, workflow state management, and UI rendering. Consider breaking it down into smaller, focused components:
- A container component for data fetching and state management
- Separate components for the search interface and results table
- A dedicated workflow management component
This would improve:
- Code maintainability
- Testing capabilities
- Reusability of individual components
🧰 Tools
🪛 Biome
[error] 116-116: Change to an optional chain.
Unsafe fix: Change to an optional chain.
(lint/complexity/useOptionalChain)
📜 Review details
Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
📒 Files selected for processing (1)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/FacilityCatchmentMapping.js
(2 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/FacilityCatchmentMapping.js (1)
Pattern **/*.js
: check
🪛 Biome
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/FacilityCatchmentMapping.js
[error] 116-116: Change to an optional chain.
Unsafe fix: Change to an optional chain.
(lint/complexity/useOptionalChain)
...micro-ui-internals/packages/modules/microplan/src/pages/employee/FacilityCatchmentMapping.js
Show resolved
Hide resolved
...micro-ui-internals/packages/modules/microplan/src/pages/employee/FacilityCatchmentMapping.js
Show resolved
Hide resolved
health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/microplanInbox.scss
Show resolved
Hide resolved
* fixed assumption audit fixes (#1758) * fixed draft issue of Setup campaign (#1757) Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> * Summary css fix (#1755) * updated css for summary screen * removed log * added null check --------- Co-authored-by: rachana-egov <rachana.singh@egovernment.org> * 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 <53823168+jagankumar-egov@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fix key (#1764) Co-authored-by: NabeelAyubee <nayubi7@gmail.com> * 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 <rachana.singh@egovernment.org> * Feature/bug (#1773) * z-index and camapaign-name in preview * ui-ux-demo-review * version updates * ver * Update ViewHierarchy.js --------- Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> * Updated the search dropdown (#1776) updated the search dropdown Co-authored-by: rachana-egov <rachana.singh@egovernment.org> * 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 <nayubi7@gmail.com> 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 <rachana.singh@egovernment.org> * 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 <nayubi7@gmail.com> * 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 <rachana.singh@egovernment.org> * 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 <53823168+jagankumar-egov@users.noreply.github.com> 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 <53823168+jagankumar-egov@users.noreply.github.com> 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 <rachana.singh@egovernment.org> * 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 <nayubi7@gmail.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * css fixes (#1792) Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> * 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 <nayubi7@gmail.com> 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 <rachana.singh@egovernment.org> * 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 <rachana.singh@egovernment.org> * demo issue fixes (#1797) Co-authored-by: rachana-egov <rachana.singh@egovernment.org> * 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 <nayubi7@gmail.com> 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 <nayubi7@gmail.com> 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 <rachana.singh@egovernment.org> Co-authored-by: Nipun Arora <aroranipun1@gmail.com> * 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 <aroranipun1@gmail.com> * 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 <nayubi7@gmail.com> 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 <rachana.singh@egovernment.org> * 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 <rachana.singh@egovernment.org> * 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 <rachana.singh@egovernment.org> * Added confirmation pop up to finalise actions (#1832) added confimation pop up to finalize actions Co-authored-by: rachana-egov <rachana.singh@egovernment.org> * 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 <53823168+jagankumar-egov@users.noreply.github.com> * 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 <aroranipun1@gmail.com> * 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 <rachana.singh@egovernment.org> Co-authored-by: Nipun Arora <aroranipun1@gmail.com> * Update searchSavedPlansWithCampaign.js (#1841) Co-authored-by: Nipun Arora <aroranipun1@gmail.com> * 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 <rachana.singh@egovernment.org> * 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 <rachana.singh@egovernment.org> * Summary user role tagging and Response Screen (#1852) * Changes ro userAccessTableWrapper * Response Screen * comment removed * minor updates (#1853) Co-authored-by: Nipun Arora <aroranipun1@gmail.com> * 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 <nayubi7@gmail.com> * added serving facility (#1860) Co-authored-by: NabeelAyubee <nayubi7@gmail.com> * updated code (#1861) * Formcomposer action bar fixes (#1862) * added serving facility * form composer action bar fix --------- Co-authored-by: NabeelAyubee <nayubi7@gmail.com> * 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 <nayubi7@gmail.com> * 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 <nayubi7@gmail.com> * 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 <nayubi7@gmail.com> * 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 <aroranipun1@gmail.com> * 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 <aroranipun1@gmail.com> * 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 <nayubi7@gmail.com> * patch fix (#1868) * route back to home on back * fixed refresh issue for pop inbox --------- Co-authored-by: rachana-egov <rachana.singh@egovernment.org> * polling fix (#1870) * polling fix * Update TimelineComponent.js * assumptions fixes (#1871) Co-authored-by: Nipun Arora <aroranipun1@gmail.com> * 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 <rachana.singh@egovernment.org> * Update PopInbox.js (#1875) Co-authored-by: Nipun Arora <aroranipun1@gmail.com> * scroll (#1876) Co-authored-by: Nipun Arora <aroranipun1@gmail.com> * 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 <nayubi7@gmail.com> * 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 <rachana.singh@egovernment.org> * 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 <aroranipun1@gmail.com> * Added count of villages and facilities in confirmation messages (#1885) Co-authored-by: rachana-egov <rachana.singh@egovernment.org> * Update UserUpload.js (#1886) * fixed localization issue (#1888) Co-authored-by: rachana-egov <rachana.singh@egovernment.org> * 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 <rachana.singh@egovernment.org> * 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 <nayubi7@gmail.com> * 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 <nayubi7@gmail.com> * 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 <aroranipun1@gmail.com> * Bug fix (#1900) * fixed decimal issue and total not getting validated issue * fixed user tagging multiselect dropdown issue --------- Co-authored-by: rachana-egov <rachana.singh@egovernment.org> * 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 <rachana.singh@egovernment.org> Co-authored-by: Nipun Arora <aroranipun1@gmail.com> * validations done for assumptions and formula (#1906) Co-authored-by: Nipun Arora <aroranipun1@gmail.com> * 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 <swathi.chatrathi@egovernments.org> * 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 <aroranipun1@gmail.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Pop inbox Pagination fix (#1907) Co-authored-by: rachana-egov <rachana.singh@egovernment.org> * Facility Pagination Fix (#1908) Co-authored-by: rachana-egov <rachana.singh@egovernment.org> * Feature/er (#1914) * wait and retry message * type of structure changed for irs * fixed plan inbox issues (#1915) Co-authored-by: rachana-egov <rachana.singh@egovernment.org> * 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 <rachana.singh@egovernment.org> * Fixed Audit issues (#1918) Co-authored-by: rachana-egov <rachana.singh@egovernment.org> * removed alphanumeric valiadtion (#1922) Co-authored-by: Nipun Arora <aroranipun1@gmail.com> * 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 <rachana.singh@egovernment.org> * 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 <rachana.singh@egovernment.org> * Fixed small issues (#1927) Co-authored-by: rachana-egov <rachana.singh@egovernment.org> * 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 <aroranipun1@gmail.com> * 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 <aroranipun1@gmail.com> * fixed pop issue (#1934) Co-authored-by: rachana-egov <rachana.singh@egovernment.org> * css fix on card comp (#1935) * Updated the campaign Card for the roles mapping * Fixed screen breaking issue (#1936) Co-authored-by: rachana-egov <rachana.singh@egovernment.org> * 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 <rachana.singh@egovernment.org> * 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 <rachana.singh@egovernment.org> * 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 <aroranipun1@gmail.com> * Update createUpdatePlanProject.js (#1948) Co-authored-by: Nipun Arora <aroranipun1@gmail.com> * 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 <rachana.singh@egovernment.org> * 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 <rachana.singh@egovernment.org> * 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 <rachana.singh@egovernment.org> * 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 <aroranipun1@gmail.com> * Updated the loader text, updated the icon information, change log updated * fixed error message issue (#1964) Co-authored-by: rachana-egov <rachana.singh@egovernment.org> * 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 <53823168+jagankumar-egov@users.noreply.github.com> 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 <53823168+jagankumar-egov@users.noreply.github.com> * 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 <53823168+jagankumar-egov@users.noreply.github.com> * 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 <rachana.singh@egovernment.org> * 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 <nayubi7@gmail.com> Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> * added title for all buttons (#1985) * updated package versions * filtering fixes (#1986) Co-authored-by: NabeelAyubee <nayubi7@gmail.com> * 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 <nayubi7@gmail.com> * fixed rerendering of summary screen in update dates (#1992) --------- Co-authored-by: Swathi-eGov <137176788+Swathi-eGov@users.noreply.github.com> Co-authored-by: Bhavya-egov <137176879+Bhavya-egov@users.noreply.github.com> Co-authored-by: rachana-egov <137176770+rachana-egov@users.noreply.github.com> Co-authored-by: rachana-egov <rachana.singh@egovernment.org> Co-authored-by: abishekTa-egov <abishek.t@egovernments.org> Co-authored-by: ashish-egov <137176738+ashish-egov@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.org> Co-authored-by: NabeelAyubee <nayubi7@gmail.com> Co-authored-by: suryansh-egov <suryansh.singh@egovernments.org> Co-authored-by: Nipun Arora <aroranipun1@gmail.com> Co-authored-by: Swathi-eGov <swathi.chatrathi@egovernments.org> Co-authored-by: Shashwat Mishra <71879793+shashwat-egov@users.noreply.github.com> Co-authored-by: Anuraj <154124191+anuraj-egov@users.noreply.github.com> Co-authored-by: Bhavya-egov <bhavya.mangal@egovernments.org>
Summary by CodeRabbit
Release Notes
New Features
VillageHierarchyTooltipWrapper
for enhanced display of residing boundaries.getFacilitySearchRequest
method for improved facility search capabilities..select-activity-info
for better layout in activity cards.ConfirmationPopUp
to include an additionalalertHeading
for clearer context.Improvements
PlanInbox
with specific action messages in notifications.PopInbox
based on user roles and actions.Bug Fixes