-
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
Fixed Audit issues #1918
Fixed Audit issues #1918
Conversation
📝 WalkthroughWalkthroughThe changes in this pull request primarily involve updates to various components of the health micro-UI. Key modifications include updating the stylesheet link in HTML files, enhancing SCSS styles for layout and responsiveness, and adjusting properties of button components across multiple JavaScript files. Additionally, several components have seen improvements in state management, rendering logic, and error handling, particularly in relation to user interactions and data presentation. Changes
Poem
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: 3
🧹 Outside diff range comments (17)
health/micro-ui/web/micro-ui-internals/example/public/index.html (2)
Line range hint
11-16
: Add subresource integrity (SRI) hashes for CDN resourcesThe CSS files are loaded from unpkg.com without SRI hashes, which poses a security risk if the CDN is compromised. Consider adding integrity attributes to the link tags.
Example fix for one of the CSS imports:
- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.46/dist/index.css" /> + <link + rel="stylesheet" + href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.46/dist/index.css" + integrity="sha384-[HASH]" + crossorigin="anonymous" + />
Line range hint
1-32
: Optimize resource loading for better performanceConsider the following performance improvements:
- Add preconnect hints for the unpkg.com domain
- Consider consolidating multiple CSS files from the same CDN
Example implementation:
<meta charset="utf-8" /> + <link rel="preconnect" href="https://unpkg.com"> + <link rel="preconnect" href="https://fonts.googleapis.com"> <link rel="icon" href="https://egov-dev-assets.s3.ap-south-1.amazonaws.com/browser-icon.png" />health/micro-ui/web/public/index.html (1)
Line range hint
9-13
: Consider enhancing security for CDN resourcesWhile using fixed versions from unpkg.com is good for stability, consider these security improvements:
- Add integrity hashes for CDN resources to prevent tampering
- Consider consolidating CSS files from the same CDN to reduce network requests
- Implement a fallback mechanism in case the CDN is unavailable
Example implementation with integrity hash:
- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.46/dist/index.css" /> + <link + rel="stylesheet" + href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.46/dist/index.css" + integrity="sha384-[HASH]" + crossorigin="anonymous" + onerror="this.onerror=null;this.href='[FALLBACK_URL]';" + />health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/AssigneeChips.js (1)
Line range hint
1-57
: Consider these improvements for better maintainability.
- Move inline button styles to a CSS class to improve maintainability and consistency.
- Consider making the text truncation length (64 characters) configurable via props.
- Add prop-types validation for better type safety.
Example refactor for the button styles:
+ // Add to your CSS file + .more-button { + height: 2rem; + min-height: 2rem; + padding: 0.5rem; + min-width: 0px; + justify-content: center; + align-items: center; + } + + .more-button-text { + height: auto; + font-size: 0.875rem; + font-weight: 400; + width: 100%; + line-height: 16px; + color: #C84C0E; + } <Button label={`+${assignees.length - 1} ${t("ES_MORE")}`} onClick={() => setShowPopUp(true)} variation="link" - style={{ - height: "2rem", - minHeight: "2rem", - padding: "0.5rem", - minWidth: "0px", - justifyContent: "center", - alignItems: "center", - }} - textStyles={{ - height: "auto", - fontSize: "0.875rem", - fontWeight: "400", - width: "100%", - lineHeight: "16px", - color: "#C84C0E", - }} + className="more-button" + textClassName="more-button-text" />health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/subBoundaryView.js (2)
Line range hint
29-35
: Consider enhancing button accessibility.The edit button could benefit from improved accessibility attributes.
<Button label={t("WBH_EDIT")} variation="secondary" size="medium" icon={"Edit"} type="button" + aria-label={t("WBH_EDIT")} + role="button" onClick={(e) => { editHandler(); }} />
Line range hint
54-71
: Consider moving inline styles to CSS for better maintainability.The "Show More" button contains extensive inline styles that could be moved to a CSS class.
Consider creating a CSS class in your stylesheet:
.show-more-button { height: 2rem; min-width: 4.188rem; min-height: 2rem; padding: 0.5rem; justify-content: center; align-items: center; } .show-more-button-text { height: auto; font-size: 0.875rem; font-weight: 400; width: 100%; line-height: 16px; color: #C84C0E; }Then simplify the button:
<Button label={`+${arr?.length - (10)} ${t("ES_MORE")}`} onClick={() => openPopUp()} variation="link" - style={{ - height: "2rem", - minWidth: "4.188rem", - minHeight: "2rem", - padding: "0.5rem", - justifyContent: "center", - alignItems: "center", - }} - textStyles={{ - height: "auto", - fontSize: "0.875rem", - fontWeight: "400", - width: "100%", - lineHeight: "16px", - color: "#C84C0E", - }} + className="show-more-button" + textClassName="show-more-button-text" />health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfigScreen.js (1)
Line range hint
18-28
: Consider enhancing error handling and cleanupThe useEffect hook could benefit from:
- Error handling for failed data loading scenarios
- Cleanup function to prevent memory leaks
Consider updating the effect like this:
useEffect(() => { + let isSubscribed = true; if (planConfigurations && planConfigurations.length > 0) { const tempDic = {}; planConfigurations.forEach((ob) => { if (!tempDic[ob.category]) { tempDic[ob.category] = [{ ...ob }]; } else { tempDic[ob.category].push({ ...ob }); } }); - setDictionary(tempDic); + if (isSubscribed) { + setDictionary(tempDic); + } } + return () => { + isSubscribed = false; + }; }, [planConfigurations, customProps]);health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/DataMgmtComponent.js (2)
Line range hint
11-19
: Remove commented debug codeConsider removing the commented-out console.log and object structure as they don't provide value in production code.
- // console.log("totalfiles", uploadedFiles); - // { - // "filestoreId": "695334cb-5813-4892-a282-a46c075f0798", - // "resourceId": "8650d05f-92dc-4410-b96b-29b39876f7c5", - // "facilityname": "Population Template (19).xlsx", - // "type": "boundaryWithTarget", - // "inputFileType": "xlsx", - // "templateIdentifier": "Population" - // }
Line range hint
54-117
: Consider reducing code duplication in download handlersThe downloadHandler logic is duplicated between the population and facilities sections. Consider extracting this into a reusable function.
+ const createDownloadHandler = (fileStoreId, fileName) => () => { + Digit.Utils.campaign.downloadExcelWithCustomName({ + fileStoreId, + customName: String(fileName) + }); + }; // Then use it like: downloadHandler={createDownloadHandler(item?.filestoreId, fileName)}health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/AssumptionsList.js (1)
Line range hint
1-109
: Consider these code quality improvements
- Extract "MIXED" as a constant
- Simplify campaignAssumption object construction
- Move orderedKeys outside component
- Use Fragment with key prop instead of empty tags
+const DISTRIBUTION_STRATEGY = { + MIXED: "MIXED" +}; + +const ORDERED_KEYS = [ + "selectedRegistrationProcess", + "selectedDistributionProcess", + "selectedRegistrationDistributionMode" +]; + const AssumptionsList = ({ customProps, setupCompleted }) => { // ... existing code ... - if(campaign_dist!="MIXED"){ + if(campaign_dist !== DISTRIBUTION_STRATEGY.MIXED){ // ... existing code ... } - const orderedKeys = ["selectedRegistrationProcess", "selectedDistributionProcess", "selectedRegistrationDistributionMode"]; return ( // ... existing code ... - {orderedKeys.map((key, index) => { + {ORDERED_KEYS.map((key, index) => { return ( - <> + <Fragment key={key}> <LabelFieldPair> // ... existing code ... </LabelFieldPair> - </> + </Fragment> ); })} ); };health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/CampaignBoundary.js (3)
Line range hint
19-186
: Remove commented-out code blockThe large commented-out
selectedData
array should be removed as it appears to be test data that's no longer needed. This will improve code maintainability and readability.
Line range hint
1-449
: Consider component decomposition for better maintainabilityThe component has grown complex with multiple responsibilities:
- Boundary hierarchy management
- Status management
- View more/less functionality
- Complex conditional rendering
Consider breaking it down into smaller, more focused components:
- BoundaryHierarchyManager - for hierarchy and status management
- BoundaryList - for rendering the boundary items
- ViewMoreToggle - for handling view more/less functionality
This would improve:
- Code maintainability
- Testing capabilities
- Reusability
- Performance optimization opportunities
Would you like me to help create a detailed plan for this refactoring?
Line range hint
341-394
: Simplify conditional rendering logicThe nested conditional rendering with multiple checks could be simplified. Consider extracting the rendering logic into separate methods or components, and using early returns to reduce nesting.
Example approach:
const renderBoundaryItem = (item1, idx) => { if (!Array.isArray(parents?.[item1])) return null; const shouldRender = !boundaryStatus?.[ind + 2] || (boundaryStatus?.[ind + 2] && (idx === 0 || idx === 1)); if (!shouldRender) return null; return ( <SubBoundaryView style={{ gap: "1.5rem", marginBottom: "0px" }} key={`${item1}_${idx}`} title={item1} arr={parents?.[item1]} /> ); };health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js (1)
Line range hint
273-279
: Consider adding debounce to search functionThe removal of length validation might lead to excessive API calls. Consider implementing debounce to optimize performance.
const handleSearch = (query) => { - // if (query?.length >= 2) { setSearchQuery(query); - // } else { - // setSearchQuery(null); - // } - // Handle search logic, such as filtering or API calls }; +const debouncedHandleSearch = Digit.Utils.debounce((query) => { + setSearchQuery(query); +}, 300);health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/RoleTableComposer.js (3)
Line range hint
432-442
: Consider improving the phone number sorting implementationThe current implementation might not handle international phone number formats correctly. Consider using a more robust phone number parsing approach.
sortFunction: (rowA, rowB) => { - const numberA = parseInt(rowA.number, 10); - const numberB = parseInt(rowB.number, 10); - if (isNaN(numberA)) return 1; // Treat invalid numbers as larger - if (isNaN(numberB)) return -1; - - if (numberA < numberB) return -1; - if (numberA > numberB) return 1; + // Handle cases where either number is NA + if (!rowA.number || rowA.number === t("NA")) return 1; + if (!rowB.number || rowB.number === t("NA")) return -1; + + // Remove any non-numeric characters and compare + const cleanNumberA = rowA.number.replace(/\D/g, ''); + const cleanNumberB = rowB.number.replace(/\D/g, ''); + return cleanNumberA.localeCompare(cleanNumberB); return 0; }
Line range hint
365-392
: Enhance error handling in employee assignmentWhile the error handling is implemented, it could be more specific to help users better understand and resolve issues.
planEmployeeCreate(payload, { onSuccess: (data) => { queryClient.invalidateQueries("PLAN_SEARCH_EMPLOYEE_WITH_TAGGING"); refetchHrms(); setIsLoading(false); setShowToast({ key: "success", label: t("ASSIGNED_SUCCESSFULLY") }); }, onError: (error, variables) => { setIsLoading(false); - setShowToast({ key: "error", label: error?.message ? error.message : t("FAILED_TO_UPDATE_RESOURCE") }); + const errorMessage = error?.response?.data?.Errors?.[0]?.message + || error?.message + || t("FAILED_TO_UPDATE_RESOURCE"); + setShowToast({ + key: "error", + label: t(errorMessage), + transitionTime: 5000 + }); }, });
Line range hint
577-583
: Add cleanup for toast timeouts to prevent memory leaksThe current implementation should clean up the timeout when the component unmounts or when the toast state changes.
useEffect(() => { if (showToast) { - setTimeout(closeToast, 5000); + const timeoutId = setTimeout(closeToast, 5000); + return () => clearTimeout(timeoutId); } }, [showToast]);
📜 Review details
Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
⛔ Files ignored due to path filters (1)
health/micro-ui/web/micro-ui-internals/packages/css/package.json
is excluded by!**/*.json
📒 Files selected for processing (13)
health/micro-ui/web/micro-ui-internals/example/public/index.html
(1 hunks)health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss
(1 hunks)health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/AssigneeChips.js
(2 hunks)health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/AssumptionsList.js
(2 hunks)health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/CampaignBoundary.js
(1 hunks)health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/DataMgmtComponent.js
(4 hunks)health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfigScreen.js
(2 hunks)health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/PopInboxTable.js
(0 hunks)health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/RoleTableComposer.js
(1 hunks)health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js
(1 hunks)health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/subBoundaryView.js
(1 hunks)health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js
(0 hunks)health/micro-ui/web/public/index.html
(1 hunks)
💤 Files with no reviewable changes (2)
- health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/PopInboxTable.js
- health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js
🧰 Additional context used
📓 Path-based instructions (8)
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/AssigneeChips.js (1)
Pattern **/*.js
: check
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/AssumptionsList.js (1)
Pattern **/*.js
: check
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/CampaignBoundary.js (1)
Pattern **/*.js
: check
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/DataMgmtComponent.js (1)
Pattern **/*.js
: check
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfigScreen.js (1)
Pattern **/*.js
: check
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/RoleTableComposer.js (1)
Pattern **/*.js
: check
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js (1)
Pattern **/*.js
: check
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/subBoundaryView.js (1)
Pattern **/*.js
: check
📓 Learnings (1)
health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss (1)
Learnt from: siddhant-nawale-egov
PR: egovernments/DIGIT-Frontend#876
File: micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss:1940-2392
Timestamp: 2024-11-10T20:01:49.000Z
Learning: Classes related to interactive elements in the microplan preview section are mostly passed to Higher Order Components (HOCs), and ARIA attributes for non-HOC elements will be managed directly by adding them where necessary.
🔇 Additional comments (16)
health/micro-ui/web/micro-ui-internals/example/public/index.html (1)
15-15
: Verify the changes in version 0.1.46
The CSS version bump from 0.1.45 to 0.1.46 needs verification to ensure it addresses the audit issues mentioned in the PR title.
health/micro-ui/web/public/index.html (1)
13-13
: LGTM! Verify the changelog for version 0.1.46
The CSS version update appears to be related to fixing audit issues.
Let's verify the changes in this version:
✅ Verification successful
Let me try another approach to verify the version update by checking the repository for any changelog or commit history related to this package.
Let's check the content of the changelog files and package.json we found to understand the version update.
Let's check for any recent commits or pull requests that might explain the version bump to 0.1.46, since the changelog isn't up to date.
Let's check the specific PR content since we found relevant audit-related PRs.
Based on all the gathered information, I can now provide the final response:
Version update is part of UI/UX audit fixes
The version bump from 0.1.45 to 0.1.46 is part of PR #1758 "fixed assumption audit fixes" which includes:
- CSS improvements for better spacing and alignment
- Enhanced responsiveness and layout consistency
- Updates to microplanning and formula config styles
- Loading animation improvements
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Description: Check the package details and recent versions
# Note: This will help understand what changes were included in 0.1.46
# Get package information from npm
curl -s https://registry.npmjs.org/@egovernments/digit-ui-health-css | jq '.versions["0.1.46"].description, .versions["0.1.46"].time'
# Check for recent versions and their publish dates
curl -s https://registry.npmjs.org/@egovernments/digit-ui-health-css | jq '.time | with_entries(select(.key|match("0.1.4[5-9]")))'
Length of output: 321
Script:
#!/bin/bash
# Search for changelog files or documentation about this package
fd -t f -e md -e txt changelog -i
fd -t f -e md -e txt changes -i
# Search for any references to this package version in the codebase
rg -i "digit-ui-health-css.*0\.1\.4[56]" --type md --type txt
# Look for package.json files that might reference this package
fd package.json --exec grep -l "digit-ui-health-css" {}
Length of output: 356
Script:
#!/bin/bash
# Check the changelog files
echo "=== Web Changelog ==="
cat health/micro-ui/web/CHANGELOG.md
echo -e "\n=== CSS Package Changelog ==="
cat health/micro-ui/web/micro-ui-internals/packages/css/CHANGELOG.md
echo -e "\n=== Package.json ==="
cat health/micro-ui/web/micro-ui-internals/packages/css/package.json
Length of output: 2264
Script:
#!/bin/bash
# Look for recent commits related to the CSS package
git log --since="2024-11-01" --grep="css\|audit" --oneline health/micro-ui/web/micro-ui-internals/packages/css/
# Check for any dependency updates in package.json
git log --since="2024-11-01" -p health/micro-ui/web/micro-ui-internals/packages/css/package.json
# Look for recent PRs mentioning audit fixes
gh pr list --search "audit css" --state merged --limit 5
Length of output: 461
Script:
#!/bin/bash
# Check the content of the most relevant PR
gh pr view 1758 --json title,body,files
# Also check the specific PR that might have introduced this version bump
git log -p --since="2024-11-01" health/micro-ui/web/public/index.html
Length of output: 1665
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/AssigneeChips.js (2)
11-11
: LGTM! Style simplification looks good.
The simplified style declaration maintains the intended layout while removing redundant properties.
28-28
: Skip reviewing this formatting change.
This is a minor formatting change that doesn't affect functionality.
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/subBoundaryView.js (1)
29-29
: LGTM! Button size property addition is consistent with audit fixes.
The addition of size="medium"
aligns with the UI consistency improvements across components.
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfigScreen.js (2)
39-39
: LGTM: Margin adjustment improves UI density
The reduction in bottom margin helps in better space utilization while maintaining adequate visual separation.
55-55
: LGTM: Button size standardization improves UI consistency
Adding size="medium" aligns with the application-wide button standardization effort, improving overall UI consistency.
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/DataMgmtComponent.js (2)
24-24
: LGTM: Appropriate use of margin for better spacing
The addition of a wrapper div with consistent margin improves the component's visual spacing and layout.
88-88
: LGTM: Consistent button styling
The size="medium" prop matches the previous button, maintaining UI consistency throughout the component.
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/AssumptionsList.js (2)
44-44
: Verify spacing consistency across microplan components
The margin reduction might affect the visual hierarchy. Let's verify if this spacing is consistent with other components.
✅ Verification successful
Margin adjustment is consistent with design patterns
The margin change from 2.5rem to 1.5rem aligns with the established spacing patterns in the microplan module. The codebase shows:
- Cards with content sections consistently use 1.5rem bottom margin (e.g., in
ActivityCard.js
,DataMgmtComponent.js
,FormulaConfigScreen.js
) - 2.5rem margin is primarily used for larger container blocks and wrapper components
- 1rem margin for headers and smaller elements
- 0rem for tight layouts and label-field pairs
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Search for similar margin patterns in other microplan components
rg -A 1 'marginBottom.*rem' health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/
Length of output: 12403
75-75
: LGTM! Button size standardization is consistent
The addition of size="medium"
aligns with similar updates across other components, improving UI consistency.
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/CampaignBoundary.js (1)
324-324
: LGTM: Button size property addition
The addition of size="medium"
property to the Button component improves UI consistency across the application.
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js (2)
260-262
: LGTM: Button styling standardization
The button styling changes improve UI consistency by standardizing the size prop and ensuring proper width alignment.
Line range hint 89-102
: LGTM: Improved error handling with user feedback
The error handling implementation properly manages state and provides clear feedback to users through toast notifications for both success and error cases.
health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/RoleTableComposer.js (1)
449-450
: LGTM! Button styling improvements enhance UI consistency
The addition of width and size properties aligns with the PR's audit fixes and maintains consistency with similar button components across the application.
health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss (1)
2622-2622
: 🛠️ Refactor suggestion
Ensure text remains accessible when preventing wrapping.
While white-space: nowrap
maintains clean aesthetics, it could cause accessibility issues if the text becomes too long and gets cut off, especially on mobile devices.
Consider adding text truncation with ellipsis for better handling of long text:
.kpi-card p {
margin: 0;
@extend .typography.heading-m;
color: theme(digitv2.lightTheme.text-secondary);
- white-space: nowrap;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ max-width: 100%;
}
...cro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/DataMgmtComponent.js
Show resolved
Hide resolved
health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss
Show resolved
Hide resolved
health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.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
New Features
Bug Fixes
UI Improvements