HLM-5156 adding filter layer is mapping section HLM-5880 bug

egovernments · May 18, 2024 · 354494e · 354494e
1 parent df1025d
commit 354494e
Show file tree

Hide file tree

Showing 23 changed files with 226 additions and 269 deletions.
diff --git a/micro-ui/web/micro-ui-internals/example/package.json b/micro-ui/web/micro-ui-internals/example/package.json
@@ -12,7 +12,7 @@
     "@egovernments/digit-ui-libraries": "1.8.1-beta.1",
     "@egovernments/digit-ui-module-core": "1.8.1-beta.14",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.1",
-    "@egovernments/digit-ui-react-components": "1.8.1-beta.2",
+    "@egovernments/digit-ui-react-components": "1.8.1-beta.20",
     "@egovernments/digit-ui-module-hcmmicroplanning":"0.0.1",
     "http-proxy-middleware": "^1.0.5",
     "react": "17.0.2",

diff --git a/micro-ui/web/micro-ui-internals/package.json b/micro-ui/web/micro-ui-internals/package.json
@@ -44,7 +44,7 @@
   "dependencies": {
     "lodash": "4.17.21",
     "microbundle-crl": "0.13.11",
-    "@egovernments/digit-ui-react-components": "1.8.1-beta.2",
+    "@egovernments/digit-ui-react-components": "1.8.1-beta.20",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-hook-form": "6.15.8",

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hcm-microplanning/package.json b/micro-ui/web/micro-ui-internals/packages/modules/hcm-microplanning/package.json
@@ -19,9 +19,9 @@
   },
   "dependencies": {
     "@cyntler/react-doc-viewer": "1.10.3",
-    "@egovernments/digit-ui-components": "0.0.1-beta.17",
-    "@egovernments/digit-ui-react-components": "1.8.1-beta.17",
-    "@egovernments/digit-ui-svg-components": "1.0.7",
+    "@egovernments/digit-ui-components": "0.0.1-beta.20",
+    "@egovernments/digit-ui-react-components": "1.8.1-beta.20",
+    "@egovernments/digit-ui-svg-components": "1.0.8",
     "@rjsf/core": "5.10.0",
     "@rjsf/utils": "5.10.0",
     "@rjsf/validator-ajv8": "5.10.0",
@@ -44,7 +44,8 @@
     "safe-buffer": "^5.2.1",
     "shpjs": "^4.0.4",
     "uuid": "^9.0.1",
-    "xlsx": "0.17.5"
+    "xlsx": "0.17.5",
+    "react-joyride": "2.5.5"
   },
   "license": "MIT",
   "keywords": [

diff --git a/...cro-ui-internals/packages/modules/hcm-microplanning/src/components/MicroplanningHeader.js b/...cro-ui-internals/packages/modules/hcm-microplanning/src/components/MicroplanningHeader.js
@@ -1,9 +1,8 @@
-import { Tutorial, useTourState } from "@egovernments/digit-ui-react-components";
+import {  HelpOutlineIcon, useTourState } from "@egovernments/digit-ui-react-components";
 import React, { useEffect, useContext, Fragment } from "react";
 import { useTranslation } from "react-i18next";
 import { useLocation } from "react-router-dom";
 import { useMyContext } from "../utils/context";
-import { HelpOutlineIcon } from "../icons/Svg";
 
 // import { TourSteps } from '../utils/TourSteps';
 
@@ -20,7 +19,7 @@ const MicroplanningHeader = () => {
 
   return (
     <>
-      <Tutorial tutorial={tourState} updateTutorial={setTourState} />
+      {/* <Tutorial tutorial={tourState} updateTutorial={setTourState} theme={{zIndex:9999}} /> */}
       <div className="wbh-header">
         {/* <Help startTour={startTour} /> */}
         <div className="header-icon-container" onClick={startTour}>
@@ -32,4 +31,4 @@ const MicroplanningHeader = () => {
   );
 };
 
-export default MicroplanningHeader;
+export default MicroplanningHeader;
diff --git a/...b/micro-ui-internals/packages/modules/hcm-microplanning/src/components/resourceMapping.js b/...b/micro-ui-internals/packages/modules/hcm-microplanning/src/components/resourceMapping.js
@@ -113,16 +113,16 @@ export const SpatialDataPropertyMapping = ({ uploadedData, resourceMapping, setR
         </span>
         <div className="navigation">
           <button onClick={() => handlePageClick(0)} disabled={currentPage === 0}>
-            <PaginationFirst width="24" height="24" fill={"rgb(0,0,0)"} />
+            {PaginationFirst && <PaginationFirst width="24" height="24" fill={"rgb(0,0,0)"} />}
           </button>
           <button onClick={() => handlePageClick(currentPage - 1)} disabled={currentPage === 0}>
-            <PaginationPrevious width="24" height="24" fill={"rgb(0,0,0)"} />
+            {PaginationPrevious && <PaginationPrevious width="24" height="24" fill={"rgb(0,0,0)"} />}
           </button>
           <button onClick={() => handlePageClick(currentPage + 1)} disabled={currentPage === totalPages - 1}>
-            <PaginationNext width="24" height="24" fill={"rgb(0,0,0)"} />
+            {PaginationNext && <PaginationNext width="24" height="24" fill={"rgb(0,0,0)"} />}
           </button>
           <button onClick={() => handlePageClick(totalPages - 1)} disabled={currentPage === totalPages - 1}>
-            <PaginationLast width="24" height="24" fill={"rgb(0,0,0)"} />
+            {PaginationLast && <PaginationLast width="24" height="24" fill={"rgb(0,0,0)"} />}
           </button>
         </div>
       </div>

diff --git a/...web/micro-ui-internals/packages/modules/hcm-microplanning/src/configs/UICustomizations.js b/...web/micro-ui-internals/packages/modules/hcm-microplanning/src/configs/UICustomizations.js
@@ -287,7 +287,9 @@ export const UICustomizations = {
       const { name,status } = data?.state?.searchForm || {};
 
       data.body.PlanConfigurationSearchCriteria = {}
-      data.body.PlanConfigurationSearchCriteria.pagination = data?.state?.tableForm
+      // data.body.PlanConfigurationSearchCriteria.limit = data?.state?.tableForm?.limit
+      data.body.PlanConfigurationSearchCriteria.limit = 10
+      data.body.PlanConfigurationSearchCriteria.offset = data?.state?.tableForm?.offset
       data.body.PlanConfigurationSearchCriteria.name = name
       data.body.PlanConfigurationSearchCriteria.tenantId = Digit.ULBService.getCurrentTenantId();
       data.body.PlanConfigurationSearchCriteria.userUuid = Digit.UserService.getUser().info.uuid;

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hcm-microplanning/src/icons/MapLayerIcon.js b/micro-ui/web/micro-ui-internals/packages/modules/hcm-microplanning/src/icons/MapLayerIcon.js
diff --git a/...b/micro-ui-internals/packages/modules/hcm-microplanning/src/icons/MapLayerIcon.stories.js b/...b/micro-ui-internals/packages/modules/hcm-microplanning/src/icons/MapLayerIcon.stories.js
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hcm-microplanning/src/icons/NorthArrow.js b/micro-ui/web/micro-ui-internals/packages/modules/hcm-microplanning/src/icons/NorthArrow.js
diff --git a/...web/micro-ui-internals/packages/modules/hcm-microplanning/src/icons/NorthArrow.stories.js b/...web/micro-ui-internals/packages/modules/hcm-microplanning/src/icons/NorthArrow.stories.js
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hcm-microplanning/src/icons/Svg.js b/micro-ui/web/micro-ui-internals/packages/modules/hcm-microplanning/src/icons/Svg.js
@@ -45,23 +45,15 @@ export const DefaultMapMarkerSvg = (style) => {
   </svg>`;
 };
 
-export const Warehouse = ({ className = "", fill = "white", fillBackground = "#42BBFF", style = {}, width = "1.5rem", height = "1.5rem" }) => {
-  return (
-    <svg width={width} height={height} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" style={style} className={className}>
-      <rect x="0.5" y="0.5" width="23" height="23" rx="3.5" fill={fillBackground} stroke="#D6D5D4" />
-      <g clip-path="url(#clip0_6391_89286)">
-        <path d="M12.0001 6L6.66675 10V18H10.0001V13.3333H14.0001V18H17.3334V10L12.0001 6Z" fill={fill} />
-      </g>
-      <defs>
-        <clipPath id="clip0_6391_89286">
-          <rect width="16" height="16" fill={fill} transform="translate(4 4)" />
-        </clipPath>
-      </defs>
-    </svg>
-  );
-};
 
-export const WarehouseMarker = ({ className = "", fill = "white", fillBackground = "#42BBFF", style = {} , width="3.125rem",height="3.125rem" }) => {
+export const WarehouseMarker = ({
+  className = "",
+  fill = "white",
+  fillBackground = "#42BBFF",
+  style = {},
+  width = "3.125rem",
+  height = "3.125rem",
+}) => {
   return `
     <svg width="${width}" height="${height}" viewBox="0 0 18 26" fill="none" xmlns="http://www.w3.org/2000/svg" style=${style} className=${className}>
       <path d="M9 0C4.03714 0 0 4.082 0 9.1C0 15.925 9 26 9 26C9 26 18 15.925 18 9.1C18 4.082 13.9629 0 9 0Z" fill=${fillBackground} />
@@ -77,6 +69,22 @@ export const WarehouseMarker = ({ className = "", fill = "white", fillBackground
     `;
 };
 
+export const Warehouse = ({ className = "", fill = "white", fillBackground = "#42BBFF", style = {}, width = "1.5rem", height = "1.5rem" }) => {
+  return (
+    <svg width={width} height={height} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" style={style} className={className}>
+      <rect x="0.5" y="0.5" width="23" height="23" rx="3.5" fill={fillBackground} stroke="#D6D5D4" />
+      <g clip-path="url(#clip0_6391_89286)">
+        <path d="M12.0001 6L6.66675 10V18H10.0001V13.3333H14.0001V18H17.3334V10L12.0001 6Z" fill={fill} />
+      </g>
+      <defs>
+        <clipPath id="clip0_6391_89286">
+          <rect width="16" height="16" fill={fill} transform="translate(4 4)" />
+        </clipPath>
+      </defs>
+    </svg>
+  );
+};
+
 export const Church = ({ className = "", fill = "white", fillBackground = "#064466", style = {}, width = "1.5rem", height = "1.5rem" }) => {
   return (
     <svg width={width} height={height} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" style={style} className={className}>
@@ -124,20 +132,18 @@ export const School = ({ className = "", fill = "white", fillBackground = "#FF7B
   );
 };
 
-export const HealthFacility = ({ className = "", fill = "white", fillBackground = "#FF7B42", style = {}, width = "1.5rem", height = "1.5rem" }) => {
+export const HealthFacility = ({ className = "", fill = "white", fillBackground = "#0C9219", style = {}, width = "1.5rem", height = "1.5rem" , onClick=null}) => {
   return (
-    <svg width={width} height={height} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" style={style} className={className}>
-      <rect x="0.5" y="0.5" width={width} height={height} rx="3.5" fill={fillBackground} stroke="#D6D5D4" />
-      <g clip-path="url(#clip0_6393_89340)">
-        <path
-          d="M12.6667 2H3.33333C2.6 2 2.00667 2.6 2.00667 3.33333L2 12.6667C2 13.4 2.6 14 3.33333 14H12.6667C13.4 14 14 13.4 14 12.6667V3.33333C14 2.6 13.4 2 12.6667 2ZM12 9.33333H9.33333V12H6.66667V9.33333H4V6.66667H6.66667V4H9.33333V6.66667H12V9.33333Z"
-          fill={fill}
-        />
+    <svg width={width} height={height} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" style={style} className={className} onClick={onClick}>
+      <rect x="0.5" y="0.5" width={width} height={height} rx="3.5" fill={fillBackground} stroke="#D6D5D4"/>
+      <g clip-path="url(#clip0_7657_78223)">
+      <path d="M16.6667 6H7.33333C6.6 6 6.00667 6.6 6.00667 7.33333L6 16.6667C6 17.4 6.6 18 7.33333 18H16.6667C17.4 18 18 17.4 18 16.6667V7.33333C18 6.6 17.4 6 16.6667 6ZM16 13.3333H13.3333V16H10.6667V13.3333H8V10.6667H10.6667V8H13.3333V10.6667H16V13.3333Z" 
+      fill={fill}/>
       </g>
       <defs>
-        <clipPath id="clip0_6393_89340">
-          <rect width="16" height="16" fill={fill} transform="translate(4 4)" />
-        </clipPath>
+      <clipPath id="clip0_7657_78223">
+      <rect width="16" height="16" fill={fill} transform="translate(4 4)"/>
+      </clipPath>
       </defs>
     </svg>
   );
@@ -174,7 +180,14 @@ export const SchoolMarker = ({ className = "", fill = "white", fillBackground =
 `;
 };
 
-export const HealthFacilityMarker = ({ className = "", fill = "white", fillBackground = "#0C9219", style = {}, width = "3.125rem", height = "3.125rem" }) => {
+export const HealthFacilityMarker = ({
+  className = "",
+  fill = "white",
+  fillBackground = "#0C9219",
+  style = {},
+  width = "3.125rem",
+  height = "3.125rem",
+}) => {
   return `
   <svg width="${width}" height="${height}" viewBox="0 0 18 26" fill="none" xmlns="http://www.w3.org/2000/svg"  style=${style} className=${className}>
     <path d="M9 0C4.03714 0 0 4.082 0 9.1C0 15.925 9 26 9 26C9 26 18 15.925 18 9.1C18 4.082 13.9629 0 9 0Z" fill="${fillBackground}"/>
@@ -189,4 +202,3 @@ export const HealthFacilityMarker = ({ className = "", fill = "white", fillBackg
   </svg>
 `;
 };
-