datastake-daf 0.6.782 → 0.6.784

package/src/@daf/pages/Stakeholders/Operators/columns.js

@@ -14,6 +14,8 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         title: t('ID'),
         ellipsis: true,
         show: true,
+        key: "datastakeId",
+        sorter: () => 0 + 0,
         render: (v, all) => {
           if (all.empty) {
             return <div className="daf-default-cell" />
@@ -27,6 +29,8 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         title: t('Name'),
         ellipsis: true,
         show: true,
+        key: "name",
+        sorter: () => 0 + 0,
         render: (v, all) => {
           if (all.empty) {
             return <div className="daf-default-cell" />
@@ -55,6 +59,8 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         title: t('Legal Form'),
         ellipsis: true,
         show: true,
+        key: "subCategory",
+        sorter: () => 0 + 0,
         render: (v, all) => {
           if (all.empty) {
             return <div className="daf-default-cell" />

package/src/@daf/pages/Stakeholders/Operators/config.js

@@ -3,7 +3,7 @@ export const getFiltersConfig = ({t}) => {
 		country: {
 		  type: 'select',
 		  label: 'Country',
-		  placeholder: (t) => `${t('Filter by')} ${t('Country').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Country').toLowerCase()}`,
 		  style: { flex: 1 },
 		  labelStyle: { flex: 1 },
 		  getLabel: (option) => option.label,
@@ -27,7 +27,7 @@ export const getFiltersConfig = ({t}) => {
 	  
 			return t('Province');
 		  },
-		  placeholder: (t) => `${t('Filter by')} ${t('Province').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Province').toLowerCase()}`,
 		  filters: (data) => ({
 			country: data.country,
 			level: 'level_1',
@@ -59,7 +59,7 @@ export const getFiltersConfig = ({t}) => {
 			return t('Province');
 		  },
 		  show: (data) => !(data.country && data.administrativeLevel1),
-		  placeholder: (t) => `${t('Filter by')} ${t('Territory').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Territory').toLowerCase()}`,
 		  filters: (data) => ({
 			country: data.country,
 			level: 'level_2',
@@ -75,7 +75,7 @@ export const getFiltersConfig = ({t}) => {
 		subCategory: {
 		  type: 'select',
 		  label: 'Sub Category',
-		  placeholder: (t) => `${t('Filter by')} ${t('Sub Category').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Sub Category').toLowerCase()}`,
 		  style: { flex: 1 },
 		  labelStyle: { flex: 1 },
 		  getLabel: (option) => option.label,
@@ -99,7 +99,7 @@ export const getFiltersConfig = ({t}) => {
 		positionInTheMineralSupplyChain: {
 		  type: 'select',
 		  label: 'Position',
-		  placeholder: (t) => `${t('Filter by')} ${t('Position').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Position').toLowerCase()}`,
 		  style: { flex: 1 },
 		  labelStyle: { flex: 1 },
 		  getLabel: (option) => option.label,
@@ -108,7 +108,7 @@ export const getFiltersConfig = ({t}) => {
 		status: {
 		  type: "select",
 		  label: "Status",
-		  placeholder: (t) => `${t("Filter by")} ${t("Status").toLowerCase()}`,
+		  placeholder: () => `${t("Filter by")} ${t("Status").toLowerCase()}`,
 		  style: { flex: 1 },
 		  labelStyle: { fley: 1 },
 		  getLabel: (option) => option.label,
@@ -139,11 +139,11 @@ export const getFilterOptions = (options, t) => {
 		status: [
 			{
 				value: "submitted",
-				label: "Submitted",
+				label: t("Submitted"),
 			},
 			{
 				value: "private",
-				label: "Private",
+				label: t("Private"),
 			},
 		],
 	}

package/src/@daf/pages/Stakeholders/Workers/columns.js

@@ -8,24 +8,28 @@ import sourceAvatarConfig from '../../../../helpers/sourceAvatarConfig.js';
 import { renderStatusTag } from '../../../utils/tags.js';
 
 export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
-    // {
-    //     dataIndex: 'datastakeId',
-    //     title: t('ID'),
-    //     ellipsis: true,
-    //     show: true,
-    //     render: (v, all) => {
-    //       if (all.empty) {
-    //         return <div className="daf-default-cell" />
-    //       }
+    {
+        dataIndex: 'datastakeId',
+        title: t('Title'),
+        ellipsis: true,
+        show: true,
+        key: "datastakeId",
+        sorter: () => 0 + 0,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
     
-    //       return <Tooltip title={v}>{v}</Tooltip>;
-    //     },
-    // },
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },
     {
         dataIndex: 'name',
         title: t('Name'),
         ellipsis: true,
         show: true,
+        key: "name",
+        sorter: () => 0 + 0,
         render: (v, all) => {
           if (all.empty) {
             return <div className="daf-default-cell" />
@@ -36,9 +40,11 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     },    
     {
         dataIndex: 'mineSite',
-        title: t('Position'),
+        title: t('Site'),
         ellipsis: true,
         show: true,
+        key: "mineSite",
+        sorter: () => 0 + 0,
         render: (v, all) => {
           if (all.empty) {
             return <div className="daf-default-cell" />

package/src/@daf/pages/Stakeholders/Workers/config.js

@@ -3,7 +3,7 @@ export const getFiltersConfig = ({t}) => {
 		country: {
 		  type: 'select',
 		  label: 'Country',
-		  placeholder: (t) => `${t('Filter by')} ${t('Country').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Country').toLowerCase()}`,
 		  style: { flex: 1 },
 		  labelStyle: { flex: 1 },
 		  getLabel: (option) => option.label,
@@ -27,7 +27,7 @@ export const getFiltersConfig = ({t}) => {
 	  
 			return t('Province');
 		  },
-		  placeholder: (t) => `${t('Filter by')} ${t('Province').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Province').toLowerCase()}`,
 		  filters: (data) => ({
 			country: data.country,
 			level: 'level_1',
@@ -59,7 +59,7 @@ export const getFiltersConfig = ({t}) => {
 			return t('Province');
 		  },
 		  show: (data) => !(data.country && data.administrativeLevel1),
-		  placeholder: (t) => `${t('Filter by')} ${t('Territory').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Territory').toLowerCase()}`,
 		  filters: (data) => ({
 			country: data.country,
 			level: 'level_2',
@@ -75,31 +75,16 @@ export const getFiltersConfig = ({t}) => {
 		activity: {
 		  type: 'select',
 		  label: 'Activity',
-		  placeholder: (t) => `${t('Filter by')} ${t('Activity').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Activity').toLowerCase()}`,
 		  style: { flex: 1 },
 		  labelStyle: { flex: 1 },
 		  getLabel: (option) => option.label,
 		  getValue: (option) => option.value,
-		  filterOptions: (val) => {
-			if (val) {
-			  const { option, filters } = val
-			  if (filters && option) {
-				const { filters: optionFilters } = option;
-				if (Array.isArray(optionFilters) && optionFilters.length) {
-				  const { value, condition } = optionFilters[0];
-				  if (condition === 'includes') {
-					return value.includes('corporation');
-				  }
-				}
-			  }
-			}
-			return true;
-		  },
 		},
 		positionInTheMineralSupplyChain: {
 		  type: 'select',
 		  label: 'Position',
-		  placeholder: (t) => `${t('Filter by')} ${t('Position').toLowerCase()}`,
+		  placeholder: () => `${t('Filter by')} ${t('Position').toLowerCase()}`,
 		  style: { flex: 1 },
 		  labelStyle: { flex: 1 },
 		  getLabel: (option) => option.label,
@@ -108,7 +93,7 @@ export const getFiltersConfig = ({t}) => {
 		status: {
 		  type: "select",
 		  label: "Status",
-		  placeholder: (t) => `${t("Filter by")} ${t("Status").toLowerCase()}`,
+		  placeholder: () => `${t("Filter by")} ${t("Status").toLowerCase()}`,
 		  style: { flex: 1 },
 		  labelStyle: { fley: 1 },
 		  getLabel: (option) => option.label,
@@ -136,11 +121,11 @@ export const getFilterOptions = (options, t) => {
 		status: [
 			{
 				value: "submitted",
-				label: "Submitted",
+				label: t("Submitted"),
 			},
 			{
 				value: "private",
-				label: "Private",
+				label: t("Private"),
 			},
 		],
 		category: stakeholderCategoryOptions || categoryOptions,

package/src/@daf/pages/Summary/Minesite/index.jsx

@@ -68,13 +68,12 @@ const MineSummary = ({
         <DashboardLayout
             header={
                 <Header 
-                    title={hasSelect ? t("Mine Review") : (singleItemData?.name || "") + " " + t("Summary")}
+                    title={hasSelect ? t("Mine Review") : (`${singleItemData?.name || ""} ${singleItemData?.name ? t("Summary") : ""}`)}
                     className="with-border-header h-w-btn-header no-px-body"
                     goBackTo={!hasSelect && goBack}
-                    loading={loading}
                     breadcrumbs={breadcrumbs}
                     addedHeaderFirst
-					actionButtons={[
+					actionButtons={hasSelect ? [] :[
                         {
 							tooltip: t("Details"),
 							icon: "FileEdit",
@@ -90,7 +89,7 @@ const MineSummary = ({
 						},
 					]}
                     addedHeader={
-						<div className="flex flex-row gap-4" style={{ marginRight: 8 }}>
+						<div className="flex flex-row gap-4">
 							<Multiselect
 								options={[...sourceOptions]}
 								isAvatarGroup
@@ -109,6 +108,9 @@ const MineSummary = ({
 							/>
 						</div>
 					}
+                    onDownload={() => {
+                        console.log("onDownload");
+                    }}
                 />
             }
         >

package/src/@daf/pages/Summary/Operator/components/TradeRelationships/index.js

@@ -36,6 +36,8 @@ const TradeRelationships = ({
 		APP
     });
 
+	console.log({graphData});
+
     useEffect(() => {
 		const defaultProduct = filterConfig?.[0]?.options?.[0]?.value;
 

package/src/@daf/pages/Summary/Operator/index.jsx

@@ -69,12 +69,12 @@ const OperatorSummary = ({
         <DashboardLayout
             header={
                 <Header 
-                    title={hasSelect ? t("Operator Review") : (singleItemData?.name || "") + " " + t("Summary")}
+                    title={hasSelect ? t("Operator Review") : (`${singleItemData?.name || ""} ${singleItemData?.name ? t("Summary") : ""}`)}
                     className="with-border-header h-w-btn-header no-px-body"
                     goBackTo={!hasSelect && goBack}
                     breadcrumbs={breadcrumbs}
                     addedHeaderFirst
-					actionButtons={[
+					actionButtons={hasSelect ? [] :[
                         {
 							tooltip: t("Details"),
 							icon: "FileEdit",
@@ -90,7 +90,7 @@ const OperatorSummary = ({
 						},
 					]}
                     addedHeader={
-						<div className="flex flex-row gap-4" style={{ marginRight: 8 }}>
+						<div className="flex flex-row gap-4">
 							<Multiselect
 								options={[...sourceOptions]}
 								isAvatarGroup
@@ -109,6 +109,9 @@ const OperatorSummary = ({
 							/>
 						</div>
 					}
+                    onDownload={() => {
+                        console.log("onDownload");
+                    }}
                 />
             }
         >

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import TablePageWithTabs from '../../core/components/Screens/TableScreen/TablePageWithTabs/index.jsx';
 import Create from './create.jsx';
 import { displayMessage } from '../../../helpers/messages.js';
@@ -40,6 +40,12 @@ const TablePage = ({
     breadcrumbs = [],
     onDownload,
 }) => {
+    const _options = useMemo(() => {
+        return {
+            ...options,
+            ...data?.options,
+        }
+    },[options, data?.options])
     
     const {
         activeTab,
@@ -56,7 +62,7 @@ const TablePage = ({
         location,
         getData,
         extendingFilters,
-        options,
+        options: _options,
         t,
         goTo,
         user,

package/src/@daf/pages/Template/components/LinkingTemplate/columns.js

@@ -0,0 +1,95 @@
+import { renderType } from './config.js';
+import { renderDateFormatted } from '../../../../../helpers/Forms.js';
+import CustomIcon from '../../../../core/components/Icon/CustomIcon.jsx';
+
+export const getColumns = ({ t, redirect = () => "", mod, mode = "app", options }) => [
+	{
+		title: "ID",
+		dataIndex: "datastakeId",
+		key: "datastakeId",
+	},
+	{
+		title: t("Type"),
+		dataIndex: "type",
+		key: "type",
+		render: (type, all) => renderType({ item: all, t, type }),
+	},
+	{
+		title: t("Name"),
+		dataIndex: "name",
+		key: "name",
+		render: (name, all) => {
+			if (all.empty) {
+				return <div className="daf-default-cell" />;
+			}
+
+			if (all?.form === "products") {
+				const { minerals } = options;
+				const mineral = minerals.find(
+					(mineral) => mineral.value === all?.typeOfProduct,
+				)?.label;
+				return mineral || "--";
+			}
+
+			return name || "--";
+		},
+	},
+	{
+		title: t("Last Update"),
+		dataIndex: "updatedAt",
+		key: "updateAt",
+		render: (updatedAt, all) => {
+			if (all.empty) {
+				return <div className="daf-default-cell" />;
+			}
+
+			return (
+				<div className="daf-default-cell">
+					{renderDateFormatted(updatedAt, "DD MMM YYYY")}
+				</div>
+			);
+		},
+	},
+	{
+		title: "",
+		dataIndex: "actions",
+		width: 50,
+		key: "actions",
+		render: (_, all) => {
+			if (all.empty) {
+				return <div className="daf-default-cell" />;
+			}
+
+			return mode === "proxy" ? (
+				<a
+					onClick={() =>
+						redirect({
+							id: all.datastakeId,
+							type: all.type,
+							mod,
+							mode,
+							item: all,
+						})
+					}
+					href="#"
+				>
+					<CustomIcon name="LinkNewTab" width={14} height={14} color="#6C737F" />
+				</a>
+			) : (
+				<a
+					href={redirect({
+						id: all.datastakeId,
+						type: all.type,
+						mod,
+						mode,
+						item: all,
+					})}
+					target="_blank"
+					rel="noreferrer"
+				>
+					<CustomIcon name="LinkNewTab" width={14} height={14} color="#6C737F" />
+				</a>
+			);
+		},
+	},
+];

package/src/@daf/pages/Template/components/LinkingTemplate/config.js

@@ -0,0 +1,88 @@
+import React from "react";
+import { capitalizeAll } from '../../../../../helpers/StringHelper.js';
+
+
+export const decapitalize = string => 
+	string && string.charAt(0).toLowerCase() + string.slice(1);
+
+const formatRedirectString = (stringItem) => {
+	let string;
+	if (stringItem.includes("nashiriki")) {
+		string = decapitalize(stringItem?.replaceAll("nashiriki", ""));
+	} else {
+		string = stringItem;
+	}
+	return string;
+};
+
+export const getLanguage = (lng = "") => {
+	if (lng.includes("en")) {
+		return "en";
+	}
+
+	if (lng.includes("fr")) {
+		return "fr";
+	}
+};
+
+export const redirect = ({ id, item }) => {
+	const viewMode = "view";
+	let type = "testimonials";
+
+	if (item.category === "mineSite") {
+		type = "scl";
+	}
+
+	if (item.stakeholderType === "operator") {
+		type = "operators";
+	}
+
+	if (item.stakeholderType === "worker") {
+		type = "workers";
+	}
+
+    if (item.form) {
+		type = `${formatRedirectString(item.form)}s`;
+	}
+
+	let url = `/${viewMode}/${type}/${id}`;
+
+	return `/app${url}`;
+};
+
+export const renderType = ({ item = {}, t = (s) => s }) => {
+	if (item.empty) {
+		return <div className="daf-default-cell" />;
+	}
+
+	if (item.category === "mineSite") {
+		return t("Mine Site");
+	}
+
+	if (item.stakeholderType === "operator") {
+		return t("Operator");
+	}
+
+	if (item.stakeholderType === "worker") {
+		return t("Worker");
+	}
+
+	if (item.form) {
+		return t(capitalizeAll(item.form));
+	}
+
+	return "--";
+};
+
+export const namespaceMap = {
+	locations: "location",
+	documents: "document",
+	stakeholders: "stakeholder",
+	events: "event",
+	incidents: "event",
+	correctiveActions: "event",
+	"production-sites": "location",
+	operators: "stakeholder",
+	workers: "stakeholder",
+	activities: "event",
+}

package/src/@daf/pages/Template/components/LinkingTemplate/index.jsx

@@ -0,0 +1,121 @@
+import React, { useEffect, useMemo } from 'react';
+import { useFilters } from '../../../../hooks/useFilters.js';
+import { getColumns } from './columns.js';
+import { redirect, namespaceMap } from './config.js';
+import LinkedSubjectsService from '../../../../services/LinkedSubjects.js';
+import { formatClassname } from '../../../../../helpers/ClassesHelper.js';
+import Table from '../../../../core/components/Table/index.jsx';
+import Pagination from '../../../../core/components/Table/Pagination/index.jsx';
+
+const emptyObject = {};
+
+const LinkingTemplate = ({
+    conf,
+    namespace
+}) => {
+    const view = useMemo(() => conf?.location?.pathname?.split(`/app/${conf.mod}/`)[1], [conf]);
+
+    const {
+		pagination,
+		onTableChange,
+		totalPages,
+		canGoNext,
+		canGoPrev,
+		setPagination,
+		goPrev,
+		goNext,
+	} = useFilters({
+		module: conf.mod,
+		view,
+		selectFiltersConfig: emptyObject,
+		filtersConfig: emptyObject,
+	});
+
+    const columns = useMemo(() => getColumns({
+		t: conf.t,
+		redirect,
+		mod: conf.mod,
+		language: conf.user?.language,
+		mode: conf.mode,
+		options: conf.options,
+	}), [conf]);
+
+    const id = conf.allData.id;
+
+    const dataSource = conf?.linkingTemplateContextData?.[id];
+
+	const _namespace = namespaceMap[namespace];
+
+    const changeData = async () => {
+		try {
+			const _data = await LinkedSubjectsService.getLinkedSubjects({ namespace: _namespace, id, mod: conf.mod });
+			const data = (_data?.data || []).map((d, i) => ({ ...d, key: `${d.id}-${i}` }));
+			conf?.addData(id, data);
+			setPagination((prev) => ({
+				...prev,
+				current: 1,
+				total: data.length ? data.length : 1,
+			}));
+		} catch (err) {
+			console.log(err);
+		}
+	};
+
+    const _dataSource = useMemo(() => {
+		const startIndex = pagination.pageSize * (pagination.current - 1);
+		const endIndex = Math.min(startIndex + pagination.pageSize, dataSource?.length || 0);
+		return [...(dataSource || [])].slice(startIndex, endIndex);
+	}, [pagination, dataSource]);
+
+    useEffect(() => {
+		if (!dataSource) {
+			changeData();
+		} else {
+			setPagination((prev) => ({
+				...prev,
+				current: 1,
+				total: dataSource.length ? dataSource.length : 1,
+			}));
+		}
+	}, []);
+
+
+    return ( <div className={formatClassname(["content", "documents-layout"])} style={{}}>
+            <div className="view-header" style={{ flexDirection: "column", paddingTop: 0 }}>
+                <div className="daf-table-wrapper pagination-no-padding">
+                    <Table
+                        className="mt-0 p-0"
+                        columns={columns}
+                        hideOnLoading={false}
+                        data={_dataSource}
+                        doEmptyRows
+                        loading={!dataSource}
+                        rowKey="key"
+                        pagination={pagination}
+                        size="small"
+                    />
+
+                    <Pagination
+                        t={conf?.t}
+                        isMobile={conf?.isMobile}
+                        page={pagination.current}
+                        totalPages={totalPages}
+                        goPrev={goPrev}
+                        goNext={goNext}
+                        canGoNext={canGoNext}
+                        canGoPrev={canGoPrev}
+                        totalItems={pagination.total}
+                        doTotalItems
+                        onChangePagination={(val) => {
+                            onTableChange({ ...pagination, current: 1, pageSize: val });
+                        }}
+                        perPage={pagination.pageSize}
+                        arrowIcons
+                    />
+                </div>
+            </div>
+        </div>
+    )
+};
+
+export default LinkingTemplate;

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

@@ -0,0 +1,10 @@
+/* eslint-disable react/prop-types */
+import React from 'react';
+import LinkingTemplate from './components/LinkingTemplate/index.jsx';
+
+export function Template({
+  conf,
+  namespace,
+}) {
+  return <LinkingTemplate conf={conf} namespace={namespace} />
+}