datastake-daf 0.6.743 → 0.6.745

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

@@ -0,0 +1,226 @@
+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 CustomIcon from '../../core/components/';
+import AvatarGroup from '../../core/components/AvatarGroup/index.jsx';
+import sourceAvatarConfig from '../../../helpers/sourceAvatarConfig.js';
+import MoreTags from '../../core/components/Table/MoreTags/index.jsx';
+
+const getLinkValue = (value, linkingObject) => {
+  if (linkingObject && linkingObject?.[value]) {
+    return linkingObject?.[value]?.name;
+  }
+  return null;
+}
+
+export const renderEventStatusTag = ({ value, t = (s) => s }) => {
+  const width = 87;
+
+  switch (value) {
+    case "edited":
+      return (
+        <Tag color="orange" 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>;
+    },
+  },
+  {
+    dataIndex: 'typeOfEvent',
+    title: t('Type'),
+    ellipsis: true,
+    show: true,
+    render: (v, all) => {
+      if (all.empty) {
+        return <div className="daf-default-cell" />
+      }
+
+      const type = findOptions(v, data?.options?.eventsType);
+
+      return type ? <Tooltip title={type}>{type}</Tooltip> : '-';
+    },
+  },
+  {
+    dataIndex: 'keyStakeholder',
+    title: t('Key Stakeholder'),
+    ellipsis: true,
+    show: true,
+    render: (v, all) => {
+      if (all.empty) {
+        return <div className="daf-default-cell" />
+      }
+      const val = (all?.stakeholderKey || []).map((sk) => {
+        return sk?.name;
+      })
+
+      if (val?.length === 0) {
+        return "--";
+      }
+
+      return <MoreTags values={val} />;
+    },
+  },
+  {
+    title: t("Date"),
+    dataIndex: "date",
+    key: "date",
+    testimonials: true,
+    incident: true,
+    correctiveActions: true,
+    show: true,
+    sorter: () => 0 + 0,
+    searchType: "date",
+    width: 125,
+    render: (date, all) => {
+      if (all.empty) {
+        return null;
+      }
+
+      const title = date ? renderDateFormatted(date, "DD MMM YYYY") : "--";
+      return <Tooltip title={title}>{title}</Tooltip>;
+    },
+    ellipsis: true,
+  },
+  {
+    dataIndex: 'scope',
+    title: t('Scope'),
+    ellipsis: true,
+    show: true,
+    render: (value, all) => {
+      if (all.empty) {
+        return <div className="daf-default-cell" />;
+      }
+
+      if (!value) {
+        return "--";
+      }
+
+      // Form the moment the intend of the if block is to be executed only in event table
+      if (typeof value === "string") {
+        if (all.navigationEventType === "other") {
+          return "--";
+        }
+
+        const categoryOptions = (data?.options?.categoryOptions || []).map((c) => {
+          const searchTerm = `typeOfEvent is ${all.navigationEventType}`;
+
+          return {
+            value: c.value,
+            label: c.label[searchTerm],
+          };
+        });
+
+        const relaxantOptions = [
+          ...categoryOptions,
+          ...(data?.options?.eventsType || []),
+          ...(data?.options?.testimonialsType || []),
+        ];
+
+        const title = relaxantOptions.find((v) => v.value === value)?.label || "--";
+
+        return <Tooltip title={title}>{title}</Tooltip>;
+      }
+
+      const val = value.map((v, i) => ({ label: v.name, value: `${v.name}-${i}` }));
+      return val.length ? <MoreTags values={val} /> : "--";
+    },
+  },
+  {
+    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",
+    correctiveActions: activeTab === "own",
+    testimonials: activeTab === "own",
+    incident: activeTab === "own",
+    width: 120,
+    render: (value, all) => {
+      if (all.empty) {
+        return <div className="daf-default-cell" />;
+      }
+
+      if (activeTab !== "own") {
+        return all?.authorId?.name;
+      }
+
+      const _val = all?.published || all?.status === "submitted" ? "submitted" : value;
+      return renderEventStatusTag({ value: _val, t });
+    },
+    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/Events/config.js

@@ -0,0 +1,183 @@
+export const checkboxConfig = {
+	name: 'Name',
+	datastakeId: 'ID'
+}
+
+export const getFiltersConfig = ({t}) => {
+    return {
+
+        timeframe: {
+            type: "timeframe",
+            label: "Timeframe",
+            style: { flex: 1 },
+        },
+		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 },
+		},
+		subCategory: {
+		  type: 'select',
+		  label: 'Category',
+		  placeholder: (t) => `${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) => `${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,
+		},
+		category:{
+			type: 'select',
+			label: 'Category',
+			placeholder: (t) => `${t('Filter by')} ${t('Category').toLowerCase()}`,
+			style: { flex: 1 },
+			labelStyle: { flex: 1 },
+			getLabel: (option) => option.label,
+			getValue: (option) => option.value,
+		}
+	}
+}
+
+export const filtersConfig = {
+	name: '',
+	datastakeId: '',
+};
+
+export const getFilterOptions = (options, t) => {
+	const {
+        timeframe = [],
+		statusOptions = [],
+		categoryOptions = [],
+		countries = [],
+		subCategory = [],
+		subCategoriesOptions,
+		stakeholderCategoryOptions,
+		stakeholderSubCategoriesOptions,
+		administrativeLevel1,
+		administrativeLevel2,
+		category=[],
+	  } = options || {};
+	console.log({options})
+
+	const _default  = {
+       timeframe: timeframe,
+	   country: countries,
+
+		category: stakeholderCategoryOptions || categoryOptions,
+		administrativeLevel1,
+		administrativeLevel2,
+		// subCategory: subCategoriesOptions,
+		category: category,
+		status: [
+			{
+				value: "submitted",
+				label: "Submitted",
+			},
+			{
+				value: "private",
+				label: "Private",
+			},
+		],
+	}
+
+	return _default;
+}

package/src/@daf/pages/{dashboards/AllInformation/Events → Events}/create.jsx

@@ -1,10 +1,10 @@
 import React, { useEffect} from 'react'
 import { message } from 'antd';
-import { MessageTypes } from '../../../../../helpers/messages.js';
-import DynamicForm from '../../../../core/components/DynamicForm/index.jsx';
+import { MessageTypes } from '../../../helpers/messages.js';
+import DynamicForm from '../../core/components/DynamicForm/index.jsx';
 
 const EventsCreate = ({
-    namespace = 'events',
+    namespace = 'event',
     view = 'scoping',
     edit = false,
     formData = {},
@@ -39,7 +39,7 @@ const EventsCreate = ({
     useEffect(() => {
         if (Object.keys(form).length === 0 && !formData[`${APP}-${view}`]) {
           if (!edit) {
-            getData({ namespace, module: APP, view, scope: 'global' });
+            getData({ namespace, module: APP, view, scope: 'create' });
           } else {
             form = formConfig;
             data = formValue;

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

@@ -1,10 +1,10 @@
 import React, { useMemo, useState, useEffect, useCallback } from 'react'
-import TablePageWithTabs from '../../../pages/TablePageWithTabs/index.jsx'
+import TablePageWithTabs from '../pages/TablePageWithTabs/index.jsx'
 import { getColumns } from './columns.js';
 import { checkboxConfig, getFiltersConfig, filtersConfig, getFilterOptions } from './config.js';
-import { useGetQueryParams } from '../../../../hooks/useGetQueryParams.js';
+import { useGetQueryParams } from '../../hooks/useGetQueryParams.js';
 import EventsCreate from './create.jsx';
-import { displayMessage } from '../../../../../helpers/messages.js';
+import { displayMessage } from '../../../helpers/messages.js';
 
 const EventsTable = ({
     t = () => {},
@@ -34,9 +34,10 @@ const EventsTable = ({
     form = {},
     extendingFilters = {},
     applications = [],
+    subjectClear = () => {},
 }) => {
     const [selectOptions, setSelectOptions] = useState();
-    const [activeTab, setActiveTab] = useState();
+    const [activeTab, setActiveTab] = useState("own");
 
     const columns = useMemo(() => getColumns({
         t, 
@@ -63,7 +64,6 @@ const EventsTable = ({
     }, [otherParams, extendingFilters])
 
     useEffect(() => {
-        console.log("fetching data")
         getData({
             pagination: paginationQuery,
             ...(Object.keys(filters).length > 0 && { filters: filters }),
@@ -73,11 +73,8 @@ const EventsTable = ({
                 [sortBy || "updatedAt"]: sortDir ? (sortDir === "ascend" ? 1 : -1) : -1,
             }
         }, 'events')
-        console.log("data fetched")
     }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
 
-    console.log({data})
-
     const selectFiltersConfig = useMemo(() => {
         return getFiltersConfig({t});
     }, [t]);
@@ -93,6 +90,13 @@ const EventsTable = ({
         setActiveTab(value);
     }, []);
 
+    useEffect(
+		() => () => {
+			subjectClear();
+		},
+		[],
+	);
+
     return (
         <TablePageWithTabs 
            t={t}
@@ -101,7 +105,7 @@ const EventsTable = ({
            location={location}
            loading={loading}
            goTo={goTo}
-           defaultActiveTab={"all"}
+           defaultActiveTab={"own"}
            columns={columns}
            data={data}
            checkboxConfig={checkboxConfig}

package/src/@daf/pages/{dashboards/AllInformation/Events → Locations/MineSite}/columns.js

@@ -1,10 +1,9 @@
 import React from 'react';
 import { Tooltip } 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';
+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';
 
 const getLinkValue = (value, linkingObject) => {
   if(linkingObject && linkingObject?.[value]) {
@@ -13,7 +12,7 @@ const getLinkValue = (value, linkingObject) => {
   return null;
 }
 
-export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
+export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data}) => [
     {
         dataIndex: 'datastakeId',
         title: t('ID'),
@@ -39,10 +38,10 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     
           return <Tooltip title={v}>{v}</Tooltip>;
         },
-    },     
+    },    
     {
-        dataIndex: 'type',
-        title: t('Type'),
+        dataIndex: 'province',
+        title: t('Province'),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -50,14 +49,16 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const type = findOptions(v, data?.options?.locationCategories);
-    
-          return type ? <Tooltip title={type}>{type}</Tooltip> : '-';
+          const region = getLinkValue(all?.location?.administrativeLevel1, all?.location?.linking?.SCL);
+
+          return region ? <Tooltip title={region}>{region}</Tooltip> : '-';
         },
-    },     
+    },   
+        
+ 
     {
-        dataIndex: 'keyStakeholder',
-        title: t('Key Stakeholder'),
+        dataIndex: 'territory',
+        title: t('Territory'),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -65,14 +66,29 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const country = findOptions(v, options?.countries);
+          const district = getLinkValue(all?.location?.administrativeLevel2, all?.location?.linking?.SCL);
 
-          return country ? <Tooltip title={country}>{country}</Tooltip> : '-';
+          return district ? <Tooltip title={district}>{district}</Tooltip> : '-';
         },
-    },      
+    },     
     {
-        dataIndex: 'scope',
-        title: t('Scope'),
+        title: t("Products"),
+        dataIndex: "products",
+        key: "products",
+        show: activeTab !== "own",
+        render: (val, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+
+            console.log({val, all})
+
+            return <AvatarGroup items={val}></AvatarGroup>;
+        },
+    },
+    ,    {
+        dataIndex: 'operator',
+        title: t('Operator'),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -80,30 +96,15 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const scope = getLinkValue(v, all?.linking?.SCL);
+          const operator = getLinkValue(all?.operator, all?.linking?.SCL);
 
-          return scope ? <Tooltip title={scope}>{scope}</Tooltip> : '-';
+          return operator ? <Tooltip title={operator}>{operator}</Tooltip> : '-';
         },
-    },    
+    },   
     {
-      title: t("Start Date"),
-      dataIndex: "startDate",
-      key: "startDate",
-      width: 125,
-      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("End Date"),
-        dataIndex: "endDate",
-        key: "endDate",
+        title: t("Last Update"),
+        dataIndex: "updatedAt",
+        key: "updatedAt",
         width: 125,
         render: (date, all) => {
             if (all.empty) {
@@ -116,18 +117,16 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         ellipsis: true,
     },
     {
-        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',
+        ellipsis: true,
+        show: activeTab == "own",
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+          const status = findOptions(v, data?.options?.statusOptions);
+          return status ? <Tooltip title={status}>{status}</Tooltip> : '-';
         },
     },
     {