datastake-daf 0.6.732 → 0.6.734

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

@@ -0,0 +1,150 @@
+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: 'name',
+        title: t('Name'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },     
+    {
+        dataIndex: 'category',
+        title: t('Category'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const category = findOptions(v, data?.options?.locationCategories);
+    
+          return category ? <Tooltip title={category}>{category}</Tooltip> : '-';
+        },
+    },     
+    {
+        dataIndex: 'country',
+        title: t('Country'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const country = findOptions(v, options?.countries);
+
+          return country ? <Tooltip title={country}>{country}</Tooltip> : '-';
+        },
+    },      
+    {
+        dataIndex: 'administrativeLevel1',
+        title: t('Region'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const region = getLinkValue(v, all?.linking?.SCL);
+
+          return region ? <Tooltip title={region}>{region}</Tooltip> : '-';
+        },
+    },    
+    {
+        dataIndex: 'administrativeLevel2',
+        title: t('District'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const district = getLinkValue(v, all?.linking?.SCL);
+
+          return district ? <Tooltip title={district}>{district}</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" />;
+            }
+
+            console.log({val, all})
+
+            return <AvatarGroup items={val}></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/Locations/config.js

@@ -0,0 +1,31 @@
+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;
+}

package/src/@daf/pages/dashboards/AllInformation/Locations/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 = 'locations',
+    view = 'scoping',
+    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: 'global' });
+          } else {
+            form = formConfig;
+            data = formValue;
+          }
+        }
+    }, [edit, user?.language]);
+
+    return (
+        <div className="daf-create-form">
+            <DynamicForm 
+                form={form}
+                data={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: 'location'
+                    };
+                
+                    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/dashboards/AllInformation/Locations/index.jsx

@@ -0,0 +1,143 @@
+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 LocationsTable = ({
+    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 = {},
+}) => {
+    const [selectOptions, setSelectOptions] = useState();
+    const [activeTab, setActiveTab] = useState();
+
+    const columns = useMemo(() => getColumns({
+        t, 
+        goTo, 
+        user,
+        options,
+        activeTab,
+        getRedirectLink, 
+        theme,
+        subject: 'locations',
+        data,
+    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data]);
+
+    const breadCrumbs = [];
+
+    const { paginationQuery, searchParams, otherParams } = useGetQueryParams({location});
+
+    useEffect(() => {
+        getData({
+            pagination: paginationQuery,
+            ...(Object.keys(otherParams).length > 0 && { filters: otherParams }),
+            ...(Object.keys(searchParams).length > 0 && { search: searchParams }),
+            tab: activeTab,
+        }, 'locations')
+    }, [paginationQuery, otherParams, searchParams, activeTab]);
+
+    console.log({data})
+
+    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("Locations")}
+           breadCrumbs={breadCrumbs}
+           location={location}
+           loading={loading}
+           goTo={goTo}
+           defaultActiveTab={"all"}
+           columns={columns}
+           data={data}
+           checkboxConfig={checkboxConfig}
+           APP={APP}
+           getApiBaseUrl={getApiBaseUrl}
+           selectOptions={selectOptions}
+           selectFiltersConfig={selectFiltersConfig}
+           getRedirectLink={getRedirectLink}
+           filtersConfig={filtersConfig}
+           isMobile={isMobile}
+           view="locations"
+           getActiveTab={handleActiveTabChange}
+           onDownload={() => {
+            console.log("download");
+           }}
+           drawerTitle={t("Create Location")}
+        >
+            {({onDrawerClose}) => (
+                <StakeholdersCreate 
+                    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/locations')
+                        }
+                    }}
+                    onCancel={onDrawerClose}
+                    query={query}
+                    ajaxForms={ajaxForms}
+                    changeAjaxForms={changeAjaxForms}
+                    ajaxOptions={ajaxOptions}
+                    changeAjaxOptions={changeAjaxOptions}
+                    formData={formData}
+                    formValue={formValue}
+                    form={form}
+                />
+            )}
+        </TablePageWithTabs>
+    )
+}
+
+export default LocationsTable

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

@@ -10,7 +10,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         dataIndex: 'datastakeId',
         title: t('ID'),
         ellipsis: true,
-          show: true,
+        show: true,
         render: (v, all) => {
           if (all.empty) {
             return <div className="daf-default-cell" />
@@ -78,9 +78,9 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         },
     },     
     {
-        title: t("Date"),
-        dataIndex: "date",
-        key: "date",
+        title: t("Last Update"),
+        dataIndex: "updatedAt",
+        key: "updatedAt",
         width: 125,
         render: (date, all) => {
             if (all.empty) {

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

@@ -74,7 +74,9 @@ const StakeholdersCreate = ({
                     const newPayload = {
                         ...defaultData,
                         ...payloadData,
+                        form: 'stakeholder'
                     };
+
                 
                     const callback = (type, m, data) => {
                         if (setSelectedFormNext) {

package/src/@daf/pages/dashboards/AllInformation/Stakeholders/index.jsx

@@ -43,7 +43,7 @@ const StakeholdersTable = ({
         activeTab,
         getRedirectLink, 
         theme,
-        subject: 'stakeholder'
+        subject: 'stakeholders'
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme]);
 
     const breadCrumbs = [];
@@ -108,9 +108,6 @@ const StakeholdersTable = ({
                     APP={APP}
                     getApiBaseUrl={getApiBaseUrl}
                     getAppHeader={getAppHeader}
-                    defaultData={{
-                        economicSector: 'miningMineralTrade'
-                    }}
                     getData={getFormData}
                     saveData={saveFormData}
                     loading={formLoading}
@@ -120,7 +117,7 @@ const StakeholdersTable = ({
                                 type,
                                 t("affirmations::subject-created-successfully") || m,
                             );
-                            goTo(`/app/edit/stakeholders/${data.datastakeId}`);
+                            goTo(`/app/stakeholders`);
                         }
                     }}
                     onCancel={onDrawerClose}

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

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

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

@@ -24,7 +24,7 @@ function TradeRelationships({goTo, t = () => {}, options = {}, hardcodedData = [
 
     const { data, loading } = useWidgetFetch({config: fetchConfig});
 
-    const mappedData = mapDataForChainOfCustody(Object.keys(data)?.length > 0 ? data : hardcodedData, options?.category ?? [], goTo);
+    const mappedData = mapDataForChainOfCustody(Object.keys(data)?.length > 0 ? data : hardcodedData, options, goTo);
 
     return (
         <Widget

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

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

package/src/@daf/pages/dashboards/helper.js

@@ -45,14 +45,15 @@ const mapIcon = (category) => {
 const leftBackground = theme.colorPrimary3;
 const rightBackground = theme.colorPrimary6;
 
-export const mapDataForChainOfCustody = (data = {}, options = [], goTo = () => {}) => {
+export const mapDataForChainOfCustody = (data = {}, options = {}, goTo = () => {}) => {
 	const mapChildren = (items, type, parentId, isDirect = true) => {
-		return (items ?? []).map((item) => ({
+		return (items ?? []).map((item) => {
+			return {
 			id: item.id,
 			number: 0,
 			name: item.name,
 			sources: parentId ? [parentId] : [],
-			subTitle: findOptions(item.category, options),
+			subTitle: findOptions(item?.category, options?.categoriesOptions),
 			leftIcon: type === "client" ? rightIcon : leftIcon,
 			leftBackground: type === "client" ? rightBackground : leftBackground,
 			topIcon: mapIcon(item.category),
@@ -62,14 +63,14 @@ export const mapDataForChainOfCustody = (data = {}, options = [], goTo = () => {
 					goTo(`/app/partners?datastakeId=${item.id}`);
 				}
 			},
-		}));
+		}});
 	};
 
 	return {
 		id: data.id,
 		number: 0,
 		name: data.name,
-		subTitle: findOptions(data.category, options),
+		subTitle: findOptions(data?.category, options?.categoriesOptions),
 		leftIcon: middleIcon,
 		leftBackground: theme.colorPrimary10,
 		topIcon: mapIcon(data.category),

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

@@ -42,7 +42,7 @@ class LinkedSubjectsService extends BaseService {
 		const _namespace = getNamespace(namespace);
 
 		return this.apiGet({
-			url: `/${_namespace}/associated-information`,
+			url: `/${_namespace}`,
 			isApp: true,
 			params: query,
 			signal,

package/src/pages.js

@@ -4,4 +4,5 @@ export { default as UserDashboard } from './@daf/pages/dashboards/UserDashboard/
 export { default as StakeholdersTable } from './@daf/pages/dashboards/AllInformation/Stakeholders/index.jsx';
 
 // Pages
-export { default as TablePageWithTabs } from './@daf/pages/pages/TablePageWithTabs/index.jsx';
+export { default as TablePageWithTabs } from './@daf/pages/pages/TablePageWithTabs/index.jsx';
+export { default as LocationsTable } from './@daf/pages/dashboards/AllInformation/Locations/index.jsx';