datastake-daf 0.6.816 → 0.6.817

package/src/@daf/pages/Events/Activities/columns.js

@@ -117,19 +117,23 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         },
     },              
     {
-        title: t("Sources"),
-        dataIndex: "sources",
-        key: "sources",
-        show: activeTab !== "own",
-        render: (val, all) => {
-            if (all.empty) {
-                return <div className="daf-default-cell" />;
-            }
+      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);
+        if (!val || val?.length === 0) {
+          return "-";
+        }
 
-            return <AvatarGroup items={sources}></AvatarGroup>;
-        },
+        const sources = sourceAvatarConfig(val, user, applications);
+
+        return <AvatarGroup items={sources} />;
+      },
     },
     {
         title: t("Status"),

package/src/@daf/pages/Events/Incidents/columns.js

@@ -117,19 +117,23 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         },
     },              
     {
-        title: t("Sources"),
-        dataIndex: "sources",
-        key: "sources",
-        show: activeTab !== "own",
-        render: (val, all) => {
-            if (all.empty) {
-                return <div className="daf-default-cell" />;
-            }
+      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);
+        if (!val || val?.length === 0) {
+          return "-";
+        }
 
-            return <AvatarGroup items={sources}></AvatarGroup>;
-        },
+        const sources = sourceAvatarConfig(val, user, applications);
+
+        return <AvatarGroup items={sources} />;
+      },
     },
     {
         title: t("Status"),

package/src/@daf/pages/Events/Testimonials/columns.js

@@ -0,0 +1,173 @@
+import React from 'react';
+import { Tooltip, Tag } from 'antd';
+import { findOptions, getLinkValue } from '../../../../helpers/StringHelper.js';
+import { renderDateFormatted } from '../../../../helpers/Forms.js';
+import AvatarGroup from '../../../core/components/AvatarGroup/index.jsx';
+import sourceAvatarConfig from '../../../../helpers/sourceAvatarConfig.js';
+import { getEventCategoryBySubject } from '../helper.js';
+import { renderStatusTag } from '../../../utils/tags.js';
+import NavigationAction from '../../../core/components/Table/NavigationAction/index.jsx';
+
+export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
+    {
+        dataIndex: 'datastakeId',
+        title: t('ID'),
+        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>;
+        },
+    },
+    {
+        dataIndex: 'name',
+        title: t('Title'),
+        ellipsis: true,
+        show: true,
+        key: "name",
+        sorter: () => 0 + 0,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },   
+    {
+        title: t("type"),
+        dataIndex: "typeOfTestimonials",
+        key: "typeOfTestimonials",
+        sorter: () => 0 + 0,
+        show: true,
+        render: (title, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+
+            const type = findOptions(title, data?.options?.testimonialsType);
+
+            return type ? <Tooltip title={type}>{type}</Tooltip> : '-';
+        },
+        ellipsis: true,
+    },
+    {
+      title: t("Date"),
+      dataIndex: "date",
+      key: "date",
+      sorter: () => 0 + 0,
+      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: '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 || data?.options?.categoryOptions);
+          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" />;
+          }
+
+        if (!val || val?.length === 0) {
+          return "-";
+        }
+
+        const sources = sourceAvatarConfig(val, user, applications);
+
+        return <AvatarGroup items={sources} />;
+      },
+    },
+    {
+        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 onClick = () => {
+          let link = `/app/view/${subject}/${all.datastakeId}`;
+          if (activeTab === "shared") {
+            link += `?sourceId=${all?.authorId?.id}`;
+          }
+          goTo(getRedirectLink(link));
+        };
+
+        return <NavigationAction onClick={onClick} theme={theme} />;
+      }
+    }
+].filter((column) => column.show !== false);

package/src/@daf/pages/Events/Testimonials/config.js

@@ -0,0 +1,175 @@
+import { getStatusOptions } from '../../../utils/filters';
+
+export const getFiltersConfig = ({t}) => {
+    return {
+		timeframe: {
+			type: "timeframe",
+			label: "Timeframe",
+			style: { flex: 1 },
+			t: t,
+		},
+		country: {
+			type: 'select',
+			label: 'Country',
+			placeholder: () => `${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('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('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 },
+		},
+		eventCategory: {
+		  type: 'select',
+		  label: 'Category',
+		  placeholder: () => `${t('Filter by')} ${t('Category').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('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("Filter by")} ${t("Status").toLowerCase()}`,
+		  style: { flex: 1 },
+		  labelStyle: { fley: 1 },
+		  getLabel: (option) => option.label,
+		  getValue: (option) => option.value,
+		},
+	}
+}
+
+export const getFilterOptions = (options, t) => {
+	const {
+		timeframe = [],
+		statusOptions,
+		categoryOptions,
+		countries,
+		subCategory,
+		category,
+		stakeholderCategoryOptions,
+		stakeholderSubCategoriesOptions,
+		administrativeLevel1,
+		administrativeLevel2,
+		positionInMineralSupplyChainOptions,
+		subCategoriesOptions,
+		eventCategoryOptions,
+	} = options || {};
+
+	const _categoryOptions = (eventCategoryOptions || categoryOptions || [])?.map((item) => ({
+		value: item.value,
+		label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label,
+	}))
+
+	const _default  = {
+		timeframe: timeframe,
+		status: getStatusOptions(t) || [],
+		eventCategory: _categoryOptions || [],
+		country: countries || [],
+		subCategory: subCategoriesOptions || [],
+		// category: category,
+		administrativeLevel1,
+		administrativeLevel2,
+		// positionInTheMineralSupplyChain: positionInMineralSupplyChainOptions || [],
+	}
+
+	return _default;
+}
+
+export const formConfig = {
+	namespace: 'testimonials',
+	view: 'testimonials',
+	scope: 'create',
+	formType: 'testimonial',
+}
+
+export const viewConfig = {
+	title: "Testimonials",
+	createTitle: "New Testimonial",
+}

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

@@ -147,13 +147,17 @@ export const getColumns = ({ t, goTo, user, options, activeTab, getRedirectLink,
     key: "sources",
     show: activeTab !== "own",
     render: (val, all) => {
-      if (all.empty) {
-        return <div className="daf-default-cell" />;
+        if (all.empty) {
+            return <div className="daf-default-cell" />;
+        }
+
+      if (!val || val?.length === 0) {
+        return "-";
       }
 
       const sources = sourceAvatarConfig(val, user, applications);
 
-      return <AvatarGroup items={sources}></AvatarGroup>;
+      return <AvatarGroup items={sources} />;
     },
   },
   {

package/src/@daf/pages/Locations/ConflictAreas/columns.js

@@ -0,0 +1,140 @@
+import React from 'react';
+import { Tooltip } from 'antd';
+import { findOptions, getLinkValue } 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';
+import MoreMenu from '../../../core/components/Table/MoreMenu/index.jsx';
+import NavigationAction from '../../../core/components/Table/NavigationAction/index.jsx';
+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,
+        key: "datastakeId",
+        sorter: () => 0 + 0,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+    
+          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" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },  
+    {
+        dataIndex: 'region',
+        title: findOptions(user?.company?.country, options?.administrativeLevel1)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel1) : t("Province"),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const region = getLinkValue(all?.administrativeLevel1, all?.linking?.SCL);
+
+          return region ? <Tooltip title={region}>{region}</Tooltip> : '-';
+        },
+    },   
+    {
+        dataIndex: 'territory',
+        title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2) : t("Territory"),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const district = getLinkValue(all?.administrativeLevel2, all?.linking?.SCL);
+
+          return district ? <Tooltip title={district}>{district}</Tooltip> : '-';
+        },
+    },     
+    {
+      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,
+  }, 
+  {
+    title: t("Sources"),
+    dataIndex: "sources",
+    key: "sources",
+    show: activeTab !== "own",
+    render: (val, all) => {
+        if (all.empty) {
+            return <div className="daf-default-cell" />;
+        }
+
+      if (!val || val?.length === 0) {
+        return "-";
+      }
+
+      const sources = sourceAvatarConfig(val, user, applications);
+
+      return <AvatarGroup items={sources} />;
+    },
+  },
+    {
+        title: t("Status"),
+        dataIndex: 'status',
+        ellipsis: true,
+        show: activeTab == "own",
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+          const _val = all?.published || all?.status === "submitted" ? "submitted" : v;
+
+          return renderStatusTag({ value: _val, t });
+        },
+    },
+    {
+        id: 'actions',
+        title: "",
+        width: 60,
+        render: (_, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />;
+          }
+  
+          const onClick = () => {
+            let link = `/app/view/${subject}/${all.datastakeId}`;
+            if (activeTab === "shared") {
+              link += `?sourceId=${all?.authorId?.id}`;
+            }
+            goTo(getRedirectLink(link));
+          };
+  
+          return <NavigationAction onClick={onClick} theme={theme} />;
+        }
+      }
+].filter((column) => column.show !== false);

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

@@ -0,0 +1,41 @@
+import { getStatusOptions } from '../../../utils/filters';
+
+export const getFiltersConfig = ({t}) => {
+    return {
+		status: {
+		  type: "select",
+		  label: "Status",
+		  placeholder: () => `${t("Filter by")} ${t("Status").toLowerCase()}`,
+		  style: { flex: 1 },
+		  labelStyle: { fley: 1 },
+		  getLabel: (option) => option.label,
+		  getValue: (option) => option.value,
+		},
+        timeframe: {
+			type: "timeframe",
+			label: "Timeframe",
+			style: { flex: 1 },
+		},
+	}
+}
+
+export const getFilterOptions = (options, t) => {
+	const _default  = {
+		status: getStatusOptions(t) || [],
+        timeframe: [],
+	}
+
+	return _default;
+}
+
+export const formConfig = {
+	namespace: 'conflict-areas',
+	view: ['scoping', 'new'],
+	scope: 'conflictAreaCreate',
+	formType: 'conflict-area',
+}
+
+export const viewConfig = {
+	title: "Conflict Areas",
+	createTitle: "New Conflict Area",
+}

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

@@ -50,7 +50,11 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           return <div className="daf-default-cell" />
         }
 
-        const locationCategories = [...(data?.options?.locationCategories || []), ...(options?.productionSiteCategories || [])]
+        const locationCategories = [
+          ...(data?.options?.locationCategories || []), 
+          ...(options?.productionSiteCategories || []), 
+          ...(options?.locationCategories || [])
+        ]
 
         const category = findOptions(v, locationCategories);
   
@@ -145,20 +149,25 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           return renderStatusTag({ value: _val, t });
         },
     },
-    
-      {
-        title: t("Sources"),
-        dataIndex: 'sources',
-        ellipsis: true,
-        show: activeTab !== "own",
-        render: (v, all) => {
+    {
+      title: t("Sources"),
+      dataIndex: "sources",
+      key: "sources",
+      show: activeTab !== "own",
+      render: (val, all) => {
           if (all.empty) {
-            return <div className="daf-default-cell" />
+              return <div className="daf-default-cell" />;
           }
-          const sources = sourceAvatarConfig(v, user, applications);
-          return <AvatarGroup items={sources}></AvatarGroup>;
-        },
+
+        if (!val || val?.length === 0) {
+          return "-";
+        }
+
+        const sources = sourceAvatarConfig(val, user, applications);
+
+        return <AvatarGroup items={sources} />;
       },
+    },
       {
         id: 'actions',
         title: "",

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

@@ -1,6 +1,6 @@
 import { getStatusOptions } from '../../../utils/filters';
 
-export const getFiltersConfig = ({t}) => {
+export const getFiltersConfig = ({t, screen}) => {
     return {
 		country: {
 		  type: 'select',
@@ -91,6 +91,7 @@ export const getFiltersConfig = ({t}) => {
 		  labelStyle: { flex: 1 },
 		  getLabel: (option) => option.label,
 		  getValue: (option) => option.value,
+		  show: () => screen === 'scl',
 		},
 		positionInTheMineralSupplyChain: {
 		  type: 'select',