Skip to content

Commit

Permalink
UM-5999 Merging develop to master (#5422)
Browse files Browse the repository at this point in the history
* 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 <saurabh.s@egovernments.org>

* 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 <ayushgupta@trisysit.com>

* SAN-784 : FSM:: FSTPO:: Entered vehicle in time is rounding off to single "0" (#1309)

Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>

* 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 <ramkrishna.sahoo@egovernments.org>

* 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 <ramkrishna.sahoo@egovernments.org>

Co-authored-by: RamkrishnaEgovt <ramkrishna.sahoo@egovernments.org>

* RAIN-4981 : UI Build Issue  fix (#1357)

Co-Authored-By: RamkrishnaEgovt <ramkrishna.sahoo@egovernments.org>

Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>
Co-authored-by: RamkrishnaEgovt <ramkrishna.sahoo@egovernments.org>

* 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 <nabeel.md@egovernments.com>

* 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 <nabeel.md@egovernments.com>

* 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 <sushant@trisysit.com>

* 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 <nabeel.md@egovernments.com>
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 <sushant@trisysit.com>

* SAN-823: changes to handle gender of DSO (#1407)

Co-authored-by: Sushant Agrawal <sushant@trisysit.com>

* 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 <talele.aniket@gmail.com>

* 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 <kaviyarasanit@gmail.com>

* 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 <shashwat.mishra@egovernments.org>
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 <talele.aniket@gmail.com>

* 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 <talele08@users.noreply.github.com>
Co-authored-by: talele08 <talele.aniket@gmail.com>
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 <talele.aniket@gmail.com>
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 <rohit.shende@egovernments.org>

* 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 <kaviyarasanit@gmail.com>
Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com>
Co-authored-by: Shashwat Mishra <shashwat.mishra@egovernments.org>
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 <rohit.shende@egovernments.org>

* 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 <vinoth.r@egovernments.org>
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 <tulika.kundu@egovernments.org>
Co-authored-by: saurabh-egov <saurabh.s@egovernments.org>
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 <ayushgupta@trisysit.com>
Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com>
Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>
Co-authored-by: lakshmisravani-wtt-egov <80089327+lakshmisravani-wtt-egov@users.noreply.github.com>
Co-authored-by: vamshikrishnakole-wtt-egov <vamshikrishna.kole@egovernments.org>
Co-authored-by: Nipun Arora <aroranipun1@gmail.com>
Co-authored-by: RamkrishnaEgovt <ramkrishna.sahoo@egovernments.org>
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 <sushant@trisysit.com>
Co-authored-by: Ramkrishna-egov <85437265+Ramkrishna-egov@users.noreply.github.com>
Co-authored-by: kaviyarasan1993 <kaviyarasanit@gmail.com>
Co-authored-by: Shashwat Mishra <shashwat.mishra@egovernments.org>
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 <rohit.shende@egovernments.org>
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)

…
  • Loading branch information
Show file tree
Hide file tree
Showing 137 changed files with 2,374 additions and 365 deletions.
2 changes: 1 addition & 1 deletion frontend/micro-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "digit-ui",
"version": "1.6.1"
"version": "1.7.0-beta.1"
}
12 changes: 12 additions & 0 deletions frontend/micro-ui/web/micro-ui-internals/example/.env-nugp
Original file line number Diff line number Diff line change
@@ -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
28 changes: 14 additions & 14 deletions frontend/micro-ui/web/micro-ui-internals/example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@
"start": "react-scripts start"
},
"devDependencies": {
"@egovernments/digit-ui-libraries": "^1.6.2",
"@egovernments/digit-ui-module-common": "^1.6.2",
"@egovernments/digit-ui-module-engagement": "^1.6.0",
"@egovernments/digit-ui-module-fsm": "^1.6.2",
"@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.1",
"@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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
};
6 changes: 2 additions & 4 deletions frontend/micro-ui/web/micro-ui-internals/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-css",
"version": "1.6.2",
"version": "1.6.4",
"license": "MIT",
"main": "dist/index.css",
"engines": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -389,4 +389,4 @@
position: unset !important;
margin: 0 !important;
width: 100% !important;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-libraries",
"version": "1.6.2",
"version": "1.7.0-beta.1",
"main": "dist/index.js",
"module": "dist/index.modern.js",
"source": "src/index.js",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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,
},
Expand All @@ -38,11 +38,15 @@ const defaultSelect = (data) => {

const useGetChart = (args) => {
const { key, type, tenantId, requestDate, filters, moduleLevel, addlFilter } = args;
const indexKeyForEmptyModule = [
"nssPtCitizenFeedbackScore",
"nssPtCitizenServiceDeliveryIndex",
];
return useQuery(
[args],
() =>
DSSService.getCharts({
...getRequest(type, key, requestDate, filters, moduleLevel, addlFilter),
...getRequest(type, key, requestDate, filters, moduleLevel, addlFilter, indexKeyForEmptyModule),
headers: {
tenantId,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -324,6 +327,8 @@ const pt = {
usePTGenderMDMS,
useMyPropertyPayments,
useGenericViewProperty,
useRatingAndFeedbackMDMS,
useServiceSearchCF,
};

const dss = {
Expand Down Expand Up @@ -513,6 +518,7 @@ const Hooks = {
useDocumentSearch,
useTenants,
useInbox: useTLInbox,
useFeedBackSearch,
useAccessControl,
useBillSearch,
useCancelBill,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 },
}),
};
Loading

0 comments on commit 0ad561e

Please sign in to comment.