Remove parent location filter from the service point list view (#1487)

onaio · Oct 22, 2024 · dcc3093 · dcc3093
1 parent bf6dad9
commit dcc3093
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 32 deletions.
diff --git a/packages/fhir-location-management/src/components/AllLocationListFlat/base.tsx b/packages/fhir-location-management/src/components/AllLocationListFlat/base.tsx
@@ -33,6 +33,7 @@ export interface Props {
   getColumns: (t: TFunction, getColumnSortProps: GetControlledSortProps) => Column<Dictionary>[];
   pageTitle: string;
   addLocationBtnRender: () => ReactNode;
+  showParentLocationFilter?: boolean;
 }
 
 const getSearchParamsFactory = (ourParams: URLParams) => (search: string | null) => {
@@ -138,6 +139,7 @@ export const BaseAllLocationListFlat: React.FC<BaseAllLocationListFlatProps> = (
             fhirBaseUrl={fhirBaseURL}
             updateFilterParams={updateFilterParams}
             currentFilters={currentFilters}
+            showParentLocationFilter={props.showParentLocationFilter ?? true}
           />
           <TableLayout {...tableProps} />
         </Col>

diff --git a/packages/fhir-location-management/src/components/AllLocationListFlat/dataGridFilterRow.tsx b/packages/fhir-location-management/src/components/AllLocationListFlat/dataGridFilterRow.tsx
@@ -10,48 +10,51 @@ export interface LocationGridFilterRowRenderProps {
   fhirBaseUrl: string;
   updateFilterParams: (filter: FilterParamState) => void;
   currentFilters: FilterParamState;
+  showParentLocationFilter: boolean;
 }
 
 const partOfFilterDataIdx = 'partof';
 const statusFilterDataIdx = 'status';
 
 export const LocationGridFilterRowRender = (props: LocationGridFilterRowRenderProps) => {
   const { t } = useMls();
-  const { fhirBaseUrl, updateFilterParams, currentFilters } = props;
+  const { fhirBaseUrl, updateFilterParams, currentFilters, showParentLocationFilter } = props;
   return (
     <div className="filter-row" data-testid="filter-row">
       <Space>
-        <Trans t={t} i18nKey="parentLocationFilter">
-          <Space>
-            Parent Location:
-            <PaginatedAsyncSelect<ILocation>
-              allowClear={true}
-              showSearch={true}
-              resourceType={locationResourceType}
-              baseUrl={fhirBaseUrl}
-              transformOption={(resource) => {
-                return {
-                  value: resource.id as string,
-                  label: resource.name as string,
-                  ref: resource,
-                };
-              }}
-              onChange={(value) => {
-                if (!value) {
-                  updateFilterParams({ [partOfFilterDataIdx]: undefined });
-                } else {
-                  updateFilterParams({
-                    [partOfFilterDataIdx]: {
-                      paramAccessor: 'partof',
-                      rawValue: value,
-                      paramValue: value,
-                    },
-                  });
-                }
-              }}
-            />
-          </Space>
-        </Trans>
+        {showParentLocationFilter && (
+          <Trans t={t} i18nKey="parentLocationFilter">
+            <Space>
+              Parent Location:
+              <PaginatedAsyncSelect<ILocation>
+                allowClear={true}
+                showSearch={true}
+                resourceType={locationResourceType}
+                baseUrl={fhirBaseUrl}
+                transformOption={(resource) => {
+                  return {
+                    value: resource.id as string,
+                    label: resource.name as string,
+                    ref: resource,
+                  };
+                }}
+                onChange={(value) => {
+                  if (!value) {
+                    updateFilterParams({ [partOfFilterDataIdx]: undefined });
+                  } else {
+                    updateFilterParams({
+                      [partOfFilterDataIdx]: {
+                        paramAccessor: 'partof',
+                        rawValue: value,
+                        paramValue: value,
+                      },
+                    });
+                  }
+                }}
+              />
+            </Space>
+          </Trans>
+        )}
         <Trans t={t} i18nKey="locationStatusFilter">
           <Space>
             Status:

diff --git a/packages/fhir-location-management/src/components/AllLocationListFlat/eusm.tsx b/packages/fhir-location-management/src/components/AllLocationListFlat/eusm.tsx
@@ -105,6 +105,7 @@ export const EusmLocationListFlat: React.FC<EusmLocationListFlatProps> = (props)
     addLocationBtnRender,
     getColumns,
     extraParamFilters: eusmPhysicalLocationsFilterParams,
+    showParentLocationFilter: false,
   };
 
   return <BaseAllLocationListFlat {...baseProps} />;