datastake-daf 0.6.741 → 0.6.743

package/dist/services/index.js

@@ -1502,7 +1502,7 @@ class OperatorService extends BaseService {
       data: data
     });
   }
-  getOptions(id = "optionPositionSupplyChain,subCategory,activityAtSite,category,countries") {
+  getOptions(id = "positionSupplyChainOptions,subCategoriesOptions,categoriesOptions,countries") {
     return this.apiGet({
       isApp: true,
       url: `/forms/options`,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.741",
+	"version": "0.6.743",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/pages/dashboards/AllInformation/Documents/columns.js

@@ -4,6 +4,7 @@ import { findOptions } from '../../../../../helpers/StringHelper.js';
 import { renderDateFormatted } from '../../../../../helpers/Forms.js';
 import CustomIcon from '../../../../core/components/Icon/CustomIcon.jsx';
 import AvatarGroup from '../../../../core/components/AvatarGroup/index.jsx';
+import sourceAvatarConfig from '../../../../../helpers/sourceAvatarConfig.js';
 
 const getLinkValue = (value, linkingObject) => {
   if(linkingObject && linkingObject?.[value]) {
@@ -12,7 +13,7 @@ const getLinkValue = (value, linkingObject) => {
   return null;
 }
 
-export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data}) => [
+export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
     {
         dataIndex: 'datastakeId',
         title: t('ID'),
@@ -80,9 +81,9 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
                 return <div className="daf-default-cell" />;
             }
 
-            console.log({val, all})
+            const sources = sourceAvatarConfig(val, user, applications);
 
-            return <AvatarGroup items={val}></AvatarGroup>;
+            return <AvatarGroup items={sources}></AvatarGroup>;
         },
     },
     {

package/src/@daf/pages/dashboards/AllInformation/Documents/index.jsx

@@ -33,6 +33,7 @@ const DocumentsTable = ({
     formValue = {},
     form = {},
     extendingFilters = {},
+    applications = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState();
@@ -47,7 +48,8 @@ const DocumentsTable = ({
         theme,
         subject: 'documents',
         data,
-    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data]);
+        applications,
+    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
 
     const breadCrumbs = [];
 

package/src/@daf/pages/dashboards/AllInformation/Events/columns.js

@@ -4,6 +4,7 @@ import { findOptions } from '../../../../../helpers/StringHelper.js';
 import { renderDateFormatted } from '../../../../../helpers/Forms.js';
 import CustomIcon from '../../../../core/components/Icon/CustomIcon.jsx';
 import AvatarGroup from '../../../../core/components/AvatarGroup/index.jsx';
+import sourceAvatarConfig from '../../../../../helpers/sourceAvatarConfig.js';
 
 const getLinkValue = (value, linkingObject) => {
   if(linkingObject && linkingObject?.[value]) {
@@ -12,7 +13,7 @@ const getLinkValue = (value, linkingObject) => {
   return null;
 }
 
-export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data}) => [
+export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
     {
         dataIndex: 'datastakeId',
         title: t('ID'),
@@ -124,9 +125,9 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
                 return <div className="daf-default-cell" />;
             }
 
-            console.log({val, all})
+            const sources = sourceAvatarConfig(val, user, applications);
 
-            return <AvatarGroup items={val}></AvatarGroup>;
+            return <AvatarGroup items={sources}></AvatarGroup>;
         },
     },
     {

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

@@ -33,6 +33,7 @@ const EventsTable = ({
     formValue = {},
     form = {},
     extendingFilters = {},
+    applications = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState();
@@ -47,7 +48,8 @@ const EventsTable = ({
         theme,
         subject: 'events',
         data,
-    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data]);
+        applications,
+    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
 
     const breadCrumbs = [];
 

package/src/@daf/pages/dashboards/AllInformation/Locations/columns.js

@@ -4,6 +4,7 @@ import { findOptions } from '../../../../../helpers/StringHelper.js';
 import { renderDateFormatted } from '../../../../../helpers/Forms.js';
 import CustomIcon from '../../../../core/components/Icon/CustomIcon.jsx';
 import AvatarGroup from '../../../../core/components/AvatarGroup/index.jsx';
+import sourceAvatarConfig from '../../../../../helpers/sourceAvatarConfig.js';
 
 const getLinkValue = (value, linkingObject) => {
   if(linkingObject && linkingObject?.[value]) {
@@ -12,7 +13,7 @@ const getLinkValue = (value, linkingObject) => {
   return null;
 }
 
-export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data}) => [
+export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
     {
         dataIndex: 'datastakeId',
         title: t('ID'),
@@ -124,9 +125,9 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
                 return <div className="daf-default-cell" />;
             }
 
-            console.log({val, all})
+            const sources = sourceAvatarConfig(val, user, applications);
 
-            return <AvatarGroup items={val}></AvatarGroup>;
+            return <AvatarGroup items={sources}></AvatarGroup>;
         },
     },
     {

package/src/@daf/pages/dashboards/AllInformation/Locations/index.jsx

@@ -32,6 +32,7 @@ const LocationsTable = ({
     formData = {},
     formValue = {},
     form = {},
+    applications = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState();
@@ -46,7 +47,8 @@ const LocationsTable = ({
         theme,
         subject: 'locations',
         data,
-    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data]);
+        applications,
+    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
 
     const breadCrumbs = [];
 

package/src/@daf/pages/dashboards/AllInformation/Stakeholders/columns.js

@@ -4,8 +4,9 @@ import { findOptions } from '../../../../../helpers/StringHelper.js';
 import { renderDateFormatted } from '../../../../../helpers/Forms.js';
 import CustomIcon from '../../../../core/components/Icon/CustomIcon.jsx';
 import AvatarGroup from '../../../../core/components/AvatarGroup/index.jsx';
+import sourceAvatarConfig from '../../../../../helpers/sourceAvatarConfig.js';
 
-export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject}) => [
+export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, applications}) => [
     {
         dataIndex: 'datastakeId',
         title: t('ID'),
@@ -105,7 +106,9 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
                 return "--";
             }
 
-            return <AvatarGroup items={val}></AvatarGroup>;
+            const sources = sourceAvatarConfig(val, user, applications);
+
+            return <AvatarGroup items={sources}></AvatarGroup>;
         },
     },
     {

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

@@ -32,6 +32,7 @@ const StakeholdersTable = ({
     formData = {},
     formValue = {},
     form = {},
+    applications = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState();
@@ -43,8 +44,9 @@ const StakeholdersTable = ({
         activeTab,
         getRedirectLink, 
         theme,
-        subject: 'stakeholders'
-    }), [t, goTo, user, options, activeTab, getRedirectLink, theme]);
+        subject: 'stakeholders',
+        applications,
+    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, applications]);
 
     const breadCrumbs = [];
 

package/src/@daf/pages/dashboards/DueDilligence/Activities/columns.js

@@ -0,0 +1,221 @@
+import React from 'react';
+import { Tooltip, Tag } from 'antd';
+import { findOptions } from '../../../../../helpers/StringHelper.js';
+import { renderDateFormatted } from '../../../../../helpers/Forms.js';
+import CustomIcon from '../../../../core/components/Icon/CustomIcon.jsx';
+import AvatarGroup from '../../../../core/components/AvatarGroup/index.jsx';
+import sourceAvatarConfig from '../../../../../helpers/sourceAvatarConfig.js';
+
+const getLinkValue = (value, linkingObject) => {
+  if(linkingObject && linkingObject?.[value]) {
+    return linkingObject?.[value]?.name;
+  }
+  return null;
+}
+
+const getEventCategoryBySubject = (eventCategoryObject, subject) => {
+  if (!eventCategoryObject || typeof eventCategoryObject !== 'object') {
+    return null;
+  }
+  
+  const subjectSingular = subject.endsWith('ies') 
+    ? subject.slice(0, -3) + 'y'
+    : subject.endsWith('s') 
+    ? subject.slice(0, -1)       
+    : subject;                      
+
+  const key = `typeOfEvent is ${subjectSingular}`;
+  return eventCategoryObject[key] || null;
+};
+
+export const renderStatusTag = ({ value, t = (s) => s }) => {
+	const width = 87;
+
+	switch (value) {
+		case "edited":
+			return (
+				<Tag color="yellow" style={{ width }} className="text-center">
+					{t("Edited")}
+				</Tag>
+			);
+		case "submitted":
+			return (
+				<Tag color="green" style={{ width }} className="text-center">
+					{t("Submitted")}
+				</Tag>
+			);
+		default:
+			return (
+				<Tag color="blue" style={{ width }} className="text-center">
+					{t("Private")}
+				</Tag>
+			);
+	}
+};
+
+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" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },
+    {
+        dataIndex: 'name',
+        title: t('Title'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },   
+    {
+      title: t("Date"),
+      dataIndex: "date",
+      key: "date",
+      render: (date, all) => {
+          if (all.empty) {
+              return <div className="daf-default-cell" />;
+          }
+
+          const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+          return <Tooltip title={_date}>{_date}</Tooltip>;
+      },
+      ellipsis: true,
+  },  
+    {
+        dataIndex: 'mineSite',
+        title: t('Location'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          // const country = findOptions(v, data?.options?.positionSupplyChainOptions);
+          const mineSite = all?.location?.name
+
+          return mineSite ? <Tooltip title={mineSite}>{mineSite}</Tooltip> : '-';
+        },
+    },  
+    {
+      dataIndex: 'province',
+      title: t('Province'),
+      ellipsis: true,
+      show: true,
+      render: (v, all) => {
+        if (all.empty) {
+          return <div className="daf-default-cell" />
+        }
+
+        const region = getLinkValue(all?.location?.administrativeLevel1, all?.location?.linking?.SCL);
+
+        return region ? <Tooltip title={region}>{region}</Tooltip> : '-';
+      },
+  },    
+  {
+      dataIndex: 'territory',
+      title: t('Territory'),
+      ellipsis: true,
+      show: true,
+      render: (v, all) => {
+        if (all.empty) {
+          return <div className="daf-default-cell" />
+        }
+
+        const district = getLinkValue(all?.location?.administrativeLevel2, all?.location?.linking?.SCL);
+
+        return district ? <Tooltip title={district}>{district}</Tooltip> : '-';
+      },
+  },  
+    {
+        dataIndex: 'eventCategory',
+        title: t('Category'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const eventCategory = findOptions(v, data?.options?.eventCategoryOptions);
+          const categoryValue = getEventCategoryBySubject(eventCategory, subject);
+          
+          return categoryValue ? <Tooltip title={categoryValue}>{categoryValue}</Tooltip> : '-';
+        },
+    },              
+    {
+        title: t("Sources"),
+        dataIndex: "sources",
+        key: "sources",
+        show: activeTab !== "own",
+        render: (val, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+
+            const sources = sourceAvatarConfig(val, user, applications);
+
+            return <AvatarGroup items={sources}></AvatarGroup>;
+        },
+    },
+    {
+        title: t("Status"),
+        dataIndex: "status",
+        key: "status",
+        show: activeTab === "own",
+        render: (val, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const _val = all?.published || all?.status === "submitted" ? "submitted" : val;
+
+          return renderStatusTag({ value: _val, t });
+        },
+    },
+    {
+      title: t("Last Update"),
+      dataIndex: "updatedAt",
+      key: "updatedAt",
+      render: (date, all) => {
+          if (all.empty) {
+              return <div className="daf-default-cell" />;
+          }
+
+          const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+          return <Tooltip title={_date}>{_date}</Tooltip>;
+      },
+      ellipsis: true,
+    },      
+    {
+      id: 'actions',
+      title: "",
+      width: 60,
+      render: (_, all) => {
+        if (all.empty) {
+          return <div className="daf-default-cell" />;
+        }
+
+        const link = `/app/view/${subject}/${all.datastakeId}`;
+
+        return <div style={{ display: "flex", justifyContent: "center" }}>
+						<a href={getRedirectLink(link)}>
+							<CustomIcon name="Link" size={15} color={theme.baseGray70} />
+						</a>
+			</div>;
+      }
+    }
+].filter((column) => column.show !== false);

package/src/@daf/pages/dashboards/DueDilligence/Activities/config.js

@@ -0,0 +1,166 @@
+export const checkboxConfig = {
+	name: 'Name',
+	datastakeId: 'ID'
+}
+
+export const getFiltersConfig = ({t}) => {
+    return {
+		country: {
+		  type: 'select',
+		  label: 'Country',
+		  placeholder: (t) => `${t('Filter by')} ${t('Country').toLowerCase()}`,
+		  style: { flex: 1 },
+		  labelStyle: { flex: 1 },
+		  getLabel: (option) => option.label,
+		  getValue: (option) => option.value,
+		},
+		administrativeLevel1: {
+		  type: 'ajaxSelect',
+		  label: ({ t = (s) => s, options = {}, filters = {}, language = 'en' }) => {
+			const { administrativeLevel1 } = options;
+	  
+			if (administrativeLevel1) {
+			  if (options.country) {
+				const _item = administrativeLevel1[filters.country];
+				if (_item) {
+				  if (_item[language]) {
+					return _item[language]
+				  }
+				}
+			  }
+			}
+	  
+			return t('Province');
+		  },
+		  placeholder: (t) => `${t('Filter by')} ${t('Province').toLowerCase()}`,
+		  filters: (data) => ({
+			country: data.country,
+			level: 'level_1',
+		  }),
+		  show: (data) => !data.country,
+		  disabled: (data) => !data.country,
+		  mapper: { label: "name", value: "id" },
+		  method: 'getOptions',
+		  entity: 'AdministrativeLevel',
+		  style: { flex: 1 },
+		  labelStyle: { flex: 1 },
+		},
+		administrativeLevel2: {
+		  type: 'ajaxSelect',
+		  label: ({ t = (s) => s, options = {}, filters = {}, language = 'en' }) => {
+			const { administrativeLevel2 } = options;
+	  
+			if (administrativeLevel2) {
+			  if (options.country) {
+				const _item = administrativeLevel2[filters.country];
+				if (_item) {
+				  if (_item[language]) {
+					return _item[language]
+				  }
+				}
+			  }
+			}
+	  
+			return t('Province');
+		  },
+		  show: (data) => !(data.country && data.administrativeLevel1),
+		  placeholder: (t) => `${t('Filter by')} ${t('Territory').toLowerCase()}`,
+		  filters: (data) => ({
+			country: data.country,
+			level: 'level_2',
+			administrativeLevel1: data.administrativeLevel1,
+		  }),
+		  disabled: (data) => !(data.country && data.administrativeLevel1),
+		  mapper: { label: "name", value: "id" },
+		  method: 'getOptions',
+		  entity: 'AdministrativeLevel',
+		  style: { flex: 1 },
+		  labelStyle: { flex: 1 },
+		},
+		activity: {
+		  type: 'select',
+		  label: 'Activity',
+		  placeholder: (t) => `${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()}`,
+		  style: { flex: 1 },
+		  labelStyle: { flex: 1 },
+		  getLabel: (option) => option.label,
+		  getValue: (option) => option.value,
+		},
+		status: {
+		  type: "select",
+		  label: "Status",
+		  placeholder: (t) => `${t("Filter by")} ${t("Status").toLowerCase()}`,
+		  style: { flex: 1 },
+		  labelStyle: { fley: 1 },
+		  getLabel: (option) => option.label,
+		  getValue: (option) => option.value,
+		},
+	}
+}
+
+export const filtersConfig = {
+	name: '',
+	datastakeId: '',
+};
+
+export const getFilterOptions = (options, t) => {
+	const {
+		statusOptions = [],
+		categoryOptions = [],
+		countries = [],
+		subCategory = [],
+		activityAtSiteOptions = [],
+		stakeholderCategoryOptions,
+		stakeholderSubCategoriesOptions,
+		administrativeLevel1,
+		administrativeLevel2,
+		positionInMineralSupplyChainOptions,
+		subCategoriesOptions,
+	  } = options || {};
+
+	const _default  = {
+		status: [
+			{
+				value: "submitted",
+				label: "Submitted",
+			},
+			{
+				value: "private",
+				label: "Private",
+			},
+		],
+		category: stakeholderCategoryOptions || categoryOptions,
+		country: countries,
+		subCategory: subCategoriesOptions,
+		activity: activityAtSiteOptions,
+		administrativeLevel1,
+		administrativeLevel2,
+		positionInTheMineralSupplyChain: positionInMineralSupplyChainOptions,
+	}
+
+	return _default;
+}