datastake-daf 0.6.763 → 0.6.764

package/src/@daf/pages/Stakeholders/Workers/index.jsx

@@ -5,6 +5,7 @@ import { checkboxConfig, getFiltersConfig, filtersConfig, getFilterOptions } fro
 import { useGetQueryParams } from '../../../hooks/useGetQueryParams.js';
 import StakeholdersCreate from './create.jsx';
 import { displayMessage } from '../../../../helpers/messages.js';
+import { useFetchData } from '../../hook.js';
 
 const WorkersTable = ({
     t = () => {},
@@ -53,27 +54,13 @@ const WorkersTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
 
-    const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({location});
-
-    const filters = useMemo(() => {
-        return {
-            ...otherParams,
-            ...extendingFilters
-        }
-    }, [otherParams, extendingFilters])
-
-    useEffect(() => {
-        getData({
-            pagination: paginationQuery,
-            ...(Object.keys(searchParams).length > 0 && { search: searchParams }),
-            ...otherParams,
-            tab: activeTab,
-            sortBy: {
-                [sortBy || "updatedAt"]: sortDir ? (sortDir === "ascend" ? 1 : -1) : -1,
-            },
-            ...extendingFilters
-        }, 'workers')
-    }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
+    useFetchData({
+        location,
+        getData,
+        activeTab,
+        extendingFilters,
+        subject: 'workers',
+    })
 
     const selectFiltersConfig = useMemo(() => {
         return getFiltersConfig({t});

package/src/@daf/pages/Stakeholders/index.jsx

@@ -6,6 +6,7 @@ import { useGetQueryParams } from '../../hooks/useGetQueryParams.js';
 import StakeholdersCreate from './create.jsx';
 import { displayMessage } from '../../../helpers/messages.js';
 import DAFHeader from '../../core/components/Header/index.jsx';
+import { useFetchData } from '../hook.js';
 
 const StakeholdersTable = ({
     t = () => {},
@@ -36,6 +37,7 @@ const StakeholdersTable = ({
     applications = [],
     subjectClear = () => {},
     breadcrumbs = [],
+    extendingFilters = {},
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState("own");
@@ -51,16 +53,13 @@ const StakeholdersTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, applications]);
 
-    const { paginationQuery, searchParams, otherParams } = useGetQueryParams({location});
-
-    useEffect(() => {
-        getData({
-            pagination: paginationQuery,
-            ...(Object.keys(otherParams).length > 0 && { filters: otherParams }),
-            ...(Object.keys(searchParams).length > 0 && { search: searchParams }),
-            tab: activeTab,
-        }, 'stakeholders')
-    }, [paginationQuery, otherParams, searchParams, activeTab]);
+    useFetchData({
+        location,
+        getData,
+        activeTab,
+        extendingFilters,
+        subject: 'stakeholders',
+    })
 
     const selectFiltersConfig = useMemo(() => {
         return getFiltersConfig({t});

package/src/@daf/pages/hook.js

@@ -0,0 +1,34 @@
+import { useEffect } from "react";
+import { useGetQueryParams } from "../hooks/useGetQueryParams";
+
+export const useFetchData = ({
+    location,
+    getData,
+    activeTab,
+    extendingFilters,
+    subject,
+}) => {
+    const { paginationQuery, searchParams, otherParams, sortBy, sortDir, } = useGetQueryParams({location});
+    useEffect(() => {
+        const cleanSearchParams = Object.fromEntries(
+            Object.entries(searchParams).filter(([_, value]) => value != null && value !== '')
+        );
+
+        const hasPagination = paginationQuery.skip != null || paginationQuery.take != null;
+        
+        if (!hasPagination) {
+            return;
+        }
+
+        getData({
+            pagination: paginationQuery,
+            ...(Object.keys(otherParams).length > 0 && otherParams ),
+            ...(Object.keys(cleanSearchParams).length > 0 && { search: cleanSearchParams }),
+            tab: activeTab,
+            sortBy: {
+                [sortBy || "updatedAt"]: sortDir ? (sortDir === "ascend" ? 1 : -1) : -1,
+            },
+            ...extendingFilters,
+        }, subject)
+    }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
+}

package/src/@daf/services/PartnerService.js

@@ -3,25 +3,10 @@ import { createLazyService } from "./helpers/LazyService.js";
 
 class PartnerService extends BaseService {
 	get(tab, filters) {
-		const { page, pageSize, search, searchParams, ...rest } = filters;
-		const params = {
-			filters: rest,
-			pagination: {
-				skip: page,
-				take: pageSize,
-			},
-		};
-		if (search && searchParams.length > 0) {
-			params.search = {
-				qs: search,
-				fields: searchParams,
-			};
-		}
-
 		return this.apiGet({
 			url: "/partner",
 			isApp: true,
-			params,
+			params: filters,
 		});
 	}
 

package/src/index.js

@@ -190,7 +190,7 @@ export { InformationChannelProvider } from "./@daf/core/components/Screens/Infor
 // UI
 export { default as SDGIcons } from "./@daf/core/components/UI/SDGIcon/index.jsx";
 export { default as CountryFlag } from "./@daf/core/components/UI/CountryFlag/index.jsx"
-
+export { default as KeyIndicatorNavigateLabel } from "./@daf/core/components/UI/KeyIndicatorNavigateLabel/index.jsx";
 
 //Settings
 export { default as Settings } from "./@daf/core/components/Screens/Settings/index.js";

package/src/pages.js

@@ -12,6 +12,7 @@ export { default as ActivitiesTable } from './@daf/pages/Events/Activities/index
 export { default as IncidentsTable } from './@daf/pages/Events/Incidents/index.jsx';
 export { default as ProductionSitesTable } from './@daf/pages/Locations/MineSite/index.jsx';
 export { default as UsersTable } from './@daf/core/components/Screens/Users/index.jsx';
+export { default as PartnersTable } from './@daf/pages/Partners/index.jsx';
 
 // Summary
 export { default as OperatorSummary } from './@daf/pages/Summary/Operator/index.jsx';