datastake-daf 0.6.771 → 0.6.772

package/dist/components/index.js

@@ -9725,19 +9725,18 @@ const resolveDynamicLabel = (labelConfig, item, defaultLabel) => {
   return labelConfig || defaultLabel;
 };
 
-const handleSectionChildren = _ref => {
-  let {
-    config,
-    allData,
-    level,
-    t,
-    rootForm,
-    user,
-    getApiBaseUrl = () => {},
-    getAppHeader = () => {},
-    app,
-    TreeNodeComponent
-  } = _ref;
+const handleSectionChildren = ({
+  config,
+  allData,
+  level,
+  t,
+  rootForm,
+  user,
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  app,
+  TreeNodeComponent
+}) => {
   if (!(level === 0 && config && typeof config === 'object')) {
     return null;
   }
@@ -9751,14 +9750,14 @@ const handleSectionChildren = _ref => {
     let fieldValue;
 
     // Determine field value based on type
-    if (fieldConfig.type === 'dataLinkGroup' && Array.isArray(allData === null || allData === void 0 ? void 0 : allData[fieldKey])) {
+    if (fieldConfig.type === 'dataLinkGroup' && Array.isArray(allData?.[fieldKey])) {
       fieldValue = allData[fieldKey];
-    } else if (fieldConfig.type === 'dataLinkGroup' && allData !== null && allData !== void 0 && allData[fieldKey]) {
+    } else if (fieldConfig.type === 'dataLinkGroup' && allData?.[fieldKey]) {
       fieldValue = allData[fieldKey];
     } else if (fieldConfig.type === 'group') {
       fieldValue = {};
     } else {
-      fieldValue = allData === null || allData === void 0 ? void 0 : allData[fieldKey];
+      fieldValue = allData?.[fieldKey];
     }
     return /*#__PURE__*/jsxRuntime.jsx(TreeNodeComponent, {
       nodeKey: fieldKey,
@@ -14719,7 +14718,8 @@ const useMap$1 = ({
       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));
-      filteredData.forEach((d, i) => {
+      const dataToRender = type === "chain" ? filteredData : data;
+      dataToRender.forEach((d, i) => {
         addIconToMapInitialy([d?.marker?.lat, d?.marker?.lng], "location", d.category || "mineSite", d, maxTotal, i);
       });
       polylinesRef.current.forEach(polyline => {

package/dist/pages/index.js

@@ -9901,7 +9901,8 @@ const useMap = ({
       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));
-      filteredData.forEach((d, i) => {
+      const dataToRender = type === "chain" ? filteredData : data;
+      dataToRender.forEach((d, i) => {
         addIconToMapInitialy([d?.marker?.lat, d?.marker?.lng], "location", d.category || "mineSite", d, maxTotal, i);
       });
       polylinesRef.current.forEach(polyline => {

package/dist/services/index.js

@@ -1495,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/package.json

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

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

@@ -205,7 +205,9 @@ export const useMap = ({
 				)
 			));
 			const maxTotal = Math.max(...(data || []).map((d) => d.total));
-			filteredData.forEach((d, i) => {
+			
+			const dataToRender = type === "chain" ? filteredData : data;
+			dataToRender.forEach((d, i) => {
 				addIconToMapInitialy(
 					[d?.marker?.lat, d?.marker?.lng],
 					"location",

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

@@ -45,11 +45,11 @@ class OperatorService extends BaseService {
 		});
 	}
 
-	getData(id, sourceId) {
+	getData(id, sourceId, source, version) {
 		return this.apiGet({
 			isApp: true,
 			url: `/stakeholder/${id}`,
-			params: { authorId: sourceId },
+			params: { authorId: sourceId, source, version },
 		});
 	}