datastake-daf 0.6.743 → 0.6.745

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

@@ -0,0 +1,222 @@
+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;                      
+
+  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);
+          console.log({categoryValue})
+          console.log({eventCategory})
+          console.log({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 → Events}/Activities/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 = "corrective-actions",

package/src/@daf/pages/{dashboards/DueDilligence → Events}/Activities/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 ActivitiesTable = ({
     t = () => {},
@@ -37,7 +37,7 @@ const ActivitiesTable = ({
     applications = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
-    const [activeTab, setActiveTab] = useState();
+    const [activeTab, setActiveTab] = useState("own");
 
     const columns = useMemo(() => getColumns({
         t, 
@@ -47,7 +47,7 @@ const ActivitiesTable = ({
         activeTab,
         getRedirectLink, 
         theme,
-        subject: 'activities',
+        subject: 'correctiveActions',
         data,
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
@@ -99,7 +99,7 @@ const ActivitiesTable = ({
            location={location}
            loading={loading}
            goTo={goTo}
-           defaultActiveTab={"all"}
+           defaultActiveTab={"own"}
            columns={columns}
            data={data}
            checkboxConfig={checkboxConfig}

package/src/@daf/pages/{dashboards/DueDilligence/Activities → Events/Incidents}/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]) {

package/src/@daf/pages/Events/Incidents/create.jsx

@@ -0,0 +1,104 @@
+import React, { useEffect} from 'react'
+import { message } from 'antd';
+import { MessageTypes } from '../../../../helpers/messages.js';
+import DynamicForm from '../../../core/components/DynamicForm/index.jsx';
+
+const StakeholdersCreate = ({
+    namespace = "incident",
+    view = "incident",
+    edit = false,
+    formData = {},
+    loading = false, 
+    onSubmitted = () => {}, 
+    onCancel = () => {}, 
+    getData = () => {}, 
+    saveData = () => {}, 
+    form: formConfig = {},
+    formValue = {},
+    defaultData = {}, 
+    user = {}, 
+    APP, 
+    query, 
+    goTo = () => {}, 
+    t = () => {}, 
+    ajaxForms = {}, 
+    changeAjaxForms = () => {}, 
+    ajaxOptions = {}, 
+    changeAjaxOptions = () => {}, 
+    getAppHeader = () => {},
+    getApiBaseUrl = () => {}, 
+}) => {
+    let {
+        form = {},
+        data = defaultData || {},
+      } = !edit ? (formData[`${APP}-${view}`] || {}) : {
+        form: formConfig,
+        data: formValue
+    };
+
+    useEffect(() => {
+        if (Object.keys(form).length === 0 && !formData[`${APP}-${view}`]) {
+          if (!edit) {
+            getData({ namespace, module: APP, view, scope: 'createIncident' });
+          } else {
+            form = formConfig;
+            data = formValue;
+          }
+        }
+    }, [edit, user?.language]);
+
+    return (
+        <div className="daf-create-form">
+            <DynamicForm 
+                form={form}
+                data={{...defaultData, ...data}}
+                showSaveAndNext={false}
+                module={APP}
+                onCancel={onCancel}
+                isCreate
+                t={t}
+                excludedKeys={["title"]}
+                user={user}
+                ajaxForms={ajaxForms}
+                ajaxOptions={ajaxOptions}
+                getAppHeader={getAppHeader}
+                getApiBaseUrl={getApiBaseUrl}
+                changeAjaxOptions={changeAjaxOptions}
+                app={APP}
+                query={query}
+                goTo={goTo}
+                changeAjaxForms={changeAjaxForms}
+                submit={(payload, setSelectedFormNext) => {
+                    const payloadData = { ...payload, module: APP, namespace };
+                
+                    const newPayload = {
+                        ...defaultData,
+                        ...payloadData,
+                        form: 'worker'
+                    };
+                
+                    const callback = (type, m, data) => {
+                        if (setSelectedFormNext) {
+                            setSelectedFormNext();
+                        }
+                        if (type === MessageTypes.SUCCESS) {
+                            if (onSubmitted) onSubmitted(type, m, data);
+                        } else {
+                            message.error(m);
+                        }
+                    };
+                    
+                    saveData(
+                        !data && !data.id ? newPayload : Object.assign(newPayload, { id: data.id }),
+                        callback,
+                    );
+                }}
+                isFormDisabled={() => {
+                    return !data || !data.typeOfEvent;
+                }}
+            />
+        </div>
+    )
+}
+
+export default StakeholdersCreate

package/src/@daf/pages/Events/Incidents/index.jsx

@@ -0,0 +1,157 @@
+import React, { useMemo, useState, useEffect, useCallback } from 'react'
+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 StakeholdersCreate from './create.jsx';
+import { displayMessage } from '../../../../helpers/messages.js';
+
+const IncidentsTable = ({
+    t = () => {},
+    goTo = () => {},
+    user = {},
+    options = {},
+    getRedirectLink = () => {},
+    theme = {},
+    loading = false,
+    data = {},
+    isMobile,
+    APP,
+    location,
+    getData = () => {},
+    getApiBaseUrl = () => {},
+    getAppHeader = () => {},
+    getFormData = () => {},
+    saveFormData = () => {},
+    formLoading = false,
+    query = {},
+    ajaxForms = {},
+    changeAjaxForms = () => {},
+    ajaxOptions = {},
+    changeAjaxOptions = () => {},
+    formData = {},
+    formValue = {},
+    form = {},
+    extendingFilters = {},
+    createDefaultValues = {},
+    applications = [],
+}) => {
+    const [selectOptions, setSelectOptions] = useState();
+    const [activeTab, setActiveTab] = useState("own");
+
+    const columns = useMemo(() => getColumns({
+        t, 
+        goTo, 
+        user,
+        options,
+        activeTab,
+        getRedirectLink, 
+        theme,
+        subject: 'incidents',
+        data,
+        applications,
+    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
+
+    const breadCrumbs = [];
+
+    const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({location});
+
+    const filters = useMemo(() => {
+        return {
+            ...otherParams,
+            ...extendingFilters
+        }
+    }, [otherParams, extendingFilters])
+
+    useEffect(() => {
+        getData({
+            pagination: paginationQuery,
+            ...(Object.keys(searchParams).length > 0 && { search: searchParams }),
+            ...otherParams,
+            tab: activeTab,
+            sortBy: {
+                [sortBy || "updatedAt"]: sortDir ? (sortDir === "ascend" ? 1 : -1) : -1,
+            },
+            ...extendingFilters
+        }, 'incidents')
+    }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
+
+    const selectFiltersConfig = useMemo(() => {
+        return getFiltersConfig({t});
+    }, [t]);
+
+    useEffect(() => {
+        setSelectOptions((prev) => ({
+          ...prev,
+          ...getFilterOptions(options, t),
+        }))
+      }, [options, t])
+
+    const handleActiveTabChange = useCallback((value) => {
+        setActiveTab(value);
+    }, []);
+
+    return (
+        <TablePageWithTabs 
+           t={t}
+           title={t("Incidents")}
+           breadCrumbs={breadCrumbs}
+           location={location}
+           loading={loading}
+           goTo={goTo}
+           defaultActiveTab={"own"}
+           columns={columns}
+           data={data}
+           checkboxConfig={checkboxConfig}
+           APP={APP}
+           getApiBaseUrl={getApiBaseUrl}
+           selectOptions={selectOptions}
+           selectFiltersConfig={selectFiltersConfig}
+           getRedirectLink={getRedirectLink}
+           filtersConfig={filtersConfig}
+           isMobile={isMobile}
+           view="incidents"
+           getActiveTab={handleActiveTabChange}
+           onDownload={() => {
+            console.log("download");
+           }}
+           drawerTitle={t("Create Incidents")}
+        >
+            {({onDrawerClose}) => (
+                <StakeholdersCreate 
+                    defaultData={createDefaultValues}
+                    t={t}
+                    goTo={goTo}
+                    user={user}
+                    APP={APP}
+                    getApiBaseUrl={getApiBaseUrl}
+                    getAppHeader={getAppHeader}
+                    getData={getFormData}
+                    saveData={saveFormData}
+                    loading={formLoading}
+                    onSubmitted={(type, m, data) => {
+                        if (data.datastakeId) {
+                            displayMessage(
+                                type,
+                                t("affirmations::subject-created-successfully") || m,
+                            );
+                            // goTo(`/app/edit/stakeholders/${data.datastakeId}`);
+                            goTo(`/app/edit/incidents/${data.datastakeId}`)
+                        }
+                    }}
+                    onCancel={onDrawerClose}
+                    query={query}
+                    ajaxForms={ajaxForms}
+                    changeAjaxForms={changeAjaxForms}
+                    ajaxOptions={ajaxOptions}
+                    changeAjaxOptions={changeAjaxOptions}
+                    formData={formData}
+                    formValue={formValue}
+                    form={form}
+                />
+            )}
+        </TablePageWithTabs>
+    )
+}
+
+export default IncidentsTable