Skip to content

Commit 5fdb5bd

Browse files
jagankumar-egovSwathi-eGovsuryansh-egovNabeelAyubeenipunarora-eGov
authored
RELEASE/HCMPRE-1990 : HCM 1.7 :: Console v0.3.1 , Microplan v0.2.0 & Payments v0.1.0 (#2217)
* BUGFIX/HCMPRE-1547 updated workflow error message to generic code (#2005) updated workflow error message to generic code Co-authored-by: Jagankumar <[email protected]> * BUGFIX/HCMPRE-1246 :: boundary related issue (#1998) * validation from ui (#1981) * validation from ui * empty top rows considered * info card added for error in place of toast * review changes * file name added * file name added * Updated the branch name validation (#1997) * Update README.md * Updated the branch name validation * Updated the branch name validator to have title check as well (#2002) * review changes --------- Co-authored-by: Jagankumar <[email protected]> * BUGFIX/ISSUE-2007 Build issue fix for #2007 (#2008) * Build issue fix for #2007 * import issue fix --------- Co-authored-by: NabeelAyubee <[email protected]> * BUGFIX/HCMPRE-1585 fixed tootltip icon position according to the label (#2010) * Update UserManagement.js (#2017) Co-authored-by: Nipun Arora <[email protected]> * Feature/HCMPRE-1234: adding mapping screen for facility and user screen (#2012) * adding mapping screen for facility and user screen * Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadDataMappingWrapper.js Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: NabeelAyubee <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * updated core version (#2020) * Bugfix/hcmpre 1583 (#2021) * Update MicroplanSearch.js * Pagination issues --------- Co-authored-by: Nipun Arora <[email protected]> * BUGFIX/HCMPRE-1634: fix for versions (#2024) * Revert "Bugfix/hcmpre 1583 (#2021)" This reverts commit 201a0ce. * BUGFIX/HCMPRE-1634 Revert ing"updated core version (#2020)" * BUGFIX/HCMPRE-1583 fixes --------- Co-authored-by: Swathi-eGov <[email protected]> * FEATURE/HCMPRE-1634:Fixed all the version updates (#2026) FEATURE/HCMPRE-1634: Fixed all the version updates * FIX : Branch name validator fixed Reference #2042 Sample Ticket for reference #2042 * FEATURE/HCMPRE-1644 : Changed download template name (#2035) FEATURE/HCMPRE-1644: Changed download template name Co-authored-by: Jagankumar <[email protected]> * BUGFIX/HCMPRE-1505 : Updated Core Version To Fix Validation Issue on … (#2047) BUGFIX/HCMPRE-1505 : Updated Core Version To Fix Validation Issue on Profile Update * FEATURE/HCMPRE-814: Added geojson view and edit (#2013) * added geojson view and edit * resolved pr comments --------- Co-authored-by: nabeelmd-eGov <[email protected]> Co-authored-by: Jagankumar <[email protected]> * BUGFIX/HCMPRE-1243: fixes currentKey (#2052) * fixes current key * fixes --------- Co-authored-by: NabeelAyubee <[email protected]> * FEATURE/HCMPRE-1625 last modified date added in campaign search and checklist search screens (#2044) * last modified date added in campaign search and checklist search screens * lat modified date corrected --------- Co-authored-by: Jagankumar <[email protected]> * BUGFIX/HCMPRE-1418 : Fixed IRS value NAN issue (#2055) Co-authored-by: Jagankumar <[email protected]> * BUGFIX/HCMPRE-1243: added check for empty upload (#2056) * fixes current key * fixes * added check --------- Co-authored-by: NabeelAyubee <[email protected]> * FEATURE/HCMPRE-1624 : added alert, fixed localisation on checklist & added more date info on Hierarchy (#2054) * showcase review points * logs rmoved --------- Co-authored-by: Jagankumar <[email protected]> * HCMPRE-1717::PAYMENTS Module setup (#2053) * PAYMENTS Module setup * updated module index file * updated comments * HCMPRE-1717:: Removed other modules dependency from Payments * added static view screen * Updated dependencies * Updated Roles and label for Payments Card * HCMPRE-1717:: Payments Base Module Setup * Resolved code rabbit comments * Update package.json * Rename view_attendance.js to ViewAttendance.js * Update attendanceManagementTable.js * Update build-config.yml * Update Module.js * Update Module.js --------- Co-authored-by: rachana-egov <[email protected]> Co-authored-by: Jagankumar <[email protected]> * FEATURE/HCMPRE-1717 :: added payment module build (#2059) * FEATURE/HCMPRE-1717 :: added payment module build * Update build-config.yml * BUGFIX/HCMPRE-1717 :: Health Payments Module Build issue fix (#2060) Health Payments Module Build issue fix * BUGFIX/HCMPRE-1283: added the config for campaign creation from microplan * BUGFIX/HCMPRE-1717 :: FIxed the build config file (#2062) * BUGFIX/HCMPRE-15830 : Fixed checkbox click area (#2064) Css changes * BUGFIX/HCMPRE-1730 & HCMPRE-1731 (#2070) * BUGFIX/HCMPRE-1730 & HCMPRE-1731 * fixes --------- Co-authored-by: NabeelAyubee <[email protected]> * Added css for payment module (#2079) Co-authored-by: rachana-egov <[email protected]> * BUGFIX/HCMPRE-1730: Fixes pagination in mapping table (#2078) * BUGFIX/HCMPRE-1730 & HCMPRE-1731 * fixes * BUGFIX/HCMPRE_1730: Fix pagination --------- Co-authored-by: NabeelAyubee <[email protected]> * FEATURE/HCMPRE-1209 : Added co-del project type (#2088) FEATURE/HCMPRE-1209 : Added co-del project type Co-authored-by: Jagankumar <[email protected]> * FEATURE/HCMPRE-1789 : Draft Flow (#2093) * changes to createUpdatePlan * Changes to UI, createUpdatePlan * Putting the Hierarchy near the name * Loc change * Resolved comments * Null check for Hierarchy level * Changes * Indirectly Mutating planObject * changes * changes --------- Co-authored-by: Abishek <[email protected]> * FEATURE/HCMPRE-1787 : Untagging all the current users if boundary is (#2092) * FEATURE/HCMPRE-1787 : Untagging all the current users if boundary is changed during setup * FEATUTE/HCMPRE-1787 : Added different error cases * FEATURE/HCMPRE-1710: Accessibility dropdown for planInbox with plan integration and apply filter (#2091) * Adding filters * Working Filter Search * InboxFilter Changes * removing console.log * Css package update * changes * changes * changes * changes * changes * A lot of changes * changes * changes * changes * uniform payload structure * FEATURE/HCMPRE-1712: Facility Dropdown for plan Inbox (#2096) * Adding filters * Working Filter Search * InboxFilter Changes * removing console.log * Css package update * changes * changes * changes * changes * changes * A lot of changes * changes * changes * changes * uniform payload structure * Adding Facility Dropdown * code replacing name attribute * Loader changes * comments resolved * Loader change * Id to id * BUGFIX/HCMPRE-1810: Fix issue for next page in user tagging (#2104) * for clickng on save and next * remove console * FEATURE/HCMPRE-1706: Plan Inbox updates and draft flow changes (#2109) * updated plan inbox * Update createUpdatePlanProject.js * formatted createupdateplanproject * BUGFIX/HCMPRE-1776 : Added UI/UX Master changes (#2110) * FEATURE/HCMPRE-1681: Handled the case where capacity is 0 and tested full flow (#2111) handled the case where capacity is 0 and tested full flow * BUGFIX/HCMPRE-1209 changes in the project type code (#2116) * HCMPRE-1766: App Configuration Screen Setup (#2117) * HCMPRE-1766: Added AppScreenConfiguration Feature screen * added enhancement in app configuration * added app configuration link * added tag component in mapping * package upgrade --------- Co-authored-by: NabeelAyubee <[email protected]> * FEATURE/HCMPRE-1713: PopInbox and filtering integration (#2108) * PopInbox and facilityId search in planInbox * Localization * Chages to CSS and removing filter * Changes to facility filter and security Question * css package update * facilityId removed * Resolved comments, made payload to facilityId * component package update * FEATURE/HCMPRE-1852 :: Consolidated Common UI (#2120) * added change for common * Updated the readme content * revert * added build configs * Update buildCommonConsole.yml * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * FEATURE/HCMPRE-1704 : Removing current validation from assumptions an… (#2122) * FEATURE/HCMPRE-1704 : Removing current validation from assumptions and making sure the flow works as expected( for mixed strat, regis and dist can be same) * FEATURE/HCMPRE-1704 : Review updates * HCMPRE-1766: User Mapping Issue fix (#2119) * User Mapping issue fixes * fix lowest Hierarchy boundary selection * fi localisation code --------- Co-authored-by: NabeelAyubee <[email protected]> * BUGFIX/HCMPRE-1584: Disable planSearch for popInbox and CSS for dropdown (#2123) * BUGFIX/HCMPRE-1866 : Updated versions (#2128) * FEATURE/HCMPRE-0000 : Fix for serach query in user tagging screen (#2132) * FEATURE/HCMPRE-1826 : Fixed 0 capacity validation from microplan (#2137) * FEATURE/HCMPRE-1826 : Fixed 0 capacity validation from microplan * validation method change * BUGFIX/HCMPRE-1944: TotalCount UI issue in planIbox (#2138) * useEffect updated * CountAssignToAll issue in planInbox * BUGFIX/HCMPRE-1955 : updated versions of core and libraries (#2144) updated versions of core and libraries * BUGFIX/HCMPRE-1826 : Enhanced microplan validation (#2147) Co-authored-by: Jagankumar <[email protected]> * FEATURE/HCMPRE-1852 :: Consolidated Common UI removing other modules(#2120) * FEATURE/HCMPRE-2207 : removed the hard coded project types (#2157) * BUGFIX/HCMPRE-1242: Status active/inactive and pagination bug fix (#2160) HCMPRE-1242: Status active/inactive and pagination bug fix Co-authored-by: NabeelAyubee <[email protected]> * BUGFIX/HCMPRE-1243: user mapping pagination issue fix and error toast added for api error (#2162) Co-authored-by: NabeelAyubee <[email protected]> * FEATURE/HCMPRE-1852: Fixes of version in consolidated UI (#2163) * Update build-config.yml * Update App.js * Update package.json * Update package.json * fix of landing pacge * Update build-config.yml * FEATURE/HCMPRE-2215 : UI Code cleanup (#2161) * FEATURE/HCMPRE-1852: Added other optimisations for common build(#2163) * add/edit mappings (#2152) * add/edit mappings * edit and delete feature added * classname corrected * Update health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js --------- Co-authored-by: nabeelmd-eGov <[email protected]> Co-authored-by: NabeelAyubee <[email protected]> * BUGFIX/HCMPRE-1243: User Mapping Table CSS fix (#2168) Co-authored-by: NabeelAyubee <[email protected]> * FEATURE/HCMPRE-1438 : Health Payments v0.1 Module (#2136) * removed hcm from store * added view attendance screen * added alert pop up, table for view and edit attendance * updated module.js file * added success screen and updated breadcrumbs * fixing table component * HCMPRE-1717:: Load and store project details on Payments module initi… (#2065) HCMPRE-1717:: Load and store project details on Payments module initialization * added input component in table for editing attendance * HCM-1646::Payment inbox attendance (#2067) attendance inbox in progress * updated table with static data and fields with attendance data * updated breadcrumbs * fixed edit attendance calls * updated css * fixed nevigation issue * updated css version * Payment inbox attendance (#2072) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * updated api calls for create and update flow and added disabled action condition * fixed back button in view screen * Payment inbox attendance (#2073) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * boundary service API integration implemented for inbox screen * Update filter_section.js --------- Co-authored-by: rachana-egov <[email protected]> * added workflow in api calls * removed comments * updated api base point * Payment inbox attendance (#2074) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * boundary service API integration implemented for inbox screen * check box and register search API integration in progress * Payment inbox attendance (#2075) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * boundary service API integration implemented for inbox screen * check box and register search API integration in progress * table data enriched * Payment inbox attendance (#2076) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * boundary service API integration implemented for inbox screen * check box and register search API integration in progress * table data enriched * removed debugger * variable name changed * inbox css fix * added module for boundary localization * added session storage for individual * added individual in session storage * fixed project search issue * Payment inbox attendance (#2080) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * boundary service API integration implemented for inbox screen * check box and register search API integration in progress * table data enriched * removed debugger * variable name changed * tab section functionlity added * attendance register param changed * Payment inbox attendance (#2082) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * boundary service API integration implemented for inbox screen * check box and register search API integration in progress * table data enriched * removed debugger * variable name changed * tab section functionlity added * attendance register param changed * localization code and table value changed * Updated hierarchy type for Payments Testing * integrated with apis * added create api * added validation for APPROVAL * fixed extra call issue * fixed issue * Payment inbox attendance (#2084) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * boundary service API integration implemented for inbox screen * check box and register search API integration in progress * table data enriched * removed debugger * variable name changed * tab section functionlity added * attendance register param changed * localization code and table value changed * inbox pagination and status register count fixed * table component css style changed * padding removed from table style * console removed * added loading for mutation * translator funtion added * started with static screens for bills * Payment inbox attendance (#2090) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * boundary service API integration implemented for inbox screen * check box and register search API integration in progress * table data enriched * removed debugger * variable name changed * tab section functionlity added * attendance register param changed * localization code and table value changed * inbox pagination and status register count fixed * table component css style changed * padding removed from table style * console removed * HCMPRE-1774: point-1 project drop down is put in the filter section and search section is not required as per last demo * updated default pagination * fixed small css issues * Payment inbox attendance (#2094) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * boundary service API integration implemented for inbox screen * check box and register search API integration in progress * table data enriched * removed debugger * variable name changed * tab section functionlity added * attendance register param changed * localization code and table value changed * inbox pagination and status register count fixed * table component css style changed * padding removed from table style * console removed * HCMPRE-1774: point-1 project drop down is put in the filter section and search section is not required as per last demo * fliter boundary dropdown in progress * staffName key changed for attendance mark by * updated view attendance screen * removed other links * Payment inbox attendance (#2095) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * boundary service API integration implemented for inbox screen * check box and register search API integration in progress * table data enriched * removed debugger * variable name changed * tab section functionlity added * attendance register param changed * localization code and table value changed * inbox pagination and status register count fixed * table component css style changed * padding removed from table style * console removed * HCMPRE-1774: point-1 project drop down is put in the filter section and search section is not required as per last demo * fliter boundary dropdown in progress * staffName key changed for attendance mark by * bug fixes * removed logs * code comment added and status put in the constant file * Updated Payments Module Initialization to a single hook * added bill search api * updated search bill params * Payment inbox attendance (#2099) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * boundary service API integration implemented for inbox screen * check box and register search API integration in progress * table data enriched * removed debugger * variable name changed * tab section functionlity added * attendance register param changed * localization code and table value changed * inbox pagination and status register count fixed * table component css style changed * padding removed from table style * console removed * HCMPRE-1774: point-1 project drop down is put in the filter section and search section is not required as per last demo * fliter boundary dropdown in progress * staffName key changed for attendance mark by * bug fixes * code comment added why not used inboxsearch composer * boundary service made dynamic * added condition to boundary filter * updated bill inbox * fixed my bills screen * Payment inbox attendance (#2100) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * boundary service API integration implemented for inbox screen * check box and register search API integration in progress * table data enriched * removed debugger * variable name changed * tab section functionlity added * attendance register param changed * localization code and table value changed * inbox pagination and status register count fixed * table component css style changed * padding removed from table style * console removed * HCMPRE-1774: point-1 project drop down is put in the filter section and search section is not required as per last demo * fliter boundary dropdown in progress * staffName key changed for attendance mark by * bug fixes * code comment added why not used inboxsearch composer * boundary service made dynamic * boundary component made dynamic * Updated paymentStatus to review Status * Localization fixes * Localization fixes * Localization fixes * Localization fixes * fixed bill screen * Payment inbox attendance (#2103) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * boundary service API integration implemented for inbox screen * check box and register search API integration in progress * table data enriched * removed debugger * variable name changed * tab section functionlity added * attendance register param changed * localization code and table value changed * inbox pagination and status register count fixed * table component css style changed * padding removed from table style * console removed * HCMPRE-1774: point-1 project drop down is put in the filter section and search section is not required as per last demo * fliter boundary dropdown in progress * staffName key changed for attendance mark by * bug fixes * code comment added why not used inboxsearch composer * boundary service made dynamic * boundary component made dynamic * boundary component issue fixed for mandatory filed and drop down reset * commented code removed * fixed table css * fixed api not being called again issue * added pdf and excel download options * HCMPRE-1816, HCMPRE-1774::Demo Feedbacks and Bug fixes (#2107) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * boundary service API integration implemented for inbox screen * check box and register search API integration in progress * table data enriched * removed debugger * variable name changed * tab section functionlity added * attendance register param changed * localization code and table value changed * inbox pagination and status register count fixed * table component css style changed * padding removed from table style * console removed * HCMPRE-1774: point-1 project drop down is put in the filter section and search section is not required as per last demo * fliter boundary dropdown in progress * staffName key changed for attendance mark by * bug fixes * code comment added why not used inboxsearch composer * boundary service made dynamic * boundary component made dynamic * boundary component issue fixed for mandatory filed and drop down reset * commented code removed * bug fixes done * updated billinbox * updating session storage for billl inbox * added session storage for bill screens * fixed bill inbox screen issues * fixed my bills session issue * updated breadcrumbs * fixed date range picker component * added loader on edit screens * Ticket: HCMPRE-1822 (#2112) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * boundary service API integration implemented for inbox screen * check box and register search API integration in progress * table data enriched * removed debugger * variable name changed * tab section functionlity added * attendance register param changed * localization code and table value changed * inbox pagination and status register count fixed * table component css style changed * padding removed from table style * console removed * HCMPRE-1774: point-1 project drop down is put in the filter section and search section is not required as per last demo * fliter boundary dropdown in progress * staffName key changed for attendance mark by * bug fixes * code comment added why not used inboxsearch composer * boundary service made dynamic * boundary component made dynamic * boundary component issue fixed for mandatory filed and drop down reset * commented code removed * bug fixes done * ticket: HCMPRE-1822, boundary option reloaded and error scenation handled for project selection and boundary selection in attendance register inbox * updated table data refresh * fixed filter issue * fixed validation issue * fixed breadcrumbs issue * fixed demo issues * ticketNo: HCMPRE-1822,bug fixes and edge cases fixed * fixed date going nulls * updated attendance duration to ceil value of dates * added session storage for selected boundary * fixed boundary filter issue * fixed locality code not going in bill search * updated render to one time only * bill search updated * fixed bill page issue * TICKET: HCMPRE-1822 (#2118) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * boundary service API integration implemented for inbox screen * check box and register search API integration in progress * table data enriched * removed debugger * variable name changed * tab section functionlity added * attendance register param changed * localization code and table value changed * inbox pagination and status register count fixed * table component css style changed * padding removed from table style * console removed * HCMPRE-1774: point-1 project drop down is put in the filter section and search section is not required as per last demo * fliter boundary dropdown in progress * staffName key changed for attendance mark by * bug fixes * code comment added why not used inboxsearch composer * boundary service made dynamic * boundary component made dynamic * boundary component issue fixed for mandatory filed and drop down reset * commented code removed * bug fixes done * ticket: HCMPRE-1822, boundary option reloaded and error scenation handled for project selection and boundary selection in attendance register inbox * HCMPRE-1822::table rows per page issue fixed, and digit.session storage implemented * session storage fix * fixed boundary filter issue * fixed pagination issue * fixed name for approver and staff * fixed view attendance screen * added toast for bill generation * fixed owner name * fixed isRequired label * updated my bills table * reworking on the table component in view attendance screen (#2121) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * boundary service API integration implemented for inbox screen * check box and register search API integration in progress * table data enriched * removed debugger * variable name changed * tab section functionlity added * attendance register param changed * localization code and table value changed * inbox pagination and status register count fixed * table component css style changed * padding removed from table style * console removed * HCMPRE-1774: point-1 project drop down is put in the filter section and search section is not required as per last demo * fliter boundary dropdown in progress * staffName key changed for attendance mark by * bug fixes * code comment added why not used inboxsearch composer * boundary service made dynamic * boundary component made dynamic * boundary component issue fixed for mandatory filed and drop down reset * commented code removed * bug fixes done * ticket: HCMPRE-1822, boundary option reloaded and error scenation handled for project selection and boundary selection in attendance register inbox * HCMPRE-1822::table rows per page issue fixed, and digit.session storage implemented * reworking on the tavle component in view attendance screen * demo fixes * fixed issue * fixed css issues * HCMPRE-1863:: Updated boundaryHierarchyOrder from boundary search. (#2124) HCMPRE-1863:: Updated boundaryHierarchyOrder from boundary search. Removed hardocoded boundaryType options * added project selection page * fixed approval flow * fixed bill screens * TICKET::HCMPRE-1884 (#2129) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * boundary service API integration implemented for inbox screen * check box and register search API integration in progress * table data enriched * removed debugger * variable name changed * tab section functionlity added * attendance register param changed * localization code and table value changed * inbox pagination and status register count fixed * table component css style changed * padding removed from table style * console removed * HCMPRE-1774: point-1 project drop down is put in the filter section and search section is not required as per last demo * fliter boundary dropdown in progress * staffName key changed for attendance mark by * bug fixes * code comment added why not used inboxsearch composer * boundary service made dynamic * boundary component made dynamic * boundary component issue fixed for mandatory filed and drop down reset * commented code removed * bug fixes done * ticket: HCMPRE-1822, boundary option reloaded and error scenation handled for project selection and boundary selection in attendance register inbox * HCMPRE-1822::table rows per page issue fixed, and digit.session storage implemented * reworking on the tavle component in view attendance screen * HCMPRE-1884, worked on preselected boundary * HCMPRE-1884:: project is also bydefault selected --------- Co-authored-by: rachana-egov <[email protected]> * fixed loading screen * fixed bill inbox screen * fixed all the css issues * Inline CSS content removed from unwanted places (#2131) * attendance inbox in progress * composer in progress * inboxserach composer replaced with custom inbox component * boundary service API integration implemented for inbox screen * check box and register search API integration in progress * table data enriched * removed debugger * variable name changed * tab section functionlity added * attendance register param changed * localization code and table value changed * inbox pagination and status register count fixed * table component css style changed * padding removed from table style * console removed * HCMPRE-1774: point-1 project drop down is put in the filter section and search section is not required as per last demo * fliter boundary dropdown in progress * staffName key changed for attendance mark by * bug fixes * code comment added why not used inboxsearch composer * boundary service made dynamic * boundary component made dynamic * boundary component issue fixed for mandatory filed and drop down reset * commented code removed * bug fixes done * ticket: HCMPRE-1822, boundary option reloaded and error scenation handled for project selection and boundary selection in attendance register inbox * HCMPRE-1822::table rows per page issue fixed, and digit.session storage implemented * reworking on the tavle component in view attendance screen * HCMPRE-1884, worked on preselected boundary * HCMPRE-1884:: project is also bydefault selected * inline css code removed from custom div * css * fixed table css * added start date and end date for campaign * HCMPRE-1943:: Demo Feedback Pending Items and Fixes * Updated constants * fixed info message when boundary changes * updated css version * Revert "updated css version" This reverts commit 65129c5. * Revert "Inline CSS content removed from unwanted places (#2131)" This reverts commit 0707199. * reverted css changes * payment module * fixed project selection issue * fixed css comments * resolved github comments * resolved code rabbit comments * fixed attendance error issue * updated context path for services from global config * fixed grammer error --------- Co-authored-by: rachana-egov <[email protected]> Co-authored-by: pitabash-eGov <[email protected]> Co-authored-by: rachana-egov <[email protected]> Co-authored-by: pitabash-eGov <[email protected]> Co-authored-by: Jagankumar <[email protected]> * BUGFIX/HCMPRE-1852 :: FIxed the build config file (#2169) * BUGFIX/HCMPRE-1852 :: FIxed the build config file * Update webpack.config.js * BUGFIX/HCMPRE-2212 : Updated Facility Filter as a Multiselect dropdown (#2167) * BUGFIX.HCMPRE-2212 : Updated Facility Filter to MultiselectDropdown * fixed filter issues * Removed console logs * BUGFIX/HCMPRE-1209 : Fixed campaign summary inbetween issue (#2170) * FEATURE/HCMPRE-1438 : Updated css version for payments css (#2172) Co-authored-by: rachana-egov <[email protected]> * BUGFIX|HCMPRE-1438: payments css (#2174) * FEATURE/HCMPRE-1438 : Updated css version for payments css * fixed css issues from deployement --------- Co-authored-by: rachana-egov <[email protected]> * BUGFIX/HCMPRE-2212 : Fixed Facility Filter Issue (#2173) * ui changes and validations for boundary added (#2175) * BUGFIX|HCMPRE-1438: Updated core module version (#2176) * FEATURE/HCMPRE-1438 : Updated css version for payments css * fixed css issues from deployement * updated core modules version in payments --------- Co-authored-by: rachana-egov <[email protected]> * BUGFIX/HCMPRE-1850 : Fix the css (#2177) css version changes * FEATURE/HCMPRE-0000 : Fixed Css Issue (#2178) * FEATURE/HCMPRE-0000: adhoc fix (#2179) ? added * FEATURE/HCMPRE-1649 : help text and checklist create call order corrected (#2071) * help text and checklist create call order corrected * localisations changed --------- Co-authored-by: Jagankumar <[email protected]> * FEATURE/HCMPRE-1649: Cleanedup campaign card & added a extra info in project type selection * BUGFIX|HCMPRE-1438: Updated payments Config key (#2182) Updated paymentsConfig Key * FEATURE/HCMPRE-1649: Updated the core version to check the feature HCMPRE-1425 workbench enhancements * FEATURE/HCMPRE-2208 :: Fixed the default landing for console user * BUGFIX/HCMPRE-2243 : Showing only supported campaign types for microplan ui (#2185) * BUGFIX/HCMPRE-2243 : Showing only supported campaign types for microplan * Added review changes * Updated to hcm-microplanning module * Fixed typo * FEATURE/HCMPRE-1852: Updated the core version dynamic core module ren… (#2190) FEATURE/HCMPRE-1852: Updated the core version dynamic core module renderer & Clean up of hcm workbench module * FEATURE/HCMPRE-1852: Updated the core version as part of Core for Single landing page * BUGFIX/HCMPRE-2250 : Added loader while data is loading (#2193) BUGFIX/HCMPRE-2250 : Added loader while data is loading for the Boundary KPI * BUGFIX/HCMPRE-1852: Added missed out package dependency * BUGFIX/HCMPRE-1818: Height of FilterCard Changed (#2191) * BUGFIX/HCMPRE-2253 : Fixed Button Issue in PopDataTable Screen (#2195) * FEATURE/HCMPRE-2263: no geojson data case handled (#2197) no geojson data case handled * BUGFIX/HCMPRE-2260: upload data mapping screen add/edit bug fixes (#2199) * BUGFIX/HCMPRE-2263: Boundary Management geojson code revert (#2200) Boundary management screen geojson code revert Co-authored-by: NabeelAyubee <[email protected]> * BUGFIX/HCMPRE-2263: campaign summary cycle number issue fix (#2202) campaign summary cycle number issue fix Co-authored-by: NabeelAyubee <[email protected]> * FEATURE/HCMPRE-2296 :: add comment feature removed (#2201) * add comment feature removed * review points convered * changes * BUGFIX/HCMPRE-1820: Filter card dynamic height (#2204) * changes for filter card height * limit changed * limit changes * FEATURE/HCMPRE-2303 : Incremented campaign manager version from 0.3.0 (#2205) * FEATURE/HCMPRE-2303 : Incremented campaign manager version from 0.3.0 to 0.3.1 * removed console * added readme and change log * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: Jagankumar <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * BUGFIX/HCMPRE-1821: Filter card tab change fix (#2206) changes * BUGFIX/HCMPRE-1438: Fixed Session storage and localization issue #2209 (#2209) Fixed Session storage and localization issue Co-authored-by: rachana-egov <[email protected]> * FEATURE/HCMPRE-2322 : Microplanning 0.2 release activities (#2210) Microplanning 0.2 release activity * BUGFIX/HCMPRE-1822: Minimum height in popInbox (#2208) changes done Co-authored-by: Nipun Arora <[email protected]> * BUGFIX/HCMPRE-2303 : Integrated with new loader (#2211) BUGFIX/HCMPRE-2303 : Integrated with new loader Co-authored-by: Jagankumar <[email protected]> * FEATURE/HCMPRE-2322 : Console 0.3.1 release activities update the logs * RELEASE/HCMPRE-1990: Updated the core & component version and updated the settings module loaders * FEATURE/HCMPRE-1438 : payment-module. Updated changelog and readme file (#2216) * Updated changelog and readme file * Update README.md --------- Co-authored-by: rachana-egov <[email protected]> * RELEASE/HCMPRE-1990 : Updated all the css versions --------- Co-authored-by: Swathi-eGov <[email protected]> Co-authored-by: suryansh-egov <[email protected]> Co-authored-by: NabeelAyubee <[email protected]> Co-authored-by: Nipun Arora <[email protected]> Co-authored-by: nabeelmd-eGov <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: abishekTa-egov <[email protected]> Co-authored-by: Swathi-eGov <[email protected]> Co-authored-by: Bhavya-egov <[email protected]> Co-authored-by: Ramkrishna-egov <[email protected]> Co-authored-by: rachana-egov <[email protected]> Co-authored-by: rachana-egov <[email protected]> Co-authored-by: pitabash-eGov <[email protected]> Co-authored-by: pitabash-eGov <[email protected]>
1 parent 04ba805 commit 5fdb5bd

File tree

197 files changed

+14573
-4332
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+14573
-4332
lines changed

.github/workflows/branch-name-check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
7070
# Validate the PR title length
7171
if [[ ${#pr_title} -lt $MIN_TITLE_LENGTH ]]; then
72-
echo "PR title '$pr_title' is too short. It must be at least $MIN_TITLE_LENGTH characters long."
72+
echo "PR title '$pr_title' is too short. It must be at least $MIN_TITLE_LENGTH characters long, excluding the default pattern or ticket number."
7373
exit 1
7474
fi
7575
+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
name: Blank Common Console Workflow
2+
on:
3+
push:
4+
branches: ['*'] # Trigger on any branch
5+
paths:
6+
- 'health/micro-ui/web/console/**'
7+
workflow_dispatch: # Enable manual triggering with inputs
8+
inputs:
9+
folder_name:
10+
description: 'Specify the folder for Docker build (default: console)'
11+
required: false
12+
default: 'console'
13+
14+
jobs:
15+
docker_image-build:
16+
outputs:
17+
run_job_digit_ui: ${{ steps.check_files.outputs.run_job_digit_ui }}
18+
runs-on: ubuntu-latest
19+
steps:
20+
- name: Checkout code
21+
uses: actions/checkout@v2
22+
with:
23+
fetch-depth: 2
24+
25+
- name: Setup Docker
26+
uses: docker/setup-buildx-action@v1
27+
28+
- name: Check modified files
29+
id: check_files
30+
run: |
31+
echo "=============== List modified files ==============="
32+
git diff --name-only HEAD^ HEAD
33+
34+
echo "========== Check paths of modified files =========="
35+
git diff --name-only HEAD^ HEAD > files.txt
36+
run_job_digit_ui=false
37+
while IFS= read -r file
38+
do
39+
if [[ $file == health/micro-ui/* ]]; then
40+
echo "This modified file is under the 'digit_ui' folder."
41+
run_job_digit_ui=true
42+
fi
43+
done < files.txt
44+
45+
# Set the output based on whether the job should run
46+
echo "::set-output name=run_job_digit_ui::$run_job_digit_ui"
47+
echo "ACTION_NUMBER=${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
48+
echo "COMMIT_ID=${GITHUB_SHA: -8}" >> $GITHUB_ENV # Extract last 8 characters of SHA
49+
echo "BRANCH_NAME=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
50+
51+
- name: Login to egovio Docker Container Registry
52+
env:
53+
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
54+
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
55+
run: |
56+
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
57+
58+
- name: Build and Push Docker images for digit-ui
59+
if: ${{ steps.check_files.outputs.run_job_digit_ui == 'true' }}
60+
run: |
61+
# Use input folder name or default
62+
DOCKER_IMAGE_VARIANT=${{ github.event.inputs.folder_name || 'console' }}
63+
echo "Original folder for Docker build: $DOCKER_IMAGE_VARIANT"
64+
65+
# Remove '-ui' if it exists in the folder name
66+
SANITIZED_FOLDER=${ORIGINAL_FOLDER//-ui/}
67+
echo "Sanitized folder for Docker build: $SANITIZED_FOLDER"
68+
69+
IMAGE_NAME_1=$DOCKER_IMAGE_VARIANT:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }}
70+
docker build -t $IMAGE_NAME_1 -f $SANITIZED_FOLDER/dockerfile . &
71+
72+
# Wait for the build to complete
73+
wait
74+
75+
# Tag and push Docker image
76+
docker tag $IMAGE_NAME_1 egovio/$IMAGE_NAME_1
77+
docker push egovio/$IMAGE_NAME_1
78+
79+
# Set outputs for the summary
80+
echo "IMAGE_NAME_1=egovio/$IMAGE_NAME_1" >> $GITHUB_ENV
81+
working-directory: health/micro-ui
82+
83+
- name: Display Docker images in Actions tab
84+
if: ${{ steps.check_files.outputs.run_job_digit_ui == 'true' }}
85+
run: |
86+
echo "First Docker image: ${{ env.IMAGE_NAME_1 }}"
87+
echo "::set-output name=first_image::$IMAGE_NAME_1"
88+
89+
- name: Show Docker images in job summary
90+
if: ${{ steps.check_files.outputs.run_job_digit_ui == 'true' }}
91+
run: |
92+
echo "## Docker images built and pushed:" >> $GITHUB_STEP_SUMMARY
93+
echo "- ${{ env.IMAGE_NAME_1 }}" >> $GITHUB_STEP_SUMMARY

build/build-config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ config:
5555
build:
5656
- work-dir: health/micro-ui/
5757
dockerfile: health/micro-ui/web/microplan/Dockerfile
58-
image-name: microplan-ui
59-
58+
image-name: microplan-ui
59+
6060
- name: builds/Digit-Frontend/health/console
6161
build:
6262
- work-dir: health/micro-ui/
6363
dockerfile: health/micro-ui/web/console/Dockerfile
6464
image-name: console
65-
65+
6666
- name: builds/Digit-Frontend/health/payments-ui
6767
build:
6868
- work-dir: health/micro-ui/

health/micro-ui/web/console/App.js

+124
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
/**
2+
* The above code initializes various Digit UI modules and components, sets up customizations, and
3+
* renders the DigitUI component based on the enabled modules and state code.
4+
* @returns The `App` component is being returned, which renders the `DigitUI` component with the
5+
* specified props such as `stateCode`, `enabledModules`, `moduleReducers`, and `defaultLanding`. The
6+
* `DigitUI` component is responsible for rendering the UI based on the provided configuration and
7+
* modules.
8+
*/
9+
import React from "react";
10+
import { initLibraries } from "@egovernments/digit-ui-libraries";
11+
import { Loader } from "@egovernments/digit-ui-components";
12+
import { DigitUI } from "@egovernments/digit-ui-module-core";
13+
import { UICustomizations } from "./Customisations/UICustomizations";
14+
import { initWorkbenchComponents } from "@egovernments/digit-ui-module-workbench";
15+
import { initCampaignComponents } from "@egovernments/digit-ui-module-campaign-manager";
16+
import { initUtilitiesComponents } from "@egovernments/digit-ui-module-utilities";
17+
import { initWorkbenchHCMComponents } from "@egovernments/digit-ui-module-hcmworkbench";
18+
19+
20+
window.contextPath = window?.globalConfigs?.getConfig("CONTEXT_PATH");
21+
22+
const enabledModules = [
23+
"DSS",
24+
"NDSS",
25+
"Utilities",
26+
// "HRMS",
27+
"Engagement",
28+
"Workbench",
29+
"HCMWORKBENCH",
30+
"Campaign"
31+
];
32+
const HCM_MODULE_NAME = "campaign";
33+
export const OverrideUICustomizations = {
34+
HCM_MODULE_NAME,
35+
}
36+
const setupLibraries = (Library, service, method) => {
37+
window.Digit = window.Digit || {};
38+
window.Digit[Library] = window.Digit[Library] || {};
39+
window.Digit[Library][service] = method;
40+
};
41+
/* To Overide any existing config/middlewares we need to use similar method */
42+
const updateCustomConfigs = () => {
43+
setupLibraries("Customizations", "commonUiConfig", { ...window?.Digit?.Customizations?.commonUiConfig, ...OverrideUICustomizations });
44+
};
45+
46+
47+
const moduleReducers = (initData) => ({
48+
initData,
49+
});
50+
51+
const initDigitUI = () => {
52+
53+
try {
54+
window.Digit.ComponentRegistryService.setupRegistry({});
55+
window.Digit.Customizations = {
56+
PGR: {},
57+
commonUiConfig: UICustomizations,
58+
};
59+
// initHRMSComponents();
60+
initUtilitiesComponents();
61+
initWorkbenchComponents();
62+
initWorkbenchHCMComponents();
63+
initCampaignComponents();
64+
updateCustomConfigs();
65+
} catch (error) {
66+
console.error('Failed to initialize DigitUI:', error);
67+
// Consider showing a user-friendly error message
68+
}
69+
};
70+
let initializationError = null;
71+
72+
const handleInitError = (error) => {
73+
console.error('Failed to initialize libraries:', error);
74+
initializationError = error;
75+
};
76+
77+
initLibraries().then(() => {
78+
initDigitUI();
79+
}).catch(handleInitError);
80+
81+
82+
83+
function App() {
84+
85+
const [stateCode, setStateCode] = React.useState(null);
86+
87+
const [isLoading, setIsLoading] = React.useState(true);
88+
React.useEffect(() => {
89+
// Add any necessary initialization checks here
90+
window.contextPath = window?.globalConfigs?.getConfig("CONTEXT_PATH");
91+
const code =
92+
window.globalConfigs?.getConfig("STATE_LEVEL_TENANT_ID") ||
93+
process.env.REACT_APP_STATE_LEVEL_TENANT_ID;
94+
setStateCode(code);
95+
setIsLoading(false);
96+
}, []);
97+
98+
if (isLoading) {
99+
return <Loader page={true} variant={"PageLoader"} />;
100+
}
101+
// Consider adding this to your App component:
102+
if (initializationError) {
103+
return <div>Failed to initialize application. Please refresh the page.</div>;
104+
}
105+
if (!stateCode) {
106+
return (
107+
<div className="error-container">
108+
<h1>Configuration Error</h1>
109+
<p>State code is not defined. Please check your configuration.</p>
110+
</div>
111+
);
112+
}
113+
return (
114+
<DigitUI
115+
stateCode={stateCode}
116+
enabledModules={enabledModules}
117+
moduleReducers={moduleReducers}
118+
defaultLanding="employee"
119+
allowedUserTypes={["employee"]}
120+
/>
121+
);
122+
}
123+
124+
export default App;
+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
FROM egovio/alpine-node-builder-14:yarn AS build
2+
#FROM ghcr.io/egovernments/alpine-node-builder-14:yarn AS build
3+
RUN apk update && apk upgrade
4+
RUN apk add --no-cache git>2.30.0
5+
ARG WORK_DIR
6+
WORKDIR /app
7+
ENV NODE_OPTIONS "--max-old-space-size=4792"
8+
9+
COPY ${WORK_DIR} .
10+
RUN ls -lah
11+
12+
#RUN node web/envs.js
13+
RUN cd web/ \
14+
&& node -e 'console.log(v8.getHeapStatistics().heap_size_limit/(1024*1024))' \
15+
&& node -e 'console.log("health-console only")' \
16+
&& cd console/ \
17+
&& chmod +x ./install-deps.sh \
18+
&& ./install-deps.sh \
19+
&& cd ../ \
20+
&& yarn install \
21+
&& yarn build:webpack
22+
23+
FROM nginx:mainline-alpine
24+
#FROM ghcr.io/egovernments/nginx:mainline-alpine
25+
ENV WORK_DIR=/var/web/console
26+
27+
RUN mkdir -p ${WORK_DIR}
28+
29+
COPY --from=build /app/web/build ${WORK_DIR}/
30+
COPY --from=build /app/web/console/nginx.conf /etc/nginx/conf.d/default.conf
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/sh
2+
3+
BRANCH="$(git branch --show-current)"
4+
5+
echo "Main Branch: $BRANCH"
6+
7+
INTERNALS="micro-ui-internals"
8+
cd ..
9+
10+
cp console/App.js src
11+
cp console/package.json package.json
12+
cp console/webpack.config.js webpack.config.js
13+
cp console/inter-package.json $INTERNALS/package.json
14+
15+
cp $INTERNALS/example/src/UICustomizations.js src/Customisations
16+
17+
echo "UI :: console " && echo "Branch: $(git branch --show-current)" && echo "$(git log -1 --pretty=%B)" && echo "installing packages"
18+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
{
2+
"name": "egovernments",
3+
"version": "1.0.0",
4+
"main": "index.js",
5+
"workspaces": [
6+
"packages/modules/campaign-manager"
7+
],
8+
"author": "JaganKumar <[email protected]>",
9+
"license": "MIT",
10+
"private": true,
11+
"engines": {
12+
"node": ">=14"
13+
},
14+
"scripts": {
15+
"start": "SKIP_PREFLIGHT_CHECK=true run-s build start:dev",
16+
"sprint": "SKIP_PREFLIGHT_CHECK=true run-s start:script",
17+
"start:dev": "run-p dev:**",
18+
"start:script": "./scripts/create.sh",
19+
"dev:css": "cd packages/css && yarn start",
20+
"publish:css": "cd packages/css && yarn publish --access public",
21+
"dev:example": "cd example && yarn start",
22+
"dev:campaign": "cd packages/modules/campaign-manager && yarn start",
23+
"build": "run-p build:**",
24+
"build:campaign": "cd packages/modules/campaign-manager && yarn build",
25+
"deploy:jenkins": "./scripts/jenkins.sh",
26+
"clean": "rm -rf node_modules"
27+
},
28+
"resolutions": {
29+
"**/@babel/runtime": "7.20.1",
30+
"**/@babel/traverse":"7.25.9",
31+
"**/babel-preset-react-app": "10.0.0",
32+
"**/@jridgewell/gen-mapping": "0.3.5",
33+
"**/ajv": "8.11.2",
34+
"fast-uri":"2.1.0"
35+
},
36+
"devDependencies": {
37+
"husky": "7.0.4",
38+
"lint-staged": "12.3.7",
39+
"npm-run-all": "4.1.5",
40+
"prettier": "2.1.2"
41+
},
42+
"husky": {},
43+
"lint-staged": {
44+
"*.{js,css,md}": "prettier --write"
45+
},
46+
"dependencies": {
47+
"lodash": "4.17.21",
48+
"microbundle-crl": "0.13.11",
49+
"@egovernments/digit-ui-react-components": "1.8.2-beta.18",
50+
"@egovernments/digit-ui-components": "0.0.2-beta.1",
51+
"react": "17.0.2",
52+
"react-dom": "17.0.2",
53+
"react-hook-form": "6.15.8",
54+
"react-i18next": "11.16.2",
55+
"react-query": "3.6.1",
56+
"react-router-dom": "5.3.0"
57+
}
58+
}
+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
server {
2+
listen 80;
3+
underscores_in_headers on;
4+
5+
location /console {
6+
root /var/web;
7+
index index.html index.htm;
8+
9+
# Serve static files and fallback to index.html for SPA routing
10+
try_files $uri $uri/ /console/index.html;
11+
12+
# Cache static assets (JS, CSS, images, fonts) for 1 year
13+
location ~* \.(?:js|css|png|jpg|jpeg|gif|svg|ico|woff|woff2|ttf|eot|otf|ttc|map)$ {
14+
add_header Cache-Control "public, max-age=31536000, immutable";
15+
}
16+
17+
# Cache HTML files for a shorter period to ensure updates are reflected
18+
location ~* \.html$ {
19+
add_header Cache-Control "no-cache, must-revalidate";
20+
}
21+
}
22+
}

0 commit comments

Comments
 (0)