From 3c88770026b1bc74e79be24004da9bfb57abf0b3 Mon Sep 17 00:00:00 2001 From: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Date: Thu, 30 May 2024 19:54:47 +0530 Subject: [PATCH] Fixes of admin console v0.1 (#759) * Merge branch 'campaign' into campaign-merged * Merge branch 'campaign' into campaign-merged --- frontend/micro-ui/web/CHANGELOG.md | 7 ++ .../micro-ui-internals/example/package.json | 4 +- .../example/public/index.html | 6 +- .../web/micro-ui-internals/package.json | 4 +- .../packages/css/package.json | 2 +- .../css/src/pages/employee/campaign.scss | 5 +- .../css/src/pages/employee/campaignCycle.scss | 7 +- .../css/src/pages/employee/index.scss | 64 +++++++++-- .../packages/css/tailwind.config.js | 5 +- .../modules/campaign-manager/package.json | 4 +- .../src/components/CampaignDates.js | 5 +- .../src/components/CampaignType.js | 2 +- .../src/components/SelectingBoundaries.js | 28 +++-- .../src/components/UploadData.js | 6 ++ .../src/hooks/useParallelSearch.js | 20 ++++ .../src/pages/employee/CycleConfiguration.js | 18 ++-- .../src/pages/employee/MyCampaign.js | 38 ++++++- .../src/pages/employee/SetupCampaign.js | 18 ++++ .../deliveryRule/AddDeliverycontext.js | 11 +- .../employee/deliveryRule/MultiTabcontext.js | 4 +- .../src/pages/employee/deliveryRule/index.js | 2 +- frontend/micro-ui/web/package.json | 2 +- frontend/micro-ui/web/public/index.html | 4 +- frontend/micro-ui/web/workbench/package.json | 2 +- .../src/server/api/campaignApis.ts | 77 +++++++++----- .../src/server/api/genericApis.ts | 2 - .../src/server/config/createAndSearch.ts | 2 +- .../src/server/config/index.ts | 3 +- .../server/config/models/campaignDetails.ts | 2 +- .../src/server/kafka/Listener.ts | 1 + .../src/server/utils/campaignUtils.ts | 46 ++++---- .../src/server/utils/genericUtils.ts | 22 +++- .../utils/transforms/projectTypeUtils.ts | 13 ++- .../server/validators/campaignValidators.ts | 100 +++++++++++++----- 34 files changed, 397 insertions(+), 139 deletions(-) create mode 100644 frontend/micro-ui/web/CHANGELOG.md create mode 100644 frontend/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useParallelSearch.js diff --git a/frontend/micro-ui/web/CHANGELOG.md b/frontend/micro-ui/web/CHANGELOG.md new file mode 100644 index 0000000000..826105084e --- /dev/null +++ b/frontend/micro-ui/web/CHANGELOG.md @@ -0,0 +1,7 @@ +# Changelog +All notable changes to this module will be documented in this file. + +## 0.1.0 - 2024-05-28 +#### Base Admin console web + 1. Helps in creating the Campaign and configure delivery rules + 2. Create Data: Validates and creates resource details of type facility,user and boundary. diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json index 495c3688d2..ccd8104bdb 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -12,8 +12,8 @@ "@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.28", - "@egovernments/digit-ui-react-components": "1.8.1-beta.23", + "@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-module-hcmworkbench":"0.0.38", "@egovernments/digit-ui-module-campaign-manager": "0.0.1", 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 index 64c6f223ce..63af0a10ba 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/public/index.html +++ b/frontend/micro-ui/web/micro-ui-internals/example/public/index.html @@ -15,8 +15,8 @@ href="https://unpkg.com/@egovernments/digit-ui-css@1.8.0-alpha.6/dist/index.css" /> --> - - + + @@ -32,4 +32,4 @@