datastake-daf 0.6.783 → 0.6.784

package/src/@daf/pages/Partners/create.jsx

@@ -2,7 +2,7 @@ import React, { useMemo } from 'react'
 import { message } from 'antd';
 import PartnerService from '../../services/PartnerService.js';
 import DynamicForm from '../../core/components/DynamicForm/index.jsx';
-import { partnershipTypes, partnerTypes } from './config.js';
+import { getPartnerTypes, getPartnershipTypes } from './config.js';
 
 const data = {};
 
@@ -22,6 +22,9 @@ const Create = ({
     getApiBaseUrl = () => {},
 }) => {
 
+	const partnerTypes = useMemo(() => getPartnerTypes(t), [t]);
+	const partnershipTypes = useMemo(() => getPartnershipTypes(t), [t]);
+
     const form = useMemo(
 		() => ({
 			identification: {
@@ -49,7 +52,7 @@ const Create = ({
 					dataId: "partnerType",
 					options: partnerTypes.map((o) => ({ ...o, label: t(o.label) })),
 					rules: [{ required: true, message: "errors::field is required" }],
-				},
+				},				
 				nickName: {
 					label: {
 						"partnerType is individual": t("Person name"),

package/src/@daf/pages/Partners/edit.jsx

@@ -1,9 +1,9 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect, useMemo } from 'react'
 import { Form, Input, Select } from "antd";
 import PartnerService from '../../services/PartnerService.js';
 import Loading from '../../core/components/Loading/index.jsx';
 import ProjectVisualisationFooter from '../../core/components/ProjectVisualisation/Footer.js';
-import { partnershipTypes } from './config.js';
+import { getPartnerTypes, getPartnershipTypes } from './config.js';
 import { licensingOptions } from '../../core/components/DataStore/components/Settings/config.js';
 
 const Edit = ({
@@ -14,6 +14,8 @@ const Edit = ({
 }) => {
     const [MainForm] = Form.useForm();
     const [loading, setLoading] = useState(false);
+    const partnerTypes = useMemo(() => getPartnerTypes(t), [t]);
+    const partnershipTypes = useMemo(() => getPartnershipTypes(t), [t]);
 
     useEffect(() => {
         MainForm.setFieldsValue({ ...partner, licensing: 'no_citation' });

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

@@ -72,4 +72,17 @@ export const renderType = ({ item = {}, t = (s) => s }) => {
 	}
 
 	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

@@ -1,7 +1,7 @@
 import React, { useEffect, useMemo } from 'react';
 import { useFilters } from '../../../../hooks/useFilters.js';
 import { getColumns } from './columns.js';
-import { redirect } from './config.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';
@@ -44,9 +44,11 @@ const LinkingTemplate = ({
 
     const dataSource = conf?.linkingTemplateContextData?.[id];
 
+	const _namespace = namespaceMap[namespace];
+
     const changeData = async () => {
 		try {
-			const _data = await LinkedSubjectsService.getLinkedSubjects({ namespace, id, mod: conf.mod });
+			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) => ({

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

@@ -6,14 +6,5 @@ export function Template({
   conf,
   namespace,
 }) {
-  switch (namespace) {
-    case 'locations':
-    case 'documents':
-    case 'stakeholders':
-    case 'events':
-      return <LinkingTemplate conf={conf} namespace={namespace} />
-    default:
-      return null;
-
-  }
+  return <LinkingTemplate conf={conf} namespace={namespace} />
 }

package/src/@daf/pages/View/hooks/usePrepareForm.js

@@ -31,7 +31,7 @@ export const usePrepareForm = ({
               } = JSON.parse(JSON.stringify(allData[dKey][nKey] || {}));
   
               if (data.datastakeId === id || id === "user") {
-                  if (viewConfig.linkingSubjects.includes(namespace)) {
+                //   if (viewConfig.linkingSubjects.includes(namespace)) {
                       setForm({
                           ...form,
                           linking: {
@@ -41,9 +41,9 @@ export const usePrepareForm = ({
                               template: "linkingSubjects",
                           },
                       });
-                  } else {
-                      setForm(form);
-                  }
+                //   } else {
+                //       setForm(form);
+                //   }
                   setData(data);
                   setGroups(config.groups || {});
                   setLinkingForms(linkingForms);

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

@@ -227,13 +227,14 @@ const View = ({
                     extraButtons={extraPageActions}
                     addedHeaderFirst
                     addedHeader={
-                        <div className="flex flex-row gap-4" style={{ marginRight: 8 }}>
+                        <div className="flex flex-row gap-4">
                             <Multiselect
                                 options={[...sourceOptions]}
                                 isAvatarGroup
                                 selectionType="checkbox"
                                 key={partners?.length}
                                 canUnselectLast={false}
+                                isSingle
                                 onChange={(selected) => {
                                     setSelectedPartners((prev) => ({
                                         ...prev,

package/src/constants/locales/en/translation.js

@@ -1,4 +1,7 @@
 const en = {
+  "Site": "Site",
+  "Production Sites": "Production Sites",
+  "Type of account": "Type of account",
   "accounts": "Accounts",
   "users": "Users",
   "subjects": "Subjects",

package/src/constants/locales/fr/translation.js

@@ -1,4 +1,7 @@
 const fr = {
+	"Site": "Site",
+	"Production Sites": "Sites de production",
+	"Type of account": "Type de compte",
 	"accounts": "Comptes",
 	"users": "Utilisateurs",
 	"subjects": "Sujets",

package/src/constants/locales/sp/translation.js

@@ -1,4 +1,7 @@
 const sp = {
+  "Site": "Sitio",
+  "Production Sites": "Centros de producción",
+  "Type of account": "Tipo de cuenta",
   "Identified Customers": "Clientes identificados",
   "Identified Suppliers": "Proveedores identificados",
   "Associated Mine Sites": "Sitios mineros asociados",