Skip to content

Commit

Permalink
v0.2 admin console merge to master (egovernments#849)
Browse files Browse the repository at this point in the history
* 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 (egovernments#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 (egovernments#1141)

* updated readmeconfig for sheet (egovernments#1142)

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

* Action column fixes, date editable logic change

* added roles for dss

---------

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

* Update constants.ts (egovernments#1145)

* Update constants.ts

* Update processTrackUtils.ts

* Update Listener.ts (egovernments#1147)

* HCMPRE 140 (egovernments#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 (egovernments#1150)

* Ashish patch2 (egovernments#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 (egovernments#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 (egovernments#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. (egovernments#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 (egovernments#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 (egovernments#1176)

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

* Ashish egov patch 2 (egovernments#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 (egovernments#1182)

* fixed timeline issues (egovernments#1185)

* HCMPRE 154 (egovernments#1186)

* date validation fix

* Update date logic

* FIX

---------

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

* changes in timeline (egovernments#1187)

* CSS version add (egovernments#1188)

* date validation fix

* Update date logic

* FIX

* css add

---------

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

* HCMPRE 154 (egovernments#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  (egovernments#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 (egovernments#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 (egovernments#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 (egovernments#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 (egovernments#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 (egovernments#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 (egovernments#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 (egovernments#1191)" (egovernments#1203)

This reverts commit 59ec953.

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

* updated versions (egovernments#1205)

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

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

* Config update for project-factory (egovernments#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 (egovernments#1210)

* updated versions

* fixed user credential button

* Kafka fix (egovernments#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 (egovernments#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 (egovernments#1215)

* Kafka restart (egovernments#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 (egovernments#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  (egovernments#1223)

* Ashish egov patch 1 (egovernments#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 (egovernments#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 (egovernments#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 (egovernments#1236)

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

    updated micro ui core version (egovernments#1233)

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

    default enableDynamicTemplateForWillBe empty string in config (egovernments#1231)

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

    build issue fix for optional chanining issue (egovernments#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 (egovernments#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]>
  • Loading branch information
8 people authored Aug 12, 2024
1 parent 8208b6f commit 1ea8b5b
Show file tree
Hide file tree
Showing 298 changed files with 4,307 additions and 39,852 deletions.
18 changes: 18 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [

{
"type": "node",
"request": "attach",
"name": "Attach to Remote",
"address": "localhost",
"port": 9229,
"localRoot": "${workspaceFolder}",
"remoteRoot": "/app"
}
]
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"editor.inlineSuggest.showToolbar": "onHover"
}
32 changes: 0 additions & 32 deletions frontend/micro-ui/.gitignore

This file was deleted.

3 changes: 0 additions & 3 deletions frontend/micro-ui/Jenkinsfile

This file was deleted.

139 changes: 0 additions & 139 deletions frontend/micro-ui/README.md

This file was deleted.

4 changes: 0 additions & 4 deletions frontend/micro-ui/package.json

This file was deleted.

5 changes: 0 additions & 5 deletions frontend/micro-ui/web/.babelrc

This file was deleted.

3 changes: 0 additions & 3 deletions frontend/micro-ui/web/.env.sample

This file was deleted.

7 changes: 0 additions & 7 deletions frontend/micro-ui/web/CHANGELOG.md

This file was deleted.

25 changes: 0 additions & 25 deletions frontend/micro-ui/web/docker/Dockerfile

This file was deleted.

26 changes: 0 additions & 26 deletions frontend/micro-ui/web/docker/devDockerfile

This file was deleted.

25 changes: 0 additions & 25 deletions frontend/micro-ui/web/docker/masDockerfile

This file was deleted.

12 changes: 0 additions & 12 deletions frontend/micro-ui/web/docker/nginx.conf

This file was deleted.

Empty file removed frontend/micro-ui/web/envs.js
Empty file.
14 changes: 0 additions & 14 deletions frontend/micro-ui/web/install-deps.sh

This file was deleted.

Loading

0 comments on commit 1ea8b5b

Please sign in to comment.