datastake-daf 0.6.766 → 0.6.767

package/src/@daf/core/components/Screens/TableScreen/TableWithTabsAndCreate/create.jsx

@@ -0,0 +1,106 @@
+import React, { useEffect} from 'react'
+import { message } from 'antd';
+import { MessageTypes } from '../../../helpers/messages.js';
+import DynamicForm from '../../core/components/DynamicForm/index.jsx';
+
+const Create = ({
+    namespace = 'stakeholders',
+    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 = () => {}, 
+    scope
+}) => {
+    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 });
+          } else {
+            form = formConfig;
+            data = formValue;
+          }
+        }
+    }, [edit, user?.language, scope]);
+
+    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: 'stakeholder'
+                    };
+
+                
+                    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 Create

package/src/@daf/core/components/Screens/TableScreen/TableWithTabsAndCreate/index.jsx

@@ -0,0 +1,115 @@
+import React, { useState, useEffect, useCallback } from 'react';
+import { useFetchData } from '../../../../../pages/hook.js';
+import TablePageWithTabs from '../TablePageWithTabs/index.jsx';
+
+const TableWithTabsAndCreate = ({
+    t = () => {},
+    goTo = () => {},
+    user = {},
+    options = {},
+    getRedirectLink = () => {},
+    theme = {},
+    loading = false,
+    data = {},
+    isMobile,
+    APP,
+    location,
+    formConfig = {
+        getFormData: () => {},
+        saveFormData: () => {},
+        formLoading: false,
+        query: {},
+        ajaxForms: {},
+        changeAjaxForms: () => {},
+        ajaxOptions: {},
+        changeAjaxOptions: () => {},
+        formData: {},
+        formValue: {},
+        form: {},
+        namespace: '',
+        view: '',
+        scope: '',
+    },
+    filtersConfig = {
+        getFiltersConfig: () => {},
+        getFilterOptions: () => {},
+        extendingFilters: {},
+        checkboxConfig: {},
+        selectOptions: {},
+        selectFiltersConfig: {},
+    },
+    getData = () => {},
+    getApiBaseUrl = () => {},
+    getAppHeader = () => {},
+    applications = [],
+    subjectClear,
+    subject,
+    columns,
+    viewConfig = {
+        title: '',
+        breadcrumbs: [],
+        createTitle: '',
+    },
+    onDownload,
+}) => {
+    const [selectOptions, setSelectOptions] = useState();
+    const [activeTab, setActiveTab] = useState("own");
+
+    useFetchData({
+        location,
+        getData,
+        activeTab,
+        extendingFilters: filtersConfig.extendingFilters,
+        subject,
+    })
+
+    useEffect(() => {
+        setSelectOptions((prev) => ({
+          ...prev,
+          ...filtersConfig.getFilterOptions(options, t),
+        }))
+      }, [options, t])
+
+    const handleActiveTabChange = useCallback((value) => {
+        setActiveTab(value);
+    }, []);
+
+    useEffect(
+		() => () => {
+			if(subjectClear && typeof subjectClear === 'function') {
+				subjectClear();
+			}
+		},
+		[],
+	);
+
+    return (
+        <TablePageWithTabs
+            t={t}
+            title={t(viewConfig.title || "")}
+            breadCrumbs={viewConfig.breadcrumbs}
+            location={location}
+            loading={loading}
+            goTo={goTo}
+            defaultActiveTab={"own"}
+            columns={columns}
+            data={data}
+            checkboxConfig={filtersConfig.checkboxConfig}
+            APP={APP}
+            getApiBaseUrl={getApiBaseUrl}
+            selectOptions={selectOptions}
+            selectFiltersConfig={filtersConfig.selectFiltersConfig}
+            getRedirectLink={getRedirectLink}
+            filtersConfig={filtersConfig}
+            isMobile={isMobile}
+            view={subject}
+            getActiveTab={handleActiveTabChange}
+            onDownload={onDownload && typeof onDownload === 'function' ? onDownload : undefined}
+            drawerTitle={t(viewConfig.createTitle || "")}
+        >
+
+        </TablePageWithTabs>
+    );
+};
+
+export default TableWithTabsAndCreate;

package/src/@daf/hooks/useMapHelper.js

@@ -9,6 +9,11 @@ export const defaultMapConfig = {
   preferCanvas: true,
   zoomControl: false,
   maxBounds: maxBounds,
+  zoomSnap: 0.5,
+  zoomDelta: 0.5, 
+  wheelPxPerZoomLevel: 150,
+  zoomAnimation: true, 
+  zoomAnimationThreshold: 10,
 };
 
 export const filterValidGPS = (data) => {

package/src/@daf/pages/Dashboards/SupplyChain/components/SupplyChainMap/index.js

@@ -4,6 +4,7 @@ import Widget from '../../../../../core/components/Dashboard/Widget/index.jsx';
 import Map from '../../../../../core/components/Dashboard/Map/index.jsx';
 import { getTagColor } from '../../../../../utils/productTag.js';
 import PropTypes from 'prop-types';
+import { findOptions } from '../../../../../../helpers/StringHelper.js';
 
 
 function SupplyChainMap({selectedSources = {}, t = () => {}, goTo = () => {}, options = {}, getRedirectLink = () => {} }) {
@@ -23,6 +24,8 @@ function SupplyChainMap({selectedSources = {}, t = () => {}, goTo = () => {}, op
 
     const { loading, data } = useWidgetFetch({config: defaultConfig});
 
+	console.log('data', data);
+
     return (
         <Widget
             title={t("Supply Chain Map")}
@@ -34,13 +37,13 @@ function SupplyChainMap({selectedSources = {}, t = () => {}, goTo = () => {}, op
 				data={Array.isArray(data) && data.length > 0 ? data : []}
 				renderTooltip={(data) => {
 					const productsText = data?.products?.[0];
-					const minerals = options?.minerals || [];
+					const minerals = options?.mineralOptions || [];
 					const participants = data?.stakeholders?.map((stakeholder) => stakeholder.name);
 					return [
 						{
 							label: t("Products"),
 							value:
-								minerals.find((mineral) => mineral.value === productsText)?.label ||
+								findOptions(productsText, minerals) ||
 								productsText ||
 								"-",
 							...(productsText && { tag: getTagColor(productsText) }),

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

@@ -1,5 +1,4 @@
 export const getEventCategoryBySubject = (eventCategoryObject, subject, isSingular = false) => {
-    console.log({eventCategoryObject, subject})
     if (!eventCategoryObject || typeof eventCategoryObject !== 'object') {
       return null;
     }

package/src/@daf/pages/Locations/MineSite/columns.js

@@ -90,7 +90,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const operators = all?.operator?.map((operator) => operator?.clientLocation?.name);
+          const operators = all?.operator?.map((operator) => operator?.locationClient?.name)?.filter(Boolean);
           return (operators && operators.length > 0) ? <MoreOptions data={operators || []} toolTipPlacement={operators?.length < 2 ? "topLeft" : "top"} /> : '-';
         },
     },   

package/src/@daf/pages/Summary/Operator/components/TradeRelationships/index.js

@@ -15,6 +15,7 @@ const TradeRelationships = ({
 	APP,
 }) => {
     const [filters, setFilters] = useState({});
+	const [isFullyRendered, setIsFullyRendered] = useState(true);
 
     const onFilterChange = (filters) => {
 		setFilters((p) => ({ ...p, ...filters }));
@@ -54,7 +55,7 @@ const TradeRelationships = ({
         <Widget
             title={t("Trade Relationships")}
             className="flex flex-1 with-border-header no-p-body"
-            loading={loading}
+            loading={loading || isFullyRendered}
         >
             <div className="flex flex-1 flex-column justify-content-center">
 				<div style={{ height: 600 }} className="flex flex-column">
@@ -76,6 +77,9 @@ const TradeRelationships = ({
 						tooltipTitle="Trade"
 						filtersConfig={filterConfig}
 						onFilterChange={onFilterChange}
+						onRenderComplete={(data) => {
+							setIsFullyRendered(!data);
+						}}
 					/>
 				</div>
 			</div>

package/src/constants/locales/en/translation.js

@@ -1,4 +1,9 @@
 const en = {
+  "accounts": "Accounts",
+  "users": "Users",
+  "subjects": "Subjects",
+  "active-users": "Active Users",
+  "total-data-points": "Total Data Points",
   "Identified Customers": "Identified Customers",
   "Identified Suppliers": "Identified Suppliers",
   "Associated Mine Sites": "Associated Mine Sites",

package/src/constants/locales/fr/translation.js

@@ -1,4 +1,9 @@
 const fr = {
+	"accounts": "Comptes",
+	"users": "Utilisateurs",
+	"subjects": "Sujets",
+	"active-users": "Utilisateurs Actifs",
+	"total-data-points": "Total Points de Données",
 	"Identified Customers": "Clients identifiés",
 	"Identified Suppliers": "Fournisseurs identifiés",
 	"Associated Mine Sites": "Sites miniers associés",