Merge pull request #1254 from BLSQ/POLIO-1102-scope-valid-org-unit

POLIO-1102: scope only valid org units
BLSQ · May 6, 2024 · e396d99 · e396d99
2 parents ae16aad + 3456aae
commit e396d99
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 48 deletions.
diff --git a/plugins/polio/js/src/domains/Campaigns/Scope/ScopeForm.tsx b/plugins/polio/js/src/domains/Campaigns/Scope/ScopeForm.tsx
@@ -77,44 +77,43 @@ export const ScopeForm: FunctionComponent = () => {
     }, [currentTab, rounds, scopePerRound, sortedRounds, values.scopes]);
 
     const filteredDistricts: FilteredDistricts[] | undefined = useMemo(() => {
-        if (districtShapes && regionShapes) {
-            let filtered: FilteredDistricts[] = districtShapes.map(district => {
+        if (!districtShapes || !regionShapes) return undefined;
+
+        const orgUnitIdToVaccine = new Map();
+        if (isPolio && scopes) {
+            scopes.forEach(scope => {
+                scope.group.org_units.forEach(ouId => {
+                    orgUnitIdToVaccine.set(ouId, scope.vaccine);
+                });
+            });
+        }
+        const filtered = districtShapes
+            .filter(district => {
+                const isInScope = scopes.some(sc =>
+                    sc.group.org_units.includes(district.id),
+                );
+                return (
+                    (district.validation_status === 'VALID' || isInScope) &&
+                    (!searchScope || isInScope) &&
+                    (!debouncedSearch ||
+                        district.name
+                            .toLowerCase()
+                            .includes(debouncedSearch.toLowerCase()))
+                );
+            })
+            .map(district => {
                 const scope = findScopeWithOrgUnit(scopes, district.id);
+                const vaccineName =
+                    orgUnitIdToVaccine.get(district.id) || undefined;
                 return {
                     ...cloneDeep(district),
                     region: findRegion(district, regionShapes),
                     scope,
-                    vaccineName: scope?.vaccine,
+                    vaccineName,
                 };
-            }) as FilteredDistricts[];
-            if (scopes && isPolio) {
-                filtered.forEach((d, index) => {
-                    scopes.forEach(scope => {
-                        scope.group.org_units.forEach(ouId => {
-                            if (d.id === ouId) {
-                                filtered[index].vaccineName = scope.vaccine;
-                            }
-                        });
-                    });
-                });
-            }
+            });
 
-            if (searchScope) {
-                filtered = filtered.filter(d =>
-                    scopes.some(scope => scope.group.org_units.includes(d.id)),
-                );
-            }
-
-            if (debouncedSearch !== '') {
-                filtered = filtered.filter(d =>
-                    d.name
-                        .toLowerCase()
-                        .includes(debouncedSearch.toLowerCase()),
-                );
-            }
-            return filtered;
-        }
-        return undefined;
+        return filtered;
     }, [
         districtShapes,
         regionShapes,

diff --git a/plugins/polio/js/src/domains/Campaigns/Scope/Scopes/DistrictScopeTable.tsx b/plugins/polio/js/src/domains/Campaigns/Scope/Scopes/DistrictScopeTable.tsx
@@ -58,7 +58,7 @@ type Props = {
     isFetching: boolean;
     districtShapes: OrgUnit[];
     selectedVaccine: string;
-    isPolio: boolean;
+    isPolio?: boolean;
 };
 
 export const DistrictScopeTable: FunctionComponent<Props> = ({

diff --git a/plugins/polio/js/src/domains/Campaigns/Scope/Scopes/MapScope.tsx b/plugins/polio/js/src/domains/Campaigns/Scope/Scopes/MapScope.tsx
@@ -92,24 +92,26 @@ export const MapScope: FunctionComponent<Props> = ({
         },
         [values.org_unit?.id, scopes, theme],
     );
+    const filterOrgUnits = useCallback(
+        (orgUnits: OrgUnit[]) =>
+            orgUnits.filter(
+                orgUnit =>
+                    (orgUnit.has_geo_json ||
+                        (orgUnit.latitude && orgUnit.longitude)) &&
+                    (orgUnit.validation_status === 'VALID' ||
+                        // display REJECTED or NEW org unit if already present in a scope
+                        findScopeWithOrgUnit(scopes, orgUnit.id)),
+            ),
+        [scopes],
+    );
 
     const districts = useMemo(
-        () =>
-            districtShapes.filter(
-                ogrUnit =>
-                    ogrUnit.has_geo_json ||
-                    (ogrUnit.latitude && ogrUnit.longitude),
-            ),
-        [districtShapes],
+        () => filterOrgUnits(districtShapes),
+        [districtShapes, filterOrgUnits],
     );
     const regions = useMemo(
-        () =>
-            regionShapes.filter(
-                ogrUnit =>
-                    ogrUnit.has_geo_json ||
-                    (ogrUnit.latitude && ogrUnit.longitude),
-            ),
-        [regionShapes],
+        () => filterOrgUnits(regionShapes),
+        [regionShapes, filterOrgUnits],
     );
 
     return (

diff --git a/plugins/polio/js/src/domains/Campaigns/Scope/Scopes/types.ts b/plugins/polio/js/src/domains/Campaigns/Scope/Scopes/types.ts
@@ -1,5 +1,8 @@
 /* eslint-disable camelcase */
-import { OrgUnit } from '../../../../../../../../hat/assets/js/apps/Iaso/domains/orgUnits/types/orgUnit';
+import {
+    OrgUnit,
+    OrgUnitStatus,
+} from '../../../../../../../../hat/assets/js/apps/Iaso/domains/orgUnits/types/orgUnit';
 import { Scope } from '../../../../constants/types';
 
 export type Shape = OrgUnit & {
@@ -21,6 +24,7 @@ export type FilteredDistricts = {
     geo_json?: Shape | undefined;
     has_geo_json: boolean;
     scope?: Scope;
+    validation_status: OrgUnitStatus;
 };
 
 export type ShapeRow = Shape & {

diff --git a/plugins/polio/js/src/domains/Campaigns/Scope/hooks/useGetGeoJson.ts b/plugins/polio/js/src/domains/Campaigns/Scope/hooks/useGetGeoJson.ts
@@ -19,9 +19,10 @@ type Params = {
 export const useGetGeoJson = (
     topParentId: number | undefined,
     orgUnitCategory: string,
+    validationStatus: string | undefined = 'all',
 ): UseQueryResult<any> => {
     const params: Params = {
-        validation_status: 'all',
+        validation_status: validationStatus,
         withShapes: 'true',
         order: 'id',
         orgUnitTypeCategory: orgUnitCategory,