Merge pull request #51 from openimis/feature/OM-278

OM-278: added filtering by economic unit if there is economic unit config
openimis · Aug 30, 2024 · 7111944 · 7111944
2 parents 3ace8fa + bf20fa7
commit 7111944
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/components/BillSearcher.js b/src/components/BillSearcher.js
@@ -69,6 +69,13 @@ const BillSearcher = ({
   const economicUnitConfig = modulesManager.getConf("fe-core", "App.economicUnitConfig", DEFAULT.ECONOMIC_UNIT_CONFIG);
   const isAdminOrInspector = rights.includes(INSPECTOR_RIGHT) || rights.includes(ADMIN_RIGHT);
 
+  const additionalExportFields = 
+    economicUnitConfig && 
+    economicUnit?.id && 
+    !isAdminOrInspector 
+      ? { subjectId: decodeId(economicUnit?.id) } 
+      : {};
+
   useEffect(() => billToDelete && openConfirmDialog(), [billToDelete]);
 
   useEffect(() => {
@@ -307,6 +314,7 @@ const BillSearcher = ({
           "dateBill": "Date Bill",
           "status": "Status",
         }}
+        additionalExportFields={additionalExportFields}
       />
       {failedExport && (
         <Dialog open={failedExport} fullWidth maxWidth="sm">