Feature/bug #1773
Feature/bug #1773
Conversation
|
Caution Review failedThe pull request is closed. 📝 WalkthroughWalkthroughThe changes in this pull request primarily involve updates to CSS stylesheets and modifications to various components within the application. Key updates include changing the version of a CSS file in HTML documents, enhancing styling properties in SCSS files, and adding new props to several React components to improve functionality and localization. Additionally, various components have undergone structural adjustments to improve user experience and maintainability. 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 (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Caution
Inline review comments failed to post. This is likely due to GitHub's limits when posting large numbers of comments.
🛑 Comments failed to post (42)
health/micro-ui/web/micro-ui-internals/example/public/index.html (3)
15-15: 🛠️ Refactor suggestion
Add integrity hash and fallback for the CDN resource.
The CSS is loaded from unpkg.com CDN without an integrity hash, which could pose a security risk. Additionally, there's no fallback if the CDN fails.
Apply this diff to add integrity hash and fallback:
- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.28/dist/index.css" /> + <link + rel="stylesheet" + href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.28/dist/index.css" + integrity="sha384-[HASH]" + crossorigin="anonymous" + onerror="this.onerror=null;this.href='/assets/digit-ui-health.css';" + />Note: Replace
[HASH]with the actual SHA-384 hash of the CSS file. You can generate it using:curl -s https://unpkg.com/@egovernments/digit-ui-health-css@0.1.28/dist/index.css | openssl dgst -sha384 -binary | openssl base64 -A
15-15: 🧹 Nitpick (assertive)
Consider using a more specific version range.
Using an exact version (0.1.28) without any version range could make it difficult to apply critical security patches automatically.
Consider using a version range that allows patch updates but prevents breaking changes:
- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.28/dist/index.css" /> + <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@~0.1.28/dist/index.css" />This will allow patches (0.1.x) but prevent minor version updates that might introduce breaking changes.
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@~0.1.28/dist/index.css" />
15-15: 💡 Codebase verification
Version 0.1.28 of the CSS package is not available
The updated version (0.1.28) of
@egovernments/digit-ui-health-csspackage does not exist on the unpkg CDN, resulting in a 404 error. This will break the application's styling when deployed.
- Revert the version update to 0.1.22 or verify the correct version number that should be used
- Ensure the package is properly published before updating the version in the code
🔗 Analysis chain
Verify the changes in the new CSS version.
The stylesheet version has been updated from 0.1.22 to 0.1.28. Since this is a patch version update, it should only contain bug fixes, but the PR summary suggests broader styling changes.
Let's verify the changes in this version:
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Compare the contents and size of both CSS versions to understand the scope of changes # Test: Download and compare both versions curl -s https://unpkg.com/@egovernments/digit-ui-health-css@0.1.22/dist/index.css -o v22.css curl -s https://unpkg.com/@egovernments/digit-ui-health-css@0.1.28/dist/index.css -o v28.css echo "Size comparison:" ls -l v22.css v28.css echo -e "\nDiff summary:" diff -u v22.css v28.css | diffstatLength of output: 531
Script:
#!/bin/bash # Let's examine the content of both CSS files to understand the changes echo "Content of v28.css:" cat v28.css echo -e "\nContent of v22.css (first few lines):" head -n 5 v22.css # Check if v28.css is a redirect or contains an error message curl -I https://unpkg.com/@egovernments/digit-ui-health-css@0.1.28/dist/index.cssLength of output: 1167
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/MobileChecklist.js (3)
15-17: 🛠️ Refactor suggestion
Improve header styling and remove commented code.
Several improvements can be made to enhance maintainability and readability:
- Move inline styles to CSS classes
- Add proper spacing between concatenated props
- Remove commented code
- <h2 className='mobile-checklist-highlight' style={{fontSize:"1.5rem"}}>{campaignName} {typeOfChecklist} {checklistRole}</h2> - {/* <h1 className="mobile-checklist-highlight">{checklistRole}</h1> */} - {/* <p className="mobile-description"></p> */} + <h2 className='mobile-checklist-highlight heading-large'> + {`${campaignName} - ${typeOfChecklist} - ${checklistRole}`} + </h2>Add this to your CSS:
.heading-large { font-size: 1.5rem; }
46-46: 🛠️ Refactor suggestion
Replace spacing div with CSS margin/padding.
Using an empty div for spacing is not a best practice. Additionally, the element should be self-closing.
- <div style={{height:"0.5rem"}}></div>Add margin/padding to the parent
.mobile-optionsclass:.mobile-options { margin-bottom: 0.5rem; }🧰 Tools
🪛 Biome
[error] 46-46: JSX elements without children should be marked as self-closing. In JSX, it is valid for any element to be self-closing.
Unsafe fix: Use a SelfClosingElement instead
(lint/style/useSelfClosingElements)
3-3: 🧹 Nitpick (assertive)
Add prop validation for better type safety.
Consider adding PropTypes or TypeScript types to validate the props and improve code maintainability.
+import PropTypes from 'prop-types'; const MobileChecklist = ({ questions, campaignName, checklistRole, typeOfChecklist }) => { // ... component code ... }; + +MobileChecklist.propTypes = { + questions: PropTypes.arrayOf( + PropTypes.shape({ + id: PropTypes.string.isRequired, + title: PropTypes.string.isRequired, + parentId: PropTypes.string, + isActive: PropTypes.bool.isRequired, + isRequired: PropTypes.bool, + type: PropTypes.shape({ + code: PropTypes.string.isRequired + }).isRequired, + options: PropTypes.arrayOf( + PropTypes.shape({ + label: PropTypes.string.isRequired + }) + ) + }) + ).isRequired, + campaignName: PropTypes.string.isRequired, + checklistRole: PropTypes.string.isRequired, + typeOfChecklist: PropTypes.string.isRequired +};health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/checklistSearchConfig.js (2)
88-91: 🧹 Nitpick (assertive)
Document the additionalCustomization implementation
The column uses
additionalCustomization: truebut it's not clear what customization is being applied to the status field. Please add comments explaining the custom rendering or transformation being applied to theisActiveboolean value.
93-96:
⚠️ Potential issueFix the action column configuration
There are two issues with the action column configuration:
- The
jsonpathproperty is empty (""). If this is an action column with buttons/links, document this intention.- The property name
jsonpathis inconsistent with other columns that usejsonPath(note the capital 'P').{ label: "HCM_CHECKLIST_ACTION", - jsonpath: "", + jsonPath: "actions", additionalCustomization: true }Committable suggestion skipped: line range outside the PR's diff.
health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/coreOverride.scss (1)
195-203: 🧹 Nitpick (assertive)
Document z-index hierarchy in comments.
The z-index values follow a clear hierarchy:
- Popup overlay: 10000
- Topbar: 9999
- Sidebar: 999
- Action bar: 10
Consider adding comments to document this hierarchy for maintainability.
Add documentation comments:
+/* Z-index hierarchy: + * 10000: Popup overlay - Highest layer for modal dialogs + * 9999: Topbar - Main navigation bar + * 999: Sidebar - Navigation sidebar + * 10: Action bar - Bottom actions + */ .employee .digit-topbar { z-index: 9999; } .digit-popup-overlay .digit-popup-wrapper { z-index: 10000; } .action-bar-wrap .actionBarClass { z-index: 10; }📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements./* Z-index hierarchy: * 10000: Popup overlay - Highest layer for modal dialogs * 9999: Topbar - Main navigation bar * 999: Sidebar - Navigation sidebar * 10: Action bar - Bottom actions */ .employee .digit-topbar { z-index: 9999; } .digit-popup-overlay .digit-popup-wrapper { z-index: 10000; } .action-bar-wrap .actionBarClass { z-index: 10; }health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/AddProductField.js (2)
104-104: 🛠️ Refactor suggestion
Avoid negative positioning for layout adjustments.
Using
position: relativewith negativetopvalue can lead to layout issues:
- It's fragile and might break in different viewport sizes
- It makes the layout harder to maintain
- It can cause unexpected behavior with surrounding elements
Consider using proper spacing through:
- CSS Grid or Flexbox for consistent layouts
- Margin/padding adjustments on the parent container
- Moving styles to a separate CSS/SCSS file for better maintainability
- <div className="product-label-field" style={{position: "relative", top: "-1rem"}}> + <div className="product-label-field">Then add appropriate CSS classes in your stylesheet:
.product-label-field { margin-bottom: 1rem; }
65-65: 🧹 Nitpick (assertive)
Consider using CSS margins instead of empty spacing divs.
Using empty divs for spacing is not recommended. Consider these alternatives:
- Add margin to the adjacent elements
- Use CSS Grid or Flexbox gap properties
- Create a reusable spacing component if needed across the application
Also, the div should be self-closing when empty.
- <div style={{height:"1.5rem"}}></div> + <div style={{height:"1.5rem"}} />📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.<div style={{height:"1.5rem"}} />🧰 Tools
🪛 Biome
[error] 65-65: JSX elements without children should be marked as self-closing. In JSX, it is valid for any element to be self-closing.
Unsafe fix: Use a SelfClosingElement instead
(lint/style/useSelfClosingElements)
health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/checklist.scss (4)
383-383: 🧹 Nitpick (assertive)
Use design system color token for consistency.
Similar to the previous color change, use a design system token instead of hardcoded hex value.
- color: #000000; + color: theme(digitv2.lightTheme.textPrimary);📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.color: theme(digitv2.lightTheme.textPrimary);
337-337: 🧹 Nitpick (assertive)
Consider using design system color tokens.
Instead of using a hardcoded hex value
#000000, consider using a color token from your design system for better maintainability and consistency.- color: #000000; + color: theme(digitv2.lightTheme.textPrimary);Committable suggestion skipped: line range outside the PR's diff.
353-354: 🛠️ Refactor suggestion
Ensure font size and family are consistent with design system.
The use of
largerfor font size is ambiguous and can lead to inconsistent rendering. Consider using a specific rem value from your design system's typography scale. Also, verify if 'Roboto Condensed' is the intended font family as per design guidelines.- font-size: larger; - font-family: 'Roboto Condensed', sans-serif; + font-size: 1rem; + font-family: theme(digitv2.font.primary);Committable suggestion skipped: line range outside the PR's diff.
403-404: 🧹 Nitpick (assertive)
💡 Codebase verification
Color contrast needs improvement and should use design system token
The mandatory asterisk color
#B91900appears on a light background (parent element hascolor: #444). While this red shade might meet WCAG requirements, it's better to:
- Use the existing design system error token
theme(digitv2.alert.error)as seen in other files, instead of hardcoding the color value- Ensure consistent error indication across the application
.mandatory-asterisk { - color: #B91900; + color: theme(digitv2.alert.error); margin-left: 4px; }🔗 Analysis chain
Verify color contrast for accessibility.
The color
#B91900is used for the mandatory asterisk. Please ensure this meets WCAG color contrast requirements for accessibility, especially against the background color.Also, consider using a design system token for this color if available.
- color: #B91900; + color: theme(digitv2.lightTheme.error);🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Search for background color definitions that might affect the contrast ratio rg -A 1 'background-color:|background:' --type scssLength of output: 82
Script:
#!/bin/bash # Search for background color definitions that might affect the contrast ratio # Using just 'rg' without file type restriction since the previous command failed rg -A 1 'background-color:|background:' health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/checklist.scssLength of output: 431
Script:
#!/bin/bash # Search for the specific color usage context rg -B 2 -A 2 '#B91900' health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/checklist.scssLength of output: 241
Script:
#!/bin/bash # Look for design system color tokens rg 'theme\(' health/micro-ui/web/micro-ui-internals/packages/css/Length of output: 43951
Script:
#!/bin/bash # Search for background colors in the specific context where the red color is used rg -B 5 -A 5 'mandatory-asterisk' health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/checklist.scssLength of output: 320
Script:
#!/bash/shell # Look for any error color tokens in the theme rg 'error|danger|alert' health/micro-ui/web/micro-ui-internals/packages/css/src/Length of output: 1812
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/index.js (1)
38-38: 🧹 Nitpick (assertive)
Simplify the boolean expression.
The boolean expression can be simplified by removing the explicit comparison with
true : false.- show: pathVar === "my-campaign" || pathVar === "checklist/search" || pathVar === "checklist/create" || pathVar === "checklist/view" || pathVar === "checklist/update" || pathVar === "update-dates-boundary" ? true : false, + show: pathVar === "my-campaign" || pathVar === "checklist/search" || pathVar === "checklist/create" || pathVar === "checklist/view" || pathVar === "checklist/update" || pathVar === "update-dates-boundary",📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.show: pathVar === "my-campaign" || pathVar === "checklist/search" || pathVar === "checklist/create" || pathVar === "checklist/view" || pathVar === "checklist/update" || pathVar === "update-dates-boundary",🧰 Tools
🪛 Biome
[error] 38-38: Unnecessary use of boolean literals in conditional expression.
Simplify your code by directly assigning the result without using a ternary operator.
If your goal is negation, you may use the logical NOT (!) or double NOT (!!) operator for clearer and concise code.
Check for more details about NOT operator.
Unsafe fix: Remove the conditional expression with(lint/complexity/noUselessTernary)
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/Dropdowns.js (3)
185-185: 🧹 Nitpick (assertive)
Add fallback for missing translation keys.
While using the translation function is good for localization, consider adding a fallback for missing translation keys.
-value={t(title)} +value={t(title, { defaultValue: title })}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.value={t(title, { defaultValue: title })}
33-34: 🧹 Nitpick (assertive)
Consider adding prop-types for type safety.
The newly added props
parentNumberandquestionNumberwould benefit from type definitions to prevent potential runtime errors.+import PropTypes from 'prop-types'; const Dropdowns = ({...}) => { // component implementation }; +Dropdowns.propTypes = { + parentNumber: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), + questionNumber: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), + // ... other props +};Committable suggestion skipped: line range outside the PR's diff.
95-104: 🧹 Nitpick (assertive)
Consider using CSS classes for styling.
Instead of inline styles, consider moving the margin styling to a CSS class for better maintainability and consistency.
-<div style={{marginTop: "0.8rem"}}> +<div className="dropdown-options-button-container"> // Add to your CSS file: // .dropdown-options-button-container { // margin-top: 0.8rem; // }Committable suggestion skipped: line range outside the PR's diff.
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/MultipleChoice.js (3)
101-111: 🧹 Nitpick (assertive)
Consider moving inline styles to CSS classes.
Instead of using inline styles and textStyles prop, consider moving these styles to CSS classes for better maintainability and consistency.
- <div style={{marginTop: "0.8rem"}}> + <div className="options-container"> <Button className="custom-class" icon="AddIcon" iconFill="" label={`${t("ADD_OPTIONS")} ${questionNumber}`} onClick={() => addOption()} size="medium" title="" variation="link" - textStyles={{ width: 'unset' }} + className="options-button" />Add to your CSS file:
.options-container { margin-top: 0.8rem; } .options-button { width: unset; }
204-204: 🛠️ Refactor suggestion
Add null check for translation.
The direct use of
t(title)could cause issues iftitleis undefined. Consider adding a null check.- value={t(title)} + value={title ? t(title) : ""}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.value={title ? t(title) : ""}
33-34: 🧹 Nitpick (assertive)
Consider adding default values for new props.
To prevent potential runtime issues when props are not provided, consider adding default values for
parentNumberandquestionNumber.- parentNumber, - questionNumber + parentNumber = "", + questionNumber = ""📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.parentNumber = "", questionNumber = ""health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/DataUploadSummary.js (2)
172-182: 🧹 Nitpick (assertive)
⚠️ Potential issueAdd keyboard accessibility to edit button and improve type safety.
The facility section implementation needs improvements in accessibility and type safety:
- Add keyboard support for the edit button:
- <div className="campaign-preview-edit-container" onClick={() => handleRedirect(10)}> + <div + className="campaign-preview-edit-container" + onClick={() => handleRedirect(10)} + onKeyDown={(e) => e.key === 'Enter' && handleRedirect(10)} + role="button" + tabIndex={0} + >
- Consider adding PropTypes or TypeScript interfaces for the CampaignDocumentsPreview component props to ensure type safety:
CampaignDocumentsPreview.propTypes = { documents: PropTypes.arrayOf( PropTypes.shape({ type: PropTypes.string.isRequired, // add other required props }) ).isRequired, };
193-203:
⚠️ Potential issueApply consistent accessibility improvements across user and target sections.
The same accessibility issues are present in both the user and target sections. Apply the keyboard accessibility pattern consistently:
// For user section (line 205) - <div className="campaign-preview-edit-container" onClick={() => handleRedirect(11)}> + <div + className="campaign-preview-edit-container" + onClick={() => handleRedirect(11)} + onKeyDown={(e) => e.key === 'Enter' && handleRedirect(11)} + role="button" + tabIndex={0} + > // For target section (line 226) - <div className="campaign-preview-edit-container" onClick={() => handleRedirect(12)}> + <div + className="campaign-preview-edit-container" + onClick={() => handleRedirect(12)} + onKeyDown={(e) => e.key === 'Enter' && handleRedirect(12)} + role="button" + tabIndex={0} + >Also applies to: 214-224
health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss (2)
435-435: 🧹 Nitpick (assertive)
Consider adding max-width for better readability.
While setting width to 100% improves mobile responsiveness, it might lead to excessive line lengths on larger screens. Consider adding a max-width constraint for better readability.
- width: 100%; + width: 100%; + max-width: 1200px; + margin: 0 auto;📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.width: 100%; max-width: 1200px; margin: 0 auto;
80-80: 🧹 Nitpick (assertive)
Consider avoiding !important flag.
While the color change is valid, using
!importantis generally considered a code smell as it breaks CSS specificity and makes styles harder to maintain. Consider increasing selector specificity instead.- color: #c84c0e !important; + .employee-container .mandatory-span { + color: #c84c0e; + }Committable suggestion skipped: line range outside the PR's diff.
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CreateQuestion.js (5)
20-21: 🧹 Nitpick (assertive)
Add PropTypes validation for new props.
The new props
parentNumberandquestionNumberare added but lack type validation. Consider adding PropTypes to ensure proper usage.import PropTypes from 'prop-types'; // Add at the bottom of the file FieldSelector.propTypes = { parentNumber: PropTypes.string, questionNumber: PropTypes.string, // ... other props };Also applies to: 175-175, 201-201, 227-227
393-535: 🛠️ Refactor suggestion
Break down complex render logic into smaller components.
The question rendering logic is complex and could benefit from being split into smaller, more manageable components. Additionally, there's a missing key prop in the mapped elements.
- Extract question card into a separate component:
const QuestionCard = ({ field, questionNumber, isDisabled, onDelete, onUpdateField }) => ( <Card type="primary" variant="form" className="question-card-container" style={{ backgroundColor: level % 2 === 0 ? "#FAFAFA" : "#FFFFFF" }}> {/* ... card content ... */} </Card> );
- Fix the key prop issue:
- <div> + <div key={field.id}>🧰 Tools
🪛 Biome
[error] 532-532: JSX elements without children should be marked as self-closing. In JSX, it is valid for any element to be self-closing.
Unsafe fix: Use a SelfClosingElement instead
(lint/style/useSelfClosingElements)
[error] 398-398: 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)
532-532: 🧹 Nitpick (assertive)
Use self-closing tag for empty div.
The empty div can be self-closing for better readability.
- <div style={{ height: "1rem" }}></div> + <div style={{ height: "1rem" }} />📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.<div style={{ height: "1rem" }} />🧰 Tools
🪛 Biome
[error] 532-532: JSX elements without children should be marked as self-closing. In JSX, it is valid for any element to be self-closing.
Unsafe fix: Use a SelfClosingElement instead
(lint/style/useSelfClosingElements)
390-390: 🧹 Nitpick (assertive)
Simplify disabled state logic.
The disabled state variable can be simplified.
- let dis = typeOfCall === "view" ? true : false; + const isDisabled = typeOfCall === "view";📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.const isDisabled = typeOfCall === "view";🧰 Tools
🪛 Biome
[error] 390-390: Unnecessary use of boolean literals in conditional expression.
Simplify your code by directly assigning the result without using a ternary operator.
If your goal is negation, you may use the logical NOT (!) or double NOT (!!) operator for clearer and concise code.
Check for more details about NOT operator.
Unsafe fix: Remove the conditional expression with(lint/complexity/noUselessTernary)
[error] 390-390: This let declares a variable that is only assigned once.
'dis' is never reassigned.
Safe fix: Use const instead.
(lint/style/useConst)
357-388: 🛠️ Refactor suggestion
Refactor question numbering logic for better maintainability.
The question numbering logic has several issues:
- Contains commented out code that should be removed
- The useEffect hook is handling multiple responsibilities
- Complex nested conditions make the logic hard to follow
Consider extracting the logic into a separate function:
- useEffect(() => { - if (initialQuestionData?.length > 0) { - const filteredQuestions = initialQuestionData.filter( - i => i.level === level && - (i.parentId ? (i.parentId === parentId) : true) && - (i.level <= 3) && - (i.isActive === true) - ); - // ... rest of the logic - } - }, [initialQuestionData, level, parentId, parentNumber, getQuestionNumber]); + const calculateNextQuestionNumber = (questions, level, parentId, parentNumber) => { + const filteredQuestions = questions?.filter( + q => q.level === level && + (q.parentId ? (q.parentId === parentId) : true) && + (q.level <= 3) && + (q.isActive === true) + ); + + if (!filteredQuestions?.length && parentNumber) { + return `${parentNumber}.1`; + } + + if (filteredQuestions?.length) { + const lastIndex = filteredQuestions.length - 1; + const lastQuestionNumber = getQuestionNumber(lastIndex, level, parentNumber); + const parts = lastQuestionNumber.split("."); + parts[parts.length - 1] = (Number.parseInt(parts[parts.length - 1], 10) + 1).toString(); + return parts.join("."); + } + + return "1"; + }; + + useEffect(() => { + const nextNumber = calculateNextQuestionNumber(initialQuestionData, level, parentId, parentNumber); + setNextQuestionNumber(nextNumber); + }, [initialQuestionData, level, parentId, parentNumber]);📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.const [nextQuestionNumber, setNextQuestionNumber] = useState("1"); const calculateNextQuestionNumber = (questions, level, parentId, parentNumber) => { const filteredQuestions = questions?.filter( q => q.level === level && (q.parentId ? (q.parentId === parentId) : true) && (q.level <= 3) && (q.isActive === true) ); if (!filteredQuestions?.length && parentNumber) { return `${parentNumber}.1`; } if (filteredQuestions?.length) { const lastIndex = filteredQuestions.length - 1; const lastQuestionNumber = getQuestionNumber(lastIndex, level, parentNumber); const parts = lastQuestionNumber.split("."); parts[parts.length - 1] = (Number.parseInt(parts[parts.length - 1], 10) + 1).toString(); return parts.join("."); } return "1"; }; useEffect(() => { const nextNumber = calculateNextQuestionNumber(initialQuestionData, level, parentId, parentNumber); setNextQuestionNumber(nextNumber); }, [initialQuestionData, level, parentId, parentNumber]);🧰 Tools
🪛 Biome
[error] 372-372: Use Number.parseInt instead of the equivalent global.
ES2015 moved some globals into the Number namespace for consistency.
Safe fix: Use Number.parseInt instead.(lint/style/useNumberNamespace)
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/CreateChecklist.js (4)
552-552: 🧹 Nitpick (assertive)
Fix self-closing element and approve prop addition
The addition of the campaignName prop improves component context. However, the element should be self-closing as it has no children.
- <MobileChecklist questions={previewData} campaignName={campaignName} checklistRole={t(`${roleLocal}`)} typeOfChecklist={t(`${checklistTypeLocal}`)}></MobileChecklist> + <MobileChecklist questions={previewData} campaignName={campaignName} checklistRole={t(`${roleLocal}`)} typeOfChecklist={t(`${checklistTypeLocal}`)} />📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.<MobileChecklist questions={previewData} campaignName={campaignName} checklistRole={t(`${roleLocal}`)} typeOfChecklist={t(`${checklistTypeLocal}`)} />🧰 Tools
🪛 Biome
[error] 552-552: JSX elements without children should be marked as self-closing. In JSX, it is valid for any element to be self-closing.
Unsafe fix: Use a SelfClosingElement instead
(lint/style/useSelfClosingElements)
469-474: 🧹 Nitpick (assertive)
Simplify the useEffect implementation
The useEffect implementation can be more concise while maintaining the same functionality.
- useEffect(()=>{ - if(showToast !== null) - { - setShowPopUp(false); - } - }, [showToast]) + useEffect(() => { + if (showToast) setShowPopUp(false); + }, [showToast]);Committable suggestion skipped: line range outside the PR's diff.
434-434: 🧹 Nitpick (assertive)
Consider extracting the separator as a constant
While the code concatenation is correct, consider extracting the separator (.) as a constant to maintain consistency and make future updates easier.
+ const CODE_SEPARATOR = '.'; - code: `${campaignName}.${checklistTypeTemp}.${roleTemp}`, + code: [campaignName, checklistTypeTemp, roleTemp].join(CODE_SEPARATOR),Committable suggestion skipped: line range outside the PR's diff.
613-613: 🧹 Nitpick (assertive)
Replace empty div with CSS margin
Using empty divs for spacing is not recommended. Consider using CSS margin instead.
- <div style={{ height: "2rem" }}></div> + <style> + .content-wrapper { + margin-bottom: 2rem; + } + </style> + <div className="content-wrapper" />Committable suggestion skipped: line range outside the PR's diff.
🧰 Tools
🪛 Biome
[error] 613-613: JSX elements without children should be marked as self-closing. In JSX, it is valid for any element to be self-closing.
Unsafe fix: Use a SelfClosingElement instead
(lint/style/useSelfClosingElements)
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateChecklist.js (2)
493-493: 🧹 Nitpick (assertive)
Use self-closing tags for elements without children
For consistency and better JSX practices, use self-closing tags for elements without children.
- <MobileChecklist questions={previewData} campaignName={campaignName} checklistRole={t(`${roleLocal}`)} typeOfChecklist={t(`${checklistTypeLocal}`)}></MobileChecklist> + <MobileChecklist questions={previewData} campaignName={campaignName} checklistRole={t(`${roleLocal}`)} typeOfChecklist={t(`${checklistTypeLocal}`)} /> - <div style={{height: "2rem"}}></div> + <div style={{height: "2rem"}} />Also applies to: 539-539
🧰 Tools
🪛 Biome
[error] 493-493: JSX elements without children should be marked as self-closing. In JSX, it is valid for any element to be self-closing.
Unsafe fix: Use a SelfClosingElement instead
(lint/style/useSelfClosingElements)
418-423: 🧹 Nitpick (assertive)
Clean up formatting and remove unnecessary empty lines
The useEffect implementation is correct, but the formatting can be improved for better readability.
- useEffect(()=>{ - if(showToast !== null) - { - setShowPopUp(false); - } - }, [showToast]) + useEffect(() => { + if (showToast !== null) { + setShowPopUp(false); + } + }, [showToast]);📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.useEffect(() => { if (showToast !== null) { setShowPopUp(false); } }, [showToast]);health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/ViewHierarchy.js (2)
281-282: 🛠️ Refactor suggestion
Improve translation key handling and use template literals.
The translation key construction has been improved to be more specific to hierarchy types, but there are some improvements needed:
- Use template literals instead of string concatenation
- Consider using predefined translation keys instead of dynamic construction to prevent missing translations
Apply this diff:
- {`${t(( hierarchyType + "_" + hierItem?.boundaryType).toUpperCase())}`} + {t(`${hierarchyType}_${hierItem?.boundaryType}`.toUpperCase())} - {`${t(( hierarchyType + "_" + hierItem?.boundaryType).toUpperCase())}`}{".shp"} + {t(`${hierarchyType}_${hierItem?.boundaryType}`.toUpperCase())}{".shp"}Also, consider maintaining a list of predefined translation keys to ensure all combinations are properly translated.
Also applies to: 289-289
🧰 Tools
🪛 Biome
[error] 282-282: Template literals are preferred over string concatenation.
Unsafe fix: Use a template literal.
(lint/style/useTemplate)
284-284: 🧹 Nitpick (assertive)
Fix self-closing element.
Use self-closing syntax for elements without children.
- <div style={{height:"1rem"}}></div> + <div style={{height:"1rem"}} />📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.<div style={{height:"1rem"}} />🧰 Tools
🪛 Biome
[error] 284-284: JSX elements without children should be marked as self-closing. In JSX, it is valid for any element to be self-closing.
Unsafe fix: Use a SelfClosingElement instead
(lint/style/useSelfClosingElements)
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js (2)
91-94: 🧹 Nitpick (assertive)
Add documentation for handleUserAction function.
The function's purpose could be clearer with JSDoc documentation.
+/** + * Resets the exit warning state when user completes their workflow + * or intentionally navigates away from the upload process + */ const handleUserAction = () => { // User performs an action that completes their workflow setShowExitWarning(false); };📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements./** * Resets the exit warning state when user completes their workflow * or intentionally navigates away from the upload process */ const handleUserAction = () => { // User performs an action that completes their workflow setShowExitWarning(false); };
74-89: 🧹 Nitpick (assertive)
Consider adding cleanup for incomplete uploads.
The beforeunload event handler is implemented correctly. However, consider adding cleanup logic when the user decides to leave during an upload.
useEffect(() => { const handleBeforeUnload = (e) => { if (showExitWarning) { e.preventDefault(); e.returnValue = ""; // Required for most browsers + // Consider cleanup of incomplete uploads + if (uploadedFile?.length > 0 && !isSuccess) { + // Add cleanup logic here + } } }; if (showExitWarning) { window.addEventListener("beforeunload", handleBeforeUnload); } return () => { window.removeEventListener("beforeunload", handleBeforeUnload); }; }, [showExitWarning]);Committable suggestion skipped: line range outside the PR's diff.
health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/MultiSelectDropdown.js (1)
287-294: 🧹 Nitpick (assertive)
Refactor to improve readability by extracting
action.payload[1]into a variableThe repeated use of
action.payload?.[1]can be refactored for better readability and maintainability. Assigningaction.payload?.[1]to a variable simplifies the code and reduces redundancy.Apply this diff to enhance the code:
case "ADD_TO_SELECTED_EVENT_QUEUE": // Check if the item already exists to prevent duplication + const item = action.payload?.[1]; - if (state.some((e) => e.code === action.payload?.[1]?.code) || !action?.payload?.[1]?.type) { + if (state.some((e) => e.code === item?.code) || !item?.type) { return state; // Return state unchanged if item is already in queue } return [ ...state, - { code: action?.payload?.[1]?.code, name: action?.payload?.[1]?.name, propsData: action.payload }, + { code: item?.code, name: item?.name, propsData: action.payload }, ];This refactoring improves code clarity by reducing repetition and making it easier to understand the logic.
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.// Check if the item already exists to prevent duplication const item = action.payload?.[1]; if (state.some((e) => e.code === item?.code) || !item?.type) { return state; // Return state unchanged if item is already in queue } return [ ...state, { code: item?.code, name: item?.name, propsData: action.payload }, ];
...web/micro-ui-internals/packages/modules/campaign-manager/src/components/DataUploadSummary.js
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>
Choose the appropriate template for your PR:
Summary by CodeRabbit
Release Notes
New Features
Improvements
Bug Fixes
UI Enhancements