Merge branch 'release/v1.0.58'

hisptz · Aug 9, 2022 · 8ac0021 · 8ac0021
2 parents f5bf273 + 0d9ef72
commit 8ac0021
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@hisptz/react-ui",
   "homepage": "https://hisptz.github.io/react-ui",
-  "version": "1.0.57",
+  "version": "1.0.58",
   "description": "A collection of reusable complex DHIS2 react ui components.",
   "license": "BSD-3-Clause",
   "scripts": {

diff --git a/src/components/Map/Map.stories.tsx b/src/components/Map/Map.stories.tsx
@@ -20,6 +20,25 @@ BoundaryLayer.args = {
   },
 };
 
+export const BoundaryLayerWithLevels = Template.bind({});
+BoundaryLayerWithLevels.args = {
+  orgUnitSelection: {
+    orgUnits: [
+      {
+        id: "ImspTQPwCqd",
+        displayName: "Sierra Leone",
+        name: "Sierra Leone",
+        path: "/ImspTQPwCqd",
+        children: [],
+      },
+    ],
+    levels: ["2"],
+  },
+  boundaryLayer: {
+    enabled: true,
+  },
+};
+
 export const ChoroplethThematicLayer = Template.bind({});
 ChoroplethThematicLayer.args = {
   orgUnitSelection: { orgUnits: [], userOrgUnit: true, userSubUnit: true, userSubX2Unit: true },

diff --git a/src/components/Map/components/MapProvider/index.tsx b/src/components/Map/components/MapProvider/index.tsx
@@ -30,6 +30,7 @@ export function MapProvider({ children, orgUnitSelection, periodSelection }: Map
   useEffect(() => {
     async function getOrgUnits() {
       const rawOrgUnitIds = getOrgUnitsSelection(orgUnitSelection);
+      console.log(rawOrgUnitIds);
       const data = await refetch({ orgUnitIds: rawOrgUnitIds });
       const { analytics, boundaries } = (data as any) ?? {};
       const rawOrgUnits = sanitizeOrgUnits(analytics?.metaData);

diff --git a/src/components/Map/utils/map.ts b/src/components/Map/utils/map.ts
@@ -44,7 +44,7 @@ export function getOrgUnitsSelection(orgUnitSelection: OrgUnitSelection) {
     orgUnits.push("USER_ORGUNIT_GRANDCHILDREN");
   }
   if (!isEmpty(orgUnitSelection.levels)) {
-    forEach(orgUnitSelection.levels, (level) => `LEVEL-${level}`);
+    forEach(orgUnitSelection.levels, (level) => orgUnits.push(`LEVEL-${level}`));
   }
 
   return [...orgUnits, ...(orgUnitSelection?.orgUnits?.map((ou: OrganisationUnit) => `${ou.id}`) ?? [])];

diff --git a/src/dataProviders/map.tsx b/src/dataProviders/map.tsx
@@ -6,7 +6,10 @@ export default function MapDataProvider({ children }: { children: React.ReactNod
   return (
     <CustomDataProvider
       data={{
-        ...mapData,
+        geoFeatures: async (type, query) => {
+          console.log(query);
+          return mapData.geoFeatures;
+        },
         analytics: async (type, query) => {
           if (query?.params?.skipData) {
             return mapData.analytics;