Admin console Improved performance, sheets freezed, implemented cachi…

…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 <nabeel.md@egovernments.com> * 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 <nabeel.md@egovernments.com> * 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 <nabeel.md@egovernments.com> * Fixed HLM-5988_warning message (#689) Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> * download filename fixes (#693) * download button fixes in summary * download filename with custom name changes added --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * 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 <nabeel.md@egovernments.com> * 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 <nabeel.md@egovernments.com> * HLM-5718 changes (#703) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * 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 <nabeel.md@egovernments.com> * 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 <nabeel.md@egovernments.com> * 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 <nabeel.md@egovernments.com> * 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 <53823168+jagankumar-egov@users.noreply.github.com> 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 <53823168+jagankumar-egov@users.noreply.github.com> * Create CHANGELOG.md * gate fixes (#736) * gate fixes validation, ui ux * gate fix --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * added loader in the selecting boundaries (#737) * Update createAndSearch.ts (#738) * fix (#739) * fix * fix --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Patch 3 (#740) * change in filter recursive * lowest level * trimmed underscore and empty spaces * boundary fix (#742) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * 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 <nabeel.md@egovernments.com> * core -update (#751) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * fixed stepper issue (#752) * fixed stepper issue * Update index.html * Feat : added user validation via individual (#753) * fixes (#754) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * code fix nabeel (#756) * fixes * fix --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * 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 <nabeel.md@egovernments.com> * css update (#780) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * HLM-6179 and HLM-6180 (#777) * HLM-6179 and HLM-6180 * campaign name changes --------- Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> * 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 <53823168+jagankumar-egov@users.noreply.github.com> 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 <nabeel.md@egovernments.com> * added error button styles (#807) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * 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 <nabeel.md@egovernments.com> * 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 <nabeel.md@egovernments.com> * Target columns (#830) * change in filter recursive * lowest level * commit * Feat : target flow fixed for LLIN-mz * uat to dev --------- Co-authored-by: admin1 <nitish@egovernments.org> * 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 <53823168+jagankumar-egov@users.noreply.github.com> 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 <nabeel.md@egovernments.com> * 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 <nabeel.md@egovernments.com> * 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 <nabeel.md@egovernments.com> * 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 <nabeel.md@egovernments.com> * 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 <nabeel.md@egovernments.com> * 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 <nabeel.md@egovernments.com> * 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 <137176738+ashish-egov@users.noreply.github.com> Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> Co-authored-by: Bhavya-egov <bhavya.mangal@egovernments.org> Co-authored-by: ashish-egov <ashish.tiwari@egovernments.org> Co-authored-by: nitish-egov <137176807+nitish-egov@users.noreply.github.com> Co-authored-by: Bhavya-egov <137176879+Bhavya-egov@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Swathi-eGov <137176788+Swathi-eGov@users.noreply.github.com> Co-authored-by: admin1 <nitish@egovernments.org>
egovernments · Jun 20, 2024 · 6caaf27 · 6caaf27
1 parent 3e8a3ec
commit 6caaf27
Show file tree

Hide file tree

Showing 78 changed files with 5,918 additions and 2,507 deletions.
diff --git a/.github/workflows/buildWorkbenchUI.yml b/.github/workflows/buildWorkbenchUI.yml
@@ -0,0 +1,64 @@
+name: Digit Admin Console Build workflow
+on:
+  push:
+    branches:
+      - campaign
+    paths:
+      - 'micro-ui/web/micro-ui-internals/**'
+  pull_request:
+    branches:
+      - campaign
+  workflow_dispatch:
+jobs:
+  docker_image-build:
+    outputs:
+      run_job_digit_ui: ${{ steps.check_files.outputs.run_job_digit_ui }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
+      - name: Setup Docker
+        uses: docker/setup-buildx-action@v1
+      - name: check modified files
+        id: check_files
+        run: |
+          echo "=============== list modified files ==============="
+          git diff --name-only HEAD^ HEAD
+
+          echo "========== check paths of modified files =========="
+          git diff --name-only HEAD^ HEAD > files.txt
+          run_job_digit_ui=false
+          while IFS= read -r file
+          do
+            if [[ $file == micro-ui/* ]]; then
+              echo "This modified file is under the 'digit_ui' folder."
+              run_job_digit_ui=true
+            fi
+          done < files.txt
+
+          # Set the output based on whether the job should run
+          echo "::set-output name=run_job_digit_ui::$run_job_digit_ui"
+          echo "ACTION_NUMBER=${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
+          echo "COMMIT_ID=${GITHUB_SHA: -8}" >> $GITHUB_ENV  # Extract last 8 characters of SHA
+          echo "BRANCH_NAME=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
+
+
+
+
+      - name: Login to egovio docker Container Registry
+        env:
+            DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+            DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: |      
+          # Authenticate with Docker Hub
+          echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+
+      - name: Build and Push Docker image for digit-ui
+        if: ${{ steps.check_files.outputs.run_job_digit_ui == 'true' }}
+        run: |
+          docker build -t workbench-ui:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }} -f web/workbench/Dockerfile .
+          docker tag workbench-ui:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }} egovio/workbench-ui:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }}
+          docker push egovio/workbench-ui:${{ env.BRANCH_NAME }}-${{ env.COMMIT_ID }}-${{ env.ACTION_NUMBER }}
+        working-directory: micro-ui
diff --git a/.github/workflows/publishProjectFactory.yml b/.github/workflows/publishProjectFactory.yml
@@ -3,6 +3,8 @@ name: project factory service docker Image CI
 on:
   push:
     branches: [ "campaign" ]
+    paths:
+      - 'utilities/project-factory/**'
   pull_request:
     branches: [ "campaign" ]
 

diff --git a/frontend/micro-ui/README.md b/frontend/micro-ui/README.md
@@ -1,5 +1,5 @@
 
-# workbench ui 
+# DIGIT ui 
 
 A React App built on top of DIGIT UI Core.
 
@@ -136,5 +136,4 @@ Start the server
   yarn start
 ```
 
-
 ![Logo](https://s3.ap-south-1.amazonaws.com/works-dev-asset/mseva-white-logo.png)
diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -9,12 +9,12 @@
     "start": "react-scripts start"
   },
   "devDependencies": {
-    "@egovernments/digit-ui-libraries": "1.8.1-beta.4",
-    "@egovernments/digit-ui-module-core": "1.8.1-beta.23",
-    "@egovernments/digit-ui-module-utilities": "1.0.1-beta.2",
-    "@egovernments/digit-ui-components": "0.0.1-beta.31",
-    "@egovernments/digit-ui-react-components": "1.8.1-beta.24",
-    "@egovernments/digit-ui-module-workbench": "1.0.1-beta.16",
+    "@egovernments/digit-ui-libraries": "1.8.2-beta.1",
+    "@egovernments/digit-ui-module-workbench": "1.0.2-beta.3",
+    "@egovernments/digit-ui-components": "0.0.2-beta.1",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.2",
+    "@egovernments/digit-ui-module-utilities": "1.0.1-beta.30",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.6",
     "@egovernments/digit-ui-module-hcmworkbench":"0.0.38",
     "@egovernments/digit-ui-module-campaign-manager": "0.0.1",
     "http-proxy-middleware": "^1.0.5",

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/public/index.html b/frontend/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -14,11 +14,10 @@
     rel="stylesheet"
     href="https://unpkg.com/@egovernments/digit-ui-css@1.8.0-alpha.6/dist/index.css"
   /> -->
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.1-beta.10/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-coreui.22/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.49-campaign/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.2/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.1/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.0.56-campaign/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->
-
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.5.41/dist/index.css" /> -->
 
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css/dist/index.css"/> -->

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/src/ComponentRegistry.js b/frontend/micro-ui/web/micro-ui-internals/example/src/ComponentRegistry.js
@@ -0,0 +1,11 @@
+class Registry {
+  constructor(registry = {}) {
+    this._registry = registry;
+  }
+
+  getComponent(id) {
+    return this._registry[id];
+  }
+}
+
+export default Registry;
diff --git a/frontend/micro-ui/web/micro-ui-internals/example/src/complaintConfig.js b/frontend/micro-ui/web/micro-ui-internals/example/src/complaintConfig.js
@@ -0,0 +1,31 @@
+export const config = {
+  routes: {
+    "complaint-type": {
+      nextStep: "pincode",
+    },
+    landmark: {
+      nextStep: "apartment",
+    },
+    apartment: {
+      component: "SelectName",
+      texts: {
+        header: "Apartment or Society",
+        cardText: "CS_COMPLAINT_SUBTYPE_TEXT",
+        submitBarLabel: "PT_COMMONS_NEXT",
+      },
+      inputs: [
+        {
+          label: "Apartment",
+          type: "text",
+          name: "custom.additionalDetails.apartment",
+          validation: {
+            minLength: 6,
+            maxLength: 7,
+          },
+          error: "CORE_COMMON_PINCODE_INVALID",
+        },
+      ],
+      nextStep: "upload-photos",
+    },
+  },
+};
diff --git a/frontend/micro-ui/web/micro-ui-internals/example/src/components/SelectName.js b/frontend/micro-ui/web/micro-ui-internals/example/src/components/SelectName.js
@@ -0,0 +1,8 @@
+import React from "react";
+import { FormStep } from "@egovernments/digit-ui-react-components";
+
+const SelectName = ({ config, onSelect, onSkip, t }) => {
+  return <FormStep config={config} onSelect={onSelect} t={t}></FormStep>;
+};
+
+export default SelectName;
diff --git a/frontend/micro-ui/web/micro-ui-internals/example/src/fsm.js b/frontend/micro-ui/web/micro-ui-internals/example/src/fsm.js
@@ -0,0 +1,38 @@
+const fsmCustomizations = {
+  getEmployeeApplicationCustomization: (config, t) => {
+    const employeeConfig = [
+      {
+        name: "applicationDetails",
+        // fields: ["sanitationType", "applicationChannel"],
+        // fieldsOrder: {sanitationType: 0, applicationChannel: 1}, // TODO
+        allFields: true, // for example: If in applicationDetails you have 10 fields and in fieldsOrder you only enter 3 fields name then on browser you will only see 3 fields in that order but if you want to see rest of 7 fields at the bottom.
+        // removeFields: ["applicantName"], // type the name of the field in camelCase to remove it
+        addFields: [
+          // by default all the custom fields will add at the bottom, you can add "field name" to "fieldsOrder" if you want them in your custom order.
+          {
+            name: "example",
+            label: t("EXAMPLE"),
+            type: "text",
+            isMandatory: true,
+            populators: {
+              name: "example",
+              validation: {
+                required: true,
+                pattern: /[A-Za-z]/,
+              },
+            },
+          },
+        ],
+      },
+    ];
+
+    return {
+      config: employeeConfig,
+      defaultConfig: true, // You want to use defaultConfig and you only want to update one field section. The above employeeConfig is also an order for all the field section. So if defaultConfig is false then on browser you will only see those field section who are inside employeeConfig
+    };
+  },
+};
+
+const fsmComponents = {};
+
+export { fsmCustomizations, fsmComponents };
diff --git a/frontend/micro-ui/web/micro-ui-internals/example/src/pgr.js b/frontend/micro-ui/web/micro-ui-internals/example/src/pgr.js
@@ -0,0 +1,15 @@
+import SelectName from "./components/SelectName";
+
+// import { config as complaintConfig } from "./complaintConfig";
+
+const pgrCustomizations = {
+  // complaintConfig,
+  getComplaintDetailsTableRows: ({ id, service, role, t }) => {
+    return {};
+  },
+};
+
+const pgrComponents = {
+  SelectName: SelectName,
+};
+export { pgrCustomizations, pgrComponents };
diff --git a/frontend/micro-ui/web/micro-ui-internals/example/src/setupProxy.js b/frontend/micro-ui/web/micro-ui-internals/example/src/setupProxy.js
@@ -0,0 +1,100 @@
+const { createProxyMiddleware } = require("http-proxy-middleware");
+
+const createProxy = createProxyMiddleware({
+  //target: process.env.REACT_APP_PROXY_API || "https://uat.digit.org",
+  // target: process.env.REACT_APP_PROXY_API || "https://qa.digit.org",
+  target: process.env.REACT_APP_PROXY_API || "https://works-dev.digit.org",
+  changeOrigin: true,
+  secure: false,
+});
+const assetsProxy = createProxyMiddleware({
+  target: process.env.REACT_APP_PROXY_ASSETS || "https://works-dev.digit.org",
+  changeOrigin: true,
+  secure: false,
+});
+const mdmsProxy = createProxyMiddleware({
+  target: process.env.REACT_APP_PROXY_ASSETS || "http://localhost:8080",
+  changeOrigin: true,
+  secure: false,
+});
+module.exports = function (app) {
+  ["/mdms-v2/v2/_create"].forEach((location) => app.use(location, mdmsProxy));
+  [
+    "/access/v1/actions/mdms",
+    "/egov-mdms-service",
+    "/mdms-v2",
+    "/egov-idgen",
+    "/egov-location",
+    "/localization",
+    "/egov-workflow-v2",
+    "/pgr-services",
+    "/filestore",
+    "/egov-hrms",
+    "/user-otp",
+    "/user",
+    "/fsm",
+    "/billing-service",
+    "/collection-services",
+    "/pdf-service",
+    "/pg-service",
+    "/vehicle",
+    "/vendor",
+    "/property-services",
+    "/fsm-calculator/v1/billingSlab/_search",
+    "/pt-calculator-v2",
+    "/dashboard-analytics",
+    "/echallan-services",
+    "/egov-searcher/bill-genie/mcollectbills/_get",
+    "/egov-searcher/bill-genie/billswithaddranduser/_get",
+    "/egov-searcher/bill-genie/waterbills/_get",
+    "/egov-searcher/bill-genie/seweragebills/_get",
+    "/egov-pdf/download/UC/mcollect-challan",
+    "/egov-hrms/employees/_count",
+    "/tl-services/v1/_create",
+    "/tl-services/v1/_search",
+    "/egov-url-shortening/shortener",
+    "/inbox/v1/_search",
+    "/inbox/v2/_search",
+    "/tl-services",
+    "/tl-calculator",
+    "/org-services",
+    "/edcr",
+    "/bpa-services",
+    "/noc-services",
+    "/egov-user-event",
+    "/egov-document-uploader",
+    "/egov-pdf",
+    "/egov-survey-services",
+    "/ws-services",
+    "/sw-services",
+    "/ws-calculator",
+    "/sw-calculator/",
+    "/egov-searcher",
+    "/report",
+    "/inbox/v1/dss/_search",
+    "/loi-service",
+    "/project/v1/",
+    "/estimate-service",
+    "/loi-service",
+    "/works-inbox-service/v2/_search",
+    "/egov-pdf/download/WORKSESTIMATE/estimatepdf",
+    "/muster-roll",
+    "/individual",
+    "/mdms-v2",
+    "/hcm-moz-impl",
+    "/project",
+    "/project/staff/v1/_search",
+    "/project/v1/_search",
+    "/facility/v1/_search",
+    "/product/v1/_search",
+    "/product/variant/v1/_search",
+    "/hcm-bff/bulk/_transform",
+    "/hcm-bff/hcm/_processmicroplan",
+    "/health-hrms",
+    "/project-factory",
+    "/boundary-service",
+    "/product",
+  ].forEach((location) => app.use(location, createProxy));
+  ["/pb-egov-assets"].forEach((location) => app.use(location, assetsProxy));
+  ["/mdms-v2/v2/_create"].forEach((location) => app.use(location, mdmsProxy));
+};
diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json
@@ -42,11 +42,11 @@
     "*.{js,css,md}": "prettier --write"
   },
   "dependencies": {
-    "ajv": "^8.12.0",
+    "ajv": "8.12.0",
     "lodash": "4.17.21",
     "microbundle-crl": "0.13.11",
-    "@egovernments/digit-ui-react-components": "1.8.1-beta.24",
-    "@egovernments/digit-ui-components": "0.0.1-beta.31",
+    "@egovernments/digit-ui-react-components": "1.8.2-beta.6",
+    "@egovernments/digit-ui-components": "0.0.2-beta.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-hook-form": "6.15.8",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-css",
-  "version": "1.0.49-campaign",
+  "version": "1.0.56-campaign",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <jagan.kumar@egov.org.in>",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaign.scss
@@ -77,3 +77,33 @@
   gap: 0.5rem;
   margin-bottom: 0.5rem;
 }
+.infoClass{
+  margin-bottom: 1.5rem
+}
+.headerWrapperClassName{
+  display: none
+}
+.popup-close-svg{
+  display: none;
+}
+.whoLogo{
+  margin-top: -1rem;
+  margin-bottom: -1rem;
+}
+
+.digit-popup-wrapper{
+  &.popUpClass{
+    width:45rem;
+
+    .popUpFooter{
+      .digit-popup-footer-buttons{
+        margin-left: 0px;
+        width: 100%;
+
+        button{
+          flex:1;
+        }
+      }
+    }
+  }
+}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaignCycle.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaignCycle.scss
@@ -265,6 +265,9 @@
   .label-field-pair {
     flex-direction: column;
     align-items: flex-start !important;
+    .card-label.card-label-smaller {
+      font-weight: 700;
+    }
     .employee-select-wrap.form-field {
       width: 100%;
     }