datastake-daf 0.6.743 → 0.6.745

package/src/@daf/pages/Stakeholders/Workers/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;
+}

package/src/@daf/pages/{dashboards/Operations → Stakeholders}/Workers/create.jsx

@@ -1,7 +1,7 @@
 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 StakeholdersCreate = ({
     namespace = "WORKERS",

package/src/@daf/pages/{dashboards/Operations → Stakeholders}/Workers/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 StakeholdersCreate from './create.jsx';
-import { displayMessage } from '../../../../../helpers/messages.js';
+import { displayMessage } from '../../../../helpers/messages.js';
 
 const WorkersTable = ({
     t = () => {},
@@ -37,7 +37,7 @@ const WorkersTable = ({
     applications = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
-    const [activeTab, setActiveTab] = useState();
+    const [activeTab, setActiveTab] = useState('own');
 
     const columns = useMemo(() => getColumns({
         t, 
@@ -99,7 +99,7 @@ const WorkersTable = ({
            location={location}
            loading={loading}
            goTo={goTo}
-           defaultActiveTab={"all"}
+           defaultActiveTab={"own"}
            columns={columns}
            data={data}
            checkboxConfig={checkboxConfig}

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

@@ -1,10 +1,10 @@
 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';
+import sourceAvatarConfig from '../../../helpers/sourceAvatarConfig.js';
 
 export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, applications}) => [
     {

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

@@ -1,7 +1,7 @@
 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 StakeholdersCreate = ({
     namespace = 'stakeholders',
@@ -39,7 +39,7 @@ const StakeholdersCreate = ({
     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/Stakeholders → Stakeholders}/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 StakeholdersCreate from './create.jsx';
-import { displayMessage } from '../../../../../helpers/messages.js';
+import { displayMessage } from '../../../helpers/messages.js';
 
 const StakeholdersTable = ({
     t = () => {},
@@ -33,9 +33,10 @@ const StakeholdersTable = ({
     formValue = {},
     form = {},
     applications = [],
+    subjectClear = () => {},
 }) => {
     const [selectOptions, setSelectOptions] = useState();
-    const [activeTab, setActiveTab] = useState();
+    const [activeTab, setActiveTab] = useState("own");
     const columns = useMemo(() => getColumns({
         t, 
         goTo, 
@@ -76,6 +77,13 @@ const StakeholdersTable = ({
         setActiveTab(value);
     }, []);
 
+    useEffect(
+		() => () => {
+			subjectClear();
+		},
+		[],
+	);
+
     return (
         <TablePageWithTabs 
            t={t}
@@ -84,7 +92,7 @@ const StakeholdersTable = ({
            location={location}
            loading={loading}
            goTo={goTo}
-           defaultActiveTab={"all"}
+           defaultActiveTab={"own"}
            columns={columns}
            data={data}
            checkboxConfig={checkboxConfig}
@@ -119,7 +127,7 @@ const StakeholdersTable = ({
                                 type,
                                 t("affirmations::subject-created-successfully") || m,
                             );
-                            goTo(`/app/stakeholders`);
+                            goTo(`/app/edit/stakeholders/${data.datastakeId}`);
                         }
                     }}
                     onCancel={onDrawerClose}

package/src/@daf/pages/dashboards/SupplyChain/components/ChartsContainer/components/Identification/index.js

@@ -25,8 +25,6 @@ function Identification({
 		[t],
 	);
 
-	console.log({identificationData: data})
-
     const chartConfig = useIdentification({ data, theme, options });
 
     return (

package/src/@daf/pages/dashboards/UserDashboard/components/KeyIndicators/config.js

@@ -48,7 +48,7 @@ export const getRowConfig = ({ t, data = {}, goTo, getRedirectLink, theme = {} }
 				<div className="flex-1">{t("Corrective Actions")}</div>
 				<div
 					className="cursor-pointer"
-					onClick={() => goTo(getRedirectLink("/app/corrective-actions"))}
+					onClick={() => goTo(getRedirectLink("/app/activities"))}
 				>
 					<CustomIcon
 						name="LinkNewTab"
@@ -77,7 +77,7 @@ export const getRowConfig = ({ t, data = {}, goTo, getRedirectLink, theme = {} }
 				<div className="flex-1">{t("Reported Incidents")}</div>
 				<div
 					className="cursor-pointer"
-					onClick={() => goTo(getRedirectLink("/app/incident"))}
+					onClick={() => goTo(getRedirectLink("/app/incidents"))}
 				>
 					<CustomIcon
 						name="LinkNewTab"

package/src/@daf/pages/dashboards/UserDashboard/components/MineSites/index.jsx

@@ -63,11 +63,7 @@ function MineSites({
 		}),
 		[activeTab, selectedPartners],
 	);
-
-	console.log({activeTab})
-	console.log({dataFetchConfig})
-
-    const { data, loading, setData } = useWidgetFetch({config: dataFetchConfig});
+  const { data, loading, setData } = useWidgetFetch({config: dataFetchConfig});
 
 	const tabs = useMemo(() => getTabs(t), [t]);
 

package/src/@daf/pages/dashboards/UserDashboard/config.js

@@ -7,12 +7,12 @@ export const getActionWidgetsConfig = ({ goTo, getRedirectLink, APP, t }) => [
     {
         icon: "FileEdit",
         title: "Report Activity",
-        onClick: () => goTo(getRedirectLink("/app/corrective-actions?create=true")),
+        onClick: () => goTo(getRedirectLink("/app/activities?create=true")),
     },
     {
         icon: "ReportIncidents",
         title: "Report Incident",
-        onClick: () => goTo(getRedirectLink("/app/incident?create=true")),
+        onClick: () => goTo(getRedirectLink("/app/incidents?create=true")),
     },
     {
         icon: "Search",

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

@@ -33,7 +33,7 @@ const TablePageWithTabs = ({
 }) => {
     const params = new URLSearchParams(location?.search);
     const [activeTab, setActiveTab] = useState(params.get("tab") || defaultActiveTab);
-    const [openCreateModal, setOpenCreateModal] = useState(false);
+    const [openCreateModal, setOpenCreateModal] = useState(params.has("create"));
 
     const getActiveTabRef = useRef(getActiveTab);
     useEffect(() => {
@@ -103,7 +103,7 @@ const TablePageWithTabs = ({
             />
             {openCreateModal && (
                 <Drawer
-                    destroyOnClose
+                    destroyOnHidden
                     title={
                         <DrawerHeader 
                             title={t(drawerTitle)}

package/src/@daf/services/AuthenticationService.js

@@ -219,7 +219,6 @@ class AuthenticationService extends BaseService {
 		language,
 		...params
 	}) {
-		console.log({language})
 		return this.apiPost({
 			url: '/query/form-options',
 			isDaf: true,

package/src/@daf/services/LinkedSubjects.js

@@ -4,7 +4,6 @@ import { filterCreateData } from "../../helpers/Forms.js";
 import { removeKeysFromObject } from "../utils/object.js";
 
 export const getNamespace = (namespace) => {
-    console.log({namespace})
 	let _namespace = namespace;
 	switch (namespace) {
 		case "locations":
@@ -27,12 +26,12 @@ export const getNamespace = (namespace) => {
 };
 
 class LinkedSubjectsService extends BaseService {
-    getForm({ namespace }, language = "en") {
+    getForm({ namespace }, language = "en", scope) {
 		return this.apiGet({
 			url: `forms/${namespace === "documents" ? namespace : getNamespace(namespace)}`,
 			isApp: true,
 			params: {
-				scope:"create",
+				scope: scope || "create",
 				language,
 			},
 		});
@@ -117,7 +116,7 @@ class LinkedSubjectsService extends BaseService {
 			url: `/forms/options`,
 			isApp: true,
 			params: {
-				id: "categoryOptions,locationCategories,countries,category,subCategory,optionPositionSupplyChain",
+				id: "categoryOptions,eventsType,locationCategories,countries,category,subCategory,optionPositionSupplyChain",
 			},
 		});
 	}

package/src/pages.js

@@ -1,13 +1,16 @@
 // Dashboards
 export { default as SupplyChainDashboard } from './@daf/pages/dashboards/SupplyChain/index.jsx';
 export { default as UserDashboard } from './@daf/pages/dashboards/UserDashboard/index.jsx';
-export { default as OperatorsTable } from './@daf/pages/dashboards/Operations/Operators/index.jsx';
-export { default as LocationsTable } from './@daf/pages/dashboards/AllInformation/Locations/index.jsx';
-export { default as StakeholdersTable } from './@daf/pages/dashboards/AllInformation/Stakeholders/index.jsx';
-export { default as EventsTable } from './@daf/pages/dashboards/AllInformation/Events/index.jsx';
-export { default as DocumentsTable } from './@daf/pages/dashboards/AllInformation/Documents/index.jsx';
-export { default as WorkersTable } from './@daf/pages/dashboards/Operations/Workers/index.jsx';
-export { default as ActivitiesTable } from './@daf/pages/dashboards/DueDilligence/Activities/index.jsx';
+export { default as OperatorsTable } from './@daf/pages/Stakeholders/Operators/index.jsx';
+export { default as LocationsTable } from './@daf/pages/Locations/index.jsx';
+export { default as StakeholdersTable } from './@daf/pages/Stakeholders/index.jsx';
+export { default as EventsTable } from './@daf/pages/Events/index.jsx';
+export { default as DocumentsTable } from './@daf/pages/Documents/index.jsx';
+export { default as WorkersTable } from './@daf/pages/Stakeholders/Workers/index.jsx';
+export { default as ActivitiesTable } from './@daf/pages/Events/Activities/index.jsx';
+
+export { default as IncidentsTable } from './@daf/pages/Events/Incidents/index.jsx';
+export { default as ProductionSitesTable } from './@daf/pages/Locations/MineSite/index.jsx';
 
 // Pages
 export { default as TablePageWithTabs } from './@daf/pages/pages/TablePageWithTabs/index.jsx';

package/build/manifest.json

@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}

package/build/robots.txt

@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow:

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

@@ -1,107 +0,0 @@
-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';
-
-const getLinkValue = (value, linkingObject) => {
-  if(linkingObject && linkingObject?.[value]) {
-    return linkingObject?.[value]?.name;
-  }
-  return null;
-}
-
-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: 'title',
-        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: 'type',
-        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?.locationCategories);
-    
-          return type ? <Tooltip title={type}>{type}</Tooltip> : '-';
-        },
-    },     
-    
-    {
-        title: t("Last Update"),
-        dataIndex: "updatedAt",
-        key: "updatedAt",
-        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("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>;
-        },
-    },
-    {
-      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/AllInformation/Stakeholders/config.js

@@ -1,31 +0,0 @@
-export const checkboxConfig = {
-	name: 'Name',
-	datastakeId: 'ID'
-}
-
-export const getFiltersConfig = ({t}) => {
-    return {
-        country: {
-			type: 'select',
-			placeholder: t('Country'),
-			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 { countries } = options || {};
-	const _default  = {
-		country: countries,
-	}
-
-	return _default;
-}