integration with the generate and create api (#314)

* HLM-5110 integrated facility with generate api * updated css version * made hierarchy type as generic * changed variable names * changes in hierarchy type --------- Co-authored-by: Jagankumar <[email protected]>
egovernments · Apr 17, 2024 · 0be2985 · 0be2985
1 parent 5c02b0e
commit 0be2985
Show file tree

Hide file tree

Showing 18 changed files with 382 additions and 133 deletions.
diff --git a/micro-ui/web/micro-ui-internals/example/public/index.html b/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -16,7 +16,7 @@
   /> -->
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].13-campaign/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].14-campaign/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->
 
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" /> -->

diff --git a/micro-ui/web/micro-ui-internals/example/src/setupProxy.js b/micro-ui/web/micro-ui-internals/example/src/setupProxy.js
@@ -91,7 +91,7 @@ module.exports = function (app) {
     "/hcm-bff/bulk/_transform",
     "/hcm-bff/hcm/_processmicroplan",
     "/health-hrms",
-    "/project-factory/v1/project-type",
+    "/project-factory",
     "/boundary-service"
   ].forEach((location) => app.use(location, createProxy));
   ["/pb-egov-assets"].forEach((location) => app.use(location, assetsProxy));

diff --git a/micro-ui/web/micro-ui-internals/package.json b/micro-ui/web/micro-ui-internals/package.json
@@ -42,6 +42,7 @@
     "*.{js,css,md}": "prettier --write"
   },
   "dependencies": {
+    "ajv": "^8.12.0",
     "lodash": "4.17.21",
     "microbundle-crl": "0.13.11",
     "@egovernments/digit-ui-react-components": "1.8.1-beta.12",
@@ -53,4 +54,4 @@
     "react-query": "3.6.1",
     "react-router-dom": "5.3.0"
   }
-}
+}
diff --git a/micro-ui/web/micro-ui-internals/packages/css/package.json b/micro-ui/web/micro-ui-internals/packages/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-css",
-  "version": "1.0.13-campaign",
+  "version": "1.0.14-campaign",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <[email protected]>",

diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaignCycle.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/campaignCycle.scss
@@ -78,6 +78,9 @@
     margin-bottom: 1.5rem;
   }
 }
+.uploaded-file-container {
+  margin-left: 0rem;
+}
 .bulk-drag-drop-container {
   background-color: #fafafa;
   border: 1.5px dashed #d6d5d4;
@@ -105,6 +108,18 @@
   }
 }
 
+.drag-drop-container{
+  margin-left: 0rem;
+  .drag-drop{
+    color: #B1B4B6;
+  }
+  .browse-text {
+    text-decoration: underline;
+    color: #f47738;
+    transition: color 0.3s;
+  }
+}
+
 .campaign-counter-container {
   padding: 1.5rem;
   .card-text {

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/Module.js b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/Module.js
@@ -5,19 +5,18 @@ import EmployeeApp from "./pages/employee";
 import { CustomisedHooks } from "./hooks";
 import { UICustomizations } from "./configs/UICustomizations";
 import CampaignCard from "./components/CampaignCard";
-import UploadBoundaryData from "./pages/employee/UploadBoundaryData";
 import CycleConfiguration from "./pages/employee/CycleConfiguration";
 import DeliverySetup from "./pages/employee/deliveryRule";
 import TimelineCampaign from "./components/TimelineCampaign";
 import CampaignDates from "./components/CampaignDates";
 import CampaignType from "./components/CampaignType";
 import CampaignName from "./components/CampaignName";
 import MyCampaign from "./pages/employee/MyCampaign";
-import UploadFacilityData from "./pages/employee/UploadFacilityData";
 import CampaignSummary from "./components/CampaignSummary";
 import CycleDetaisPreview from "./components/CycleDetaisPreview";
 import Response from "./pages/employee/Response";
-import SelectingBoundaries from "./pages/employee/SelectingBoundaries";
+import SelectingBoundaries from "./components/SelectingBoundaries";
+import UploadData from "./components/UploadData";
 
 const CampaignModule = ({ stateCode, userType, tenants }) => {
   const moduleCode = ["campaignmanager", "workbench", "mdms", "schema"];
@@ -45,19 +44,18 @@ const componentsToRegister = {
   // campaignModule: CampaignModule,
   // campaignCard: CampaignCard,
   CampaignCard: CampaignCard,
-  UploadBoundaryData,
+  UploadData,
   DeliveryRule: DeliverySetup,
   CycleConfiguration: CycleConfiguration,
   TimelineCampaign,
   CampaignDates,
   CampaignType,
   CampaignName,
   MyCampaign,
-  UploadFacilityData,
   CampaignSummary,
   CycleDetaisPreview,
   Response,
-  SelectingBoundaries: SelectingBoundaries
+  SelectingBoundaries
 };
 
 const overrideHooks = () => {

diff --git a/...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BulkUpload.js b/...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BulkUpload.js
@@ -39,7 +39,7 @@ const BulkUpload = ({ multiple = true, onSubmit, fileData, onFileDelete, onFileD
     <div className="drag-drop-container">
       <UploadIcon />
       <p className="drag-drop-text">
-        {t("WBH_DRAG_DROP")} <text className="browse-text">{t("WBH_BULK_BROWSE_FILES")}</text>
+      <text className="drag-drop"> {t("WBH_DRAG_DROP")}</text> <text className="browse-text">{t("WBH_BULK_BROWSE_FILES")}</text>
       </p>
     </div>
   );
@@ -98,7 +98,7 @@ const BulkUpload = ({ multiple = true, onSubmit, fileData, onFileDelete, onFileD
 
   const handleChange = async (newFiles) => {
     try {
-      await validateExcel(newFiles[0]);
+      // await validateExcel(newFiles[0]);
       onSubmit([...newFiles]);
     } catch (error) {
       // Handle the validation error, you can display a message or take appropriate actions.

diff --git a/...src/pages/employee/SelectingBoundaries.js → ...ger/src/components/SelectingBoundaries.js b/...src/pages/employee/SelectingBoundaries.js → ...ger/src/components/SelectingBoundaries.js
@@ -2,7 +2,7 @@ import React, { useEffect, useState, Fragment } from "react";
 import { CardText, LabelFieldPair, Card, Header, CardLabel } from "@egovernments/digit-ui-react-components";
 import { useTranslation } from "react-i18next";
 import { Dropdown, InfoCard, MultiSelectDropdown } from "@egovernments/digit-ui-components";
-import { mailConfig } from "../../configs/mailConfig";
+import { mailConfig } from "../configs/mailConfig";
 function SelectingBoundaries({ onSelect, formData, ...props }) {
   const { t } = useTranslation();
   const tenantId = Digit.ULBService.getCurrentTenantId();