datastake-daf 0.6.763 → 0.6.765

package/src/@daf/pages/Dashboards/SupplyChain/components/KeyIndicators/config.js

@@ -1,20 +1,17 @@
 import React from "react";
 import CustomIcon from '../../../../../core/components/Icon/CustomIcon.jsx';
+import KeyIndicatorNavigateLabel from '../../../../../core/components/UI/KeyIndicatorNavigateLabel/index.jsx';
 
 export const getRowConfig = ({ t, data = {}, goTo, getRedirectLink, theme = {} }) => [
 	{
 		label: (
-			<div className="flex">
-				<div className="flex-1">{t("Identified Mine Sites")}</div>
-				<div className="cursor-pointer" onClick={() => goTo(getRedirectLink("/app/production-sites"))}>
-					<CustomIcon
-						name="LinkNewTab"
-						width={16}
-						height={16}
-						color={theme.colorPrimary}
-					/>
-				</div>
-			</div>
+			<KeyIndicatorNavigateLabel 
+				t={t} 
+				getRedirectLink={getRedirectLink} 
+				theme={theme} 
+				label="Identified Mine Sites" 
+				link="/app/production-sites" 
+			/>
 		),
 		render: () => {
 			return <span>{data.mineSites ?? 0}</span>;
@@ -22,20 +19,13 @@ export const getRowConfig = ({ t, data = {}, goTo, getRedirectLink, theme = {} }
 	},
 	{
 		label: (
-			<div className="flex">
-				<div className="flex-1">{t("Identified Operators")}</div>
-				<div
-					className="cursor-pointer"
-					onClick={() => goTo(getRedirectLink("/app/operators"))}
-				>
-					<CustomIcon
-						name="LinkNewTab"
-						width={16}
-						height={16}
-						color={theme.colorPrimary}
-					/>
-				</div>
-			</div>
+			<KeyIndicatorNavigateLabel 
+				t={t} 
+				getRedirectLink={getRedirectLink} 
+				theme={theme} 
+				label="Identified Operators" 
+				link="/app/operators" 
+			/>
 		),
 		render: () => <span>{data?.operators ?? 0}</span>,
 	},
@@ -49,39 +39,25 @@ export const getRowConfig = ({ t, data = {}, goTo, getRedirectLink, theme = {} }
 	},
 	{
 		label: (
-			<div className="flex">
-				<div className="flex-1">{t("Associated Documents")}</div>
-				<div
-					className="cursor-pointer"
-					onClick={() => goTo(getRedirectLink("/app/documents"))}
-				>
-					<CustomIcon
-						name="LinkNewTab"
-						width={16}
-						height={16}
-						color={theme.colorPrimary}
-					/>
-				</div>
-			</div>
+			<KeyIndicatorNavigateLabel 
+				t={t} 
+				getRedirectLink={getRedirectLink} 
+				theme={theme} 
+				label="Associated Documents" 
+				link="/app/documents" 
+			/>
 		),
 		render: () => <span>{data.documents ?? 0}</span>,
 	},
 	{
 		label: (
-			<div className="flex">
-				<div className="flex-1">{t("Information Sources")}</div>
-				<div
-					className="cursor-pointer"
-					onClick={() => goTo(getRedirectLink("/app/partners"))}
-				>
-					<CustomIcon
-						name="LinkNewTab"
-						width={16}
-						height={16}
-						color={theme.colorPrimary}
-					/>
-				</div>
-			</div>
+			<KeyIndicatorNavigateLabel 
+				t={t} 
+				getRedirectLink={getRedirectLink} 
+				theme={theme} 
+				label="Information Sources" 
+				link="/app/partners" 
+			/>
 		),
 		render: () => <span>{data.sources ?? 0}</span>,
 	},

package/src/@daf/pages/Dashboards/SupplyChain/index.jsx

@@ -79,9 +79,9 @@ function SupplyChain({
             <section>
                 <SupplyChainMap selectedSources={selectedPartners} t={t} goTo={goTo} options={options} getRedirectLink={getRedirectLink} />
             </section>
-            <section>
+            {/* <section>
                 <TradeRelationships selectedSources={selectedPartners} t={t} options={options} goTo={goTo} hardcodedData={hardcodedData} />
-            </section>
+            </section> */}
             <section>
                 <ChartsContainer selectedSources={selectedPartners} t={t} theme={theme} options={options} />
             </section>				

package/src/@daf/pages/Dashboards/UserDashboard/components/KeyIndicators/config.js

@@ -1,23 +1,17 @@
 import React from 'react';
 import CustomIcon from '../../../../../core/components/Icon/CustomIcon.jsx';
+import KeyIndicatorNavigateLabel from '../../../../../core/components/UI/KeyIndicatorNavigateLabel/index.jsx';
 
 export const getRowConfig = ({ t, data = {}, goTo, getRedirectLink, theme = {} }) => [
 	{
 		label: (
-			<div className="flex">
-				<div className="flex-1">{t("Monitored Locations")}</div>
-				<div
-					className="cursor-pointer"
-					onClick={() => goTo(getRedirectLink("/app/locations"))}
-				>
-					<CustomIcon
-						name="LinkNewTab"
-						width={16}
-						height={16}
-						color={theme.colorPrimary}
-					/>
-				</div>
-			</div>
+			<KeyIndicatorNavigateLabel 
+				t={t} 
+				getRedirectLink={getRedirectLink} 
+				theme={theme} 
+				label="Monitored Locations" 
+				link="/app/locations" 
+			/>
 		),
 		render: () => {
 			return <span>{data.locations ?? 0}</span>;
@@ -25,39 +19,25 @@ export const getRowConfig = ({ t, data = {}, goTo, getRedirectLink, theme = {} }
 	},
 	{
 		label: (
-			<div className="flex">
-				<div className="flex-1">{t("Identified Stakeholders")}</div>
-				<div
-					className="cursor-pointer"
-					onClick={() => goTo(getRedirectLink("/app/stakeholders"))}
-				>
-					<CustomIcon
-						name="LinkNewTab"
-						width={16}
-						height={16}
-						color={theme.colorPrimary}
-					/>
-				</div>
-			</div>
+			<KeyIndicatorNavigateLabel 
+				t={t} 
+				getRedirectLink={getRedirectLink} 
+				theme={theme} 
+				label="Identified Stakeholders" 
+				link="/app/stakeholders" 
+			/>
 		),
 		render: () => <span>{data?.stakeholders ?? 0}</span>,
 	},
 	{
 		label: (
-			<div className="flex">
-				<div className="flex-1">{t("Corrective Actions")}</div>
-				<div
-					className="cursor-pointer"
-					onClick={() => goTo(getRedirectLink("/app/activities"))}
-				>
-					<CustomIcon
-						name="LinkNewTab"
-						width={16}
-						height={16}
-						color={theme.colorPrimary}
-					/>
-				</div>
-			</div>
+			<KeyIndicatorNavigateLabel 
+				t={t} 
+				getRedirectLink={getRedirectLink} 
+				theme={theme} 
+				label="Activities" 
+				link="/app/activities" 
+			/>
 		),
 		render: () => {
 			return (
@@ -73,20 +53,13 @@ export const getRowConfig = ({ t, data = {}, goTo, getRedirectLink, theme = {} }
 	},
 	{
 		label: (
-			<div className="flex">
-				<div className="flex-1">{t("Reported Incidents")}</div>
-				<div
-					className="cursor-pointer"
-					onClick={() => goTo(getRedirectLink("/app/incidents"))}
-				>
-					<CustomIcon
-						name="LinkNewTab"
-						width={16}
-						height={16}
-						color={theme.colorPrimary}
-					/>
-				</div>
-			</div>
+			<KeyIndicatorNavigateLabel 
+				t={t} 
+				getRedirectLink={getRedirectLink} 
+				theme={theme} 
+				label="Reported Incidents" 
+				link="/app/incidents" 
+			/>
 		),
 		render: () => (
 			<span>
@@ -100,20 +73,13 @@ export const getRowConfig = ({ t, data = {}, goTo, getRedirectLink, theme = {} }
 	},
 	{
 		label: (
-			<div className="flex">
-				<div className="flex-1">{t("Information Sources")}</div>
-				<div
-					className="cursor-pointer"
-					onClick={() => goTo(getRedirectLink("/app/partners"))}
-				>
-					<CustomIcon
-						name="LinkNewTab"
-						width={16}
-						height={16}
-						color={theme.colorPrimary}
-					/>
-				</div>
-			</div>
+			<KeyIndicatorNavigateLabel 
+				t={t} 
+				getRedirectLink={getRedirectLink} 
+				theme={theme} 
+				label="Information Sources" 
+				link="/app/partners" 
+			/>
 		),
 		render: () => <span>{data.sources ?? 0}</span>,
 	},

package/src/@daf/pages/Documents/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 DocumentsTable = ({
     t = () => {},
@@ -35,6 +36,7 @@ const DocumentsTable = ({
     applications = [],
     subjectClear = () => {},
     breadcrumbs = [],
+    extendingFilters = {},
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState("own");
@@ -50,19 +52,13 @@ const DocumentsTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, applications]);
 
-    const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({location});
-
-    useEffect(() => {
-        getData({
-            pagination: paginationQuery,
-            ...(Object.keys(otherParams).length > 0 && { filters: otherParams }),
-            ...(Object.keys(searchParams).length > 0 && { search: searchParams }),
-            tab: activeTab,
-            sortBy: {
-                [sortBy || "updatedAt"]: sortDir ? (sortDir === "ascend" ? 1 : -1) : -1,
-            }
-        }, 'documents')
-    }, [paginationQuery, otherParams, searchParams, activeTab]);
+    useFetchData({
+        location,
+        getData,
+        activeTab,
+        extendingFilters,
+        subject: 'documents',
+    })
 
     const selectFiltersConfig = useMemo(() => {
         return getFiltersConfig({t});

package/src/@daf/pages/Events/Activities/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 ActivitiesTable = ({
     t = () => {},
@@ -53,27 +54,13 @@ const ActivitiesTable = ({
         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
-        }, 'activities')
-    }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
+    useFetchData({
+        location,
+        getData,
+        activeTab,
+        extendingFilters,
+        subject: 'activities',
+    })
 
     const selectFiltersConfig = useMemo(() => {
         return getFiltersConfig({t});

package/src/@daf/pages/Events/Incidents/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 IncidentsTable = ({
     t = () => {},
@@ -53,27 +54,13 @@ const IncidentsTable = ({
         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
-        }, 'incidents')
-    }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
+    useFetchData({
+        location,
+        getData,
+        activeTab,
+        extendingFilters,
+        subject: 'incidents',
+    })
 
     const selectFiltersConfig = useMemo(() => {
         return getFiltersConfig({t});

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

@@ -5,6 +5,7 @@ import { checkboxConfig, getFiltersConfig, filtersConfig, getFilterOptions } fro
 import { useGetQueryParams } from '../../hooks/useGetQueryParams.js';
 import EventsCreate from './create.jsx';
 import { displayMessage } from '../../../helpers/messages.js';
+import { useFetchData } from '../hook.js';
 
 const EventsTable = ({
     t = () => {},
@@ -53,26 +54,13 @@ const EventsTable = ({
         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(filters).length > 0 && { filters: filters }),
-            ...(Object.keys(searchParams).length > 0 && { search: searchParams }),
-            tab: activeTab,
-            sortBy: {
-                [sortBy || "updatedAt"]: sortDir ? (sortDir === "ascend" ? 1 : -1) : -1,
-            }
-        }, 'events')
-    }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
+    useFetchData({
+        location,
+        getData,
+        activeTab,
+        extendingFilters,
+        subject: 'events',
+    })
 
     const selectFiltersConfig = useMemo(() => {
         return getFiltersConfig({t});

package/src/@daf/pages/Locations/MineSite/index.jsx

@@ -5,6 +5,7 @@ import { checkboxConfig, getFiltersConfig, filtersConfig, getFilterOptions } fro
 import { useGetQueryParams } from '../../../hooks/useGetQueryParams.js';
 import ProductionSitesCreate from './create.jsx';
 import { displayMessage } from '../../../../helpers/messages.js';
+import { useFetchData } from '../../hook.js';
 
 const ProductionSitesTable = ({
     t = () => {},
@@ -53,27 +54,13 @@ const ProductionSitesTable = ({
         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
-        }, 'production-sites')
-    }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
+    useFetchData({
+        location,
+        getData,
+        activeTab,
+        extendingFilters,
+        subject: 'production-sites',
+    })
 
     const selectFiltersConfig = useMemo(() => {
         return getFiltersConfig({t});

package/src/@daf/pages/Locations/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 LocationsTable = ({
     t = () => {},
@@ -35,6 +36,7 @@ const LocationsTable = ({
     applications = [],
     subjectClear = () => {},
     breadcrumbs = [],
+    extendingFilters = {},
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState("own");
@@ -52,18 +54,13 @@ const LocationsTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, 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,
-        }, 'locations')
-    }, [paginationQuery, otherParams, searchParams, activeTab]);
-
-    console.log({data})
+    useFetchData({
+        location,
+        getData,
+        activeTab,
+        extendingFilters,
+        subject: 'locations',
+    })
 
     const selectFiltersConfig = useMemo(() => {
         return getFiltersConfig({t});