datastake-daf 0.6.745 → 0.6.747

package/src/helpers/StringHelper.js

@@ -190,4 +190,11 @@ export function formatToKebabCase(str) {
   return str
     .replace(/([a-z])([A-Z])/g, "$1-$2")
     .toLowerCase();
+}
+
+export const getLinkValue = (value, linkingObject) => {
+  if(linkingObject && linkingObject?.[value]) {
+    return linkingObject?.[value]?.name;
+  }
+  return null;
 }

package/src/pages.js

@@ -1,6 +1,6 @@
 // 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 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/Stakeholders/Operators/index.jsx';
 export { default as LocationsTable } from './@daf/pages/Locations/index.jsx';
 export { default as StakeholdersTable } from './@daf/pages/Stakeholders/index.jsx';
@@ -12,6 +12,8 @@ export { default as ActivitiesTable } from './@daf/pages/Events/Activities/index
 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';
 
+// Summary
+export { default as OperatorSummary } from './@daf/pages/Summary/Operator/index.jsx';
+export { default as RestorationActivitySummary } from './@daf/pages/Summary/Activities/Restoration/index.jsx';
+export { default as MineSummary } from './@daf/pages/Summary/Minesite/index.jsx';

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

@@ -1,176 +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';
-
-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}) => [
-    {
-        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>;
-        },
-    },    
-    {
-        title: t("Date"),
-        dataIndex: "date",
-        key: "date",
-        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,
-    },
- 
-    {
-        dataIndex: 'location',
-        title: t('Location'),
-        ellipsis: true,
-        show: true,
-        render: (v, all) => {
-          if (all.empty) {
-            return <div className="daf-default-cell" />
-          }
-
-          const location = getLinkValue(all?.location, all?.linking);
-
-          return location ? <Tooltip title={location}>{location}</Tooltip> : '-';
-        },
-    },     
-    {
-        title: t("Province"),
-        dataIndex: "province",
-        key: "province",
-        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: 'territory',
-        title: t('Territory'),
-        ellipsis: true,
-        show: true,
-        render: (v, all) => {
-          if (all.empty) {
-            return <div className="daf-default-cell" />
-          }
-
-          const territory = getLinkValue(all?.territory, all?.linking);
-
-          return territory ? <Tooltip title={territory}>{territory}</Tooltip> : '-';
-        },
-    },   
-    {
-        title: t("Category"),
-        dataIndex: 'category',
-        ellipsis: true,
-        show: activeTab !== "own",
-        render: (v, all) => {
-          if (all.empty) {
-            return <div className="daf-default-cell" />
-          }
-          const category = findOptions(v, data?.options?.categoryOptions);
-          return category ? <Tooltip title={category}>{category}</Tooltip> : '-';
-        },
-    },
-    {
-        title: t("Sources"),
-        dataIndex: 'sources',
-        ellipsis: true,
-        show: activeTab !== "own",
-        render: (v, all) => {
-          if (all.empty) {
-            return <div className="daf-default-cell" />
-          }
-          const sources = findOptions(v, data?.options?.sourcesOptions);
-          return sources ? <Tooltip title={sources}>{sources}</Tooltip> : '-';
-        },
-    },
-    {
-        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> : '-';
-        },
-    },
-
-    {
-        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,
-    },
-    {
-      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/Incidents2/config.js

@@ -1,170 +0,0 @@
-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,
-		},
-	}
-}
-
-export const filtersConfig = {
-	name: '',
-	datastakeId: '',
-};
-
-export const getFilterOptions = (options, t) => {
-	const {
-        timeframe = [],
-		statusOptions = [],
-		categoryOptions = [],
-		countries = [],
-		subCategory = [],
-		subCategoriesOptions,
-		stakeholderCategoryOptions,
-		stakeholderSubCategoriesOptions,
-		administrativeLevel1,
-		administrativeLevel2,
-	  } = options || {};
-
-	const _default  = {
-       timeframe: timeframe,
-		category: stakeholderCategoryOptions || categoryOptions,
-		country: countries,
-		administrativeLevel1,
-		administrativeLevel2,
-		subCategory: subCategoriesOptions,
-		status: [
-			{
-				value: "submitted",
-				label: "Submitted",
-			},
-			{
-				value: "private",
-				label: "Private",
-			},
-		],
-	}
-
-	return _default;
-}

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

@@ -1,104 +0,0 @@
-import React, { useEffect} from 'react'
-import { message } from 'antd';
-import { MessageTypes } from '../../../../helpers/messages.js';
-import DynamicForm from '../../../core/components/DynamicForm/index.jsx';
-
-const IncidentsCreate = ({
-    namespace = "event",
-    view = "event",
-    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: 'incident'
-                    };
-                
-                    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 IncidentsCreate

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

@@ -1,156 +0,0 @@
-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 IncidentsCreate 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 = {},
-}) => {
-    const [selectOptions, setSelectOptions] = useState();
-    const [activeTab, setActiveTab] = useState("own");
-
-    const columns = useMemo(() => getColumns({
-        t, 
-        goTo, 
-        user,
-        options,
-        activeTab,
-        getRedirectLink, 
-        theme,
-        subject: 'incidents',
-        data,
-    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data]);
-
-    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 Incident")}
-        >
-            {({onDrawerClose}) => (
-                <IncidentsCreate 
-                    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