Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "HLM-6185: Added null check for the project task resources list" #778

Closed
wants to merge 1 commit into from

Conversation

kavi-egov
Copy link
Collaborator

@kavi-egov kavi-egov commented Jun 16, 2024

Reverts #767

Summary by CodeRabbit

  • Refactor
    • Removed the status field from project task indexing to streamline data handling.
    • Simplified the task transformation process by removing unnecessary code and directly mapping task resources.
    • Removed the getBeneficiaryType method from the project service to reduce code complexity and improve maintainability.

Copy link
Contributor

coderabbitai bot commented Jun 16, 2024

Walkthrough

The recent changes focus on simplifying and streamlining the codebase by removing redundant fields and methods. Specifically, the status field in the ProjectTaskIndexV1 class and the getBeneficiaryType method in ProjectService were removed. Additionally, ProjectTaskTransformationService was modified to simplify task resource transformation by eliminating unnecessary code and directly mapping tasks to their corresponding instances.

Changes

File Changes Summary
.../transformer/models/downstream/ProjectTaskIndexV1.java Removed the status field declaration.
.../transformer/service/ProjectService.java Removed the getBeneficiaryType method that retrieved beneficiary types for a project.
.../transformer/service/ProjectTaskTransformationService.java Simplified transformation logic by removing unnecessary code and directly mapping task resources to ProjectTaskIndexV1 instances.

Poem

With code so tight, goodbye to old,
A field once proud, now untold,
Methods gone, and cleaned the way,
For simpler paths, where logic stays.
A rabbit's cheer for lines refined,
In streamlined code, pure joy we find.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Outside diff range comments (1)
health-services/transformer/src/main/java/org/egov/transformer/service/ProjectService.java (1)

[!TIP]
Codebase Verification

The getBeneficiaryType method is still referenced in ProjectTransformationService.java, and there is no alternative field or method in the Project class to replace this functionality. Please ensure that the necessary method or equivalent functionality is reintroduced to handle the targetType appropriately.

  • ProjectTransformationService.java (line 235): .targetType(r.getBeneficiaryType())
Analysis chain

Line range hint 1-158: The removal of the getBeneficiaryType method simplifies the ProjectService class. Confirm that this change does not leave any unhandled cases in the handling of project-related data.

Scripts executed

The following scripts were executed for the analysis:


Script:

#!/bin/bash
# Description: Verify that no unhandled cases are left by the removal of the `getBeneficiaryType` method.
rg --type java 'getBeneficiaryType' ./health-services/transformer/src/main/java/org/egov/transformer/service

Length of output: 283



Script:

#!/bin/bash
# Extract the context around the usage of `getBeneficiaryType` in `ProjectTransformationService.java`.
rg --context 10 'getBeneficiaryType' ./health-services/transformer/src/main/java/org/egov/transformer/service/ProjectTransformationService.java

Length of output: 1682



Script:

#!/bin/bash
# Find the definition of `ProjectIndexV1` class to understand the role of `targetType`.
rg --type java 'class ProjectIndexV1' ./health-services/transformer/src/main/java/org/egov/transformer

# Explore the `Project` class for alternatives to `getBeneficiaryType`.
rg --type java 'class Project' ./health-services/transformer/src/main/java/org/egov/transformer

Length of output: 3795



Script:

#!/bin/bash
# Extract the full content of `ProjectIndexV1` class to understand the role of `targetType`.
cat ./health-services/transformer/src/main/java/org/egov/transformer/models/downstream/ProjectIndexV1.java

# Search for the `Project` class definition in the entire repository.
rg --type java 'class Project' .

Length of output: 20753



Script:

#!/bin/bash
# Extract the full content of `Project` class to find an alternative to the `getBeneficiaryType` method.
cat ./health-services/libraries/health-services-models/src/main/java/org/egov/common/models/project/Project.java

Length of output: 3472

Review details

Configuration used: .coderabbit.yaml
Review profile: ASSERTIVE

Commits

Files that changed from the base of the PR and between 3d000ed and 70d8809.

Files selected for processing (3)
  • health-services/transformer/src/main/java/org/egov/transformer/models/downstream/ProjectTaskIndexV1.java (1 hunks)
  • health-services/transformer/src/main/java/org/egov/transformer/service/ProjectService.java (1 hunks)
  • health-services/transformer/src/main/java/org/egov/transformer/service/ProjectTaskTransformationService.java (2 hunks)
Additional comments not posted (2)
health-services/transformer/src/main/java/org/egov/transformer/models/downstream/ProjectTaskIndexV1.java (1)

Line range hint 1-29: The removal of the status field simplifies the ProjectTaskIndexV1 class. Ensure that this change does not affect any dependent serialization, deserialization, or business logic.

Verification successful

The extensive search results indicate that the status field is widely used across the codebase in various contexts, including tests, controllers, models, and configuration files. However, none of the references seem to be directly related to the ProjectTaskIndexV1 class.

Given the absence of direct dependencies or references to the status field within the ProjectTaskIndexV1 class or its immediate context, it is reasonable to conclude that the removal of the status field from this particular class does not impact other parts of the codebase.

  • The removal of the status field simplifies the ProjectTaskIndexV1 class.
  • Ensure that this change does not affect any dependent serialization, deserialization, or business logic.
Scripts executed

The following scripts were executed for the analysis:


Script:

#!/bin/bash
# Description: Check for usage of the 'status' field in serialization and deserialization processes.
ast-grep --lang java --pattern $'class ProjectTaskIndexV1 {
  $$$
  status($_)
  $$$
}'

Length of output: 88



Script:

#!/bin/bash
# Search for any references to the 'status' field across the entire codebase.
rg '\bstatus\b'

Length of output: 197531

health-services/transformer/src/main/java/org/egov/transformer/service/ProjectTaskTransformationService.java (1)

78-105: The transformation logic in ProjectTaskIndexV1Transformer appears streamlined and efficient. Verify that the removal of the handling for empty task resources and the getBeneficiaryType method call does not negatively impact the transformation logic or data integrity.

Verification successful

The transformation logic in ProjectTaskTransformationService.java is not directly affected by the removal of the getBeneficiaryType method. This method is referenced in ProjectTransformationService.java, but not within the reviewed snippet. Therefore, the changes should not negatively impact the transformation logic or data integrity.

  • ProjectTransformationService.java: getBeneficiaryType method reference found.
Scripts executed

The following scripts were executed for the analysis:


Script:

#!/bin/bash
# Description: Verify the impact of removed logic on transformation processes.
rg --type java 'getBeneficiaryType' ./health-services/transformer/src/main/java/org/egov/transformer/service

Length of output: 283

@kavi-egov kavi-egov closed this Jun 18, 2024
jagankumar-egov pushed a commit that referenced this pull request Jun 20, 2024
kavi-egov pushed a commit that referenced this pull request Jun 20, 2024
…ng, 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]>
kavi-egov added a commit that referenced this pull request Jun 27, 2024
* 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]>
kavi-egov pushed a commit that referenced this pull request Aug 12, 2024
* 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

* Feat : changed download logic (#942)

* Update README.md (#943)

* fixed target validate for different tabs not present (#945)

* Enriching already exsisting user (#946)

* Feat : adding dropdowns (#952)

* HLM-6270: Date logic changes, added localisation code (#953)

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

* changed maximum target message (#954)

* changed maximum target message

* Update UploadData.js

* Call generate (#951)

* updated target error messages

* generate call while campaign update changes boundaries

* some update on call-generate

* call-generate

* updated call-gnerate logic

* added column campaign id in generated resource table

* updated config index.ts

* removed console.logs

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

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

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

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

* added some additional conditions

---------

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

* changed facility info message (#955)

* HLM 6270 (#957)

* refactor

* added title text

---------

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

* Update genericUtils.ts (#958)

* fixed boundary draft logic (#959)

* Boundary code generated has now configurable hierarchy type and boundary name at last based on config (#963)

* fixed target validate for different tabs not present

* made hierarchytype and bondary name configurable in auto generation of boundary code

* added toString() on elment for safety

* HLM-6270: Elimated Generate API & enhance download API, Date logic fixes (#966)

* refactor

* added title text

* HLM-6270: Elimated Generate API & enhance download API, Date logic fixes

---------

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

* Ashish table create (#972)

* saving

* Feat : adding table

* Feat : table creating

* updated configs

* Feat : added table

* Feat : table added

* Feat : integrated processtracks

* Fix : name format (#973)

* Update campaignUtils.ts (#974)

* configure app static screen and skeleton (#980)

* configure app static screen and skeleton

* comments resolved

* Migration repair (#981)

* migration repair

* migration repair

* migration repair

* Updated CampaignCard to add NATIONAL_SUPERVISOR dashboard link

* made isActive change (#986)

* boundaries on which we split to be fetched from mdms (#982)

* fixed target validate for different tabs not present

* split boundaries fetch from mdms

* updated logic to fetch split on from mdms based on campaign type

* fromatting

* Update campaignUtils.ts (#988)

* Update processTrackUtils.ts (#989)

* fixs (#990)

* fixs

* Update SelectingBoundaries.js

* Update processTrackUtils.ts (#991)

* Summary screen api loop fix (#992)

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

* Resource activity (#993)

* fixed target validate for different tabs not present

* resource activity persisting in db

* Update processTrackUtils.ts (#994)

* added timeout of 2 sec for boundary entity to persist (#996)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* css version fix (#997)

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

* Process tracking update (#998)

* Feat : changed logic of process track

* Feat : improved process tracks

* improved process tracking

* Update campaignUtils.ts (#999)

* Update campaignUtils.ts (#1000)

* Update campaignUtils.ts

* Update Listener.ts

* Feat : imporved process track (#1001)

* Update campaignManageService.ts (#1003)

* Update campaignManageService.ts

* Update campaignUtils.ts

* Update processTrackUtils.ts

* Feat : added user mapping for multiple boundaries with common parent (#1005)

* new template will be generated if source is microplan accordingly from mdms (#1004)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* new template generate if source is microplan

* updated logic for generating templates if source of campaign is from microplan

* made separate function for checking source is microplan

* added separate  func for checking source is microplan

* refactor

* chnaged the checkIFSourceMicoplan func

* refactored checkifsourceismicroplan

* Fix : fix array fetch from cell (#1006)

* Feat : fixed array issue in target (#1007)

* Feat : fixed array issue in target

* Update index.ts

* Some fixes and refactor (#1008)

* Feat : fixed array issue in target

* Update index.ts

* Refactor

* Fixed status row

* commented harcoded check && added new dashboard icon (#1011)

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

* Fixed sheetrows issues (#1012)

* Sheet row fixed (#1013)

* Fixed sheetrows issues

* Shut down if kafka error

* Feat : formated sheet (#1015)

* integrated admin schema  with mdms_v2 (#1018)

* Fix process timeline (#1029)

* Feat : formated sheet

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* Feat : imporved processTracking and fixed migration script

* Feat : fixed error persistence

* Fix

* Un wrap other rows (#1034)

* Feat : formated sheet

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* Feat : imporved processTracking and fixed migration script

* Feat : fixed error persistence

* Unwraped lower rows

* Update publishProjectFactory.yml

* updated package versions (#1042)

* HLM-6325/HLM-6277: Update date with & without boundary screen integration and actionable column added (#1045)

* HLM-6007

* css version fix

* update date screen added

* change add

* css fixes and API Integration for search project

* Implemented Action component in My Campaign screen

* Implemented Date Update with and without boundary with API integration

* Boundary change

---------

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

* Facility dynamic generate for source microplan (#1046)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* added code for generating facility template if source is microplan

* updated name

* updated version (#1047)

* updated core version to fix login forget password issues(#1051)

* Fixed update topic (#1056)

* updated version (#1061)

* Hidden sheet impel (#1077)

* Feat : formated sheet

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* Feat : imporved processTracking and fixed migration script

* Feat : fixed error persistence

* Unwraped lower rows

* Update campaignUtils.ts

* Update publishProjectFactory.yml

* Update genericUtils.ts (#1078)

* target template download based on delivery conditions if present (#1080)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* logic for dynamic target generate template based on delivery conditions

* fixed stepper color issue from draft (#1083)

* fixed reordering of tab issue (#1092)

* Hlm 6350 (#1094)

* timeline wip

* added timeline from summary

* removed log

* integarte with mdms (#1095)

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

* Update genericUtils.ts (#1097)

* Update targetUtils.ts (#1098)

* Hlm 6350 (#1100)

* timeline wip

* added timeline from summary

* removed log

* integrated timeline with popup

* updated version

* updated css version

* HCMPRE-32: Resolve date update demo points (#1104)

* integarte with mdms

* HCMPRE-32: Resolve date update demo points

* comment resolve

---------

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

* Dynamic target upload and download both with target columns as per delivery conditions when campaign is updated with cahnegs in delivery conditions (#1109)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* target upload based on dynamic column in reference to deliveryRules

* logic for calling generate target tempalte when campaign delivery conditions change

* removed console

* updated css version (#1102)

* added chip for dropdown (#1111)

* version fix to resolve issue (#1112)

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

* Ashish patch1 (#1118)

* Feat : formated sheet

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* Feat : imporved processTracking and fixed migration script

* Feat : fixed error persistence

* Unwraped lower rows

* Update campaignUtils.ts

* Update genericValidator.ts

* Update publishProjectFactory.yml

* Update targetUtils.ts

* edit product with prefilled value and count (#1115)

* Boundary upload  to have not generate boundary code if  code is already filled to support migration (#1121)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* Boundary upload  to have not generate boundary code if  code is already filled to support migration

* Update index.ts

* Update constants.ts (#1122)

* Update constants.ts

* Update utilities/project-factory/src/server/config/constants.ts

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

* Update campaignUtils.ts

* Update campaignUtils.ts

* Update campaignMappingUtils.ts

---------

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

* template downlod for source microplan (#1123)

* Different tabs onlevel to fetch from mdms rather than from config in target upload flow (#1124)

* template downlod for source microplan

* updated logic for getting different tabs based on level from config to fetch it from mdms in target upload flow

* Sequence order change in action button (#1125)

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

* reverted  the function validateAllDistrictTabsPresentOrNot (#1126)

* template downlod for source microplan

* updated logic for getting different tabs based on level from config to fetch it from mdms in target upload flow

* restored the func validateAllDistrictTabsPresentOrNot to default

* Update index.ts (#1129)

* Update index.ts

* Update Listener.ts

* Update Producer.ts

* Update generateUtils.ts (#1130)

* some changes related to generate boundary template (#1133)

* updated logic for target columns acc to delivery conditions only for smc (#1137)

* some changes related to generate boundary template

* updated logic for making configurable target acc to delivery only for smc

* refactored code for including dynamic target columns for specific types according to configs array

* updated version and boundary fix (#1141)

* updated readmeconfig for sheet (#1142)

* HCMPRE-140: Action column fixes, date editable logic change (#1143)

* Action column fixes, date editable logic change

* added roles for dss

---------

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

* Update constants.ts (#1145)

* Update constants.ts

* Update processTrackUtils.ts

* Update Listener.ts (#1147)

* HCMPRE 140 (#1149)

* Action column fixes, date editable logic change

* added roles for dss

* update dates fixes

---------

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

* updated core version (#1150)

* Ashish patch2 (#1152)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Update publishProjectFactory.yml

* Redis cache for generating target when delivery conditions change (#1156)

* updated readmeconfig for sheet

* added cache for generating target template when only delivery conditions change

* added cache time in config

* refactored caching code in generate flow for boundary sheet

* refactored callGenerate function

* Ashish egov patch 2 (#1166)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Update publishProjectFactory.yml

* HCMPRE-154: Update Dates bug fixes, Toast added for error. (#1158)

* Action column fixes, date editable logic change

* added roles for dss

* update dates fixes

* HCMPRE-154 update dates bug fixes, Added toast for error

* code clean

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

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

* Adding date bug

* date fix

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

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

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

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

---------

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

* version update (#1168)

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

* HCMPRE-6407 download template changes  (#1128)

* HLM-6407 adding changes for facility template

* HLM-6407 adding changes for facility template

* HLM-6407 adding changes for facility template

* HLM-6407 codde review comment

* HCMPRE-91 code review comments

* HLM-6407 using same mdms schema for microplan

* HLM-6407 adding changes for facility template

* HLM-6407 adding changes for facility template

* HLM-6407 adding changes for facility template

* HLM-6407 codde review comment

* HCMPRE-91 code review comments

* HLM-6407 using same mdms schema for microplan

* HLM-6407 code review comments

* HLM-6407 code review comments

* Core ui version fix (#1176)

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

* Ashish egov patch 2 (#1178)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Update publishProjectFactory.yml

* Update Producer.ts (#1182)

* fixed timeline issues (#1185)

* HCMPRE 154 (#1186)

* date validation fix

* Update date logic

* FIX

---------

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

* changes in timeline (#1187)

* CSS version add (#1188)

* date validation fix

* Update date logic

* FIX

* css add

---------

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

* HCMPRE 154 (#1189)

* date validation fix

* Update date logic

* FIX

* css add

* non editable fix

---------

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

* limited the number of columns of target for upto only 18 in number  (#1190)

* updated readmeconfig for sheet

* added cache for generating target template when only delivery conditions change

* added logic for having only 18 target columns  if exceed i will create one column with  header OTHER_TARGETS

* HCMPRE 154 (#1191)

* date validation fix

* Update date logic

* FIX

* css add

* non editable fix

* date start from tomorrow

* css fix for language screen

---------

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

* Produceasync (#1192)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Producer update

* Feat : updated producemodified message

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* HCMPRE 154 (#1193)

* date validation fix

* Update date logic

* FIX

* css add

* non editable fix

* date start from tomorrow

* css fix for language screen

* disable today date

---------

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

* config updates according to devops (#1197)

* updated readmeconfig for sheet

* added cache for generating target template when only delivery conditions change

* added logic for having only 18 target columns  if exceed i will create one column with  header OTHER_TARGETS

* updated config to fetch from devops accordingly

* Update index.ts

* All changes (#1201)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Update Producer.ts

* Update Producer.ts

* Feat : updated producemodified message

* Feat : removed waiting

* adding constraint

* Update V20240731162600__add_uniqiue_constraint_process_track.sql

* Update constants.ts

* Update publishProjectFactory.yml

* HCMPRE 154 (#1202)

* date validation fix

* Update date logic

* FIX

* css add

* non editable fix

* date start from tomorrow

* css fix for language screen

* disable today date

* date and cycle fix

---------

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

* Revert "HCMPRE 154 (#1191)" (#1203)

This reverts commit 59ec953.

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

* updated versions (#1205)

* Update date change screen date logic fix, info added, hard reload issue fix (#1206)

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

* Config update for project-factory (#1207)

* updated readmeconfig for sheet

* added cache for generating target template when only delivery conditions change

* added logic for having only 18 target columns  if exceed i will create one column with  header OTHER_TARGETS

* updated config to fetch from devops accordingly

* updated config for project -factory

* Timeline (#1210)

* updated versions

* fixed user credential button

* Kafka fix (#1212)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Revert "Ashish egov patch 2 (#1178)"

This reverts commit e86a4dc.

* Update Producer.ts

* Update Producer.ts

* Feat : updated producemodified message

* Feat : removed waiting

* adding constraint

* Update V20240731162600__add_uniqiue_constraint_process_track.sql

* Update constants.ts

* Feat : improved kafka

* Fix kafka restart issue

* fixed the pop up button issue (#1215)

* Kafka restart (#1217)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Revert "Ashish egov patch 2 (#1178)"

This reverts commit e86a4dc.

* Update Producer.ts

* Update Producer.ts

* Feat : updated producemodified message

* Feat : removed waiting

* adding constraint

* Update V20240731162600__add_uniqiue_constraint_process_track.sql

* Update constants.ts

* Feat : improved kafka

* Update Producer.ts

* Update Producer.ts

* Update publishProjectFactory.yml

* updated core versions for privacy component  (#1223)

* Ashish egov patch 1 (#1228)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Revert "Ashish egov patch 2 (#1178)"

This reverts commit e86a4dc.

* Update Producer.ts

* Update Producer.ts

* Feat : updated producemodified message

* Feat : removed waiting

* adding constraint

* Update V20240731162600__add_uniqiue_constraint_process_track.sql

* Update constants.ts

* Feat : improved kafka

* Update Producer.ts

* Update Producer.ts

* Update campaignUtils.ts

* feat : solved localization passing through kafka

* Update publishProjectFactory.yml

* removed frontend

* Update package.json

* Squashed commit of the following:

commit 3cd21c2
Merge: 12061ca 80f6307
Author: Jagankumar <[email protected]>
Date:   Thu Aug 8 15:13:48 2024 +0530

    Merge branch 'campaign' into campaign-merged

commit 80f6307
Author: nitish-egov <[email protected]>
Date:   Wed Aug 7 18:08:15 2024 +0530

    Updated changelog (#1242)

    * default enableDynamicTemplateForWillBe empty string in config

    * updated changelog and postman collection

commit f897dba
Author: Jagankumar <[email protected]>
Date:   Wed Aug 7 17:25:39 2024 +0530

    Update package.json

commit dd691e6
Author: Bhavya-egov <[email protected]>
Date:   Tue Aug 6 13:34:40 2024 +0530

    updated workbench version (#1236)

commit 3a30736
Author: Bhavya-egov <[email protected]>
Date:   Tue Aug 6 11:00:14 2024 +0530

    updated micro ui core version (#1233)

commit a1f7329
Author: nitish-egov <[email protected]>
Date:   Mon Aug 5 18:29:40 2024 +0530

    default enableDynamicTemplateForWillBe empty string in config (#1231)

commit d3c3e95
Author: nabeelmd-eGov <[email protected]>
Date:   Mon Aug 5 18:11:23 2024 +0530

    build issue fix for optional chanining issue (#1230)

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

commit 236b843
Author: nabeelmd-eGov <[email protected]>
Date:   Mon Aug 5 17:17:20 2024 +0530

    fix (#1229)

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

* sending only activity object to kafka in place of request body (#851)

---------

Co-authored-by: ashish-egov <[email protected]>
Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Bhavya-egov <[email protected]>
Co-authored-by: nabeelmd-eGov <[email protected]>
Co-authored-by: nabeelmd-eGov <[email protected]>
Co-authored-by: Priyanka-eGov <[email protected]>
yashita-egov pushed a commit to yashita-egov/health-campaign-services that referenced this pull request Sep 27, 2024
* Updated the user Password generation logic egovernments#761

* Update Listener.ts (egovernments#730)

* Update Listener.ts

* added try catch logic in producer

* Feat : added parallel batch execution (egovernments#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 (egovernments#765)

* changes config (egovernments#769)

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

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

* fixed the ajv package version for build issue

* Feat : removed xlsx (egovernments#776)

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

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

* css update (egovernments#780)

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

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

* HLM-6179 and HLM-6180

* campaign name changes

---------

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

* Feat : fixed target generation (egovernments#781)

* fixed tenantId issue (egovernments#784)

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

* module ui fix

* updated all the package version for build fixes

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

* updated core version (egovernments#791)

* updated core version

* updated css also

* Update campaignValidators.ts (egovernments#794)

* Updated the excel generation logic and files

* added changes for configurable column in target sheet (egovernments#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 (egovernments#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 (egovernments#801)

* Hlm 6170 (egovernments#802)

* change in filter recursive

* lowest level

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

* updated css (egovernments#804)

* fixed button issue (egovernments#805)

* HLM 6177: Error card implementation in summary screen (egovernments#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 (egovernments#807)

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

* updated popUp css (egovernments#808)

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

* added error button styles

* Implementing New Pop up screen in boundaries

---------

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

* Facility changes (egovernments#812)

* Feat : changed facility Template

* Feat : locked target templates

* fixed colour issue (egovernments#813)

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

* Unique field added (egovernments#814)

* Feat : changed facility Template

* Feat : locked target templates

* Feat : added unique check logic

* Target schema update (egovernments#815)

* change in filter recursive

* lowest level

* updated shcema of target columns to be configurable

* removed empty spaces from config index.ts

* Active mapping (egovernments#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 (egovernments#816)

* Updated the workbench and css module version

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

* Update campaignValidators.ts (egovernments#819)

* added active inactive validation (egovernments#820)

* changed api call time (egovernments#826)

* Feat : added target sum mapping (egovernments#825)

* added campaign type as filter (egovernments#827)

* Update genericApis.ts (egovernments#828)

* Update excelUtils.ts (egovernments#829)

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

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

* Target columns (egovernments#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 (egovernments#833)

* Target mr dn (egovernments#834)

* change in filter recursive

* lowest level

* Feat : skipped validation temporarily

* changes in the target validation (egovernments#835)

* fixed error info (egovernments#837)

* Added roboto font (egovernments#840)

* Feat : added roboto font

* Fixed config

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

* change in filter recursive

* lowest level

* updated validation of target based on campaign type

* fixed validation issue (egovernments#844)

* Updated the workbench package version

* fixed validation logic (egovernments#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 (egovernments#848)

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

* Fix ; unused variables fixed

* Feat : improved error messages

* Fix : download error fix (egovernments#850)

* Update campaignUtils.ts (egovernments#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 (egovernments#853)

* HLM 6210: Toast, error focus fix and project type reset delivery data fix  (egovernments#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 (egovernments#855)

* Update campaignValidators.ts (egovernments#859)

* HLM 6210 (egovernments#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 (egovernments#852)

* change in filter recursive

* lowest level

* removed unnecessary validation for target

* spacing refactor

* Update campaignValidators.ts (egovernments#863)

* Header validation (egovernments#861)

* change in filter recursive

* lowest level

* removed unnecessary validation for target

* changed the logic of header validation

* space refactor

* Update campaignUtils.ts (egovernments#864)

* fixed ui error (egovernments#865)

* Read me (egovernments#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 (egovernments#868)

* HLM 6210:campaign type change reset fix (egovernments#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 (egovernments#870)

* Update package.json

* updated error messages (egovernments#871)

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

* updated the table config

* Update campaignApis.ts (egovernments#875)

* removed the schema and updated the db name

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

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

* Trim resource (egovernments#878)

* Feat : trimmed resource persist message

* Refactor

* Removed reject error in produce message

* fixed min time, draft logic (egovernments#879)

* Update index.ts (egovernments#880)

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

* added min ui error and facility usage

* changes

* Update campaignUtils.ts (egovernments#884)

* HLM 6007 (egovernments#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 (egovernments#886)

* Update Dockerfile (egovernments#887)

* Create buildWorkbenchUI.yml

* Update README.md (egovernments#917)

* Update buildWorkbenchUI.yml

* Update README.md

* Updated the DB Schema issue of Project-factory

* fixed hierarchy order (egovernments#919)

* User flag hcm (egovernments#920)

* Feat : docker config update

* Feat : added user create flag

* Refactored

* Update campaignUtils.ts

* Update campaignMappingUtils.ts (egovernments#922)

* Ashish egov patch 2 (egovernments#921)

* Update index.ts

* Update campaignApis.ts

* Fixed the project type conversion and product duplicate issue

* Update campaignApis.ts (egovernments#924)

* Update campaignMappingUtils.ts (egovernments#925)

* Update campaignMappingUtils.ts

* Refactored

* Update publishProjectFactory.yml

* Update buildWorkbenchUI.yml

* Update campaignMappingUtils.ts (egovernments#926)

* Update request.ts (egovernments#928)

* Update request.ts

* Feat : updated httprequest

* Feat : warning response added

* Refactor

* added start and enddate in cycles

* Update campaignApis.ts (egovernments#930)

* Update request.ts (egovernments#932)

* fixed generate issue (egovernments#933)

* Fixed project-type resources duplication

* updated target error messages (egovernments#936)

* fixed stepper from draft (egovernments#937)

* Update Listener.ts

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

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

* fixed error message issue (egovernments#941)

* Redis integration (egovernments#940)

* Feat : added redis

* Feat : added redis retry

* updated migration

* Feat : changed download logic (egovernments#942)

* Update README.md (egovernments#943)

* fixed target validate for different tabs not present (egovernments#945)

* Enriching already exsisting user (egovernments#946)

* Feat : adding dropdowns (egovernments#952)

* HLM-6270: Date logic changes, added localisation code (egovernments#953)

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

* changed maximum target message (egovernments#954)

* changed maximum target message

* Update UploadData.js

* Call generate (egovernments#951)

* updated target error messages

* generate call while campaign update changes boundaries

* some update on call-generate

* call-generate

* updated call-gnerate logic

* added column campaign id in generated resource table

* updated config index.ts

* removed console.logs

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

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

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

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

* added some additional conditions

---------

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

* changed facility info message (egovernments#955)

* HLM 6270 (egovernments#957)

* refactor

* added title text

---------

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

* Update genericUtils.ts (egovernments#958)

* fixed boundary draft logic (egovernments#959)

* Boundary code generated has now configurable hierarchy type and boundary name at last based on config (egovernments#963)

* fixed target validate for different tabs not present

* made hierarchytype and bondary name configurable in auto generation of boundary code

* added toString() on elment for safety

* HLM-6270: Elimated Generate API & enhance download API, Date logic fixes (egovernments#966)

* refactor

* added title text

* HLM-6270: Elimated Generate API & enhance download API, Date logic fixes

---------

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

* Ashish table create (egovernments#972)

* saving

* Feat : adding table

* Feat : table creating

* updated configs

* Feat : added table

* Feat : table added

* Feat : integrated processtracks

* Fix : name format (egovernments#973)

* Update campaignUtils.ts (egovernments#974)

* configure app static screen and skeleton (egovernments#980)

* configure app static screen and skeleton

* comments resolved

* Migration repair (egovernments#981)

* migration repair

* migration repair

* migration repair

* Updated CampaignCard to add NATIONAL_SUPERVISOR dashboard link

* made isActive change (egovernments#986)

* boundaries on which we split to be fetched from mdms (egovernments#982)

* fixed target validate for different tabs not present

* split boundaries fetch from mdms

* updated logic to fetch split on from mdms based on campaign type

* fromatting

* Update campaignUtils.ts (egovernments#988)

* Update processTrackUtils.ts (egovernments#989)

* fixs (egovernments#990)

* fixs

* Update SelectingBoundaries.js

* Update processTrackUtils.ts (egovernments#991)

* Summary screen api loop fix (egovernments#992)

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

* Resource activity (egovernments#993)

* fixed target validate for different tabs not present

* resource activity persisting in db

* Update processTrackUtils.ts (egovernments#994)

* added timeout of 2 sec for boundary entity to persist (egovernments#996)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* css version fix (egovernments#997)

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

* Process tracking update (egovernments#998)

* Feat : changed logic of process track

* Feat : improved process tracks

* improved process tracking

* Update campaignUtils.ts (egovernments#999)

* Update campaignUtils.ts (egovernments#1000)

* Update campaignUtils.ts

* Update Listener.ts

* Feat : imporved process track (egovernments#1001)

* Update campaignManageService.ts (egovernments#1003)

* Update campaignManageService.ts

* Update campaignUtils.ts

* Update processTrackUtils.ts

* Feat : added user mapping for multiple boundaries with common parent (egovernments#1005)

* new template will be generated if source is microplan accordingly from mdms (egovernments#1004)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* new template generate if source is microplan

* updated logic for generating templates if source of campaign is from microplan

* made separate function for checking source is microplan

* added separate  func for checking source is microplan

* refactor

* chnaged the checkIFSourceMicoplan func

* refactored checkifsourceismicroplan

* Fix : fix array fetch from cell (egovernments#1006)

* Feat : fixed array issue in target (egovernments#1007)

* Feat : fixed array issue in target

* Update index.ts

* Some fixes and refactor (egovernments#1008)

* Feat : fixed array issue in target

* Update index.ts

* Refactor

* Fixed status row

* commented harcoded check && added new dashboard icon (egovernments#1011)

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

* Fixed sheetrows issues (egovernments#1012)

* Sheet row fixed (egovernments#1013)

* Fixed sheetrows issues

* Shut down if kafka error

* Feat : formated sheet (egovernments#1015)

* integrated admin schema  with mdms_v2 (egovernments#1018)

* Fix process timeline (egovernments#1029)

* Feat : formated sheet

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* Feat : imporved processTracking and fixed migration script

* Feat : fixed error persistence

* Fix

* Un wrap other rows (egovernments#1034)

* Feat : formated sheet

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* Feat : imporved processTracking and fixed migration script

* Feat : fixed error persistence

* Unwraped lower rows

* Update publishProjectFactory.yml

* updated package versions (egovernments#1042)

* HLM-6325/HLM-6277: Update date with & without boundary screen integration and actionable column added (egovernments#1045)

* HLM-6007

* css version fix

* update date screen added

* change add

* css fixes and API Integration for search project

* Implemented Action component in My Campaign screen

* Implemented Date Update with and without boundary with API integration

* Boundary change

---------

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

* Facility dynamic generate for source microplan (egovernments#1046)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* added code for generating facility template if source is microplan

* updated name

* updated version (egovernments#1047)

* updated core version to fix login forget password issues(egovernments#1051)

* Fixed update topic (egovernments#1056)

* updated version (egovernments#1061)

* Hidden sheet impel (egovernments#1077)

* Feat : formated sheet

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* Feat : imporved processTracking and fixed migration script

* Feat : fixed error persistence

* Unwraped lower rows

* Update campaignUtils.ts

* Update publishProjectFactory.yml

* Update genericUtils.ts (egovernments#1078)

* target template download based on delivery conditions if present (egovernments#1080)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* logic for dynamic target generate template based on delivery conditions

* fixed stepper color issue from draft (egovernments#1083)

* fixed reordering of tab issue (egovernments#1092)

* Hlm 6350 (egovernments#1094)

* timeline wip

* added timeline from summary

* removed log

* integarte with mdms (egovernments#1095)

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

* Update genericUtils.ts (egovernments#1097)

* Update targetUtils.ts (egovernments#1098)

* Hlm 6350 (egovernments#1100)

* timeline wip

* added timeline from summary

* removed log

* integrated timeline with popup

* updated version

* updated css version

* HCMPRE-32: Resolve date update demo points (egovernments#1104)

* integarte with mdms

* HCMPRE-32: Resolve date update demo points

* comment resolve

---------

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

* Dynamic target upload and download both with target columns as per delivery conditions when campaign is updated with cahnegs in delivery conditions (egovernments#1109)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* target upload based on dynamic column in reference to deliveryRules

* logic for calling generate target tempalte when campaign delivery conditions change

* removed console

* updated css version (egovernments#1102)

* added chip for dropdown (egovernments#1111)

* version fix to resolve issue (egovernments#1112)

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

* Ashish patch1 (egovernments#1118)

* Feat : formated sheet

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* Feat : imporved processTracking and fixed migration script

* Feat : fixed error persistence

* Unwraped lower rows

* Update campaignUtils.ts

* Update genericValidator.ts

* Update publishProjectFactory.yml

* Update targetUtils.ts

* edit product with prefilled value and count (egovernments#1115)

* Boundary upload  to have not generate boundary code if  code is already filled to support migration (egovernments#1121)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* Boundary upload  to have not generate boundary code if  code is already filled to support migration

* Update index.ts

* Update constants.ts (egovernments#1122)

* Update constants.ts

* Update utilities/project-factory/src/server/config/constants.ts

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

* Update campaignUtils.ts

* Update campaignUtils.ts

* Update campaignMappingUtils.ts

---------

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

* template downlod for source microplan (egovernments#1123)

* Different tabs onlevel to fetch from mdms rather than from config in target upload flow (egovernments#1124)

* template downlod for source microplan

* updated logic for getting different tabs based on level from config to fetch it from mdms in target upload flow

* Sequence order change in action button (egovernments#1125)

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

* reverted  the function validateAllDistrictTabsPresentOrNot (egovernments#1126)

* template downlod for source microplan

* updated logic for getting different tabs based on level from config to fetch it from mdms in target upload flow

* restored the func validateAllDistrictTabsPresentOrNot to default

* Update index.ts (egovernments#1129)

* Update index.ts

* Update Listener.ts

* Update Producer.ts

* Update generateUtils.ts (egovernments#1130)

* some changes related to generate boundary template (egovernments#1133)

* updated logic for target columns acc to delivery conditions only for smc (#1137)

* some changes related to generate boundary template

* updated logic for making configurable target acc to delivery only for smc

* refactored code for including dynamic target columns for specific types according to configs array

* updated version and boundary fix (#1141)

* updated readmeconfig for sheet (#1142)

* HCMPRE-140: Action column fixes, date editable logic change (#1143)

* Action column fixes, date editable logic change

* added roles for dss

---------

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

* Update constants.ts (#1145)

* Update constants.ts

* Update processTrackUtils.ts

* Update Listener.ts (#1147)

* HCMPRE 140 (#1149)

* Action column fixes, date editable logic change

* added roles for dss

* update dates fixes

---------

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

* updated core version (#1150)

* Ashish patch2 (#1152)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Update publishProjectFactory.yml

* Redis cache for generating target when delivery conditions change (#1156)

* updated readmeconfig for sheet

* added cache for generating target template when only delivery conditions change

* added cache time in config

* refactored caching code in generate flow for boundary sheet

* refactored callGenerate function

* Ashish egov patch 2 (#1166)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Update publishProjectFactory.yml

* HCMPRE-154: Update Dates bug fixes, Toast added for error. (#1158)

* Action column fixes, date editable logic change

* added roles for dss

* update dates fixes

* HCMPRE-154 update dates bug fixes, Added toast for error

* code clean

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

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

* Adding date bug

* date fix

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

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

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

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

---------

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

* version update (#1168)

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

* HCMPRE-6407 download template changes  (egovernments#1128)

* HLM-6407 adding changes for facility template

* HLM-6407 adding changes for facility template

* HLM-6407 adding changes for facility template

* HLM-6407 codde review comment

* HCMPRE-91 code review comments

* HLM-6407 using same mdms schema for microplan

* HLM-6407 adding changes for facility template

* HLM-6407 adding changes for facility template

* HLM-6407 adding changes for facility template

* HLM-6407 codde review comment

* HCMPRE-91 code review comments

* HLM-6407 using same mdms schema for microplan

* HLM-6407 code review comments

* HLM-6407 code review comments

* Core ui version fix (#1176)

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

* Ashish egov patch 2 (#1178)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Update publishProjectFactory.yml

* Update Producer.ts (#1182)

* fixed timeline issues (#1185)

* HCMPRE 154 (#1186)

* date validation fix

* Update date logic

* FIX

---------

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

* changes in timeline (#1187)

* CSS version add (#1188)

* date validation fix

* Update date logic

* FIX

* css add

---------

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

* HCMPRE 154 (#1189)

* date validation fix

* Update date logic

* FIX

* css add

* non editable fix

---------

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

* limited the number of columns of target for upto only 18 in number  (#1190)

* updated readmeconfig for sheet

* added cache for generating target template when only delivery conditions change

* added logic for having only 18 target columns  if exceed i will create one column with  header OTHER_TARGETS

* HCMPRE 154 (#1191)

* date validation fix

* Update date logic

* FIX

* css add

* non editable fix

* date start from tomorrow

* css fix for language screen

---------

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

* Produceasync (#1192)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Producer update

* Feat : updated producemodified message

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* HCMPRE 154 (#1193)

* date validation fix

* Update date logic

* FIX

* css add

* non editable fix

* date start from tomorrow

* css fix for language screen

* disable today date

---------

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

* config updates according to devops (#1197)

* updated readmeconfig for sheet

* added cache for generating target template when only delivery conditions change

* added logic for having only 18 target columns  if exceed i will create one column with  header OTHER_TARGETS

* updated config to fetch from devops accordingly

* Update index.ts

* All changes (#1201)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Update Producer.ts

* Update Producer.ts

* Feat : updated producemodified message

* Feat : removed waiting

* adding constraint

* Update V20240731162600__add_uniqiue_constraint_process_track.sql

* Update constants.ts

* Update publishProjectFactory.yml

* HCMPRE 154 (#1202)

* date validation fix

* Update date logic

* FIX

* css add

* non editable fix

* date start from tomorrow

* css fix for language screen

* disable today date

* date and cycle fix

---------

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

* Revert "HCMPRE 154 (#1191)" (#1203)

This reverts commit 59ec953.

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

* updated versions (#1205)

* Update date change screen date logic fix, info added, hard reload issue fix (#1206)

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

* Config update for project-factory (#1207)

* updated readmeconfig for sheet

* added cache for generating target template when only delivery conditions change

* added logic for having only 18 target columns  if exceed i will create one column with  header OTHER_TARGETS

* updated config to fetch from devops accordingly

* updated config for project -factory

* Timeline (#1210)

* updated versions

* fixed user credential button

* Kafka fix (#1212)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Revert "Ashish egov patch 2 (#1178)"

This reverts commit e86a4dc.

* Update Producer.ts

* Update Producer.ts

* Feat : updated producemodified message

* Feat : removed waiting

* adding constraint

* Update V20240731162600__add_uniqiue_constraint_process_track.sql

* Update constants.ts

* Feat : improved kafka

* Fix kafka restart issue

* fixed the pop up button issue (#1215)

* Kafka restart (#1217)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Revert "Ashish egov patch 2 (#1178)"

This reverts commit e86a4dc.

* Update Producer.ts

* Update Producer.ts

* Feat : updated producemodified message

* Feat : removed waiting

* adding constraint

* Update V20240731162600__add_uniqiue_constraint_process_track.sql

* Update constants.ts

* Feat : improved kafka

* Update Producer.ts

* Update Producer.ts

* Update publishProjectFactory.yml

* updated core versions for privacy component  (#1223)

* Ashish egov patch 1 (#1228)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Revert "Ashish egov patch 2 (#1178)"

This reverts commit e86a4dc.

* Update Producer.ts

* Update Producer.ts

* Feat : updated producemodified message

* Feat : removed waiting

* adding constraint

* Update V20240731162600__add_uniqiue_constraint_process_track.sql

* Update constants.ts

* Feat : improved kafka

* Update Producer.ts

* Update Producer.ts

* Update campaignUtils.ts

* feat : solved localization passing through kafka

* Update publishProjectFactory.yml

* removed frontend

* Update package.json

* Squashed commit of the following:

commit 3cd21c2
Merge: 12061ca 80f6307
Author: Jagankumar <[email protected]>
Date:   Thu Aug 8 15:13:48 2024 +0530

    Merge branch 'campaign' into campaign-merged

commit 80f6307
Author: nitish-egov <[email protected]>
Date:   Wed Aug 7 18:08:15 2024 +0530

    Updated changelog (#1242)

    * default enableDynamicTemplateForWillBe empty string in config

    * updated changelog and postman collection

commit f897dba
Author: Jagankumar <[email protected]>
Date:   Wed Aug 7 17:25:39 2024 +0530

    Update package.json

commit dd691e6
Author: Bhavya-egov <[email protected]>
Date:   Tue Aug 6 13:34:40 2024 +0530

    updated workbench version (#1236)

commit 3a30736
Author: Bhavya-egov <[email protected]>
Date:   Tue Aug 6 11:00:14 2024 +0530

    updated micro ui core version (#1233)

commit a1f7329
Author: nitish-egov <[email protected]>
Date:   Mon Aug 5 18:29:40 2024 +0530

    default enableDynamicTemplateForWillBe empty string in config (#1231)

commit d3c3e95
Author: nabeelmd-eGov <[email protected]>
Date:   Mon Aug 5 18:11:23 2024 +0530

    build issue fix for optional chanining issue (#1230)

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

commit 236b843
Author: nabeelmd-eGov <[email protected]>
Date:   Mon Aug 5 17:17:20 2024 +0530

    fix (#1229)

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

* sending only activity object to kafka in place of request body (egovernments#851)

---------

Co-authored-by: ashish-egov <[email protected]>
Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Bhavya-egov <[email protected]>
Co-authored-by: nabeelmd-eGov <[email protected]>
Co-authored-by: nabeelmd-eGov <[email protected]>
Co-authored-by: Priyanka-eGov <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant