From 0f0eaa34d41d0a5e5afe25b18750311e6c44ebbe Mon Sep 17 00:00:00 2001 From: gnnko <nnkogift@hotmail.com> Date: Tue, 9 Aug 2022 09:27:41 +0300 Subject: [PATCH 1/2] :bug: fix(map): Improvements - Enabled org unit level selection in map --- src/components/Map/Map.stories.tsx | 19 +++++++++++++++++++ .../Map/components/MapProvider/index.tsx | 1 + src/components/Map/utils/map.ts | 2 +- src/dataProviders/map.tsx | 5 ++++- 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/components/Map/Map.stories.tsx b/src/components/Map/Map.stories.tsx index 3bed73f..c8e5e61 100644 --- 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 index 2ea5ce1..06f6e20 100644 --- 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 index 2a1092b..0241cc0 100644 --- 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 index 7e13edc..88705b0 100644 --- 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; From 0d9ef72546705262f976d62c4c103f8a612ee00e Mon Sep 17 00:00:00 2001 From: gnnko <nnkogift@hotmail.com> Date: Tue, 9 Aug 2022 09:35:26 +0300 Subject: [PATCH 2/2] chore(package.json): Version update - Changed version to v1.0.58 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9502165..f634b4a 100644 --- 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": {