datastake-daf 0.6.762 → 0.6.764

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/config.js

@@ -151,7 +151,6 @@ export const getFilterOptions = (options, t) => {
 
 		category=[],
 	  } = options || {};
-	console.log({options})
 
 	const _default  = {
        timeframe: timeframe,

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/columns.js

@@ -6,6 +6,7 @@ import CustomIcon from '../../../core/components/Icon/CustomIcon.jsx';
 import AvatarGroup from '../../../core/components/AvatarGroup/index.jsx';
 import sourceAvatarConfig from '../../../../helpers/sourceAvatarConfig.js';
 import MoreMenu from '../../../core/components/Table/MoreMenu/index.jsx';
+import MoreOptions from '../../../core/components/Table/MoreOptions/index.jsx';
 
 export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
     {
@@ -88,9 +89,8 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const operator = getLinkValue(all?.operator, all?.linking?.SCL);
-
-          return operator ? <Tooltip title={operator}>{operator}</Tooltip> : '-';
+          const operators = all?.operatorOfLocation?.map((operator) => operator?.clientLocation?.name);
+          return (operators && operators.length > 0) ? <MoreOptions data={operators || []} tooltipPlacement="topLeft" /> : '-';
         },
     },   
     {

package/src/@daf/pages/Locations/MineSite/config.js

@@ -140,7 +140,6 @@ export const getFilterOptions = (options, t) => {
 		administrativeLevel1,
 		administrativeLevel2,
 	  } = options || {};
-	console.log({options})
 
 	const _default  = {
 		category: stakeholderCategoryOptions || categoryOptions,

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});

package/src/@daf/pages/Partners/columns.js

@@ -0,0 +1,421 @@
+import React from "react";
+import { Modal, Popover, Tag, message } from "antd";
+import MoreMenu from '../../core/components/Table/MoreMenu/index.jsx';
+import TooltipIcon from '../../core/components/Icon/TooltipIcon.jsx';
+import { findOptions, camelCaseToTitle } from '../../../helpers/StringHelper.js';
+import { copyToClipboard } from '../../../helpers/copyToClipboard.js';
+import { partnershipTypes, partnerTypes } from './config.js';
+
+export const getColumns = ({
+	t,
+	accept,
+	decline,
+	suspend,
+	selectOptions = {},
+	resendInvite,
+	activate,
+	activeTab,
+	setOpen,
+	block,
+}) => [
+	{
+		title: t("ID"),
+		dataIndex: "datastakeId",
+		key: "datastakeId",
+		ellipsis: true,
+		render: (v, all) => {
+			if (all.empty) {
+				return <div className="daf-default-cell" />;
+			}
+			// THE FALLBACK WAS DEPENDS BEFORE
+			return v || "-";
+		},
+	},
+	{
+		title: (
+			<div className="flex-row">
+				{t("Partner Type")}
+				<Popover
+					title={t("Partner Type")}
+					content={
+						<div className="max-w-250">
+							{t("Source: This partner shares information with your organisation.")}{" "}
+							<br />
+							<br />
+							{t("Client: This partner receives information from your organisation.")}
+							<br />
+							<br />
+							{t("Exchange: You share information with each other.")}
+						</div>
+					}
+				>
+					<div className="ml-2 flex flex-column justify-content-center">
+						<TooltipIcon fontSize={12} />
+					</div>
+				</Popover>
+			</div>
+		),
+		dataIndex: "partnershipType",
+		key: "partnershipType",
+		ellipsis: true,
+		render: (val, all) => {
+			if (all.empty) {
+				return <div className="daf-default-cell" />;
+			}
+
+			return partnershipTypes.find((v) => v.value === val)?.label || val || "-";
+		},
+	},
+	{
+		title: <div className="flex-row">{t("Entity Type")}</div>,
+		dataIndex: "partnerType",
+		key: "partnerType",
+		ellipsis: true,
+		render: (val, all) => {
+			if (all.empty) {
+				return <div className="daf-default-cell" />;
+			}
+
+			return partnerTypes.find((v) => v.value === val)?.label || val || "-";
+		},
+	},
+	{
+		title: t("Name"),
+		dataIndex: "nickName",
+		key: "nickName",
+		ellipsis: true,
+		render: (v, all) => {
+			if (all.empty) {
+				return <div className="daf-default-cell" />;
+			}
+
+			return v || "-";
+		},
+	},
+	{
+		title: t("Email"),
+		dataIndex: "email",
+		key: "email",
+		ellipsis: true,
+		render: (v, all) => {
+			if (all.empty) {
+				return <div className="daf-default-cell" />;
+			}
+
+			return v || "-";
+		},
+	},
+	{
+		title: t("Category"),
+		dataIndex: "category",
+		key: "category",
+		ellipsis: true,
+		render: (v, all) => {
+			if (all.empty) {
+				return <div className="daf-default-cell" />;
+			}
+			return v ? findOptions(v, selectOptions?.category || []) : "-";
+		},
+	},
+	{
+		title: (
+			<div className="flex-row">
+				{t("Settings")}
+				<Popover
+					title={t("Settings")}
+					content={
+						<div className="max-w-250">
+							{t(
+								"Standard: information is licensed with citation and available without restriction.",
+							)}
+							<br />
+							<br />
+							{t(
+								"Custom: Information sharing settings have been adjusted by the Source as reflected in the corresponding Channel.",
+							)}
+						</div>
+					}
+				>
+					<div className="ml-2 flex flex-column justify-content-center">
+						<TooltipIcon fontSize={12} />
+					</div>
+				</Popover>
+			</div>
+		),
+		dataIndex: "settings",
+		key: "settings",
+		ellipsis: true,
+		render: (v, all) => {
+			if (all.empty) {
+				return <div className="daf-default-cell" />;
+			}
+
+			return v ? t(camelCaseToTitle(v)) : "-";
+		},
+	},
+	{
+		title: (
+			<div className="flex-row">
+				{t("Status")}
+				<Popover
+					title={t("Status")}
+					content={
+						<div className="max-w-250">
+							{t(
+								"Information is shared in accordance with settings for partners designated as Active.",
+							)}
+							<br />
+							<br />
+							{t(
+								"Information sharing is suspended for partners designated as Inactive.",
+							)}
+						</div>
+					}
+				>
+					<div className="ml-2 flex flex-column justify-content-center">
+						<TooltipIcon fontSize={12} />
+					</div>
+				</Popover>
+			</div>
+		),
+		dataIndex: "status",
+		key: "status",
+		// ellipsis: true,
+		// width: 150,
+		render: (val, all) => {
+			if (all.empty) {
+				return <div className="daf-default-cell" />;
+			}
+
+			switch (val) {
+				case "active":
+					return (
+						<Tag
+							color="green"
+							style={{
+								width: 100,
+								textAlign: "center",
+							}}
+						>
+							{t("Active")}
+						</Tag>
+					);
+				case "declined":
+					return (
+						<Tag
+							color="red"
+							style={{
+								width: 100,
+								textAlign: "center",
+							}}
+						>
+							{t("Declined")}
+						</Tag>
+					);
+				case "pending":
+					return (
+						<Tag
+							color="orange"
+							style={{
+								width: 100,
+								textAlign: "center",
+							}}
+						>
+							{t("Pending")}
+						</Tag>
+					);
+				case "blocked":
+					return (
+						<Tag
+							color="red-inverse"
+							style={{
+								width: 100,
+								textAlign: "center",
+							}}
+						>
+							{t("Blocked")}
+						</Tag>
+					);
+				case "suspended":
+					return (
+						<Tag
+							style={{
+								width: 100,
+								textAlign: "center",
+							}}
+						>
+							{t("Suspended")}
+						</Tag>
+					);
+				default:
+					return "-";
+			}
+		},
+	},
+	{
+		title: "",
+		dataIndex: "actions",
+		width: 60,
+		show: true,
+		key: "actions",
+		render: (_, val) => {
+			if (val.empty) {
+				return <div className="daf-default-cell" />;
+			}
+
+			let items = [];
+
+			if (activeTab === "requests") {
+				switch (val.status) {
+					case "declined":
+						items.push({
+							label: t("Block User"),
+							key: "block",
+							onClick: () =>
+								Modal.confirm({
+									title: t("Are you sure you want to block this user?"),
+									onOk: () => block(val.id),
+									cancelText: t("No"),
+									okText: t("Yes"),
+									closable: true,
+								}),
+						});
+						break;
+					case "pending":
+						items.push(
+							...[
+								{
+									label: t("Approve"),
+									key: "approve",
+									onClick: () =>
+										Modal.confirm({
+											content: t(
+												"Are you sure you want to approve this request?",
+											),
+											title: t("Approve"),
+											onOk: () => accept(val.id),
+											cancelText: t("No"),
+											okText: t("Yes"),
+											closable: true,
+										}),
+								},
+								{
+									label: t("Decline"),
+									key: "decline",
+									onClick: () =>
+										Modal.confirm({
+											title: t("Decline"),
+											content: t(
+												"Are you sure you want to decline this request?",
+											),
+											onOk: () => decline(val.id),
+											cancelText: t("No"),
+											okText: t("Yes"),
+											closable: true,
+										}),
+								},
+							],
+						);
+						break;
+					default:
+				}
+			} else {
+				switch (val.status) {
+					case "pending":
+						items.push({
+							label: t("Details"),
+							key: "edit",
+							onClick: () => setOpen(val),
+						});
+						items.push({
+							label: t("Suspend Partner"),
+							key: "suspend",
+							onClick: () =>
+								Modal.confirm({
+									title: t("Suspend Partner"),
+									content: t("Are you sure you want to suspend this partner?"),
+									onOk: () => suspend(val.id),
+									cancelText: t("No"),
+									okText: t("Yes"),
+									closable: true,
+								}),
+						});
+						items.push({
+							label: t("Copy Invitation Link"),
+							key: "copyInvitationLink",
+							disabled: !val.code,
+							onClick: () => {
+								const copyText = document.getElementById("myInput");
+								copyText.value = val.datastakeId
+									? `${window.location.origin}/app-invitation?code=${val.code}`
+									: `${window.location.origin}/register?code=${val.code}`;
+								copyToClipboard("myInput");
+								message.info(t("Invitation link copied!"));
+							},
+						});
+						items.push({
+							label: t("Resend Invite"),
+							key: "resendInvite",
+							onClick: () =>
+								Modal.confirm({
+									title: t("Resend Invitation"),
+									content: t(
+										"Are you sure you want to invite this user again? This user will receive a new notification",
+									),
+									onOk: () => resendInvite(val.id),
+									cancelText: t("No"),
+									okText: t("Yes"),
+									closable: true,
+								}),
+						});
+						break;
+					case "suspended":
+						items.push({
+							label: t("Details"),
+							key: "details",
+							onClick: () => setOpen(val),
+						});
+						items.push({
+							label: t("Activate Partner"),
+							key: "activate",
+							onClick: () =>
+								Modal.confirm({
+									title: t("Re-activate Partnership"),
+									content: t(
+										"Are you sure you want to re-activate this collaboration?",
+									),
+									onOk: () => activate(val.id),
+									cancelText: t("No"),
+									okText: t("Yes"),
+									closable: true,
+								}),
+						});
+						break;
+					case "active":
+						items.push({
+							label: t("Details"),
+							key: "edit",
+							onClick: () => setOpen(val),
+						});
+						items.push({
+							label: t("Suspend Partner"),
+							key: "suspend",
+							onClick: () =>
+								Modal.confirm({
+									title: t("Suspend Partner"),
+									content: t("Are you sure you want to suspend this partner?"),
+									onOk: () => suspend(val.id),
+									cancelText: t("No"),
+									okText: t("Yes"),
+									closable: true,
+								}),
+						});
+						break;
+					default:
+				}
+			}
+
+			return <MoreMenu items={items} />;
+		},
+	},
+];