From 6faf040bfecdc9b023e5578adf1e8c3480c8458b Mon Sep 17 00:00:00 2001 From: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Date: Wed, 26 Apr 2023 15:22:54 +0530 Subject: [PATCH] 2.9-beta Urban Code merge from DIGIT-Dev master (#81) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * UM-5301 : TL updated the mdms and validation condition in units (#4675) * UM-5301 : TL updated the mdms and validation condition in units * UM-5301 : Created new component for inital units code logic * Pay now link changed (#4677) * Master 5270 (#4678) * migration file renamed * migration file fix * UM-5301 : TL UI solved the issue of cache value for new application creation (#4728) * UM-5297 OBPS::citizen::After clicking on view applications by citizen redirecting to something went wrong screen (#4729) * Added permanentAddress for unmasking (#4730) * Updated WnS Modify Application validation condition (#4731) * UM-5315, UM-5311 mCollect::Toast message not showing (#4732) * UM-5315, UM-5311 mCollect::Toast message not showing * UM-5315, UM-5311 updated versions * UM-5134 the disconnection calculation change (#4733) * UM-5314 Added effective date from for dicsonnection * UM-5314 Added math absolute for disconnection calculation * UM-5134 Corrected calculation logic for disconnection (#4734) * UM-5134 Changed the condition for calculation * UM-5314 corrected the calculation logic * UM-5314 chnaged demand search url param * UM-5314 Changed the billing service ulr params fro demand search * Resolved calculation logic for disconnection * Changed the name of constant status * UM-5314 Changed the constant name of the status * Support for (#4742) amendmentreason,reasondocumentnumber,effectivefrom,effectivetill in amendmentUpdateRequest * [UM-5313]-Added changes for AmendmentUpdate query (#4744) * Added changes for AmendmentUpdate query * Update * Update CODEOWNERS * Update CODEOWNERS * Update CODEOWNERS * Update CODEOWNERS * Update CODEOWNERS * [UM-5320]-WnS Payment Notifications For Disconnection (#4749) * WnS Payment Notifications For Disconnection * SW Payment Notif update * Comments updated for condition * Update CODEOWNERS * Update CODEOWNERS * UM-5339,UM-5323, UM-5324 hot fixes (#4753) * [UM-5280]-Changed DonloadReceipt links for notifications (#4754) * Update CODEOWNERS * Update CODEOWNERS * UM-5357, UM-5325 W&S :: Resubmit is not working for WnS new connection (#4760) * UM-5349 W&S :: Connections additional details are not reflected on Citizen (#4762) * [UM-5330,UM-5329,UM-5326,UM-5346] : TL UI employee and citizen, new application and renewal bug fixes (#4769) * Added isAudit condition for property search decryption condition (#4768) * Updated search for consumerCode (#4771) * [UM-5328]-Changes for WnS email notifications. (#4761) * Changes for WnS email notifications. 1.) The email notifications are triggering as expected 2.) Notification/sms/mail is being triggered for the 0 amount in disconnection 3.) If the amount of demand generated or meter reading is added to be collected, then that has to be redirected to my bills -->Bill details ( but it's redirecting to the applications page) * Updated receipt link * Updated application download link with application details link * Removed commented code. * Updated message template for payment email notif * UM-5334 inbox api failing when trying to search for invalid applications (#4767) * UM-5334 replacing stream with for loop for empty processinstance search results. * UM-5345 changing class type * UM-5345 adding null check above for loop * UM-5345 removing comments and empty check for process instance * UM-5345 refractoring code * Updated open rowmapper (#4774) * UM-5345 sending notification for only primary owner (#4764) * Updated connectiondetails old UI link to new UI link (#4775) * UM-5335 moving unique mobileno validation above enrichment call (#4776) * UM-5335 moving unique mobileno validation above enrichment call * UM-5335 moving unique mobileno validation above enrichment call * UM-5333, UM-5344 OBPS::Not showing the application details proper after stake holder registration (#4777) * [UM-5329,UM-5348,UM-5363] : TL fixes for units and acessories for create and renewal flow (#4778) * UM-5333 updated versions of obps (#4779) * UM-5333 OBPS::Not showing the application details proper after stake holder registration (#4780) * UM-5333 updated versions of obps * UM-5333 OBPS::Not showing the application details proper after stake holder registration * Notif ws issues resolved (#4782) * Conditon for 0 payment bill generation * Notif links and disconn edit template issue resolved * [UM-5329,UM-5337,UM-5349] : WS TL UI fixes, billing slab error fixes and connection details changes (#4781) * UM-5327 Disconnection Calculation changes (#4763) * UM-5327 Added the code for disconnection demand creation * UM-5327 Added decimal value in condition * UM-5327 Added else if condition for disconnection demand generation * UM-5327 Changed demand search url for disconnection * UM-5327 Demand generate changes * UM-5327 Added the demand generation calculations for sewerage Co-authored-by: hinamakhija-eGov * Changed the metered billing code for disconnection (#4783) * UM-5458, UM-5470 OBPS::citizen:: showing applications which were created with another number (#4784) * UM-5458 Updated OBPS version (#4788) * Added division logic (#4785) * UM-5458 Updated OBPS versions (#4789) * [UM-5326] : fixed the address component when redirection from property in TL and employee billing slab issue fix while renewal (#4787) * [UM-5332,UM-5459,UM-5445,UM-5480] : PT mutation transferror details fix in check page,OBPS cache issue in bpareg in obps, WS disconnection payment update fix for partial payment, TL fix for workflow documents no present in citizen side (#4790) * UM-5361 : TL accessory input fix while renewal (#4795) * OBPS version upgraded. (#4793) * OBPS version upgrated. * OBPS version updated * [UM-5459,UM-5477,UM-5482] : OBPS Issue rerading worflow timeline, alignment issue in inbox and cache issue are fixed (#4797) * UM-5482 : OBPS Increment version and removed extra console.log (#4803) * Added exception for division logic (#4798) * UM-5489 OBPS & TL:: Report issues (#4806) * [UM-5501,UM-5496] : PGR style issue fixed and obps edit issues fixed for locality (#4807) * [UM-5496,UM-5497,5504] : TL create flow fixes and obps fix for pincode and oc and permit flow (#4809) * UM-5489 OBPS & TL:: Report issues (#4810) * UM-5489 OBPS & TL:: Report issues * UM-5489 OBPS & TL:: Report issues * UM-5489 OBPS & TL:: Report issues (#4813) * [UM-5505,UM-5506] : TL UI fixes for create and renewal (#4815) * [UM-5523,UM-5524,UM-5525,UM-5508] : TL fixes for renewal flow and ws fixes (#4816) * [UM-5524,UM-5526] : TL renewal fixes corrosponding to property and ot… (#4821) * [UM-5524,UM-5526] : TL renewal fixes corrosponding to property and other small fixes * TL Renewal undefined error fix * Calculation update for final charges of W&S disconnection applications (#4824) * UM-5526 : TL fixes for renewal and edit flow from send back from DV (#4825) * UM-5531 OBPS::showing incorrect architect name (#4826) * asasdsad * UM-5531 OBPS::showing incorrect architect name * [UM-5012] : TL UI consumer number integration in inbox (#4828) * Added null checks to Property owner details (#4829) * Updating the select street component from fsm to tl (#4831) * TL Fix for build in components (#4833) * UM-5477 OBPS:: Inbox Application status option not showing the count and not aligned proper (#4834) * UM-5477 OBPS:: Inbox Application status option not showing the count and not aligned proper * UM-5477 OBPS:: Inbox Application status option not showing the count … * Removed Sewerage cess from sewerage disconnection calculation (#4835) * [UM-5012] : added consumer field to bill amendment screen and send back to citizen fixes for TL (#4840) * TL WS fix for send back to citizen and pdf issue (#4842) * [UM-5337,UM-5356] : OBPS fix related to edit if edcr search and 3rd and 4th fix for product sepcific pages (#4847) * [UM-5548,UM-5543,UM-5545] : OBPS alignment and tl renewal issue fix (#4849) * UM-5524 : TL fix for citizen renewal property change and routing (#4859) * [UM-5556,UM-5557] : TL application type update for search result, consumer code change from cronsumer number in Bill Amendment inbox, WS adding of scroll bar in inbox (#4863) * updated consumerCode param for Bill Amendment inbox (#4866) * TL UI fix for edit renewal in citizen side (#4871) * OBPS:StakeHolders Notifications-Event and Email Notifications Changes (#4880) * [UM-5539] : WS APK issues employee side and tl renewal issue (#4881) * UM-5536 TL:Reports::when searching TL Reports screen getting stuck & taking a long time to get search results and navigating to other report screens * UM-5536 :: Fixed Report issue loading issue , incorporated the TL Pending report Elapsed time red color column and show NA if value is null and - in case of Number Null * UM-5531 OBPS::showing incorrect architect name (#4885) * #SM-1705 provision to dso to create application with his number (#4887) * #SM-1705 Submitted applications from ULB side do not show at FSTP account * #SM-1688 and #SM-1705 given provision to dso to create application as a citizen * UM-5536 adding payment link replacement in email notif (#4886) * [UM-5539] : WS APK alignment fix and mobile number redirection (#4889) * [UM-5568] - Updated Payment notifications logic to fetch emails using uuids (#4890) * changed code for payment notifications * Update * Updated Payment notif logic for Sewerage flow * _encryptOldData update- added support for tenantIds search (#4891) * Added tenantId support for oldDataEncryption service. * Updated mdms state search method * Updated finalList response of property and sewerage. * Removed splitting of tenantId in mdms search * Added check for plumberInfo for modify and disconnection flows (#4896) * UM-5570, UM-5573, UM-5575 OBPS::APK::stakeholder flow UI issues (#4897) * [UM-5539,UM-5560,UM-5564] : WS Product Specific pages and Bill Amendm… (#4899) * [UM-5539,UM-5560,UM-5564] : WS Product Specific pages and Bill Amendment APK issues fixes * Update useInboxMobileCardsData.js * SM-1134: UAT Blank page is displayed when FSTPO clicks on Add New Vehicle Entry (#4898) Co-authored-by: nabeelmd-eGov * UM-5511, UM-5536 :: Report loading issue, localisation prefix issue , application status custom logic added * UM-5575 OBPS::APK::Alignment issues in permit & OC flows (#4902) * UM-5511 : Report localisation issue fix to work even with no localisationPrefix * [UM-5539,UM-5560] : WS phone number redirection in apk, & product sepcific pages down arrow alignment (#4904) * enc missing flow fix (#4905) Co-authored-by: kavi_elrey <25226238+kavi-egov@users.noreply.github.com> * UM-5575 updated css version (#4906) * [UM-5565,UM-5539] : WS Fixes in bill amendment and PT fixes in APK (#4907) * [UM-5565,UM-5539] : WS Fixes in bill amendment and PT fixes in APK * TL alignment fix in create screen * UM-5575 OBPS APK issues (#4910) * [UM-5579] - Fuzzy search fix (#4908) * Added data push to fuzzy topic * Push data for fuzzy search * PT fuzzy search url changed * Updated fuzzy search data push for _create api * [UM-5539,UM-5584] : bill amendment amount fix and scrolling fix in inbox tl (#4911) * Added decryption for pt fuzy search (#4912) * UM-5539 : Redirection of mobile number after unmasking (#4914) * [UM-5603,UM-5539] : Bill Amendment removed the redirection link from inbox and redirection of mobile number fix (#4915) * UM-5600 Missing localisation key_permit conditions (#4916) * UM-5600 Missing localisation key_permit conditions (#4917) * UM-5600 Missing localisation key_permit conditions * UM-5600 Missing localisation key_permit conditions * [UM-5607] : able to delete right question, survey details fix (#4920) * [UM-5613] : Survey UI fix for multiple and checkbox option in hindi (#4921) * [UM-5607] : survey edit screen different question (#4922) * UM-5598 removing static URLs from Inapp Notifications for OBPS and Stakeholder Flow (#4913) * UM-5598 removing static links from obps inapp notifications * UM-5598 removing static links from obps stakeholder inapp notifications * UM-5598 adding action button for Portal link * UM-5598 adding action button for Portal link * [UM-5611,UM-5356] : Survey fix for owner in result view and channel from citizen side * UM-5572 :: Download issue fix for download certificate * UM-5592 OBPS and NOC hot fixes (#4930) * [UM-5620,UM-5621] : Survey UI employee side fixes (#4931) * [UM-5620,UM-5621] : Survey UI employee side fixes * [UM-5620] : survey UI updated the width for dropdown question * Update HomePageWrapper.scss Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> * UM-5594, UM-5622, UM-5593 eDCR search_disabled if wrong value is entered (#4932) * UM-5596, UM-5622 fire NOC::Issues in create application (#4933) * UM-5622 fire NOC::Issues in create application (#4934) * DPG-1197 :: Core Update Password Update index.js (#4938) updated the url for change password * [UM-5629] : SURVEY UI Adding validation for name for edit flow (#4940) * UM-5589 Fire NOC is having application view as a link in the doc attachment (#4941) * UM-5251 Inbox: "Assign to me" Filter not working (#4942) * Removed isAudit condition for decryption in search call (#4944) * Update old-property encryption in update flow (#4947) * [UM-5627,UM-5630] : Survey UI api request param added and PT UI fix for citizen error (#4945) * UM-5599 added mobile number in the search request (#4950) * [UM-5624,UM-5634] : Survey UI edit flow fixes for duplicate name, result view email id not showing fix and citizen respond UI validation from notification fix (#4948) * UM-5322 PT: Mutation flow: In Acknowledgement Form only one Transferor Details are present. (#4951) * UM-5599 removing uuid from search criteria while searching with mobil… (#4949) * UM-5599 removing uuid from search criteria while searching with mobilenumber * UM-5599 Removing commented code * UM-5595 : UI side bar is getting scrolled to top (resetting to default) whenever opened (#4952) * UM-5638 FireNOc::citizen::create application issues (#4953) * UM-5322 PT: Mutation flow: In Acknowledgement Form only one Transferor Details are present. (#4958) * UM-5642 fire NOC:: Edit screen issues & building type issue (#4961) * UM-5561 : Bill genie APK issue fixes (#4965) * UM-5511 :: TL Report Application status custom change added * UM-5614 User search host issue (#4957) * UM-5614 adding logs * UM-5614 removing '_beta' from version. * UM-5614 adding logs * UM-5614 adding logs * UM-5614 adding logs * UM-5614 changing User Host * UM-5614 fixing search query's substring end-index * UM-5614 removing logs * UM-5614 adding AND to the created time were clause * UM-5608 Airport NOC Update Issue (#4963) * UM-5608 adding exception * UM-5608 adding exception * UM-5608 adding logs * UM-5608 adding validation in update flow for auro approve Issue * UM-5608 removing validations and logs that are not required * [UM-5347] : OBPS UI made the button overlay for application details (#4971) * cleanup * Added audit table and updated topic name for data push in wns enc (#4959) * UM-5648 returning if landinfo search with mobilenumber is empty (#4976) * UM-5648 returning if landinfo search with mobilenumber is empty * UM-5648 return empty list * Improved _encryptOldData api for audit table data & disabled this api (#4982) * Improved _encryptOldData api for audit table data & disabled this api * added lastmodifiedtime back in the plainsearch query * Update CHANGELOG.md * Update pom.xml * Commented the property enc code --------- Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com> * Updated pom versions and changelog.md files (#4985) * [UM-5608] : OBPS UI adding validation before NOC update (#4974) * [UM-5608] : OBPS UI adding validation before NOC update * [UM-5608] : Updated the condition for Noc update calls and Added condition for privacy info tag in ws * UM-5644, UM-5643 fire NOC::Not showing the information related to property details (#4991) * UM-5635 : Survey UI changes regarding edit flow question array and obps fixes (#4992) * UM-5634 : Survey UI, added the updated request params for MarkInactive, MarkActive and delete (#4994) * UM-5669, UM-5649 OBPS::changes for search BPA Application in architect inbox (#4996) * firenoc search fix (#4995) Co-authored-by: kavi_elrey <25226238+kavi-egov@users.noreply.github.com> * UM-5659 Firenoc citizen search changes (#4990) * UM-5659 changes for citizen search with mobileno * UM-5659 changing query and db response * UM-5659 changing query and db response * changing type of firenocIds to let * UM-5659 modifying query * importing function from utils * UM-5659 formatting code and removing logs * UM-5669 OBPS::changes for search BPA Application in architect inbox (#5004) * UM-5663 fireNOC::create application flow issues (#5005) * Updated versions for services (#5002) * Updated versions for services * Updated version and Changelog for municipal services --------- Co-authored-by: Priyanka-eGov * added survey to master (#5013) Co-authored-by: debasishchakraborty-egovt * UM-5655 : Added change (#5016) Co-authored-by: debasishchakraborty-egovt * Update UserService.java (#4972) * UM-5683: added change to restrict send event to citizen if survey is not active. (#5018) Co-authored-by: debasishchakraborty-egovt * UM-5650 : OBPS UI owner details added the validation for checking from database and architect supervisor role (#5020) * UM-5644 fire NOC::Not showing the information related to property details (#5022) * UM-5683: added change to restrict send event to citizen if survey is NOT ACTIVE (#5024) * UM-5683: added change to restrict send event to citizen if survey is not active. * UM-5683: added change to restrict send event to citizen if survey is not active. * UM-5683: added change to restrict send event to citizen if survey is not active. --------- Co-authored-by: debasishchakraborty-egovt * Removed _beta versions from business-services and utilities (#5017) * UM-5685 : Survey UI redirectiong from notification of delete and active survey, required style componenet added (#5029) * [DPG-959] Added bulk property pdf generation (#4756) * UM-5615 : added changes in status message and status for sendVerification (#5031) Co-authored-by: debasishchakraborty-egovt * UM-5684 FireNOC:: Issues in citizen & employee side (#5032) * UM-5043 Sorting is disabled in reports. (#5034) * UM-5043 Disabled only date sorting (#5035) * UM-5585 : Product specific pages ::APK::Not able to play the video in how it works screen #5036 * masterFixForinappNotification: reverting changes now for both active and inactive survey will get notified (#5038) Co-authored-by: debasishchakraborty-egovt * UM-5644 fire NOC::Not showing the information related to property details (#5040) * [UM-5687,UM-5689] : Survey fixes UI employee and citizen side, review changes from PO (#5041) * Pom and changelog changes for core-services (#5043) * WS UI Fix for modify application (#5051) * UM-443 added firenoc inbox (#5054) * UM-5704 fireNOC::showing incorrect billing period after payment (#5055) * UM-5644 fire NOC::Not showing the information related to property details (#5057) * [DPG-1211,UM-5590] : updated the API curl for update password conditionally and corrected the validation for email in user profile update (#5056) * UM-5642 Added condition for firenoc approver login (#5059) * UM-5723 fireNOC::UI issues (#5062) * Version updates of Old and New UI (#5070) * Version updates of Old and New UI * Updated DSS version of mono UI * Updated Reports Versions * Added ChangeLog file (#5074) * UM-5728 fireNOC::If Number of basements is Zero it was not autopopulating in new with provision number & only at summary screen its showing (#5075) * Added financial year logic for TL (#5076) * Added financial year logic for TL * Added financial year logic for TL * UM-1308 OBPS_Application status report (#5078) * UM-1308 OBPS_Application status report (#5097) * Backend developer guide (#5067) * Stage-1: Basic Developer Guide * Stage-2: Integrated with IdGen Service * Stage-2: Integrated with User Service * Stage-2: Integrated with Workflow Service * Stage-3: Integrated with Url Shortener * Stage-3: Integrated Payment Back Update Consumer * Stage-3: Added Indexer config * Stage-3: Added certificate generation(pdf) config * Stage-4: Added BTR Calculator * Stage-4: Integrated with BTR Calculator * Notification sw-calc (#5091) * Updated Url shortener for sw calc * Update * UM-5726 Fire noc reports hot fixes (#5117) * #SM-1902 fsm service code migration fron dev to uat (#5128) * #SM-1902 fsm service code migration fron dev to uat * #SM-1902 replace with existing one * UM-5725 : Forgot password cache issue fixed without login (#5127) * #SM-1910 code migration from dev to uat (#5132) * #SM-1910 code migration from dev to uat * #SM-1910 code migration from dev to uat * #SM-1910 code migration from dev to uat * #SM-1903 and SM-1911 develop to master merge (#5136) * Sm 1911 Merging Dev code to Master Branch (#5149) * #SM-1911 vehicle flyway issue fixed * SM-1911 Pom file version change * UI package dependency version incremented for 2.8 * [5754,5755,5756] :UI DSS total amount rounding amount fixed a… (#5146) * [UM-5749,5754,5755,5756] :UI DSS total amount rounding amount fixed and PT usage category null value condition added and tl validation updated for institute name * Reverting the changes of DSS 5749 * SM-1905,SM-1904: Code Migration from Dev to Master for v1.3 (FSM) (#5126) * SM-1905: Migration from dev to master in progress for FSM * SM-1905: css changes for FSM wip * SM-1905: Css migration from dev to uat for FSM * SM-1904: Code migration to master * UI/UX +91 component fix * SM-1905:Added css * SM-1905:Removed hardcoded code * SM-1905:Added unmask component * SM-1905: Added fsm packages/fsm & build:fsm in package.json * SM-1905: Updated veriosn +1 * SM-1905: Updated package.json * SM-1905: Updated package.json * SM-1905: Updated libraries version & common pacakge version by +1 * SM-1905: Added fsm modules in package.json * SM-1905: Updated react componnets package.json +1 * SM-1905: Updated package.json * SM-1904/SM-1905: Added pincode fix and +91 component * SM-1905: Updated css version +1 * SM-1905: Updated index.html * SM-1905: Added missing code for payment modules * SM-1904: Resolving review comments * SM-1904: Resolving PR comments * SM-1904 CSS upgrade --------- Co-authored-by: jagankumar-egov Co-authored-by: nabeelmd-eGov * SM-1933: ULB: In UAT Collect payment page showing NAN for Total Amount (#5165) * SM-1933: Fixed total amount * SM-1933: Fixed total amount * SM-1941: FSTP, Zero Pricing, Back Button fix, TL component fix (#5167) Co-authored-by: nabeelmd-eGov * SM-1938:UAT-Payment link crashing when opened on mobile (#5171) * SM:1938: Authorization bill payment WIP * SM-1938: Fixed link url issue * SM-1945/SM-1944: Localisation key fix and FSTP error message fix (#5174) Co-authored-by: nabeelmd-eGov * Removed username&password from elasticsearch req headers for privacy-audit (#5178) * Removed usernme and pwd from headers * Removed username&password from elasticsearch req headers frprivacy-audit * Added service-request build config (#5195) * SM-1952/SM-1951/SM-1950/SM-1949: Date field disabled, future date fix, Back to vendor details fix (#5207) Co-authored-by: nabeelmd-eGov * SM-1954/SM-1953: Collect screen owner mobile number showing fix, advance balance refetch when Locality change fix (#5215) * SM-1954/SM-1953: Collect screen owner mobile number showing fix, advance balance refetch when Locality change fix * SM-1953: adding comments --------- Co-authored-by: nabeelmd-eGov * required merge access (#5204) * resolved conflicts * #SM-421 modified change log (#5254) * FSM Updated the Digit-ui package version to 1.6.1 (#5264) Co-authored-by: nabeelmd-eGov * #SM-1982 provision to create dso fsm application from citizen side (#5306) * #SM-1981 fixed my application list for dso in citizen portal (#5307) * [UM-5923] : updating the name of selectereet componenet in TL (#5310) * [UM-6013] : updated the conditional check for getting FY for request … (#5325) * [UM-6013] : updated the conditional check for getting FY for request body * UM-6013 : incremented the TL module version * SM-2099/SM-2111/SM-1980: Remove Mobile number, payment method and pay now flow fix (#5323) * SM-2111: Pre Pay flow not working fix * SM-2099 Remove Payment Type * SM-1980 remove driver mobile number * SM-2099 * SM-2099 package version upgrade --------- Co-authored-by: nabeelmd-eGov * SM-2111: Update trips post pay flow fixed (#5349) Co-authored-by: nabeelmd-eGov * #SM-1980 Mobile Number sequence implemented for Driver (#5330) * UM-6013 updated the version in web package in order to solve build issue (#5353) * version update for libraries in web package.json * version update for common and fsm in web package.json * SM-2171, Vendor show NA when disable fixes (#5355) Co-authored-by: nabeelmd-eGov * #SM-2110 fixed for old application (#5357) * SM-1980: Driver Submit button fix (#5358) Co-authored-by: nabeelmd-eGov * SM-2138 FSTO redirection page fix (#5364) Co-authored-by: nabeelmd-eGov * #SM-2181 fixed for pre-pay application (#5369) * SM-2197: DSO Pay action hide fix (#5373) Co-authored-by: nabeelmd-eGov * SM-2196: Update application redirection fix (#5371) Co-authored-by: nabeelmd-eGov * #SM-2130 modified query (#5374) * #SM-2130 modified (#5377) * SM-2141 clock icon disable fstp (#5387) Co-authored-by: nabeelmd-eGov * #SM-2212 added citizen role for dso (#5389) * #SM-2099 removed validation for received payment (#5386) * SM-2225: Collect Payment Hide for dso (#5392) Co-authored-by: nabeelmd-eGov * #SM-2249 fixed (#5408) * UM-5999 Merging develop to master (#5422) * DPG-957 : Basic backend Developer Guide (#4453) * Stage-1: Basic Developer Guide * Stage-2: Integrated with IdGen Service * Stage-2: Integrated with User Service * Stage-2: Integrated with Workflow Service * Setting oldapplication to true when disconnection is executed (#4499) * Setting oldapplication to true when disconnection is executed * Added variable for action from request * [UM-1265, UM-5159] Property payment event notification issue (#4505) * UM-1265 incorporating decryption for property owners in assessment notification flow. * UM-1265 adding import statement * UM-1265 adding internal microservive user uuid * UM-1265 unmasking owner details in property object * UM-1265 modifying user search call for event notification to search by mobileno as username * UM-1265 modifying user search call for event notification to search by mobileno as username * UM-1265 adding try catch block * UM-1265 removing getAllFieldsPlainAccessList function * [UM-5157] - Updated models for user. (#4508) * Updated Pagination for plainSearch(for oldData Encryption) (#4394) * Updated Pagination for plainSearch(for oldData Encryption) * Removed commented code * Added prepay for citizen (#4521) * #SM-1435 UI redirect citizen payment (#4525) * Changed tenantId for Inbox encryption (#4534) * UM-1280 WS Disconnection Notification changes (#4533) * UM-1280 adding sw notification changes and removing stream for duplicate mobile numbers * UM-1280 adding correct mapnames * UM-1280 adding decryption for water connection holder and property owner object * UM-1280 replacing unmasking method with decryption method * UM-1280 changing decyption model name * UM-1280 changing path for decryption * UM-1280 resetting userinfo in requestinfo to original userinfo * UM-1280 adding sw notification changes for event issue * UM-1280 adding sw notification changes for event issue * Pgr noc land (#4569) * RAIN-4136:Mcollect few audit fixes (#1063) * RAIN-3995: MY payments for property (#1061) * RAIN-3995: MY payments for property * RAIN-3995: Review changes and fixes * RAIN-4136: Rremoved unwanted code * RAIN-3944 :UI : SEARCH APPLICATION FOR PT(#1062) * RAIN-3944 : SEARCH APPLICATION FOR PT * unwanted code removed * RAIN- 3993 :: UI Audit: Search Property [Citizen/ Employee] (#1064) * PT EMP Search screen revamp * PT Search screen formatted and integrated * Added validation ,fixed form and added toast , roles * EMployee Search screen modified and Mobileview enabled with all validations * Modified css for the reset button employee * form warning removed * Correceted the links and added search links in home screen * intermediate minor change for enable citizen * citizen side search fields modified * RAIN-3993 : PT Citizen search modified with latest search params * RAIN-3993 : PT Citizen side search screen integraeted with all validations and localisations * RAIN-3993: PT Search property enabled with search config * Added Search App * RAIN-4545 :: UI Audit: Update property application [Employee] (#1067) * RAIN-4545 : Employee update property show the onwer details initial commit * RAIN-4545 : Property update show owner data formated * Update EditForm.js * RAIN-3831 :: Citizen - View Property: Change mobile number (#1066) * RAIN-3831 : PT Citizen update number feature * RAIN-3831 : PT Update no popup integrated * RAIN-3831 : PT Modified few alignments and integrated with login / authenticate/regisetr apis * RAIN-3831 : PT Update no integrated with the Update proeprty api with all validations and toast messages * RAIN-3831 : PT UPdate number citizen handled all uses case converted to reducer * RAIN-3831 : PT Citizen update number added mdms config integration * RAIN-3830 : PT Employee init commit of update no creation * RAIN-3830 : PT EMployee code cleaned up and made seperate request * RAIN-3830 : PT Update no integrated with EMployee * RAIN-4583, RAIN-4585, RAIN-4586 WNS Intial commits (#1070) * RAIN-3993 : PT AUdit search unit test issue fixed (#1071) * RAIN-3993 : PT AUdit search unit test issue fixed * removed log * RAIN-4585 added WS Module in Package and app files (#1074) * Update property-services.yml (#1080) * [RAIN-4697]: Added null checks (#1078) * [RAIN-4697]: Added null checks * [RAIN-4717] : Fixed cron job bug * [RAIN-4697] : Removed null checks * Revert "[RAIN-4697] : Removed null checks" This reverts commit 1c753273588c97a2e4fe644685c4b08169eeb77e. * Revert "[RAIN-4697]: Added null checks" This reverts commit 670feb9de5023d1ffced87a6270e666ea097909f. * RAIN-3871 : PT My Payments integrated with the employee property info screen (#1083) * RAIN-3871 : PT Payment details in employee RAIN-4605 : PT Payment details screen added to the employee property info screen * RAIN-3871 : PT My Payments integrated with the employee property info screen * Update Receipts.js * [RAIN-4719] : Added alternate mobile number to sms requests (#1088) * fixed PGR RAIN-4703 by adding PDF identification util and adding that in PGR module (#1095) * RAIN-4712 Fixed issue BPA inbox is not rendering when submit appln for (#1099) multiple citiex * RAIN-3553: WS Search & Pay - open & normal (#1097) * RAIN-3553: WS Search & Pay - open & normal * RAIN-3553: changing alert to Toast * RAIN-3553: Review changes * RAIN-3553: Review changes * RAIN-4114 RAIN-4115: TL UI Audit task (#1073) * code cleanup and RAIN-4114 RAIN-4115: * removed debugger * added fields for institutional details * fixed create flow * Added expired applications in search api (#1104) * Added expired applications in search api * Updated the query * RAIN-3869 : PT Assessment screen citizen side enhancement for diff type proeprty (#1100) * RAIN-3869 : PT UI AUdit - Integration with api for flat and vacant RAIN-3869 : PT Assessment initial commit RAIN-3869 : PT Units added for the flat type property RAIN-3869 : PT Assessment flow modified for the units flat type property RAIN-3869 : PT Independent property initial commit * RAIN-3869 : PT Assessment land area issue fix for independent proper * Fixed the independent proeprty create * base ment enabled for create * formating done and removed few loggers * RAIN-3869 : PT Modified for few review comments * TL Search: Status fixes for different business services (#1111) * Rain 3830:UI PT : Employee - View Property: Update mobile number (#1113) * RAIN-3830 : PT Update no initial config * RAIN-3830 : PT Update No field added for active property * COde formatted * Rain 4353 4311 4736:: UI Fixes on Mcollect and bpa inbox screens (#1117) * fixed bug RAIN-4736 * fixed RAIN-4353, RAIN-4311 * RAIN-4745-4749: Close icon and refresh icon added in mobile view (#1119) * RAIN-4690 adding offset and limit (#1090) (#1102) * OBPS-TL : pincode cache problem fixed and TL localisation issue fixed (#1128) * Rain 4415: UI : PT : COMMON Search screen created to be used by other modules (#1109) * RAIN-4415 Screen 1 & Screen 2 OTP WIP * RAIN-4415 Screen 3 * RAIN-4415 * RAIN-4415 * RAIN-4415 Add link success page * RAIN-4415 Add missing route * RAIN-4415 Search updates * RAIN-4415 Create new property WIP * RAIN-4415 Add common pt module * ENabled commonpt module * RAIN-4415 Updates to search functionality * RAIN-4415 Moving all changes from pt to commonPt module and other changes * RAIN-4415 Code review points * REVERTED PT MODULE CHANGES * Update index.js * Added it in main app * RAIN-4415 Add redirect url section * RAIN-4415 Logic update for redirect url Co-authored-by: shoaibsyed7 <79191374+shoaibsyed7@users.noreply.github.com> Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> * RAIN-4775-4776: OBPS BUGS STAKEHOLDER FIXES (#1130) * Rain 4743 Fixed issue applications are not showing in newly registered architect in old UI (#1134) * RAIN-4743 Fixed issue in newly registered architect login applications are not showing * RAIN-4743 Script to migrate appln type and service type for existing applns * RAIN-4008 WS Notification Enhancement (#1103) * Changes for notification enhancement * Changes for sw-service * adding email topic * changing email topic * changes for ws billing and demand notif flow. * changes for sw bill/demand notif flow * changes for email notifications * Changes for email notification * PR review changes * RAIN-4008 changing variable value (#1136) * RAIN-4743 Fixed search issue with mobile no (#1137) * RAIN-4791: Alignment in create challan fixed (#1140) * RAIN-4766 trying to fix by specifying the react query version (#1143) * RAIN-4465 changes for pt notification enhancement (#1142) * UI FILE STORE API added Authtoken in header (#1146) * Update UploadServices.js * FILE STORE API added Authtoken in header * RAIN-4757 Order the city drop down properly (#1148) * Rain 4700 80s:: UI MCollect OBPS bugs fixes (#1147) * RAIN-4750-85-88-90-92-4802 Mcollect and OBPS Bug Fixes * RAIN-4802: unwanted code removed * RAIN-4770, RAIN-4771, RAIN-4773, RAIN-4774, RAIN-4778 issues fixed (#1152) * RAIN-4709 changes for bpa custom indexer (#1151) * UI-[RAIN-4758,RAIN-4759,RAIN-4789,RAIN-4793,RAIN-4794,RAIN-4795,RAIN-4804] : OBPS Bug Fixes (#1154) * RAIN-[4758,4759,4789,4793,4794,4795,4804] : OBPS Bug Fixes * [RAIN-4791,RAIN-4793,RAIN-4803] : Feedback Changes * RAIN-4782 Fixed issue with search criteria showing wrong result (#1155) * RAIN-4782 Catch filestore API exception * RAIN-4782 Add stakeholder search with userid * RAIN-4779, RAIN-4772, RAIN-4810,RAIN-4909 PDF Icon issues fixed throughout the modules and file names as well and assignee name, blocker issue, document label names fixed (#1161) * RAIN-4779, RAIN-4772, RAIN-4810,RAIN-4909 PDF Icon issues fixed throught the modules and file names as well and assignee name, blocker issue, document label names fixed * RAIN-4779, RAIN-4772, RAIN-4810,RAIN-4909 PDF Icon issues fixed throughout the modules and file names as well and assignee name, blocker issue, document label names fixed * UI [RAIN-4916 : RAIN-4805 ]: OBPS bug fixes on inbox and multiupload (#1159) * fixed RAIN-4916 by changing status to processInstance state * RAIN-4805 fixed the issue by removing the upload field unless code is selected * [RAIN-4800,RAIN-4803,RAIN-4927]:OBPS CREATION AND AUDIT BUG FIXES (#1162) * UI [RAIN-4780,RAIN-4753,RAIN-4932,RAIN-4806] : APK Common Download pdf/ image ,Notifications & BPA my applications issue fixes done (#1153) * RAIN-4780 : Download Receipt pdfs incase of apk * Update api.js * RAIN-4780 : New Ui :PDF Download issue fix incase of APK * RAIN-4753 : Citizen ENgagement APK download file issue fix * RAIN-4780 : Formatted code * RAIN-4780 : Citizen engagement document issue fix * updated utils to check * FIxed for that doc engagemnet apk issue * RAIN-4932 : UI : Citizen Notification issue fix * RAIN-4806 : UI: BPA : MyApplications removed the loaded data on unmount of screen * fixed RAIN-4763 by adding the TL mobile view (#1164) * RAIN-4754: PT MOBILE INBOX FIX & MISC OBPS FIXES (#1165) * RAIN-4914 fixed null vehicle error (#1166) * fixed RAIN-4914 fixed null vehicle error * removed debugger * RAIN-4953 : APK Download pdf in case of open download url issue fixed Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> * RAIN-4776 Fixed stakeholder documents order issue (#1167) * RAIN-4776 Fixed stakeholder documents order issue * RAIN-4776 Fixed stakeholder documents order issue * RAIN-4910 by restoring to last years financial date before 1st april (#1169) * fixed RAIN-4914 fixed null vehicle error * removed debugger * fixed RAIN-4910 by restoring to last years financial date before 1st april * RAIN-4930, RAIN-4949 OBPS-UI/UX Audit - Citizen - Font size and spacing between the headers to be fixed in Application detail screenOBPS-UI/UX Audit - Citizen - Font size and spacing between the headers to be fixed in Application detail screenOBPS-UI/UX Audit - Citizen - Font size and spacing between the headers to be fixed in Application detail screen (#1171) * [RAIN-4936,RAIN-4937,RAIN-4950]:OBPS multiple document upload bug fix and css and style changes * RAIN-4943 : UI Billgenie APK Download group bills issue fix * RAIN-4897: Employee Language selection screen hidden the language selection at the Header * RAIN-4756 : Citizen Enagagement View Download alignment issue fixed * RAIN-4756 : Citizen ENgagement ALignemnt issue fix * RAIN-4811, RAIN-4924, RAIN-4926 "You need 5 Minutes in registration" message must be replaced in Stakeholder registration screen (#1174) * first option will be selected by default in the OBPS create flow (#1175) Co-authored-by: saurabh-egov * RAIN-4763 : fixed the search application mobile view (#1176) * RAIN-4937: CSS audit testing fixes (#1178) * RAIN-4937: CSS audit testing fixes * RAIN-4937: CSS audit testing fixes-2 * RAIN-4930-1 Font size and spacing between the headers to be fixed in Application detail screen (#1182) * locality not mandatory when mbno&pId is present (#1185) Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * RAIN-4950: Fine tunning of action button (#1186) * RAIN-4950: Fine tunning of action button * RAIN-4950: Fixed for mobile view as well * RAIN-4763 , RAIN-4980 : UI TL FSM and css Bug fixes (#1187) * fixed RAIN-4980 by filtering other users data * RAIN-4763 fixed the CSS issue * RAIN-4957, RAIN-4967, RAIN-4973, RAIN-4930, RAIN-4949 Architect Name is misaligned in OC-eDCR scrutiny detail screen (#1189) * [RAIN-4971,RAIN-4972,RAIN-4979,RAIN-4982,RAIN-4969]:OC BPA SEND TO ARCHITECT AND SEND BACK TO CITIZEN BUG FIXES (#1190) * RAIN-4758 : City updated validation and miscellaneous localisation fixes (#1194) * RAIN-4942 : UI : OBPS - Fixed stakeholder regustration flow issues (#1195) * [RAIN-4976,RAIN-4986,RAIN-4989]:Obps timeline and inbox / comaprison report fixes (#1199) * [RAIN-4992,RAIN-4989]:Create scrutiny tenant fix and css for timeline checkpoints * RAIN-4965 : PT ALternate No screen reload issue fix after successfully update * RAIN-4963 : PT Alternate no should be only on open pay screen * RAIN-4798 : APK Report search and download issue fix * UI: OBPS Doc select category type issue fix * RAIN-4797 : UI : APK Report pdf xlsx file download issue fix * RAIN-4797 : UI : APK Report pdf xlsx file download issue fix * RAIN-4797: APK Report download issue fix in case of excel sheet download * RAIN-4797 : Report downloads added a return statement at last * UI : OBPS Doc issue fixed * RAIN-4993 OBPS :: UAT :: Not able to Revocate the BPA application from Field Inspector login (#1201) * RAIN-4916, RAIN-4975 UAT: OBPS: Mismatch in Application status , Architect is unable to search application based on application number in OBPS inbox screen (#1205) * RAIN-4726, RAIN-4987:: UI fixed pdf alignment issue by adding margin & Fsm issue fix (#1210) * v1.4.1 * RAIN-4987 inbox total now reflects the addition of pending issues only * RAIN-4726 fixed pdf alignment issue by adding margin * RAIN-4946 Bill Genie : Merge and download Button and its options alignment are not proper in APK. (#1212) * [RAIN-4944,RAIN-4996,RAIN-4997,RAIN-4998]:CSS styling and function obps fixes (#1216) * RAIN-4760, RAIN-4922 : OBPS Doc upload in sendback and removal in normal flow issues were fixed (#1218) * docker file updated * Revert "docker file updated" This reverts commit c59f1ae3457084a7924bae103da4ec9101d031db. * Docker file updated for build with different docker acc * RAIN-4760 : OBPS Doc upload in sendback and removal in normal flow issues were fixed * RAIN-4922 : Common dropdown issue fix and Updated CSS verison * Update Dropdown.js Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> * [RAIN-4789,RAIN-5003]:obps bug fixes relaed to clear searchand timeline (#1219) * [RAIN-4789,RAIN-5003]:obps bug fixes relaed to clear searchand timeline * Update package.json Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> * RAIN-5001, RAIN-4975, RAIN-4999, RAIN-5002 Isuses fixed in OBPS Flow (#1220) * RAIN-4987 by switching total count in case of dso login (#1225) * v1.4.2 * fixed RAIN-4987 by switching total count in case of dso login * [RAIN-4962] : Modified user search criteria (#1223) * [RAIN-4962] : Modified user search criteria * [RAIN-4962] : Fixed null pointer error * [RAIN-4962] : Fixed null pointer error * RAIN-5006, RAIN-5033, RAIN-5030, RAIN-4959, RAIN-4809, RAIN-4774 Primary owner improvement, Terms and conditions improvement and other obps bugs fixes (#1232) * [RAIN-4989,RAIN-5032,RAIN-5037]:fix for current owner, landmark, wron… (#1234) * [RAIN-4989,RAIN-5032,RAIN-5037]:fix for current owner, landmark, wrong pincode, fee details, localisations * RAIN-5009 : OBPS Assign application to any particular role employee issue fixed in BPA Applications * RAIN-4760 : Documents Re upload same file issue fixed * RAIN-5009: UI : Common Dropdown issue fixed (#1228) * RAIN-5009: Common Dropdown issue fixed * FIle formatted Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> * RAIN-4959 permit conditions which should come only in the approver screen (#1235) * RAIN-5039 : financial year fixed and dual download in citizen side fixed (#1237) * [RAIN-4776,RAIN-5049]: document details rearranged, name validation, street edit fixed (#1238) * RAIN-4959 OCEDCR flow and OC basic details issues fixed and added loader and error messages (#1240) * RAIN-4739 ::UI - DSS Download issue fix (#1242) * fixed SAN-821 by replacing state (#1244) * fixed response page loading issue by conditional statement (#1300) * Rain 4119 pt lightweight create when creating an application (#1215) * RAIN-4415 Create Property Common PT (cherry picked from commit 36bd4fde38a24495cf5628a0222dde3ff550e141) * RAIN-4119 Code review points * Rain 4899 UI pt employee search property for linking 1 (#1217) * RAIN-4899 Search proprty for employee CPT (cherry picked from commit 9cddf99e10a1cd4b3b4c106bdda928dcb80fc2dd) * RAIN-4899 Code review points * RAIN-4899 Code review points * Update Search.js Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> * RAIN-4584-4587-4589: WS Apply screen, connection holder, timeline and… (#1138) * RAIN-4584-4587-4589: WS Apply screen, connection holder, timeline and summary * Integration of Doc screen and review changes * SAN-802:Show validation message for DSO phone number on login (#1306) Co-authored-by: ayush * SAN-784 : FSM:: FSTPO:: Entered vehicle in time is rounding off to single "0" (#1309) Co-authored-by: nabeelmd-eGov * RAIN-5106 : DSS Enable the navigation from old ui overview to new UI (#1315) * RAIN-5106 : DSS Enable the navigation from old ui overview to new UI * formatted * fixed fsm rating commment display issue (#1316) * RAIN-4710 UI : National Dashboard : Map Component POC and Integrate (#1320) * Lakshmisravani wtt egov patch 1 (#1308) * Added new source for mgramseva * Added condition to make user update while updating property. * RAIN-4935 OBPS-UI/UX Audit - BPA application fail to display in Fire/Airport NOC application detail screen * SAN-821 :: FSM - Fix for Auto Create / update api call if app left open (#1302) * RAIN-5009 : OBPS Assign application to any particular role employee issue (#1246) * Missing change. (#1327) * RAIN-4929 OBPS-UI/UX Audit - All blocks of Application details must be away from the edge throughout the BPA module (#1328) * RAIN-4929 OBPS-UI/UX Audit - All blocks of Application details must be away from the edge throughout the BPA module * RAIN-4929 commented missing file * RAIN-4929 commented unwated file * SAN-826: Change in UI to show the drop-down for NUMBER_OF_TRIPS when the type is DROP_DOWN in the data received from MDMS - UI (#1332) * Rain 3829 employee search and collect tax update invalid mobile number on collection of tax before collection (#1329) * RAIN-3829 implementing the changes wip * RAIN-3829 Functionality complete * RAIN-3829 Remove console logs * RAIN-3829 Replaced string with localisation code * [RAIN-4940,RAIN-5047]:Action popup styles and permit date correction (#1335) * RAIN-4739 : DSS Download issue fix in webview and movbile view is ifxed (#1336) * RAIN-5008:: UI- bpa search application (#1339) * RAIN-4981 : UI : Exposed all the screens for the overriding in any ca… (#1313) (#1343) * RAIN-4981 : UI : Exposed all the screens for the overriding in any case for customisations (#1269) Added Error Boundary component, and console error stack * RAIN 4981 PT Module * RAIN 4981 PT Module * PT Module RAIN 4981-II * PT Citizen Changes * RAIN 4981-II mCollect * Changes "RAIN 4981 PT Module" * Revert "RAIN 4981-II mCollect" This reverts commit 24d0b7e14ae6244499df9929ce01ff1d542be35f. * Changes RAIN 4981 PT Module * RAIN 4981 mCollect * PT Module Citizen index RAIN 4981 * RAIN 4981 PGR Module * RAIN 4981 TL Module * RAIN 4981 Core Module * RAIN 4981 NOC Module * RAIN 4981 Obps Module * Revert "RAIN 4981 Core Module" This reverts commit f44fba07bfa3930970d4aad1e0e83bfeee2dc365. * RAIN 4981 FSM Module * RAIN 4981 Receipt Module Co-authored-by: RamkrishnaEgovt * RAIN 4981 Reviewed Changes * fixed some compilation issues * Update Module.js * Fixed some compilation issues * Created pages in hrms and few other modules * Added a Error Boundary component Co-authored-by: RamkrishnaEgovt Co-authored-by: RamkrishnaEgovt * RAIN-4981 : UI Build Issue fix (#1357) Co-Authored-By: RamkrishnaEgovt Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Co-authored-by: RamkrishnaEgovt * RAIN-4938: Configured the service and application types according to … (#1358) * RAIN-4938: Configured the service and application types according to the roles and few miscellaneous css issues fixed * RAIN-4938: Correction of one value in mdms * RAIN-4948 OBPS-UI/UX Audit - Fire NOC Offline/Airport NOC Offline/Airport NOC options must not be shown on filter screen of FireNOC approver (#1360) * RAIN-4948 * RAIN-4948v2 * RAIN-4948 OBPS-UI/UX Audit - Fire NOC Offline/Airport NOC Offline/Airport NOC options must not be shown on filter screen of FireNOC approver * RAIN-4778 UAT: Stakeholder registration: Post approval of application, "Stakeholder Registered Successfully" screen fails to display in employee portal (#1361) * RAIN-4778 Add response page for NOC as well (#1364) * RAIN-4778 added conditions in common pay (#1366) * RAIN-5186 OBPS_Success message_Permit_OC (#1370) * RAIN-5186 OBPS_Success message_Permit_OC (#1375) * fixed RAIN-4994 by changing input drived from multidropdown selection (#1376) * fixed RAIN-4994 by changing input drived from multidropdown selection * removed debugger * RAIN-5044,5028,5048 : Mcollect dss bug fixes (#1379) * fixed RAIN-5048 by fixing requestInforemoval block to the last conditional block * fixed RAIN-5028 by handling case sensitive switch case block * fixed RAIN-5044 by handling FY with respect to current date * RAIN-5183 : DSS Mcollect some blank screen issue fixed (#1363) * RAIN-4960, RAIN-4961 : PT Edit option for Update number in case of alternate number (#1378) * RAIN-4960 : PT Edit option for Update number in case of alternate number * RAIN-4961 : PT Edit option for alternate num in citizen * RAIN-4961 : Formatted file code * Update updateMobile.js * UI/UX Revamp Citizen Survey to fill the survey and submit screen static changes (Citizen side) (#987) * added citizen side survey form * RAIN-4208 * useSubmitResponse hook * fix checkbox issue * review comment changes * RAIN-3473 : Survey Create form changes added and reverted index.js file change * RAIN-3473 : UI : Updated the CSS Package version to 1.4.4 * SAN-817 FSM v1.1: DSO can edit pit and property usage details - UI (#1372) * SAN-817 added new field for property type, property sub type, pit detail and added button for upload pit photo * SAN-817 changes in upload pit photo services * SAN-817 changes in submit function * SAN-817 added filestoreid in pitdetails * SAN-817 resolve error * SAN-817 modal/index.js bug fixing * SA-817 bug fixing in image upload * SAN-817 bug fixing and responsive Co-authored-by: nabeelmd-eGov * RAIN-5004 OBPS filters in Inbox (#1383) * [RAIN-4776,RAIN-4941,RAIN-5115]:application timeline enhancements and re ordering of documents in application details page (#1382) * SAN-798: Select vehicle capacity instead of vehicle make - UI (#1373) * SAN-798: Select vehicle capacity instead of vehicle make - UI * SAN-798: changes for showing vehicle capacity * SAN-798: change for showing vehicle capacity * RAIN-5208 by fixing multiselect dropdown compatibility (#1384) * SAN-736: Capture citizen gender on application - UI (#1377) * SAN-736: Capture citizen gender on application - UI * FIxed merge conflicts issue * Removed console Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> * RAIN-4948 OBPS-UI/UX Audit - Fire NOC Offline/Airport NOC Offline/Airport NOC options must not be shown on filter screen of FireNOC approver (#1387) * SAN-688 add ULB helpline contact number in CitizenSideBar (#1388) Co-authored-by: nabeelmd-eGov * RAIN-5194 : DSS Added switch for the Table and other chart if present (#1390) * RAIN-5194 : DSS Added switch for the Table and other chart if present * DSS : added some null check * RAIN-5198: UI : Updated the Citizen profile update issue for name (#1381) * RAIN-5194 : DSS added a table switch button class and updated version * Fixed some firenoc issue related to sendback and download a certificate * RAIN-4945 OBPS-UI/UX Audit - For Single action, dropdown selection must not be shown during take action (#1392) * RAIN-5004 Removed unwanted value * RAIN-4472 : UI : Error Boundary component Updated and added to the Employee APP * San 795 (#1342) * SAN-795: Change for TripCount * SAN-795: Fix for fetching NumberOfTrip Count * Changes as per PR (https://github.com/egovernments/DIGIT-Dev/pull/1342) review comment Co-authored-by: Sushant Agrawal * RAIN-4707 : DSS Map component added in national dashboard home screen… (#1395) * RAIN-4707 : DSS Map component added in national dashboard home screen and enabled the home screen * RAIN-4707 : DSS MAP updated the color codes * RAIN-5198: UI : Updated the Citizen profile update issue for name * RAIN-4732, RAIN-4923 WS :: Meter Reading Details are displayed on the summary page of sewerage modified application (#1396) * RAIN-4984 When demand is not applicable then skip the payment stage (#1385) * RAIN-4984 When demand is not applicable then skip the payment stage * RAIN-4984 When demand is not applicable then skip the payment stage * RAIN-4984 update OC workflow config for skip payment * RAIN-4984 When demand is not applicable then skip the payment stage * RAIN-4984 Update workflow status business service map * RAIN-5193 Add fuzzy search for noc applnno,approvalno and sourcerefid (#1399) * RAIN-4939, RAIN-4923 APK:OBPS:: Details overlapping on Application Details screen. * RAIN-4252 : DSS Enabled the switch tabs for the overall dss to have revenue and services * RAIN-5229 : DSS Table pagination issue fix * RAIN-4252 : DSS Added a new card CSS Package version updated * RAIN-5193 RAIN-4947:added search application noc (#1331) * WIP added basic struture to search application noc * SAN-826: Change in UI to show the drop-down for NUMBER_OF_TRIPS when the type is DROP_DOWN in the data received from MDMS - UI (#1332) * WIP added basic struture to search application noc * completedRAIN-5193 RAIN-4947 Co-authored-by: ayushgupta-eGov <94037835+ayushgupta-eGov@users.noreply.github.com> * San 688 Change in localization key (#1402) * SAN-688 add ULB helpline contact number in CitizenSideBar * SAN-688 change localisation key Co-authored-by: nabeelmd-eGov Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> * RAIN-4653 : DSS UI Added the switch component to support in bar charts (#1403) * Rain 4890 Localization code change for Button (#1323) * RAIN-4939 RAIN-4939 Bill Cancellation : APK : UI Alignment of the footer of thebill Cancellation screens are not proper. * RAIN-5228 : DSS ULBand DDR filters options are not sorted * RAIN-5253 : DSS Mcollect some bar chart values were not getting localisaed issue fixed * RAIN-5224 : Bill Genie showed 2 business services in download screen * RAIN-5247, RAIN-5223 : Billgenie Added a will expiry tooltip in download row & retry will reload * RAIN-4981 : UI Added Error Boundary component in citizen modules * DSS : Home screen national dashboard screen fixed (#1409) * Rain 4898 UI pt employee light weight create property 1 (#1303) * RAIN-4898 Create property employee common pt WIP (cherry picked from commit 6c81c3a59dddcf4b774f371e9d400182a1dbc300) * RAIN-4898 create property done with small static fields (cherry picked from commit d9db04c012662f83061758c15f265ad6db428cd9) * RAIN-4898 Removed static field (cherry picked from commit 72a328f9372c47a2672db81ca51ea0f735446bf7) * RAIN-4898 Remove console logs * RAIN-4898 Add condition to create and update prop on basis of mdms config * RAIN-4898 Add conditions for usertype * RAIN-4898 create and update property wip * RAIN-5125 : DSS National dashboard , navigation constant updated (#1414) * RAIN-5125 : DSS New ui card added for state and national dashboards (#1416) * Changes for SAN-822, to support citizen gender while creating applica… (#1404) * Changes for SAN-822, to support citizen gender while creating application * Code changes as per review comment PR #1404 Co-authored-by: Sushant Agrawal * SAN-823: changes to handle gender of DSO (#1407) Co-authored-by: Sushant Agrawal * RAIN-4994:Multiselect integration in citizen side scrutiny details (#1418) * Central instance changes copy merge (#1410) * kafka topics updated with state tenantid * tracer version udated to 2.1.0 * otp made only for "\in"\ tenant * test removed * bug fix * tracer updated for all municipal services to 2.1.0 * Update migrate.sh * removed repo for conflict * Update migrate.sh * Update migrate.sh * Update migrate.sh * Update migrate.sh * schemaname * Update migrate.sh * Update migrate.sh * Update migrate.sh * Update migrate.sh * Update migrate.sh * Update migrate.sh * Update migrate.sh * Update migrate.sh * Update migrate.sh * Update migrate.sh * Update migrate.sh * tracer version upgraded * tracer upgraded * Update pom.xml * Central billing coll patch (#115) * billing collection schema nased queries update * pom update, merger from bill coll query update * tenant replace fix * tenat replace flow test and fix * [RAIN-3391] Multiple schema migration: changes in hrms, billing and collection services migration script * Update pom.xml * Update pom.xml * removed unwanted migrations * Delete business-services/billing-service/src/main/resources/db/migration/seed directory * Update Dockerfile * Update pom.xml * tenantid fix in kafka topic * Update CODEOWNERS * Central property schema (#156) * schema replacer added and migration service removed * tenantid reverted to criteria * Revert "schema replacer added and migration service removed" This reverts commit 69a6bdce28a6bc489c4a2994908a46068cdaebab. * schema replacer added for property * Update PropertyRepository.java (#157) * central search upgrade for property (#220) * RAIN-3724: made migration bean optional to remove statelevel tenantId (#221) * Update repo id (#223) * Property query update (#239) * state level tenant change * query refactoring * Central update (#240) * central search upgrade for property * state level tenant change * table name fix in query (#241) * Update repo id (#244) * Kavi patch 14 sep (#246) * table name fix in query * and clause bug fix * kafka topic update for central env * RAIN-3742: correction to POM (#249) * RAIN-3742: updated billing POM (#250) * Update main.go (#256) * Update main.go (#257) * RAIN-3724: updated kafka producer for billing slab (#258) * Rain 3742 (#259) * RAIN-3724: updated kafka producer for billing slab * RAIN-3742: correction to topic name Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com> * RAIN-3799: made changes for single instance (#280) * RAIN-3799: updated producer in sms and events (#281) * RAIN-3799: updated migration shell script (#282) * RAIN-3799: added tenantId in update (#284) * added schema replacer to assmt query (#285) * tl single instace update (#298) * tl single instace update * query schemareplace * RAIN-3671: updated POM (#307) * search bug fix (#320) * RAIN-3801 water service single instance changes (#313) * RAIN-3801 water service single instance changes * RAIN-3801 Removed state level tenantid variable * RAIN-3836: updated the tenantId in citizen search flow (#333) * RAIN-3905: added replace schema in bill status update (#335) * [RAIN-3391] Central instance multiple schema changes in hrms service (#151) * [RAIN-3391] Central instance multiple schema changes in hrms service * [RAIN-3391] Added logic for db operations to be done on default schema in case central instance level tenant id is passed * [RAIN-3614] Removed unnecessary assignment of tenantID to null in hrms service * [RAIN-3614] HRMS changes for central instance bug * [RAIN-3666] Added customized sms topic support for hrms * RAIN-3801 sewerage service single instance changes (#339) * [RAIN-3828] added multiple schema changes in workflow service (#286) * [RAIN-3828] added multiple schema changes in workflow service * [RAIN-3828] Added validations to ensure that tenantId is passed mandatorily in WF calls * [RAIN-3828] Updated migration shell script for WF * Wf changes (#371) * RAIN-3393: added fallback in workflow * RAIN-3392: fallback changes for bulk search * RAIN-3393: removed MDMS dependency * Updated tracer version in wf Co-authored-by: talele08 * state level search for bill & coll (#374) * dynamic topics for bill update added (#383) * startup bug fix (#401) * RAIN-3802 Made changes for single instance in fire noc service and calculator (#404) * RAIN-4005: Remove invalid validation (#416) * Update BillingServiceConsumer.java (#417) * Update BillingServiceConsumer.java * revert of kafka topic changes * Rain 4005 (#418) * RAIN-4005: removed tenantId enrichment in my tl search * RAIN-4005: overloaded repository methods when tenantId is not available * mdc setting in consumer (#421) * mdc tenantid fix (#422) * payment aduti backupdate fix (#424) * payment aduti backupdate fix * failure update fix * Added tenantId in MDC in kafka consumer (#430) * Rain 4005 (#431) * Added tenantId in MDC in kafka consumer * RAIN-4005: added tenantId in MDC in payment notification flow * added tenantId in MDC in kafka consumers of PT and PGR (#432) * Enhanced pgr in app notifications for rate and reopen buttons (#435) * Updated producer to push on state topic (#439) * Updated producer to push on state topic * data posted in multiple topics Co-authored-by: kaviyarasan1993 * single instance changes for pg-service (#447) * Dss ingest error handling (#449) * Added error stack trace in ingest * changes dor central instance * Rain 3991 (#452) * RAIN-3991 Updated header value * RAIN-3991 Updated MDMS host * made kafka topic names configurable (#454) * added schema placeholder at missing places (#457) * report pom udated (#458) * Ingest cleanup (#460) * removed duplicate variables * dss ingest cleanup * updated POM version (#463) * Rain 4052 (#477) * RAIN-4052 corrected tenantid * RAIN-4052 corrected tenantid and added tenantId in MDC in kafka consumers * RAIN-4052 Set tenantid for update call * RAIN-4052 Updated query * RAIN-4052 set is.environment.central.instance as true * RAIN-3693 Fixed firenoc create,update and search call flow (#476) * [RAIN-3828] Adding pgr create and update topic regex to notification … (#498) * [RAIN-3828] Adding pgr create and update topic regex to notification consumer topic pattern * [RAIN-3828] Added topic pattern regex to PT notification consumer * RAIN-3269: Added fallback on tenantId search (#508) * Made changes for central instance (#489) * Made changes for central instance * Corrected header and added check for search call * Updqated headers value * Setting header * corrected header for filestore call * Debugging header value for filestorecall * debuuging filestore api * Removed unnecessary console log * Made changes in egov-pdf service for central instance (#495) * Made changes in egov-pdf service for central instance * Added host for water and sewerage * updated header value for egov-pdf service * [RAIN-3828] PT notification changes for state specific sms (#520) * [RAIN-3828] TL notification changes for central instance (#522) * [RAIN-3828] TL notification changes for central instance * [RAIN-3828] Added regex based topics for consumer to listen to * [RAIN-3828] Updated topics to topicPattern in PT notification consumer (#526) * [RAIN-3828] Updated tenantId to be passed to localization call to state level tenantId (#531) * Water meter patch (#482) * Added check for internal consumer * Added check for inteernal consumer record for SW service * Added tenantid in property search * Updated foreign key constraints for sewerage table * Added tenant id in search criteria * Added kafka topic pattern * Added payment collection topic in kafka topic pattern * Added payment collection topic * Added payment collection topic and meter reading topic * [RAIN-3828] Replaced equalsIgnoreCase with contains method in property consumer (#536) * Added meter reading kafka pattern (#548) * Added state level tenantid search (#563) * Added state level tenantid search * made changes for notification * Added tenantid for citizen search (#537) * Merged central instance changes for wns calcultor in central-instance… (#564) * Merged central instance changes for wns calcultor in central-instance-changes branch * Updated apply adhoc tax feature for one time fee * [RAIN-3828] dynamic hostname selection in url shortening for central … (#569) * [RAIN-3828] dynamic hostname selection in url shortening for central instance * Added logger instead of sysout * [RAIN-3828] Added logic to take statelevel tenantId to select host from config map (#570) * Added . while forming state level tenantId (#571) * correction to kafka topic name (#584) * [RAIN-4148] Replaced angular brackets with curly braces in TL notific… (#594) * [RAIN-4148] Replaced angular brackets with curly braces in TL notification placeholders * [RAIN-4148] Passing state level tenantid to localization call for TL notifications * [RAIN-4148] Added state level tenantId in PT localization call for notification * [RAIN-3828] Dynamic host based on tenantId for building notification … (#547) * [RAIN-3828] Dynamic host based on tenantId for building notification links in PT service * Added logs to debug url shortening host * Adding more logs * [RAIN-4148] Added dynamic host selection for url shortening call in TL (#596) * [RAIN-4148] Changed schema placeholders in TL payment (#599) * [RAIN-4148] Updated assessment payment notification placeholders (#620) * Echallan central changes (#624) * Added changes for central instance in eChallan service * Updated tenantid for localisation call * Updated location host * Added dynamic host for notification * Updated kafka topic pattern * Updated tenantid for mdms call * Added dynamic host for notification * Added URL shortner host * Added dynamic host for SW service * Corrected sewerfage message placeholder * Added consumer topic pattern in firenoc * Updated consumer group of fire noc service * Added notification process for create application * Created notification util * Corrected producer path * Corrected kafka topic * Corrected SMS for Field inspection and doc verifier * Debugging SMS logs * Added SMS for action send back to citizen * Added logic to ensure that tenantId is never null for setting schema in hrms search (#694) * Fixes department placeholder issue in indexing pgr records (#695) * user update for central (#754) * Rain 4342 (#815) * RAIN-4342 Updated tenantid for pdf call * RAIN-4342 Updated tenantid for pdf call in sw service * RAIN-4342 Updated hostname for pdf call * RAIN-4342 Updated hostname for filestore call * RAIN-4342 Updated hostname for pdf call in sw service * tracer updated for user (#847) * Encclient versionupdate (#863) * enc client upgrade added * tracer updated to 2.1.1 (#862) Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * Common services 1.1.0 (#934) * egov-otp central validation fix * central instance tenant fix for user * test case fix for user tenant update * common library update for centralinstance backward compatibiality check Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * User tenant bugfix (#886) * egov-otp central validation fix * central instance tenant fix for user * test case fix for user tenant update * duplicate user test fix * otp match bug fic for citizen * user repo bug fix * tenantid header issue from user-otp to user fixed * test fix * test bug fix * auth api MDC tenantid added Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * Rebase conflict fix (#935) * central instance tenant fix for user * common library bug fix Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * changed repo id for nexus (#982) Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * Central notif changes (#867) * [RAIN-3828] Adding pgr create and update topic regex to notification consumer topic pattern * [RAIN-3828] Added topic pattern regex to PT notification consumer * [RAIN-3828] Corrected listener topics to topicPattern Co-authored-by: Shashwat Mishra Co-authored-by: Shashwat Mishra <71879793+shashwat-egov@users.noreply.github.com> * Internal gateway zuul changes (#983) * Update CODEOWNERS * RAIN-3368 Creating the new service for demo utility (#33) * RAIN-3368 Creating the new service for demo utility * Updated host names * RAIN-3368 Added build file for demo-utility (#34) * Update CODEOWNERS * RAIN 3371 updated working directory for resolving Jenkins build error (#37) * RAIN-3438 Employee Inbox :: SLA is displayed in Red colour for all the applications in the employee inbox (Old UI) (#49) * RAIN-3438 Incremented patch version for employee for inbox fix (#51) * RAIN-3375 Auto Escalation :: Exclamatory mark is not displayed near SLA days on Application which got escalated on Assigned to ALL tab (#55) * internal gateway files fetched from old repo * tenantid logging rewrite * tenantid enricher added for open urls separately * internal gateway code clean up and performance enanchement * digit repo added pom * removed bean for getter * exception added for oauth in tenantid setter * zuul mixmode tenantid inject fix * filestore url expemted from tenant setter * mixmode urls added for tenant setter * lists made immutable, encryptedurllist filtered, code refactored * minor bug fix * anonymous user tenant map updated * http replaced * tenant validation added in auth * multiple tenantid issue fix * tenant id setter update * header set to acces control explicitly * Update main.go * Update main.go * Added cache burst during initialization (#321) * added tenant update skipping * added tenant update skipping * additional repo added * changes to create tracer new version (#348) Co-authored-by: talele08 * tenant replace only if empty * 2.1.1 bug fix * non json tenantid validation added * user expected from tenant enrichment * tennatid mandatory fr non-json apis * filestore read tenantid bug fix * enc clinet updated for central environments * url changed to public * repo changed for upload to nexus repo * enc client config bug fix Co-authored-by: basilvg-eGov <81950519+basilvg-eGov@users.noreply.github.com> Co-authored-by: narendrabandhamneni-wt-egov <61416451+narendrabandhamneni-wt-egov@users.noreply.github.com> Co-authored-by: Gajendran <40357140+gajendran-egov@users.noreply.github.com> Co-authored-by: vamshikrishnakole-wtt-egov <57343517+vamshikrishnakole-wtt-egov@users.noreply.github.com> Co-authored-by: talele08 Co-authored-by: talele08 Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * User tenant bugfix report user integration (#1004) * egov-otp central validation fix * central instance tenant fix for user * test case fix for user tenant update * duplicate user test fix * otp match bug fic for citizen * user repo bug fix * tenantid header issue from user-otp to user fixed * test fix * test bug fix * auth api MDC tenantid added * report user integration * commons version update Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * Utils renamed (#1005) * nexus repo update * multiinstance util renamed * backward comp fully covered user,otp,zuul,report (#1007) Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * added mock multistateutils to test (#1016) Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * enc common service dependency added (#1052) * enc common service dependency added * pom updated for all client with tracer 2.1.1 * common services updated in mdms client * common services updated in tracer * unused ref of central var removed * removed redundant repo * tenantid set to MDC in enc client Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * common services centralinstance backward compatiability integration (#1059) Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * RAIN-4577 common services centralinstance backward compatiability int… (#1065) * RAIN-4577 common services centralinstance backward compatiability integration in echallan, water and sewerage service * RAIN-4577 Removed autowired from MultiStateInstanceUtil * RAIN-4577 Fixed pom issue for echallan, water and sewerage * [Rain 3266] Access control changes for central instance (#1082) * [RAIN-3266] Made changes in access control service to perform authorization by taking ulb level, state level and central instance level mdms data * RAIN-3266: updated tracer version * RAIN-3266: correction to tenant splitting * RAIN-3266: removed configurable property due to test case failures * RAIN-3266: printing the header * [RAIN-3266] Added more meaningful logs for debugging * [RAIN-3266] Added logic to set header dynamically in access control * [RAIN-3266] Updated tracer version in access control * [RAIN-3266] sending headers to mdms request * access control backward comp update * variable renamed Co-authored-by: talele08 Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com> * Multistate util fix (#1060) * common services centralinstance backward compatiability integration * property multistate util fix * enc common service dependency added (#1052) * enc common service dependency added * pom updated for all client with tracer 2.1.1 * common services updated in mdms client * common services updated in tracer * unused ref of central var removed * removed redundant repo * tenantid set to MDC in enc client Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * enc common service dependency added * enc pom fix * billing service central update * unwanted library removed * pom issue fix * RAIN-4577 fixed pom issue in billing service * RAIN-4577 update schema placeholder * collection service backward comp fic * app props updated to true by default * Update application.properties Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> Co-authored-by: rohit-eGov * nexus repo update (#1000) * egov-otp central validation fix (#878) Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * Update main.go (#310) * tenantid header update for user call (#1108) * tenantid header update for user call * test case fix Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * hrms backward comp update (#1110) Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * multistate util added (#1114) Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * Servcies common junit (#1115) * tets cases added for statetenant util method * public repo change Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * tenant format bug fix (#1122) Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * accesscontrol test fix (#1123) Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * Central accesscontrol bugfix (#1125) * multiinstance added to config * multiinstance test fix Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * tenantid issue fix in hrms (#1129) Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> * read tenantid from url for incompatiable request (#1145) Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> Co-authored-by: kaviyarasan1993 Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com> Co-authored-by: Shashwat Mishra Co-authored-by: nikesh-eGov <48427967+nikesh-eGov@users.noreply.github.com> Co-authored-by: rohit-eGov <52992779+rohit-eGov@users.noreply.github.com> Co-authored-by: Shashwat Mishra <71879793+shashwat-egov@users.noreply.github.com> Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> Co-authored-by: basilvg-eGov <81950519+basilvg-eGov@users.noreply.github.com> Co-authored-by: narendrabandhamneni-wt-egov <61416451+narendrabandhamneni-wt-egov@users.noreply.github.com> Co-authored-by: Gajendran <40357140+gajendran-egov@users.noreply.github.com> Co-authored-by: vamshikrishnakole-wtt-egov <57343517+vamshikrishnakole-wtt-egov@users.noreply.github.com> Co-authored-by: rohit-eGov * resolved tl-services conflict (#1425) * pgr merge conflict resolved (#1426) * property conflict fix * poms updated for library * ws service and calculator merged * build config, codeowners merged * demo util pom merge * merged sw service and sw calculator * Resolved the merge conflicts in Frontend and egov-pdf * Resolved merge conflict in pdf and fire noc service * mdms merge from central * Resolved merge conflict in egov-pdf service * mdms bug fix * user header update for citizen * fixed circular dependency * resolved merge issue in billing service * resolved POM issue in dss-analytics * resolved apportion pom * RAIN-5272 Updated pom file * RAIN-5514 Updated host for user search (#1497) * added replaceschema in count in TL * schema update in query * RAIN-5495 Updated search query (#1502) * added headers in post call (#1587) * RAIN-5444 Fix payment issue * mdms loop fix * Billing central consumer fix (#1601) * consuming based on topic pattern * seperated payment create consumer * fix to cancel payment consumer * Kafka topic pattern (#1622) * changed regex to support backward compatiblity * changed kafka topic regex in TL * RAIN-5632 Added security fixes changes in central instance env (#1635) * removed search validation for citizen (#1680) * Rain 5670 (#1686) * RAIN-5670 updated query to get connection details * RAIN-5670 * RAIn-5670 Added central instance env variable * RAIn-5670 Debugging tenant and connection data * RAIN-5670 changes set declaration * RAIN-5670 Updated set decalration in sw calc * Corrected validation * Pg topic fix (#1705) * RAIN-5696 Updated producer config aand search query * RAIN-5696 Updated pom * RAIN-5696 added tenantid in validation * RAIN-5696 added tenantid in validation * RAIN-5696 Added kafka topic pattern * RAIN-5696 reverted query changes (#1707) * RAIN-5617 updated assignment search query (#1719) * Commented unused variable * Added header value in property search call (#1743) * updated kafka topic pattern and state tenant lenght * added MultiStateInstanceUtil in PGR * updated kafka regex pattern for backward compatibility (#1803) * RAIN-6360 Updated application properties * RAIN-6360 Updated amendment query * RAIN-6306 Updated application.properties * Updated POM file * Added receipt number based search * RAIN-6308 Update env varaible * RAIN-6308 Added condition for header tenant id * RAIN-6308 made changes in fire noc service for single instance (#1977) * get statelevel tenantid for mdms call * Updated condition in consumer to check incoming topic * get statelevel tenant id for mdms call in sw service * Updated user event kafka topic * Rain 5525 (#2229) * RAIN-5525 enable workflow * RAIN-5525 Upgraded POM file * RAIN-5525 Upgraded pom of workflow service * Corrected tenantid for mdms call to get channel list * Corrected mdms call to fetch channel list and added requestinfo in userevent call * Enriched uuit before sending the userevent * added async keyword * Firenoc evnt (#2233) * Debugging user response * Debugging user response * Debugging user response * Debugging payload * Removing unnecessary logs * Updated consumer and producer files * Corrected sms placeholder * Rain-6450 - syncing dashboard analytics code changes from develop branch to central branch. (#2414) * [CENTRAL-INSTANCE] Added central instance changes for workflow service (#2650) * other services cpy from develop Co-authored-by: Tulika-eGov <74046137+Tulika-eGov@users.noreply.github.com> Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Co-authored-by: vamshikrishnakole-wtt-egov <57343517+vamshikrishnakole-wtt-egov@users.noreply.github.com> Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com> Co-authored-by: Sarvesh-eGov <71336235+Sarvesh-eGov@users.noreply.github.com> Co-authored-by: saurabh-egov <71308823+saurabh-egov@users.noreply.github.com> Co-authored-by: vinothrallapalli-eGov Co-authored-by: Priyanka-eGov <74049060+Priyanka-eGov@users.noreply.github.com> Co-authored-by: burhanj-eGov <96115279+burhanj-eGov@users.noreply.github.com> Co-authored-by: shoaibsyed7 <79191374+shoaibsyed7@users.noreply.github.com> Co-authored-by: tulika kundu Co-authored-by: saurabh-egov Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> Co-authored-by: ayushgupta-eGov <94037835+ayushgupta-eGov@users.noreply.github.com> Co-authored-by: ayush Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> Co-authored-by: nabeelmd-eGov Co-authored-by: lakshmisravani-wtt-egov <80089327+lakshmisravani-wtt-egov@users.noreply.github.com> Co-authored-by: vamshikrishnakole-wtt-egov Co-authored-by: Nipun Arora Co-authored-by: RamkrishnaEgovt Co-authored-by: nrj-eGov <90257171+nrj-eGov@users.noreply.github.com> Co-authored-by: Sushant Agrawal <94037797+sushanta-egov@users.noreply.github.com> Co-authored-by: Sushant Agrawal Co-authored-by: Ramkrishna-egov <85437265+Ramkrishna-egov@users.noreply.github.com> Co-authored-by: kaviyarasan1993 Co-authored-by: Shashwat Mishra Co-authored-by: nikesh-eGov <48427967+nikesh-eGov@users.noreply.github.com> Co-authored-by: rohit-eGov <52992779+rohit-eGov@users.noreply.github.com> Co-authored-by: Shashwat Mishra <71879793+shashwat-egov@users.noreply.github.com> Co-authored-by: basilvg-eGov <81950519+basilvg-eGov@users.noreply.github.com> Co-authored-by: narendrabandhamneni-wt-egov <61416451+narendrabandhamneni-wt-egov@users.noreply.github.com> Co-authored-by: Gajendran <40357140+gajendran-egov@users.noreply.github.com> Co-authored-by: rohit-eGov Co-authored-by: naveen-wt-egov <90044067+naveen-wt-egov@users.noreply.github.com> * Ws sw central merge (#4570) * RAIN-4136:Mcollect few audit fixes (#1063) * RAIN-3995: MY payments for property (#1061) * RAIN-3995: MY payments for property * RAIN-3995: Review changes and fixes * RAIN-4136: Rremoved unwanted code * RAIN-3944 :UI : SEARCH APPLICATION FOR PT(#1062) * RAIN-3944 : SEARCH APPLICATION FOR PT * unwanted code removed * RAIN- 3993 :: UI Audit: Search Property [Citizen/ Employee] (#1064) * PT EMP Search screen revamp * PT Search screen formatted and integrated * Added validation ,fixed form and added toast , roles * EMployee Search screen modified and Mobileview enabled with all validations * Modified css for the reset button employee * form warning removed * Correceted the links and added search links in home screen * intermediate minor change for enable citizen * citizen side search fields modified * RAIN-3993 : PT Citizen search modified with latest search params * RAIN-3993 : PT Citizen side search screen integraeted with all validations and localisations * RAIN-3993: PT Search property enabled with search config * Added Search App * RAIN-4545 :: UI Audit: Update property application [Employee] (#1067) * RAIN-4545 : Employee update property show the onwer details initial commit * RAIN-4545 : Property update show owner data formated * Update EditForm.js * RAIN-3831 :: Citizen - View Property: Change mobile number (#1066) * RAIN-3831 : PT Citizen update number feature * RAIN-3831 : PT Update no popup integrated * RAIN-3831 : PT Modified few alignments and integrated with login / authenticate/regisetr apis * RAIN-3831 : PT Update no integrated with the Update proeprty api with all validations and toast messages * RAIN-3831 : PT UPdate number citizen handled all uses case converted to reducer * RAIN-3831 : PT Citizen update number added mdms config integration * RAIN-3830 : PT Employee init commit of update no creation * RAIN-3830 : PT EMployee code cleaned up and made seperate request * RAIN-3830 : PT Update no integrated with EMployee * RAIN-4583, RAIN-4585, RAIN-4586 WNS Intial commits (#1070) * RAIN-3993 : PT AUdit search unit test issue fixed (#1071) * RAIN-3993 : PT AUdit search unit test issue fixed * removed log * RAIN-4585 added WS Module in Package and app files (#1074) * Update property-services.yml (#1080) * [RAIN-4697]: Added null checks (#1078) * [RAIN-4697]: Added null checks * [RAIN-4717] : Fixed cron job bug * [RAIN-4697] : Removed null checks * Revert "[RAIN-4697] : Removed null checks" This reverts commit 1c753273588c97a2e4fe644685c4b08169eeb77e. * Revert "[RAIN-4697]: Added null checks" This reverts commit 670feb9de5023d1ffced87a6270e666ea097909f. * RAIN-3871 : PT My Payments integrated with the employee property info screen (#1083) * RAIN-3871 : PT Payment details in employee RAIN-4605 : PT Payment details screen added to the employee property info screen * RAIN-3871 : PT My Payments integrated with the employee property info screen * Update Receipts.js * [RAIN-4719] : Added alternate mobile number to sms requests (#1088) * fixed PGR RAIN-4703 by adding PDF identification util and adding that in PGR module (#1095) * RAIN-4712 Fixed issue BPA inbox is not rendering when submit appln for (#1099) multiple citiex * RAIN-3553: WS Search & Pay - open & normal (#1097) * RAIN-3553: WS Search & Pay - open & normal * RAIN-3553: changing alert to Toast * RAIN-3553: Review changes * RAIN-3553: Review changes * RAIN-4114 RAIN-4115: TL UI Audit task (#1073) * code cleanup and RAIN-4114 RAIN-4115: * removed debugger * added fields for institutional details * fixed create flow * Added expired applications in search api (#1104) * Added expired applications in search api * Updated the query * RAIN-3869 : PT Assessment screen citizen side enhancement for diff type proeprty (#1100) * RAIN-3869 : PT UI AUdit - Integration with api for flat and vacant RAIN-3869 : PT Assessment initial commit RAIN-3869 : PT Units added for the flat type property RAIN-3869 : PT Assessment flow modified for the units flat type property RAIN-3869 : PT Independent property initial commit * RAIN-3869 : PT Assessment land area issue fix for independent proper * Fixed the independent proeprty create * base ment enabled for create * formating done and removed few loggers * RAIN-3869 : PT Modified for few review comments * TL Search: Status fixes for different business services (#1111) * Rain 3830:UI PT : Employee - View Property: Update mobile number (#1113) * RAIN-3830 : PT Update no initial config * RAIN-3830 : PT Update No field added for active property * COde formatted * Rain 4353 4311 4736:: UI Fixes on Mcollect and bpa inbox screens (#1117) * fixed bug RAIN-4736 * fixed RAIN-4353, RAIN-4311 * RAIN-4745-4749: Close icon and refresh icon added in mobile view (#1119) * RAIN-4690 adding offset and limit (#1090) (#1102) * OBPS-TL : pincode cache problem fixed and TL localisation issue fixed (#1128) * Rain 4415: UI : PT : COMMON Search screen created to be used by other modules (#1109) * RAIN-4415 Screen 1 & Screen 2 OTP WIP * RAIN-4415 Screen 3 * RAIN-4415 * RAIN-4415 * RAIN-4415 Add link success page * RAIN-4415 Add missing route * RAIN-4415 Search updates * RAIN-4415 Create new property WIP * RAIN-4415 Add common pt module * ENabled commonpt module * RAIN-4415 Updates to search functionality * RAIN-4415 Moving all changes from pt to commonPt module and other changes * RAIN-4415 Code review points * REVERTED PT MODULE CHANGES * Update index.js * Added it in main app * RAIN-4415 Add redirect url section * RAIN-4415 Logic update for redirect url Co-authored-by: shoaibsyed7 <79191374+shoaibsyed7@users.noreply.github.com> Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> * RAIN-4775-4776: OBPS BUGS STAKEHOLDER FIXES (#1130) … * UM-6085 : updated the min length for comment box to 64 from 50 (#5428) * UM-6067 : updated the styling issues as per the design review for cit… (#5433) UM-6067 : updated the styling issues as per the design review for citizen feedback and consent form * UM-6067 : removed the citizen feedback button from the failed payment… (#5434) UM-6067 : removed the citizen feedback button from the failed payment screen * SM-2249:Fixed collect pay action for UAT (#5440) * UM-5572 and UM-5573 :: Mobile APK file upload issue fixed, which will… (#5442) UM-5572 and UM-5573 :: Mobile APK file upload issue fixed, which will accept the all files to upload into the system (#5441) * apk generation * dev env * fix for the apk upload pdf This reverts commit 3acffa7cfb5fc07b93dfa5a4fcde3c7b6bafeba3. * Updated the urls and generated the APKS also fixed the file type as anything * temp issue fix * Update MainActivity.java * UM-5873 : added citizen feedback rating to state dashboard screens (#5446) * UM-6012 Citizen Feedback Notification Changes for master (#5432) * UM-6012 Adding changes for Citizen Feedback Notifications * UM-6012 Removing code changes * UM-6012 adding beta version changes * UM-6012 adding code changes * Added Service-Request module to UAT (#5397) * Added Service-Request module to UAT * Updated persister file * Updated pagination for service search * Property Service - library version updated (#5451) library version updated Co-authored-by: kavi_elrey <25226238+kavi-egov@users.noreply.github.com> * UM-5999 :: Tl issue wip (#5452) * Adding TLSelectStreet component in componenet registry for TL module * Removing the select street component and replacing it with TLSelectStreet --------- Co-authored-by: Tulika-eGov <74046137+Tulika-eGov@users.noreply.github.com> Co-authored-by: hinamakhija-eGov <96222691+hinamakhija-eGov@users.noreply.github.com> Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com> Co-authored-by: vamshikrishnakole-wtt-egov <57343517+vamshikrishnakole-wtt-egov@users.noreply.github.com> Co-authored-by: ashwiniathani-eGov <95741699+ashwiniathani-eGov@users.noreply.github.com> Co-authored-by: Harish S <119594385+Harish-egov@users.noreply.github.com> Co-authored-by: nikesh-eGov <48427967+nikesh-eGov@users.noreply.github.com> Co-authored-by: Priyanka-eGov <74049060+Priyanka-eGov@users.noreply.github.com> Co-authored-by: hinamakhija-eGov Co-authored-by: vamshikrishnakole-wtt-egov Co-authored-by: JithendarKumar-eGov <103918846+JithendarKumar-eGov@users.noreply.github.com> Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> Co-authored-by: nabeelmd-eGov Co-authored-by: Tulika-eGov Co-authored-by: gajendran.c Co-authored-by: Priyanka-eGov Co-authored-by: Debasish Chakraborty <117706910+debasishchakraborty-egovt@users.noreply.github.com> Co-authored-by: debasishchakraborty-egovt Co-authored-by: shubhang-eGov <70943369+shubhang-eGov@users.noreply.github.com> Co-authored-by: Shailesh Pandey <110380977+shailesh-egov@users.noreply.github.com> Co-authored-by: sardarshaik-eGov <112462979+sardarshaik-eGov@users.noreply.github.com> Co-authored-by: Anil Singha <99383116+anilsingha-eGov@users.noreply.github.com> Co-authored-by: AmanKumar-eGov <124674733+AmanKumar-eGov@users.noreply.github.com> Co-authored-by: talele08 Co-authored-by: Sarvesh-eGov <71336235+Sarvesh-eGov@users.noreply.github.com> Co-authored-by: saurabh-egov <71308823+saurabh-egov@users.noreply.github.com> Co-authored-by: vinothrallapalli-eGov Co-authored-by: burhanj-eGov <96115279+burhanj-eGov@users.noreply.github.com> Co-authored-by: shoaibsyed7 <79191374+shoaibsyed7@users.noreply.github.com> Co-authored-by: saurabh-egov Co-authored-by: Thikarthik <94159842+Thikarthik@users.noreply.github.com> Co-authored-by: ayushgupta-eGov <94037835+ayushgupta-eGov@users.noreply.github.com> Co-authored-by: ayush Co-authored-by: lakshmisravani-wtt-egov <80089327+lakshmisravani-wtt-egov@users.noreply.github.com> Co-authored-by: Nipun Arora Co-authored-by: RamkrishnaEgovt Co-authored-by: nrj-eGov <90257171+nrj-eGov@users.noreply.github.com> Co-authored-by: Sushant Agrawal <94037797+sushanta-egov@users.noreply.github.com> Co-authored-by: Sushant Agrawal Co-authored-by: Ramkrishna-egov <85437265+Ramkrishna-egov@users.noreply.github.com> Co-authored-by: kaviyarasan1993 Co-authored-by: Shashwat Mishra Co-authored-by: rohit-eGov <52992779+rohit-eGov@users.noreply.github.com> Co-authored-by: Shashwat Mishra <71879793+shashwat-egov@users.noreply.github.com> Co-authored-by: basilvg-eGov <81950519+basilvg-eGov@users.noreply.github.com> Co-authored-by: narendrabandhamneni-wt-egov <61416451+narendrabandhamneni-wt-egov@users.noreply.github.com> Co-authored-by: Gajendran <40357140+gajendran-egov@users.noreply.github.com> Co-authored-by: rohit-eGov Co-authored-by: naveen-wt-egov <90044067+naveen-wt-egov@users.noreply.github.com> Co-authored-by: talele08 Co-authored-by: aniket Co-authored-by: Gowtham-egov <112694085+Gowtham-egov@users.noreply.github.com> Co-authored-by: Rohit Shende Co-authored-by: egov-taresh <106061176+egov-taresh@users.noreply.github.com> Co-authored-by: JithendarKumar-eGov Co-authored-by: Karthik-egov <93192752+Karthik-egov@users.noreply.github.com> --- build/build-config.yml | 8 + .../BillingServiceApplicationTests.java | 18 - .../demand/billingservice/mappertest.java | 33 -- .../BillingServiceApplicationTests.java | 18 - .../java/org/egov/demand/util/FileUtils.java | 13 - .../repository/BusinessDetailsRepository.java | 53 --- core-services/README.md | 1 - .../org/egov/wf/web/controllers/testing.java | 16 - core-services/service-request/CHANGELOG.md | 8 + core-services/service-request/LOCALSETUP.md | 18 + core-services/service-request/README.md | 18 + core-services/service-request/pom.xml | 125 +++++++ .../java/digit/ServiceRequestApplication.java | 18 + .../main/java/digit/config/Configuration.java | 60 +++ .../java/digit/config/MainConfiguration.java | 39 ++ .../main/java/digit/constants/Constants.java | 12 + .../src/main/java/digit/error/ErrorCode.java | 68 ++++ .../src/main/java/digit/kafka/Consumer.java | 21 ++ .../src/main/java/digit/kafka/Producer.java | 20 + .../ServiceDefinitionRequestRepository.java | 66 ++++ .../repository/ServiceRequestRepository.java | 63 ++++ .../ServiceDefinitionQueryBuilder.java | 147 ++++++++ .../querybuilder/ServiceQueryBuilder.java | 162 ++++++++ .../rowmapper/ServiceDefinitionRowMapper.java | 137 +++++++ .../rowmapper/ServiceRowMapper.java | 141 +++++++ .../ServiceDefinitionRequestService.java | 75 ++++ .../ServiceRequestEnrichmentService.java | 106 ++++++ .../digit/service/ServiceRequestService.java | 71 ++++ .../java/digit/util/ResponseInfoFactory.java | 25 ++ .../ServiceDefinitionRequestValidator.java | 91 +++++ .../validators/ServiceRequestValidator.java | 179 +++++++++ .../web/controllers/ServiceController.java | 55 +++ .../ServiceDefinitionController.java | 59 +++ .../digit/web/models/AttributeDefinition.java | 129 +++++++ .../java/digit/web/models/AttributeValue.java | 52 +++ .../java/digit/web/models/Pagination.java | 82 +++++ .../digit/web/models/RequestInfoWrapper.java | 18 + .../main/java/digit/web/models/Service.java | 86 +++++ .../web/models/ServiceAttributeCriteria.java | 33 ++ .../digit/web/models/ServiceCriteria.java | 80 ++++ .../digit/web/models/ServiceDefinition.java | 76 ++++ .../web/models/ServiceDefinitionCriteria.java | 65 ++++ .../web/models/ServiceDefinitionRequest.java | 37 ++ .../web/models/ServiceDefinitionResponse.java | 55 +++ .../ServiceDefinitionSearchRequest.java | 44 +++ .../java/digit/web/models/ServiceRequest.java | 39 ++ .../digit/web/models/ServiceResponse.java | 55 +++ .../web/models/ServiceSearchRequest.java | 45 +++ .../src/main/resources/application.properties | 53 +++ .../src/main/resources/db/Dockerfile | 9 + .../src/main/resources/db/migrate.sh | 3 + .../V20230221120036__service_create_ddl.sql | 27 ++ ...21133034__servicedefinition_create_ddl.sql | 35 ++ .../resources/service-request-persister.yml | 138 +++++++ frontend/micro-ui/package.json | 2 +- .../web/micro-ui-internals/example/.env-nugp | 12 + .../micro-ui-internals/example/package.json | 28 +- .../example/src/setupProxy.js | 1 + .../web/micro-ui-internals/package.json | 6 +- .../packages/css/package.json | 2 +- .../packages/css/src/components/card.scss | 2 +- .../packages/css/src/components/checkbox.scss | 22 +- .../css/src/pages/employee/popupmodule.scss | 13 + .../packages/libraries/package.json | 2 +- .../libraries/src/hooks/dss/useGetChart.js | 11 +- .../packages/libraries/src/hooks/index.js | 6 + .../libraries/src/hooks/obps/useBPASearch.js | 4 +- .../src/hooks/pt/useRatingAndFeedbackMDMS.js | 35 ++ .../src/hooks/pt/useServiceSearchCF.js | 25 ++ .../libraries/src/hooks/useFeedBackSearch.js | 18 + .../packages/libraries/src/index.js | 2 + .../libraries/src/services/atoms/urls.js | 3 + .../libraries/src/services/elements/CF.js | 36 ++ .../libraries/src/services/elements/PT.js | 31 ++ .../src/services/elements/WorkFlow.js | 8 +- .../services/molecules/FSM/DriverDetails.js | 4 +- .../src/services/molecules/FSM/DsoDetails.js | 2 +- .../src/services/molecules/FSM/Search.js | 2 +- .../services/molecules/FSM/VehicleDetails.js | 2 +- .../src/services/molecules/Ulb/index.js | 22 +- .../packages/libraries/src/utils/dss/index.js | 5 +- .../packages/modules/bills/package.json | 4 +- .../bills/src/components/Search/index.js | 1 - .../packages/modules/common/package.json | 6 +- .../bills/routes/bill-details/bill-details.js | 29 +- .../payments/citizen/payers-details/index.js | 87 ++++- .../payments/citizen/payment-type/index.js | 21 +- .../src/payments/citizen/response/index.js | 28 +- .../Bill-details/billDetails.js | 33 +- .../employee/payment-collect/index.js | 38 +- .../packages/modules/commonPt/package.json | 4 +- .../packages/modules/core/package.json | 4 +- .../packages/modules/core/src/Module.js | 4 + .../core/src/components/AcknowledgementCF.js | 57 +++ .../core/src/components/CitizenFeedback.js | 168 +++++++++ .../TopBarSideBar/SideBar/EmployeeSideBar.js | 38 ++ .../TopBarSideBar/SideBar/NavItem.js | 79 ++++ .../TopBarSideBar/SideBar/NavItemHeader.js | 135 +++++++ .../core/src/config/RatingAndFeedback.js | 45 +++ .../pages/citizen/Login/SelectMobileNumber.js | 76 +++- .../modules/core/src/pages/citizen/index.js | 7 +- .../packages/modules/dss/package.json | 4 +- .../modules/dss/src/components/CustomTable.js | 15 +- .../modules/dss/src/components/MetricChart.js | 19 +- .../packages/modules/dss/src/pages/Home.js | 13 +- .../packages/modules/engagement/package.json | 4 +- .../components/Surveys/CitizenSurveyForm.js | 2 +- .../Surveys/CitizenSurveyQuestion.js | 4 +- .../Surveys/ResultsView/SurveyDetailsView.js | 12 +- .../packages/modules/fsm/package.json | 4 +- .../fsm/src/components/CustomTimePicker.js | 2 +- .../fsm/src/components/RegistryInbox.js | 58 ++- .../fsm/src/components/RegistrySearch.js | 6 +- .../fsm/src/components/inbox/search.js | 27 +- .../pageComponents/SelectPropertySubtype.js | 2 +- .../src/pageComponents/SelectPropertyType.js | 2 +- .../fsm/src/pageComponents/SelectSlumName.js | 2 +- .../fsm/src/pageComponents/SelectStreet.js | 21 +- .../ApplicationDetails/Modal/index.js | 49 ++- .../config/CompleteApplication.js | 44 +-- .../employee/ApplicationDetails/index.js | 4 +- .../employee/FSMRegistry/Driver/AddDriver.js | 10 +- .../FSMRegistry/Driver/DriverDetails.js | 2 +- .../employee/FSMRegistry/Driver/EditDriver.js | 2 + .../FSMRegistry/Vehicle/AddVehicle.js | 35 +- .../FSMRegistry/Vehicle/EditVehicle.js | 32 +- .../FSMRegistry/Vehicle/VehicleDetails.js | 2 +- .../employee/FSMRegistry/Vendor/AddVendor.js | 2 +- .../employee/FSMRegistry/Vendor/EditVendor.js | 2 + .../FSMRegistry/Vendor/VendorDetails.js | 2 +- .../src/pages/employee/FSMRegistry/index.js | 50 ++- .../fsm/src/pages/employee/FstpAddVehicle.js | 10 +- .../src/pages/employee/FstpOperatorDetails.js | 24 +- .../pages/employee/configs/DriverConfig.js | 40 +- .../pages/employee/configs/VehicleConfig.js | 51 ++- .../pages/employee/configs/VendorConfig.js | 6 +- .../modules/fsm/src/pages/employee/index.js | 7 +- .../packages/modules/hrms/package.json | 4 +- .../modules/hrms/src/pages/EmployeeDetails.js | 3 +- .../modules/hrms/src/pages/createEmployee.js | 8 +- .../packages/modules/hrms/src/pages/index.js | 2 +- .../packages/modules/mCollect/package.json | 4 +- .../mCollect/src/components/DesktopInbox.js | 2 +- .../src/pageComponents/ServiceDetails.js | 1 + .../packages/modules/noc/package.json | 4 +- .../packages/modules/obps/package.json | 4 +- .../SearchFormFieldsComponent.js | 20 +- .../src/components/SearchApplication/index.js | 28 +- .../src/pages/citizen/MyApplication/index.js | 11 +- .../modules/obps/src/pages/citizen/index.js | 1 + .../modules/obps/src/pages/employee/Search.js | 10 +- .../packages/modules/pgr/package.json | 4 +- .../packages/modules/pt/package.json | 4 +- .../packages/modules/pt/src/Module.js | 10 + .../pageComponents/OwnerDetailsEmployee.js | 2 +- .../pageComponents/PTCitizenFeedbackPopUp.js | 19 + .../pageComponents/PTWFApplicationTimeline.js | 2 +- .../SelectInistitutionOwnerDetails.js | 2 +- .../pages/citizen/Create/PTAcknowledgement.js | 9 +- .../src/pages/citizen/MyProperties/index.js | 6 +- .../MyProperties/propertyInformation.js | 2 +- .../src/pages/citizen/PTApplicationDetails.js | 49 ++- .../pages/citizen/PTMyApplications/index.js | 33 +- .../PTMyApplications/pt-application.js | 4 +- .../modules/pt/src/pages/citizen/index.js | 1 + .../packages/modules/receipts/package.json | 4 +- .../packages/modules/reports/package.json | 2 +- .../config/CompleteApplication.js | 2 +- .../ApplicationDetails/config/index.js | 24 ++ .../packages/modules/tl/package.json | 4 +- .../packages/modules/tl/src/Module.js | 4 +- .../{SelectStreet.js => TLSelectStreet.js} | 4 +- .../pageComponents/TLTradeUnitsEmployee.js | 4 +- .../src/pages/citizen/Renewal/renewTrade.js | 1 + .../packages/modules/ws/package.json | 4 +- .../SearchFormFieldsComponent.js | 2 +- .../packages/react-components/package.json | 2 +- .../src/atoms/CitizenConsentForm.js | 71 ++++ .../react-components/src/atoms/Rating.js | 31 +- .../react-components/src/atoms/StatusTable.js | 5 +- .../react-components/src/atoms/Tempo.js | 111 ++++++ .../src/atoms/WrapUnMaskComponent.js | 79 ++++ .../react-components/src/atoms/svgindex.js | 12 +- .../react-components/src/hoc/FormComposer.js | 1 + .../packages/react-components/src/index.js | 4 + .../src/molecules/FormStep.js | 2 +- .../web/micro-ui-internals/publish-beta.sh | 70 ++++ .../web/micro-ui-internals/publish.sh | 45 ++- frontend/micro-ui/web/package.json | 39 +- frontend/micro-ui/web/public/index.html | 2 +- frontend/micro-ui/web/src/App.js | 4 +- .../mono-ui/web/dss-dashboard/package.json | 2 +- .../src/components/SingleCheckbox/index.js | 16 +- .../src/components/SingleCheckbox/index.scss | 4 + .../src/redux/app/actionTypes.js | 1 + .../egov-ui-kit-dev/src/redux/app/actions.js | 35 ++ .../egov-ui-kit-dev/src/redux/app/reducer.js | 3 + .../egov-ui-kit-dev/src/utils/reportResult.js | 6 +- frontend/mono-ui/web/rainmaker/package.json | 2 +- .../citizen/src/config/forms/specs/login.js | 10 + .../User/Login/components/LoginForm/index.js | 114 +++++- .../src/modules/citizen/User/Login/index.js | 27 +- .../fsm/calculator/services/FSMService.java | 2 +- .../querybuilder/FSMQueryBuilder.java | 2 +- .../repository/rowmapper/FSMRowMapper.java | 2 +- .../java/org/egov/fsm/service/FSMService.java | 33 +- .../egov/fsm/service/VehicleTripService.java | 24 +- .../org/egov/fsm/validator/FSMValidator.java | 53 ++- .../egov/fsm/workflow/WorkflowIntegrator.java | 11 +- .../egov/inbox/config/InboxConfiguration.java | 6 - .../inbox/service/ElasticSearchService.java | 1 - .../src/main/resources/application.properties | 2 - .../property-services/CHANGELOG.md | 4 + municipal-services/property-services/pom.xml | 6 +- .../egov/pt/config/PropertyConfiguration.java | 4 +- .../java/org/egov/pt/producer/Producer.java | 20 - .../egov/pt/service/NotificationService.java | 33 +- .../org/egov/pt/util/NotificationUtil.java | 51 ++- .../java/org/egov/pt/util/PTConstants.java | 34 ++ .../src/main/resources/application.properties | 1 + .../config/KafkaConfigBatch.java | 82 ----- .../config/KafkaConfiguration.java | 49 --- .../vendor/config/VendorConfiguration.java | 41 +-- .../driver/repository/DriverRepository.java | 8 + .../querybuilder/DriverQueryBuilder.java | 18 +- .../vendor/driver/service/DriverService.java | 13 + .../org/egov/vendor/service/UserService.java | 7 +- .../org/egov/vendor/web/model/user/User.java | 348 +++++++++--------- .../src/main/resources/application.properties | 5 +- ...230404230257__driverMobileSeqIncrement.sql | 1 + .../V20230412114645__updateVendorRole.sql | 3 + .../config/KafkaConfigBatch.java | 100 ----- .../config/KafkaConfiguration.java | 46 --- 233 files changed, 5697 insertions(+), 1161 deletions(-) delete mode 100644 business-services/billing-service/src/test/java/org/egov/demand/billingservice/BillingServiceApplicationTests.java delete mode 100644 business-services/billing-service/src/test/java/org/egov/demand/billingservice/mappertest.java delete mode 100644 business-services/billing-service/src/test/java/org/egov/demand/service/BillingServiceApplicationTests.java delete mode 100644 business-services/billing-service/src/test/java/org/egov/demand/util/FileUtils.java delete mode 100644 business-services/collection-services/src/main/java/org/egov/collection/repository/BusinessDetailsRepository.java delete mode 100644 core-services/egov-workflow-v2/src/test/java/org/egov/wf/web/controllers/testing.java create mode 100644 core-services/service-request/CHANGELOG.md create mode 100644 core-services/service-request/LOCALSETUP.md create mode 100644 core-services/service-request/README.md create mode 100644 core-services/service-request/pom.xml create mode 100644 core-services/service-request/src/main/java/digit/ServiceRequestApplication.java create mode 100644 core-services/service-request/src/main/java/digit/config/Configuration.java create mode 100644 core-services/service-request/src/main/java/digit/config/MainConfiguration.java create mode 100644 core-services/service-request/src/main/java/digit/constants/Constants.java create mode 100644 core-services/service-request/src/main/java/digit/error/ErrorCode.java create mode 100644 core-services/service-request/src/main/java/digit/kafka/Consumer.java create mode 100644 core-services/service-request/src/main/java/digit/kafka/Producer.java create mode 100644 core-services/service-request/src/main/java/digit/repository/ServiceDefinitionRequestRepository.java create mode 100644 core-services/service-request/src/main/java/digit/repository/ServiceRequestRepository.java create mode 100644 core-services/service-request/src/main/java/digit/repository/querybuilder/ServiceDefinitionQueryBuilder.java create mode 100644 core-services/service-request/src/main/java/digit/repository/querybuilder/ServiceQueryBuilder.java create mode 100644 core-services/service-request/src/main/java/digit/repository/rowmapper/ServiceDefinitionRowMapper.java create mode 100644 core-services/service-request/src/main/java/digit/repository/rowmapper/ServiceRowMapper.java create mode 100644 core-services/service-request/src/main/java/digit/service/ServiceDefinitionRequestService.java create mode 100644 core-services/service-request/src/main/java/digit/service/ServiceRequestEnrichmentService.java create mode 100644 core-services/service-request/src/main/java/digit/service/ServiceRequestService.java create mode 100644 core-services/service-request/src/main/java/digit/util/ResponseInfoFactory.java create mode 100644 core-services/service-request/src/main/java/digit/validators/ServiceDefinitionRequestValidator.java create mode 100644 core-services/service-request/src/main/java/digit/validators/ServiceRequestValidator.java create mode 100644 core-services/service-request/src/main/java/digit/web/controllers/ServiceController.java create mode 100644 core-services/service-request/src/main/java/digit/web/controllers/ServiceDefinitionController.java create mode 100644 core-services/service-request/src/main/java/digit/web/models/AttributeDefinition.java create mode 100644 core-services/service-request/src/main/java/digit/web/models/AttributeValue.java create mode 100644 core-services/service-request/src/main/java/digit/web/models/Pagination.java create mode 100644 core-services/service-request/src/main/java/digit/web/models/RequestInfoWrapper.java create mode 100644 core-services/service-request/src/main/java/digit/web/models/Service.java create mode 100644 core-services/service-request/src/main/java/digit/web/models/ServiceAttributeCriteria.java create mode 100644 core-services/service-request/src/main/java/digit/web/models/ServiceCriteria.java create mode 100644 core-services/service-request/src/main/java/digit/web/models/ServiceDefinition.java create mode 100644 core-services/service-request/src/main/java/digit/web/models/ServiceDefinitionCriteria.java create mode 100644 core-services/service-request/src/main/java/digit/web/models/ServiceDefinitionRequest.java create mode 100644 core-services/service-request/src/main/java/digit/web/models/ServiceDefinitionResponse.java create mode 100644 core-services/service-request/src/main/java/digit/web/models/ServiceDefinitionSearchRequest.java create mode 100644 core-services/service-request/src/main/java/digit/web/models/ServiceRequest.java create mode 100644 core-services/service-request/src/main/java/digit/web/models/ServiceResponse.java create mode 100644 core-services/service-request/src/main/java/digit/web/models/ServiceSearchRequest.java create mode 100644 core-services/service-request/src/main/resources/application.properties create mode 100644 core-services/service-request/src/main/resources/db/Dockerfile create mode 100644 core-services/service-request/src/main/resources/db/migrate.sh create mode 100644 core-services/service-request/src/main/resources/db/migration/main/V20230221120036__service_create_ddl.sql create mode 100644 core-services/service-request/src/main/resources/db/migration/main/V20230221133034__servicedefinition_create_ddl.sql create mode 100644 core-services/service-request/src/main/resources/service-request-persister.yml create mode 100644 frontend/micro-ui/web/micro-ui-internals/example/.env-nugp create mode 100644 frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/pt/useRatingAndFeedbackMDMS.js create mode 100644 frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/pt/useServiceSearchCF.js create mode 100644 frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/useFeedBackSearch.js create mode 100644 frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/CF.js create mode 100644 frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/AcknowledgementCF.js create mode 100644 frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/CitizenFeedback.js create mode 100644 frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/NavItem.js create mode 100644 frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/NavItemHeader.js create mode 100644 frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/config/RatingAndFeedback.js create mode 100644 frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/PTCitizenFeedbackPopUp.js rename frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/{SelectStreet.js => TLSelectStreet.js} (98%) create mode 100644 frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/CitizenConsentForm.js create mode 100644 frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/Tempo.js create mode 100644 frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/WrapUnMaskComponent.js create mode 100644 frontend/micro-ui/web/micro-ui-internals/publish-beta.sh delete mode 100644 municipal-services/property-services/src/main/java/org/egov/pt/producer/Producer.java delete mode 100644 municipal-services/sw-calculator/src/main/java/org/egov/swcalculation/config/KafkaConfigBatch.java delete mode 100644 municipal-services/sw-calculator/src/main/java/org/egov/swcalculation/config/KafkaConfiguration.java create mode 100644 municipal-services/vendor/src/main/resources/db/migration/main/V20230404230257__driverMobileSeqIncrement.sql create mode 100644 municipal-services/vendor/src/main/resources/db/migration/main/V20230412114645__updateVendorRole.sql delete mode 100644 municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/config/KafkaConfigBatch.java delete mode 100644 municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/config/KafkaConfiguration.java diff --git a/build/build-config.yml b/build/build-config.yml index 494d3cc8efe..c53d280c3cc 100644 --- a/build/build-config.yml +++ b/build/build-config.yml @@ -260,6 +260,14 @@ config: - work-dir: "core-services/egov-survey-services/src/main/resources/db" image-name: "egov-survey-services-db" + - name: "builds/digit-dev/core-services/service-request" + build: + - work-dir: "core-services/service-request" + image-name: "service-request" + dockerfile: "build/maven/Dockerfile" + - work-dir: "core-services/service-request/src/main/resources/db" + image-name: "service-request-db" + - name: "builds/digit-dev/core-services/report" build: diff --git a/business-services/billing-service/src/test/java/org/egov/demand/billingservice/BillingServiceApplicationTests.java b/business-services/billing-service/src/test/java/org/egov/demand/billingservice/BillingServiceApplicationTests.java deleted file mode 100644 index d4090483495..00000000000 --- a/business-services/billing-service/src/test/java/org/egov/demand/billingservice/BillingServiceApplicationTests.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.egov.demand.billingservice; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -@ActiveProfiles("test") -public class BillingServiceApplicationTests { - - @Test - public void contextLoads() { - } - -} diff --git a/business-services/billing-service/src/test/java/org/egov/demand/billingservice/mappertest.java b/business-services/billing-service/src/test/java/org/egov/demand/billingservice/mappertest.java deleted file mode 100644 index 97471a06678..00000000000 --- a/business-services/billing-service/src/test/java/org/egov/demand/billingservice/mappertest.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.egov.demand.billingservice; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Test; -import org.postgresql.util.PGobject; - -import java.math.BigDecimal; -import java.sql.SQLException; -import java.util.LinkedList; -import java.util.List; -import java.util.Objects; - -public class mappertest { - - @Test - public void name() throws SQLException { - - - List L = new LinkedList(); - - L.add(new BigDecimal(1)); - L.add(2); - - System.out.println(L.get(1).getClass()); - - } - - - - - -} diff --git a/business-services/billing-service/src/test/java/org/egov/demand/service/BillingServiceApplicationTests.java b/business-services/billing-service/src/test/java/org/egov/demand/service/BillingServiceApplicationTests.java deleted file mode 100644 index 2124238fa80..00000000000 --- a/business-services/billing-service/src/test/java/org/egov/demand/service/BillingServiceApplicationTests.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.egov.demand.service; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -@ActiveProfiles("test") -public class BillingServiceApplicationTests { - - @Test - public void contextLoads() { - } - -} diff --git a/business-services/billing-service/src/test/java/org/egov/demand/util/FileUtils.java b/business-services/billing-service/src/test/java/org/egov/demand/util/FileUtils.java deleted file mode 100644 index 5a261ce861e..00000000000 --- a/business-services/billing-service/src/test/java/org/egov/demand/util/FileUtils.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.egov.demand.util; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; - -public class FileUtils { - public String getFileContents(String path) throws IOException { - ClassLoader classLoader = getClass().getClassLoader(); - return new String(Files.readAllBytes(new File(classLoader.getResource(path).getFile()).toPath())); - } - -} diff --git a/business-services/collection-services/src/main/java/org/egov/collection/repository/BusinessDetailsRepository.java b/business-services/collection-services/src/main/java/org/egov/collection/repository/BusinessDetailsRepository.java deleted file mode 100644 index 8565f4db8a9..00000000000 --- a/business-services/collection-services/src/main/java/org/egov/collection/repository/BusinessDetailsRepository.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.egov.collection.repository; - -import lombok.extern.slf4j.Slf4j; -import org.egov.collection.web.contract.BusinessDetailsResponse; -import org.egov.collection.web.contract.factory.RequestInfoWrapper; -import org.egov.common.contract.request.RequestInfo; -import org.egov.tracer.model.CustomException; -import org.egov.tracer.model.ServiceCallException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Repository; -import org.springframework.web.client.HttpClientErrorException; -import org.springframework.web.client.RestTemplate; - -import java.util.List; - -@Repository -@Slf4j -public class BusinessDetailsRepository { - - public static final Logger LOGGER = LoggerFactory.getLogger(BusinessDetailsRepository.class); - - @Autowired - private RestTemplate restTemplate; - - private String url; - - public BusinessDetailsRepository(RestTemplate restTemplate,@Value("${egov.common.service.host}") final String commonServiceHost, - @Value("${egov.services.get_businessdetails_by_codes}") final String url) { - this.restTemplate = restTemplate; - this.url = commonServiceHost + url; - } - - public BusinessDetailsResponse getBusinessDetails(List businessCodes,String tenantId,RequestInfo requestInfo) { - RequestInfoWrapper requestInfoWrapper = new RequestInfoWrapper(); - requestInfoWrapper.setRequestInfo(requestInfo); - String businessDetailsCodes = String.join(",", businessCodes); - try { - return restTemplate.postForObject(url, requestInfoWrapper, - BusinessDetailsResponse.class, tenantId, businessDetailsCodes); - } catch (HttpClientErrorException e) { - log.error("Unable to fetch business detail for {} and tenant id {} from egov-common-masters, " , - businessCodes, tenantId, e); - throw new ServiceCallException(e.getResponseBodyAsString()); - } catch (Exception e) { - log.error("Unable to fetch business detail for {} and tenant id, " , businessCodes, tenantId, e); - throw new CustomException("BUSINESS_DETAIL_SERVICE_ERROR", "Unable to fetch business detail from " + - "egov-common-masters, unknown error occurred"); - } - } -} diff --git a/core-services/README.md b/core-services/README.md index a13a47a2d24..628326bd831 100644 --- a/core-services/README.md +++ b/core-services/README.md @@ -4,4 +4,3 @@ DIGIT Core Platform consists of the foundational microservices for authenticatio #### DIGIT is released under MIT License - diff --git a/core-services/egov-workflow-v2/src/test/java/org/egov/wf/web/controllers/testing.java b/core-services/egov-workflow-v2/src/test/java/org/egov/wf/web/controllers/testing.java deleted file mode 100644 index 9f95b31bf2a..00000000000 --- a/core-services/egov-workflow-v2/src/test/java/org/egov/wf/web/controllers/testing.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.egov.wf.web.controllers; - -import org.junit.Test; - -import java.util.List; - -public class testing { - - - @Test - public void name() { - List a; - - - } -} diff --git a/core-services/service-request/CHANGELOG.md b/core-services/service-request/CHANGELOG.md new file mode 100644 index 00000000000..4a912571a9d --- /dev/null +++ b/core-services/service-request/CHANGELOG.md @@ -0,0 +1,8 @@ + + +# Changelog +All notable changes to this module will be documented in this file. + +## 1.0.0_beta - 2020-04-13 + +- Base version \ No newline at end of file diff --git a/core-services/service-request/LOCALSETUP.md b/core-services/service-request/LOCALSETUP.md new file mode 100644 index 00000000000..cbf9088b57d --- /dev/null +++ b/core-services/service-request/LOCALSETUP.md @@ -0,0 +1,18 @@ +# Local Setup + +To setup the service-request in your local system, clone the [Muncipal Service repository](https://github.com/egovernments/DIGIT-Dev). + +## Dependencies + +### Infra Dependency + +- [x] Postgres DB +- [ ] Redis +- [ ] Elasticsearch +- [x] Kafka + - [x] Consumer + - [x] Producer + +## Running Locally + +To run the service-request in local system, you need to change dB connection details as per your local setup of postgres. diff --git a/core-services/service-request/README.md b/core-services/service-request/README.md new file mode 100644 index 00000000000..a2e8a9f7b84 --- /dev/null +++ b/core-services/service-request/README.md @@ -0,0 +1,18 @@ +# Swagger generated server + +Spring Boot Server + + +## Overview +This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project. +By using the [OpenAPI-Spec](https://github.com/swagger-api/swagger-core), you can easily generate a server stub. +This is an example of building a swagger-enabled server in Java using the SpringBoot framework. + +The underlying library integrating swagger to SpringBoot is [springfox](https://github.com/springfox/springfox) + +Start your server as an simple java application + +You can view the api documentation in swagger-ui by pointing to +http://localhost:8080/ + +Change default port value in application.properties \ No newline at end of file diff --git a/core-services/service-request/pom.xml b/core-services/service-request/pom.xml new file mode 100644 index 00000000000..1aa52fb3da1 --- /dev/null +++ b/core-services/service-request/pom.xml @@ -0,0 +1,125 @@ + + 4.0.0 + org.egov + service-request + jar + service-request + 1.0.0_beta-SNAPSHOT + + 1.8 + ${java.version} + ${java.version} + + + org.springframework.boot + spring-boot-starter-parent + 2.2.6.RELEASE + + + src/main/java + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.flywaydb + flyway-core + + + org.postgresql + postgresql + 42.2.2.jre7 + + + org.springframework.boot + spring-boot-starter-test + test + + + + io.swagger + swagger-core + 1.5.18 + + + io.swagger.core.v3 + swagger-annotations + 2.2.8 + + + + + org.egov.services + tracer + 2.1.2-SNAPSHOT + + + org.egov.services + digit-models + 1.0.0-SNAPSHOT + + + org.egov + mdms-client + 0.0.2-SNAPSHOT + compile + + + org.projectlombok + lombok + true + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + + javax.validation + validation-api + + + + + repo.egovernments.org + eGov ERP Releases Repository + https://nexus-repo.egovernments.org/nexus/content/repositories/releases/ + + + repo.egovernments.org.snapshots + eGov ERP Releases Repository + https://nexus-repo.egovernments.org/nexus/content/repositories/snapshots/ + + + repo.egovernments.org.public + eGov Public Repository Group + https://nexus-repo.egovernments.org/nexus/content/groups/public/ + + + repo.digit.org + eGov DIGIT Releases Repository + https://nexus-repo.digit.org/nexus/content/repositories/snapshots/ + + + diff --git a/core-services/service-request/src/main/java/digit/ServiceRequestApplication.java b/core-services/service-request/src/main/java/digit/ServiceRequestApplication.java new file mode 100644 index 00000000000..e7bf8edc567 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/ServiceRequestApplication.java @@ -0,0 +1,18 @@ +package digit; + + +import org.egov.tracer.config.TracerConfiguration; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Import; + +@Import({ TracerConfiguration.class }) +@SpringBootApplication +public class ServiceRequestApplication { + + public static void main(String[] args) { + SpringApplication.run(ServiceRequestApplication.class, args); + } + +} diff --git a/core-services/service-request/src/main/java/digit/config/Configuration.java b/core-services/service-request/src/main/java/digit/config/Configuration.java new file mode 100644 index 00000000000..f25fcf9f4ad --- /dev/null +++ b/core-services/service-request/src/main/java/digit/config/Configuration.java @@ -0,0 +1,60 @@ +package digit.config; + +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.*; +import org.egov.tracer.config.TracerConfiguration; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Import; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import java.util.TimeZone; + +@Component +@Data +@Import({TracerConfiguration.class}) +@NoArgsConstructor +@AllArgsConstructor +@Setter +@Getter +public class Configuration { + @Value("${app.timezone}") + private String timeZone; + + @PostConstruct + public void initialize() { + TimeZone.setDefault(TimeZone.getTimeZone(timeZone)); + } + + @Bean + @Autowired + public MappingJackson2HttpMessageConverter jacksonConverter(ObjectMapper objectMapper) { + MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(); + converter.setObjectMapper(objectMapper); + return converter; + } + + // Pagination + @Value("${egov.service.request.default.offset}") + private Integer defaultOffset; + + @Value("${egov.service.request.default.limit}") + private Integer defaultLimit; + + @Value("${egov.service.request.max.limit}") + private Integer maxLimit; + + // Kafka topics + @Value("${egov.service.definition.create.topic}") + private String serviceDefinitionCreateTopic; + + @Value("${egov.service.create.topic}") + private String serviceCreateTopic; + + @Value("${egov.max.string.input.size}") + private Integer maxStringInputSize; + +} diff --git a/core-services/service-request/src/main/java/digit/config/MainConfiguration.java b/core-services/service-request/src/main/java/digit/config/MainConfiguration.java new file mode 100644 index 00000000000..60b7660e94c --- /dev/null +++ b/core-services/service-request/src/main/java/digit/config/MainConfiguration.java @@ -0,0 +1,39 @@ +package digit.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Import; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.MediaType; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import java.util.TimeZone; +import javax.annotation.PostConstruct; + import com.fasterxml.jackson.databind.DeserializationFeature; + import com.fasterxml.jackson.databind.ObjectMapper; +import org.egov.tracer.config.TracerConfiguration; + + +@Import({TracerConfiguration.class}) +public class MainConfiguration { + + @Value("${app.timezone}") + private String timeZone; + + @PostConstruct + public void initialize() { + TimeZone.setDefault(TimeZone.getTimeZone(timeZone)); + } + + @Bean + public ObjectMapper objectMapper(){ + return new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES).setTimeZone(TimeZone.getTimeZone(timeZone)); + } + + @Bean + @Autowired + public MappingJackson2HttpMessageConverter jacksonConverter(ObjectMapper objectMapper) { + MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(); + converter.setObjectMapper(objectMapper); + return converter; + } +} \ No newline at end of file diff --git a/core-services/service-request/src/main/java/digit/constants/Constants.java b/core-services/service-request/src/main/java/digit/constants/Constants.java new file mode 100644 index 00000000000..ef95112ca4b --- /dev/null +++ b/core-services/service-request/src/main/java/digit/constants/Constants.java @@ -0,0 +1,12 @@ +package digit.constants; + +import org.springframework.stereotype.Component; + +@Component +public class Constants { + + public static final String VALUE = "value"; + + public static final String VALUE_JSON_PATH = "$.value"; + +} diff --git a/core-services/service-request/src/main/java/digit/error/ErrorCode.java b/core-services/service-request/src/main/java/digit/error/ErrorCode.java new file mode 100644 index 00000000000..dab0fa9a6a7 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/error/ErrorCode.java @@ -0,0 +1,68 @@ +package digit.error; + +import org.springframework.stereotype.Component; + +@Component +public class ErrorCode { + public static final String SERVICE_REQUEST_INVALID_SERVICE_DEF_ID_CODE = "SERVICE_REQUEST_INVALID_SERVICE_DEF_ID"; + + public static final String SERVICE_REQUEST_INVALID_SERVICE_DEF_ID_MSG = "Invalid service definition id"; + + public static final String SERVICE_REQUEST_INVALID_DATA_TYPE_CODE = "SERVICE_REQUEST_INVALID_DATA_TYPE"; + + public static final String SERVICE_REQUEST_INVALID_DATA_TYPE_MSG = "Invalid data type"; + + public static final String SERVICE_REQUEST_UNRECOGNIZED_ATTRIBUTE_CODE = "SERVICE_REQUEST_UNRECOGNIZED_ATTRIBUTE_CODE"; + + public static final String SERVICE_REQUEST_UNRECOGNIZED_ATTRIBUTE_MSG = "Provided attribute code is not a part of the concerned service definition"; + + public static final String SERVICE_REQUEST_ATTRIBUTE_INVALID_VALUE_CODE = "SERVICE_REQUEST_ATTRIBUTE_INVALID_VALUE_CODE"; + + public static final String SERVICE_REQUEST_ATTRIBUTE_INVALID_NUMBER_VALUE_MSG = "Attribute Value provided against the attribute definition of type Number must be a number"; + + public static final String SERVICE_REQUEST_ATTRIBUTE_INVALID_STRING_VALUE_MSG = "Attribute Value provided against the attribute definition of type String must be a string"; + + public static final String SERVICE_REQUEST_ATTRIBUTE_INVALID_TEXT_VALUE_MSG = "Attribute Value provided against the attribute definition of type Text must be a string"; + + public static final String SERVICE_REQUEST_ATTRIBUTE_INVALID_DATETIME_VALUE_MSG = "Attribute Value provided against the attribute definition of type DateTime must be an epoch value of type long"; + + public static final String SERVICE_REQUEST_ATTRIBUTE_INVALID_SINGLE_VALUE_LIST_VALUE_MSG = "Attribute Value provided against the attribute definition of type single value list must be an instance of String"; + + public static final String SERVICE_REQUEST_ATTRIBUTE_INVALID_MULTI_VALUE_LIST_VALUE_MSG = "Attribute Value provided against the attribute definition of type multi value list must be an instance of list"; + + public static final String INVALID_SIZE_OF_INPUT_CODE = "INVALID_SIZE_OF_INPUT_CODE"; + + public static final String INVALID_SIZE_OF_TEXT_MSG = "Text value cannot be of length greater than configured length "; + + public static final String SERVICE_DEFINITION_ALREADY_EXISTS_ERR_CODE = "SERVICE_DEFINITION_ALREADY_EXISTS_ERR_CODE"; + + public static final String SERVICE_DEFINITION_ALREADY_EXISTS_ERR_MSG = "Service definition with the given tenantId and code combination already exists"; + + public static final String ATTRIBUTE_CODE_UNIQUENESS_ERR_CODE = "ATTRIBUTE_CODE_UNIQUENESS_ERR_CODE"; + + public static final String ATTRIBUTE_CODE_UNIQUENESS_ERR_MSG = "Attribute definitions provided as part of service definition must have unique codes"; + + public static final String SERVICE_REQUEST_ATTRIBUTE_VALUES_UNIQUENESS_ERR_CODE = "SERVICE_REQUEST_ATTRIBUTE_VALUES_UNIQUENESS_ERR_CODE"; + + public static final String SERVICE_REQUEST_ATTRIBUTE_VALUES_UNIQUENESS_ERR_MSG = "Attribute values being passed against a particular service definition must be unique"; + + public static final String SERVICE_REQUEST_REQUIRED_ATTRIBUTE_NOT_PROVIDED_ERR_CODE = "SERVICE_REQUEST_REQUIRED_ATTRIBUTE_NOT_PROVIDED_ERR_CODE"; + + public static final String SERVICE_REQUEST_REQUIRED_ATTRIBUTE_NOT_PROVIDED_ERR_MSG = "Mandatory attribute value not provided as part of service request"; + + public static final String INVALID_ATTRIBUTE_DEFINITION_ERR_CODE = "INVALID_ATTRIBUTE_DEFINITION_ERR_CODE"; + + public static final String INVALID_ATTRIBUTE_DEFINITION_ERR_MSG = "Values are only allowed in case of single value and multi value lists"; + + public static final String SERVICE_REQUEST_ATTRIBUTE_INVALID_VALUE_SINGLEVALUELIST_MSG = "Values provided against single value type list must belong to the list of values provided during service definition creation."; + + public static final String SERVICE_REQUEST_ATTRIBUTE_INVALID_VALUE_MULTIVALUELIST_MSG = "Values provided against multi value type list must belong to the list of values provided during service definition creation."; + + public static final String INVALID_REGEX_ERR_CODE = "INVALID_REGEX_ERR_CODE"; + + public static final String INVALID_REGEX_ERR_MSG = "The provided regex failed to compile for attribute definition with code - "; + + public static final String ATTRIBUTE_VALUE_REGEX_VALIDATION_ERR_CODE = "ATTRIBUTE_VALUE_REGEX_VALIDATION_ERR"; + + public static final String ATTRIBUTE_VALUE_REGEX_VALIDATION_ERR_MSG = "Provided attribute value does not conform with the regex provided against attribute definition"; +} diff --git a/core-services/service-request/src/main/java/digit/kafka/Consumer.java b/core-services/service-request/src/main/java/digit/kafka/Consumer.java new file mode 100644 index 00000000000..557ffe5d7bb --- /dev/null +++ b/core-services/service-request/src/main/java/digit/kafka/Consumer.java @@ -0,0 +1,21 @@ +package digit.kafka; + +import org.springframework.kafka.annotation.KafkaListener; +import org.springframework.stereotype.Component; + +import java.util.HashMap; + +@Component +public class Consumer { + + /* + * Uncomment the below line to start consuming record from kafka.topics.consumer + * Value of the variable kafka.topics.consumer should be overwritten in application.properties + */ + //@KafkaListener(topics = {"kafka.topics.consumer"}) + public void listen(final HashMap record) { + + //TODO + + } +} diff --git a/core-services/service-request/src/main/java/digit/kafka/Producer.java b/core-services/service-request/src/main/java/digit/kafka/Producer.java new file mode 100644 index 00000000000..542f4f686c0 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/kafka/Producer.java @@ -0,0 +1,20 @@ +package digit.kafka; + +import lombok.extern.slf4j.Slf4j; +import org.egov.tracer.kafka.CustomKafkaTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +// NOTE: If tracer is disabled change CustomKafkaTemplate to KafkaTemplate in autowiring + +@Service +@Slf4j +public class Producer { + + @Autowired + private CustomKafkaTemplate kafkaTemplate; + + public void push(String topic, Object value) { + kafkaTemplate.send(topic, value); + } +} diff --git a/core-services/service-request/src/main/java/digit/repository/ServiceDefinitionRequestRepository.java b/core-services/service-request/src/main/java/digit/repository/ServiceDefinitionRequestRepository.java new file mode 100644 index 00000000000..acf01303e30 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/repository/ServiceDefinitionRequestRepository.java @@ -0,0 +1,66 @@ +package digit.repository; + +import digit.repository.querybuilder.ServiceDefinitionQueryBuilder; +import digit.repository.rowmapper.ServiceDefinitionRowMapper; +import digit.web.models.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.SingleColumnRowMapper; +import org.springframework.stereotype.Repository; +import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; + +import java.util.ArrayList; +import java.util.List; + +@Slf4j +@Repository +public class ServiceDefinitionRequestRepository { + + @Autowired + private JdbcTemplate jdbcTemplate; + + @Autowired + private ServiceDefinitionRowMapper serviceDefinitionRowMapper; + + @Autowired + private ServiceDefinitionQueryBuilder serviceDefinitionQueryBuilder; + + + public List getServiceDefinitions(ServiceDefinitionSearchRequest serviceDefinitionSearchRequest) { + ServiceDefinitionCriteria criteria = serviceDefinitionSearchRequest.getServiceDefinitionCriteria(); + + List preparedStmtList = new ArrayList<>(); + + if(CollectionUtils.isEmpty(criteria.getIds()) && ObjectUtils.isEmpty(criteria.getTenantId()) && CollectionUtils.isEmpty(criteria.getCode())) + return new ArrayList<>(); + + // Fetch ids based on criteria if ids are not present + if(CollectionUtils.isEmpty(criteria.getIds())){ + // Fetch ids according to given criteria + String idQuery = serviceDefinitionQueryBuilder.getServiceDefinitionsIdsQuery(serviceDefinitionSearchRequest, preparedStmtList); + log.info("Service definition ids query: " + idQuery); + log.info("Parameters: " + preparedStmtList.toString()); + List serviceDefinitionIds = jdbcTemplate.query(idQuery, preparedStmtList.toArray(), new SingleColumnRowMapper<>(String.class)); + + if(CollectionUtils.isEmpty(serviceDefinitionIds)) + return new ArrayList<>(); + + // Set ids in criteria + criteria.setIds(serviceDefinitionIds); + preparedStmtList.clear(); + } + + + + String query = serviceDefinitionQueryBuilder.getServiceDefinitionSearchQuery(criteria, preparedStmtList); + log.info("query for search: " + query + " params: " + preparedStmtList); + return jdbcTemplate.query(query, preparedStmtList.toArray(), serviceDefinitionRowMapper); + + } + + public List getService(ServiceCriteria criteria) { + return new ArrayList<>(); + } +} diff --git a/core-services/service-request/src/main/java/digit/repository/ServiceRequestRepository.java b/core-services/service-request/src/main/java/digit/repository/ServiceRequestRepository.java new file mode 100644 index 00000000000..17a0cdf5ddf --- /dev/null +++ b/core-services/service-request/src/main/java/digit/repository/ServiceRequestRepository.java @@ -0,0 +1,63 @@ +package digit.repository; + +import digit.repository.querybuilder.ServiceDefinitionQueryBuilder; +import digit.repository.querybuilder.ServiceQueryBuilder; +import digit.repository.rowmapper.ServiceDefinitionRowMapper; +import digit.repository.rowmapper.ServiceRowMapper; +import digit.web.models.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.SingleColumnRowMapper; +import org.springframework.stereotype.Repository; +import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; + +import java.util.ArrayList; +import java.util.List; + +@Slf4j +@Repository +public class ServiceRequestRepository { + + @Autowired + private JdbcTemplate jdbcTemplate; + + @Autowired + private ServiceRowMapper serviceRowMapper; + + @Autowired + private ServiceQueryBuilder serviceQueryBuilder; + + + public List getService(ServiceSearchRequest serviceSearchRequest) { + ServiceCriteria criteria = serviceSearchRequest.getServiceCriteria(); + + List preparedStmtList = new ArrayList<>(); + + if(CollectionUtils.isEmpty(criteria.getIds()) && ObjectUtils.isEmpty(criteria.getTenantId()) && CollectionUtils.isEmpty(criteria.getServiceDefIds()) && CollectionUtils.isEmpty(criteria.getReferenceIds())) + return new ArrayList<>(); + + // Fetch ids based on criteria if ids are not present + if(CollectionUtils.isEmpty(criteria.getIds())){ + // Fetch ids according to given criteria + String idQuery = serviceQueryBuilder.getServiceIdsQuery(serviceSearchRequest, preparedStmtList); + log.info("Service ids query: " + idQuery); + log.info("Parameters: " + preparedStmtList.toString()); + List serviceIds = jdbcTemplate.query(idQuery, preparedStmtList.toArray(), new SingleColumnRowMapper<>(String.class)); + + if(CollectionUtils.isEmpty(serviceIds)) + return new ArrayList<>(); + + // Set ids in criteria + criteria.setIds(serviceIds); + preparedStmtList.clear(); + } + + + // Search based on the ids found out/ ids been explicitly provided in the request. + String query = serviceQueryBuilder.getServiceSearchQuery(criteria, preparedStmtList); + log.info("query for search: " + query + " params: " + preparedStmtList); + return jdbcTemplate.query(query, preparedStmtList.toArray(), serviceRowMapper); + } +} diff --git a/core-services/service-request/src/main/java/digit/repository/querybuilder/ServiceDefinitionQueryBuilder.java b/core-services/service-request/src/main/java/digit/repository/querybuilder/ServiceDefinitionQueryBuilder.java new file mode 100644 index 00000000000..937093cc7c6 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/repository/querybuilder/ServiceDefinitionQueryBuilder.java @@ -0,0 +1,147 @@ +package digit.repository.querybuilder; + +import digit.config.Configuration; +import digit.web.models.Pagination; +import digit.web.models.ServiceDefinitionCriteria; +import digit.web.models.ServiceDefinitionSearchRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; + +import java.util.List; + +@Component +public class ServiceDefinitionQueryBuilder { + + @Autowired + private Configuration config; + + private static final String SELECT = " SELECT "; + private static final String INNER_JOIN = " INNER JOIN "; + private static final String LEFT_JOIN = " LEFT OUTER JOIN "; + private static final String AND_QUERY = " AND "; + + private static final String IDS_WRAPPER_QUERY = " SELECT id FROM ({HELPER_TABLE}) temp "; + private final String ORDERBY_CREATEDTIME = " ORDER BY sd.createdtime DESC "; + + public String getServiceDefinitionsIdsQuery(ServiceDefinitionSearchRequest serviceDefinitionSearchRequest, List preparedStmtList) { + ServiceDefinitionCriteria criteria = serviceDefinitionSearchRequest.getServiceDefinitionCriteria(); + + StringBuilder query = new StringBuilder(SELECT + " DISTINCT(sd.id), sd.createdtime "); + query.append(" FROM eg_service_definition sd "); + + if(!ObjectUtils.isEmpty(criteria.getTenantId())){ + addClauseIfRequired(query, preparedStmtList); + query.append(" sd.tenantid = ? "); + preparedStmtList.add(criteria.getTenantId()); + } + + if(!CollectionUtils.isEmpty(criteria.getCode())){ + addClauseIfRequired(query, preparedStmtList); + query.append(" sd.code IN ( ").append(createQuery(criteria.getCode())).append(" )"); + addToPreparedStatement(preparedStmtList, criteria.getCode()); + } + + if(!CollectionUtils.isEmpty(criteria.getModule())){ + addClauseIfRequired(query, preparedStmtList); + query.append(" sd.module IN ( ").append(createQuery(criteria.getModule())).append(" )"); + addToPreparedStatement(preparedStmtList, criteria.getModule()); + } + + if(!CollectionUtils.isEmpty(criteria.getIds())){ + addClauseIfRequired(query, preparedStmtList); + query.append(" sd.id IN ( ").append(createQuery(criteria.getIds())).append(" )"); + addToPreparedStatement(preparedStmtList, criteria.getIds()); + } + + if(!ObjectUtils.isEmpty(criteria.getClientId())){ + addClauseIfRequired(query, preparedStmtList); + query.append(" sd.clientid = ? "); + preparedStmtList.add(criteria.getClientId()); + } + + // Fetch service definitions which have NOT been soft deleted + addClauseIfRequired(query, preparedStmtList); + query.append(" sd.isActive = ? "); + preparedStmtList.add(Boolean.TRUE); + + // order service definitions based on their createdtime in latest first manner + query.append(ORDERBY_CREATEDTIME); + + // Pagination to limit results + if(ObjectUtils.isEmpty(serviceDefinitionSearchRequest.getPagination())){ + prepareDefaultPaginationObject(serviceDefinitionSearchRequest); + } + addPagination(query, preparedStmtList, serviceDefinitionSearchRequest.getPagination()); + + return IDS_WRAPPER_QUERY.replace("{HELPER_TABLE}", query.toString()); + } + + private void prepareDefaultPaginationObject(ServiceDefinitionSearchRequest serviceDefinitionSearchRequest) { + Pagination pagination = new Pagination(); + pagination.setOffset(config.getDefaultOffset()); + pagination.setLimit(config.getDefaultLimit()); + serviceDefinitionSearchRequest.setPagination(pagination); + } + + private void addClauseIfRequired(StringBuilder query, List preparedStmtList){ + if(preparedStmtList.isEmpty()){ + query.append(" WHERE "); + }else{ + query.append(" AND "); + } + } + + private String createQuery(List ids) { + StringBuilder builder = new StringBuilder(); + int length = ids.size(); + for (int i = 0; i < length; i++) { + builder.append(" ?"); + if (i != length - 1) + builder.append(","); + } + return builder.toString(); + } + + private void addToPreparedStatement(List preparedStmtList, List ids) { + ids.forEach(id -> { + preparedStmtList.add(id); + }); + } + + private void addPagination(StringBuilder query, List preparedStmtList, Pagination pagination) { + + // Append offset + query.append(" OFFSET ? "); + preparedStmtList.add(ObjectUtils.isEmpty(pagination.getOffset()) ? config.getDefaultOffset() : pagination.getOffset()); + + // Append limit + query.append(" LIMIT ? "); + preparedStmtList.add(ObjectUtils.isEmpty(pagination.getLimit()) ? config.getDefaultLimit() : pagination.getLimit()); + } + + + public String getServiceDefinitionSearchQuery(ServiceDefinitionCriteria criteria, List preparedStmtList) { + StringBuilder query = new StringBuilder("SELECT sd.id, sd.tenantid, sd.code, sd.module, sd.isactive, sd.createdby, sd.lastmodifiedby, sd.createdtime, sd.lastmodifiedtime, sd.additionaldetails, sd.clientid, " + + "ad.id as attribute_definition_id, ad.referenceid as attribute_definition_referenceid, ad.tenantid as attribute_definition_tenantid, ad.code as attribute_definition_code, ad.datatype as attribute_definition_datatype, ad.values as attribute_definition_values, ad.isactive as attribute_definition_isactive, ad.required as attribute_definition_required, ad.regex as attribute_definition_regex, ad.order as attribute_definition_order, ad.createdby as attribute_definition_createdby, ad.lastmodifiedby as attribute_definition_lastmodifiedby, ad.createdtime as attribute_definition_createdtime, ad.lastmodifiedtime as attribute_definition_lastmodifiedtime, ad.additionaldetails as attribute_definition_additionaldetails " + + "FROM eg_service_definition as sd " + + "INNER JOIN eg_service_attribute_definition as ad ON " + + "sd.id=ad.referenceid "); + + + if(!ObjectUtils.isEmpty(criteria.getTenantId())){ + addClauseIfRequired(query, preparedStmtList); + query.append(" sd.tenantid = ? "); + preparedStmtList.add(criteria.getTenantId()); + } + + if(!CollectionUtils.isEmpty(criteria.getIds())){ + addClauseIfRequired(query, preparedStmtList); + query.append(" sd.id IN ( ").append(createQuery(criteria.getIds())).append(" )"); + addToPreparedStatement(preparedStmtList, criteria.getIds()); + } + + return query.toString(); + } +} diff --git a/core-services/service-request/src/main/java/digit/repository/querybuilder/ServiceQueryBuilder.java b/core-services/service-request/src/main/java/digit/repository/querybuilder/ServiceQueryBuilder.java new file mode 100644 index 00000000000..e5244218391 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/repository/querybuilder/ServiceQueryBuilder.java @@ -0,0 +1,162 @@ +package digit.repository.querybuilder; + +import digit.config.Configuration; +import digit.web.models.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; +import org.springframework.util.StringUtils; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +@Component +public class ServiceQueryBuilder { + + @Autowired + private Configuration config; + + private static final String SELECT = " SELECT "; + private static final String INNER_JOIN = " INNER JOIN "; + private static final String LEFT_JOIN = " LEFT OUTER JOIN "; + private static final String AND_QUERY = " AND "; + + private static final String IDS_WRAPPER_QUERY = " SELECT id FROM ({HELPER_TABLE}) temp "; + private final String ORDERBY_CREATEDTIME = " ORDER BY service.createdtime DESC "; + + public String getServiceIdsQuery(ServiceSearchRequest serviceSearchRequest, List preparedStmtList) { + ServiceCriteria criteria = serviceSearchRequest.getServiceCriteria(); + + StringBuilder query = new StringBuilder(SELECT + " DISTINCT(service.id), service.createdtime "); + query.append(" FROM eg_service service "); + + if(!ObjectUtils.isEmpty(criteria.getTenantId())){ + addClauseIfRequired(query, preparedStmtList); + query.append(" service.tenantid = ? "); + preparedStmtList.add(criteria.getTenantId()); + } + + if(!CollectionUtils.isEmpty(criteria.getIds())){ + addClauseIfRequired(query, preparedStmtList); + query.append(" service.id IN ( ").append(createQuery(criteria.getIds())).append(" )"); + addToPreparedStatement(preparedStmtList, criteria.getIds()); + } + + if(!CollectionUtils.isEmpty(criteria.getServiceDefIds())){ + addClauseIfRequired(query, preparedStmtList); + query.append(" service.servicedefid IN ( ").append(createQuery(criteria.getServiceDefIds())).append(" )"); + addToPreparedStatement(preparedStmtList, criteria.getServiceDefIds()); + } + + if(!CollectionUtils.isEmpty(criteria.getReferenceIds())){ + addClauseIfRequired(query, preparedStmtList); + query.append(" service.referenceid IN ( ").append(createQuery(criteria.getReferenceIds())).append(" )"); + addToPreparedStatement(preparedStmtList, criteria.getReferenceIds()); + } + + if(!ObjectUtils.isEmpty(criteria.getAccountId())){ + addClauseIfRequired(query, preparedStmtList); + query.append(" service.accountid = ? "); + preparedStmtList.add(criteria.getAccountId()); + } + + if(!ObjectUtils.isEmpty(criteria.getClientId())){ + addClauseIfRequired(query, preparedStmtList); + query.append(" service.clientid = ? "); + preparedStmtList.add(criteria.getClientId()); + } + + // order services based on their createdtime in latest first manner + query.append(ORDERBY_CREATEDTIME); + + if(ObjectUtils.isEmpty(serviceSearchRequest.getPagination())) + prepareDefaultPaginationObject(serviceSearchRequest); + + // Pagination to limit results + addPagination(query, preparedStmtList, serviceSearchRequest.getPagination()); + + return IDS_WRAPPER_QUERY.replace("{HELPER_TABLE}", query.toString()); + } + + private void addClauseIfRequired(StringBuilder query, List preparedStmtList){ + if(preparedStmtList.isEmpty()){ + query.append(" WHERE "); + }else{ + query.append(" AND "); + } + } + + private String createQuery(List ids) { + StringBuilder builder = new StringBuilder(); + int length = ids.size(); + for (int i = 0; i < length; i++) { + builder.append(" ?"); + if (i != length - 1) + builder.append(","); + } + return builder.toString(); + } + + private void addToPreparedStatement(List preparedStmtList, List ids) { + ids.forEach(id -> { + preparedStmtList.add(id); + }); + } + + private void prepareDefaultPaginationObject(ServiceSearchRequest serviceSearchRequest) { + Pagination pagination = new Pagination(); + pagination.setOffset(config.getDefaultOffset()); + pagination.setLimit(config.getDefaultLimit()); + serviceSearchRequest.setPagination(pagination); + } + + private void addPagination(StringBuilder query, List preparedStmtList, Pagination pagination) { + + // Append offset + query.append(" OFFSET ? "); + preparedStmtList.add(ObjectUtils.isEmpty(pagination.getOffset()) ? config.getDefaultOffset() : pagination.getOffset()); + + // Append limit + query.append(" LIMIT ? "); + preparedStmtList.add(ObjectUtils.isEmpty(pagination.getLimit()) ? config.getDefaultLimit() : + ((pagination.getLimit() > config.getMaxLimit()) ? config.getMaxLimit() : pagination.getLimit())); + } + + + public String getServiceSearchQuery(ServiceCriteria criteria, List preparedStmtList) { + StringBuilder query = new StringBuilder("SELECT service.id, service.tenantid, service.servicedefid, service.referenceid, service.createdby, service.lastmodifiedby, service.createdtime, service.lastmodifiedtime, service.additionaldetails, service.accountid, service.clientid, " + + "attribute_value.id as attribute_value_id, attribute_value.referenceid as attribute_value_referenceid, attribute_value.attributecode as attribute_value_attributecode, attribute_value.value as attribute_value_value, attribute_value.createdby as attribute_value_createdby, attribute_value.lastmodifiedby as attribute_value_lastmodifiedby, attribute_value.createdtime as attribute_value_createdtime, attribute_value.lastmodifiedtime as attribute_value_lastmodifiedtime, attribute_value.additionaldetails as attribute_value_additionaldetails " + + "FROM eg_service as service " + + "INNER JOIN eg_service_attribute_value as attribute_value ON " + + "service.id=attribute_value.referenceid "); + + if(!ObjectUtils.isEmpty(criteria.getTenantId())){ + addClauseIfRequired(query, preparedStmtList); + query.append(" service.tenantid = ? "); + preparedStmtList.add(criteria.getTenantId()); + } + + if(!CollectionUtils.isEmpty(criteria.getIds())){ + addClauseIfRequired(query, preparedStmtList); + query.append(" service.id IN ( ").append(createQuery(criteria.getIds())).append(" )"); + addToPreparedStatement(preparedStmtList, criteria.getIds()); + } + + if (!ObjectUtils.isEmpty(criteria.getAttributes())) { + if (!StringUtils.isEmpty(criteria.getAttributes().getAttributeCode())) { + addClauseIfRequired(query, preparedStmtList); + query.append(" attribute_value.attributeCode = ? "); + preparedStmtList.add(criteria.getAttributes().getAttributeCode()); + } + if (!StringUtils.isEmpty(criteria.getAttributes().getValue())) { + addClauseIfRequired(query, preparedStmtList); + query.append(" attribute_value.value ->> 'value' = ? "); + preparedStmtList.add(criteria.getAttributes().getValue()); + } + } + + return query.toString(); + } +} diff --git a/core-services/service-request/src/main/java/digit/repository/rowmapper/ServiceDefinitionRowMapper.java b/core-services/service-request/src/main/java/digit/repository/rowmapper/ServiceDefinitionRowMapper.java new file mode 100644 index 00000000000..7ffba868ec3 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/repository/rowmapper/ServiceDefinitionRowMapper.java @@ -0,0 +1,137 @@ +package digit.repository.rowmapper; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import digit.models.coremodels.AuditDetails; +import digit.web.models.AttributeDefinition; +import digit.web.models.ServiceDefinition; +import org.apache.commons.lang.StringUtils; +import org.egov.tracer.model.CustomException; +import org.postgresql.util.PGobject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; +import org.springframework.jdbc.core.ResultSetExtractor; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import java.io.IOException; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.*; + +@Component +public class ServiceDefinitionRowMapper implements ResultSetExtractor> { + + /** + * Rowmapper that maps every column of the search result set to a key in the model. + */ + + @Autowired + private ObjectMapper mapper; + + @Override + public List extractData(ResultSet rs) throws SQLException, DataAccessException { + Map serviceDefinitionMap = new HashMap<>(); + while (rs.next()) { + String currentId = rs.getString("id"); + ServiceDefinition currentServiceDefinition = serviceDefinitionMap.get(currentId); + if (!StringUtils.isBlank(currentId)) { + + if (currentServiceDefinition == null) { + + AuditDetails auditDetails = AuditDetails.builder().createdBy(rs.getString("createdby")) + .createdTime(rs.getLong("createdtime")).lastModifiedBy(rs.getString("lastmodifiedby")) + .lastModifiedTime(rs.getLong("lastmodifiedtime")).build(); + currentServiceDefinition = ServiceDefinition.builder() + .id(rs.getString("id")) + .tenantId(rs.getString("tenantid")) + .code(rs.getString("code")) + .module(rs.getString("module")) + .isActive(rs.getBoolean("isactive")) + .auditDetails(auditDetails) + .additionalDetails(getAdditionalDetail((PGobject) rs.getObject("additionaldetails"))) + .clientId(rs.getString("clientid")) + .build(); + + } + + addAttributeDefinitions(rs, currentServiceDefinition); + serviceDefinitionMap.put(currentId, currentServiceDefinition); + } + + } + return new ArrayList<>(serviceDefinitionMap.values()); + } + + private void addAttributeDefinitions(ResultSet rs, ServiceDefinition serviceDefinition) throws SQLException, DataAccessException { + String values = rs.getString("attribute_definition_values"); + AuditDetails auditDetails = AuditDetails.builder().createdBy(rs.getString("attribute_definition_createdby")) + .createdTime(rs.getLong("attribute_definition_createdtime")).lastModifiedBy(rs.getString("attribute_definition_lastmodifiedby")) + .lastModifiedTime(rs.getLong("attribute_definition_lastmodifiedtime")).build(); + AttributeDefinition attributeDefinition = AttributeDefinition.builder().id(rs.getString("attribute_definition_id")) + .referenceId(rs.getString("attribute_definition_referenceid")) + .tenantId(rs.getString("attribute_definition_tenantid")) + .code(rs.getString("attribute_definition_code")) + .dataType(AttributeDefinition.DataTypeEnum.fromValue(rs.getString("attribute_definition_datatype"))) + .values(StringUtils.isEmpty(values) ? Arrays.asList() : Arrays.asList(values.split(","))) + .isActive(rs.getBoolean("attribute_definition_isactive")) + .required(rs.getBoolean("attribute_definition_required")) + .regex(rs.getString("attribute_definition_regex")) + .order(rs.getString("attribute_definition_order")) + .auditDetails(auditDetails) + .additionalDetails(getAdditionalDetail((PGobject) rs.getObject("attribute_definition_additionaldetails"))) + .build(); + + if (CollectionUtils.isEmpty(serviceDefinition.getAttributes())) { + List attributeDefinitions = new ArrayList<>(); + attributeDefinitions.add(attributeDefinition); + serviceDefinition.setAttributes(attributeDefinitions); + } else { + serviceDefinition.getAttributes().add(attributeDefinition); + } + + + } + + private JsonNode getAdditionalDetail(PGobject pGobject){ + + JsonNode additionalDetail = null; + try { + if(pGobject != null){ + additionalDetail = mapper.readTree(pGobject.getValue()); + } + } + catch (IOException e){ + throw new CustomException("PARSING_ERROR","Failed to parse additionalDetail object"); + } + return additionalDetail; + } + + private JsonNode getJsonValue(PGobject pGobject) { + try { + if (Objects.isNull(pGobject) || Objects.isNull(pGobject.getValue())) + return null; + else + return mapper.readTree(pGobject.getValue()); + } catch (IOException e) { + throw new CustomException("SERVER_ERROR", "Exception occurred while parsing the additionalDetail json : " + e + .getMessage()); + } + } + + private List nodeToList(PGobject pGobject) { + try { + if (Objects.isNull(pGobject) || Objects.isNull(pGobject.getValue())) + return null; + else + return mapper.readValue(pGobject.getValue(), new TypeReference>() { + }); + + } catch (IOException e) { + throw new CustomException("SERVER_ERROR", "Exception occurred while parsing the receiver json : " + e + .getMessage()); + } + } + +} diff --git a/core-services/service-request/src/main/java/digit/repository/rowmapper/ServiceRowMapper.java b/core-services/service-request/src/main/java/digit/repository/rowmapper/ServiceRowMapper.java new file mode 100644 index 00000000000..0792c6a70f6 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/repository/rowmapper/ServiceRowMapper.java @@ -0,0 +1,141 @@ +package digit.repository.rowmapper; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.jayway.jsonpath.JsonPath; +import digit.models.coremodels.AuditDetails; +import digit.web.models.AttributeDefinition; +import digit.web.models.AttributeValue; +import digit.web.models.Service; +import digit.web.models.ServiceDefinition; +import org.apache.commons.lang.StringUtils; +import org.egov.tracer.model.CustomException; +import org.postgresql.util.PGobject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; +import org.springframework.jdbc.core.ResultSetExtractor; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import java.io.IOException; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.*; + +import static digit.constants.Constants.VALUE_JSON_PATH; + +@Component +public class ServiceRowMapper implements ResultSetExtractor> { + + /** + * Rowmapper that maps every column of the search result set to a key in the model. + */ + + @Autowired + private ObjectMapper mapper; + + @Override + public List extractData(ResultSet rs) throws SQLException, DataAccessException { + Map serviceMap = new HashMap<>(); + while (rs.next()) { + String currentId = rs.getString("id"); + Service currentService = serviceMap.get(currentId); + if (!StringUtils.isBlank(currentId)) { + + if (currentService == null) { + + AuditDetails auditDetails = AuditDetails.builder().createdBy(rs.getString("createdby")) + .createdTime(rs.getLong("createdtime")).lastModifiedBy(rs.getString("lastmodifiedby")) + .lastModifiedTime(rs.getLong("lastmodifiedtime")).build(); + currentService = Service.builder() + .id(rs.getString("id")) + .tenantId(rs.getString("tenantid")) + .serviceDefId(rs.getString("servicedefid")) + .referenceId(rs.getString("referenceid")) + .auditDetails(auditDetails) + .additionalDetails(getAdditionalDetail((PGobject) rs.getObject("additionaldetails"))) + .accountId(rs.getString("accountid")) + .clientId(rs.getString("clientid")) + .build(); + + } + + addAttributeValues(rs, currentService); + serviceMap.put(currentId, currentService); + } + + } + return new ArrayList<>(serviceMap.values()); + } + + private void addAttributeValues(ResultSet rs, Service service) throws SQLException, DataAccessException { + PGobject genericValueObject = (PGobject) rs.getObject("attribute_value_value"); + AuditDetails auditDetails = AuditDetails.builder().createdBy(rs.getString("attribute_value_createdby")) + .createdTime(rs.getLong("attribute_value_createdtime")).lastModifiedBy(rs.getString("attribute_value_lastmodifiedby")) + .lastModifiedTime(rs.getLong("attribute_value_lastmodifiedtime")).build(); + AttributeValue attributeValue = AttributeValue.builder().id(rs.getString("attribute_value_id")) + .referenceId(rs.getString("attribute_value_referenceid")) + .attributeCode(rs.getString("attribute_value_attributecode")) + .value(getProperTypeCastedAttributeValue(genericValueObject)) + .auditDetails(auditDetails) + .additionalDetails(getAdditionalDetail((PGobject) rs.getObject("attribute_value_additionaldetails"))) + .build(); + + if (CollectionUtils.isEmpty(service.getAttributes())) { + List attributeValues = new ArrayList<>(); + attributeValues.add(attributeValue); + service.setAttributes(attributeValues); + } else { + service.getAttributes().add(attributeValue); + } + + + } + + private Object getProperTypeCastedAttributeValue(PGobject genericValueObject) { + String valueJson = genericValueObject.getValue(); + return JsonPath.read(valueJson, VALUE_JSON_PATH); + } + + private JsonNode getAdditionalDetail(PGobject pGobject){ + + JsonNode additionalDetail = null; + try { + if(pGobject != null){ + additionalDetail = mapper.readTree(pGobject.getValue()); + } + } + catch (IOException e){ + throw new CustomException("PARSING_ERROR","Failed to parse additionalDetail object"); + } + return additionalDetail; + } + + private JsonNode getJsonValue(PGobject pGobject) { + try { + if (Objects.isNull(pGobject) || Objects.isNull(pGobject.getValue())) + return null; + else + return mapper.readTree(pGobject.getValue()); + } catch (IOException e) { + throw new CustomException("SERVER_ERROR", "Exception occurred while parsing the additionalDetail json : " + e + .getMessage()); + } + } + + private List nodeToList(PGobject pGobject) { + try { + if (Objects.isNull(pGobject) || Objects.isNull(pGobject.getValue())) + return null; + else + return mapper.readValue(pGobject.getValue(), new TypeReference>() { + }); + + } catch (IOException e) { + throw new CustomException("SERVER_ERROR", "Exception occurred while parsing the receiver json : " + e + .getMessage()); + } + } + +} diff --git a/core-services/service-request/src/main/java/digit/service/ServiceDefinitionRequestService.java b/core-services/service-request/src/main/java/digit/service/ServiceDefinitionRequestService.java new file mode 100644 index 00000000000..eba021c8c88 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/service/ServiceDefinitionRequestService.java @@ -0,0 +1,75 @@ +package digit.service; + +import digit.config.Configuration; +import digit.kafka.Producer; +import digit.repository.ServiceDefinitionRequestRepository; +import digit.validators.ServiceDefinitionRequestValidator; +import digit.web.models.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class ServiceDefinitionRequestService { + + @Autowired + private ServiceDefinitionRequestValidator serviceDefinitionRequestValidator; + + @Autowired + private ServiceRequestEnrichmentService enrichmentService; + + @Autowired + private ServiceDefinitionRequestRepository serviceDefinitionRequestRepository; + + @Autowired + private Producer producer; + + @Autowired + private Configuration config; + + public ServiceDefinition createServiceDefinition(ServiceDefinitionRequest serviceDefinitionRequest) { + + ServiceDefinition serviceDefinition = serviceDefinitionRequest.getServiceDefinition(); + + // Validate incoming service definition request + serviceDefinitionRequestValidator.validateServiceDefinitionRequest(serviceDefinitionRequest); + + // Enrich incoming service definition request + enrichmentService.enrichServiceDefinitionRequest(serviceDefinitionRequest); + + // Producer statement to emit service definition to kafka for persisting + producer.push(config.getServiceDefinitionCreateTopic(), serviceDefinitionRequest); + + // Restore attribute values to the type in which it was sent in service definition request + enrichmentService.setAttributeDefinitionValuesBackToNativeState(serviceDefinition); + + return serviceDefinition; + } + + public List searchServiceDefinition(ServiceDefinitionSearchRequest serviceDefinitionSearchRequest){ + + List listOfServiceDefinitions = serviceDefinitionRequestRepository.getServiceDefinitions(serviceDefinitionSearchRequest); + + if(CollectionUtils.isEmpty(listOfServiceDefinitions)) + return new ArrayList<>(); + + listOfServiceDefinitions.forEach(serviceDefinition -> { + // Restore attribute values to native state + enrichmentService.setAttributeDefinitionValuesBackToNativeState(serviceDefinition); + }); + + return listOfServiceDefinitions; + } + + public ServiceDefinition updateServiceDefinition(ServiceDefinitionRequest serviceDefinitionRequest) { + + // TO DO + + return serviceDefinitionRequest.getServiceDefinition(); + } + +} + diff --git a/core-services/service-request/src/main/java/digit/service/ServiceRequestEnrichmentService.java b/core-services/service-request/src/main/java/digit/service/ServiceRequestEnrichmentService.java new file mode 100644 index 00000000000..79a8e90a3a0 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/service/ServiceRequestEnrichmentService.java @@ -0,0 +1,106 @@ +package digit.service; + +import digit.models.coremodels.AuditDetails; +import digit.web.models.*; +import org.egov.common.contract.request.RequestInfo; +import org.springframework.stereotype.Component; + +import java.util.*; + +import static digit.constants.Constants.*; + +@Component +public class ServiceRequestEnrichmentService { + + public void enrichServiceDefinitionRequest(ServiceDefinitionRequest serviceDefinitionRequest) { + ServiceDefinition serviceDefinition = serviceDefinitionRequest.getServiceDefinition(); + RequestInfo requestInfo = serviceDefinitionRequest.getRequestInfo(); + + // Enrich ID for service definition + serviceDefinition.setId(UUID.randomUUID().toString()); + + // Prepare audit details + AuditDetails auditDetails = new AuditDetails(); + auditDetails.setCreatedBy(requestInfo.getUserInfo().getUuid()); + auditDetails.setLastModifiedBy(requestInfo.getUserInfo().getUuid()); + auditDetails.setCreatedTime(System.currentTimeMillis()); + auditDetails.setLastModifiedTime(System.currentTimeMillis()); + + // Enrich audit details for attributes + serviceDefinition.getAttributes().forEach(attribute -> { + attribute.setId(UUID.randomUUID().toString()); + attribute.setAuditDetails(auditDetails); + attribute.setReferenceId(serviceDefinition.getId()); + }); + + // Enrich audit details for service definition + serviceDefinition.setAuditDetails(auditDetails); + + // Initialize values with empty strings in case of non-list type attribute definition values + serviceDefinition.getAttributes().forEach(attributeDefinition -> { + if(!(attributeDefinition.getDataType().equals(AttributeDefinition.DataTypeEnum.SINGLEVALUELIST) || attributeDefinition.getDataType().equals(AttributeDefinition.DataTypeEnum.MULTIVALUELIST))){ + List emptyStringList = new ArrayList<>(); + emptyStringList.add(""); + attributeDefinition.setValues(emptyStringList); + } + }); + + } + + public Map enrichServiceRequest(ServiceRequest serviceRequest) { + Service service = serviceRequest.getService(); + RequestInfo requestInfo = serviceRequest.getRequestInfo(); + + // Enrich id for service + service.setId(UUID.randomUUID().toString()); + + // Prepare audit details + AuditDetails auditDetails = new AuditDetails(); + auditDetails.setCreatedBy(requestInfo.getUserInfo().getUuid()); + auditDetails.setLastModifiedBy(requestInfo.getUserInfo().getUuid()); + auditDetails.setCreatedTime(System.currentTimeMillis()); + auditDetails.setLastModifiedTime(System.currentTimeMillis()); + + // Enrich audit details in attribute values + service.getAttributes().forEach(attributeValue -> { + attributeValue.setId(UUID.randomUUID().toString()); + attributeValue.setAuditDetails(auditDetails); + attributeValue.setReferenceId(service.getId()); + }); + + // Enrich audit details for service + service.setAuditDetails(auditDetails); + + // Convert incoming attribute value into JSON object + Map attributeCodeVsValueMap = convertAttributeValuesIntoJson(serviceRequest); + + return attributeCodeVsValueMap; + + } + + private Map convertAttributeValuesIntoJson(ServiceRequest serviceRequest) { + Map attributeCodeVsValueMap = new HashMap<>(); + serviceRequest.getService().getAttributes().forEach(attributeValue -> { + attributeCodeVsValueMap.put(attributeValue.getAttributeCode(), attributeValue.getValue()); + Map jsonObj = new HashMap<>(); + jsonObj.put(VALUE, attributeValue.getValue()); + attributeValue.setValue(jsonObj); + }); + return attributeCodeVsValueMap; + } + + public void setAttributeDefinitionValuesBackToNativeState(ServiceDefinition serviceDefinition) { + // Initialize values with null in case of non-list type attribute definition values + serviceDefinition.getAttributes().forEach(attributeDefinition -> { + if(!(attributeDefinition.getDataType().equals(AttributeDefinition.DataTypeEnum.SINGLEVALUELIST) || attributeDefinition.getDataType().equals(AttributeDefinition.DataTypeEnum.MULTIVALUELIST))){ + attributeDefinition.setValues(null); + } + }); + } + + public void setAttributeValuesBackToNativeState(ServiceRequest serviceRequest, Map attributeCodeVsValueMap) { + serviceRequest.getService().getAttributes().forEach(attributeValue -> { + attributeValue.setValue(attributeCodeVsValueMap.get(attributeValue.getAttributeCode())); + }); + } +} diff --git a/core-services/service-request/src/main/java/digit/service/ServiceRequestService.java b/core-services/service-request/src/main/java/digit/service/ServiceRequestService.java new file mode 100644 index 00000000000..44fc333c47f --- /dev/null +++ b/core-services/service-request/src/main/java/digit/service/ServiceRequestService.java @@ -0,0 +1,71 @@ +package digit.service; + +import digit.config.Configuration; +import digit.kafka.Producer; +import digit.repository.ServiceRequestRepository; +import digit.validators.ServiceDefinitionRequestValidator; +import digit.validators.ServiceRequestValidator; +import digit.web.models.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Service +public class ServiceRequestService { + + @Autowired + private ServiceRequestValidator serviceRequestValidator; + + @Autowired + private ServiceRequestEnrichmentService enrichmentService; + + @Autowired + private ServiceRequestRepository serviceRequestRepository; + + @Autowired + private Producer producer; + + @Autowired + private Configuration config; + + public digit.web.models.Service createService(ServiceRequest serviceRequest) { + + digit.web.models.Service service = serviceRequest.getService(); + + // Validate incoming service definition request + serviceRequestValidator.validateServiceRequest(serviceRequest); + + // Enrich incoming service definition request + Map attributeCodeVsValueMap = enrichmentService.enrichServiceRequest(serviceRequest); + + // Producer statement to emit service definition to kafka for persisting + producer.push(config.getServiceCreateTopic(), serviceRequest); + + // Restore attribute values to the type in which it was sent in service request + enrichmentService.setAttributeValuesBackToNativeState(serviceRequest, attributeCodeVsValueMap); + + return service; + } + + public List searchService(ServiceSearchRequest serviceSearchRequest){ + + List listOfServices = serviceRequestRepository.getService(serviceSearchRequest); + + if(CollectionUtils.isEmpty(listOfServices)) + return new ArrayList<>(); + + return listOfServices; + } + + public digit.web.models.Service updateService(ServiceRequest serviceRequest) { + + // TO DO + + return serviceRequest.getService(); + } + +} diff --git a/core-services/service-request/src/main/java/digit/util/ResponseInfoFactory.java b/core-services/service-request/src/main/java/digit/util/ResponseInfoFactory.java new file mode 100644 index 00000000000..ccd60a380ec --- /dev/null +++ b/core-services/service-request/src/main/java/digit/util/ResponseInfoFactory.java @@ -0,0 +1,25 @@ +package digit.util; + +import org.egov.common.contract.request.RequestInfo; +import org.egov.common.contract.response.ResponseInfo; +import org.springframework.stereotype.Component; + +@Component +public class ResponseInfoFactory { + + public ResponseInfo createResponseInfoFromRequestInfo(final RequestInfo requestInfo, final Boolean success) { + + final String apiId = requestInfo != null ? requestInfo.getApiId() : ""; + final String ver = requestInfo != null ? requestInfo.getVer() : ""; + Long ts = null; + if(requestInfo!=null) + ts = requestInfo.getTs(); + final String resMsgId = "uief87324"; // FIXME : Hard-coded + final String msgId = requestInfo != null ? requestInfo.getMsgId() : ""; + final String responseStatus = success ? "successful" : "failed"; + + return ResponseInfo.builder().apiId(apiId).ver(ver).ts(ts).resMsgId(resMsgId).msgId(msgId).resMsgId(resMsgId) + .status(responseStatus).build(); + } + +} \ No newline at end of file diff --git a/core-services/service-request/src/main/java/digit/validators/ServiceDefinitionRequestValidator.java b/core-services/service-request/src/main/java/digit/validators/ServiceDefinitionRequestValidator.java new file mode 100644 index 00000000000..1e6aee80298 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/validators/ServiceDefinitionRequestValidator.java @@ -0,0 +1,91 @@ +package digit.validators; + +import digit.repository.ServiceDefinitionRequestRepository; +import digit.web.models.*; +import org.egov.tracer.model.CustomException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; + +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.regex.Pattern; + +import static digit.error.ErrorCode.*; + +@Component +public class ServiceDefinitionRequestValidator { + + @Autowired + private ServiceDefinitionRequestRepository serviceDefinitionRequestRepository; + + public void validateServiceDefinitionRequest(ServiceDefinitionRequest serviceDefinitionRequest){ + ServiceDefinition serviceDefinition = serviceDefinitionRequest.getServiceDefinition(); + + // Validate if a service definition with the same combination of tenantId and code already exists + validateServiceDefinitionExistence(serviceDefinition); + + // Validate if all attribute definitions provided as part of service definitions have unique code + validateAttributeDefinitionUniqueness(serviceDefinition); + + // Validate values provided in attribute definitions as per data type + validateAttributeValuesAsPerDataType(serviceDefinition); + + // Validate regex values provided in attribute definitions + validateRegex(serviceDefinition); + + } + + private void validateRegex(ServiceDefinition serviceDefinition) { + serviceDefinition.getAttributes().forEach(attributeDefinition -> { + if(!ObjectUtils.isEmpty(attributeDefinition.getRegex())){ + try { + Pattern.compile(attributeDefinition.getRegex(), Pattern.CASE_INSENSITIVE); + }catch (Exception e){ + throw new CustomException(INVALID_REGEX_ERR_CODE, INVALID_REGEX_ERR_MSG + attributeDefinition.getCode()); + } + } + }); + } + + private void validateAttributeValuesAsPerDataType(ServiceDefinition serviceDefinition) { + // Values should be present only in case of single value and multi value lists + serviceDefinition.getAttributes().forEach(attributeDefinition -> { + AttributeDefinition.DataTypeEnum dataType = attributeDefinition.getDataType(); + + if(!(dataType.equals(AttributeDefinition.DataTypeEnum.SINGLEVALUELIST) || dataType.equals(AttributeDefinition.DataTypeEnum.MULTIVALUELIST))){ + if(!CollectionUtils.isEmpty(attributeDefinition.getValues())) + throw new CustomException(INVALID_ATTRIBUTE_DEFINITION_ERR_CODE, INVALID_ATTRIBUTE_DEFINITION_ERR_MSG); + } + }); + } + + private void validateAttributeDefinitionUniqueness(ServiceDefinition serviceDefinition) { + Set attributeCodes = new HashSet<>(); + + serviceDefinition.getAttributes().forEach(attributeDefinition -> { + if(attributeCodes.contains(attributeDefinition.getCode())){ + throw new CustomException(ATTRIBUTE_CODE_UNIQUENESS_ERR_CODE, ATTRIBUTE_CODE_UNIQUENESS_ERR_MSG); + }else{ + attributeCodes.add(attributeDefinition.getCode()); + } + }); + } + + private void validateServiceDefinitionExistence(ServiceDefinition serviceDefinition) { + List serviceDefinitionList = serviceDefinitionRequestRepository.getServiceDefinitions(ServiceDefinitionSearchRequest.builder().serviceDefinitionCriteria(ServiceDefinitionCriteria.builder().tenantId(serviceDefinition.getTenantId()).code(Collections.singletonList(serviceDefinition.getCode())).build()).build()); + if(!CollectionUtils.isEmpty(serviceDefinitionList)){ + throw new CustomException(SERVICE_DEFINITION_ALREADY_EXISTS_ERR_CODE, SERVICE_DEFINITION_ALREADY_EXISTS_ERR_MSG); + } + } + + public void validateUpdateRequest(ServiceDefinitionRequest serviceDefinitionRequest) { + + // TO DO + + } + +} diff --git a/core-services/service-request/src/main/java/digit/validators/ServiceRequestValidator.java b/core-services/service-request/src/main/java/digit/validators/ServiceRequestValidator.java new file mode 100644 index 00000000000..9c395488e17 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/validators/ServiceRequestValidator.java @@ -0,0 +1,179 @@ +package digit.validators; + +import digit.config.Configuration; +import digit.repository.ServiceDefinitionRequestRepository; +import digit.repository.ServiceRequestRepository; +import digit.web.models.*; +import lombok.extern.slf4j.Slf4j; +import org.egov.tracer.model.CustomException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.util.ObjectUtils; + +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import static digit.error.ErrorCode.*; + +@Slf4j +@Component +public class ServiceRequestValidator { + + @Autowired + private ServiceRequestRepository serviceRequestRepository; + + @Autowired + private ServiceDefinitionRequestRepository serviceDefinitionRequestRepository; + + @Autowired + private Configuration config; + + public void validateServiceRequest(ServiceRequest serviceRequest){ + List serviceDefinitions = validateServiceDefID(serviceRequest.getService().getTenantId(), serviceRequest.getService().getServiceDefId()); + serviceRequest.getService().setCode(serviceDefinitions.get(0).getCode()); + serviceRequest.getService().setModule(serviceDefinitions.get(0).getModule()); + validateAttributeValuesAgainstServiceDefinition(serviceDefinitions.get(0), serviceRequest.getService()); + validateAccountId(serviceRequest.getService()); + } + + private void validateAccountId(Service service) { + // TO DO + } + + + private void validateAttributeValuesAgainstServiceDefinition(ServiceDefinition serviceDefinition, Service service) { + + // Prepare map of attribute code vs attribute type and + // validate uniqueness of attribute value codes being passed against service definition + Map attributeCodeVsDataType = new HashMap<>(); + Set setOfRequiredAttributes = new HashSet<>(); + Map> attributeCodeVsValues = new HashMap<>(); + Map attributeCodeVsRegexMap = new HashMap<>(); + serviceDefinition.getAttributes().forEach(attributeDefinition -> { + attributeCodeVsDataType.put(attributeDefinition.getCode(), attributeDefinition.getDataType()); + + if(attributeDefinition.getDataType().equals(AttributeDefinition.DataTypeEnum.SINGLEVALUELIST) || attributeDefinition.getDataType().equals(AttributeDefinition.DataTypeEnum.MULTIVALUELIST)){ + attributeCodeVsValues.put(attributeDefinition.getCode(), new HashSet<>(attributeDefinition.getValues())); + } + + if(attributeDefinition.getRequired()) + setOfRequiredAttributes.add(attributeDefinition.getCode()); + + if(!ObjectUtils.isEmpty(attributeDefinition.getRegex())){ + attributeCodeVsRegexMap.put(attributeDefinition.getCode(), attributeDefinition.getRegex()); + } + }); + + // Check if service has all the attribute values required as part of service definition + Set setOfAttributeValues = new HashSet<>(); + service.getAttributes().forEach(attributeValue -> { + if(!attributeCodeVsDataType.keySet().contains(attributeValue.getAttributeCode())){ + throw new CustomException(SERVICE_REQUEST_UNRECOGNIZED_ATTRIBUTE_CODE, SERVICE_REQUEST_UNRECOGNIZED_ATTRIBUTE_MSG); + } + + if(!setOfAttributeValues.contains(attributeValue.getAttributeCode())) + setOfAttributeValues.add(attributeValue.getAttributeCode()); + else + throw new CustomException(SERVICE_REQUEST_ATTRIBUTE_VALUES_UNIQUENESS_ERR_CODE, SERVICE_REQUEST_ATTRIBUTE_VALUES_UNIQUENESS_ERR_MSG); + }); + + // Check if all required attributes have been provided as part of service + setOfRequiredAttributes.forEach(requiredAttribute -> { + if(!setOfAttributeValues.contains(requiredAttribute)) + throw new CustomException(SERVICE_REQUEST_REQUIRED_ATTRIBUTE_NOT_PROVIDED_ERR_CODE, SERVICE_REQUEST_REQUIRED_ATTRIBUTE_NOT_PROVIDED_ERR_MSG); + }); + + // Validate if value being passed is consistent in terms of data type provided as part of service definition + service.getAttributes().forEach(attributeValue -> { + if(attributeCodeVsDataType.get(attributeValue.getAttributeCode()).equals(AttributeDefinition.DataTypeEnum.NUMBER)){ + if(!(attributeValue.getValue() instanceof Number)){ + throw new CustomException(SERVICE_REQUEST_ATTRIBUTE_INVALID_VALUE_CODE, SERVICE_REQUEST_ATTRIBUTE_INVALID_NUMBER_VALUE_MSG); + } + }else if(attributeCodeVsDataType.get(attributeValue.getAttributeCode()).equals(AttributeDefinition.DataTypeEnum.STRING)){ + if(!(attributeValue.getValue() instanceof String)){ + throw new CustomException(SERVICE_REQUEST_ATTRIBUTE_INVALID_VALUE_CODE, SERVICE_REQUEST_ATTRIBUTE_INVALID_STRING_VALUE_MSG); + } + validateSize(attributeValue.getValue()); + }else if(attributeCodeVsDataType.get(attributeValue.getAttributeCode()).equals(AttributeDefinition.DataTypeEnum.TEXT)){ + if(!(attributeValue.getValue() instanceof String)){ + throw new CustomException(SERVICE_REQUEST_ATTRIBUTE_INVALID_VALUE_CODE, SERVICE_REQUEST_ATTRIBUTE_INVALID_TEXT_VALUE_MSG); + } + validateSize(attributeValue.getValue()); + }else if(attributeCodeVsDataType.get(attributeValue.getAttributeCode()).equals(AttributeDefinition.DataTypeEnum.DATETIME)){ + if(!(attributeValue.getValue() instanceof Long)){ + throw new CustomException(SERVICE_REQUEST_ATTRIBUTE_INVALID_VALUE_CODE, SERVICE_REQUEST_ATTRIBUTE_INVALID_DATETIME_VALUE_MSG); + } + }else if(attributeCodeVsDataType.get(attributeValue.getAttributeCode()).equals(AttributeDefinition.DataTypeEnum.SINGLEVALUELIST)){ + if(!(attributeValue.getValue() instanceof String)){ + throw new CustomException(SERVICE_REQUEST_ATTRIBUTE_INVALID_VALUE_CODE, SERVICE_REQUEST_ATTRIBUTE_INVALID_SINGLE_VALUE_LIST_VALUE_MSG); + } + }else if(attributeCodeVsDataType.get(attributeValue.getAttributeCode()).equals(AttributeDefinition.DataTypeEnum.MULTIVALUELIST)){ + if(!(attributeValue.getValue() instanceof List)){ + throw new CustomException(SERVICE_REQUEST_ATTRIBUTE_INVALID_VALUE_CODE, SERVICE_REQUEST_ATTRIBUTE_INVALID_MULTI_VALUE_LIST_VALUE_MSG); + } + } + }); + + // Validate if value provided against attribute definition of single value list and multi value list is the same as the list of values provided during creation + service.getAttributes().forEach(attributeValue -> { + if(attributeCodeVsValues.containsKey(attributeValue.getAttributeCode())){ + if(attributeCodeVsDataType.get(attributeValue.getAttributeCode()).equals(AttributeDefinition.DataTypeEnum.SINGLEVALUELIST)){ + if(!attributeCodeVsValues.get(attributeValue.getAttributeCode()).contains(attributeValue.getValue())){ + throw new CustomException(SERVICE_REQUEST_ATTRIBUTE_INVALID_VALUE_CODE, SERVICE_REQUEST_ATTRIBUTE_INVALID_VALUE_SINGLEVALUELIST_MSG); + } + } else if(attributeCodeVsDataType.get(attributeValue.getAttributeCode()).equals(AttributeDefinition.DataTypeEnum.MULTIVALUELIST)){ + List providedAttributeValues = (List) attributeValue.getValue(); + providedAttributeValues.forEach(providedAttributeValue -> { + if(!attributeCodeVsValues.get(attributeValue.getAttributeCode()).contains(providedAttributeValue)){ + throw new CustomException(SERVICE_REQUEST_ATTRIBUTE_INVALID_VALUE_CODE, SERVICE_REQUEST_ATTRIBUTE_INVALID_VALUE_MULTIVALUELIST_MSG); + } + }); + } + } + }); + + // Validate if all attribute values provided against service definition conform to the regex provided + service.getAttributes().forEach(attributeValue -> { + if(attributeCodeVsRegexMap.containsKey(attributeValue.getAttributeCode())){ + if(attributeCodeVsDataType.get(attributeValue.getAttributeCode()).equals(AttributeDefinition.DataTypeEnum.MULTIVALUELIST)){ + List providedAttributeValues = (List) attributeValue.getValue(); + providedAttributeValues.forEach(providedAttributeValue -> { + if(!providedAttributeValue.matches(attributeCodeVsRegexMap.get(attributeValue.getAttributeCode()))){ + throw new CustomException(ATTRIBUTE_VALUE_REGEX_VALIDATION_ERR_CODE, ATTRIBUTE_VALUE_REGEX_VALIDATION_ERR_MSG); + } + }); + }else{ + if(!String.valueOf(attributeValue.getValue()).matches(attributeCodeVsRegexMap.get(attributeValue.getAttributeCode()))){ + throw new CustomException(ATTRIBUTE_VALUE_REGEX_VALIDATION_ERR_CODE, ATTRIBUTE_VALUE_REGEX_VALIDATION_ERR_MSG); + } + } + + } + }); + + } + + private void validateSize(Object value) { + String incomingValue = (String) value; + + if(incomingValue.length() > config.getMaxStringInputSize()){ + throw new CustomException(INVALID_SIZE_OF_INPUT_CODE, INVALID_SIZE_OF_TEXT_MSG); + } + } + + private List validateServiceDefID(String tenantId, String serviceDefId) { + List serviceDefinitions = serviceDefinitionRequestRepository.getServiceDefinitions(ServiceDefinitionSearchRequest.builder().serviceDefinitionCriteria(ServiceDefinitionCriteria.builder().tenantId(tenantId).ids(Arrays.asList(serviceDefId)).build()).build()); + + if(serviceDefinitions.isEmpty()) + throw new CustomException(SERVICE_REQUEST_INVALID_SERVICE_DEF_ID_CODE, SERVICE_REQUEST_INVALID_SERVICE_DEF_ID_MSG); + + return serviceDefinitions; + } + + public void validateUpdateRequest(ServiceRequest serviceRequest) { + } + + public void validateServiceUpdateRequest(ServiceRequest serviceRequest) { + } +} \ No newline at end of file diff --git a/core-services/service-request/src/main/java/digit/web/controllers/ServiceController.java b/core-services/service-request/src/main/java/digit/web/controllers/ServiceController.java new file mode 100644 index 00000000000..18b6b78b187 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/web/controllers/ServiceController.java @@ -0,0 +1,55 @@ +package digit.web.controllers; + +import digit.service.ServiceRequestService; +import digit.util.ResponseInfoFactory; +import digit.web.models.*; +import lombok.extern.slf4j.Slf4j; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.egov.common.contract.response.ResponseInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.Collections; +import java.util.List; + +@Slf4j +@RestController +@RequestMapping("/service") +public class ServiceController { + + @Autowired + private ObjectMapper objectMapper; + + @Autowired + private ResponseInfoFactory responseInfoFactory; + + @Autowired + private ServiceRequestService serviceRequestService; + + @RequestMapping(value="/v1/_create", method = RequestMethod.POST) + public ResponseEntity create(@RequestBody @Valid ServiceRequest serviceRequest) { + Service service = serviceRequestService.createService(serviceRequest); + ResponseInfo responseInfo = responseInfoFactory.createResponseInfoFromRequestInfo(serviceRequest.getRequestInfo(), true); + ServiceResponse response = ServiceResponse.builder().service(Collections.singletonList(service)).responseInfo(responseInfo).build(); + return new ResponseEntity<>(response, HttpStatus.OK); + } + + @RequestMapping(value="/v1/_search", method = RequestMethod.POST) + public ResponseEntity search(@Valid @RequestBody ServiceSearchRequest serviceSearchRequest) { + List serviceList = serviceRequestService.searchService(serviceSearchRequest); + ServiceResponse response = ServiceResponse.builder().service(serviceList).build(); + return new ResponseEntity<>(response,HttpStatus.OK); + } + + @RequestMapping(value="/v1/_update", method = RequestMethod.POST) + public ResponseEntity update(@RequestBody @Valid ServiceRequest serviceRequest){ + Service service = serviceRequestService.updateService(serviceRequest); + ResponseInfo responseInfo = responseInfoFactory.createResponseInfoFromRequestInfo(serviceRequest.getRequestInfo(), true); + ServiceResponse response = ServiceResponse.builder().service(Collections.singletonList(service)).responseInfo(responseInfo).build(); + return new ResponseEntity<>(response, HttpStatus.OK); + } + +} diff --git a/core-services/service-request/src/main/java/digit/web/controllers/ServiceDefinitionController.java b/core-services/service-request/src/main/java/digit/web/controllers/ServiceDefinitionController.java new file mode 100644 index 00000000000..8cc826b4b26 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/web/controllers/ServiceDefinitionController.java @@ -0,0 +1,59 @@ +package digit.web.controllers; + + +import digit.service.ServiceDefinitionRequestService; +import digit.util.ResponseInfoFactory; +import digit.web.models.ServiceDefinition; +import digit.web.models.ServiceDefinitionRequest; +import digit.web.models.ServiceDefinitionResponse; +import digit.web.models.ServiceDefinitionSearchRequest; +import lombok.extern.slf4j.Slf4j; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.egov.common.contract.response.ResponseInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.Collections; +import java.util.List; + +@Slf4j +@RestController +@RequestMapping("/service") +public class ServiceDefinitionController { + + @Autowired + private ObjectMapper objectMapper; + + @Autowired + private ResponseInfoFactory responseInfoFactory; + + @Autowired + private ServiceDefinitionRequestService serviceDefinitionRequestService; + + @RequestMapping(value="/definition/v1/_create", method = RequestMethod.POST) + public ResponseEntity create(@RequestBody @Valid ServiceDefinitionRequest serviceDefinitionRequest) { + ServiceDefinition serviceDefinition = serviceDefinitionRequestService.createServiceDefinition(serviceDefinitionRequest); + ResponseInfo responseInfo = responseInfoFactory.createResponseInfoFromRequestInfo(serviceDefinitionRequest.getRequestInfo(), true); + ServiceDefinitionResponse response = ServiceDefinitionResponse.builder().serviceDefinition(Collections.singletonList(serviceDefinition)).responseInfo(responseInfo).build(); + return new ResponseEntity<>(response, HttpStatus.OK); + } + + @RequestMapping(value="/definition/v1/_search", method = RequestMethod.POST) + public ResponseEntity search(@Valid @RequestBody ServiceDefinitionSearchRequest serviceDefinitionSearchRequest) { + List serviceDefinitionList = serviceDefinitionRequestService.searchServiceDefinition(serviceDefinitionSearchRequest); + ServiceDefinitionResponse response = ServiceDefinitionResponse.builder().serviceDefinition(serviceDefinitionList).build(); + return new ResponseEntity<>(response,HttpStatus.OK); + } + + @RequestMapping(value="/definition/v1/_update", method = RequestMethod.POST) + public ResponseEntity update(@RequestBody @Valid ServiceDefinitionRequest serviceDefinitionRequest){ + ServiceDefinition serviceDefinition = serviceDefinitionRequestService.updateServiceDefinition(serviceDefinitionRequest); + ResponseInfo responseInfo = responseInfoFactory.createResponseInfoFromRequestInfo(serviceDefinitionRequest.getRequestInfo(), true); + ServiceDefinitionResponse response = ServiceDefinitionResponse.builder().serviceDefinition(Collections.singletonList(serviceDefinition)).responseInfo(responseInfo).build(); + return new ResponseEntity<>(response, HttpStatus.OK); + } + +} \ No newline at end of file diff --git a/core-services/service-request/src/main/java/digit/web/models/AttributeDefinition.java b/core-services/service-request/src/main/java/digit/web/models/AttributeDefinition.java new file mode 100644 index 00000000000..3419cf98f64 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/web/models/AttributeDefinition.java @@ -0,0 +1,129 @@ +package digit.web.models; + +import java.util.Objects; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import digit.models.coremodels.AuditDetails; +import io.swagger.v3.oas.annotations.media.Schema; + +import java.util.ArrayList; +import java.util.List; + +import org.springframework.validation.annotation.Validated; + +import javax.validation.Valid; +import javax.validation.constraints.*; + +import lombok.AllArgsConstructor; +import lombok.NoArgsConstructor; +import lombok.Data; +import lombok.Builder; + +/** + * Hold the attribute definition fields details as json object. + */ +@Schema(description = "Hold the attribute definition fields details as json object.") +@Validated +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class AttributeDefinition { + @JsonProperty("id") + @Size(min = 2, max = 64) + private String id = null; + + @JsonProperty("referenceId") + @Size(min = 2, max = 64) + private String referenceId = null; + + @JsonProperty("tenantId") + @Size(min = 2, max = 64) + private String tenantId = null; + + @JsonProperty("code") + @NotNull + @Size(min = 2, max = 64) + private String code = null; + + /** + * defines the attribute type + */ + public enum DataTypeEnum { + STRING("String"), + + NUMBER("Number"), + + TEXT("Text"), + + DATETIME("Datetime"), + + SINGLEVALUELIST("SingleValueList"), + + MULTIVALUELIST("MultiValueList"), + + FILE("File"); + + private String value; + + DataTypeEnum(String value) { + this.value = value; + } + + @Override + @JsonValue + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static DataTypeEnum fromValue(String text) { + for (DataTypeEnum b : DataTypeEnum.values()) { + if (String.valueOf(b.value).equals(text)) { + return b; + } + } + return null; + } + } + + @JsonProperty("dataType") + @NotNull + private DataTypeEnum dataType = null; + + @JsonProperty("values") + private List values = null; + + @JsonProperty("isActive") + @NotNull + private Boolean isActive = true; + + @JsonProperty("required") + private Boolean required = null; + + @JsonProperty("regex") + @Size(min = 2, max = 64) + private String regex = null; + + @JsonProperty("order") + private String order = null; + + @JsonProperty("auditDetails") + @Valid + private AuditDetails auditDetails = null; + + @JsonProperty("additionalDetails") + private Object additionalDetails = null; + + + public AttributeDefinition addValuesItem(String valuesItem) { + if (this.values == null) { + this.values = new ArrayList<>(); + } + this.values.add(valuesItem); + return this; + } + +} diff --git a/core-services/service-request/src/main/java/digit/web/models/AttributeValue.java b/core-services/service-request/src/main/java/digit/web/models/AttributeValue.java new file mode 100644 index 00000000000..beed4cfd2f2 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/web/models/AttributeValue.java @@ -0,0 +1,52 @@ +package digit.web.models; + +import java.util.Objects; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import digit.models.coremodels.AuditDetails; +import io.swagger.v3.oas.annotations.media.Schema; +import org.springframework.validation.annotation.Validated; + +import javax.validation.Valid; +import javax.validation.constraints.*; + +import lombok.AllArgsConstructor; +import lombok.NoArgsConstructor; +import lombok.Data; +import lombok.Builder; + +/** + * Hold the attribute details as object. + */ +@Schema(description = "Hold the attribute details as object.") +@Validated +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class AttributeValue { + @JsonProperty("id") + private String id = null; + + @JsonProperty("referenceId") + @Size(min = 2, max = 64) + private String referenceId = null; + + @JsonProperty("attributeCode") + @NotNull + private String attributeCode = null; + + @JsonProperty("value") + @NotNull + private Object value = null; + + @JsonProperty("auditDetails") + @Valid + private AuditDetails auditDetails = null; + + @JsonProperty("additionalDetails") + private Object additionalDetails = null; + + +} diff --git a/core-services/service-request/src/main/java/digit/web/models/Pagination.java b/core-services/service-request/src/main/java/digit/web/models/Pagination.java new file mode 100644 index 00000000000..077d9d54307 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/web/models/Pagination.java @@ -0,0 +1,82 @@ +package digit.web.models; + +import java.util.Objects; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.v3.oas.annotations.media.Schema; + +import java.math.BigDecimal; + +import org.springframework.validation.annotation.Validated; + +import javax.validation.Valid; +import javax.validation.constraints.*; + +import lombok.AllArgsConstructor; +import lombok.NoArgsConstructor; +import lombok.Data; +import lombok.Builder; + +/** + * Pagination details + */ +@Schema(description = "Pagination details") +@Validated +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class Pagination { + @JsonProperty("limit") + @Valid + private Integer limit = new Integer(10); + + @JsonProperty("offset") + @Valid + private Integer offset = new Integer(0); + + @JsonProperty("totalCount") + @Valid + private Long totalCount = null; + + @JsonProperty("sortBy") + private String sortBy = null; + + /** + * Sorting order + */ + public enum OrderEnum { + ASC("asc"), + + DESC("desc"); + + private String value; + + OrderEnum(String value) { + this.value = value; + } + + @Override + @JsonValue + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderEnum fromValue(String text) { + for (OrderEnum b : OrderEnum.values()) { + if (String.valueOf(b.value).equals(text)) { + return b; + } + } + return null; + } + } + + @JsonProperty("order") + private OrderEnum order = null; + + +} diff --git a/core-services/service-request/src/main/java/digit/web/models/RequestInfoWrapper.java b/core-services/service-request/src/main/java/digit/web/models/RequestInfoWrapper.java new file mode 100644 index 00000000000..b36665e3e25 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/web/models/RequestInfoWrapper.java @@ -0,0 +1,18 @@ +package digit.web.models; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +import org.egov.common.contract.request.RequestInfo; + + +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class RequestInfoWrapper { + + @JsonProperty("RequestInfo") + private RequestInfo requestInfo; + +} \ No newline at end of file diff --git a/core-services/service-request/src/main/java/digit/web/models/Service.java b/core-services/service-request/src/main/java/digit/web/models/Service.java new file mode 100644 index 00000000000..33946fdf323 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/web/models/Service.java @@ -0,0 +1,86 @@ +package digit.web.models; + +import java.util.Objects; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import digit.models.coremodels.AuditDetails; +import digit.web.models.AttributeValue; +import io.swagger.v3.oas.annotations.media.Schema; + +import java.util.ArrayList; +import java.util.List; + +import org.springframework.validation.annotation.Validated; + +import javax.validation.Valid; +import javax.validation.constraints.*; + +import lombok.AllArgsConstructor; +import lombok.NoArgsConstructor; +import lombok.Data; +import lombok.Builder; + +/** + * Hold the Service field details as json object. + */ +@Schema(description = "Hold the Service field details as json object.") +@Validated +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class Service { + @JsonProperty("id") + private String id = null; + + @JsonProperty("tenantId") + @NotNull + @Size(min = 2, max = 64) + private String tenantId = null; + + @JsonProperty("serviceDefId") + @NotNull + @Size(min = 2, max = 64) + private String serviceDefId = null; + + @JsonProperty("referenceId") + @Size(min = 2, max = 64) + private String referenceId = null; + + @JsonProperty("attributes") + @NotNull + @Valid + private List attributes = new ArrayList<>(); + + @JsonProperty("auditDetails") + @Valid + private AuditDetails auditDetails = null; + + @JsonProperty("additionalDetails") + private Object additionalDetails = null; + + @JsonProperty("accountId") + @NotNull + @Size(max = 64) + private String accountId = null; + + @JsonProperty("clientId") + @Size(max = 64) + private String clientId = null; + + @JsonProperty("code") + @Size(max = 64) + private String code = null; + + @JsonProperty("module") + @Size(max = 64) + private String module = null; + + + public Service addAttributesItem(AttributeValue attributesItem) { + this.attributes.add(attributesItem); + return this; + } + +} diff --git a/core-services/service-request/src/main/java/digit/web/models/ServiceAttributeCriteria.java b/core-services/service-request/src/main/java/digit/web/models/ServiceAttributeCriteria.java new file mode 100644 index 00000000000..17fb1a90edc --- /dev/null +++ b/core-services/service-request/src/main/java/digit/web/models/ServiceAttributeCriteria.java @@ -0,0 +1,33 @@ +package digit.web.models; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.validation.annotation.Validated; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +/** + * The object will contain all the search parameters for Service . + */ +@Schema(description = "The object will contain all the search parameters for Service .") +@Validated +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class ServiceAttributeCriteria { + @JsonProperty("attributeCode") + private String attributeCode = null; + + @JsonProperty("value") + private String value = null; + +} diff --git a/core-services/service-request/src/main/java/digit/web/models/ServiceCriteria.java b/core-services/service-request/src/main/java/digit/web/models/ServiceCriteria.java new file mode 100644 index 00000000000..e7d03131c3d --- /dev/null +++ b/core-services/service-request/src/main/java/digit/web/models/ServiceCriteria.java @@ -0,0 +1,80 @@ +package digit.web.models; + +import java.util.HashMap; +import java.util.Objects; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.v3.oas.annotations.media.Schema; + +import java.util.ArrayList; +import java.util.List; + +import org.springframework.validation.annotation.Validated; + +import javax.validation.Valid; +import javax.validation.constraints.*; + +import lombok.AllArgsConstructor; +import lombok.NoArgsConstructor; +import lombok.Data; +import lombok.Builder; + +/** + * The object will contain all the search parameters for Service . + */ +@Schema(description = "The object will contain all the search parameters for Service .") +@Validated +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class ServiceCriteria { + @JsonProperty("tenantId") + @NotNull + @Size(min = 2, max = 64) + private String tenantId = null; + + @JsonProperty("ids") + private List ids = null; + + @JsonProperty("serviceDefIds") + private List serviceDefIds = null; + + @JsonProperty("referenceIds") + private List referenceIds = null; + + @JsonProperty("attributes") + private ServiceAttributeCriteria attributes; + + @JsonProperty("accountId") + private String accountId = null; + + @JsonProperty("clientId") + private String clientId = null; + + public ServiceCriteria addIdsItem(String idsItem) { + if (this.ids == null) { + this.ids = new ArrayList<>(); + } + this.ids.add(idsItem); + return this; + } + + public ServiceCriteria addServiceDefIdsItem(String serviceDefIdsItem) { + if (this.serviceDefIds == null) { + this.serviceDefIds = new ArrayList<>(); + } + this.serviceDefIds.add(serviceDefIdsItem); + return this; + } + + public ServiceCriteria addReferenceIdsItem(String referenceIdsItem) { + if (this.referenceIds == null) { + this.referenceIds = new ArrayList<>(); + } + this.referenceIds.add(referenceIdsItem); + return this; + } + +} diff --git a/core-services/service-request/src/main/java/digit/web/models/ServiceDefinition.java b/core-services/service-request/src/main/java/digit/web/models/ServiceDefinition.java new file mode 100644 index 00000000000..0d186e8114e --- /dev/null +++ b/core-services/service-request/src/main/java/digit/web/models/ServiceDefinition.java @@ -0,0 +1,76 @@ +package digit.web.models; + +import java.util.Objects; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import digit.models.coremodels.AuditDetails; +import digit.web.models.AttributeDefinition; +import io.swagger.v3.oas.annotations.media.Schema; + +import java.util.ArrayList; +import java.util.List; + +import org.springframework.validation.annotation.Validated; + +import javax.validation.Valid; +import javax.validation.constraints.*; + +import lombok.AllArgsConstructor; +import lombok.NoArgsConstructor; +import lombok.Data; +import lombok.Builder; + +/** + * Holds the Service Definition details json object. + */ +@Schema(description = "Holds the Service Definition details json object.") +@Validated +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class ServiceDefinition { + @JsonProperty("id") + @Size(min = 2, max = 64) + private String id = null; + + @JsonProperty("tenantId") + @Size(min = 2, max = 64) + private String tenantId = null; + + @JsonProperty("code") + @NotNull + @Size(min = 2, max = 64) + private String code = null; + + @JsonProperty("module") + @NotNull + @Size(min = 2, max = 64) + private String module = null; + + @JsonProperty("isActive") + private Boolean isActive = true; + + @JsonProperty("attributes") + @NotNull + @Valid + private List attributes = new ArrayList<>(); + + @JsonProperty("auditDetails") + @Valid + private AuditDetails auditDetails = null; + + @JsonProperty("additionalDetails") + private Object additionalDetails = null; + + @JsonProperty("clientId") + @Size(max = 64) + private String clientId = null; + + public ServiceDefinition addAttributesItem(AttributeDefinition attributesItem) { + this.attributes.add(attributesItem); + return this; + } + +} diff --git a/core-services/service-request/src/main/java/digit/web/models/ServiceDefinitionCriteria.java b/core-services/service-request/src/main/java/digit/web/models/ServiceDefinitionCriteria.java new file mode 100644 index 00000000000..f66d6aaf683 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/web/models/ServiceDefinitionCriteria.java @@ -0,0 +1,65 @@ +package digit.web.models; + +import java.util.Objects; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.v3.oas.annotations.media.Schema; + +import java.util.ArrayList; +import java.util.List; + +import org.springframework.validation.annotation.Validated; + +import javax.validation.Valid; +import javax.validation.constraints.*; + +import lombok.AllArgsConstructor; +import lombok.NoArgsConstructor; +import lombok.Data; +import lombok.Builder; + +/** + * The object will contain all the search parameters for Service Definition. + */ +@Schema(description = "The object will contain all the search parameters for Service Definition.") +@Validated +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class ServiceDefinitionCriteria { + @JsonProperty("tenantId") + @NotNull + @Size(min = 2, max = 64) + private String tenantId = null; + + @JsonProperty("ids") + private List ids = null; + + @JsonProperty("code") + private List code = null; + + @JsonProperty("module") + private List module = null; + + @JsonProperty("clientId") + private String clientId = null; + + public ServiceDefinitionCriteria addIdsItem(String idsItem) { + if (this.ids == null) { + this.ids = new ArrayList<>(); + } + this.ids.add(idsItem); + return this; + } + + public ServiceDefinitionCriteria addCodeItem(String codeItem) { + if (this.code == null) { + this.code = new ArrayList<>(); + } + this.code.add(codeItem); + return this; + } + +} diff --git a/core-services/service-request/src/main/java/digit/web/models/ServiceDefinitionRequest.java b/core-services/service-request/src/main/java/digit/web/models/ServiceDefinitionRequest.java new file mode 100644 index 00000000000..8508c638ae1 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/web/models/ServiceDefinitionRequest.java @@ -0,0 +1,37 @@ +package digit.web.models; + +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import digit.web.models.ServiceDefinition; +import io.swagger.v3.oas.annotations.media.Schema; +import org.egov.common.contract.request.RequestInfo; +import org.springframework.validation.annotation.Validated; +import javax.validation.Valid; +import javax.validation.constraints.*; +import lombok.AllArgsConstructor; +import lombok.NoArgsConstructor; +import lombok.Data; +import lombok.Builder; + +/** + * ServiceDefinitionRequest + */ +@Validated +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class ServiceDefinitionRequest { + + @JsonProperty("RequestInfo") + @NotNull + @Valid + private RequestInfo requestInfo = null; + + @JsonProperty("ServiceDefinition") + @NotNull + @Valid + private ServiceDefinition serviceDefinition = null; + +} diff --git a/core-services/service-request/src/main/java/digit/web/models/ServiceDefinitionResponse.java b/core-services/service-request/src/main/java/digit/web/models/ServiceDefinitionResponse.java new file mode 100644 index 00000000000..7e5e126f0d5 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/web/models/ServiceDefinitionResponse.java @@ -0,0 +1,55 @@ +package digit.web.models; + +import java.util.Objects; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import digit.web.models.Pagination; +import digit.web.models.ServiceDefinition; +import io.swagger.v3.oas.annotations.media.Schema; + +import java.util.ArrayList; +import java.util.List; + +import org.egov.common.contract.response.ResponseInfo; +import org.springframework.validation.annotation.Validated; + +import javax.validation.Valid; +import javax.validation.constraints.*; + +import lombok.AllArgsConstructor; +import lombok.NoArgsConstructor; +import lombok.Data; +import lombok.Builder; + +/** + * ServiceDefinitionResponse + */ +@Validated +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class ServiceDefinitionResponse { + @JsonProperty("ResponseInfo") + @Valid + private ResponseInfo responseInfo = null; + + @JsonProperty("ServiceDefinition") + @Valid + private List serviceDefinition = null; + + @JsonProperty("Pagination") + @Valid + private Pagination pagination = null; + + + public ServiceDefinitionResponse addServiceDefinitionItem(ServiceDefinition serviceDefinitionItem) { + if (this.serviceDefinition == null) { + this.serviceDefinition = new ArrayList<>(); + } + this.serviceDefinition.add(serviceDefinitionItem); + return this; + } + +} diff --git a/core-services/service-request/src/main/java/digit/web/models/ServiceDefinitionSearchRequest.java b/core-services/service-request/src/main/java/digit/web/models/ServiceDefinitionSearchRequest.java new file mode 100644 index 00000000000..a5f47ae1248 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/web/models/ServiceDefinitionSearchRequest.java @@ -0,0 +1,44 @@ +package digit.web.models; + +import java.util.Objects; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import digit.web.models.Pagination; +import digit.web.models.ServiceDefinitionCriteria; +import io.swagger.v3.oas.annotations.media.Schema; +import org.egov.common.contract.request.RequestInfo; +import org.springframework.validation.annotation.Validated; + +import javax.validation.Valid; +import javax.validation.constraints.*; + +import lombok.AllArgsConstructor; +import lombok.NoArgsConstructor; +import lombok.Data; +import lombok.Builder; + +/** + * ServiceDefinitionSearchRequest + */ +@Validated +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class ServiceDefinitionSearchRequest { + @JsonProperty("RequestInfo") + @NotNull + @Valid + private RequestInfo requestInfo = null; + + @JsonProperty("ServiceDefinitionCriteria") + @Valid + private ServiceDefinitionCriteria serviceDefinitionCriteria = null; + + @JsonProperty("Pagination") + @Valid + private Pagination pagination = null; + + +} diff --git a/core-services/service-request/src/main/java/digit/web/models/ServiceRequest.java b/core-services/service-request/src/main/java/digit/web/models/ServiceRequest.java new file mode 100644 index 00000000000..76c5a9db7b0 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/web/models/ServiceRequest.java @@ -0,0 +1,39 @@ +package digit.web.models; + +import java.util.Objects; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import digit.web.models.Service; +import io.swagger.v3.oas.annotations.media.Schema; +import org.egov.common.contract.request.RequestInfo; +import org.springframework.validation.annotation.Validated; + +import javax.validation.Valid; +import javax.validation.constraints.*; + +import lombok.AllArgsConstructor; +import lombok.NoArgsConstructor; +import lombok.Data; +import lombok.Builder; + +/** + * ServiceRequest + */ +@Validated +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class ServiceRequest { + @JsonProperty("RequestInfo") + @NotNull + @Valid + private RequestInfo requestInfo = null; + + @JsonProperty("Service") + @Valid + private Service service = null; + + +} diff --git a/core-services/service-request/src/main/java/digit/web/models/ServiceResponse.java b/core-services/service-request/src/main/java/digit/web/models/ServiceResponse.java new file mode 100644 index 00000000000..963dbda74b4 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/web/models/ServiceResponse.java @@ -0,0 +1,55 @@ +package digit.web.models; + +import java.util.Objects; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import digit.web.models.Pagination; +import digit.web.models.Service; +import io.swagger.v3.oas.annotations.media.Schema; + +import java.util.ArrayList; +import java.util.List; + +import org.egov.common.contract.response.ResponseInfo; +import org.springframework.validation.annotation.Validated; + +import javax.validation.Valid; +import javax.validation.constraints.*; + +import lombok.AllArgsConstructor; +import lombok.NoArgsConstructor; +import lombok.Data; +import lombok.Builder; + +/** + * ServiceResponse + */ +@Validated +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class ServiceResponse { + @JsonProperty("ResponseInfo") + @Valid + private ResponseInfo responseInfo = null; + + @JsonProperty("Service") + @Valid + private List service = null; + + @JsonProperty("Pagination") + @Valid + private Pagination pagination = null; + + + public ServiceResponse addServiceItem(Service serviceItem) { + if (this.service == null) { + this.service = new ArrayList<>(); + } + this.service.add(serviceItem); + return this; + } + +} diff --git a/core-services/service-request/src/main/java/digit/web/models/ServiceSearchRequest.java b/core-services/service-request/src/main/java/digit/web/models/ServiceSearchRequest.java new file mode 100644 index 00000000000..d25081d2c99 --- /dev/null +++ b/core-services/service-request/src/main/java/digit/web/models/ServiceSearchRequest.java @@ -0,0 +1,45 @@ +package digit.web.models; + +import java.util.Objects; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import digit.web.models.Pagination; +import digit.web.models.ServiceCriteria; +import io.swagger.v3.oas.annotations.media.Schema; +import org.egov.common.contract.request.RequestInfo; +import org.springframework.validation.annotation.Validated; + +import javax.validation.Valid; +import javax.validation.constraints.*; + +import lombok.AllArgsConstructor; +import lombok.NoArgsConstructor; +import lombok.Data; +import lombok.Builder; + +/** + * ServiceSearchRequest + */ +@Validated +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class ServiceSearchRequest { + @JsonProperty("RequestInfo") + @NotNull + @Valid + private RequestInfo requestInfo = null; + + @JsonProperty("ServiceCriteria") + @NotNull + @Valid + private ServiceCriteria serviceCriteria = null; + + @JsonProperty("Pagination") + @Valid + private Pagination pagination = null; + + +} diff --git a/core-services/service-request/src/main/resources/application.properties b/core-services/service-request/src/main/resources/application.properties new file mode 100644 index 00000000000..b08e73fc128 --- /dev/null +++ b/core-services/service-request/src/main/resources/application.properties @@ -0,0 +1,53 @@ +server.contextPath=/service-request +server.servlet.contextPath=/service-request +server.port=8280 +app.timezone=UTC + +#DATABASE CONFIGURATION +spring.datasource.driver-class-name=org.postgresql.Driver +spring.datasource.url=jdbc:postgresql://localhost:5432/testdb +spring.datasource.username=postgres +spring.datasource.password=postgres + +#FLYWAY CONFIGURATION +spring.flyway.url=jdbc:postgresql://localhost:5432/testdb +spring.flyway.user=postgres +spring.flyway.password=postgres +spring.flyway.table=public +spring.flyway.baseline-on-migrate=true +spring.flyway.outOfOrder=true +spring.flyway.locations=classpath:/db/migration/main +spring.flyway.enabled=true + +# KAFKA SERVER CONFIGURATIONS +kafka.config.bootstrap_server_config=localhost:9092 +spring.kafka.consumer.value-deserializer=org.egov.tracer.kafka.deserializer.HashMapDeserializer +spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer +spring.kafka.consumer.group-id=service-request +spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer +spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer +spring.kafka.listener.missing-topics-fatal=false +spring.kafka.consumer.properties.spring.json.use.type.headers=false + +# KAFKA CONSUMER CONFIGURATIONS +kafka.consumer.config.auto_commit=true +kafka.consumer.config.auto_commit_interval=100 +kafka.consumer.config.session_timeout=15000 +kafka.consumer.config.auto_offset_reset=earliest +# KAFKA PRODUCER CONFIGURATIONS +kafka.producer.config.retries_config=0 +kafka.producer.config.batch_size_config=16384 +kafka.producer.config.linger_ms_config=1 +kafka.producer.config.buffer_memory_config=33554432 + +# Pagination +egov.service.request.default.offset=0 +egov.service.request.default.limit=10 +egov.service.request.max.limit=100 + +# Kafka topics +egov.service.definition.create.topic=save-service-definition +egov.service.create.topic=save-service + +# String input size configuration +egov.max.string.input.size=8192 \ No newline at end of file diff --git a/core-services/service-request/src/main/resources/db/Dockerfile b/core-services/service-request/src/main/resources/db/Dockerfile new file mode 100644 index 00000000000..a5699ff7d99 --- /dev/null +++ b/core-services/service-request/src/main/resources/db/Dockerfile @@ -0,0 +1,9 @@ +FROM egovio/flyway:4.1.2 + +COPY ./migration/main /flyway/sql + +COPY migrate.sh /usr/bin/migrate.sh + +RUN chmod +x /usr/bin/migrate.sh + +CMD ["/usr/bin/migrate.sh"] diff --git a/core-services/service-request/src/main/resources/db/migrate.sh b/core-services/service-request/src/main/resources/db/migrate.sh new file mode 100644 index 00000000000..43960b25cdb --- /dev/null +++ b/core-services/service-request/src/main/resources/db/migrate.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +flyway -url=$DB_URL -table=$SCHEMA_TABLE -user=$FLYWAY_USER -password=$FLYWAY_PASSWORD -locations=$FLYWAY_LOCATIONS -baselineOnMigrate=true -outOfOrder=true -ignoreMissingMigrations=true migrate \ No newline at end of file diff --git a/core-services/service-request/src/main/resources/db/migration/main/V20230221120036__service_create_ddl.sql b/core-services/service-request/src/main/resources/db/migration/main/V20230221120036__service_create_ddl.sql new file mode 100644 index 00000000000..86c5d3232c4 --- /dev/null +++ b/core-services/service-request/src/main/resources/db/migration/main/V20230221120036__service_create_ddl.sql @@ -0,0 +1,27 @@ +CREATE TABLE eg_service( + id character varying(64), + tenantId character varying(64), + serviceDefId character varying(64), + referenceId character varying(64), + createdBy character varying(64), + lastModifiedBy character varying(64), + createdTime bigint, + lastModifiedTime bigint, + additionalDetails JSONB, + accountId character varying(64), + clientId character varying(64), + CONSTRAINT uk_eg_service UNIQUE (id) +); + +CREATE TABLE eg_service_attribute_value( + id character varying(64), + referenceId character varying(64), + attributeCode character varying(64), + "value" JSONB, + createdBy character varying(64), + lastModifiedBy character varying(64), + createdTime bigint, + lastModifiedTime bigint, + additionalDetails JSONB, + CONSTRAINT uk_eg_attribute_value UNIQUE (id) +); diff --git a/core-services/service-request/src/main/resources/db/migration/main/V20230221133034__servicedefinition_create_ddl.sql b/core-services/service-request/src/main/resources/db/migration/main/V20230221133034__servicedefinition_create_ddl.sql new file mode 100644 index 00000000000..50bd9af4fc6 --- /dev/null +++ b/core-services/service-request/src/main/resources/db/migration/main/V20230221133034__servicedefinition_create_ddl.sql @@ -0,0 +1,35 @@ +CREATE TABLE eg_service_definition( + id character varying(64), + tenantId character varying(64), + code character varying(64), + module character varying(64), + isActive boolean, + createdBy character varying(64), + lastModifiedBy character varying(64), + createdTime bigint, + lastModifiedTime bigint, + additionalDetails JSONB, + clientId character varying(64), + CONSTRAINT uk_eg_service_definition UNIQUE (id), + CONSTRAINT pk_eg_service_definition PRIMARY KEY (tenantId,code) +); + +CREATE TABLE eg_service_attribute_definition( + id character varying(64), + referenceId character varying(64), + tenantId character varying(64), + code character varying(64), + dataType character varying(64), + "values" character varying(8192), + isActive boolean, + required boolean, + regEx character varying(64), + "order" character varying(64), + createdBy character varying(64), + lastModifiedBy character varying(64), + createdTime bigint, + lastModifiedTime bigint, + additionalDetails JSONB, + CONSTRAINT uk_eg_attribute_definition UNIQUE (id), + CONSTRAINT pk_eg_attribute_definition PRIMARY KEY (code,referenceId) +); diff --git a/core-services/service-request/src/main/resources/service-request-persister.yml b/core-services/service-request/src/main/resources/service-request-persister.yml new file mode 100644 index 00000000000..ada2919663d --- /dev/null +++ b/core-services/service-request/src/main/resources/service-request-persister.yml @@ -0,0 +1,138 @@ +serviceMaps: + serviceName: service-request + mappings: + - version: 1.0 + description: Persists service definition details in service definition table + fromTopic: save-service-definition + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_service_definition(id, tenantid, code, module, isactive, createdby, lastmodifiedby, createdtime, lastmodifiedtime, additionaldetails, clientid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.ServiceDefinition + jsonMaps: + - jsonPath: $.ServiceDefinition.id + + - jsonPath: $.ServiceDefinition.tenantId + + - jsonPath: $.ServiceDefinition.code + + - jsonPath: $.ServiceDefinition.module + + - jsonPath: $.ServiceDefinition.isActive + + - jsonPath: $.ServiceDefinition.auditDetails.createdBy + + - jsonPath: $.ServiceDefinition.auditDetails.lastModifiedBy + + - jsonPath: $.ServiceDefinition.auditDetails.createdTime + + - jsonPath: $.ServiceDefinition.auditDetails.lastModifiedTime + + - jsonPath: $.ServiceDefinition.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.ServiceDefinition.clientId + + + + - query: INSERT INTO eg_service_attribute_definition(id, referenceid, tenantid, code, datatype, "values", isactive, required, regex, "order", createdby, lastmodifiedby, createdtime, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.ServiceDefinition.attributes.* + jsonMaps: + - jsonPath: $.ServiceDefinition.attributes.*.id + + - jsonPath: $.ServiceDefinition.attributes.*.referenceId + + - jsonPath: $.ServiceDefinition.attributes.*.tenantId + + - jsonPath: $.ServiceDefinition.attributes.*.code + + - jsonPath: $.ServiceDefinition.attributes.*.dataType + + - jsonPath: $.ServiceDefinition.attributes.*.values + type: ARRAY + dbType: STRING + + - jsonPath: $.ServiceDefinition.attributes.*.isActive + + - jsonPath: $.ServiceDefinition.attributes.*.required + + - jsonPath: $.ServiceDefinition.attributes.*.regex + + - jsonPath: $.ServiceDefinition.attributes.*.order + + - jsonPath: $.ServiceDefinition.attributes.*.auditDetails.createdBy + + - jsonPath: $.ServiceDefinition.attributes.*.auditDetails.lastModifiedBy + + - jsonPath: $.ServiceDefinition.attributes.*.auditDetails.createdTime + + - jsonPath: $.ServiceDefinition.attributes.*.auditDetails.lastModifiedTime + + - jsonPath: $.ServiceDefinition.attributes.*.additionalDetails + type: JSON + dbType: JSONB + + + + + + - version: 1.0 + description: Persists service details in service table + fromTopic: save-service + isTransaction: true + queryMaps: + + + - query: INSERT INTO eg_service(id, tenantid, servicedefid, referenceid, createdby, lastmodifiedby, createdtime, lastmodifiedtime, additionaldetails, accountid, clientid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Service + jsonMaps: + - jsonPath: $.Service.id + + - jsonPath: $.Service.tenantId + + - jsonPath: $.Service.serviceDefId + + - jsonPath: $.Service.referenceId + + - jsonPath: $.Service.auditDetails.createdBy + + - jsonPath: $.Service.auditDetails.lastModifiedBy + + - jsonPath: $.Service.auditDetails.createdTime + + - jsonPath: $.Service.auditDetails.lastModifiedTime + + - jsonPath: $.Service.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Service.accountId + + - jsonPath: $.Service.clientId + + + - query: INSERT INTO eg_service_attribute_value(id, referenceid, attributecode, value, createdby, lastmodifiedby, createdtime, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Service.attributes.* + jsonMaps: + - jsonPath: $.Service.attributes.*.id + + - jsonPath: $.Service.attributes.*.referenceId + + - jsonPath: $.Service.attributes.*.attributeCode + + - jsonPath: $.Service.attributes.*.value + type: JSON + dbType: JSONB + + - jsonPath: $.Service.attributes.*.auditDetails.createdBy + + - jsonPath: $.Service.attributes.*.auditDetails.lastModifiedBy + + - jsonPath: $.Service.attributes.*.auditDetails.createdTime + + - jsonPath: $.Service.attributes.*.auditDetails.lastModifiedTime + + - jsonPath: $.Service.attributes.*.additionalDetails + type: JSON + dbType: JSONB \ No newline at end of file diff --git a/frontend/micro-ui/package.json b/frontend/micro-ui/package.json index 954e19caa6a..e85f76739a4 100644 --- a/frontend/micro-ui/package.json +++ b/frontend/micro-ui/package.json @@ -1,4 +1,4 @@ { "name": "digit-ui", - "version": "1.6.1" + "version": "1.7.0-beta.1" } diff --git a/frontend/micro-ui/web/micro-ui-internals/example/.env-nugp b/frontend/micro-ui/web/micro-ui-internals/example/.env-nugp new file mode 100644 index 00000000000..5ca85808464 --- /dev/null +++ b/frontend/micro-ui/web/micro-ui-internals/example/.env-nugp @@ -0,0 +1,12 @@ +SKIP_PREFLIGHT_CHECK=true +REACT_APP_USER_TYPE=EMPLOYEE +REACT_APP_EMPLOYEE_TOKEN=c835932f-2ad4-4d05-83d6-49e0b8c59f8a +REACT_APP_CITIZEN_TOKEN=7cd58aae-30b3-41ed-a1b3-3417107a993c +REACT_APP_PROXY_API=https://upyog.niua.org +REACT_APP_PROXY_ASSETS=https://upyog.niua.org +REACT_APP_GLOBAL=https://s3.ap-south-1.amazonaws.com/in-egov-assets/globalConfigs.js +REACT_APP_CENTRAL_GLOBAL=https://egov-central-instance-assets.s3.ap-south-1.amazonaws.com/statebglobalConfigs.js +REACT_APP_QA_GLOBAL=https://s3.ap-south-1.amazonaws.com/egov-dev-assets/globalConfigs.js +REACT_APP_UAT_GLOBAL=https://s3.ap-south-1.amazonaws.com/egov-uat-assets/globalConfigs.js +REACT_APP_STATEB_GLOBAL=https://egov-central-instance-assets.s3.ap-south-1.amazonaws.com/statebglobalConfigs.js +staging=https://staging.digit.org \ No newline at end of file diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json index 67f54d32c72..e91c95e7166 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -9,20 +9,20 @@ "start": "react-scripts start" }, "devDependencies": { - "@egovernments/digit-ui-libraries": "^1.6.1", - "@egovernments/digit-ui-module-common": "^1.6.1", - "@egovernments/digit-ui-module-engagement": "^1.6.0", - "@egovernments/digit-ui-module-fsm": "^1.6.1", - "@egovernments/digit-ui-module-mcollect": "^1.6.0", - "@egovernments/digit-ui-module-noc": "^1.6.0", - "@egovernments/digit-ui-module-obps": "^1.6.0", - "@egovernments/digit-ui-module-pgr": "^1.6.0", - "@egovernments/digit-ui-module-pt": "^1.6.0", - "@egovernments/digit-ui-module-receipts": "^1.6.0", - "@egovernments/digit-ui-module-tl": "^1.6.0", - "@egovernments/digit-ui-module-ws": "^1.6.0", - "@egovernments/digit-ui-module-bills": "^1.6.0", - "@egovernments/digit-ui-module-commonpt": "^1.6.0", + "@egovernments/digit-ui-libraries": "^1.7.0-beta.1", + "@egovernments/digit-ui-module-common": "^1.7.0-beta.1", + "@egovernments/digit-ui-module-engagement": "^1.7.0-beta.1", + "@egovernments/digit-ui-module-fsm": "^1.7.0-beta.1", + "@egovernments/digit-ui-module-mcollect": "^1.7.0-beta.1", + "@egovernments/digit-ui-module-noc": "^1.7.0-beta.1", + "@egovernments/digit-ui-module-obps": "^1.7.0-beta.1", + "@egovernments/digit-ui-module-pgr": "^1.7.0-beta.1", + "@egovernments/digit-ui-module-pt": "^1.7.0-beta.1", + "@egovernments/digit-ui-module-receipts": "^1.7.0-beta.1", + "@egovernments/digit-ui-module-tl": "^1.7.0-beta.1", + "@egovernments/digit-ui-module-ws": "^1.7.0-beta.1", + "@egovernments/digit-ui-module-bills": "^1.7.0-beta.1", + "@egovernments/digit-ui-module-commonpt": "^1.7.0-beta.1", "http-proxy-middleware": "^1.0.5", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/example/src/setupProxy.js b/frontend/micro-ui/web/micro-ui-internals/example/src/setupProxy.js index 40f9c452d20..40210aa6b37 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/src/setupProxy.js +++ b/frontend/micro-ui/web/micro-ui-internals/example/src/setupProxy.js @@ -62,6 +62,7 @@ module.exports = function (app) { "/inbox/v1/dss/_search", "/inbox/v1/elastic/_search", "/fsm-calculator", + "/service-request", ].forEach((location) => app.use(location, createProxy)); ["/pb-egov-assets"].forEach((location) => app.use(location, assetsProxy)); }; diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json index 6606b75ea41..c7a104eed7f 100644 --- a/frontend/micro-ui/web/micro-ui-internals/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/package.json @@ -9,11 +9,9 @@ "packages/react-components", "packages/modules/bills", "packages/modules/common", - "packages/modules/commonPt", "packages/modules/core", "packages/modules/dss", "packages/modules/engagement", - "packages/modules/pgr", "packages/modules/pt", "packages/modules/tl", "packages/modules/ws", @@ -57,9 +55,9 @@ "build:components": "cd packages/react-components && yarn build", "build:common": "cd packages/modules/common && yarn build", "build:pt": "cd packages/modules/pt && yarn build", - "build:commonPt": "cd packages/modules/commonPt && yarn build", + "buildD:commonPt": "cd packages/modules/commonPt && yarn build", "build:core": "cd packages/modules/core && yarn build", - "build:pgr": "cd packages/modules/pgr && yarn build", + "buildD:pgr": "cd packages/modules/pgr && yarn build", "build:fsm": "cd packages/modules/fsm && yarn build", "build:dss": "cd packages/modules/dss && yarn build", "buildD:mcollect": "cd packages/modules/mCollect && yarn build", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json index 1f7af0edfe4..901586f4b4a 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-css", - "version": "1.6.2", + "version": "1.6.4", "license": "MIT", "main": "dist/index.css", "engines": { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/card.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/card.scss index 954e1dded00..e3dc9ef949c 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/card.scss +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/card.scss @@ -389,4 +389,4 @@ position: unset !important; margin: 0 !important; width: 100% !important; -} \ No newline at end of file +} diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/checkbox.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/checkbox.scss index f91cb2ce271..b9df78b6063 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/checkbox.scss +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/checkbox.scss @@ -48,7 +48,27 @@ .label { margin-left: 56px; - @apply text-form-field text-text-primary; + @apply text-form-field text-text-primary relative top-10; + } +} + +.fsm-citizen-rating-wrapper { + .card-label:last-of-type { + margin-top: 24px; + } + + .card-label { + margin-bottom: 24px; + } +} + +.fsm-citizen-rating-wrapper { + .card-label:last-of-type { + margin-top: 24px; + } + + .card-label { + margin-bottom: 24px; } } diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/popupmodule.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/popupmodule.scss index b8a99b6f5d7..ef52730f3e9 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/popupmodule.scss +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/popupmodule.scss @@ -32,3 +32,16 @@ } } } + +.popup-module-main { + iframe #page-container div { + width: 99% !important; + margin: 5px !important; + } + + iframe #page-container { + ::-webkit-scrollbar { + width: 0px !important; + } + } +} diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/package.json index 37bf2120a24..730d284e40f 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-libraries", - "version": "1.6.1", + "version": "1.7.0-beta.1", "main": "dist/index.js", "module": "dist/index.modern.js", "source": "src/index.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/dss/useGetChart.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/dss/useGetChart.js index 20d41f3736d..1d346215c19 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/dss/useGetChart.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/dss/useGetChart.js @@ -2,7 +2,7 @@ import { useQuery } from "react-query"; import { startOfMonth, endOfMonth, getTime } from "date-fns"; import { DSSService } from "../../services/elements/DSS"; -const getRequest = (type, code, requestDate, filters, moduleLevel = "", addlFilter) => { +const getRequest = (type, code, requestDate, filters, moduleLevel = "", addlFilter, indexKeyForEmptyModule) => { let newFilter = { ...{ ...filters, ...addlFilter } }; let updatedFilter = Object.keys(newFilter) .filter((ele) => newFilter[ele].length > 0) @@ -16,7 +16,7 @@ const getRequest = (type, code, requestDate, filters, moduleLevel = "", addlFilt visualizationCode: code, queryType: "", filters: updatedFilter, - moduleLevel: moduleLevel, + moduleLevel: indexKeyForEmptyModule?.includes(code)? "" : moduleLevel, aggregationFactors: null, requestDate, }, @@ -38,11 +38,16 @@ const defaultSelect = (data) => { const useGetChart = (args) => { const { key, type, tenantId, requestDate, filters, moduleLevel, addlFilter } = args; + const indexKeyForEmptyModule = [ + "nssPtCitizenFeedbackScore", + "nssPtCitizenServiceDeliveryIndex", + "sdssPtCitizenFeedbackScore", + ]; return useQuery( [args], () => DSSService.getCharts({ - ...getRequest(type, key, requestDate, filters, moduleLevel, addlFilter), + ...getRequest(type, key, requestDate, filters, moduleLevel, addlFilter, indexKeyForEmptyModule), headers: { tenantId, }, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/index.js index 33c80c9aa53..ddc1aa9a14e 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/index.js @@ -103,6 +103,8 @@ import useGenderMDMS from "./pt/useGenderMDMS"; import usePTGenderMDMS from "./pt/usePTGenderMDMS"; import useMyPropertyPayments from "./pt/useMyPropertyPayments"; import useGenericViewProperty from "./pt/useGenericViewProperty"; +import useRatingAndFeedbackMDMS from "./pt/useRatingAndFeedbackMDMS"; +import useServiceSearchCF from "./pt/useServiceSearchCF"; import useDssMdms from "./dss/useMDMS"; import useDashboardConfig from "./dss/useDashboardConfig"; @@ -244,6 +246,7 @@ import useBillAmendmentInbox from "./billAmendment/useInbox"; import { usePrivacyContext } from "./usePrivacyContext"; import useToCheckPrivacyEnablement from "./ws/useToCheckPrivacyEnablement"; import useWSConfigMDMS from "./ws/useWSConfigMDMS"; +import useFeedBackSearch from "./useFeedBackSearch"; const pgr = { useComplaintDetails, @@ -324,6 +327,8 @@ const pt = { usePTGenderMDMS, useMyPropertyPayments, useGenericViewProperty, + useRatingAndFeedbackMDMS, + useServiceSearchCF, }; const dss = { @@ -513,6 +518,7 @@ const Hooks = { useDocumentSearch, useTenants, useInbox: useTLInbox, + useFeedBackSearch, useAccessControl, useBillSearch, useCancelBill, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/obps/useBPASearch.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/obps/useBPASearch.js index 76daac73a54..a312324fb52 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/obps/useBPASearch.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/obps/useBPASearch.js @@ -36,10 +36,12 @@ const useBPASearch = (tenantId, filters = {}, config = {}) => { const userInformation = userInfo?.value?.info; if (window.location.href.includes("/citizen") && window.location.href.includes("/search")) { - if (!filters?.createdBy) filters.createdBy = userInformation?.uuid; + if (!filters?.createdBy && !window.location.href.includes("obps-application")) filters.createdBy = userInformation?.uuid; if (!filters?.applicationType) filters.applicationType = "BUILDING_PLAN_SCRUTINY"; if (!filters?.serviceType) filters.serviceType = "NEW_CONSTRUCTION"; } + + if (window.location.href.includes("/search/obps-application")) filters.mobileNumber = userInformation?.mobileNumber; const client = useQueryClient(); return {...useQuery(['BPA_SEARCH', tenantId, filters], async () => { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/pt/useRatingAndFeedbackMDMS.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/pt/useRatingAndFeedbackMDMS.js new file mode 100644 index 00000000000..f4d086ec521 --- /dev/null +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/pt/useRatingAndFeedbackMDMS.js @@ -0,0 +1,35 @@ +import React from "react"; +import { useQuery } from "react-query"; +import { MdmsService } from "../../services/elements/MDMS"; + +const useRatingAndFeedbackMDMS = { + RatingAndFeedBack: (tenantId) => + useQuery( + [tenantId, "PT_MDMS_RATING_AND_FEEDBACK_VALUES"], + () => + MdmsService.getDataByCriteria( + tenantId, + { + details: { + tenantId: tenantId, + moduleDetails: [ + { + moduleName: "common-masters", + masterDetails: [ + { + name : "RatingAndFeedback", + } + ], + }, + ], + }, + }, + "PT" + ), + { + select: (data) => data?.["common-masters"]?.RatingAndFeedback?.reduce((obj, item) => (obj[item.type] = item.value, obj) ,{}), + } + ), +}; + +export default useRatingAndFeedbackMDMS; \ No newline at end of file diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/pt/useServiceSearchCF.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/pt/useServiceSearchCF.js new file mode 100644 index 00000000000..f5861d1c3d1 --- /dev/null +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/pt/useServiceSearchCF.js @@ -0,0 +1,25 @@ +import { useQuery, useQueryClient } from "react-query"; + +const useServiceSearchCF = ({ tenantId, filters }, config = {}) => { + const client = useQueryClient(); + //removing servicedefids from search call as it's not required anymore + // const searchargs = { filters : { ServiceDefinitionCriteria : {tenantId : filters?.serviceSearchArgs?.tenantId, module:filters?.serviceSearchArgs?.module, code:filters?.serviceSearchArgs?.code }}}; + + + // const { isLoading, error, data } = useQuery(["ServiceDefinitionSearch", tenantId, filters], () => Digit.PTService.cfdefinitionsearch(searchargs), { + // ...config, + // }); + +let serviceSearchArg = {filters : {ServiceCriteria : {tenantId:filters?.serviceSearchArgs?.tenantId, /*serviceDefIds: [data?.ServiceDefinition?.[0]?.id]["ca134821-97f0-42b7-a53d-f6cd2796e4b9"],attributes:filters?.serviceSearchArgs?.attributes*/ referenceIds:filters?.serviceSearchArgs?.referenceIds}}} +let serviceconfig = {/*enabled : data?.ServiceDefinition?.[0]?.id ? true : false,*/...config, cacheTime: 0} + +const { isLoading : serviceLoading, error : serviceerror, data :servicedata} = useQuery(["ServiceSearch", tenantId, filters], () => Digit.PTService.cfsearch(serviceSearchArg), { + ...serviceconfig, + }); + + +return {isLoading: serviceLoading, error : serviceerror, data : servicedata, revalidate: () => client.invalidateQueries(["ServiceSearch", tenantId, filters]) }; + +}; + +export default useServiceSearchCF; \ No newline at end of file diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/useFeedBackSearch.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/useFeedBackSearch.js new file mode 100644 index 00000000000..a2336b2aee7 --- /dev/null +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/useFeedBackSearch.js @@ -0,0 +1,18 @@ +import { useQuery, useQueryClient } from "react-query"; + +const useFeedBackSearch = ({ tenantId, filters }, config = {}) => { + const client = useQueryClient(); + + let serviceSearchArg = {filters : {ServiceCriteria : {tenantId:filters?.serviceSearchArgs?.tenantId, referenceIds:filters?.serviceSearchArgs?.referenceIds}}} + let serviceconfig = {/*enabled : data?.ServiceDefinition?.[0]?.id ? true : false,*/ cacheTime: 0} + + const { isLoading : serviceLoading, error : serviceerror, data :servicedata} = useQuery(["ServiceSearch", tenantId, filters], () => Digit.PTService.cfsearch(serviceSearchArg), { + ...serviceconfig, + }); + + + return {isLoading: serviceLoading, error : serviceerror, data : servicedata, revalidate: () => client.invalidateQueries(["ServiceSearch", tenantId, filters]) }; + +}; + +export default useFeedBackSearch; \ No newline at end of file diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/index.js index 83e7a9d5b1e..e2449a9f34b 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/index.js @@ -48,6 +48,7 @@ import { NOCService } from "./services/elements/NOC"; import { NOCSearch } from "./services/molecules/NOC/Search"; import AccessControlService from "./services/elements/Access"; import BillServices from "./services/elements/Bill"; +import { CFService } from "./services/elements/CF"; import {CustomService} from "./services/elements/CustomService"; @@ -73,6 +74,7 @@ const initLibraries = () => { setupLibraries("PGRService", PGRService); setupLibraries("FSMService", FSMService); setupLibraries("PTService", PTService); + setupLibraries("CFService", CFService); setupLibraries("CustomService", CustomService); setupLibraries("TLService", TLService); setupLibraries("Surveys", Surveys); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js index cd574f4187f..3719e3850ad 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js @@ -79,6 +79,9 @@ const Urls = { assessment_search: "/property-services/assessment/_search", payment_search: "/collection-services/payments/PT/_search", pt_calculate_mutation: "/pt-calculator-v2/propertytax/mutation/_calculate", + cfcreate: "/service-request/service/v1/_create", + cfdefinitionsearch: "/service-request/service/definition/v1/_search", + cfsearch: "/service-request/service/v1/_search", }, dss: { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/CF.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/CF.js new file mode 100644 index 00000000000..a127d593117 --- /dev/null +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/CF.js @@ -0,0 +1,36 @@ +import Urls from "../atoms/urls"; +import { Request } from "../atoms/Utils/Request"; + +export const CFService = { + cfcreate: (details, tenantId) => + Request({ + url: Urls.pt.cfcreate, + data: details, + useCache: false, + setTimeParam: false, + userService: true, + method: "POST", + params: {}, + auth: true, + }), + cfdefinitionsearch: ({ filters, auth }) => + Request({ + url: Urls.pt.cfdefinitionsearch, + useCache: false, + method: "POST", + auth: auth === false ? auth : true, + userService: auth === false ? auth : true, + data: {...filters}, + //params: { tenantId, ...filters }, + }), + cfsearch: ({ filters, auth }) => + Request({ + url: Urls.pt.cfsearch, + useCache: false, + method: "POST", + auth: auth === false ? auth : true, + userService: auth === false ? auth : true, + data: {...filters}, + //params: { tenantId, ...filters }, + }), +}; \ No newline at end of file diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/PT.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/PT.js index 2b890d4107c..9f8bf62996b 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/PT.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/PT.js @@ -99,6 +99,37 @@ export const PTService = { userService: false, params: { tenantId, ...filters }, }), + cfcreate: (details, tenantId) => + Request({ + url: Urls.pt.cfcreate, + data: details, + useCache: false, + setTimeParam: false, + userService: true, + method: "POST", + params: {}, + auth: true, + }), + cfdefinitionsearch: ({ filters, auth }) => + Request({ + url: Urls.pt.cfdefinitionsearch, + useCache: false, + method: "POST", + auth: auth === false ? auth : true, + userService: auth === false ? auth : true, + data: {...filters}, + //params: { tenantId, ...filters }, + }), + cfsearch: ({ filters, auth }) => + Request({ + url: Urls.pt.cfsearch, + useCache: false, + method: "POST", + auth: auth === false ? auth : true, + userService: auth === false ? auth : true, + data: {...filters}, + //params: { tenantId, ...filters }, + }), }; // export const PTService = { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/WorkFlow.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/WorkFlow.js index 7f21fe72047..dbc76a1330f 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/WorkFlow.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/WorkFlow.js @@ -261,8 +261,12 @@ export const WorkflowService = { } catch (err) { } } - // HANDLING ACTION FOR NEW VEHICLE LOG FROM UI SIDE - const nextActions = location.pathname.includes("new-vehicle-entry") ? action_newVehicle : actionRolePair; + //Added the condition so that following filter can happen only for fsm and does not affect other module + let nextActions = []; + if(window.location.href?.includes("fsm")){ + // TAKING OUT CURRENT APPL STATUS + nextActions = location.pathname.includes("new-vehicle-entry") ? action_newVehicle : location.pathname.includes("dso") ? actionRolePair.filter((i)=> i.action !== "PAY") : actionRolePair; + } if (role !== "CITIZEN" && moduleCode === "PGR") { const onlyPendingForAssignmentStatusArray = timeline?.filter(e => e?.status === "PENDINGFORASSIGNMENT") diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/FSM/DriverDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/FSM/DriverDetails.js index 261769d5ff1..dc615b61bef 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/FSM/DriverDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/FSM/DriverDetails.js @@ -6,7 +6,7 @@ const getResponse = (data, vendorDetils) => { title: "ES_FSM_REGISTRY_DETAILS_DRIVER_DETAILS", values: [ { title: "ES_FSM_REGISTRY_DRIVER_NAME", value: data?.name }, - { title: "ES_FSM_REGISTRY_DRIVER_PHONE", value: data?.owner?.mobileNumber }, + // { title: "ES_FSM_REGISTRY_DRIVER_PHONE", value: data?.owner?.mobileNumber }, { title: "ES_FSM_REGISTRY_DRIVER_LICENSE", value: data?.licenseNumber }, { title: "ES_FSM_REGISTRY_DETAILS_VENDOR_NAME", @@ -22,7 +22,7 @@ const getResponse = (data, vendorDetils) => { const DriverDetails = async (tenantId, filters = {}) => { const { ids } = filters; const driverDetails = await FSMService.driverSearch(tenantId, filters); - const vendorDetails = await FSMService.vendorSearch(tenantId, { driverIds: ids, status: "ACTIVE" }); + const vendorDetails = await FSMService.vendorSearch(tenantId, { driverIds: ids }); const data = driverDetails.driver.map((data) => ({ driverData: data, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/FSM/DsoDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/FSM/DsoDetails.js index b0559082ec5..ea05354ae4d 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/FSM/DsoDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/FSM/DsoDetails.js @@ -38,7 +38,7 @@ const getDriverDetails = (drivers) => { id: driver?.id, values: [ { title: "ES_FSM_REGISTRY_DRIVER_NAME", value: driver?.name }, - { title: "ES_FSM_REGISTRY_DRIVER_PHONE", value: driver?.owner?.mobileNumber }, + // { title: "ES_FSM_REGISTRY_DRIVER_PHONE", value: driver?.owner?.mobileNumber }, { title: "ES_FSM_REGISTRY_DRIVER_LICENSE", value: driver?.licenseNumber }, { title: "ES_FSM_REGISTRY_DRIVER_STATUS", value: driver?.status }, ], diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/FSM/Search.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/FSM/Search.js index bd56dc4a15e..900ea0c1c73 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/FSM/Search.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/FSM/Search.js @@ -188,7 +188,7 @@ export const Search = { { title: "ES_APPLICATION_DETAILS_VEHICLE_NO", value: vehicle?.registrationNumber || "N/A" }, { title: "ES_APPLICATION_DETAILS_VEHICLE_CAPACITY", value: response?.vehicleCapacity || "N/A" }, { title: "ES_APPLICATION_DETAILS_POSSIBLE_SERVICE_DATE", value: displayServiceDate(response?.possibleServiceDate) || "N/A" }, - { title: "ES_APPLICATION_DETAILS_AMOUNT_RECEIVED", value: receivedPayment || "N/A" }, + // { title: "ES_APPLICATION_DETAILS_AMOUNT_RECEIVED", value: receivedPayment || "N/A" }, ], }, ]; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/FSM/VehicleDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/FSM/VehicleDetails.js index 0cca0264751..64ee144f5cc 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/FSM/VehicleDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/FSM/VehicleDetails.js @@ -24,7 +24,7 @@ const getResponse = (data, vendorDetails) => { const VehicleDetails = async (tenantId, filters = {}) => { const vehicleDetails = await FSMService.vehiclesSearch(tenantId, filters); const id = vehicleDetails?.vehicle?.[0]?.id - const vendorDetails = await FSMService.vendorSearch(tenantId, { vehicleIds: id, status: "ACTIVE" }); + const vendorDetails = await FSMService.vendorSearch(tenantId, { vehicleIds: id }); const data = vehicleDetails.vehicle.map((data) => ({ vehicleData: data, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js index e5249335b20..bfebef9f047 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/Ulb/index.js @@ -88,6 +88,26 @@ export const ULBService = { } return homeCity|| Digit.UserService.getUser()?.info?.permanentCity || ULBService.getStateId(); }, + + /** + * Custom method to get citizen's current selected city + * + * @author jagankumar-egov + * + * @example + * Digit.ULBService.getCitizenCurrentTenant() -> will return selected home city if not loggedin users city if not state tenant + * + * Digit.ULBService.getCitizenCurrentTenant(true) -> will return selected home city + * + * @returns {String} + */ + getCitizenCurrentTenant: (selectedCity = false) => { + const homeCity = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")?.code; + if (selectedCity) { + return homeCity; + } + return homeCity || Digit.UserService.getUser()?.info?.permanentCity || ULBService.getStateId(); + }, /** * Custom method to get all ulb's which the loggedin employee has access to * @@ -144,5 +164,5 @@ export const ULBService = { }); return filteredArray; } - } + }, }; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/dss/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/dss/index.js index 91fe019630b..121cf6d8211 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/dss/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/dss/index.js @@ -15,7 +15,7 @@ const amountFormatter = (value, denomination, t) => { } }; -export const formatter = (value, symbol, unit, commaSeparated = true, t) => { +export const formatter = (value, symbol, unit, commaSeparated = true, t, isDecimal) => { if (!value && value !== 0) return ""; switch (symbol) { case "amount": @@ -27,6 +27,9 @@ export const formatter = (value, symbol, unit, commaSeparated = true, t) => { if (!commaSeparated) { return parseInt(value); } + if(isDecimal) + return value; + const Nformatter = new Intl.NumberFormat("en-IN"); return Nformatter.format(Math.round(value)); case "percentage": diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/package.json index c2d667c4ff5..2cdc6dc78df 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-bills", - "version": "1.6.0", + "version": "1.7.0-beta.1", "description": "BILLS", "license": "MIT", "main": "dist/index.js", @@ -15,7 +15,7 @@ "prepublish": "yarn build" }, "dependencies": { - "@egovernments/digit-ui-react-components": "^1.6.0", + "@egovernments/digit-ui-react-components": "^1.7.0-beta.1", "react": "17.0.2", "react-dom": "17.0.2", "react-hook-form": "6.15.8", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/src/components/Search/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/src/components/Search/index.js index 55d80ba9cae..027601d15be 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/src/components/Search/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/src/components/Search/index.js @@ -70,7 +70,6 @@ const SearchApplication = ({ showTable, showLoader, isLoading, tenantId, t, onSu setValue("sortBy", args.id); setValue("sortOrder", args.desc ? "DESC" : "ASC"); }, []); - function onPageSizeChange(e) { setValue("limit", Number(e.target.value)); handleSubmit(onSubmit)(); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/package.json index 66f747add60..da66799fc8b 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-common", - "version": "1.6.1", + "version": "1.7.0-beta.1", "license": "MIT", "description": "Digit Common Payment Module", "main": "dist/index.js", @@ -15,8 +15,8 @@ "prepublish": "yarn build" }, "dependencies": { - "@egovernments/digit-ui-libraries": "1.6.0", - "@egovernments/digit-ui-react-components": "^1.6.0", + "@egovernments/digit-ui-libraries": "1.7.0-beta.1", + "@egovernments/digit-ui-react-components": "^1.7.0-beta.1", "react": "17.0.2", "react-dom": "17.0.2", "react-hook-form": "6.15.8", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/bills/routes/bill-details/bill-details.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/bills/routes/bill-details/bill-details.js index 66f6f048265..fc52a5226d6 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/bills/routes/bill-details/bill-details.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/bills/routes/bill-details/bill-details.js @@ -14,8 +14,8 @@ const BillDetails = ({ paymentRules, businessService }) => { const { workflow: wrkflow, tenantId: _tenantId, ConsumerName } = Digit.Hooks.useQueryParams(); const [bill, setBill] = useState(state?.bill); const tenantId = state?.tenantId || _tenantId || Digit.UserService.getUser().info?.tenantId; - if(wrkflow === "WNS" && consumerCode.includes("?")) - consumerCode = consumerCode.substring(0,consumerCode.indexOf("?")) + const propertyId = state?.propertyId; + if (wrkflow === "WNS" && consumerCode.includes("?")) consumerCode = consumerCode.substring(0, consumerCode.indexOf("?")); const { data, isLoading } = state?.bill ? { isLoading: false } : Digit.Hooks.useFetchPayment({ @@ -31,12 +31,20 @@ const BillDetails = ({ paymentRules, businessService }) => { {data : {uuid:[Useruuid]}}, { recordId: Useruuid, plainRequestFields: ["mobileNumber"] }, { - enabled: Useruuid ? true : false, - cacheTime: 100, - - } -] -const { isLoading : isUserLoading, data: userData, revalidate } = Digit.Hooks.useCustomAPIHook(...requestCriteria); + enabled: Useruuid ? true : false, + cacheTime: 100, + }, + ]; + + const { isLoading: isUserLoading, data: userData, revalidate } = Digit.Hooks.useCustomAPIHook(...requestCriteria); + + const { isLoading: isFSMLoading, isError, error, data: application, error: errorApplication } = Digit.Hooks.fsm.useApplicationDetail( + t, + tenantId, + consumerCode, + { enabled: pathname.includes("FSM") ? true : false }, + "CITIZEN" + ); let { minAmountPayable, isAdvanceAllowed } = paymentRules; minAmountPayable = wrkflow === "WNS" ? 100 : minAmountPayable; const billDetails = bill?.billDetails?.sort((a, b) => b.fromPeriod - a.fromPeriod)?.[0] || []; @@ -140,10 +148,9 @@ const { isLoading : isUserLoading, data: userData, revalidate } = Digit.Hooks.us paymentAmount, tenantId: billDetails.tenantId, name: bill.payerName, - mobileNumber: bill.mobileNumber && bill.mobileNumber?.includes("*") ? userData?.user?.[0]?.mobileNumber : bill.mobileNumber, - }); + mobileNumber: bill.mobileNumber && bill.mobileNumber?.includes("*") ? userData?.user?.[0]?.mobileNumber : bill.mobileNumber, }); } else { - history.push(`/digit-ui/citizen/payment/collect/${businessService}/${consumerCode}`, { paymentAmount, tenantId: billDetails.tenantId }); + history.push(`/digit-ui/citizen/payment/collect/${businessService}/${consumerCode}`, { paymentAmount, tenantId: billDetails.tenantId, propertyId: propertyId }); } }; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/payers-details/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/payers-details/index.js index 5c1b878bccb..cf1e9f97678 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/payers-details/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/payers-details/index.js @@ -5,17 +5,15 @@ import { RadioButtons, SubmitBar, BackButton, - CardLabel, - CardLabelDesc, - CardSectionHeader, - InfoBanner, Loader, TextInput, MobileNumber, + CheckBox, + CitizenConsentForm } from "@egovernments/digit-ui-react-components"; import { useTranslation } from "react-i18next"; -import { useForm, Controller } from "react-hook-form"; -import { useParams, useHistory, useLocation, Redirect } from "react-router-dom"; +import { useForm } from "react-hook-form"; +import { useParams, useHistory, useLocation } from "react-router-dom"; import { stringReplaceAll } from "../bills/routes/bill-details/utils"; const SelectPaymentType = (props) => { @@ -42,6 +40,8 @@ const SelectPaymentType = (props) => { const { workflow: wrkflow, tenantId: _tenantId, ConsumerName } = Digit.Hooks.useQueryParams(); const [bill, setBill] = useState(state?.bill); const tenantId = state?.tenantId || _tenantId || Digit.UserService.getUser().info?.tenantId; + const isLoggedIn = Digit.UserService.getUser() + const { data, isLoading } = state?.bill ? { isLoading: false } : Digit.Hooks.useFetchPayment({ tenantId, businessService, consumerCode }); @@ -70,10 +70,56 @@ const SelectPaymentType = (props) => { const { control, handleSubmit } = useForm(); const [canSubmit, setCanSubmit] = useState(false); const [mobileNumberError, setmobileNumberError] = useState(null); + const [isCheckBox, setIsCheckBox] = useState(false); + const [isCCFEnabled, setisCCFEnabled] = useState(false); + const [mdmsConfig, setMdmsConfig] = useState(""); + + const { isLoading: citizenConcentFormLoading, data:ccfData } = Digit.Hooks.useCustomMDMS(Digit.ULBService.getStateId(), "common-masters", [{ name: "CitizenConsentForm" }]); + + function setTermsAndPolicyDetails(e) { + setIsCheckBox(e.target.checked) + } + + const checkDisbaled = () => { + if (isCCFEnabled?.isCitizenConsentFormEnabled && !isLoggedIn?.access_token) { + const data = paymentType?.code !== optionSecound?.code ? false : userInfo ? false : !canSubmit; + let isEnabled = false + if (!data && isCheckBox) isEnabled = false; + else isEnabled = true; + return isEnabled; + } else { + return paymentType?.code !== optionSecound?.code ? false : userInfo ? false : !canSubmit + } + } + + useEffect(()=> { + if (ccfData?.["common-masters"]?.CitizenConsentForm?.[0]?.isCitizenConsentFormEnabled) { + setisCCFEnabled(ccfData?.["common-masters"]?.CitizenConsentForm?.[0]) + } + }, [ccfData]); + + const onLinkClick = (e) => { + setMdmsConfig(e.target.id) +} + + const checkLabels = () => { + return + {isCCFEnabled?.checkBoxLabels?.map((data, index) => { + return + {/* {index == 0 && "CCF"} */} + {data?.linkPrefix && {t(`${data?.linkPrefix}_`)}} + {data?.link && { onLinkClick(e) }} style={{ color: "#F47738", cursor: "pointer" }}>{t(`${data?.link}_`)}} + {data?.linkPostfix && {t(`${data?.linkPostfix}_`)}} + {(index == isCCFEnabled?.checkBoxLabels?.length - 1) && t("LABEL")} + + })} + + } + useEffect(() => { if (!bill && data) { - let requiredBill = data.Bill.filter((e) => e.consumerCode == consumerCode)[0]; + let requiredBill = data?.Bill?.filter((e) => e.consumerCode == consumerCode)[0]; setBill(requiredBill); } }, [isLoading]); @@ -115,7 +161,7 @@ const SelectPaymentType = (props) => { } }; - if (isLoading || isUserLoading) { + if (isLoading || isUserLoading || citizenConcentFormLoading) { return ; } @@ -158,9 +204,32 @@ const SelectPaymentType = (props) => { ) : null} + + {isCCFEnabled?.isCitizenConsentFormEnabled && !isLoggedIn?.access_token &&
+ + + +
} + diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/payment-type/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/payment-type/index.js index ab208bdd9e2..cdbbe60fe6f 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/payment-type/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/payment-type/index.js @@ -22,7 +22,7 @@ export const SelectPaymentType = (props) => { const { state = {} } = useLocation(); const userInfo = Digit.UserService.getUser(); const [showToast, setShowToast] = useState(null); - const { tenantId: __tenantId, authorization, workflow: wrkflow, consumerCode: connectionNo } = Digit.Hooks.useQueryParams(); + const { tenantId: __tenantId, authorization, workflow: wrkflow , consumerCode : connectionNo } = Digit.Hooks.useQueryParams(); const paymentAmount = state?.paymentAmount; const { t } = useTranslation(); const history = useHistory(); @@ -30,6 +30,7 @@ export const SelectPaymentType = (props) => { // const menu = ["AXIS"]; let { consumerCode, businessService } = useParams(); const tenantId = state?.tenantId || __tenantId || Digit.ULBService.getCurrentTenantId(); + const propertyId = state?.propertyId; const stateTenant = Digit.ULBService.getStateId(); const { control, handleSubmit } = useForm(); const { data: menu, isLoading } = Digit.Hooks.useCommonMDMS(stateTenant, "DIGIT-UI", "PaymentGateway"); @@ -38,7 +39,7 @@ export const SelectPaymentType = (props) => { {} ); if (window.location.href.includes("ISWSCON") || wrkflow === "WNS") consumerCode = decodeURIComponent(consumerCode); - if (wrkflow === "WNS") consumerCode = stringReplaceAll(consumerCode, "+", "/"); + if( wrkflow === "WNS") consumerCode = stringReplaceAll(consumerCode,"+","/") useEffect(() => { if (paymentdetails?.Bill && paymentdetails.Bill.length == 0) { setShowToast({ key: true, label: "CS_BILL_NOT_FOUND" }); @@ -73,14 +74,9 @@ export const SelectPaymentType = (props) => { tenantId: billDetails?.tenantId, }, // success - callbackUrl: - window.location.href.includes("mcollect") || wrkflow === "WNS" - ? `${window.location.protocol}//${window.location.host}/digit-ui/citizen/payment/success/${businessService}/${ - wrkflow === "WNS" ? encodeURIComponent(consumerCode) : consumerCode - }/${tenantId}?workflow=${wrkflow === "WNS" ? wrkflow : "mcollect"}` - : `${window.location.protocol}//${window.location.host}/digit-ui/citizen/payment/success/${businessService}/${ - wrkflow === "WNS" ? encodeURIComponent(consumerCode) : consumerCode - }/${tenantId}`, + callbackUrl: window.location.href.includes("mcollect") || wrkflow === "WNS" + ? `${window.location.protocol}//${window.location.host}/digit-ui/citizen/payment/success/${businessService}/${wrkflow === "WNS"? encodeURIComponent(consumerCode):consumerCode}/${tenantId}?workflow=${wrkflow === "WNS"? wrkflow : "mcollect"}` + : `${window.location.protocol}//${window.location.host}/digit-ui/citizen/payment/success/${businessService}/${wrkflow === "WNS"? encodeURIComponent(consumerCode):consumerCode}/${tenantId}?propertyId=${propertyId}`, additionalDetails: { isWhatsapp: false, }, @@ -119,10 +115,7 @@ export const SelectPaymentType = (props) => {
{t("PAYMENT_CS_TOTAL_AMOUNT_DUE")} - - {" "} - ₹ {paymentAmount !== undefined ? Number(paymentAmount).toFixed(2) : Number(billDetails?.totalAmount).toFixed(2)} - + ₹ { paymentAmount !== undefined ? Number(paymentAmount).toFixed(2) : Number(billDetails?.totalAmount).toFixed(2)}
{t("PAYMENT_CS_SELECT_METHOD")} {menu?.length && ( diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/response/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/response/index.js index 5e549a8ec04..375ff645995 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/response/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/response/index.js @@ -16,7 +16,7 @@ export const SuccessfulPayment = (props)=>{ const WrapPaymentComponent = (props) => { const { t } = useTranslation(); const queryClient = useQueryClient(); - const { eg_pg_txnid: egId, workflow: workflw } = Digit.Hooks.useQueryParams(); + const { eg_pg_txnid: egId, workflow: workflw, propertyId } = Digit.Hooks.useQueryParams(); const [printing, setPrinting] = useState(false); const [allowFetchBill, setallowFetchBill] = useState(false); const { businessService: business_service, consumerCode, tenantId } = useParams(); @@ -90,6 +90,7 @@ export const SuccessfulPayment = (props)=>{ const isMobile = window.Digit.Utils.browser.isMobile(); + if (isError || !payments || !payments.Payments || payments.Payments.length === 0 || data.txnStatus === "FAILURE") { return ( @@ -100,7 +101,7 @@ export const SuccessfulPayment = (props)=>{ successful={false} /> {t("CS_PAYMENT_FAILURE_MESSAGE")} - {business_service !== "PT" ? ( + {!(business_service?.includes("PT")) ? ( @@ -109,6 +110,9 @@ export const SuccessfulPayment = (props)=>{ + {/* {business_service?.includes("PT") &&
+ +
} */}
{t("CORE_COMMON_GO_TO_HOME")}
@@ -120,7 +124,7 @@ export const SuccessfulPayment = (props)=>{ const paymentData = data?.payments?.Payments[0]; const amount = reciept_data?.paymentDetails?.[0]?.totalAmountPaid; - const transactionDate = paymentData.transactionDate; + const transactionDate = paymentData?.transactionDate; const printCertificate = async () => { //const tenantId = Digit.ULBService.getCurrentTenantId(); const state = tenantId; @@ -278,7 +282,7 @@ export const SuccessfulPayment = (props)=>{ } else if (business_service?.includes("WS") || business_service?.includes("SW")) { bannerText = t(`CITIZEN_SUCCESS_${paymentData?.paymentDetails[0].businessService.replace(/\./g, "_")}_WS_PAYMENT_MESSAGE`); } else { - bannerText = `CITIZEN_SUCCESS_${paymentData?.paymentDetails[0]?.businessService.replace(/\./g, "_")}_PAYMENT_MESSAGE`; + bannerText = paymentData?.paymentDetails[0]?.businessService ? `CITIZEN_SUCCESS_${paymentData?.paymentDetails[0]?.businessService.replace(/\./g, "_")}_PAYMENT_MESSAGE` : t("CITIZEN_SUCCESS_UC_PAYMENT_MESSAGE"); } } @@ -329,7 +333,7 @@ export const SuccessfulPayment = (props)=>{ rowContainerStyle={rowContainerStyle} last label={t("CS_PAYMENT_AMOUNT_PENDING")} - text={`₹ ${reciept_data?.paymentDetails?.[0]?.totalDue - reciept_data?.paymentDetails?.[0]?.totalAmountPaid}`} + text={(reciept_data?.paymentDetails?.[0]?.totalDue && reciept_data?.paymentDetails?.[0]?.totalAmountPaid ) ? `₹ ${reciept_data?.paymentDetails?.[0]?.totalDue - reciept_data?.paymentDetails?.[0]?.totalAmountPaid}` : `₹ ${0}`} /> )} @@ -338,7 +342,7 @@ export const SuccessfulPayment = (props)=>{ rowContainerStyle={rowContainerStyle} last label={t(ommitRupeeSymbol ? "CS_PAYMENT_AMOUNT_PAID_WITHOUT_SYMBOL" : "CS_PAYMENT_AMOUNT_PAID")} - text={"₹ " + reciept_data?.paymentDetails?.[0]?.totalAmountPaid} + text={reciept_data?.paymentDetails?.[0]?.totalAmountPaid ? ("₹ " + reciept_data?.paymentDetails?.[0]?.totalAmountPaid) : `₹ 0` } /> {(business_service !== "PT" || workflw) && ( { ) : null} - {!(business_service == "TL") && } - {!(business_service == "TL") && ( + {business_service?.includes("PT") &&
+ +
} + {business_service?.includes("PT") ? ( +
+ {t("CS_DOWNLOAD_RECEIPT")} +
+ ) : null} + {!(business_service == "TL") || !(business_service?.includes("PT")) && } + {!(business_service == "TL") || !(business_service?.includes("PT")) && (
{t("CORE_COMMON_GO_TO_HOME")}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/employee/payment-collect/Bill-details/billDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/employee/payment-collect/Bill-details/billDetails.js index c11a39a8d17..cad951192da 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/employee/payment-collect/Bill-details/billDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/employee/payment-collect/Bill-details/billDetails.js @@ -355,20 +355,25 @@ const BillDetails = ({ businessService, consumerCode, _amount, onChange }) => { textStyle={{ textAlign: "left" }} text={"₹ " + Number(getAmountPerTrip()).toFixed(2)} /> - - {getAdvanceAmountPaid ? ( - - ) : ( - - )} + + {!applicationData?.paymentPreference && + (getAdvanceAmountPaid ? ( + + ) : ( + + ))} {applicationData?.applicationStatus !== "PENDING_APPL_FEE_PAYMENT" ? ( { const { data: paymentdetails, isLoading } = Digit.Hooks.useFetchPayment({ tenantId: tenantId, consumerCode, businessService }); const bill = paymentdetails?.Bill ? paymentdetails?.Bill[0] : {}; - const { data: applicationData } = Digit.Hooks.fsm.useSearch(tenantId, { applicationNos: consumerCode }, { staleTime: Infinity, enabled: businessService?.toUpperCase()?.includes("FSM") ? true : false }); + const { data: applicationData } = Digit.Hooks.fsm.useSearch( + tenantId, + { applicationNos: consumerCode }, + { staleTime: Infinity, enabled: businessService?.toUpperCase()?.includes("FSM") ? true : false } + ); const advanceBill = applicationData?.advanceAmount; + // const { data: applicationData } = Digit.Hooks.fsm.useSearch(tenantId, { applicationNos: consumerCode }, { staleTime: Infinity }); + // const advanceBill = applicationData?.advanceAmount; + // const { isLoading: storeLoading, data: store } = Digit.Services.useStore({ // stateCode: props.stateCode, // moduleCode: businessService.split(".")[0], @@ -80,7 +87,9 @@ export const CollectPayment = (props) => { data.paidBy = data.paidBy.code; if ( - BillDetailsFormConfig({ consumerCode, businessService }, t)[ModuleWorkflow ? (businessService === "SW" && ModuleWorkflow === "WS"? businessService : ModuleWorkflow) : businessService] && + BillDetailsFormConfig({ consumerCode, businessService }, t)[ + ModuleWorkflow ? (businessService === "SW" && ModuleWorkflow === "WS" ? businessService : ModuleWorkflow) : businessService + ] && !data?.amount?.paymentAllowed ) { let action = @@ -117,7 +126,7 @@ export const CollectPayment = (props) => { paidBy: data.paidBy, }, }; - if (advanceBill !== null && applicationData?.applicationStatus === "PENDING_APPL_FEE_PAYMENT") { + if (advanceBill !== null && applicationData?.applicationStatus === "PENDING_APPL_FEE_PAYMENT" && !applicationData.paymentPreference) { (recieptRequest.Payment.paymentDetails[0].totalAmountPaid = advanceBill), (recieptRequest.Payment.totalAmountPaid = advanceBill), (recieptRequest.Payment.totalDue = bill.totalAmount); @@ -175,6 +184,9 @@ export const CollectPayment = (props) => { const resposne = await Digit.PaymentService.createReciept(tenantId, recieptRequest); queryClient.invalidateQueries(); history.push( + IsDisconnectionFlow ? `${props.basePath}/success/${businessService}/${resposne?.Payments[0]?.paymentDetails[0]?.receiptNumber.replace(/\//g, "%2F")}/${ + resposne?.Payments[0]?.paymentDetails[0]?.bill?.consumerCode + }?IsDisconnectionFlow=${IsDisconnectionFlow}` : `${props.basePath}/success/${businessService}/${resposne?.Payments[0]?.paymentDetails[0]?.receiptNumber.replace(/\//g, "%2F")}/${ resposne?.Payments[0]?.paymentDetails[0]?.bill?.consumerCode }?IsDisconnectionFlow=${IsDisconnectionFlow}` @@ -218,7 +230,7 @@ export const CollectPayment = (props) => { select={(d) => { if (d.name == paidByMenu[0].name) { props.setValue("payerName", bill?.payerName); - // SM-1953: commenting to resolve showing mobile number when selecting the owner option + // SM-1953: commenting to resolve showing mobile number when selecting the owner option // props.setValue("payerMobile", bill?.mobileNumber); } else { props.setValue("payerName", ""); @@ -235,7 +247,7 @@ export const CollectPayment = (props) => { { label: t("PAYMENT_PAYER_NAME_LABEL"), isMandatory: true, - disable : selectedPaidBy?.code === "OWNER" && (bill?.payerName || formState?.payerName) ? true : false, + disable: selectedPaidBy?.code === "OWNER" && (bill?.payerName || formState?.payerName) ? true : false, type: "text", populators: { name: "payerName", @@ -258,7 +270,7 @@ export const CollectPayment = (props) => { required: true, pattern: /^[6-9]\d{9}$/, }, - error: t("PAYMENT_INVALID_MOBILE"), + error: t("CORE_COMMON_APPLICANT_MOBILE_NUMBER_INVALID"), className: "payment-form-text-input-correction", }, }, @@ -300,7 +312,9 @@ export const CollectPayment = (props) => { const getFormConfig = () => { if ( - BillDetailsFormConfig({ consumerCode, businessService }, t)[ModuleWorkflow ? (businessService === "SW" && ModuleWorkflow === "WS"? businessService : ModuleWorkflow) : businessService] || + BillDetailsFormConfig({ consumerCode, businessService }, t)[ + ModuleWorkflow ? (businessService === "SW" && ModuleWorkflow === "WS" ? businessService : ModuleWorkflow) : businessService + ] || ModuleWorkflow || businessService === "TL" || businessService.includes("ONE_TIME_FEE") @@ -309,8 +323,12 @@ export const CollectPayment = (props) => { } let conf = config.concat(formConfigMap[formState?.paymentMode?.code] || []); conf = conf?.concat(cashConfig); - return BillDetailsFormConfig({ consumerCode, businessService }, t)[ModuleWorkflow ? (businessService === "SW" && ModuleWorkflow === "WS"? businessService : ModuleWorkflow) : businessService] - ? BillDetailsFormConfig({ consumerCode, businessService }, t)[ModuleWorkflow ? (businessService === "SW" && ModuleWorkflow === "WS"? businessService : ModuleWorkflow) : businessService].concat(conf) + return BillDetailsFormConfig({ consumerCode, businessService }, t)[ + ModuleWorkflow ? (businessService === "SW" && ModuleWorkflow === "WS" ? businessService : ModuleWorkflow) : businessService + ] + ? BillDetailsFormConfig({ consumerCode, businessService }, t)[ + ModuleWorkflow ? (businessService === "SW" && ModuleWorkflow === "WS" ? businessService : ModuleWorkflow) : businessService + ].concat(conf) : conf; }; const checkFSM = window.location.href.includes("FSM"); @@ -329,7 +347,7 @@ export const CollectPayment = (props) => { onSubmit={onSubmit} formState={formState} defaultValues={getDefaultValues()} - isDisabled={IsDisconnectionFlow ? false : (bill?.totalAmount ? !bill.totalAmount > 0 : true)} + isDisabled={IsDisconnectionFlow ? false : bill?.totalAmount ? !bill.totalAmount > 0 : true} // isDisabled={BillDetailsFormConfig({ consumerCode }, t)[businessService] ? !} onFormValueChange={(setValue, formValue) => { if (!isEqual(formValue.paymentMode, selectedPaymentMode)) { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/commonPt/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/commonPt/package.json index f51e1937e6c..0eba13e3562 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/commonPt/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/commonPt/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-commonpt", - "version": "1.6.0", + "version": "1.7.0-beta.1", "license": "MIT", "description": "Digit PT Light weight Module", "main": "dist/index.js", @@ -19,7 +19,7 @@ "react-router-dom": "5.3.0" }, "dependencies": { - "@egovernments/digit-ui-react-components": "^1.6.0", + "@egovernments/digit-ui-react-components": "^1.7.0-beta.1", "lodash.merge": "^4.6.2", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/package.json index 3d0ca8d155f..dc731b0b8f7 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-core", - "version": "1.6.0", + "version": "1.7.0-beta.1", "license": "MIT", "description": "Digit App Core Module contains all core components", "main": "dist/index.js", @@ -15,7 +15,7 @@ "prepublish": "yarn build" }, "dependencies": { - "@egovernments/digit-ui-react-components": "^1.6.0", + "@egovernments/digit-ui-react-components": "^1.7.0-beta.1", "react": "17.0.2", "react-dom": "17.0.2", "react-i18next": "11.16.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/Module.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/Module.js index 8c7393a3020..08915d6e7eb 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/Module.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/Module.js @@ -6,6 +6,8 @@ import { getI18n } from "react-i18next"; import { Body, Loader } from "@egovernments/digit-ui-react-components"; import { DigitApp } from "./App"; import SelectOtp from "./pages/citizen/Login/SelectOtp"; +import AcknowledgementCF from "./components/AcknowledgementCF"; +import CitizenFeedback from "./components/CitizenFeedback"; import getStore from "./redux/store"; import ErrorBoundary from "./components/ErrorBoundaries"; @@ -108,6 +110,8 @@ export const DigitUI = ({ stateCode, registry, enabledModules, moduleReducers }) const componentsToRegister = { SelectOtp, + AcknowledgementCF, + CitizenFeedback, }; export const initCoreComponents = () => { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/AcknowledgementCF.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/AcknowledgementCF.js new file mode 100644 index 00000000000..2c8b0209edf --- /dev/null +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/AcknowledgementCF.js @@ -0,0 +1,57 @@ +import { Banner, Card, CardText, LinkButton, Loader, Row, StatusTable, SubmitBar } from "@egovernments/digit-ui-react-components"; +import React, { useEffect } from "react"; +import { useTranslation } from "react-i18next"; +import { Link, useLocation } from "react-router-dom"; + +const GetActionMessage = (props) => { + const { t } = useTranslation(); + if (props?.isSuccess) { + return t("CS_PROPERTY_FEEDBACK_SUCCESS"); + } + else { + return t("CS_PROPERTY_FEEDBACK_FAILED") + } +}; + +const rowContainerStyle = { + padding: "4px 0px", + justifyContent: "space-between", +}; + +const BannerPicker = (props) => { + return ( + + ); +}; + +const AcknowledgementCF = ({ data, onSuccess }) => { + const { t } = useTranslation(); + const tenantId = Digit.ULBService.getCurrentTenantId(); + const location = useLocation(); + const { data: storeData } = Digit.Hooks.useStore.getInitData(); + const { tenants } = storeData || {}; + const isMobile = window.Digit.Utils.browser.isMobile(); + + return ( +
+ + + {location.state?.result?.Service?.[0] && {t("CS_CF_FEEDBACK_RESPONSE")}} + {!(location.state?.result?.Service?.[0]) && {t("CS_FILE_PROPERTY_FAILED_RESPONSE")}} +
+ + + +
+ +
+ ); +}; + +export default AcknowledgementCF; \ No newline at end of file diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/CitizenFeedback.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/CitizenFeedback.js new file mode 100644 index 00000000000..d9b80603be3 --- /dev/null +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/CitizenFeedback.js @@ -0,0 +1,168 @@ +import React, { useCallback, useEffect, useState } from "react"; +import { useHistory, Link } from "react-router-dom"; +import { useForm } from "react-hook-form"; +import { useTranslation } from "react-i18next"; +import { RatingAndFeedBack } from "../config/RatingAndFeedback"; + +import { Card, CardHeader, CardLabel, CheckBox, TextArea, SubmitBar, Rating, CloseSvg, Loader, CardText, CardLabelError } from "@egovernments/digit-ui-react-components"; + +const CitizenFeedback = ({popup = false, onClose, setShowToast, data}) => { + const { t } = useTranslation(); + const history = useHistory(); + const user = Digit.UserService.getUser(); + let {redirectedFrom, propertyId, acknowldgementNumber, creationReason, tenantId, locality} = Digit.Hooks.useQueryParams(); + const isMobile = window.Digit.Utils.browser.isMobile(); + tenantId = tenantId || Digit.ULBService.getCurrentTenantId(); + const stateId = Digit.ULBService.getStateId(); + + //uncomment this once mdms updated in QA + const { data: RatingAndFeedBack, isLoading: RatingAndFeedBackLoading } = Digit.Hooks.pt.useRatingAndFeedbackMDMS.RatingAndFeedBack(stateId); + + const [comment, setComment] = useState(""); + const [rating, setRating] = useState(0); + + //uncomment this once mdms updated in QA + if (RatingAndFeedBackLoading) { + return ; + } + + const onComments = (e) => { + setComment(e.target.value); + }; + + const feedback = (e, ref, index) => { + setRating(index); + }; + + const onSubmit = () => { + + let formData = {} + + let ServiceDefinitionCriteria = { + "tenantId": data?.Properties?.[0]?.tenantId || tenantId, + "code": [`PT_${redirectedFrom?.includes("payment") ? "PAYMENT" : (creationReason || data?.Properties?.[0]?.creationReason)}`], + "module": ["PT"] + } + + Digit.PTService.cfdefinitionsearch({filters : {ServiceDefinitionCriteria}}).then((result1, err) => { + + if(result1?.ServiceDefinition?.length > 0){ + formData = { + "tenantId": data?.Properties?.[0]?.tenantId || tenantId, + "serviceDefId": result1?.ServiceDefinition?.[0]?.id, + "isActive": true, + "attributes": [ + { + "attributeCode": "consumerCode", + "value": propertyId || data?.Properties?.[0]?.propertyId, + "additionalDetails": {} + }, + { + "attributeCode": "rating", + "value": rating, + "additionalDetails": {} + }, + { + "attributeCode": "comments", + "value": comment, + "additionalDetails": {} + }, + { + "attributeCode": "channel", + "value": "Online", + "additionalDetails": {} + } + ], + "additionalDetails": { + locality: locality || data?.Properties?.[0]?.address?.locality?.code || "", + }, + "accountId" : user?.info?.uuid, + //"clientId": result1?.ServiceDefinition?.[0]?.clientId + } + + //condition for create formdata according to bussiness service + formData = {...formData, referenceId : acknowldgementNumber || data?.Properties?.[0]?.acknowldgementNumber} + + + Digit.PTService.cfcreate({ Service: {...formData} }, tenantId) + .then((result, err) => { + if(result?.Service?.length > 0){ + if(popup) + { onClose(false); + setShowToast({ key: false, label: "PT_FEEDBACK_SUBMITTED_SUCCESSFULLY" }); + } + else + history.push({pathname:"/digit-ui/citizen/feedback-acknowledgement", + state: {rating,comment,result}}) + + } + }) + .catch((e) => { + setShowToast({ key: "error", label:`${e?.response?.data?.Errors[0]?.message}` }); + //setError(e?.response?.data?.Errors[0]?.message || null); + }); + } + }) + + }; + + + const getCardHeaderAndText = (type) => { + //this is used if need to show default card text and header in pop up : removing the same for now + // if(type === "Header" && popup) + // return "PT_RATE_HELP_TEXT"; + // else if(type === "Text" && popup) + // return "PT_RATE_TEXT"; + let tempObject = RatingAndFeedBack?.enabledScreensList?.filter((ob) => ob?.module === "PT" && (redirectedFrom?.includes(ob?.screenfrom) || ob?.bussinessService?.includes(data?.Properties?.[0]?.creationReason)))?.[0] + if(type === "Header") + return tempObject?.cardHeader; + else if(type === "Text") + { + return tempObject?.cardText; + } + } + + const getCommentHeader = () => { + return RatingAndFeedBack?.headerByRating?.filter((ob) => rating >= ob?.minvalue && rating <= ob?.maxvalue)?.[0]?.code || t("CS_WHAT_WENT_WRONG"); + } + + const getCommentCheck = () => { + if(comment && comment?.length < 64) + return true; + else if(rating) + return false; + else + return true; + } + + return ( + +
+ +
+ {t(getCardHeaderAndText("Header")) || t(`PT_RATE_HELP_TEXT`)} + {popup && onClose(false)}> + + } +
+ {t(getCardHeaderAndText("Text"),{acknowldgementNumber : acknowldgementNumber || data?.Properties?.[0]?.acknowldgementNumber,propertyId : propertyId || data?.Properties?.[0]?.propertyId}) ||t(`PT_RATE_TEXT`)} + feedback(e, ref, i)} /> + {rating !== 0 &&
+ {t(getCommentHeader())} + + {comment && comment?.length < 64 && {t("CS_MIN_LENGTH_64")}} +
} + + {!popup &&
+ {t("CS_GO_BACK_HOME")} +
} + +
+ + ); +}; + +export default CitizenFeedback; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/EmployeeSideBar.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/EmployeeSideBar.js index 58e96c241c3..82698e20e9a 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/EmployeeSideBar.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/EmployeeSideBar.js @@ -2,6 +2,8 @@ import React, { useRef, useEffect, useState } from "react"; import SubMenu from "./SubMenu"; import { Loader, SearchIcon } from "@egovernments/digit-ui-react-components"; import { useTranslation } from "react-i18next"; +import NavItem from "./NavItem"; +import _, { findIndex } from "lodash"; const EmployeeSideBar = () => { const sidebarRef = useRef(null); @@ -38,6 +40,12 @@ const EmployeeSideBar = () => { const configEmployeeSideBar = {}; + //creating the object structure from mdms value for easy iteration + let configEmployeeSideBar1 = {}; + data?.actions?.filter((e) => e.url === "url")?.forEach((item) => { + _.set(configEmployeeSideBar1,item.path,{...item}) + }) + data?.actions .filter((e) => e.url === "url") .forEach((item) => { @@ -61,6 +69,23 @@ const EmployeeSideBar = () => { } }); let res = []; + + //method is used for restructing of configEmployeeSideBar1 nested object into nested array object + function restructuringOfConfig (tempconfig){ + const result = []; + for(const key in tempconfig){ + const value= tempconfig[key]; + if(typeof value === "object" && !(value?.id)){ + const children = restructuringOfConfig(value); + result.push({label : key,children, icon:children?.[0]?.icon, to:""}); + } + else{ + result.push({label: key, value, icon:value?.leftIcon, to: key === "Home" ? "/digit-ui/employee" : value?.navigationURL}); + } + } + + return result + } const splitKeyValue = () => { const keys = Object.keys(configEmployeeSideBar); keys.sort((a, b) => a.orderNumber - b.orderNumber); @@ -104,6 +129,19 @@ const EmployeeSideBar = () => { { res.sort((a,b) => a.moduleName.localeCompare(b.moduleName)); } + //reverting the newsidebar change for now, in order to solve ndss login issue + //let newconfig = restructuringOfConfig(configEmployeeSideBar1); + //below lines are used for shifting home object to first place + // newconfig.splice(newconfig.findIndex((ob) => ob?.label === ""),1); + // newconfig.sort((a,b) => a.label.localeCompare(b.label)); + // const fndindex = newconfig?.findIndex((el) => el?.label === "Home"); + // const homeitem = newconfig.splice(fndindex,1); + // newconfig.unshift(homeitem?.[0]); + // return ( + // newconfig.map((item, index) => { + // return ; + // }) + // ); return res?.map((item, index) => { return ; }); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/NavItem.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/NavItem.js new file mode 100644 index 00000000000..1247e290415 --- /dev/null +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/NavItem.js @@ -0,0 +1,79 @@ +import React from 'react'; +import { NavLink } from 'react-router-dom'; +import NavItemHeader from './NavItemHeader'; +import { + HomeIcon, + ComplaintIcon, + BPAHomeIcon, + PropertyHouse, + CaseIcon, + ReceiptIcon, + PersonIcon, + DocumentIconSolid, + DropIcon, + CollectionsBookmarIcons, + FinanceChartIcon, + CollectionIcon, +} from "@egovernments/digit-ui-react-components"; +import ReactTooltip from 'react-tooltip'; +import { useTranslation } from 'react-i18next'; + +const NavItem = props => { + let { label, icon, to, children } = props.item; + const { t } = useTranslation(); + const IconsObject = { + home: , + announcement: , + business: , + store: , + assignment: , + receipt: , + "business-center": , + description: , + "water-tap": , + "collections-bookmark": , + "insert-chart": , + edcr: , + collections: , + }; + const leftIconArray = icon?.split?.(":")?.[1]; + const leftIcon = IconsObject[leftIconArray] || IconsObject.collections; + const iconArr=icon?.leftIcon?.split?.(":")|| leftIcon?.split?.(":"); + if(iconArr?.[0]=='dynamic'){ + var IconComp = require("@egovernments/digit-ui-react-components")?.[iconArr?.[1]]; + leftIcon=IconComp?:leftIcon; + } + const getModuleName = label?.replace(/[ -]/g, "_").toUpperCase(); + const appendTranslate = t(`ACTION_TEST_${getModuleName.toUpperCase()}`); + const trimModuleName = t(appendTranslate?.length > 20 ? appendTranslate.substring(0, 20) + "..." : appendTranslate); + + if (children) { + return ; + } + + return ( +
+ +
+
+ {leftIcon /*className={style.navIcon}*/ } +
+ {trimModuleName} + {trimModuleName?.includes("...") && + {t(`ACTION_TEST_${getModuleName}`)} + } +
+
+
+ + +
+ ); +}; + +export default NavItem; \ No newline at end of file diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/NavItemHeader.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/NavItemHeader.js new file mode 100644 index 00000000000..3ecf8bfab6d --- /dev/null +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/NavItemHeader.js @@ -0,0 +1,135 @@ +import React, { useState } from 'react'; +import { NavLink, useLocation } from 'react-router-dom'; +import { + ArrowForward, + ArrowVectorDown, + ArrowDirection, + HomeIcon, + ComplaintIcon, + BPAHomeIcon, + PropertyHouse, + CaseIcon, + ReceiptIcon, + PersonIcon, + DocumentIconSolid, + DropIcon, + CollectionsBookmarIcons, + FinanceChartIcon, + CollectionIcon, +} from "@egovernments/digit-ui-react-components"; +import ReactTooltip from "react-tooltip"; +import { useTranslation } from 'react-i18next'; + +const resolveLinkPath = (childTo, parentTo) => `${parentTo}/${childTo}`; + +const NavItemHeader = props => { + const { item } = props; + const [expanded, setExpand] = useState( + /*location.pathname.includes(headerToPath)*/ false + ); + let { label, icon, to: headerToPath, children } = item; + const { t } = useTranslation(); + const location = useLocation(); + const getOrigin = window.location.origin + const IconsObject = { + home: , + announcement: , + business: , + store: , + assignment: , + receipt: , + "business-center": , + description: , + "water-tap": , + "collections-bookmark": , + "insert-chart": , + edcr: , + collections: , + }; + const leftIconArray = icon?.split?.(":")?.[1]; + const leftIcon = IconsObject[leftIconArray] || IconsObject.collections; + const iconArr=item?.icon?.leftIcon?.split?.(":")|| item?.leftIcon?.split?.(":"); + if(iconArr?.[0]=='dynamic'){ + var IconComp = require("@egovernments/digit-ui-react-components")?.[iconArr?.[1]]; + leftIcon=IconComp?:leftIcon; + } + const getModuleName = label?.replace(/[ -]/g, "_").toUpperCase(); + const appendTranslate = t(`ACTION_TEST_${getModuleName.toUpperCase()}`); + const trimModuleName = t(appendTranslate?.length > 20 ? appendTranslate.substring(0, 20) + "..." : appendTranslate); + + const onExpandChange = e => { + e.preventDefault(); + setExpand(expanded => !expanded); + }; + + return ( + + + + {expanded && ( +
+ {children.map((item, index) => { + const key = `${item.label}-${index}`; + + const { label, icon, children } = item; + const leftIconArray = icon?.split?.(":")?.[1]; + const leftIcon = IconsObject[leftIconArray] || IconsObject.collections; + const getModuleName = label?.replace(/[ -]/g, "_").toUpperCase(); + const appendTranslate = t(`ACTION_TEST_${getModuleName.toUpperCase()}`); + const trimModuleName = t(appendTranslate?.length > 20 ? appendTranslate.substring(0, 20) + "..." : appendTranslate); + + if (children) { + return ( +
+ +
+ ); + } + + return ( + +
+ {trimModuleName} + {trimModuleName?.includes("...") && + {t(`ACTION_TEST_${getModuleName}`)} + } +
+ + ); + })} +
+ )} + + ); +}; + +export default NavItemHeader; \ No newline at end of file diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/config/RatingAndFeedback.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/config/RatingAndFeedback.js new file mode 100644 index 00000000000..bfbe5337b63 --- /dev/null +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/config/RatingAndFeedback.js @@ -0,0 +1,45 @@ +export const RatingAndFeedBack = { + isCitizenRatingEnabled : true, + headerByRating: [ + { + minvalue : 1, + maxvalue : 3, + code : "CS_WHAT_WENT_WRONG" + }, + { + minvalue : 4, + maxvalue : 5, + code : "CS_WHAT_WENT_GOOD" + } + ], + enabledScreensList:[ + { + module : "PT", + bussinessService : "PT_CREATE", + screenfrom : "pt/property/new-application/acknowledgement", + cardHeader : "PT_RATE_HELP_TEXT_CREATE", + cardText : "PT_RATE_CARD_TEXT_CREATE", + }, + { + module : "PT", + bussinessService : "PT_MUTATION", + screenfrom : "pt/property/property-mutation/acknowledgement", + cardHeader : "PT_RATE_HELP_TEXT_MUTATE", + cardText : "PT_RATE_CARD_TEXT_MUTATE", + }, + { + module : "PT", + bussinessService : "PT_UPDATE", + screenfrom : "pt/property/edit-application/acknowledgement", + cardHeader : "PT_RATE_HELP_TEXT_UPDATE", + cardText : "PT_RATE_CARD_TEXT_UPDATE", + }, + { + module : "PT", + bussinessService : "PT", + screenfrom : "digit-ui/citizen/payment/success", + cardHeader : "PT_RATE_HELP_TEXT_PAY", + cardText : "PT_RATE_CARD_TEXT_PAY", + } + ] +} \ No newline at end of file diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/SelectMobileNumber.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/SelectMobileNumber.js index 10981c4250a..91979ed32cb 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/SelectMobileNumber.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/SelectMobileNumber.js @@ -1,18 +1,86 @@ -import React from "react"; -import { CardText, FormStep } from "@egovernments/digit-ui-react-components"; +import React, { useState, useEffect } from "react"; +import { CardText, FormStep, CitizenConsentForm, Loader, CheckBox } from "@egovernments/digit-ui-react-components"; import { Link } from "react-router-dom"; const SelectMobileNumber = ({ t, onSelect, showRegisterLink, mobileNumber, onMobileChange, config, canSubmit }) => { + + const [isCheckBox, setIsCheckBox] = useState(false); + const [isCCFEnabled, setisCCFEnabled] = useState(false); + const [mdmsConfig, setMdmsConfig] = useState(""); + + const { isLoading, data } = Digit.Hooks.useCustomMDMS(Digit.ULBService.getStateId(), "common-masters", [{ name: "CitizenConsentForm" }]); + + function setTermsAndPolicyDetails(e) { + setIsCheckBox(e.target.checked) + } + + const checkDisbaled = () => { + if (isCCFEnabled?.isCitizenConsentFormEnabled) { + return !(mobileNumber.length === 10 && canSubmit && isCheckBox) + } else { + return !(mobileNumber.length === 10 && canSubmit) + } + } + + useEffect(()=> { + if (data?.["common-masters"]?.CitizenConsentForm?.[0]?.isCitizenConsentFormEnabled) { + setisCCFEnabled(data?.["common-masters"]?.CitizenConsentForm?.[0]) + } + }, [data]); + + const onLinkClick = (e) => { + setMdmsConfig(e.target.id) +} + + const checkLabels = () => { + return + {isCCFEnabled?.checkBoxLabels?.map((data, index) => { + return + {/* {index == 0 && "CCF"} */} + {data?.linkPrefix && {t(`${data?.linkPrefix}_`)}} + {data?.link && { onLinkClick(e) }} style={{ color: "#F47738", cursor: "pointer" }}>{t(`${data?.link}_`)}} + {data?.linkPostfix && {t(`${data?.linkPostfix}_`)}} + {(index == isCCFEnabled?.checkBoxLabels?.length - 1) && t("LABEL")} + + })} + + } + + + + if (isLoading) return + return ( + > + {isCCFEnabled?.isCitizenConsentFormEnabled &&
+ + + +
} + ); }; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/index.js index 725707ebac7..b0186b61aa8 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/index.js @@ -1,4 +1,4 @@ -import { BackButton, WhatsappIcon, Card, CitizenHomeCard, CitizenInfoLabel } from "@egovernments/digit-ui-react-components"; +import { BackButton, WhatsappIcon, Card, CitizenHomeCard, CitizenInfoLabel, PrivateRoute } from "@egovernments/digit-ui-react-components"; import React from "react"; import { useTranslation } from "react-i18next"; import { Route, Switch, useRouteMatch, useHistory, Link } from "react-router-dom"; @@ -15,6 +15,8 @@ import ErrorComponent from "../../components/ErrorComponent"; import FAQsSection from "./FAQs/FAQs"; import HowItWorks from "./HowItWorks/howItWorks"; import StaticDynamicCard from "./StaticDynamicComponent/StaticDynamicCard"; +import AcknowledgementCF from "../../components/AcknowledgementCF"; +import CitizenFeedback from "../../components/CitizenFeedback"; import Search from "./SearchApp"; const sidebarHiddenFor = [ "digit-ui/citizen/register/name", @@ -163,6 +165,9 @@ const Home = ({ + + + diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json index 2a1166050d3..ddf699fabf9 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-dss", - "version": "1.6.0", + "version": "1.7.0-beta.1", "license": "MIT", "description": "Digit Dashboard Module", "main": "dist/index.js", @@ -19,7 +19,7 @@ "react-router-dom": "5.3.0" }, "dependencies": { - "@egovernments/digit-ui-react-components": "^1.6.0", + "@egovernments/digit-ui-react-components": "^1.7.0-beta.1", "react": "17.0.2", "react-date-range": "1.3.0", "react-dom": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomTable.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomTable.js index c1d090d48db..7f527330bad 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomTable.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomTable.js @@ -10,14 +10,16 @@ import ReactTooltip from "react-tooltip"; const rowNamesToBeLocalised = ["Department", "", "Usage Type", "Ward", "Wards", "City Name"]; -const InsightView = ({ rowValue, insight, t }) => { +const InsightView = ({ rowValue, insight, t, isFinance }) => { return ( {rowValue} + {!(isFinance) &&
{` `} {insight >= 0 ? ArrowUpwardElement() : ArrowDownwardElement()} {` `} {isNaN(insight) ? `0%` : `${Digit.Utils.dss.formatter(Math.abs(insight), "number", "Lac", true, t)}%`} +
} ); }; @@ -35,6 +37,7 @@ const CustomTable = ({ data = {}, onSearch, setChartData, setChartDenomination, const { value, setValue, ulbTenants, fstpMdmsData } = useContext(FilterContext); const tenantId = Digit.ULBService.getCurrentTenantId(); const dssTenants = Digit.SessionStorage.get("DSS_TENANTS"); + let isFinance = window.location.href.includes("/employee/dss/dashboard/finance"); const lastYearDate = { startDate: subYears(value?.range?.startDate, 1).getTime(), endDate: subYears(value?.range?.endDate, 1).getTime(), @@ -239,8 +242,8 @@ const CustomTable = ({ data = {}, onSearch, setChartData, setChartDenomination, const cellValue = originalRow?.[name]; if (plot?.symbol === "amount") { return typeof cellValue === "object" - ? { value: Digit.Utils.dss.formatter(convertDenomination(cellValue?.value), "number", "Lac", true, t), insight: cellValue?.insight } - : String(Digit.Utils.dss.formatter(convertDenomination(cellValue), "number", "Lac", true, t)); + ? { value: Digit.Utils.dss.formatter(convertDenomination(cellValue?.value), "number", "Lac", true, t, isFinance ? true : false), insight: cellValue?.insight } + : String(Digit.Utils.dss.formatter(convertDenomination(cellValue), "number", "Lac", true, t, isFinance ? true : false)); } else if (plot?.symbol === "number" || plot?.symbol === "percentage") { return typeof cellValue === "object" ? { value: Digit.Utils.dss.formatter(cellValue?.value, "number", "Lac", true, t), insight: cellValue?.insight } @@ -314,7 +317,7 @@ const CustomTable = ({ data = {}, onSearch, setChartData, setChartDenomination, Cell: (args) => { const { value: cellValue, column, row } = args; if (typeof cellValue === "object") { - return ; + return ; } const filter = response?.responseData?.filter?.find((elem) => elem?.column === column?.id); if (response?.responseData?.drillDownChartId !== "none" && filter !== undefined) { @@ -374,9 +377,9 @@ const CustomTable = ({ data = {}, onSearch, setChartData, setChartDenomination, } return (
- + { !(isFinance) && {t("DSS_CMN_TABLE_INFO")} - + } {filterStack?.length > 1 && (
{t("DSS_FILTERS_APPLIED")}: diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/MetricChart.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/MetricChart.js index 731043cad9c..c7ec498efb3 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/MetricChart.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/MetricChart.js @@ -6,14 +6,14 @@ import FilterContext from "./FilterContext"; import { ArrowDownwardElement } from "./ArrowDownward"; import { ArrowUpwardElement } from "./ArrowUpward"; -const MetricData = ({ t, data, code }) => { +const MetricData = ({ t, data, code, indexValuesWithStar }) => { const { value } = useContext(FilterContext); const insight = data?.insight?.value?.replace(/[+-]/g, "")?.split("%"); return (

- {code === "citizenAvgRating" ? ( - + {indexValuesWithStar?.includes(code) ? ( + ) : ( `${Digit.Utils.dss.formatter(data?.headerValue, data?.headerSymbol, value?.denomination, true, t)} ${ code === "totalSludgeTreated" ? t(`DSS_KL`) : "" @@ -41,7 +41,7 @@ const MetricData = ({ t, data, code }) => { ); }; -const MetricChartRow = ({ data, setChartDenomination, index, moduleCode }) => { +const MetricChartRow = ({ data, setChartDenomination, index, moduleCode, indexValuesWithStar }) => { const { id, chartType } = data; const tenantId = Digit.ULBService.getCurrentTenantId(); const { t } = useTranslation(); @@ -137,7 +137,7 @@ const MetricChartRow = ({ data, setChartDenomination, index, moduleCode }) => { {showDate?.[id]?.lastUpdatedTime}

- + {/*
{`${displaySymbol(response.headerSymbol)} ${response.headerValue}`}
*/}
); @@ -145,11 +145,18 @@ const MetricChartRow = ({ data, setChartDenomination, index, moduleCode }) => { const MetricChart = ({ data, setChartDenomination, moduleCode }) => { const { charts } = data; + const indexValuesWithStar = [ + "citizenAvgRating", + "nssOverviewCitizenFeedbackScore", + "nssPtCitizenFeedbackScore", + "sdssPtCitizenFeedbackScore", + "sdssOverviewCitizenFeedbackScore", + ]; return ( <> {charts.map((chart, index) => ( - + ))} diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/pages/Home.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/pages/Home.js index 7a2df9729ea..8f73fbcf090 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/pages/Home.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/pages/Home.js @@ -7,6 +7,7 @@ import { Loader, MultiLink, Poll, + Rating, ShareIcon, WhatsappIcon, } from "@egovernments/digit-ui-react-components"; @@ -89,9 +90,17 @@ const Chart = ({ data, moduleLevel, overview = false }) => { {t(`TIP_${data.name}`)}
-

+ {data.name === "NATIONAL_DSS_OVERVIEW_CITIZEN_FEEDBACK_SCORE" ? + + :

{Digit.Utils.dss.formatter(response?.responseData?.data?.[0]?.headerValue, response?.responseData?.data?.[0]?.headerSymbol, "Lac", true, t)} -

+

} {response?.responseData?.data?.[0]?.insight?.value ? (

{response?.responseData?.data?.[0]?.insight?.indicator === "upper_green" ? ArrowUpwardElement("10px") : ArrowDownwardElement("10px")} diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/package.json index 927a65bcd18..a5727349c0b 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-engagement", - "version": "1.6.0", + "version": "1.7.0-beta.1", "license": "MIT", "main": "dist/index.js", "module": "dist/index.modern.js", @@ -18,7 +18,7 @@ "react-router-dom": "5.3.0" }, "dependencies": { - "@egovernments/digit-ui-react-components": "^1.6.0", + "@egovernments/digit-ui-react-components": "^1.7.0-beta.1", "react": "17.0.2", "react-dom": "17.0.2", "react-hook-form": "6.15.8", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/components/Surveys/CitizenSurveyForm.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/components/Surveys/CitizenSurveyForm.js index 66858017b0e..980ceac6dfb 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/components/Surveys/CitizenSurveyForm.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/components/Surveys/CitizenSurveyForm.js @@ -29,7 +29,7 @@ const CitizenSurveyForm = ({ surveyData, onFormSubmit,submitDisabled,formDisable

{surveyData?.title?.toUpperCase()}
- {surveyData?.questions?.length ? surveyData.questions.map((config, index) => ) : null} + {surveyData?.questions?.length ? surveyData.questions.map((config, index) => ) : null} {showToast && } {!submitDisabled && } diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/components/Surveys/CitizenSurveyQuestion.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/components/Surveys/CitizenSurveyQuestion.js index 8523598eb08..2882cf07988 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/components/Surveys/CitizenSurveyQuestion.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/components/Surveys/CitizenSurveyQuestion.js @@ -2,7 +2,7 @@ import { Card, CardLabelError, CheckBox, RadioButtons, TextArea, TextInput } fro import React, { Fragment } from "react"; import { Controller } from "react-hook-form"; -const CitizenSurveyQuestion = ({ t, question, control, register, values, formState,formDisabled }) => { +const CitizenSurveyQuestion = ({t, question, control, register, values, formState,formDisabled, index }) => { const formErrors = formState?.errors; if (!question) return; @@ -197,7 +197,7 @@ const CitizenSurveyQuestion = ({ t, question, control, register, values, formSta return (
- {question.questionStatement} {question?.required? "*":""} + {index+1}. {question.questionStatement} {question?.required? "*":""} {displayAnswerField(question.type)}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/components/Surveys/ResultsView/SurveyDetailsView.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/components/Surveys/ResultsView/SurveyDetailsView.js index 75ed7aeccea..cab391432ae 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/components/Surveys/ResultsView/SurveyDetailsView.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/components/Surveys/ResultsView/SurveyDetailsView.js @@ -1,6 +1,6 @@ -import { TextInput, Dropdown, RemoveableTag, LinkButton,SearchField,SubmitBar } from '@egovernments/digit-ui-react-components' +import { TextInput, Dropdown, RemoveableTag, LinkButton,LinkLabel, SearchField,SubmitBar } from '@egovernments/digit-ui-react-components' import React,{useMemo} from 'react' -import { useHistory } from "react-router-dom"; +import { useHistory, Link } from "react-router-dom"; const SurveyDetailsView = ({surveyTitle,surveyDesc,t,surveyId}) => { const history = useHistory() @@ -33,13 +33,17 @@ const SurveyDetailsView = ({surveyTitle,surveyDesc,t,surveyId}) => { extraStyles={{tagStyles : {display:"flex"}}} />
- + */} + history.push(`/digit-ui/employee/engagement/surveys/inbox/details/${surveyId}`)}> + {t("VIEW_SURVEY_QUESTIONS")} + + diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json index 5e727e48026..0492e1ef08a 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-fsm", - "version": "1.6.1", + "version": "1.7.0-beta.1", "license": "MIT", "main": "dist/index.js", "description": "Digit FSM Module", @@ -19,7 +19,7 @@ "react-router-dom": "5.3.0" }, "dependencies": { - "@egovernments/digit-ui-react-components": "^1.6.1", + "@egovernments/digit-ui-react-components": "^1.7.0-beta.1", "microbundle-crl": "0.13.11", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/CustomTimePicker.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/CustomTimePicker.js index 0c10e69d080..a655333b9df 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/CustomTimePicker.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/CustomTimePicker.js @@ -14,7 +14,7 @@ const CustomTimePicker = ({ name, value, onChange }) => { } } - return ; + return ; }; export default CustomTimePicker; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/RegistryInbox.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/RegistryInbox.js index d429fd76e42..9f5c8188b4f 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/RegistryInbox.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/RegistryInbox.js @@ -158,7 +158,7 @@ const RegisryInbox = (props) => { }); }; - const onVendorSelect = (row, selectedOption) => { + const onVendorDriverSelect = (row, selectedOption) => { let driverData = row.original; let formDetails = row.original.dsoDetails; @@ -200,6 +200,47 @@ const RegisryInbox = (props) => { }); }; + const onVendorVehicleSelect = (row, selectedOption) => { + let vehicleData = row.original; + let formDetails = row.original.dsoDetails; + let existingVendor = vehicleData?.vendor; + let selectedVendor = selectedOption; + delete vehicleData.vendor; + vehicleData.vendorVehicleStatus = "ACTIVE"; + if (existingVendor) { + const vehicles = existingVendor?.vehicles; + vehicles.splice( + vehicles.findIndex((ele) => ele.id === vehicleData.id), + 1 + ); + const formData = { + vendor: { + ...formDetails, + vehicles: vehicles, + }, + }; + } + const formData = { + vendor: { + ...selectedVendor, + vehicles: selectedVendor.vehicles ? [...selectedVendor.vehicles, vehicleData] : [vehicleData], + }, + }; + + mutateVendor(formData, { + onError: (error, variables) => { + setShowToast({ key: "error", action: error }); + setTimeout(closeToast, 5000); + }, + onSuccess: (data, variables) => { + setShowToast({ key: "success", action: "VENDOR" }); + queryClient.invalidateQueries("DSO_SEARCH"); + props.refetchData(); + setTimeout(closeToast, 3000); + }, + }); + }; + const onCellClick = (row, column, length) => { setTableData((old) => old.map((data, index) => { @@ -414,7 +455,18 @@ const RegisryInbox = (props) => { { Header: t("ES_FSM_REGISTRY_INBOX_VENDOR_NAME"), disableSortBy: true, - Cell: ({ row }) => GetCell(row.original?.vendor?.name || "NA"), + Cell: ({ row }) => { + return ( + onVendorVehicleSelect(row, value)} + optionKey="name" + t={t} + /> + ); + }, }, { Header: t("ES_FSM_REGISTRY_INBOX_ENABLED"), @@ -466,7 +518,7 @@ const RegisryInbox = (props) => { className="fsm-registry-dropdown" selected={row.original.vendor} option={vendors} - select={(value) => onVendorSelect(row, value)} + select={(value) => onVendorDriverSelect(row, value)} optionKey="name" t={t} /> diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/RegistrySearch.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/RegistrySearch.js index e8ee2277240..9169a6ba8a1 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/RegistrySearch.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/RegistrySearch.js @@ -193,8 +193,10 @@ const SearchApplication = ({ onSearch, type, onClose, onTabChange, isFstpOperato > {searchFields?.map((input, index) => ( - - {getFields(input)}{" "} + + {getFields(input)} ))}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/inbox/search.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/inbox/search.js index b1624bc6159..bcde6fa491a 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/inbox/search.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/inbox/search.js @@ -1,4 +1,4 @@ -import React, { useState } from "react"; +import React, { useState,useEffect } from "react"; import { useForm, Controller } from "react-hook-form"; import { TextInput, @@ -27,6 +27,8 @@ const SearchApplication = ({ onSearch, type, onClose, isFstpOperator, searchFiel const mobileView = innerWidth <= 640; const FSTP = Digit.UserService.hasAccess("FSM_EMP_FSTPO") || false; const watchSearch = watch(["applicationNos", "mobileNumber", "fromDate", "toDate"]); + const [isReady, setIsReady] = useState(false); + const onSubmitInput = (data) => { if (!data.mobileNumber) { @@ -58,12 +60,23 @@ const SearchApplication = ({ onSearch, type, onClose, isFstpOperator, searchFiel ); }; - const searchValidation = (data) => { + const searchValidation = () => { if (FSTP) return null; - watchSearch.applicationNos || watchSearch.mobileNumber || (watchSearch.fromDate && watchSearch.toDate) ? setError(false) : setError(true); - return watchSearch.applicationNos || watchSearch.mobileNumber || (watchSearch.fromDate && watchSearch.toDate) ? true : false; - }; + if (!watchSearch.applicationNos && !watchSearch.mobileNumber && !watchSearch.fromDate && !watchSearch.toDate) { + setError(true); + } else { + setError(false); + } + + } + + useEffect(() => { + if (watchSearch.applicationNos || watchSearch.mobileNumber) { + searchValidation(); + } + }, [watchSearch.applicationNos, watchSearch.mobileNumber]); + const getFields = (input) => { switch (input.type) { @@ -134,7 +147,9 @@ const SearchApplication = ({ onSearch, type, onClose, isFstpOperator, searchFiel
{searchFields?.map((input, index) => ( - + {getFields(input)}{" "} ))} diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pageComponents/SelectPropertySubtype.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pageComponents/SelectPropertySubtype.js index 05f00aa3cf0..ba69ee034e6 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pageComponents/SelectPropertySubtype.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pageComponents/SelectPropertySubtype.js @@ -43,7 +43,7 @@ const SelectPropertySubtype = ({ config, onSelect, t, userType, formData }) => { }; const goNext = () => { - sessionStorage.removeItem("Digit.total_amount"); + sessionStorage.removeItem("Digit.total_amount") onSelect(config.key, subtype); }; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pageComponents/SelectPropertyType.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pageComponents/SelectPropertyType.js index a1f9d61cd3f..20c8898d585 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pageComponents/SelectPropertyType.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pageComponents/SelectPropertyType.js @@ -23,7 +23,7 @@ const SelectPropertyType = ({ config, onSelect, t, userType, formData }) => { }, [formData?.propertyType, propertyTypesData.data]); const goNext = () => { - sessionStorage.removeItem("Digit.total_amount"); + sessionStorage.removeItem("Digit.total_amount") onSelect(config.key, propertyType); }; function selectedValue(value) { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pageComponents/SelectSlumName.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pageComponents/SelectSlumName.js index c190ecdd968..f0adf15d3be 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pageComponents/SelectSlumName.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pageComponents/SelectSlumName.js @@ -12,7 +12,7 @@ const SelectSlumName = ({ config, onSelect, t, userType, formData }) => { const [slumMenu, setSlumMenu] = useState(); useEffect(() => { - if (userType !== "employee" && formData?.address?.slumArea?.code === false) onSelect(config.key, { slumData: null, slum: null }, true); + if (userType !== "employee" && formData?.address?.slumArea?.code !== true) onSelect(config.key, { slumData: null, slum: null }, true); }, [formData?.address?.slumArea]); useEffect(() => { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pageComponents/SelectStreet.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pageComponents/SelectStreet.js index 16582e0626d..aa6a533355a 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pageComponents/SelectStreet.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pageComponents/SelectStreet.js @@ -21,11 +21,10 @@ const SelectStreet = ({ t, config, onSelect, userType, formData, formState, setE } = useForm(); const formValue = watch(); const { errors } = localFormState; - const checkLocation = window.location.href.includes("tl/new-application") || window.location.href.includes("tl/renew-application-details"); + const checkLocation = window.location.href.includes("tl/new-application") || window.location.href.includes("tl/renew-application-details") || window.location.href.includes("tl/edit-application-details/") || window.location.href.includes("/tl/tradelicence/new-application/street") || window.location.href.includes("/tl/tradelicence/renew-trade") || window.location.href.includes("/tl/tradelicence/edit-application") ; const isRenewal = window.location.href.includes("edit-application") || window.location.href.includes("tl/renew-application-details"); const [street, setStreet] = useState(); const [doorNo, setDoorNo] = useState(); - let inputs; if (window.location.href.includes("tl")) { inputs = config.inputs; @@ -78,10 +77,28 @@ const SelectStreet = ({ t, config, onSelect, userType, formData, formState, setE return {}; }; + useEffect(() => { + if(window.location.href.includes("employee/tl/") && formData?.cpt?.details) + { + setValue("doorNo", formData?.cpt?.details?.address?.doorNo); + setValue("street", formData?.cpt?.details?.address?.street); + } + },[formData]) + useEffect(() => { trigger(); }, []); + useEffect(()=>{ + if(formData?.address?.doorNo) setDoorNo(formData?.address?.doorNo) + if(formData?.address?.street) setStreet(formData?.address?.street) + },[formData?.address]) + + useEffect(() => { + if (formData?.address?.doorNo) setDoorNo(formData?.address?.doorNo); + if (formData?.address?.street) setStreet(formData?.address?.street); + }, [formData?.address]); + useEffect(() => { if (formData?.address?.doorNo) setDoorNo(formData?.address?.doorNo); if (formData?.address?.street) setStreet(formData?.address?.street); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/Modal/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/Modal/index.js index accac07a7c3..f784b490409 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/Modal/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/Modal/index.js @@ -63,8 +63,6 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction, const client = useQueryClient(); const stateCode = Digit.ULBService.getStateId(); - const { data: ReceivedPaymentTypeData, isLoading: receivedPaymentLoad } = Digit.Hooks.fsm.useMDMS(stateCode, "FSM", "ReceivedPaymentType"); - const { data: vehicleList, isLoading: isVehicleData, isSuccess: isVehicleDataLoaded } = Digit.Hooks.fsm.useMDMS( stateCode, "Vehicle", @@ -131,7 +129,6 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction, const [pitDetail, setPitDetail] = useState(); const [fstpoRejectionReason, setFstpoRejectionReason] = useState(); const [noOfTrips, setNoOfTrips] = useState(null); - const [receivedPaymentType, setReceivedPaymentType] = useState(null); const [defaultValues, setDefautValue] = useState({ capacity: vehicle?.capacity, @@ -142,12 +139,6 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction, pitDetail: applicationData?.pitDetail, }); - useEffect(() => { - if (!receivedPaymentLoad) { - setReceivedPaymentType(ReceivedPaymentTypeData) - } - }, [receivedPaymentLoad, ReceivedPaymentTypeData]); - useEffect(() => { if (isSuccess && isVehicleDataLoaded && applicationData) { const [vehicle] = vehicleList.filter((item) => item.code === applicationData.vehicleType); @@ -205,7 +196,8 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction, useEffect(() => { if (isSuccess && isDsoSuccess && applicationData && applicationData.dsoId) { const [dso] = dsoData.filter((dso) => dso.id === applicationData.dsoId); - const vehicleNoList = dso?.vehicles?.filter((vehicle) => vehicle.capacity == applicationData?.vehicleCapacity); + const tempList = dso?.vehicles?.filter((vehicle) => vehicle.capacity == applicationData?.vehicleCapacity); + const vehicleNoList = tempList.sort((a,b) => (a.registrationNumber > b.registrationNumber ? 1 : -1 )); setVehicleNoList(vehicleNoList); } }, [isSuccess, isDsoSuccess]); @@ -284,7 +276,6 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction, if (data.subtype && typeof (data.subtype) === "object") applicationData.propertyUsage = data.subtype.code; if (data.subtype && typeof (data.subtype) === "string") applicationData.propertyUsage = data.subtype; if (data.noOfTrips) applicationData.noOfTrips = data.noOfTrips; - if (data.paymentMode) applicationData.additionalDetails.receivedPayment = data.paymentMode.code; if (fileStoreId) { if (applicationData.pitDetail.additionalDetails && applicationData.pitDetail.additionalDetails.fileStoreId) { @@ -308,6 +299,8 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction, useEffect(() => { switch (action) { case "UPDATE": + case "SCHEDULE": + case "ES_FSM_SCHEDULE": setFormValve(true); return setConfig( configUpdateTrips({ @@ -380,7 +373,7 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction, case "COMPLETE": case "COMPLETED": setFormValve(true); - return setConfig(configCompleteApplication({ t, vehicle, vehicleCapacity: applicationData?.vehicleCapacity, noOfTrips: applicationData?.noOfTrips, applicationCreatedTime: applicationData?.auditDetails?.createdTime, receivedPaymentType: ReceivedPaymentTypeData, action, module })); + return setConfig(configCompleteApplication({ t, vehicle, vehicleCapacity: applicationData?.vehicleCapacity, noOfTrips: applicationData?.noOfTrips, applicationCreatedTime: applicationData?.auditDetails?.createdTime, action, module })); case "SUBMIT": case "FSM_SUBMIT": return history.push("/digit-ui/employee/fsm/modify-application/" + applicationNumber); @@ -423,22 +416,22 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction, action, }) ); - case "SCHEDULE": - case "ES_FSM_SCHEDULE": - setFormValve(true); - return setConfig( - configScheduleDso({ - t, - rejectMenu: Reason?.DeclineReason, - setReason: setDeclineReason, - reason: declineReason, - applicationCreatedTime: applicationData?.auditDetails?.createdTime, - vehicle, - vehicleCapacity: applicationData?.vehicleCapacity, - action, - noOfTrips: applicationData?.noOfTrips - }) - ); + // case "SCHEDULE": + // case "ES_FSM_SCHEDULE": + // setFormValve(true); + // return setConfig( + // configScheduleDso({ + // t, + // rejectMenu: Reason?.DeclineReason, + // setReason: setDeclineReason, + // reason: declineReason, + // applicationCreatedTime: applicationData?.auditDetails?.createdTime, + // vehicle, + // vehicleCapacity: applicationData?.vehicleCapacity, + // action, + // noOfTrips: applicationData?.noOfTrips + // }) + // ); case "PAY": case "ADDITIONAL_PAY_REQUEST": diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/config/CompleteApplication.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/config/CompleteApplication.js index 5e1248ddb85..3b06903c565 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/config/CompleteApplication.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/config/CompleteApplication.js @@ -2,9 +2,15 @@ import React from "react"; import { DatePicker } from "@egovernments/digit-ui-react-components"; import { RadioButtons } from "@egovernments/digit-ui-react-components"; - -export const configCompleteApplication = ({ t, vehicle, vehicleCapacity, noOfTrips, applicationCreatedTime = 0, receivedPaymentType, action, module }) => ({ - +export const configCompleteApplication = ({ + t, + vehicle, + vehicleCapacity, + noOfTrips, + applicationCreatedTime = 0, + action, + module, +}) => ({ label: { heading: `ES_FSM_ACTION_TITLE_${action}`, submit: `CS_COMMON_${action}`, @@ -27,7 +33,7 @@ export const configCompleteApplication = ({ t, vehicle, vehicleCapacity, noOfTri min: Digit.Utils.date.getDate(applicationCreatedTime), max: Digit.Utils.date.getDate(), }, - component: (props, customProps) => , + component: (props, customProps) => , }, }, { @@ -114,40 +120,12 @@ export const configCompleteApplication = ({ t, vehicle, vehicleCapacity, noOfTri validation: { required: true, }, - defaultValue: noOfTrips + defaultValue: noOfTrips, // defaultValue: customizationConfig && Object.keys(customizationConfig).length > 0 ? customizationConfig?.noOfTrips?.default : 1, }, disable: true, // disable: customizationConfig ? !customizationConfig?.noOfTrips?.override : true, }, - module !== "FSM_ZERO_PAY_SERVICE" && { - label: "FSM_PAYMENT_RECEIVED", - isMandatory: true, - type: "custom", - populators: { - name: "paymentMode", - error: t("ES_NEW_APPLICATION_NO_OF_TRIPS_INVALID"), - validation: { - required: true, - }, - rules: { required: true }, - customProps: { - isMandatory: true, - options: receivedPaymentType, - optionsKey: "i18nKey", - innerStyles: { minWidth: "33%" }, - }, - component: (props, customProps) => ( - { - props.onChange(d); - }} - {...customProps} - /> - ), - }, - }, ], }, ], diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/index.js index 7f77f14e583..566e9c2f82d 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/index.js @@ -99,7 +99,7 @@ const ApplicationDetails = (props) => { useEffect(() => { switch (selectedAction) { - case DSO && "SCHEDULE": + case "SCHEDULE": case "DSO_ACCEPT": case "ACCEPT": case "ASSIGN": @@ -118,7 +118,7 @@ const ApplicationDetails = (props) => { return setShowModal(true); case "SUBMIT": case "FSM_SUBMIT": - case !DSO && "SCHEDULE": + // case !DSO && "SCHEDULE": return history.push("/digit-ui/employee/fsm/modify-application/" + applicationNumber); case "PAY": case "FSM_PAY": diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Driver/AddDriver.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Driver/AddDriver.js index cbbe57d1ac7..47d1a528f30 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Driver/AddDriver.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Driver/AddDriver.js @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; -import { FormComposer, Toast, Header } from "@egovernments/digit-ui-react-components"; +import { FormComposer, Toast, Header, InfoIcon } from "@egovernments/digit-ui-react-components"; import { useHistory } from "react-router-dom"; import DriverConfig from "../../configs/DriverConfig"; import { useQueryClient } from "react-query"; @@ -41,7 +41,7 @@ const AddDriver = ({ parentUrl, heading }) => { }; const onFormValueChange = (setValue, formData) => { - if (formData?.driverName && formData?.phone && formData?.selectGender) { + if (formData?.driverName && formData?.selectGender) { setSubmitValve(true); } else { setSubmitValve(false); @@ -57,7 +57,7 @@ const AddDriver = ({ parentUrl, heading }) => { const license = data?.license; const gender = data?.selectGender?.code; const emailId = data?.emailId; - const phone = data?.phone; + // const phone = data?.phone; const dob = new Date(`${data.dob}`).getTime() || new Date(`1/1/1970`).getTime(); const additionalDetails = data?.additionalDetails; const formData = { @@ -75,7 +75,7 @@ const AddDriver = ({ parentUrl, heading }) => { gender: gender, dob: dob, emailId: emailId || "abc@egov.com", - mobileNumber: phone, + // mobileNumber: phone, }, vendorDriverStatus: "INACTIVE", }, @@ -92,7 +92,7 @@ const AddDriver = ({ parentUrl, heading }) => { queryClient.invalidateQueries("FSM_DRIVER_SEARCH"); setTimeout(() => { closeToast(); - history.push(`/digit-ui/employee/fsm/registry`); + history.push(`/digit-ui/employee/fsm/registry?selectedTabs=DRIVER`); }, 5000); }, }); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Driver/DriverDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Driver/DriverDetails.js index c8330a968e2..14a3399e049 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Driver/DriverDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Driver/DriverDetails.js @@ -252,7 +252,7 @@ const DriverDetails = (props) => { const closeModal = () => { setSelectedAction(null); - setSelectedOption({}) + setSelectedOption({}); setShowModal(false); }; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Driver/EditDriver.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Driver/EditDriver.js index 5a2cfd2bf11..4e11b0a1002 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Driver/EditDriver.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Driver/EditDriver.js @@ -73,6 +73,7 @@ const EditDriver = ({ parentUrl, heading }) => { const license = data?.license; const gender = data?.selectGender?.code; const emailId = data?.emailId; + // const mobileNumber = data?.phone; const dob = new Date(`${data.dob}`).getTime(); const additionalDetails = data?.additionalDetails; const formData = { @@ -86,6 +87,7 @@ const EditDriver = ({ parentUrl, heading }) => { gender: gender || driverDetails.owner.gender || "OTHER", dob: dob, emailId: emailId || "abc@egov.com", + // mobileNumber: mobileNumber, }, }, }; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vehicle/AddVehicle.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vehicle/AddVehicle.js index 1cc541fc6b2..52725caf268 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vehicle/AddVehicle.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vehicle/AddVehicle.js @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; -import { FormComposer, Toast, Header } from "@egovernments/digit-ui-react-components"; +import { FormComposer, Toast, Header, InfoIcon } from "@egovernments/digit-ui-react-components"; import { useHistory } from "react-router-dom"; import VehicleConfig from "../../configs/VehicleConfig"; import { useQueryClient } from "react-query"; @@ -30,6 +30,19 @@ const AddVehicle = ({ parentUrl, heading }) => { const Config = VehicleConfig(t); + Config[0].body.forEach((item) => { + if (item.label === "ES_FSM_REGISTRY_VEHICLE_NUMBER") { + item.labelChildren = ( +
+ + + {t(item.populators.validation.title)} + +
+ ); + } + }); + const [canSubmit, setSubmitValve] = useState(false); const defaultValues = { @@ -41,7 +54,14 @@ const AddVehicle = ({ parentUrl, heading }) => { }; const onFormValueChange = (setValue, formData) => { - if (formData?.registrationNumber && formData?.ownerName && formData?.phone && formData?.vehicle?.modal && formData?.vehicle?.type) { + if ( + formData?.registrationNumber && + formData?.ownerName && + formData?.phone && + formData?.vehicle?.modal && + formData?.vehicle?.type && + formData?.selectGender + ) { setSubmitValve(true); } else { setSubmitValve(false); @@ -64,6 +84,10 @@ const AddVehicle = ({ parentUrl, heading }) => { const ownerName = data?.ownerName; const phone = data?.phone; const additionalDetails = data?.additionalDetails; + const gender = data?.selectGender?.code; + const emailId = data?.emailId; + const dob = new Date(`${data.dob}`).getTime() || new Date(`1/1/1970`).getTime(); + const formData = { vehicle: { tenantId: tenantId, @@ -84,10 +108,13 @@ const AddVehicle = ({ parentUrl, heading }) => { fatherOrHusbandName: ownerName, relationship: "OTHER", gender: "OTHERS", - dob: new Date(`1/1/1970`).getTime(), + dob: dob, emailId: "abc@egov.com", correspondenceAddress: "", mobileNumber: phone, + gender: gender, + dob: dob, + emailId: emailId || "abc@egov.com", }, additionalDetails: { description: additionalDetails, @@ -106,7 +133,7 @@ const AddVehicle = ({ parentUrl, heading }) => { queryClient.invalidateQueries("FSM_VEICLES_SEARCH"); setTimeout(() => { closeToast(); - history.push(`/digit-ui/employee/fsm/registry`); + history.push(`/digit-ui/employee/fsm/registry?selectedTabs=VEHICLE`); }, 5000); }, }); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vehicle/EditVehicle.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vehicle/EditVehicle.js index 57ec101841b..cc5289d7632 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vehicle/EditVehicle.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vehicle/EditVehicle.js @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; -import { FormComposer, Loader, Toast, Header } from "@egovernments/digit-ui-react-components"; +import { FormComposer, Loader, Toast, Header, InfoIcon } from "@egovernments/digit-ui-react-components"; import { useHistory, useParams } from "react-router-dom"; import { useQueryClient } from "react-query"; import VehicleConfig from "../../configs/VehicleConfig"; @@ -60,6 +60,9 @@ const EditVehicle = ({ parentUrl, heading }) => { Digit.DateUtils.ConvertTimestampToDate(vehicleDetails?.vehicleData?.fitnessValidTill, "yyyy-MM-dd"), phone: vehicleDetails?.vehicleData?.owner?.mobileNumber, ownerName: vehicleDetails?.vehicleData?.owner?.name, + selectGender: vehicleDetails?.vehicleData?.owner?.gender, + dob: vehicleDetails?.vehicleData?.owner?.dob && Digit.DateUtils.ConvertTimestampToDate(vehicleDetails?.vehicleData?.owner?.dob, "yyyy-MM-dd"), + emailId: vehicleDetails?.vehicleData?.owner?.emailId === "abc@egov.com" ? "" : vehicleDetails?.vehicleData?.owner?.emailId, additionalDetails: vehicleDetails?.vehicleData?.additionalDetails?.description, }; setDefaultValues(values); @@ -71,6 +74,19 @@ const EditVehicle = ({ parentUrl, heading }) => { const Config = VehicleConfig(t, true); + Config[0].body.forEach((item) => { + if (item.label === "ES_FSM_REGISTRY_VEHICLE_NUMBER") { + item.labelChildren = ( +
+ + + {t(item.populators.validation.title)} + +
+ ); + } + }); + const onFormValueChange = (setValue, formData) => { if (formData?.registrationNumber && formData?.ownerName && formData?.phone && formData?.vehicle?.modal && formData?.vehicle?.type) { setSubmitValve(true); @@ -92,6 +108,12 @@ const EditVehicle = ({ parentUrl, heading }) => { const roadTax = new Date(`${data?.roadTax}`).getTime(); const fitnessValidity = new Date(`${data?.fitnessValidity}`).getTime(); const additionalDetails = data?.additionalDetails; + const vehicleOwnerName = data?.ownerName; + const phone = data?.phone; + const gender = data?.selectGender?.code; + const emailId = data?.emailId; + const dob = new Date(`${data.dob}`).getTime() || new Date(`1/1/1970`).getTime(); + const formData = { vehicle: { ...vehicleDetails, @@ -106,6 +128,14 @@ const EditVehicle = ({ parentUrl, heading }) => { ...vehicleDetails.additionalDetails, description: additionalDetails, }, + owner: { + ...vehicleDetails.owner, + gender: gender || vehicleDetails.owner?.gender || "OTHER", + dob: dob, + emailId: emailId || "abc@egov.com", + name: vehicleOwnerName, + mobileNumber: phone, + }, }, }; mutate(formData, { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vehicle/VehicleDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vehicle/VehicleDetails.js index 3ad1e8eac37..635ac4af167 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vehicle/VehicleDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vehicle/VehicleDetails.js @@ -129,7 +129,7 @@ const VehicleDetails = (props) => { const closeModal = () => { setSelectedAction(null); - setSelectedOption({}) + setSelectedOption({}); setShowModal(false); }; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vendor/AddVendor.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vendor/AddVendor.js index 3fa5f9fd8db..6ebf5699152 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vendor/AddVendor.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vendor/AddVendor.js @@ -132,7 +132,7 @@ const AddVendor = ({ parentUrl, heading }) => { queryClient.invalidateQueries("DSO_SEARCH"); setTimeout(() => { closeToast(); - history.push(`/digit-ui/employee/fsm/registry`); + history.push(`/digit-ui/employee/fsm/registry?selectedTabs=VENDOR`); }, 5000); }, }); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vendor/EditVendor.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vendor/EditVendor.js index 56949b40960..10d14d4bb5b 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vendor/EditVendor.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vendor/EditVendor.js @@ -89,6 +89,7 @@ const EditVendor = ({ parentUrl, heading }) => { const onSubmit = (data) => { const name = data?.vendorName; + const phone = data?.phone; const pincode = data?.pincode; const street = data?.street?.trim(); const doorNo = data?.doorNo?.trim(); @@ -141,6 +142,7 @@ const EditVendor = ({ parentUrl, heading }) => { gender: gender || dsoDetails.owner?.gender || "OTHER", dob: dob, emailId: emailId || "abc@egov.com", + mobileNumber: phone, relationship: dsoDetails.owner?.relationship || "OTHER", }, additionalDetails: { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vendor/VendorDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vendor/VendorDetails.js index ddce140ae89..a3bf8fb8939 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vendor/VendorDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/Vendor/VendorDetails.js @@ -136,7 +136,7 @@ const VendorDetails = (props) => { const closeModal = () => { setSelectedAction(null); - setSelectedOption({}) + setSelectedOption({}); setShowModal(false); }; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/index.js index a039fc0e046..96556eebb69 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FSMRegistry/index.js @@ -1,6 +1,8 @@ import React, { useState, useCallback, useEffect } from "react"; import { useTranslation } from "react-i18next"; -import { Header } from "@egovernments/digit-ui-react-components"; +import { Header, InfoIcon } from "@egovernments/digit-ui-react-components"; +import { useParams, useHistory, useLocation } from "react-router-dom"; + import RegisryInbox from "../../../components/RegistryInbox"; const FSMRegistry = () => { @@ -14,12 +16,17 @@ const FSMRegistry = () => { const [vehicleIds, setVehicleIds] = useState(""); const [driverIds, setDriverIds] = useState(""); const [tableData, setTableData] = useState([]); + const history = useHistory(); + const location = useLocation(); + const queryParams = new URLSearchParams(location.search); + const selectedTabs = queryParams.get("selectedTabs"); + const [loaded, setLoaded] = useState(false); const userInfo = Digit.UserService.getUser(); let paginationParms = { limit: pageSize, offset: pageOffset, sortBy: sortParams?.[0]?.id, sortOrder: sortParams?.[0]?.desc ? "DESC" : "ASC" }; const { data: dsoData, isLoading: isLoading, isSuccess: isDsoSuccess, error: dsoError, refetch } = - tab === "VEHICLE" + selectedTabs === "VEHICLE" ? Digit.Hooks.fsm.useVehiclesSearch({ tenantId, filters: { @@ -29,7 +36,7 @@ const FSMRegistry = () => { }, config: { enabled: false }, }) - : tab === "DRIVER" + : selectedTabs === "DRIVER" ? Digit.Hooks.fsm.useDriverSearch({ tenantId, filters: { @@ -60,11 +67,10 @@ const FSMRegistry = () => { { vehicleIds: vehicleIds, driverIds: driverIds, - status: "ACTIVE", + // status: "ACTIVE", }, { enabled: false } ); - const inboxTotalCount = dsoData?.totalCount || 50; useEffect(() => { @@ -76,15 +82,15 @@ const FSMRegistry = () => { }, [searchParams, sortParams, pageOffset, pageSize]); useEffect(() => { - if (dsoData?.vehicle && tab === "VEHICLE") { + if (dsoData?.vehicle && selectedTabs === "VEHICLE") { let vehicleIds = ""; dsoData.vehicle.map((data) => { vehicleIds += `${data.id},`; }); setVehicleIds(vehicleIds); - setTableData(dsoData.vehicle); + setTableData(dsoData?.vehicle); } - if (dsoData?.driver && tab === "DRIVER") { + if (dsoData?.driver && selectedTabs === "DRIVER") { let driverIds = ""; dsoData.driver.map((data) => { driverIds += `${data.id},`; @@ -92,7 +98,7 @@ const FSMRegistry = () => { setDriverIds(driverIds); setTableData(dsoData?.driver); } - if (dsoData?.vendor && tab === "VENDOR") { + if (dsoData?.vendor && selectedTabs === "VENDOR") { const tableData = dsoData.vendor.map((dso) => ({ mobileNumber: dso.owner?.mobileNumber, name: dso.name, @@ -124,7 +130,7 @@ const FSMRegistry = () => { useEffect(() => { if (vendorData) { - if (tab === "VEHICLE") { + if (selectedTabs === "VEHICLE") { const vehicles = dsoData?.vehicle.map((data) => { let vendor = vendorData.find((ele) => ele.dsoDetails?.vehicles?.find((vehicle) => vehicle.id === data.id)); if (vendor) { @@ -135,7 +141,7 @@ const FSMRegistry = () => { setTableData(vehicles); setVehicleIds(""); } - if (tab === "DRIVER") { + if (selectedTabs === "DRIVER") { const drivers = dsoData?.driver.map((data) => { let vendor = vendorData.find((ele) => ele.dsoDetails?.drivers?.find((driver) => driver.id === data.id)); if (vendor) { @@ -167,17 +173,23 @@ const FSMRegistry = () => { const handleFilterChange = () => {}; - const searchFields = - tab === "VEHICLE" + let searchFields = + selectedTabs === "VEHICLE" ? [ { label: t("ES_FSM_REGISTRY_SEARCH_VEHICLE_NUMBER"), name: "registrationNumber", - pattern: `[A-Z]{2}\\s{1}[0-9]{2}\\s{0,1}[A-Z]{1,2}\\s{1}[0-9]{4}`, - title: t("ES_FSM_VEHICLE_FORMAT_TIP"), + labelChildren: ( +
+ + + {t("ES_FSM_VEHICLE_FORMAT_TIP")} + +
+ ), }, ] - : tab === "DRIVER" + : selectedTabs === "DRIVER" ? [ { label: t("ES_FSM_REGISTRY_SEARCH_DRIVER_NAME"), @@ -190,7 +202,6 @@ const FSMRegistry = () => { name: "name", }, ]; - const handleSort = useCallback((args) => { if (args?.length === 0) return; setSortParams(args); @@ -198,6 +209,9 @@ const FSMRegistry = () => { const onTabChange = (tab) => { setTab(tab); + if (selectedTabs !== tab) { + history.push(`/digit-ui/employee/fsm/registry?selectedTabs=${tab}`); + } }; const refetchData = () => { @@ -233,7 +247,7 @@ const FSMRegistry = () => { onPageSizeChange={handlePageSizeChange} totalRecords={inboxTotalCount || 0} onTabChange={onTabChange} - selectedTab={tab} + selectedTab={selectedTabs} refetchData={refetchData} refetchVendor={refetchVendorData} /> diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FstpAddVehicle.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FstpAddVehicle.js index 5d8c912dbc9..af0fd02be03 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FstpAddVehicle.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FstpAddVehicle.js @@ -1,5 +1,5 @@ import React, { useEffect, useState } from "react"; -import { FormStep, TextInput, LabelFieldPair, CardLabel, Header } from "@egovernments/digit-ui-react-components"; +import { FormStep, TextInput, LabelFieldPair, CardLabel, Header, InfoIcon } from "@egovernments/digit-ui-react-components"; import { useForm, Controller } from "react-hook-form"; import _ from "lodash"; import { useTranslation } from "react-i18next"; @@ -26,6 +26,14 @@ const FstpAddVehicle = ({ onSelect }) => { pattern: `[A-Z]{2}\\s{1}[0-9]{2}\\s{0,1}[A-Z]{1,2}\\s{1}[0-9]{4}`, title: t("ES_FSM_VEHICLE_FORMAT_TIP"), }, + labelChildren: ( +
+ + + {t("ES_FSM_VEHICLE_FORMAT_TIP")} + +
+ ), }, ], key: "vehicleNumber", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FstpOperatorDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FstpOperatorDetails.js index 050d2e057e2..09452e42a59 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FstpOperatorDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FstpOperatorDetails.js @@ -1,7 +1,7 @@ import React, { Fragment, useState, useEffect, useRef } from "react"; import { useParams, useHistory, useLocation } from "react-router-dom"; import TimePicker from "react-time-picker"; -import { Dropdown, Header, MultiUploadWrapper, TextArea } from "@egovernments/digit-ui-react-components"; +import { Dropdown, Header, InfoIcon, MultiUploadWrapper, TextArea } from "@egovernments/digit-ui-react-components"; import { Card, CardLabel, @@ -322,7 +322,7 @@ const FstpOperatorDetails = () => { setShowToast({ key: "success", action: `ES_FSM_DISPOSE_UPDATE_SUCCESS` }); setTimeout(() => { closeToast(); - history.push(`/digit-ui/employee/fsm/fstp-operations`); + history.push(`/digit-ui/employee`); }, 5000); }; @@ -358,6 +358,17 @@ const FstpOperatorDetails = () => { value: vehicle?.vehicle?.registrationNumber || applicationNos || ( onChangeVehicleNumber(e.target.value)} value={newVehicleNumber} /> ), + labelChildren: ( +
+ + + {t("ES_FSM_VEHICLE_FORMAT_TIP")} + +
+ ), }, { title: `${t("ES_INBOX_DSO_NAME")} *`, @@ -415,7 +426,7 @@ const FstpOperatorDetails = () => {
{t("ES_INBOX_VEHICLE_LOG")}
- + {vehicleData?.map((row, index) => ( { label={row.title} text={row.value || "N/A"} last={false} - labelStyle={{ fontWeight: "normal" }} + labelStyle={ + isMobile && history.location.pathname.includes("new-vehicle-entry") + ? { fontWeight: "normal", display: "contents" } + : { fontWeight: "normal" } + } + labelChildren={history.location.pathname.includes("new-vehicle-entry") ? row.labelChildren : ""} /> ))}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/configs/DriverConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/configs/DriverConfig.js index 63c5bbddb0e..c0574fee3bc 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/configs/DriverConfig.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/configs/DriverConfig.js @@ -30,9 +30,11 @@ const DriverConfig = (t, disabled = false) => { key: "license", populators: { name: "license", + maxlength: 13, validation: { required: true, - pattern: /^[a-zA-Z-]{0,}[- ]{0,1}[ 0-9]{1,}/, + pattern: /^[0-9]{13}/, + title: t("ES_FSM_DRIVER_FORMAT_TIP"), }, error: t("FSM_REGISTRY_INVALID_DRIVER_LICENSE"), required: false, @@ -97,24 +99,24 @@ const DriverConfig = (t, disabled = false) => { className: "payment-form-text-input-correction", }, }, - { - label: "ES_FSM_REGISTRY_DRIVER_PHONE", - isMandatory: true, - type: "mobileNumber", - key: "phone", - disable: disabled, - populators: { - name: "phone", - validation: { - required: true, - pattern: /^[6-9]\d{9}$/, - }, - error: t("FSM_REGISTRY_INVALID_PHONE"), - defaultValue: "", - className: "payment-form-text-input-correction", - labelStyle: { border: "1px solid black", borderRight: "none" }, - }, - }, + // { + // label: "ES_FSM_REGISTRY_DRIVER_PHONE", + // isMandatory: true, + // type: "mobileNumber", + // key: "phone", + // // disable: disabled, + // populators: { + // name: "phone", + // validation: { + // required: true, + // pattern: /^[6-9]\d{9}$/, + // }, + // error: t("FSM_REGISTRY_INVALID_PHONE"), + // defaultValue: "", + // className: "payment-form-text-input-correction", + // labelStyle: { border: "1px solid black", borderRight: "none" }, + // }, + // }, ], }, ]; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/configs/VehicleConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/configs/VehicleConfig.js index 4698b54412d..c1b74d4b0fb 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/configs/VehicleConfig.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/configs/VehicleConfig.js @@ -1,5 +1,6 @@ import React from "react"; const { DatePicker, Dropdown } = require("@egovernments/digit-ui-react-components"); +import { convertEpochToDate } from "../../../utils"; const VehicleConfig = (t, disabled = false) => { return [ @@ -87,7 +88,7 @@ const VehicleConfig = (t, disabled = false) => { label: "ES_FSM_REGISTRY_NEW_VEHICLE_OWNER_NAME", isMandatory: true, type: "text", - disable: disabled, + // disable: disabled, populators: { name: "ownerName", validation: { @@ -104,7 +105,7 @@ const VehicleConfig = (t, disabled = false) => { isMandatory: true, type: "mobileNumber", key: "phone", - disable: disabled, + // disable: disabled, populators: { name: "phone", validation: { @@ -117,6 +118,52 @@ const VehicleConfig = (t, disabled = false) => { labelStyle: { border: "1px solid black", borderRight: "none" }, }, }, + { + label: "ES_FSM_REGISTRY_NEW_GENDER", + isMandatory: true, + type: "component", + route: "select-gender", + hideInEmployee: false, + key: "selectGender", + component: "SelectGender", + // disable: disabled, + }, + { + label: t("ES_FSM_REGISTRY_NEW_DOB"), + isMandatory: false, + type: "custom", + key: "dob", + populators: { + name: "dob", + validation: { + required: true, + }, + component: (props, customProps) => ( + + ), + }, + }, + { + label: "ES_FSM_REGISTRY_NEW_EMAIL", + isMandatory: false, + type: "text", + key: "emailId", + populators: { + name: "emailId", + validation: { + required: false, + pattern: /^[a-zA-Z0-9+_.-]+@[a-zA-Z0-9.-]+\.[a-zA-Z0-9.-]+$/, + }, + error: t("FSM_REGISTRY_INVALID_EMAIL"), + defaultValue: "", + className: "payment-form-text-input-correction", + }, + }, { label: "ES_FSM_REGISTRY_NEW_VENDOR_ADDITIONAL_DETAILS", isMandatory: false, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/configs/VendorConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/configs/VendorConfig.js index 3856c793d3c..2be07c2a99c 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/configs/VendorConfig.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/configs/VendorConfig.js @@ -1,6 +1,6 @@ import React from "react"; -import { convertEpochToDate } from "../../../utils"; const { DatePicker, Dropdown } = require("@egovernments/digit-ui-react-components"); +import { convertEpochToDate } from "../../../utils"; const VendorConfig = (t, disabled = false) => { return [ @@ -36,7 +36,7 @@ const VendorConfig = (t, disabled = false) => { hideInEmployee: false, key: "selectGender", component: "SelectGender", - disable: disabled, + // disable: disabled, texts: { headerCaption: "", header: "CS_COMMON_CHOOSE_GENDER", @@ -86,7 +86,7 @@ const VendorConfig = (t, disabled = false) => { isMandatory: true, type: "mobileNumber", key: "phone", - disable: disabled, + // disable: disabled, populators: { name: "phone", validation: { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/index.js index fd279e0f2d8..0b143b44672 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/index.js @@ -61,7 +61,7 @@ export const FsmBreadCrumb = ({ location }) => { show: isFsm, }, { - path: isRegistry ? "/digit-ui/employee/fsm/registry" : FSTPO ? "/digit-ui/employee/fsm/fstp-inbox" : "/digit-ui/employee", + path: isRegistry ? `/digit-ui/employee/fsm/registry?selectedTabs=VENDOR` : FSTPO ? "/digit-ui/employee/fsm/fstp-inbox" : "/digit-ui/employee", content: isVehicleLog ? t("ES_TITLE_INBOX") : "FSM", show: isFsm, }, @@ -146,7 +146,7 @@ const EmployeeApp = ({ path, url, userType }) => { const moduleForSomeFSMAdmin = FSM_ADMIN ? [ { - link: "/digit-ui/employee/fsm/registry", + link: "/digit-ui/employee/fsm/registry?selectedTabs=VENDOR", name: "ES_TITLE_FSM_REGISTRY", icon: , }, @@ -207,7 +207,8 @@ const EmployeeApp = ({ path, url, userType }) => { window.location.href.includes("/employee/fsm/registry") || window.location.href.includes("/employee/fsm/application-details/"); - const desludgingApplicationCheck = window.location.href.includes("/employee/fsm/new-application") || window.location.href.includes("/employee/fsm/modify-application"); + const desludgingApplicationCheck = + window.location.href.includes("/employee/fsm/new-application") || window.location.href.includes("/employee/fsm/modify-application"); return ( diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json index daf4e407b63..dfb3890d732 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-hrms", - "version": "1.6.0", + "version": "1.7.0-beta.1", "description": "Digit HRMS Module", "license": "MIT", "main": "dist/index.js", @@ -15,7 +15,7 @@ "prepublish": "yarn build" }, "dependencies": { - "@egovernments/digit-ui-react-components": "^1.6.0", + "@egovernments/digit-ui-react-components": "^1.7.0-beta.1", "react": "17.0.2", "react-dom": "17.0.2", "react-hook-form": "6.15.8", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EmployeeDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EmployeeDetails.js index 0cafeeb26b7..a70fe0a72da 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EmployeeDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EmployeeDetails.js @@ -20,6 +20,7 @@ const Details = () => { const [errorInfo, setErrorInfo, clearError] = Digit.Hooks.useSessionStorage("EMPLOYEE_HRMS_ERROR_DATA", false); const [mutationHappened, setMutationHappened, clear] = Digit.Hooks.useSessionStorage("EMPLOYEE_HRMS_MUTATION_HAPPENED", false); const [successData, setsuccessData, clearSuccessData] = Digit.Hooks.useSessionStorage("EMPLOYEE_HRMS_MUTATION_SUCCESS_DATA", false); + const isMobile = window.Digit.Utils.browser.isMobile(); useEffect(() => { setMutationHappened(false); @@ -63,7 +64,7 @@ const Details = () => { return ( -
+
{t("HR_NEW_EMPLOYEE_FORM_HEADER")}
{!isLoading && data?.Employees.length > 0 ? ( diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/createEmployee.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/createEmployee.js index 6f92398e750..4394cd80bb6 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/createEmployee.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/createEmployee.js @@ -1,4 +1,4 @@ -import { FormComposer, Toast ,Loader} from "@egovernments/digit-ui-react-components"; +import { FormComposer, Toast ,Loader, Header} from "@egovernments/digit-ui-react-components"; import React, { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import { useHistory } from "react-router-dom"; @@ -13,6 +13,7 @@ const CreateEmployee = () => { const [checkfield, setcheck] = useState(false) const { t } = useTranslation(); const history = useHistory(); + const isMobile = window.Digit.Utils.browser.isMobile(); const { data: mdmsData,isLoading } = Digit.Hooks.useCommonMDMS(Digit.ULBService.getStateId(), "egov-hrms", ["CommonFieldsConfig"], { select: (data) => { @@ -195,9 +196,12 @@ const CreateEmployee = () => { const config =mdmsData?.config?mdmsData.config: newConfig; return (
+
+
{t("HR_COMMON_CREATE_EMPLOYEE_HEADER")}
+
{
-

+

{t("HR_COMMON_BUTTON_HOME")} {" "} diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/mCollect/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/mCollect/package.json index e00bb64caca..428e7f33a30 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/mCollect/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/mCollect/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-mcollect", - "version": "1.6.0", + "version": "1.7.0-beta.1", "license": "MIT", "description": "Digit Misc Collections Module", "main": "dist/index.js", @@ -19,7 +19,7 @@ "react-router-dom": "5.3.0" }, "dependencies": { - "@egovernments/digit-ui-react-components": "^1.6.0", + "@egovernments/digit-ui-react-components": "^1.7.0-beta.1", "lodash.merge": "^4.6.2", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/mCollect/src/components/DesktopInbox.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/mCollect/src/components/DesktopInbox.js index 64a5a36d94e..1dd43890283 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/mCollect/src/components/DesktopInbox.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/mCollect/src/components/DesktopInbox.js @@ -188,7 +188,7 @@ const DesktopInbox = ({ tableConfig, filterComponent, columns, ...props }) => { } return ( -

+
{!props.isSearch && (
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/mCollect/src/pageComponents/ServiceDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/mCollect/src/pageComponents/ServiceDetails.js index f854ecea3ce..19465af89d1 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/mCollect/src/pageComponents/ServiceDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/mCollect/src/pageComponents/ServiceDetails.js @@ -287,6 +287,7 @@ const OwnerForm1 = (_props) => { isMandatory className="form-field" selected={props.value} + optionCardStyles={{maxHeight:"960%"}} //errorStyle={(localFormState.touched.financialYear && errors?.financialYear?.message) ? true : false} // disable={financialYearOptions?.length === 1} id="businessService" diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/noc/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/noc/package.json index a2c5ec20448..6148979858a 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/noc/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/noc/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-noc", - "version": "1.6.0", + "version": "1.7.0-beta.1", "description": "", "main": "dist/index.js", "module": "dist/index.modern.js", @@ -18,7 +18,7 @@ "react-router-dom": "5.3.0" }, "dependencies": { - "@egovernments/digit-ui-react-components": "^1.6.0", + "@egovernments/digit-ui-react-components": "^1.7.0-beta.1", "react": "17.0.2", "react-dom": "17.0.2", "react-hook-form": "6.15.8", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/package.json index 565e79cdc4c..2143315d1a7 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-obps", - "version": "1.6.0", + "version": "1.7.0-beta.1", "description": "", "main": "dist/index.js", "module": "dist/index.modern.js", @@ -18,7 +18,7 @@ "react-router-dom": "5.3.0" }, "dependencies": { - "@egovernments/digit-ui-react-components": "^1.6.0", + "@egovernments/digit-ui-react-components": "^1.7.0-beta.1", "react": "17.0.2", "react-dom": "17.0.2", "react-hook-form": "6.15.8", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/SearchFormFieldsComponent.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/SearchFormFieldsComponent.js index 5c7990cee9c..9b55c92b5b3 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/SearchFormFieldsComponent.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/SearchFormFieldsComponent.js @@ -17,7 +17,7 @@ const SearchFormFieldsComponent = ({ formState, Controller, register, control, t control.setValue("status", ""); sessionStorage.setItem("search_application", JSON.stringify(applicationType)); const { applicationTypes, ServiceTypes } = Digit.Hooks.obps.useServiceTypeFromApplicationType({ - Applicationtype: applicationType?.code || (userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_") ).length>0 && userInformation?.roles?.filter((ob) => ob.code.includes("BPA_") ).length<=0 ?"BPA_STAKEHOLDER_REGISTRATION" :"BUILDING_PLAN_SCRUTINY"), + Applicationtype: applicationType?.code || (userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_") ).length>0 && userInformation?.roles?.filter((ob) => ob.code.includes("BPA_") || ob.code.includes("CITIZEN") ).length<=0 ?"BPA_STAKEHOLDER_REGISTRATION" :"BUILDING_PLAN_SCRUTINY"), tenantId: stateTenantId, }); const businessServices = "BPA,BPA_LOW,BPA_OC,ARCHITECT,BUILDER,ENGINEER,STRUCTURALENGINEER"; @@ -113,12 +113,12 @@ const SearchFormFieldsComponent = ({ formState, Controller, register, control, t { - !window.location.href.includes("/digit-ui/citizen") && + !window.location.href.includes("citizen/obps/search/application") && - {window.location.href.includes("/digit-ui/citizen") && } + {window.location.href.includes("citizen/obps/search/application") && }

{ reset({ applicationNo: "", - // mobileNumber: window.location.href.includes("/digit-ui/citizen") ? currentUserPhoneNumber : "", - mobileNumber: "", + mobileNumber: window.location.href.includes("/search/obps-application") ? currentUserPhoneNumber : "", + // mobileNumber: "", fromDate: "", toDate: "", status: "", @@ -197,21 +197,21 @@ const SearchFormFieldsComponent = ({ formState, Controller, register, control, t limit: 10, sortBy: "commencementDate", sortOrder: "DESC", - applicationType: userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length <= 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_"))).length > 0 ? { + applicationType: userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length <= 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_") || ob.code.includes("CITIZEN"))).length > 0 ? { code: "BUILDING_PLAN_SCRUTINY", i18nKey: "WF_BPA_BUILDING_PLAN_SCRUTINY", - } : userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length > 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_"))).length <= 0 ? { + } : userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length > 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_") || ob.code.includes("CITIZEN"))).length <= 0 ? { code: "BPA_STAKEHOLDER_REGISTRATION", i18nKey: "WF_BPA_BPA_STAKEHOLDER_REGISTRATION", } : { code: "BUILDING_PLAN_SCRUTINY", i18nKey: "WF_BPA_BUILDING_PLAN_SCRUTINY", }, - serviceType: userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length <= 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_"))).length > 0 ? { + serviceType: userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length <= 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_") || ob.code.includes("CITIZEN"))).length > 0 ? { applicationType: ["BUILDING_PLAN_SCRUTINY", "BUILDING_OC_PLAN_SCRUTINY"], code: "NEW_CONSTRUCTION", i18nKey: "BPA_SERVICETYPE_NEW_CONSTRUCTION", - } : userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length > 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_"))).length <= 0 ? /* { + } : userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length > 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_") || ob.code.includes("CITIZEN"))).length <= 0 ? /* { code: "BPA_STAKEHOLDER_REGISTRATION", applicationType:["BPA_STAKEHOLDER_REGISTRATION"], roles: ["BPAREG_APPROVER","BPAREG_DOC_VERIFIER"], diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/index.js index b4c4e7084b1..158693d17ca 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/index.js @@ -29,8 +29,8 @@ const OBPSSearchApplication = ({ tenantId, t, onSubmit, data, error, searchData, const { register, control, handleSubmit, setValue, getValues, reset, formState } = useForm({ defaultValues: { applicationNo: "", - // mobileNumber: window.location.href.includes("/digit-ui/citizen") ? currentUserPhoneNumber : "", - mobileNumber: "", + mobileNumber: window.location.href.includes("/search/obps-application") ? currentUserPhoneNumber : "", + // mobileNumber: "", fromDate: "", toDate: "", status: "", @@ -38,21 +38,21 @@ const OBPSSearchApplication = ({ tenantId, t, onSubmit, data, error, searchData, limit: 10, sortBy: "commencementDate", sortOrder: "DESC", - applicationType: userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length <= 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_"))).length > 0 ? { + applicationType: userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length <= 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_") || ob.code.includes("CITIZEN"))).length > 0 ? { code: "BUILDING_PLAN_SCRUTINY", i18nKey: "WF_BPA_BUILDING_PLAN_SCRUTINY", - } : userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length > 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_"))).length <= 0 ? { + } : userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length > 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_") || ob.code.includes("CITIZEN"))).length <= 0 ? { code: "BPA_STAKEHOLDER_REGISTRATION", i18nKey: "WF_BPA_BPA_STAKEHOLDER_REGISTRATION", } : { code: "BUILDING_PLAN_SCRUTINY", i18nKey: "WF_BPA_BUILDING_PLAN_SCRUTINY", }, - serviceType: userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length <= 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_"))).length > 0 ? { + serviceType: userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length <= 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_") || ob.code.includes("CITIZEN"))).length > 0 ? { applicationType: ["BUILDING_PLAN_SCRUTINY", "BUILDING_OC_PLAN_SCRUTINY"], code: "NEW_CONSTRUCTION", i18nKey: "BPA_SERVICETYPE_NEW_CONSTRUCTION", - } : userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length > 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_"))).length <= 0 ? /* { + } : userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length > 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_") || ob.code.includes("CITIZEN"))).length <= 0 ? /* { code: "BPA_STAKEHOLDER_REGISTRATION", applicationType:["BPA_STAKEHOLDER_REGISTRATION"], roles: ["BPAREG_APPROVER","BPAREG_DOC_VERIFIER"], @@ -78,8 +78,8 @@ const OBPSSearchApplication = ({ tenantId, t, onSubmit, data, error, searchData, //reset({ ...searchData, isSubmitSuccessful: false }); reset({ applicationNo: "", - mobileNumber: "", - // mobileNumber: window.location.href.includes("/digit-ui/citizen") ? Digit.UserService.getUser()?.info?.mobileNumber : "", + // mobileNumber: "", + mobileNumber: window.location.href.includes("/search/obps-application") ? Digit.UserService.getUser()?.info?.mobileNumber : "", fromDate: "", toDate: "", status: "", @@ -87,21 +87,21 @@ const OBPSSearchApplication = ({ tenantId, t, onSubmit, data, error, searchData, limit: 10, sortBy: "commencementDate", sortOrder: "DESC", - applicationType: userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length <= 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_"))).length > 0 ? { + applicationType: userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length <= 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_") || ob.code.includes("citizen"))).length > 0 ? { code: "BUILDING_PLAN_SCRUTINY", i18nKey: "WF_BPA_BUILDING_PLAN_SCRUTINY", - } : userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length > 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_"))).length <= 0 ? { + } : userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length > 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_") || ob.code.includes("citizen"))).length <= 0 ? { code: "BPA_STAKEHOLDER_REGISTRATION", i18nKey: "WF_BPA_BPA_STAKEHOLDER_REGISTRATION", } : { code: "BUILDING_PLAN_SCRUTINY", i18nKey: "WF_BPA_BUILDING_PLAN_SCRUTINY", }, - serviceType: userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length <= 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_"))).length > 0 ? { + serviceType: userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length <= 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_") || ob.code.includes("citizen"))).length > 0 ? { applicationType: ["BUILDING_PLAN_SCRUTINY", "BUILDING_OC_PLAN_SCRUTINY"], code: "NEW_CONSTRUCTION", i18nKey: "BPA_SERVICETYPE_NEW_CONSTRUCTION", - } : userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length > 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_"))).length <= 0 ? /* { + } : userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length > 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_") || ob.code.includes("citizen"))).length <= 0 ? /* { code: "BPA_STAKEHOLDER_REGISTRATION", applicationType:["BPA_STAKEHOLDER_REGISTRATION"], roles: ["BPAREG_APPROVER","BPAREG_DOC_VERIFIER"], @@ -225,7 +225,7 @@ const OBPSSearchApplication = ({ tenantId, t, onSubmit, data, error, searchData,

{t("ES_COMMON_SEARCH_APPLICATION")}:

{ - window.location.href.includes("/digit-ui/citizen") && + window.location.href.includes("citizen/obps/search/application") &&
@@ -305,7 +305,7 @@ const OBPSSearchApplication = ({ tenantId, t, onSubmit, data, error, searchData,
{t("ES_COMMON_SEARCH_APPLICATION")}
{ - window.location.href.includes("/digit-ui/citizen") && + window.location.href.includes("citizen/obps/search/application") &&
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/MyApplication/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/MyApplication/index.js index c722daf47fa..2f77130b0a3 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/MyApplication/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/MyApplication/index.js @@ -28,9 +28,9 @@ const MyApplication = () => { const { data: bpaData, isLoading: isBpaSearchLoading, revalidate: bpaRevalidate } = Digit.Hooks.obps.useBPASearch(tenantId, { requestor, mobileNumber: requestor, - limit: -1, + limit: 50 - (data?.Licenses?.length ? Number(data?.Licenses?.length) : 0), offset: 0, - }); + }, {enabled: !isLoading ? true : false}); const { isMdmsLoading, data: mdmsData } = Digit.Hooks.obps.useMDMS(Digit.ULBService.getStateId(), "BPA", ["RiskTypeComputation"]); const getBPAREGFormData = (data) => { @@ -176,6 +176,13 @@ const MyApplication = () => { ) } })} + +
+ {`${t("BPA_NOT_ABLE_TO_FIND_APP_MSG")} `} + + {t("BPA_CLICK_HERE_TO_SEARCH_LINK")} + +
); }; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/index.js index 3b7fdd7f051..193f21cd979 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/index.js @@ -48,6 +48,7 @@ const App = ({ path }) => { } /> + } /> diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/Search.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/Search.js index 10a3575c7f4..aaeaaa3099a 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/Search.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/Search.js @@ -11,8 +11,8 @@ const Search = ({ path }) => { const tenantId = Digit.ULBService.getCurrentTenantId(); const location = useLocation(); const details = () => { - if (userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length <= 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_"))).length > 0) return "BUILDING_PLAN_SCRUTINY"; - if (userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length > 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_"))).length <= 0) return "BPA_STAKEHOLDER_REGISTRATION"; + if (userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length <= 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_") || ob.code.includes("CITIZEN"))).length > 0) return "BUILDING_PLAN_SCRUTINY"; + if (userInformation?.roles?.filter((ob) => ob.code.includes("BPAREG_"))?.length > 0 && userInformation?.roles?.filter((ob) =>(ob.code.includes("BPA_") || ob.code.includes("CITIZEN"))).length <= 0) return "BPA_STAKEHOLDER_REGISTRATION"; else return "BUILDING_PLAN_SCRUTINY" } const [selectedType, setSelectedType] = useState(details()); @@ -92,9 +92,9 @@ const Search = ({ path }) => { let payload1 = { applicationType: "BUILDING_PLAN_SCRUTINY", serviceType: "NEW_CONSTRUCTION", - // ...(window.location.href.includes("/digit-ui/citizen") && { - // mobileNumber: Digit.UserService.getUser()?.info?.mobileNumber, - // }), + ...(window.location.href.includes("/search/obps-application") && { + mobileNumber: Digit.UserService.getUser()?.info?.mobileNumber, + }), }; setPayload({ ...payload, ...payload1 }); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json index 7bac905345c..3dafaa513c3 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-pgr", - "version": "1.6.0", + "version": "1.7.0-beta.1", "license": "MIT", "main": "dist/index.js", "module": "dist/index.modern.js", @@ -19,7 +19,7 @@ }, "dependencies": { - "@egovernments/digit-ui-react-components": "^1.6.0", + "@egovernments/digit-ui-react-components": "^1.7.0-beta.1", "lodash.merge": "^4.6.2", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/package.json index 28b01010962..24b854ace84 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-pt", - "version": "1.6.0", + "version": "1.7.0-beta.1", "license": "MIT", "main": "dist/index.js", "module": "dist/index.modern.js", @@ -19,7 +19,7 @@ }, "dependencies": { - "@egovernments/digit-ui-react-components": "^1.6.0", + "@egovernments/digit-ui-react-components": "^1.7.0-beta.1", "lodash.merge": "^4.6.2", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/Module.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/Module.js index d3c8aca2846..1c51be74544 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/Module.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/Module.js @@ -69,6 +69,7 @@ import PTRegistrationDocument from "./pageComponents/Mutate/RegistrationDocument import TransferProof from "./pageComponents/Mutate/transferReasonDocument"; import UpdateNumber from "./pages/citizen/MyProperties/updateNumber"; import EmployeeUpdateOwnerNumber from "./pages/employee/updateNumber"; +//import PTCitizenFeedback from "@egovernments/digit-ui-module-core/src/components/PTCitizenFeedback"; import EmployeeApp from "./pages/employee"; import PTCard from "./components/PTCard"; @@ -84,6 +85,10 @@ import Response from "./pages/Response"; import TransferOwnership from "./pages/employee/PropertyMutation"; import DocsRequired from "./pages/employee/PropertyMutation/docsRequired"; import SelectOtp from "../../core/src/pages/citizen/Login/SelectOtp"; +import CitizenFeedback from "@egovernments/digit-ui-module-core/src/components/CitizenFeedback"; +import AcknowledgementCF from "@egovernments/digit-ui-module-core/src/components/AcknowledgementCF"; +// PTAcknowledgementCF from "@egovernments/digit-ui-module-core/src/components/PTAcknowledgementCF"; +//import PTCitizenFeedbackPopUp from "./pageComponents/PTCitizenFeedbackPopUp"; const componentsToRegister = { PTLandArea, @@ -159,7 +164,12 @@ const componentsToRegister = { PTSearchResultsComponent: SearchResultsComponent, PTEditProperty: EditProperty, PTMutateProperty: MutateProperty, + //PTCitizenFeedbackPopUp, + // PTCitizenFeedback, + // PTAcknowledgementCF, SelectOtp, // To-do: Temp fix, Need to check why not working if selectOtp module is already imported from core module + AcknowledgementCF, + CitizenFeedback, }; const addComponentsToRegistry = () => { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/OwnerDetailsEmployee.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/OwnerDetailsEmployee.js index 22fcbfcfdcf..5fa95da0756 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/OwnerDetailsEmployee.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/OwnerDetailsEmployee.js @@ -224,7 +224,7 @@ const OwnerForm = (_props) => { rules={{ required: t("CORE_COMMON_REQUIRED_ERRMSG"), validate: { - pattern: (v) => (/^[a-zA-Z\s]+$/.test(v) ? true : t("ERR_DEFAULT_INPUT_FIELD_MSG")), + pattern: (v) => (/^[a-zA-Z_@./()#&+-\s]*$/.test(v) ? true : t("ERR_DEFAULT_INPUT_FIELD_MSG")), }, }} render={(props) => ( diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/PTCitizenFeedbackPopUp.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/PTCitizenFeedbackPopUp.js new file mode 100644 index 00000000000..a6b2ed40c38 --- /dev/null +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/PTCitizenFeedbackPopUp.js @@ -0,0 +1,19 @@ +import { PopUp } from "@egovernments/digit-ui-react-components"; +import React from "react"; + +const PTCitizenFeedbackPopUp = ({ setpopup, setShowToast, data }) => { + + const CitizenFeedback = Digit?.ComponentRegistryService?.getComponent("CitizenFeedback"); + + return ( + + +
+ +
+ + + ); +}; + +export default PTCitizenFeedbackPopUp; \ No newline at end of file diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/PTWFApplicationTimeline.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/PTWFApplicationTimeline.js index a37abc350f6..e714bfad509 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/PTWFApplicationTimeline.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/PTWFApplicationTimeline.js @@ -79,7 +79,7 @@ const PTWFApplicationTimeline = (props) => { ? (
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/SelectInistitutionOwnerDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/SelectInistitutionOwnerDetails.js index a00399ce391..24265c7ed7c 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/SelectInistitutionOwnerDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/SelectInistitutionOwnerDetails.js @@ -118,7 +118,7 @@ const SelectInistitutionOwnerDetails = ({ t, config, onSelect, userType, formDat disable={isUpdateProperty || isEditProperty} {...(validation = { isRequired: true, - pattern: "^[a-zA-Z-.`' ]*$", + pattern: "^[a-zA-Z_@./()#&+- ]*$", title: t("PT_NAME_ERROR_MESSAGE"), })} /> diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/Create/PTAcknowledgement.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/Create/PTAcknowledgement.js index 5c17bc2b941..d8f2cd30f6b 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/Create/PTAcknowledgement.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/Create/PTAcknowledgement.js @@ -1,7 +1,7 @@ -import { Banner, Card, CardText, LinkButton, Loader, Row, StatusTable, SubmitBar } from "@egovernments/digit-ui-react-components"; +import { Banner, Card, CardText, LinkButton, LinkLabel, Loader, Row, StatusTable, SubmitBar } from "@egovernments/digit-ui-react-components"; import React, { useEffect } from "react"; import { useTranslation } from "react-i18next"; -import { Link } from "react-router-dom"; +import { Link, useRouteMatch } from "react-router-dom"; import getPTAcknowledgementData from "../../../getPTAcknowledgementData"; import { convertToProperty, convertToUpdateProperty } from "../../../utils"; @@ -41,6 +41,7 @@ const PTAcknowledgement = ({ data, onSuccess }) => { !window.location.href.includes("edit-application") && !isPropertyMutation ); const { data: storeData } = Digit.Hooks.useStore.getInitData(); + const match = useRouteMatch(); const { tenants } = storeData || {}; useEffect(() => { @@ -106,8 +107,10 @@ const PTAcknowledgement = ({ data, onSuccess }) => { /> )} + {/* {mutation.isSuccess && + + } */} {mutation.isSuccess && } - diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/MyProperties/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/MyProperties/index.js index 726f7d4f256..39962e0fc04 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/MyProperties/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/MyProperties/index.js @@ -7,7 +7,7 @@ import { propertyCardBodyStyle } from "../../../utils"; export const MyProperties = () => { const { t } = useTranslation(); - const tenantId = Digit.ULBService.getCurrentTenantId(); + const tenantId = Digit.ULBService.getCitizenCurrentTenant(true) || Digit.ULBService.getCurrentTenantId(); const user = Digit.UserService.getUser().userInfo; let filter = window.location.href.split("/").pop(); @@ -20,8 +20,8 @@ export const MyProperties = () => { t1 = 4; } let filter1 = !isNaN(parseInt(filter)) - ? { limit: "50", sortOrder: "ASC", sortBy: "createdTime", offset: off } - : { limit: "4", sortOrder: "ASC", sortBy: "createdTime", offset: "0",mobileNumber:user?.mobileNumber }; + ? { limit: "50", sortOrder: "ASC", sortBy: "createdTime", offset: off, tenantId } + : { limit: "4", sortOrder: "ASC", sortBy: "createdTime", offset: "0",mobileNumber:user?.mobileNumber, tenantId }; const { isLoading, isError, error, data } = Digit.Hooks.pt.usePropertySearchNew({ filters: filter1,searchedFrom:"myPropertyCitizen" }, { filters: filter1 }); if (isLoading) { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/MyProperties/propertyInformation.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/MyProperties/propertyInformation.js index 947050d9e68..5eb56c3aaf9 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/MyProperties/propertyInformation.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/MyProperties/propertyInformation.js @@ -54,7 +54,7 @@ const PropertyInformation = () => { enable:false }); - const { isLoading, isError, error, data } = Digit.Hooks.pt.usePropertySearch({ filters: { propertyIds } }, { filters: { propertyIds } }); + const { isLoading, isError, error, data } = Digit.Hooks.pt.usePropertySearch({ filters: { propertyIds, tenantId } }, { filters: { propertyIds, tenantId } }); const { isLoading: auditDataLoading, isError: isAuditError, data: auditData } = Digit.Hooks.pt.usePropertySearch( { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/PTApplicationDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/PTApplicationDetails.js index 1672f7360d6..e5f12306c5c 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/PTApplicationDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/PTApplicationDetails.js @@ -1,11 +1,13 @@ -import { Card, CardSubHeader, Header, LinkButton, Loader, Row, StatusTable, MultiLink, SubmitBar } from "@egovernments/digit-ui-react-components"; -import React, { useEffect, useState } from "react"; +import { Card, CardSubHeader, Header, LinkButton, Loader, Row, StatusTable, MultiLink, PopUp, Toast, SubmitBar } from "@egovernments/digit-ui-react-components"; +import React, { useEffect, useMemo, useState } from "react"; import { useTranslation } from "react-i18next"; import { useHistory, useParams } from "react-router-dom"; import getPTAcknowledgementData from "../../getPTAcknowledgementData"; import PropertyDocument from "../../pageComponents/PropertyDocument"; import PTWFApplicationTimeline from "../../pageComponents/PTWFApplicationTimeline"; import { getCityLocale, getPropertyTypeLocale, propertyCardBodyStyle, getMohallaLocale, pdfDownloadLink } from "../../utils"; +import PTCitizenFeedbackPopUp from "../../pageComponents/PTCitizenFeedbackPopUp"; +//import PTCitizenFeedback from "@egovernments/digit-ui-module-core/src/components/PTCitizenFeedback"; import get from "lodash/get"; import { size } from "lodash"; @@ -16,22 +18,44 @@ const PTApplicationDetails = () => { const { acknowledgementIds, tenantId } = useParams(); const [acknowldgementData, setAcknowldgementData] = useState([]); const [showOptions, setShowOptions] = useState(false); + const [popup, setpopup] = useState(false); + const [showToast, setShowToast] = useState(null); // const tenantId = Digit.ULBService.getCurrentTenantId(); const { data: storeData } = Digit.Hooks.useStore.getInitData(); const { tenants } = storeData || {}; const { isLoading, isError, error, data } = Digit.Hooks.pt.usePropertySearch( - { filters: { acknowledgementIds } }, - { filters: { acknowledgementIds } } + { filters: { acknowledgementIds, tenantId } }, + { filters: { acknowledgementIds, tenantId } } ); const [billAmount, setBillAmount] = useState(null); const [billStatus, setBillStatus] = useState(null); + let serviceSearchArgs = { + tenantId : tenantId, + code: [`PT_${data?.Properties?.[0]?.creationReason}`], + module: ["PT"], + referenceIds : [data?.Properties?.[0]?.acknowldgementNumber] + //removing thid as of now sending ack no in referenceId + // attributes: { + // "attributeCode": "referenceId", + // "value": data?.Properties?.[0]?.acknowldgementNumber, + // } + } + + const { isLoading:serviceloading, error : serviceerror, data : servicedata} = Digit.Hooks.pt.useServiceSearchCF({ filters: { serviceSearchArgs } },{ filters: { serviceSearchArgs }, enabled : data?.Properties?.[0]?.acknowldgementNumber ?true : false, cacheTime : 0 }); + + const properties = get(data, "Properties", []); const propertyId = get(data, "Properties[0].propertyId", []); let property = (properties && properties.length > 0 && properties[0]) || {}; const application = property; sessionStorage.setItem("pt-property", JSON.stringify(application)); + useMemo(() => { + if(data?.Properties?.[0]?.status === "ACTIVE" && popup == false && servicedata?.Service?.length == 0) + setpopup(true); + },[data,servicedata]) + useEffect(async () => { if (acknowledgementIds && tenantId && property) { const res = await Digit.PaymentService.searchBill(tenantId, { Service: "PT.MUTATION", consumerCode: acknowledgementIds }); @@ -517,7 +541,24 @@ const PTApplicationDetails = () => { )}
+ {showToast && ( + { + setShowToast(null); + }} + /> + )} + {/* setpopup(true)} /> */} + {/* {popup && ( +
+ +
+ )} */} + {popup && }
); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/PTMyApplications/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/PTMyApplications/index.js index 00d7a20362f..4fe71fb489f 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/PTMyApplications/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/PTMyApplications/index.js @@ -7,7 +7,7 @@ import { propertyCardBodyStyle } from "../../../utils"; export const PTMyApplications = () => { const { t } = useTranslation(); - const tenantId = Digit.ULBService.getCurrentTenantId(); + const tenantId = Digit.ULBService.getCitizenCurrentTenant(true) || Digit.ULBService.getCurrentTenantId(); const user = Digit.UserService.getUser().info; let filter = window.location.href.split("/").pop(); @@ -20,14 +20,35 @@ export const PTMyApplications = () => { t1 = 4; } let filter1 = !isNaN(parseInt(filter)) - ? { limit: "50", sortOrder: "ASC", sortBy: "createdTime", offset: off } - : { limit: "4", sortOrder: "ASC", sortBy: "createdTime", offset: "0",mobileNumber:user?.mobileNumber }; + ? { limit: "50", sortOrder: "ASC", sortBy: "createdTime", offset: off, tenantId } + : { limit: "4", sortOrder: "ASC", sortBy: "createdTime", offset: "0",mobileNumber:user?.mobileNumber, tenantId }; const { isLoading, isError, error, data } = Digit.Hooks.pt.usePropertySearch({ filters: filter1 }, { filters: filter1 }); - if (isLoading) { + + const { Properties: applicationsList } = data || {}; + let combinedApplicationNumber = applicationsList?.length > 0 ? applicationsList?.map((ob) => ob?.acknowldgementNumber) : []; + let serviceSearchArgs = { + tenantId : tenantId, + referenceIds : combinedApplicationNumber, + } + + const { isLoading:serviceloading, data : servicedata} = Digit.Hooks.useFeedBackSearch({ filters: { serviceSearchArgs } },{ filters: { serviceSearchArgs }, enabled : combinedApplicationNumber?.length > 0 ?true : false, cacheTime : 0 }); + + function getLabelValue(curservice){ + let foundValue = servicedata?.Service?.find((ob) => ob?.referenceId?.includes(curservice?.acknowldgementNumber)); + + if(foundValue) + return t("CS_CF_VIEW") + else if(!foundValue && curservice?.status?.includes("ACTIVE")) + return t("CS_CF_RATE_US") + else + return t("CS_CF_TRACK") + } + + if (isLoading || serviceloading) { return ; } - const { Properties: applicationsList } = data || {}; + return ( @@ -36,7 +57,7 @@ export const PTMyApplications = () => { {applicationsList?.length > 0 && applicationsList.map((application, index) => (
- +
))} {!applicationsList?.length > 0 &&

{t("PT_NO_APPLICATION_FOUND_MSG")}

} diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/PTMyApplications/pt-application.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/PTMyApplications/pt-application.js index 7710a66ce55..4b0183be38f 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/PTMyApplications/pt-application.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/PTMyApplications/pt-application.js @@ -3,7 +3,7 @@ import React from "react"; import { useTranslation } from "react-i18next"; import { Link } from "react-router-dom"; -const PTApplication = ({ application, tenantId }) => { +const PTApplication = ({ application, tenantId, buttonLabel }) => { const { t } = useTranslation(); return ( @@ -13,7 +13,7 @@ const PTApplication = ({ application, tenantId }) => { - + ); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/index.js index 744486d03f3..819730c11a5 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/index.js @@ -9,6 +9,7 @@ import { PTMyPayments } from "./MyPayments"; const hideBackButtonConfig = [ { screenPath: "property/new-application/acknowledgement" }, { screenPath: "property/edit-application/acknowledgement" }, + //{ screenPath: "property/feedback-acknowledgement" } ]; const App = () => { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/receipts/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/receipts/package.json index 0d9c11fa606..a4e115d3fc2 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/receipts/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/receipts/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-receipts", - "version": "1.6.0", + "version": "1.7.0-beta.1", "description": "RECEIPTS", "license": "MIT", "main": "dist/index.js", @@ -15,7 +15,7 @@ "prepublish": "yarn build" }, "dependencies": { - "@egovernments/digit-ui-react-components": "^1.3.0", + "@egovernments/digit-ui-react-components": "^1.7.0-beta.1", "react": "17.0.2", "react-dom": "17.0.2", "react-hook-form": "6.15.8", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/reports/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/reports/package.json index cee5d62d063..38a714ee5ab 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/reports/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/reports/package.json @@ -16,7 +16,7 @@ }, "dependencies": { - "@egovernments/digit-ui-react-components": "^1.6.0", + "@egovernments/digit-ui-react-components": "^1.7.0-beta.1", "react": "17.0.2", "react-dom": "17.0.2", "react-hook-form": "6.15.8", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/config/CompleteApplication.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/config/CompleteApplication.js index a4c7c96b2fd..7ac779f83d9 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/config/CompleteApplication.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/config/CompleteApplication.js @@ -24,7 +24,7 @@ export const configCompleteApplication = ({ t, vehicle, applicationCreatedTime = min: Digit.Utils.date.getDate(applicationCreatedTime), max: Digit.Utils.date.getDate(), }, - component: (props, customProps) => , + component: (props, customProps) => , }, }, { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/config/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/config/index.js index a75df054fe6..7cb9c280d80 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/config/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/config/index.js @@ -3,6 +3,10 @@ import { configCompleteApplication } from "./CompleteApplication"; import { configReassignDSO } from "./ReassignDso"; import { configRejectApplication } from "./RejectApplication"; import { configAcceptDso } from "./AcceptDso"; +<<<<<<< HEAD +<<<<<<< HEAD:frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/config/index.js +======= +>>>>>>> upstream/master import { configPTApproverApplication } from "./PTApproverApplication"; import { configPTAssessProperty } from "./PTAssessProperty"; import { configTLApproverApplication } from "./TLApproverApplication"; @@ -11,6 +15,14 @@ import { configBPAApproverApplication } from "./BPAApproverApplication"; import { configNOCApproverApplication } from "./NOCApproverApplication"; import { configWSApproverApplication } from "./WSApproverApplication"; import { configWSDisConnectApplication } from "./WSDisconnectApplication"; +<<<<<<< HEAD +======= +import { configScheduleDso } from "./ScheduleDso"; +import { configRejectFstpo } from "./RejectFstpo"; +import { configUpdateTrips } from "./UpdateTrips"; +>>>>>>> upstream/master:frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/config/index.js +======= +>>>>>>> upstream/master export { configAssignDso, @@ -18,6 +30,10 @@ export { configReassignDSO, configRejectApplication, configAcceptDso, +<<<<<<< HEAD +<<<<<<< HEAD:frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/config/index.js +======= +>>>>>>> upstream/master configPTApproverApplication, configPTAssessProperty, configTLApproverApplication, @@ -26,4 +42,12 @@ export { configNOCApproverApplication, configWSApproverApplication, configWSDisConnectApplication +<<<<<<< HEAD +======= + configScheduleDso, + configRejectFstpo, + configUpdateTrips, +>>>>>>> upstream/master:frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/config/index.js +======= +>>>>>>> upstream/master }; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/package.json index 62489f9d0c7..8e59bea4524 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-tl", - "version": "1.6.0", + "version": "1.7.0-beta.1", "license": "MIT", "main": "dist/index.js", "module": "dist/index.modern.js", @@ -19,7 +19,7 @@ }, "dependencies": { - "@egovernments/digit-ui-react-components": "^1.6.0", + "@egovernments/digit-ui-react-components": "^1.7.0-beta.1", "lodash.merge": "^4.6.2", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/Module.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/Module.js index 39555794eda..9d821367fb7 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/Module.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/Module.js @@ -14,7 +14,6 @@ import SelectProofIdentity from "./pageComponents/SelectProofIdentity"; import SelectOwnershipProof from "./pageComponents/SelectOwnershipProof"; import SelectTradeName from "./pageComponents/SelectTradeName"; import SelectStructureType from "./pageComponents/SelectStructureType"; -import SelectStreet from "./pageComponents/SelectStreet"; import SelectVehicleType from "./pageComponents/SelectVehicleType"; import SelectBuildingType from "./pageComponents/SelectBuildingType"; import SelectCommencementDate from "./pageComponents/SelectCommencementDate"; @@ -28,6 +27,7 @@ import MyApplications from "./pages/citizen/Applications/Application"; import TradeLicenseList from "./pages/citizen/Renewal/TradeLicenseList"; import TLWFApplicationTimeline from "./pageComponents/TLWFApplicationTimeline"; import SelectOtherTradeDetails from "./pageComponents/SelectOtherTradeDetails"; +import TLSelectStreet from "./pageComponents/TLSelectStreet"; import TLOwnerDetailsEmployee from "./pageComponents/TLOwnerDetailsEmployee"; import TLTradeDetailsEmployee from "./pageComponents/TLTradeDetailsEmployee"; @@ -119,7 +119,7 @@ const componentsToRegister = { SelectOwnerAddress, SelectProofIdentity, SelectOwnershipProof, - TLSelectStreet: SelectStreet, + TLSelectStreet, TLCheckPage, TLDocument, TLAcknowledgement, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/SelectStreet.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/TLSelectStreet.js similarity index 98% rename from frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/SelectStreet.js rename to frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/TLSelectStreet.js index d59513e1c8c..9984312d97e 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/SelectStreet.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/TLSelectStreet.js @@ -4,7 +4,7 @@ import { useForm, Controller } from "react-hook-form"; import _ from "lodash"; import Timeline from "../components/TLTimelineInFSM"; -const SelectStreet = ({ t, config, onSelect, userType, formData, formState, setError, clearErrors }) => { +const TLSelectStreet = ({ t, config, onSelect, userType, formData, formState, setError, clearErrors }) => { const onSkip = () => onSelect(); const [focusIndex, setFocusIndex] = useState({ index: -1, type: "" }); @@ -177,4 +177,4 @@ const SelectStreet = ({ t, config, onSelect, userType, formData, formState, setE ); }; -export default SelectStreet; \ No newline at end of file +export default TLSelectStreet; \ No newline at end of file diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/TLTradeUnitsEmployee.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/TLTradeUnitsEmployee.js index abe4390c154..280091d2ffb 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/TLTradeUnitsEmployee.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/TLTradeUnitsEmployee.js @@ -165,8 +165,8 @@ const TradeUnitForm = (_props) => { let tradeType = cloneDeep(filteredTradeDetails); let tradeCatogoryList = []; tradeType.map(data => { - data.code = data?.code?.split('.')[0]; - data.i18nKey = t(`TRADELICENSE_TRADETYPE_${data?.code?.split('.')[0]}`); + data.code = data?.tradeType?.split('.')[0]; + data.i18nKey = t(`TRADELICENSE_TRADETYPE_${data?.tradeType?.split('.')[0]}`); tradeCatogoryList.push(data); }); const filterTradeCategoryList = getUniqueItemsFromArray(tradeCatogoryList, "code"); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Renewal/renewTrade.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Renewal/renewTrade.js index 1c8e0529fa1..5753e88f966 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Renewal/renewTrade.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Renewal/renewTrade.js @@ -81,6 +81,7 @@ const getTradeEditDetails = (data,t) => { fatherOrHusbandName : ob?.fatherOrHusbandName, relationship : { code: ob?.relationship , i18nKey:ob.relationship?`COMMON_RELATION_${ob.relationship}`:"CS_NA"}, id: ob.id, + uuid : ob.uuid, }); }); return ownerarray; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json index 04b60a47b40..de23b97dd89 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-ws", - "version": "1.6.0", + "version": "1.7.0-beta.1", "description": "", "main": "dist/index.js", "module": "dist/index.modern.js", @@ -19,7 +19,7 @@ }, "dependencies": { - "@egovernments/digit-ui-react-components": "^1.6.0", + "@egovernments/digit-ui-react-components": "^1.7.0-beta.1", "react": "17.0.2", "react-dom": "17.0.2", "react-hook-form": "6.15.8", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/BillIAmendMentInbox/SearchFormFieldsComponent.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/BillIAmendMentInbox/SearchFormFieldsComponent.js index a849a3c088f..244181ffb04 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/BillIAmendMentInbox/SearchFormFieldsComponent.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/BillIAmendMentInbox/SearchFormFieldsComponent.js @@ -49,4 +49,4 @@ const SearchFormFieldsComponents = ({ registerRef, searchFormState }) => { ); }; -export default SearchFormFieldsComponents; \ No newline at end of file +export default SearchFormFieldsComponents; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/package.json index 6a19e01f868..9712b1be049 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-react-components", - "version": "1.6.1", + "version": "1.7.0-beta.1", "license": "MIT", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/CitizenConsentForm.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/CitizenConsentForm.js new file mode 100644 index 00000000000..a11462bd71c --- /dev/null +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/CitizenConsentForm.js @@ -0,0 +1,71 @@ +import React, { useState, useEffect } from "react"; +import { Loader, Modal } from ".."; + +const Heading = (props) => { + return

{props.label}

; +}; + +const Close = () => ( + + + +); + +const CloseBtn = (props) => { + return ( +
+ +
+ ); +}; + + +const CitizenConsentForm = ({ t, styles, mdmsConfig = "", setMdmsConfig, labels }) => { + const [showModal, setShowModal] = useState(false); + + useEffect(() => { + if (mdmsConfig && !showModal) setShowModal(true) + }, [mdmsConfig]) + + const closeModal = () => { + setShowModal(false); + setMdmsConfig("") + } + + const url = labels?.filter(data => data.linkId == mdmsConfig)?.[0]?.[Digit.StoreData.getCurrentLanguage()]; + + return ( +
+ {showModal ? } + headerBarEnd={} + actionCancelOnSubmit={closeModal} + formId="modal-action" + popupStyles={{ width: "750px", overflow: "auto" }} + style={{ minHeight: "45px", height: "auto", width: "160px" }} + hideSubmit={true} + headerBarMainStyle={{ margin: "0px", height: "35px" }} + + > + {url ? +
+ +
: +
+ {t("COMMON_URL_NOT_FOUND")} +
} + + : null} +
+ ); +}; + +export default CitizenConsentForm; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/Rating.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/Rating.js index 309e3d6e9a5..8771253cdb0 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/Rating.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/Rating.js @@ -7,6 +7,17 @@ const Rating = (props) => { var stars = []; const star = useRef(null); + const calculatingPercentage = (percentage) => { + if (percentage >= 85 && percentage < 90) { + return percentage - 8 + } else if (percentage >= 90 && percentage < 95) { + return percentage - 12 + } else if(percentage >= 95) { + return percentage - 15 + } else { + return percentage + } + } for (var i = 1; i <= props.maxRating; i++) { if (i - props.currentRating <= 0) { const index = i; @@ -14,7 +25,7 @@ const Rating = (props) => { stars.push( props.onFeedback(e, star, index)} />); } else if (i - props.currentRating > 0 && i - props.currentRating < 1) { const index = i; - stars.push( props.onFeedback(e, star, index)} percentage={Math.round(((props.currentRating - parseInt(props.currentRating)) * 100))} />) + stars.push( props.onFeedback(e, star, index)} percentage={calculatingPercentage(Math.round(((props.currentRating - parseInt(props.currentRating)) * 100)))} />) } else { const index = i; // stars.push(star emptyprops.onFeedback(e,ref)}/>) @@ -23,9 +34,23 @@ const Rating = (props) => { } return ( -
- {props.text ? props.text : ""} {stars} +
+ {props?.toolTipText ? +
+
+
+

{props.text ? props.text : ""} {stars}

+ + {`${props.currentRating}`} + +
+
+
: +
+ {props.text ? props.text : ""} {stars} +
}
+ ); }; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/StatusTable.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/StatusTable.js index fa1cae580b7..80f6171b936 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/StatusTable.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/StatusTable.js @@ -78,7 +78,10 @@ export const Row = (props) => { else{ return (
-

{props.label}

+

+ {props.label} + {props.labelChildren && props.labelChildren} +

{/* {value}//// {props?.privacy && ( diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/Tempo.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/Tempo.js new file mode 100644 index 00000000000..989c0d0d452 --- /dev/null +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/Tempo.js @@ -0,0 +1,111 @@ +import React, { useState, useEffect } from "react"; +import { Loader, CheckBox, Modal } from ".."; + +const Heading = (props) => { + return

{props.label}

; +}; + +const Close = () => ( + + + +); + +const CloseBtn = (props) => { + return ( +
+ +
+ ); +}; + + +const Tempo = ({ t, styles, mdmsConfig = "", setMdmsConfig }) => { + const [selectedData, setSelectedData] = useState({}); + const [showModal, setShowModal] = useState(); + const isMobile = window.Digit.Utils.browser.isMobile(); + + const { isLoading, data: tempoData } = Digit.Hooks.useCustomMDMS(Digit.ULBService.getStateId(), "common-masters", [{ name: mdmsConfig }]); + + useEffect(() => { + if (mdmsConfig && !showModal) setShowModal(true) + }, [mdmsConfig]) + + useEffect(() => { + if (tempoData?.["common-masters"]?.[mdmsConfig]) { + setSelectedData(tempoData?.["common-masters"]?.[mdmsConfig]); + } + }, [tempoData]) + + const closeModal = () => { + setShowModal(false); + setMdmsConfig("") + } + + + return ( +
+ {showModal ? } + headerBarEnd={} + actionCancelOnSubmit={closeModal} + formId="modal-action" + popupStyles={{ width: "720px", overflow: "auto" }} + style={{ minHeight: "45px", height: "auto", width: "160px" }} + hideSubmit={true} + headerBarMainStyle={{ margin: "0px", height: "35px" }} + > + {isLoading ? : null} + + {!isLoading &&
+ {selectedData?.length > 0 && + selectedData?.map((value) => +
+ {value?.header && +
+ {t(value.header)} +
} + {value?.paragragh?.length && + value.paragragh.map((para) => +
+ {para?.paras?.map((value, index) => { + return + {/* {index == 0 && "CCF_PP"} */} + {value && {`${t(value)}`}} + {para?.linkLabels?.[index] && {`${t(para?.linkLabels?.[index])}`}} + {/* {index == para?.paras?.length - 1 && "LABEL"} */} + + })} +
+ ) + } + {value?.bulletinPoints?.length && +
+
    + {value?.bulletinPoints?.map((point) =>
  • {t(point)}
    • )} +
+
+ } + {value?.numericPoints?.length && +
+
    + {value.numericPoints.map((point) =>
  1. {t(point)}
    2. )} +
+
+ } + {value?.subParagragh?.length && + value.subParagragh.map((subPara) => +
+ {t(subPara)} +
+ ) + } +
+ )}
} + + : null} +
+ ); +}; + +export default Tempo; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/WrapUnMaskComponent.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/WrapUnMaskComponent.js new file mode 100644 index 00000000000..0d528e535da --- /dev/null +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/WrapUnMaskComponent.js @@ -0,0 +1,79 @@ +import _ from "lodash"; +import PropTypes from "prop-types"; +import React, { useState } from "react"; +import { useTranslation } from "react-i18next"; +import { Loader, UnMaskComponent } from ".."; +import { PrivacyMaskIcon } from ".."; +/** + * Custom Component to demask the masked values. + * + * @author jagankumar-egov + * + * Feature :: Privacy + * + * @example + * + */ + +const formatValue = (showValue) => { + return ( + showValue && Digit.Utils.locale.stringReplaceAll(showValue, showValue?.substring(showValue?.indexOf("*"), showValue?.lastIndexOf("*") + 1), "") + ); +}; + +const WrapUnMaskComponent = React.memo(({ privacy = {}, value, unmaskField, ...rem }) => { + const [privacyState, setPrivacyState] = useState(false); + const { loadData = {} } = privacy; + const { t } = useTranslation(); + const aaa = [ + loadData?.serviceName, + loadData?.requestParam, + loadData?.requestBody, + { recordId: privacy?.uuid, plainRequestFields: Array.isArray(privacy?.fieldName) ? privacy?.fieldName : [privacy?.fieldName] }, + { + enabled: privacyState, + select: (data) => { + if (loadData?.d) { + return loadData?.d(data, value); + } + return unmaskField ? unmaskField(_.get(data, loadData?.jsonPath, value)) : _.get(data, loadData?.jsonPath, value); + }, + }, + ]; + const { isLoading, data, ...orr } = Digit.Hooks.useCustomAPIHook(...aaa); + if (isLoading) { + return !unmaskField ? :
+
; + } + + return privacy?.uuid && data ? ( + + {!unmaskField && t(data)} + {!unmaskField && privacy?.showValue && formatValue(value)} + + ) : ( + + {!unmaskField && value} + {privacy && ( + + { + privacy?.uuid && loadData && setPrivacyState(true); + }} + {...rem} + > + + )} + + ); +}); + +WrapUnMaskComponent.propTypes = { + privacy: PropTypes.object, +}; +WrapUnMaskComponent.defaultProps = { + privacy: { uuid: "", fieldName: "", model: "" }, +}; + +export default WrapUnMaskComponent; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/svgindex.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/svgindex.js index a501eafa73d..dbabff4f686 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/svgindex.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/svgindex.js @@ -192,8 +192,8 @@ const DocumentIcon = () => ( ); -const DocumentIconSolid = () => ( - +const DocumentIconSolid = ({styles, className}) => ( + @@ -671,10 +671,10 @@ const PersonIcon = ({ className, styles }) => ( ); -const ReceiptIcon = () => ( - +const ReceiptIcon = ({styles, className}) => ( + - + ); @@ -760,7 +760,7 @@ const BPAHomeIcon = ({ className, styles }) => ( fillRule="evenodd" clipRule="evenodd" d="M30.3333 0H3.66659C1.83325 0 0.333252 1.5 0.333252 3.33333V26.6667C0.333252 28.5 1.83325 30 3.66659 30H30.3333C32.1666 30 33.6666 28.5 33.6666 26.6667V3.33333C33.6666 1.5 32.1666 0 30.3333 0ZM13.6666 23.3333H5.33325V20H13.6666V23.3333ZM13.6666 16.6667H5.33325V13.3333H13.6666V16.6667ZM13.6666 10H5.33325V6.66667H13.6666V10ZM21.6999 20L16.9999 15.2667L19.3499 12.9167L21.6999 15.2833L26.9833 10L29.3499 12.3667L21.6999 20Z" - fill="white" + //fill="white" /> ); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/FormComposer.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/FormComposer.js index 46341973103..96b6fbd7d92 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/FormComposer.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/FormComposer.js @@ -281,6 +281,7 @@ export const FormComposer = (props) => { {t(field.label)} {field.isMandatory ? " * " : null} + {field.labelChildren && field.labelChildren} )}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/index.js index 7ddaef05793..3fb04f03aba 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/index.js @@ -222,6 +222,9 @@ import OpenLinkContainer from "./atoms/OpenLinkContainer"; import UploadPitPhoto from "./molecules/UploadPitPhoto"; import { DownloadBtnCommon } from "./atoms/svgindex"; import ToggleSwitch from "./atoms/ToggleSwitch"; + +import CitizenConsentForm from "./atoms/CitizenConsentForm"; + export { Phone, Body, @@ -453,4 +456,5 @@ export { FirenocIcon, InfoIcon, LoginIcon, + CitizenConsentForm }; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/FormStep.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/FormStep.js index 032aeb5a888..0495fc05d24 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/FormStep.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/FormStep.js @@ -40,7 +40,7 @@ const FormStep = ({ if (input.type === "text") { return ( - {t(input.label)} + {t(input.label)} {input.labelChildren && input.labelChildren} {errors[input.name] && {t(input.error)}}
{componentInFront ? {componentInFront} : null} diff --git a/frontend/micro-ui/web/micro-ui-internals/publish-beta.sh b/frontend/micro-ui/web/micro-ui-internals/publish-beta.sh new file mode 100644 index 00000000000..fc0031449da --- /dev/null +++ b/frontend/micro-ui/web/micro-ui-internals/publish-beta.sh @@ -0,0 +1,70 @@ +#!/bin/bash + +BASEDIR="$(cd "$(dirname "$0")" && pwd)" + +msg() { + echo -e "\n\n\033[32;32m$1\033[0m" +} + +# msg "Pre-building all packages" +# yarn build +# sleep 5 + +msg "Building and publishing css" +cd "$BASEDIR/packages/css" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --access public + +msg "Building and publishing libraries" +cd "$BASEDIR/packages/libraries" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag urban-2.9-beta + +msg "Building and publishing react-components" +cd "$BASEDIR/packages/react-components" && rm -rf node_modules && rm -rf dist&& yarn build && npm publish --tag urban-2.9-beta + +# sleep 10 +# msg "Updating dependencies" +# cd "$BASEDIR" && yarn upgrade -S @egovernments +# sleep 5 + +msg "Building and publishing PGR module" +cd "$BASEDIR/packages/modules/pgr" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag urban-2.9-beta + +msg "Building and publishing FSM module" +cd "$BASEDIR/packages/modules/fsm" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag urban-2.9-beta + +msg "Building and publishing PT module" +cd "$BASEDIR/packages/modules/pt" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag urban-2.9-beta + +msg "Building and publishing DSS module" +cd "$BASEDIR/packages/modules/dss" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag urban-2.9-beta + +msg "Building and publishing Common module" +cd "$BASEDIR/packages/modules/common" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag urban-2.9-beta + +msg "Building and publishing Core module" +cd "$BASEDIR/packages/modules/core" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag urban-2.9-beta + +msg "Building and publishing OBPS module" +cd "$BASEDIR/packages/modules/obps" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag urban-2.9-beta + +msg "Building and publishing tl module" +cd "$BASEDIR/packages/modules/tl" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag urban-2.9-beta + +msg "Building and publishing bills module" +cd "$BASEDIR/packages/modules/bills" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag urban-2.9-beta + +msg "Building and publishing noc module" +cd "$BASEDIR/packages/modules/noc" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag urban-2.9-beta + +msg "Building and publishing commonPt module" +cd "$BASEDIR/packages/modules/commonPt" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag urban-2.9-beta + +msg "Building and publishing engagement module" +cd "$BASEDIR/packages/modules/engagement" && rm -rf node_modules && rm -rf dis && yarn build && npm publish --tag urban-2.9-beta + +msg "Building and publishing receipts module" +cd "$BASEDIR/packages/modules/receipts" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag urban-2.9-beta + +msg "Building and publishing hrms module" +cd "$BASEDIR/packages/modules/hrms" && rm -rf node_modules && rm -rf dist && yarn build&& npm publish --tag urban-2.9-beta + +msg "Building and publishing ws module" +cd "$BASEDIR/packages/modules/ws" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag urban-2.9-beta diff --git a/frontend/micro-ui/web/micro-ui-internals/publish.sh b/frontend/micro-ui/web/micro-ui-internals/publish.sh index 16549a284dd..e91a397e06c 100644 --- a/frontend/micro-ui/web/micro-ui-internals/publish.sh +++ b/frontend/micro-ui/web/micro-ui-internals/publish.sh @@ -11,13 +11,13 @@ msg() { # sleep 5 msg "Building and publishing css" -cd "$BASEDIR/packages/css" && yarn publish --access public +cd "$BASEDIR/packages/css" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --access public msg "Building and publishing libraries" -cd "$BASEDIR/packages/libraries" && yarn publish --access public +cd "$BASEDIR/packages/libraries" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --access public msg "Building and publishing react-components" -cd "$BASEDIR/packages/react-components" && yarn publish --access public +cd "$BASEDIR/packages/react-components" && rm -rf node_modules && rm -rf dist&& yarn build && npm publish --access public # sleep 10 # msg "Updating dependencies" @@ -25,19 +25,46 @@ cd "$BASEDIR/packages/react-components" && yarn publish --access public # sleep 5 msg "Building and publishing PGR module" -cd "$BASEDIR/packages/modules/pgr" && yarn publish --access public +cd "$BASEDIR/packages/modules/pgr" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --access public msg "Building and publishing FSM module" -cd "$BASEDIR/packages/modules/fsm" && yarn publish --access public +cd "$BASEDIR/packages/modules/fsm" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --access public msg "Building and publishing PT module" -cd "$BASEDIR/packages/modules/pt" && yarn publish --access public +cd "$BASEDIR/packages/modules/pt" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --access public msg "Building and publishing DSS module" -cd "$BASEDIR/packages/modules/dss" && yarn publish --access public +cd "$BASEDIR/packages/modules/dss" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --access public msg "Building and publishing Common module" -cd "$BASEDIR/packages/modules/common" && yarn publish --access public +cd "$BASEDIR/packages/modules/common" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --access public msg "Building and publishing Core module" -cd "$BASEDIR/packages/modules/core" && yarn publish --access public +cd "$BASEDIR/packages/modules/core" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --access public + +msg "Building and publishing OBPS module" +cd "$BASEDIR/packages/modules/obps" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --access public + +msg "Building and publishing tl module" +cd "$BASEDIR/packages/modules/tl" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --access public + +msg "Building and publishing bills module" +cd "$BASEDIR/packages/modules/bills" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --access public + +msg "Building and publishing noc module" +cd "$BASEDIR/packages/modules/noc" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --access public + +msg "Building and publishing commonPt module" +cd "$BASEDIR/packages/modules/commonPt" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --access public + +msg "Building and publishing engagement module" +cd "$BASEDIR/packages/modules/engagement" && rm -rf node_modules && rm -rf dis && yarn build && npm publish --access public + +msg "Building and publishing receipts module" +cd "$BASEDIR/packages/modules/receipts" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --access public + +msg "Building and publishing hrms module" +cd "$BASEDIR/packages/modules/hrms" && rm -rf node_modules && rm -rf dist && yarn build&& npm publish --access public + +msg "Building and publishing ws module" +cd "$BASEDIR/packages/modules/ws" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --access public diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index 57045fc72f0..80ec6ffacd3 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -1,6 +1,6 @@ { "name": "micro-ui", - "version": "1.6.1", + "version": "1.7.0-beta.1", "private": true, "homepage": "/digit-ui", "workspaces": [ @@ -8,11 +8,9 @@ "micro-ui-internals/packages/react-components", "micro-ui-internals/packages/modules/bills", "micro-ui-internals/packages/modules/common", - "micro-ui-internals/packages/modules/commonPt", "micro-ui-internals/packages/modules/core", "micro-ui-internals/packages/modules/dss", "micro-ui-internals/packages/modules/engagement", - "micro-ui-internals/packages/modules/pgr", "micro-ui-internals/packages/modules/pt", "micro-ui-internals/packages/modules/tl", "micro-ui-internals/packages/modules/ws", @@ -22,23 +20,24 @@ "node": ">=14" }, "dependencies": { - "@egovernments/digit-ui-libraries": "1.6.1", - "@egovernments/digit-ui-module-bills": "1.6.0", - "@egovernments/digit-ui-module-common": "1.6.1", - "@egovernments/digit-ui-module-core": "1.6.0", - "@egovernments/digit-ui-module-engagement": "1.6.0", - "@egovernments/digit-ui-module-dss": "1.6.0", - "@egovernments/digit-ui-module-fsm": "1.6.1", - "@egovernments/digit-ui-module-hrms": "1.6.0", - "@egovernments/digit-ui-module-mcollect": "1.6.0", - "@egovernments/digit-ui-module-obps": "1.6.0", - "@egovernments/digit-ui-module-noc": "1.6.0", - "@egovernments/digit-ui-module-pgr": "1.6.0", - "@egovernments/digit-ui-module-pt": "1.6.0", - "@egovernments/digit-ui-module-receipts": "1.6.0", - "@egovernments/digit-ui-module-tl": "1.6.0", - "@egovernments/digit-ui-module-ws": "1.6.0", - "@egovernments/digit-ui-react-components": "1.6.1", + "@egovernments/digit-ui-libraries": "1.7.0-beta.1", + "@egovernments/digit-ui-module-bills": "1.7.0-beta.1", + "@egovernments/digit-ui-module-common": "1.7.0-beta.1", + "@egovernments/digit-ui-module-core": "1.7.0-beta.1", + "@egovernments/digit-ui-module-engagement": "1.7.0-beta.1", + "@egovernments/digit-ui-module-dss": "1.7.0-beta.1", + "@egovernments/digit-ui-module-fsm": "1.7.0-beta.1", + "@egovernments/digit-ui-module-hrms": "1.7.0-beta.1", + "@egovernments/digit-ui-module-mcollect": "1.7.0-beta.1", + "@egovernments/digit-ui-module-commonpt":"1.7.0-beta.1", + "@egovernments/digit-ui-module-obps": "1.7.0-beta.1", + "@egovernments/digit-ui-module-noc": "1.7.0-beta.1", + "@egovernments/digit-ui-module-pgr": "1.7.0-beta.1", + "@egovernments/digit-ui-module-pt": "1.7.0-beta.1", + "@egovernments/digit-ui-module-receipts": "1.7.0-beta.1", + "@egovernments/digit-ui-module-tl": "1.7.0-beta.1", + "@egovernments/digit-ui-module-ws": "1.7.0-beta.1", + "@egovernments/digit-ui-react-components": "1.7.0-beta.1", "babel-loader": "8.1.0", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/frontend/micro-ui/web/public/index.html b/frontend/micro-ui/web/public/index.html index 3337e3054f9..51e8b7805ba 100644 --- a/frontend/micro-ui/web/public/index.html +++ b/frontend/micro-ui/web/public/index.html @@ -4,7 +4,7 @@ - + diff --git a/frontend/micro-ui/web/src/App.js b/frontend/micro-ui/web/src/App.js index a9035df3aec..a3ee8b76f89 100644 --- a/frontend/micro-ui/web/src/App.js +++ b/frontend/micro-ui/web/src/App.js @@ -74,7 +74,7 @@ window.Digit.ComponentRegistryService.setupRegistry({ HRMSModule, TLModule, TLLinks, - ReceiptsModule + // ReceiptsModule }); initPGRComponents(); @@ -83,7 +83,7 @@ initDSSComponents(); initMCollectComponents(); initHRMSComponents(); initTLComponents(); -initReceiptsComponents(); +// initReceiptsComponents(); initOBPSComponents(); initNOCComponents(); initEngagementComponents(); diff --git a/frontend/mono-ui/web/dss-dashboard/package.json b/frontend/mono-ui/web/dss-dashboard/package.json index 5f0a2597dd0..d3b340e99b8 100644 --- a/frontend/mono-ui/web/dss-dashboard/package.json +++ b/frontend/mono-ui/web/dss-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "e-governance", - "version": "1.9.0", + "version": "1.10.0-beta", "private": true, "homepage": "/dashboard/", "proxy": "https://qa.digit.org", diff --git a/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/SingleCheckbox/index.js b/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/SingleCheckbox/index.js index ca44a1d2fca..47aa051cc12 100644 --- a/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/SingleCheckbox/index.js +++ b/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/SingleCheckbox/index.js @@ -14,6 +14,12 @@ const defaultStyle = { const selectedLabelStyle = { color: "#00bcd1", }; +const checkBoxWidth = { + width: "20px", + display: "inline-block" +} + + const SingleCheckboxUi = ({ defaultValue, value, @@ -26,21 +32,25 @@ const SingleCheckboxUi = ({ containerClassName, id, disabled, + isSeperateLabel = "", }) => { const renderCheckbox = () => { return ( - + + {isSeperateLabel && {isSeperateLabel}} +
); }; diff --git a/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/SingleCheckbox/index.scss b/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/SingleCheckbox/index.scss index 4e54f5c0eaf..c155231f880 100644 --- a/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/SingleCheckbox/index.scss +++ b/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/SingleCheckbox/index.scss @@ -1,3 +1,7 @@ .checkbox-container { padding-left: 0; } + +.checkbox-container svg{ + fill: #FE7A51 !important; +} diff --git a/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/redux/app/actionTypes.js b/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/redux/app/actionTypes.js index 0094b339b04..a2eec0117e6 100644 --- a/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/redux/app/actionTypes.js +++ b/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/redux/app/actionTypes.js @@ -31,6 +31,7 @@ export const FETCH_RESET_INBOX_RECORDS = "FETCH_RESET_INBOX_RECORDS"; export const FETCH_ACTIONMENU_PENDING = "FETCH_ACTIONMENU_PENDING"; export const FETCH_ACTIONMENU_ERROR = "FETCH_ACTIONMENU_ERROR"; export const FETCH_ESCALATED_INBOX_RECORDS_COMPLETE = "FETCH_ESCALATED_INBOX_RECORDS_COMPLETE"; +export const FETCH_CITIZEN_CONSENT_FORM = "FETCH_CITIZEN_CONSENT_FORM"; diff --git a/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/redux/app/actions.js b/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/redux/app/actions.js index 8a96dea0317..77089366bc8 100644 --- a/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/redux/app/actions.js +++ b/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/redux/app/actions.js @@ -459,4 +459,39 @@ export const resetFetchRecords = () => { return async (dispatch, getState) => { dispatch(fetchResetInboxRecords()); }; +}; + +export const setCitizenConsertFormData = (payload) => { + return { + type: actionTypes.FETCH_CITIZEN_CONSENT_FORM, + payload, + }; +}; + +export const fetchCitizenConsentForm = () => { + return async (dispatch) => { + const requestBody = { + MdmsCriteria: { + tenantId: commonConfig.tenantId, + moduleDetails: [ + { + moduleName: "common-masters", + masterDetails: [ + { + name: "CitizenConsentForm", + }, + ], + }, + ], + }, + }; + try { + const payload = await httpRequest(MDMS.GET.URL, MDMS.GET.ACTION, [], requestBody); + const { MdmsRes } = payload; + const commonMasters = MdmsRes["common-masters"]; + const citizenConsertFormData = commonMasters["CitizenConsentForm"]; + dispatch(setCitizenConsertFormData(citizenConsertFormData[0])); + } catch (error) { + } + }; }; \ No newline at end of file diff --git a/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/redux/app/reducer.js b/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/redux/app/reducer.js index 0a7f96285da..24707135b59 100644 --- a/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/redux/app/reducer.js +++ b/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/redux/app/reducer.js @@ -222,6 +222,9 @@ const appReducer = (state = initialState, action) => { errorMessage:action.payload }, }; + case actionTypes.FETCH_CITIZEN_CONSENT_FORM: { + return { ...state, citizenConsentForm: action.payload }; + } default: return state; } diff --git a/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/utils/reportResult.js b/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/utils/reportResult.js index 8cb9aeae390..4b025ae63a0 100644 --- a/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/utils/reportResult.js +++ b/frontend/mono-ui/web/rainmaker/dev-packages/egov-ui-kit-dev/src/utils/reportResult.js @@ -846,7 +846,7 @@ class ShowField extends Component {