Skip to content

Commit

Permalink
merging master to master-flyway-imageupdate (#800)
Browse files Browse the repository at this point in the history
* HLM Health-HRMS bug fix, user was set to null in hrms update as the t… (#761)

* HLM Health-HRMS bug fix, user was set to null in hrms update as the tenantid was not provided during internal search

* HLM updated hrms user type

* updated type from individual create

* Addressed code review comments

* Added code comments and fixme todo as per code review comments

* HLM updated flyway migration docker version

* Revert "HLM updated flyway migration docker version"

This reverts commit 1f1167e.

* Updated code comments on EmployeeService update method

* Update EmployeeService.java

* Updated code comments on EmployeeService, added changes for NPE handling

---------

Co-authored-by: kavi_elrey@1993 <[email protected]>

* HLM-6185: Added null check for the project task resources list (#767)

* HLM-6185: Added null check for the project task resources list

* HLM-6185: updated transformer logic for project task with beneficiary task and status population

* microplan-ui (#782)

* microplan-ui

* adding HLM-6172 changes

* hiding unique identifier column

* Update build-config.yml

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* adding digti frontend pr 934 changes

* Update build-config.yml

* removing pl tl and template files

* removed unnecessary code

* Delete frontend/microplan-ui/Jenkinsfile

* updating operation to match api changes

* updating operation to match api changes

* Update README.md

* Update README.md

* microplan-ui adding uploadguidelines and removing unnecessary files

---------

Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: SriPadma8997-egov <[email protected]>

* Admin console Improved performance, sheets freezed, implemented caching, delivery type integarted (#790)

* Update campaignValidators.ts (#655)

* fixes-> cyclenumber issue, hover issue, dropdown height issue,

* css

* fixes-> cyclenumber issue, hover issue, dropdown height issue, (#656)

* fixes-> cyclenumber issue, hover issue, dropdown height issue,

* css

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Update campaignUtils.ts

* fixed HLM-5970

* Feat : added boundary validation at data level

* fixes

* local add

* Added boundary validation

* Refactor

* fixed HLM-5935 and HLM-5749

* Refactor

* Feat : updated table

* change campaignid in payload

* Feat : added campaignId

* Update campaignApis.ts

* Update campaignValidators.ts

* refactored

* Refactor

* assigned campaignId

* Refactor

* updated createRequest Schema

* Feat : invalid Status Persist

* status fix

* version-fix

* Update CODEOWNERS

* core version updated and css fix for language dropdown

* refactor (#676)

* Uat signoff (#678)

* change in filter recursive

* lowest level

* added validation related to target sheet headers

* HLM-5916

* download button fixes in summary (#682)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Hlm 5927 (#687)

* change in filter recursive

* lowest level

* added validation for boundary codes to be invalid other than that selected from UI in target upload

* Added Delivery and cycle config for LLIN and SMC both (#688)

* no of cycle and deivery drafted changes

* fixes

* add localisation code for boundaries

* fixes

* fixes

* Value localise in summary screen, api error change

* fixes

* genarate api call fix

* font size change for summary

* login css change

* HLM-5718: SMC delivery config enhancement

* config update

* added config for in between

* fix config for llin

* added mdms integration

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Fixed HLM-5988_warning message (#689)

Co-authored-by: nabeelmd-eGov <[email protected]>

* download filename fixes (#693)

* download button fixes in summary

* download filename with custom name changes added

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* download filename fixes (#694)

* download button fixes in summary

* download filename with custom name changes added

* config fix for llin

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* successful toast message is fixed (#695)

* successful toast message is fixed

* Update UploadData.js

* HLM-5991: Alert Pop UP CR (#696)

Co-authored-by: nabeelmd-eGov <[email protected]>

* HLM-5718 changes (#703)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Localization cache (#706)

* change in filter recursive

* lowest level

* refactored  localization cache logic

* Update README.md (#707)

* Update README.md

* Update README.md

* Update utilities/project-factory/README.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update README.md

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* HLM-5985_made lowest level changes (#708)

* HLM-5985_made lowest level changes

* resolved codeRabbit comments

* Create LOCALSETUP.md (#709)

* Create LOCALSETUP.md

* Refactored config

* Update LOCALSETUP.md

* Update utilities/project-factory/LOCALSETUP.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/LOCALSETUP.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/LOCALSETUP.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/LOCALSETUP.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update LOCALSETUP.md

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* updated the localisation module config

* Refactor config (#713)

* Refactor config

* Update utilities/project-factory/src/server/validators/campaignValidators.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/src/server/validators/campaignValidators.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/src/server/validators/campaignValidators.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update postman_collection.json (#714)

* Update postman_collection.json

* Update postman_collection.json

* Delete utilities/project-factory/project_factory_swagger.yml (#715)

* Feat : removed campaignId validation for boundary upload (#718)

* updated the delay for boundary relationship

* added logger for request TODO TEST

will be reverted

* Revert "added logger for request TODO TEST"

This reverts commit d5c2bf5.

* Schema validation (#719)

* Feat : removed campaignId validation for boundary upload

* Feat : added schema validation

* Fixed mdms host

* updated the logger messages

* updated the loggers

* delivery new changes, toast fix, error fix (#716)

* delivery new changes, toast fix, error fix

* new fixes

* fixes

* change text component to field component

* added hierarchy

* fix

* fix

* fix

* fix

* passing hierarchy from props

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Schema validation2 (#721)

* Feat : removed campaignId validation for boundary upload

* Feat : added schema validation

* Fixed mdms host

* Feat : added boundary validation

* Feat : optimized product search

* Fix : project mapping fixed (#722)

* Fixed project search (#723)

* smc fixes (#724)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Feat : added boundary confirmation (#727)

* Fix: fixed processing boundary

* Refactor

* fixed HLM-6109 (#729)

* gate fixes validation, ui ux (#731)

Co-authored-by: nabeelmd-eGov <[email protected]>

* integrated panelcard component (#732)

* integrated panelcard component

* Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/Response.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update genericUtils.ts (#733)

* updated the folder structure

* Create CHANGELOG.md (#717)

* updated the versions

* Update .gitignore

* Update request.ts (#735)

* fixed generate api issue (#734)

Co-authored-by: Jagankumar <[email protected]>

* Create CHANGELOG.md

* gate fixes (#736)

* gate fixes validation, ui ux

* gate fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* added loader in the selecting boundaries (#737)

* Update createAndSearch.ts (#738)

* fix (#739)

* fix

* fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Patch 3 (#740)

* change in filter recursive

* lowest level

* trimmed underscore and empty spaces

* boundary fix (#742)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Update genericUtils.ts (#746)

* fixed the delivery products issue

* Fixed delivery conditions issue

* Update campaignApis.ts (#747)

* fixed warning toast (#748)

* fixed warning toast

* Update UploadData.js

* fix (#749)

* fix

* fx

* fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* core -update (#751)

Co-authored-by: nabeelmd-eGov <[email protected]>

* fixed stepper issue (#752)

* fixed stepper issue

* Update index.html

* Feat : added user validation via individual (#753)

* fixes (#754)

Co-authored-by: nabeelmd-eGov <[email protected]>

* code fix nabeel (#756)

* fixes

* fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Updated few loggers (#759)

* updated few loggers flow

* Update utilities/project-factory/src/server/api/campaignApis.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/src/server/utils/campaignMappingUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/src/server/utils/campaignUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/src/server/validators/campaignValidators.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/src/server/api/campaignApis.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/src/server/utils/campaignMappingUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/src/server/utils/genericUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Updated the user Password generation logic #761

* Update Listener.ts (#730)

* Update Listener.ts

* added try catch logic in producer

* Feat : added parallel batch execution (#767)

* Feat : added parallel batch execution

* Refactor

* Update utilities/project-factory/src/server/validators/campaignValidators.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fixed the stepper (#765)

* changes config (#769)

* Project type config and added loggers for process of campaign (#772)

* Feat : added themes in generate template (#773)

* fixed the ajv package version for build issue

* Feat : removed xlsx (#776)

* HLM-6177: PARALLEL SEARCH IMPLEMENT, DELIVERY TYPE IMPLEMENT (#778)

Co-authored-by: nabeelmd-eGov <[email protected]>

* css update (#780)

Co-authored-by: nabeelmd-eGov <[email protected]>

* HLM-6179 and HLM-6180 (#777)

* HLM-6179 and HLM-6180

* campaign name changes

---------

Co-authored-by: Jagankumar <[email protected]>

* Feat : fixed target generation (#781)

* fixed tenantId issue (#784)

* fix: resolved AJV-related Jenkins build issue reference #783 #786 (#787)

* module ui fix

* updated all the package version for build fixes

* fixed kafka-error at target generation (#789)

* updated core version (#791)

* updated core version

* updated css also

* Update campaignValidators.ts (#794)

* Updated the excel generation logic and files

* added changes for configurable column in target sheet (#779)

* change in filter recursive

* lowest level

* made target headers  genearte through mdms schema

* changed config index.ts

* changed config index.ts

* changes for now

* added configurable column logic from schema HLM-6169

* updated validate of target columns through schema

* added masterForColumnSchema in index.ts

* formatted dataManageService

* refactored lock TargetFields func

* removed console.log

* User creation performance improved (#800)

* Feat : Improved user creation performance

* Change status color

* Update utilities/project-factory/src/server/utils/campaignUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update genericUtils.ts (#801)

* Hlm 6170 (#802)

* change in filter recursive

* lowest level

* HLM -6170 added logic for only village level data in target sheet and some refactoring

* updated css (#804)

* fixed button issue (#805)

* HLM 6177: Error card implementation in summary screen (#806)

* HLM-6177: PARALLEL SEARCH IMPLEMENT, DELIVERY TYPE IMPLEMENT

* Added Error Cards in summary screen and redirection

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* added error button styles (#807)

Co-authored-by: nabeelmd-eGov <[email protected]>

* updated popUp css (#808)

* HLM 6178: Implementing New Pop up screen in boundaries (#809)

* added error button styles

* Implementing New Pop up screen in boundaries

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Facility changes (#812)

* Feat : changed facility Template

* Feat : locked target templates

* fixed colour issue (#813)

* Updated the project type conversion logic for the             "deliveryType" dont1 and n config

* Unique field added (#814)

* Feat : changed facility Template

* Feat : locked target templates

* Feat : added unique check logic

* Target schema update (#815)

* change in filter recursive

* lowest level

* updated shcema of target columns to be configurable

* removed empty spaces from config index.ts

* Active mapping (#817)

* Feat : changed facility Template

* Feat : locked target templates

* Feat : added unique check logic

* Feat : added mapping via active field

* changes in the schema validation (#816)

* Updated the workbench and css module version

* Feat : added active inactive boundary check (#818)

* Update campaignValidators.ts (#819)

* added active inactive validation (#820)

* changed api call time (#826)

* Feat : added target sum mapping (#825)

* added campaign type as filter (#827)

* Update genericApis.ts (#828)

* Update excelUtils.ts (#829)

* UI issue fixes, icon fix in summary error (#831)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Target columns (#830)

* change in filter recursive

* lowest level

* commit

* Feat : target flow fixed for LLIN-mz

* uat to dev

---------

Co-authored-by: admin1 <[email protected]>

* Feat : freezed target columns (#833)

* Target mr dn (#834)

* change in filter recursive

* lowest level

* Feat : skipped validation temporarily

* changes in the target validation (#835)

* fixed error info (#837)

* Added roboto font (#840)

* Feat : added roboto font

* Fixed config

* target validation based on diff campaign types (#843)

* change in filter recursive

* lowest level

* updated validation of target based on campaign type

* fixed validation issue (#844)

* Updated the workbench package version

* fixed validation logic (#846)

* fixed validation logic

* Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Error messages improved (#848)

* Feat : imporved error messages and initilised utils for tracking process

* Fix ; unused variables fixed

* Feat : improved error messages

* Fix : download error fix (#850)

* Update campaignUtils.ts (#851)

* Update campaignUtils.ts

* Update utilities/project-factory/src/server/utils/campaignUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update campaignValidators.ts (#853)

* HLM 6210: Toast, error focus fix and project type reset delivery data fix  (#854)

* HLM-6210: campaign type change reset delivery data fix, summary error focus fix

* summary error focus fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* HLM-6225_added time out according to data (#855)

* Update campaignValidators.ts (#859)

* HLM 6210 (#858)

* HLM-6210: campaign type change reset delivery data fix, summary error focus fix

* summary error focus fix

* parallel search fixes

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Remove validation (#852)

* change in filter recursive

* lowest level

* removed unnecessary validation for target

* spacing refactor

* Update campaignValidators.ts (#863)

* Header validation (#861)

* change in filter recursive

* lowest level

* removed unnecessary validation for target

* changed the logic of header validation

* space refactor

* Update campaignUtils.ts (#864)

* fixed ui error (#865)

* Read me (#867)

* change in filter recursive

* lowest level

* removed unnecessary validation for target

* changed the logic of header validation

* fixed portugese language error

* space refactoring

* Update Dockerfile

* Update Dockerfile

* Update migrate.sh

* Update Dockerfile

* Update campaignValidators.ts (#868)

* HLM 6210:campaign type change reset fix (#869)

* HLM-6210: campaign type change reset delivery data fix, summary error focus fix

* summary error focus fix

* parallel search fixes

* campaign type change reset fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Update excelUtils.ts for sheetHeaders wraping (#870)

* Update package.json

* updated error messages (#871)

* feat : added jaeger-client tracing (#872)

* updated the table config

* Update campaignApis.ts (#875)

* removed the schema and updated the db name

* fixing generate API call, file auto delete, date error (#877)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Trim resource (#878)

* Feat : trimmed resource persist message

* Refactor

* Removed reject error in produce message

* fixed min time, draft logic (#879)

* Update index.ts (#880)

* added min ui error and facility usage (#883)

* added min ui error and facility usage

* changes

* Update campaignUtils.ts (#884)

* HLM 6007 (#885)

* fixing generate API call, file auto delete, date error

* generate api fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Update Dockerfile

* Feat : docker config update (#886)

* Update Dockerfile (#887)

* Create buildWorkbenchUI.yml

* Update README.md (#917)

* Update buildWorkbenchUI.yml

* Update README.md

* Updated the DB Schema issue of Project-factory

* fixed hierarchy order (#919)

* User flag hcm (#920)

* Feat : docker config update

* Feat : added user create flag

* Refactored

* Update campaignUtils.ts

* Update campaignMappingUtils.ts (#922)

* Ashish egov patch 2 (#921)

* Update index.ts

* Update campaignApis.ts

* Fixed the project type conversion and product duplicate issue

* Update campaignApis.ts (#924)

* Update campaignMappingUtils.ts (#925)

* Update campaignMappingUtils.ts

* Refactored

* Update publishProjectFactory.yml

* Update buildWorkbenchUI.yml

* Update campaignMappingUtils.ts (#926)

* Update request.ts (#928)

* Update request.ts

* Feat : updated httprequest

* Feat : warning response added

* Refactor

* added start and enddate in cycles

* Update campaignApis.ts (#930)

* Update request.ts (#932)

* fixed generate issue (#933)

* Fixed project-type resources duplication

* updated target error messages (#936)

* fixed stepper from draft (#937)

* Update Listener.ts

* delivery type disable fix, product sku name change (#939)

Co-authored-by: nabeelmd-eGov <[email protected]>

* fixed error message issue (#941)

* Redis integration (#940)

* Feat : added redis

* Feat : added redis retry

* updated migration

* fixed

* updated migration

* Delete .vscode/launch.json

* Delete .vscode/settings.json

---------

Co-authored-by: ashish-egov <[email protected]>
Co-authored-by: nabeelmd-eGov <[email protected]>
Co-authored-by: nabeelmd-eGov <[email protected]>
Co-authored-by: Bhavya-egov <[email protected]>
Co-authored-by: ashish-egov <[email protected]>
Co-authored-by: nitish-egov <[email protected]>
Co-authored-by: Bhavya-egov <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Swathi-eGov <[email protected]>
Co-authored-by: admin1 <[email protected]>

* Master flyway imageupdate (#794)

* flyway base image updated

* reverted product changes and removed duplicate attendance code (#768)

* flyway version update

* updated psql version for core services and facility

* flyway update

* HLM throwing custom exception when boundary service call throw an error (#775)

* HLM-6196: Search failing, updated GenericQueryBuilder.java, added changes to get all … (#769)

* HLM Health-HRMS bug fix, user was set to null in hrms update as the t… (#761)

* HLM Health-HRMS bug fix, user was set to null in hrms update as the tenantid was not provided during internal search

* HLM updated hrms user type

* updated type from individual create

* Addressed code review comments

* Added code comments and fixme todo as per code review comments

* HLM updated flyway migration docker version

* Revert "HLM updated flyway migration docker version"

This reverts commit 1f1167e.

* Updated code comments on EmployeeService update method

* Update EmployeeService.java

* Updated code comments on EmployeeService, added changes for NPE handling

---------

Co-authored-by: kavi_elrey@1993 <[email protected]>

* HLM-6196: updated GenericQueryBuilder.java, added changes to get all the fields except Object class

* hlm-6196: update common library reference for dev testing"

* HLM-6196: updated health-service-common version to 1.0.17-SNAPSHOT and added default for included deleted

* HLM-6196: updated genericrepository

* HLM-6196: fixed testcases

* HLM-6196: fixed individual search query error

* taskresource additional fields column added

* HLM-6196: updated health services models TaskResource, added AdditionalField

* HLM-6196: hfreferral, referral, sideeffect - edge case fix

* HLM-6196: removed todo from urlparams

---------

Co-authored-by: kavi_elrey@1993 <[email protected]>
Co-authored-by: Vishal <[email protected]>

* Hlm 6196 hrms employee search by names fix (#785)

* HLM-6196: updated @component in validators for client reference id validation

* HLM-6196: fixed testcases for stock and individual

* HLM-6196: added missing migration file

* HLM-6196: updated IndividualSearch model, added exclude annotation on individual name

* HLM-6196: rectifying egov-hrms individual search object commit

* HLM-6196: updated health services common for model exclude field fix

* Revert "HLM-6196: updated @component in validators for client reference id validation"

This reverts commit 6e915a0.

* Revert "HLM-6196: fixed testcases for stock and individual"

This reverts commit ce90104.

* HLM-6196: added comments as per code review

* Update IndividualSearch.java

---------

Co-authored-by: kavi_elrey@1993 <[email protected]>

* HLM-6196: updated @component in validators for client reference id va… (#781)

* HLM-6196: updated @component in validators for client reference id validation

* HLM-6196: fixed testcases for stock and individual

* HLM-6196: added missing migration file

* HLM-6196: updated IndividualSearch model, added exclude annotation on individual name

* HLM-6196: rectifying egov-hrms individual search object commit

* HLM-6196: updated health services common for model exclude field fix

* Revert "HLM-6196: updated @component in validators for client reference id validation"

This reverts commit 6e915a0.

* Revert "HLM-6196: fixed testcases for stock and individual"

This reverts commit ce90104.

* Revert "Revert "HLM-6196: updated @component in validators for client reference id validation""

This reverts commit 2218ad3.

* Revert "Revert "HLM-6196: fixed testcases for stock and individual""

This reverts commit 083c516.

* HLM-6196: replaced RuntimeException with CustomException

* HLM-6196: updated to get only message from exception

* HLM-6196: updated individual search as it was with exclude annotation

* Update core-services/egov-hrms/src/main/java/org/egov/hrms/web/validator/EmployeeValidator.java

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* updated changelog for HCM v1.4 release

* updated changelog for HCM v1.4 release

* Update health-services/product/CHANGELOG.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update health-services/libraries/health-services-models/src/main/java/org/egov/common/models/project/TaskResource.java

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* HLM added error stack strace whenever custom exception is thrown while validation duplicate entry

---------

Co-authored-by: kavi_elrey <[email protected]>
Co-authored-by: Vishal <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Adding plan-service folder for master merge (#783)

* Adding plan-service folder for master merge

* code review comment.

---------

Co-authored-by: devdatta-egov <[email protected]>

* Microplan UI (#793)

* microplan-ui

* adding HLM-6172 changes

* hiding unique identifier column

* Update build-config.yml

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* adding digti frontend pr 934 changes

* Update build-config.yml

* removing pl tl and template files

* removed unnecessary code

* Delete frontend/microplan-ui/Jenkinsfile

* updating operation to match api changes

* updating operation to match api changes

* Update README.md

* Update README.md

* microplan-ui adding uploadguidelines and removing unnecessary files

* adding microplan to micro-ui

* adding microplan folder in microui/web

* Update setupProxy.js

* review changes

* adding review changes

* review changes

* Update Mapping.js

* Update Upload.js

* Update geojsonValidations.js

* Update CreateMicroplan.js

* Update MicroplanPreview.js

* Update MicroplanPreview.js

* Update CreateMicroplan.js

* adding review comments, updage campaign service, removed hardcoded tenent and removed logout util

* removing microplan-ui folder

* Update index.js

* adding review changes, reducing functional complexcity

* updaing microplan css pkg version

* Update jsonToExcelBlob.js

* Update MicroplanCreatedScreen.js

* Update UICustomizations.js

* Update uploadUtils.js

* Update build-config.yml

---------

Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: SriPadma8997-egov <[email protected]>

---------

Co-authored-by: kavi_elrey@1993 <[email protected]>
Co-authored-by: siddhant-nawale-egov <[email protected]>
Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: SriPadma8997-egov <[email protected]>
Co-authored-by: ashish-egov <[email protected]>
Co-authored-by: nabeelmd-eGov <[email protected]>
Co-authored-by: nabeelmd-eGov <[email protected]>
Co-authored-by: Bhavya-egov <[email protected]>
Co-authored-by: ashish-egov <[email protected]>
Co-authored-by: nitish-egov <[email protected]>
Co-authored-by: Bhavya-egov <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Swathi-eGov <[email protected]>
Co-authored-by: admin1 <[email protected]>
Co-authored-by: Vishal <[email protected]>
Co-authored-by: Priyanka-eGov <[email protected]>
Co-authored-by: devdatta-egov <[email protected]>
  • Loading branch information
18 people authored Jun 27, 2024
1 parent ee169be commit 37ec1da
Show file tree
Hide file tree
Showing 209 changed files with 24,013 additions and 2,752 deletions.
64 changes: 64 additions & 0 deletions .github/workflows/buildWorkbenchUI.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: Digit Admin Console Build workflow
on:
push:
branches:
- campaign
paths:
- 'micro-ui/web/micro-ui-internals/**'
pull_request:
branches:
- campaign
workflow_dispatch:
jobs:
docker_image-build:
outputs:
run_job_digit_ui: ${{ steps.check_files.outputs.run_job_digit_ui }}
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
with:
fetch-depth: 2
- name: Setup Docker
uses: docker/setup-buildx-action@v1
- name: check modified files
id: check_files
run: |
echo "=============== list modified files ==============="
git diff --name-only HEAD^ HEAD
echo "========== check paths of modified files =========="
git diff --name-only HEAD^ HEAD > files.txt
run_job_digit_ui=false
while IFS= read -r file
do
if [[ $file == micro-ui/* ]]; then
echo "This modified file is under the 'digit_ui' folder."
run_job_digit_ui=true
fi
done < files.txt
# Set the output based on whether the job should run
echo "::set-output name=run_job_digit_ui::$run_job_digit_ui"
echo "ACTION_NUMBER=${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
echo "COMMIT_ID=${GITHUB_SHA: -8}" >> $GITHUB_ENV # Extract last 8 characters of SHA
echo "BRANCH_NAME=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
- name: Login to egovio docker Container Registry
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
run: |
# Authenticate with Docker Hub
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- name: Build and Push Docker image for digit-ui
if: ${{ steps.check_files.outputs.run_job_digit_ui == 'true' }}
run: |
docker build -t workbench-ui:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }} -f web/workbench/Dockerfile .
docker tag workbench-ui:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }} egovio/workbench-ui:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }}
docker push egovio/workbench-ui:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }}
working-directory: micro-ui
2 changes: 2 additions & 0 deletions .github/workflows/publishProjectFactory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: project factory service docker Image CI
on:
push:
branches: [ "campaign" ]
paths:
- 'utilities/project-factory/**'
pull_request:
branches: [ "campaign" ]

Expand Down
6 changes: 6 additions & 0 deletions build/build-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,12 @@ config:
- work-dir: frontend/micro-ui/
dockerfile: frontend/micro-ui/web/workbench/Dockerfile
image-name: workbench-ui

- name: builds/health-campaign-services/frontend/microplan-ui
build:
- work-dir: frontend/micro-ui/
dockerfile: frontend/micro-ui/web/microplan/Dockerfile
image-name: microplan-ui

#Utilities
- name: "builds/health-campaign-services/health-services/project-factory"
Expand Down
3 changes: 1 addition & 2 deletions frontend/micro-ui/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# workbench ui
# DIGIT ui

A React App built on top of DIGIT UI Core.

Expand Down Expand Up @@ -136,5 +136,4 @@ Start the server
yarn start
```


![Logo](https://s3.ap-south-1.amazonaws.com/works-dev-asset/mseva-white-logo.png)
15 changes: 8 additions & 7 deletions frontend/micro-ui/web/micro-ui-internals/example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@
"start": "react-scripts start"
},
"devDependencies": {
"@egovernments/digit-ui-libraries": "1.8.1-beta.4",
"@egovernments/digit-ui-module-core": "1.8.1-beta.23",
"@egovernments/digit-ui-module-utilities": "1.0.1-beta.2",
"@egovernments/digit-ui-components": "0.0.1-beta.31",
"@egovernments/digit-ui-react-components": "1.8.1-beta.24",
"@egovernments/digit-ui-module-workbench": "1.0.1-beta.16",
"@egovernments/digit-ui-libraries": "1.8.2-beta.1",
"@egovernments/digit-ui-module-workbench": "1.0.2-beta.3",
"@egovernments/digit-ui-components": "0.0.2-beta.1",
"@egovernments/digit-ui-module-core": "1.8.2-beta.2",
"@egovernments/digit-ui-module-utilities": "1.0.1-beta.30",
"@egovernments/digit-ui-react-components": "1.8.2-beta.6",
"@egovernments/digit-ui-module-hcmworkbench":"0.0.38",
"@egovernments/digit-ui-module-campaign-manager": "0.0.1",
"@egovernments/digit-ui-module-hcmmicroplanning": "0.0.1",
"http-proxy-middleware": "^1.0.5",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand All @@ -36,4 +37,4 @@
"last 1 safari version"
]
}
}
}
53 changes: 26 additions & 27 deletions frontend/micro-ui/web/micro-ui-internals/example/public/index.html
Original file line number Diff line number Diff line change
@@ -1,35 +1,34 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="utf-8" />
<link rel="icon" href="https://egov-dev-assets.s3.ap-south-1.amazonaws.com/browser-icon.png" />
<link
href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;500;700&family=Roboto:wght@400;500;700&display=swap"
rel='stylesheet' type='text/css'>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#00bcd1" />
<title>DIGIT</title>
<!-- <link
<head>
<meta charset="utf-8" />
<link rel="icon" href="https://egov-dev-assets.s3.ap-south-1.amazonaws.com/browser-icon.png" />
<link
href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;500;700&family=Roboto:wght@400;500;700&display=swap"
rel="stylesheet"
type="text/css"
/>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#00bcd1" />
<title>DIGIT</title>
<!-- <link
rel="stylesheet"
href="https://unpkg.com/@egovernments/[email protected]/dist/index.css"
/> -->
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<!-- added below css for hcm-workbench module inclusion-->

<!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" /> -->

<!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css/dist/index.css"/> -->
<!-- <script src="https://s3.ap-south-1.amazonaws.com/egov-dev-assets/globalConfigs.js"></script> -->
<script src="%REACT_APP_GLOBAL%"></script>

</head>
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<!-- added below css for hcm-workbench module inclusion-->
<!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" /> -->

<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
</body>
<!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css/dist/index.css"/> -->
<!-- <script src="https://s3.ap-south-1.amazonaws.com/egov-dev-assets/globalConfigs.js"></script> -->
<script src="%REACT_APP_GLOBAL%"></script>
</head>

<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
</body>
</html>

This file was deleted.

Loading

0 comments on commit 37ec1da

Please sign in to comment.