datastake-daf 0.6.770 → 0.6.772

package/dist/services/index.js

@@ -1381,14 +1381,18 @@ class LinkedSubjectsService extends BaseService {
     id,
     signal,
     namespace,
-    sourceId
+    sourceId,
+    source,
+    version
   }) {
     return this.apiGet({
       url: `/${namespace === "nashirikiEvent" ? "event" : namespace}/${id}`,
       isApp: true,
       signal,
       params: {
-        authorId: sourceId
+        authorId: sourceId,
+        source,
+        version
       }
     });
   }
@@ -1491,12 +1495,14 @@ class OperatorService extends BaseService {
       }
     });
   }
-  getData(id, sourceId) {
+  getData(id, sourceId, source, version) {
     return this.apiGet({
       isApp: true,
       url: `/stakeholder/${id}`,
       params: {
-        authorId: sourceId
+        authorId: sourceId,
+        source,
+        version
       }
     });
   }

package/dist/utils/index.js

@@ -4971,7 +4971,8 @@ const renderTooltipJsx = ({
   className,
   link,
   onClickLink,
-  total
+  total,
+  isNewTab = false
 }) => {
   return /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
     children: /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -5012,7 +5013,7 @@ const renderTooltipJsx = ({
               })]
             }) : null
           })]
-        }), link ? typeof onClickLink === "function" || typeof link !== "string" ? /*#__PURE__*/jsxRuntime.jsx("div", {
+        }), link ? /*#__PURE__*/jsxRuntime.jsx("div", {
           className: "flex flex-column",
           children: /*#__PURE__*/jsxRuntime.jsx("div", {
             className: "link-cont",
@@ -5020,20 +5021,7 @@ const renderTooltipJsx = ({
             children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
               width: 10,
               height: 10,
-              name: "Link"
-            })
-          })
-        }) : /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "flex flex-column",
-          children: /*#__PURE__*/jsxRuntime.jsx("a", {
-            href: link,
-            className: "link-cont",
-            target: "_blank",
-            rel: "noopener noreferrer",
-            children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
-              width: 10,
-              height: 10,
-              name: "LinkNewTab"
+              name: isNewTab ? "LinkNewTab" : "Link"
             })
           })
         }) : null]

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.770",
+	"version": "0.6.772",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/Dashboard/Map/ChainIcon/index.js

@@ -245,6 +245,7 @@ export default function LocationIcon({
 				items: renderTooltip(data),
 				link,
 				onClickLink: () => onClickLink(data),
+				isNewTab: true,
 			})}
 			// open={
 			// 	(!openPopupIdRef.current || openPopupIdRef.current === data.datastakeId) &&

package/src/@daf/core/components/Dashboard/Map/hook.js

@@ -193,8 +193,21 @@ export const useMap = ({
 		}
 		clearMapMarkers();
 		if (data) {
+			// Filters out locations that are not connected to any stakeholders
+			const excludedType = ['village', 'town', 'area', 'territory']
+			const filteredData = data?.filter((obj) => 
+				!excludedType.includes(obj?.type) && (obj?.stakeholders?.length > 0 || 
+				data.some((other) => 
+				  other.datastakeId !== obj.datastakeId &&
+				  (other.stakeholders || []).some((stk) =>
+					(stk.links || []).includes(obj.datastakeId)
+				  )
+				)
+			));
 			const maxTotal = Math.max(...(data || []).map((d) => d.total));
-			data.forEach((d, i) => {
+			
+			const dataToRender = type === "chain" ? filteredData : data;
+			dataToRender.forEach((d, i) => {
 				addIconToMapInitialy(
 					[d?.marker?.lat, d?.marker?.lng],
 					"location",

package/src/@daf/core/components/Graphs/TradeRelationship/index.jsx

@@ -49,6 +49,10 @@ function TradeRelationship({
       }, 200);
       
       return () => clearTimeout(timeoutId);
+    } 
+    if(nodes.length === 0 || edges.length === 0) {
+      setIsFullyRendered(true);
+      onRenderComplete(true);
     }
   }, [nodes.length, edges.length, associatedNodes]);
   

package/src/@daf/core/components/Screens/Admin/AdminDashboard/index.jsx

@@ -19,8 +19,6 @@ export default function AdminDashboard({
     ? data.keyIndicatorsData
     : [];
 
-  console.log("AdminDashboard:data", data);
-
   return (
     <div className="daf-analysis admin-dashboard">
       <Header title={t(`${adminTranslationIdentifier}::dashboard`)} />

package/src/@daf/core/components/Screens/Settings/Edit/index.js

@@ -23,6 +23,7 @@ export default function SettingsEdit({
   renderMenu,
   children,
   t,
+  changeNotificationState,
 }) {
   return (
     <Style>
@@ -34,6 +35,7 @@ export default function SettingsEdit({
         onCancel,
         goToView,
         t,
+        changeNotificationState,
       }) : null}
       <div className="view-content">
         {renderMenu ? renderMenu({

package/src/@daf/core/components/Screens/Settings/components/Header/index.js

@@ -11,8 +11,8 @@ export default function SettingsHeader({
   goToEdit = () => {},
   goToView = () => {},
   t = (key) => key,
+  changeNotificationState
 }) {
-  const { changeNotificationState } = useForms();
 
   const breadCrumbs = useMemo(
     () => [

package/src/@daf/core/components/ViewForm/components/Records/config.js

@@ -0,0 +1,22 @@
+export const getSourcesType = (subject) => {
+    const typeMapping = {
+      locations: "location",
+      location: "location",
+      "production-sites": "location",
+      
+      stakeholders: "stakeholder",
+      stakeholder: "stakeholder",
+      workers: "stakeholder",
+      operators: "stakeholder",
+      
+      documents: "document",
+      document: "document",
+      
+      events: "event",
+      event: "event",
+      activities: "event",
+      incidents: "event",
+    };
+  
+    return typeMapping[subject] ?? null;
+  };

package/src/@daf/core/components/ViewForm/components/Records/index.jsx

@@ -0,0 +1,155 @@
+import React, { useState, useEffect, useMemo } from 'react';
+import { Form, Select, Button } from 'antd';
+import Modal from "../../../Modal/index.jsx";
+import SourceService from "../../../../../services/SourceService.js";
+import VersionService from "../../../../../services/VersionService.js";
+import { getSourcesType } from './config.js';
+
+const Records = ({ 
+    onSubmit,
+    modalTitle = "Records",
+    t = () => {},
+    onClose = () => {},
+    open = false,
+    subject = "",
+    id = "",
+}) => {
+    const [form] = Form.useForm();
+    const [sources, setSources] = useState([]);
+    const [versions, setVersions] = useState([]);
+    const [selectedSource, setSelectedSource] = useState(null);
+
+    const handleCancel = () => {
+        onClose();
+        form.resetFields();
+    };
+    const type = useMemo(() => getSourcesType(subject), [subject]);
+
+    const getSources = async () => {
+        try {    
+            const { data } = await SourceService.getSources({ type, id });
+            setSources(data);
+        } catch (error) {
+            console.error('Error fetching sources:', error);
+        }
+    }
+
+    const getVersions = async () => {
+        try {
+            const { data } = await VersionService.getSources({ type, id, params: {
+                source: selectedSource,
+            } });
+            console.log({data})
+            setVersions(data);
+        } catch (error) {
+            console.error('Error fetching versions:', error);
+        }
+    }
+
+    const sourceOptions = useMemo(() => {
+        return sources.map((source) => ({
+            label: source?.name,
+            value: source?.id,
+        }));
+    },[sources])
+
+    useEffect(() => {
+       if(type && id) {
+        getSources();
+       }
+    }, [type, id]);
+
+    useEffect(() => {
+        if(selectedSource) {
+            getVersions();
+        }
+    }, [selectedSource]);
+
+    const versionOptions = useMemo(() => {
+        if (!versions?.numberOfVersions) return [];
+        
+        return Array.from({ length: versions.numberOfVersions }, (_, index) => ({
+            label: `Version ${index + 1}`,
+            value: index + 1,
+        }));
+    }, [versions]);
+
+    const handleOk = async () => {
+        try {
+            const values = await form.validateFields();
+            if (onSubmit) {
+                onSubmit(values);
+            }
+            onClose();
+            form.resetFields();
+        } catch (error) {
+            console.error('Validation failed:', error);
+        }
+    };
+
+    return (
+        <Modal
+            open={open}
+            t={t}
+            title={t(modalTitle)}
+            onSuccess={handleOk}
+            onClose={handleCancel}
+            withModalFormWrapper={false}
+        >
+            <Form
+                form={form}
+                layout="vertical"
+                name="recordsForm"
+            >
+                <Form.Item
+                    name="source"
+                    label={t("Source")}
+                    rules={[{ required: true, message: t('Please select an option') }]}
+                >
+                    <Select
+                            placeholder={t("Select")}
+                            showSearch
+                            optionFilterProp="children"
+                            onChange={(value) => {
+                                console.log('Selected source ID:', value);                        
+                                setSelectedSource(value);
+                            }}
+                        >
+                        {sourceOptions.map((option) => (
+                            <Select.Option 
+                                key={option.value} 
+                                value={option.value}
+                            >
+                                {option.label}
+                            </Select.Option>
+                        ))}
+                    </Select>
+                </Form.Item>
+
+                <Form.Item
+                    name="version"
+                    label={t("Version")}
+                    rules={[{ required: true, message: t('Please select an option') }]}
+                >
+                    <Select
+                        placeholder={t("Select")}
+                        showSearch
+                        optionFilterProp="children"
+                    >
+                        {versionOptions.map((option) => (
+                            <Select.Option 
+                                key={option.value} 
+                                value={option.value}
+                            >
+                                {option.label}
+                            </Select.Option>
+                        ))}
+                    </Select>
+                </Form.Item>
+            </Form>
+            <div style={{ height: 60 }}/>
+        </Modal>
+    );
+};
+
+export default Records;

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

@@ -56,11 +56,11 @@ function SupplyChainMap({selectedSources = {}, t = () => {}, goTo = () => {}, op
 				onClickLink={(data) => {
 					const locationTypes = ['village', 'town', 'area', 'territory'];
 					if(data?.type === 'mineSite') {
-						goTo(getRedirectLink(`/app/mine-summary/${data.datastakeId}`));
+						window.open(getRedirectLink(`/app/mine-summary/${data.datastakeId}`), '_blank');
 					} else if (locationTypes.includes(data.type)) {
-						goTo(getRedirectLink(`/app/view/locations/${data.datastakeId}`));
+						window.open(getRedirectLink(`/app/view/locations/${data.datastakeId}`), '_blank');
 					} else {
-						goTo(getRedirectLink(`/app/view/stakeholders/${data.datastakeId}`));
+						window.open(getRedirectLink(`/app/view/stakeholders/${data.datastakeId}`), '_blank');
 					}
 				}}
 			/>

package/src/@daf/pages/Documents/config.js

@@ -15,4 +15,16 @@ export const getFilterOptions = (options, t) => {
 	}
 
 	return _default;
+}
+
+export const formConfig = {
+	namespace: 'document',
+	view: 'scoping',
+	scope: 'create',
+	formType: 'document',
+}
+
+export const viewConfig = {
+	title: "Documents",
+	createTitle: "Create Document",
 }

package/src/@daf/pages/Documents/index.jsx

@@ -1,5 +1,4 @@
 import React from 'react'
-import { getColumns } from './columns.js';
 import TablePage from '../TablePage/index.jsx';
 
 const DocumentsTable = ({
@@ -54,13 +53,8 @@ const DocumentsTable = ({
             getApiBaseUrl={getApiBaseUrl}
             getAppHeader={getAppHeader}
             subjectClear={subjectClear}
-            getColumns={getColumns}
-            
-            viewConfig={{
-                title: "Documents",
-                breadcrumbs: breadcrumbs,
-                createTitle: "Create Document",
-            }}
+            extendingFilters={extendingFilters}
+            breadcrumbs={breadcrumbs}
                         
             formConfig={{
                 getFormData,
@@ -74,12 +68,8 @@ const DocumentsTable = ({
                 formData,
                 formValue,
                 form,
-                namespace: 'document',
-                view: 'scoping',
-                scope: 'create',
-                formType: 'document',
-                defaultValues: createDefaultValues,
             }}
+            defaultValues={createDefaultValues}
             
             onDownload={() => console.log("download")}
         />

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

@@ -163,4 +163,16 @@ export const getFilterOptions = (options, t) => {
 	}
 
 	return _default;
+}
+
+export const formConfig = {
+	namespace: 'corrective-actions',
+	view: 'corrective-actions',
+	scope: 'createActivity',
+	formType: 'activity',
+}
+
+export const viewConfig = {
+	title: "Activities",
+	createTitle: "Create Activity",
 }

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

@@ -1,5 +1,4 @@
 import React from 'react'
-import { getColumns } from './columns.js';
 import TablePage from '../../TablePage/index.jsx';
 
 const ActivitiesTable = ({
@@ -47,17 +46,11 @@ const ActivitiesTable = ({
             APP={APP}
             location={location}
             applications={applications}
-
             subject="activities"
             getData={getData}
             getApiBaseUrl={getApiBaseUrl}
             getAppHeader={getAppHeader}
-            getColumns={getColumns}
-            viewConfig={{
-                title: "Activities",
-                breadcrumbs: breadcrumbs,
-                createTitle: "Create Activity",
-            }}
+            breadcrumbs={breadcrumbs}
             extendingFilters={extendingFilters}
             formConfig={{
                 getFormData,
@@ -71,12 +64,8 @@ const ActivitiesTable = ({
                 formData,
                 formValue,
                 form,
-                namespace: "corrective-actions",
-                view: 'corrective-actions',
-                scope: 'createActivity',
-                formType: 'activity',
-                defaultValues: createDefaultValues,
             }}
+            defaultValues={createDefaultValues}
             onDownload={() => console.log("download")}
         />
     )

package/src/@daf/pages/Events/Incidents/config.js

@@ -163,4 +163,16 @@ export const getFilterOptions = (options, t) => {
 	}
 
 	return _default;
+}
+
+export const formConfig = {
+	namespace: 'incident',
+	view: 'incident',
+	scope: 'createIncident',
+	formType: 'incident',
+}
+
+export const viewConfig = {
+	title: "Incidents",
+	createTitle: "Create Incident",
 }

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

@@ -1,5 +1,4 @@
 import React from 'react'
-import { getColumns } from './columns.js';
 import TablePage from '../../TablePage/index.jsx';
 
 const IncidentsTable = ({
@@ -52,12 +51,7 @@ const IncidentsTable = ({
             getData={getData}
             getApiBaseUrl={getApiBaseUrl}
             getAppHeader={getAppHeader}
-            getColumns={getColumns}
-            viewConfig={{
-                title: "Incidents",
-                breadcrumbs: breadcrumbs,
-                createTitle: "Create Incident",
-            }}
+            breadcrumbs={breadcrumbs}
             extendingFilters={extendingFilters}
             formConfig={{
                 getFormData,
@@ -71,12 +65,8 @@ const IncidentsTable = ({
                 formData,
                 formValue,
                 form,
-                namespace: "incident",
-                view: 'incident',
-                scope: 'createIncident',
-                formType: 'incident',
-                defaultValues: createDefaultValues,
             }}
+            defaultValues={createDefaultValues}
             onDownload={() => console.log("download")}
         />
     )

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

@@ -155,4 +155,16 @@ export const getFilterOptions = (options, t) => {
 		
 	}
 
+}
+
+export const formConfig = {
+	namespace: 'event',
+	view: 'scoping',
+	scope: 'create',
+	formType: 'event',
+}
+
+export const viewConfig = {
+	title: "Events",
+	createTitle: "Create Event",
 }

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

@@ -1,5 +1,4 @@
 import React from 'react'
-import { getColumns } from './columns.js';
 import TablePage from '../TablePage/index.jsx';
 
 const EventsTable = ({
@@ -54,12 +53,7 @@ const EventsTable = ({
             getApiBaseUrl={getApiBaseUrl}
             getAppHeader={getAppHeader}
             subjectClear={subjectClear}
-            getColumns={getColumns}
-            viewConfig={{
-                title: "Events",
-                breadcrumbs: breadcrumbs,
-                createTitle: "Create Event",
-            }}
+            breadcrumbs={breadcrumbs}
             extendingFilters={extendingFilters}
             formConfig={{
                 getFormData,
@@ -73,12 +67,8 @@ const EventsTable = ({
                 formData,
                 formValue,
                 form,
-                namespace: "event",
-                view: 'scoping',
-                scope: 'create',
-                formType: 'event',
-                defaultValues: createDefaultValues,
             }}
+            defaultValues={createDefaultValues}
             onDownload={() => console.log("download")}
         />
     )

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

@@ -151,4 +151,16 @@ export const getFilterOptions = (options, t) => {
 	}
 
 	return _default;
+}
+
+export const formConfig = {
+	namespace: 'PRODUCTION SITES',
+	view: ['scoping', 'new'],
+	scope: 'global',
+	formType: 'production-sites',
+}
+
+export const viewConfig = {
+	title: "Production Sites",
+	createTitle: "Create Production Site",
 }

package/src/@daf/pages/Locations/MineSite/index.jsx

@@ -1,5 +1,4 @@
 import React from 'react'
-import { getColumns } from './columns.js';
 import TablePage from '../../TablePage/index.jsx';
 
 const ProductionSitesTable = ({
@@ -52,12 +51,7 @@ const ProductionSitesTable = ({
             getData={getData}
             getApiBaseUrl={getApiBaseUrl}
             getAppHeader={getAppHeader}
-            getColumns={getColumns}
-            viewConfig={{
-                title: "Production Sites",
-                breadcrumbs: breadcrumbs,
-                createTitle: "Create Production Site",
-            }}
+            breadcrumbs={breadcrumbs}
             extendingFilters={extendingFilters}
             formConfig={{
                 getFormData,
@@ -71,12 +65,8 @@ const ProductionSitesTable = ({
                 formData,
                 formValue,
                 form,
-                namespace: "PRODUCTION SITES",
-                view: ['scoping', 'new'],
-                scope: 'global',
-                formType: 'production-sites',
-                defaultValues: createDefaultValues,
             }}
+            defaultValues={createDefaultValues}
             onDownload={() => console.log("download")}
         />
     )

package/src/@daf/pages/Locations/config.js

@@ -26,4 +26,16 @@ export const getFilterOptions = (options, t) => {
 		country: countries,
 		category: locationCategories || category,
 	};
+}
+
+export const formConfig = {
+	namespace: 'locations',
+	view: 'scoping',
+	scope: 'create',
+	formType: 'location',
+}
+
+export const viewConfig = {
+	title: "Locations",
+	createTitle: "Create Location",
 }