datastake-daf 0.6.744 → 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/{dashboards/AllInformation/Events → Events}/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 EventsCreate = ({
     namespace = 'event',

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 = () => {},
@@ -37,7 +37,7 @@ const EventsTable = ({
     subjectClear = () => {},
 }) => {
     const [selectOptions, setSelectOptions] = useState();
-    const [activeTab, setActiveTab] = useState();
+    const [activeTab, setActiveTab] = useState("own");
 
     const columns = useMemo(() => getColumns({
         t, 
@@ -64,7 +64,6 @@ const EventsTable = ({
     }, [otherParams, extendingFilters])
 
     useEffect(() => {
-        console.log("fetching data")
         getData({
             pagination: paginationQuery,
             ...(Object.keys(filters).length > 0 && { filters: filters }),
@@ -74,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]);
@@ -109,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/Operations/ProductionSites → Locations/MineSite}/columns.js

@@ -1,9 +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 { 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]) {

package/src/@daf/pages/{dashboards/Operations/ProductionSites → Locations/MineSite}/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 ProductionSitesCreate = ({
     namespace = "PRODUCTION SITES",

package/src/@daf/pages/{dashboards/Operations/ProductionSites → Locations/MineSite}/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 ProductionSitesCreate from './create.jsx';
-import { displayMessage } from '../../../../../helpers/messages.js';
+import { displayMessage } from '../../../../helpers/messages.js';
 
 const ProductionSitesTable = ({
     t = () => {},
@@ -36,7 +36,7 @@ const ProductionSitesTable = ({
     createDefaultValues = {},
 }) => {
     const [selectOptions, setSelectOptions] = useState();
-    const [activeTab, setActiveTab] = useState();
+    const [activeTab, setActiveTab] = useState('own');
 
     const columns = useMemo(() => getColumns({
         t, 
@@ -97,7 +97,7 @@ const ProductionSitesTable = ({
            location={location}
            loading={loading}
            goTo={goTo}
-           defaultActiveTab={"all"}
+           defaultActiveTab={"own"}
            columns={columns}
            data={data}
            checkboxConfig={checkboxConfig}

package/src/@daf/pages/{dashboards/AllInformation/Locations → Locations}/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';
 
 const getLinkValue = (value, linkingObject) => {
   if(linkingObject && linkingObject?.[value]) {

package/src/@daf/pages/{dashboards/AllInformation/Locations → Locations}/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 = 'locations',

package/src/@daf/pages/{dashboards/AllInformation/Locations → Locations}/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 LocationsTable = ({
     t = () => {},
@@ -36,7 +36,7 @@ const LocationsTable = ({
     subjectClear = () => {},
 }) => {
     const [selectOptions, setSelectOptions] = useState();
-    const [activeTab, setActiveTab] = useState();
+    const [activeTab, setActiveTab] = useState("own");
 
     const columns = useMemo(() => getColumns({
         t, 
@@ -96,7 +96,7 @@ const LocationsTable = ({
            location={location}
            loading={loading}
            goTo={goTo}
-           defaultActiveTab={"all"}
+           defaultActiveTab={"own"}
            columns={columns}
            data={data}
            checkboxConfig={checkboxConfig}

package/src/@daf/pages/{dashboards/Operations → Stakeholders}/Operators/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';
 
 const getLinkValue = (value, linkingObject) => {
   if(linkingObject && linkingObject?.[value]) {

package/src/@daf/pages/{dashboards/Operations → Stakeholders}/Operators/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 = "OPERATOR",

package/src/@daf/pages/{dashboards/Operations → Stakeholders}/Operators/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 OperatorsTable = ({
     t = () => {},
@@ -37,7 +37,7 @@ const OperatorsTable = ({
     applications = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
-    const [activeTab, setActiveTab] = useState();
+    const [activeTab, setActiveTab] = useState('own');
 
     const columns = useMemo(() => getColumns({
         t, 
@@ -99,7 +99,7 @@ const OperatorsTable = ({
            location={location}
            loading={loading}
            goTo={goTo}
-           defaultActiveTab={"all"}
+           defaultActiveTab={"own"}
            columns={columns}
            data={data}
            checkboxConfig={checkboxConfig}

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

@@ -1,10 +1,10 @@
 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';
+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]) {
@@ -137,7 +137,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
 
             const sources = sourceAvatarConfig(val, user, applications);
 
-            return <AvatarGroup items={val}></AvatarGroup>;
+          return <AvatarGroup items={sources}></AvatarGroup>;
         },
     },    
     {

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/Documents → 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',

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 = () => {},
@@ -36,7 +36,7 @@ const StakeholdersTable = ({
     subjectClear = () => {},
 }) => {
     const [selectOptions, setSelectOptions] = useState();
-    const [activeTab, setActiveTab] = useState();
+    const [activeTab, setActiveTab] = useState("own");
     const columns = useMemo(() => getColumns({
         t, 
         goTo, 
@@ -92,7 +92,7 @@ const StakeholdersTable = ({
            location={location}
            loading={loading}
            goTo={goTo}
-           defaultActiveTab={"all"}
+           defaultActiveTab={"own"}
            columns={columns}
            data={data}
            checkboxConfig={checkboxConfig}

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",