datastake-daf 0.6.733 → 0.6.734

package/dist/hooks/index.js

@@ -6925,7 +6925,7 @@ const useWidgetFetch = ({
   };
   React.useEffect(() => {
     fetchData();
-  }, []);
+  }, [config]);
   return {
     data,
     loading,

package/dist/pages/index.js

@@ -6788,7 +6788,7 @@ const useWidgetFetch = ({
   };
   React.useEffect(() => {
     fetchData();
-  }, []);
+  }, [config]);
   return {
     data,
     loading,
@@ -11990,30 +11990,32 @@ const mapIcon = category => {
 };
 const leftBackground = theme.colorPrimary3;
 const rightBackground = theme.colorPrimary6;
-const mapDataForChainOfCustody = (data = {}, options = [], goTo = () => {}) => {
+const mapDataForChainOfCustody = (data = {}, options = {}, goTo = () => {}) => {
   const mapChildren = (items, type, parentId, isDirect = true) => {
-    return (items ?? []).map(item => ({
-      id: item.id,
-      number: 0,
-      name: item.name,
-      sources: parentId ? [parentId] : [],
-      subTitle: findOptions(item.category, options),
-      leftIcon: type === "client" ? rightIcon : leftIcon,
-      leftBackground: type === "client" ? rightBackground : leftBackground,
-      topIcon: mapIcon(item.category),
-      children: mapChildren(item.sources ?? item.clients ?? [], type, item.id, false),
-      onClick: () => {
-        if (isDirect && parentId === data.id) {
-          goTo(`/app/partners?datastakeId=${item.id}`);
+    return (items ?? []).map(item => {
+      return {
+        id: item.id,
+        number: 0,
+        name: item.name,
+        sources: parentId ? [parentId] : [],
+        subTitle: findOptions(item?.category, options?.categoriesOptions),
+        leftIcon: type === "client" ? rightIcon : leftIcon,
+        leftBackground: type === "client" ? rightBackground : leftBackground,
+        topIcon: mapIcon(item.category),
+        children: mapChildren(item.sources ?? item.clients ?? [], type, item.id, false),
+        onClick: () => {
+          if (isDirect && parentId === data.id) {
+            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),
@@ -12044,7 +12046,7 @@ function TradeRelationships({
   } = 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 /*#__PURE__*/jsxRuntime.jsx(Widget, {
     loading: loading,
     title: t("Trade Relationships"),
@@ -12430,6 +12432,9 @@ function Identification({
     label: t("Monthly"),
     value: "monthly"
   }], [t]);
+  console.log({
+    identificationData: data
+  });
   const chartConfig = useIdentification({
     data,
     theme,
@@ -13713,6 +13718,12 @@ function MineSites({
     defaultData: [],
     stop: selectedPartners?.loading
   }), [activeTab, selectedPartners]);
+  console.log({
+    activeTab
+  });
+  console.log({
+    dataFetchConfig
+  });
   const {
     data,
     loading,
@@ -29924,7 +29935,8 @@ const StakeholdersCreate$1 = ({
         };
         const newPayload = {
           ...defaultData,
-          ...payloadData
+          ...payloadData,
+          form: 'stakeholder'
         };
         const callback = (type, m, data) => {
           if (setSelectedFormNext) {
@@ -29984,7 +29996,7 @@ const StakeholdersTable = ({
     activeTab,
     getRedirectLink,
     theme,
-    subject: 'stakeholder'
+    subject: 'stakeholders'
   }), [t, goTo, user, options, activeTab, getRedirectLink, theme]);
   const breadCrumbs = [];
   const {
@@ -30059,7 +30071,7 @@ const StakeholdersTable = ({
       onSubmitted: (type, m, data) => {
         if (data.datastakeId) {
           displayMessage(type, t("affirmations::subject-created-successfully") || m);
-          goTo(`/app/locations`);
+          goTo(`/app/stakeholders`);
         }
       },
       onCancel: onDrawerClose,
@@ -30075,6 +30087,12 @@ const StakeholdersTable = ({
   });
 };
 
+const getLinkValue = (value, linkingObject) => {
+  if (linkingObject && linkingObject?.[value]) {
+    return linkingObject?.[value]?.name;
+  }
+  return null;
+};
 const getColumns = ({
   t,
   goTo,
@@ -30084,8 +30102,7 @@ const getColumns = ({
   getRedirectLink,
   theme,
   subject,
-  data,
-  dataOptions
+  data
 }) => [{
   dataIndex: 'datastakeId',
   title: t('ID'),
@@ -30129,7 +30146,7 @@ const getColumns = ({
         className: "daf-default-cell"
       });
     }
-    const category = findOptions(v, dataOptions?.locationCategories);
+    const category = findOptions(v, data?.options?.locationCategories);
     return category ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: category,
       children: category
@@ -30163,8 +30180,11 @@ const getColumns = ({
         className: "daf-default-cell"
       });
     }
-    findOptions(v, options?.countries);
-    return '-';
+    const region = getLinkValue(v, all?.linking?.SCL);
+    return region ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: region,
+      children: region
+    }) : '-';
   }
 }, {
   dataIndex: 'administrativeLevel2',
@@ -30177,8 +30197,11 @@ const getColumns = ({
         className: "daf-default-cell"
       });
     }
-    findOptions(v, options?.countries);
-    return '-';
+    const district = getLinkValue(v, all?.linking?.SCL);
+    return district ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: district,
+      children: district
+    }) : '-';
   }
 }, {
   title: t("Last Update"),
@@ -30209,9 +30232,10 @@ const getColumns = ({
         className: "daf-default-cell"
       });
     }
-    if (!val || val?.length === 0) {
-      return "--";
-    }
+    console.log({
+      val,
+      all
+    });
     return /*#__PURE__*/jsxRuntime.jsx(AvatarGroup, {
       items: val
     });
@@ -30356,7 +30380,8 @@ const StakeholdersCreate = ({
         };
         const newPayload = {
           ...defaultData,
-          ...payloadData
+          ...payloadData,
+          form: 'location'
         };
         const callback = (type, m, data) => {
           if (setSelectedFormNext) {
@@ -30404,8 +30429,7 @@ const LocationsTable = ({
   changeAjaxOptions = () => {},
   formData = {},
   formValue = {},
-  form = {},
-  dataOptions = {}
+  form = {}
 }) => {
   const [selectOptions, setSelectOptions] = React.useState();
   const [activeTab, setActiveTab] = React.useState();
@@ -30417,10 +30441,9 @@ const LocationsTable = ({
     activeTab,
     getRedirectLink,
     theme,
-    subject: 'location',
-    data,
-    dataOptions
-  }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, dataOptions]);
+    subject: 'locations',
+    data
+  }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data]);
   const breadCrumbs = [];
   const {
     paginationQuery,
@@ -30441,6 +30464,9 @@ const LocationsTable = ({
       tab: activeTab
     }, 'locations');
   }, [paginationQuery, otherParams, searchParams, activeTab]);
+  console.log({
+    data
+  });
   const selectFiltersConfig = React.useMemo(() => {
     return getFiltersConfig({
       t
@@ -30495,7 +30521,7 @@ const LocationsTable = ({
         if (data.datastakeId) {
           displayMessage(type, t("affirmations::subject-created-successfully") || m);
           // goTo(`/app/edit/stakeholders/${data.datastakeId}`);
-          window.location.reload();
+          goTo('/app/locations');
         }
       },
       onCancel: onDrawerClose,

package/package.json

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

package/src/@daf/core/components/DynamicForm/storyConfig.js

@@ -9,22 +9,35 @@ export const storyData = {
 	getApiBaseUrl,
 	getAppHeader,
 	form: {
-		form: 
-		{
+		form: {
 			"id": "identification",
 			"position": 1,
+			"meta": {
+				"meta": {
+					"hidden": true
+				},
+				"kobo": {
+					"sectionName": {
+						"English (en)": "Identification",
+						"French (fr)": "Identification",
+						"sp": "Identificación"
+					}
+				}
+			},
 			"date": {
-				"_id": "68e77861e8ffe2dc9621c980",
-				"id": "20112d2f-5c35-4667-8aa5-d19f8e77434c",
+				"_id": "6903e169de03f5cd64f66f38",
+				"id": "3ce07178-d73c-41c3-a0f6-c90d299c6055",
 				"dataId": "date",
 				"section": "identification",
 				"type": "date",
 				"meta": {
-					"group": "identification",
+					"comment": false,
 					"notApplicable": false,
 					"notAvailable": false,
-					"comment": true,
-					"versioning": true,
+					"disableEdit": {
+						"create": false,
+						"edit": true
+					},
 					"mandatory": true
 				},
 				"position": 2,
@@ -35,142 +48,110 @@ export const storyData = {
 					}
 				],
 				"scope": [
-					"global",
-					"modal",
-					"registrationFormDocuments",
-					"documents",
-					"pictures",
-					"evaluationDocumentation",
-					"evidenceAmoundGoldProduced",
-					"investmentNote",
-					"financialAnalysis",
-					"createDocument"
+					"event",
+					"trainingEvent",
+					"monitoringEvent",
+					"createEventModal",
+					"createMonitoringModal",
+					"createPlantingCycleModal",
+					"createRestorationModal",
+					"createEngagementModal",
+					"createOperationModal",
+					"createActivityModal",
+					"operationsActivity",
+					"engagementActivity",
+					"monitoringActivity",
+					"restorationActivity",
+					"activity",
+					"restorationActivityStart",
+					"restorationActivityEnd",
+					"monitoringActivity",
+					"engagementActivity",
+					"operationsActivity",
+					"straatos"
 				],
 				"label": "Date",
-				"createdAt": "2025-10-09T08:55:00.585Z",
-				"updatedAt": "2025-10-09T08:55:00.585Z",
+				"createdAt": "2025-10-30T22:06:34.850Z",
+				"updatedAt": "2025-10-30T22:06:34.850Z",
 				"__v": 0
 			},
-			"documents": {
-				"_id": "68e77861e8ffe2dc9621c986",
-				"id": "9357626a-1f08-40af-81f3-1263204014d6",
-				"dataId": "documents",
+			"name": {
+				"_id": "6903e169de03f5cd64f66f52",
+				"id": "af308827-f01f-442f-bc68-0b68e25d1895",
+				"dataId": "name",
 				"section": "identification",
-				"type": "upload",
+				"type": "text",
 				"meta": {
 					"comment": false,
 					"notApplicable": false,
 					"notAvailable": false,
-					"group": "documentation",
-					"versioning": true,
-					"mandatory": true
-				},
-				"showIf": "type is documents",
-				"position": 4,
-				"dataLink": {
-					"entity": "Documents",
-					"createUserVersion": false,
-					"createNew": true,
-					"collection": "documents",
-					"formNamespace": "DOCUMENTS",
-					"keys": [
-						"title"
-					],
-					"pickKeys": []
-				},
-				"rules": [
-					{
-						"message": "errors::field is required",
-						"required": true
-					},
-					{
-						"accept": ".doc,.docx,.pdf,.xls,.xlsx",
-						"type": "any"
+					"defaultValue": "Training related to operations",
+					"group": "identification",
+					"mandatory": false,
+					"kobo": {
+						"fieldName": {
+							"English (en)": "Title",
+							"French (fr)": "Titre",
+							"sp": "Título"
+						}
 					},
-					{
-						"max": 5,
-						"type": "any"
+					"disableEdit": {
+						"create": false,
+						"edit": true
 					}
-				],
-				"scope": [
-					"global",
-					"registrationFormDocuments",
-					"evaluationDocumentation",
-					"documents",
-					"evidenceAmoundGoldProduced",
-					"investmentNote",
-					"financialAnalysis",
-					"createDocument",
-					"projectDocument"
-				],
-				"label": "Upload file",
-				"tableLabel": "Content",
-				"createdAt": "2025-10-09T08:55:03.354Z",
-				"updatedAt": "2025-10-09T08:55:03.354Z",
-				"__v": 0
-			},
-			"links": {
-				"_id": "68e77861e8ffe2dc9621c98a",
-				"id": "5788f425-56cd-4d32-aec8-c540f3fa2e5d",
-				"dataId": "links",
-				"section": "identification",
-				"type": "link",
-				"meta": {
-					"comment": false,
-					"notApplicable": false,
-					"notAvailable": false,
-					"group": "documentation",
-					"versioning": true,
-					"mandatory": true
-				},
-				"showIf": "type is link",
-				"position": 4,
-				"dataLink": {
-					"entity": "Documents",
-					"createUserVersion": false,
-					"createNew": true,
-					"collection": "documents",
-					"formNamespace": "DOCUMENTS",
-					"keys": [
-						"title"
-					],
-					"pickKeys": []
 				},
+				"position": 3,
 				"rules": [
 					{
-						"message": "errors::field is required",
-						"required": true
+						"required": true,
+						"message": "errors::field is required"
 					}
 				],
 				"scope": [
-					"global",
-					"modal",
-					"registrationFormDocuments",
-					"evaluationDocumentation",
-					"evidenceAmoundGoldProduced",
-					"financialAnalysis",
-					"investmentNote",
-					"createDocument"
+					"event",
+					"straatos",
+					"trainingEvent",
+					"monitoringEvent",
+					"createEventModal",
+					"createActivityModal",
+					"createOperationModal",
+					"createMonitoringModal",
+					"createRestorationModal",
+					"createPlantingCycleModal",
+					"createEngagementModal",
+					"engagementActivity",
+					"operationsActivity",
+					"restorationActivity",
+					"monitoringActivity",
+					"operationsActivity",
+					"engagementActivity",
+					"monitoringActivity",
+					"restorationActivity",
+					"restorationActivityStart",
+					"activity"
 				],
-				"label": "Paste Link",
-				"tableLabel": "Document",
-				"createdAt": "2025-10-09T08:55:03.357Z",
-				"updatedAt": "2025-10-09T08:55:03.357Z",
+				"label": "Activity title",
+				"createdAt": "2025-10-30T22:06:34.865Z",
+				"updatedAt": "2025-10-30T22:06:34.865Z",
 				"__v": 0
 			},
-			"name": {
-				"_id": "68e77861e8ffe2dc9621c98c",
-				"id": "88f5305a-3380-4409-ad8f-05e1683a3089",
-				"dataId": "name",
+			"subCategory": {
+				"_id": "6903e169de03f5cd64f66f72",
+				"id": "85f91af5-dfe2-403b-812d-182425fba422",
+				"dataId": "subCategory",
 				"section": "identification",
-				"type": "text",
+				"type": "select",
 				"meta": {
 					"group": "identification",
+					"comment": false,
 					"notApplicable": false,
-					"notAvailable": false,
-					"comment": true,
-					"versioning": true,
-					"mandatory": true
+					"notAvailable": true,
+					"disableEdit": {
+						"create": false,
+						"edit": true
+					},
+					"mandatory": true,
+					"conditionalOptions": "$$_options.activity.operationType"
 				},
 				"position": 1,
 				"rules": [
@@ -180,90 +161,93 @@ export const storyData = {
 					}
 				],
 				"scope": [
-					"global",
-					"modal",
-					"registrationFormDocuments",
-					"documents",
-					"evaluationDocumentation",
-					"pictures",
-					"evidenceAmoundGoldProduced",
-					"investmentNote",
-					"financialAnalysis",
-					"createDocument",
-					"projectDocument"
+					"event",
+					"createEventModal",
+					"createOperationModal",
+					"createEngagementModal",
+					"createMonitoringModal",
+					"createRestorationModal",
+					"createPlantingCycleModal",
+					"activity",
+					"operationsActivity",
+					"createActivityModal",
+					"engagementActivity",
+					"monitoringActivity",
+					"restorationActivity",
+					"trainingEvent",
+					"straatos"
 				],
-				"label": "Title",
-				"createdAt": "2025-10-09T08:55:00.689Z",
-				"updatedAt": "2025-10-09T08:55:00.689Z",
-				"__v": 0
-			},
-			"pictures": {
-				"_id": "68e77861e8ffe2dc9621c98e",
-				"id": "2c0ffe9e-ddab-4e1c-93da-a6e681a93158",
-				"dataId": "pictures",
-				"section": "identification",
-				"type": "imageUpload",
-				"meta": {
-					"group": "identification",
-					"notApplicable": true,
-					"notAvailable": true,
-					"comment": true,
-					"versioning": true,
-					"mandatory": true
-				},
-				"showIf": "type is pictures",
-				"position": 4,
-				"dataLink": {
-					"entity": "Documents",
-					"createUserVersion": false,
-					"createNew": true,
-					"collection": "documents",
-					"formNamespace": "DOCUMENTS",
-					"keys": [
-						"title"
-					],
-					"pickKeys": []
-				},
-				"rules": [
+				"label": "Type of activity",
+				"options": [
 					{
-						"message": "errors::field is required",
-						"type": "any"
+						"label": "Training",
+						"value": "training"
 					},
 					{
-						"max": 1,
-						"type": "any"
+						"label": "Other",
+						"value": "other"
 					},
 					{
-						"required": true,
-						"message": "errors::field is required"
+						"label": "Commercial intervention",
+						"value": "commercial_intervention"
+					},
+					{
+						"label": "Operational training",
+						"value": "operational_training"
+					},
+					{
+						"label": "Equipment provision",
+						"value": "equipment_provision"
+					},
+					{
+						"label": "Financial intervention",
+						"value": "financial_intervention"
+					},
+					{
+						"label": "Infrastructure",
+						"value": "infrastructure"
+					},
+					{
+						"label": "Investigation & research",
+						"value": "investigation_research"
+					},
+					{
+						"label": "Legalisation",
+						"value": "legalisation"
+					},
+					{
+						"label": "Policy & enforcement",
+						"value": "policy_enforcement"
+					},
+					{
+						"label": "Technical intervention",
+						"value": "technical_intervention"
+					},
+					{
+						"label": "Site visit",
+						"value": "site_visit"
 					}
 				],
-				"scope": [
-					"global",
-					"modal",
-					"registrationFormDocuments",
-					"pictures",
-					"documents",
-					"evaluationDocumentation",
-					"evidenceAmoundGoldProduced",
-					"investmentNote",
-					"financialAnalysis",
-					"createDocument"
-				],
-				"label": "Upload file",
-				"tableLabel": "Content",
-				"createdAt": "2025-10-09T08:55:03.424Z",
-				"updatedAt": "2025-10-09T08:55:03.424Z",
+				"createdAt": "2025-10-30T22:06:36.634Z",
+				"updatedAt": "2025-10-30T22:06:36.634Z",
 				"__v": 0
 			},
-			"type": {
-				"_id": "68e77861e8ffe2dc9621c994",
-				"id": "67dea7ae-6622-4570-b796-ccdaf4ca73d4",
-				"dataId": "type",
+			"typeOfEvent": {
+				"_id": "6903e169de03f5cd64f66f74",
+				"id": "f44a3e74-e68a-40a0-a7f5-62189bc068a2",
+				"dataId": "typeOfEvent",
 				"section": "identification",
 				"type": "select",
 				"meta": {
-					"versioning": true,
+					"group": "identification",
+					"comment": false,
+					"notApplicable": false,
+					"notAvailable": true,
+					"defaultValue": "operation",
+					"disableEdit": {
+						"edit": true,
+						"create": true
+					},
 					"mandatory": true
 				},
 				"position": 0,
@@ -274,93 +258,37 @@ export const storyData = {
 					}
 				],
 				"scope": [
-					"global",
-					"modal",
-					"registrationFormDocuments",
-					"documents",
-					"evaluationDocumentation",
-					"pictures",
-					"evidenceAmoundGoldProduced",
-					"investmentNote",
-					"financialAnalysis",
-					"createDocument"
+					"createOperationModal",
+					"createEngagementModal",
+					"createMonitoringModal",
+					"createRestorationModal",
+					"createActivityModal"
 				],
-				"label": "Type",
+				"label": "Category",
 				"options": [
 					{
-						"label": "Document",
-						"value": "documents"
+						"label": "Operation",
+						"value": "operation"
 					},
 					{
-						"label": "Image",
-						"value": "pictures"
+						"label": "Restoration",
+						"value": "restoration"
 					},
 					{
-						"label": "Video",
-						"value": "video"
+						"label": "Monitoring",
+						"value": "monitoring"
 					},
 					{
-						"label": "Link",
-						"value": "link"
-					}
-				],
-				"createdAt": "2025-10-09T08:55:04.175Z",
-				"updatedAt": "2025-10-09T08:55:04.175Z",
-				"__v": 0
-			},
-			"videos": {
-				"_id": "68e77861e8ffe2dc9621c996",
-				"id": "acd697ae-4d0a-4c86-abfd-028e980c9dfe",
-				"dataId": "videos",
-				"section": "identification",
-				"type": "videoUpload",
-				"meta": {
-					"comment": false,
-					"notApplicable": false,
-					"notAvailable": false,
-					"group": "documentation",
-					"versioning": true,
-					"mandatory": true
-				},
-				"showIf": "type is video",
-				"position": 4,
-				"dataLink": {
-					"entity": "Documents",
-					"createUserVersion": false,
-					"createNew": true,
-					"collection": "documents",
-					"formNamespace": "DOCUMENTS",
-					"keys": [
-						"title"
-					],
-					"pickKeys": []
-				},
-				"rules": [
-					{
-						"message": "errors::field is required",
-						"required": true
+						"label": "Engagement",
+						"value": "engagement"
 					}
 				],
-				"scope": [
-					"global",
-					"modal",
-					"registrationFormDocuments",
-					"documents",
-					"evaluationDocumentation",
-					"evidenceAmoundGoldProduced",
-					"createDocument",
-					"investmentNote",
-					"financialAnalysis"
-				],
-				"label": "Upload file",
-				"tableLabel": "Content",
-				"createdAt": "2025-10-09T08:55:03.362Z",
-				"updatedAt": "2025-10-09T08:55:03.362Z",
+				"createdAt": "2025-10-30T22:06:36.144Z",
+				"updatedAt": "2025-10-30T22:06:36.144Z",
 				"__v": 0
 			},
-			"label": "Identification",
-			"subTitle": "Identification"
-		},
+			"label": "Identification"
+		}
 	},
 	data: {
 		date: "2025-08-11T15:54:02.839Z",

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

@@ -35,7 +35,7 @@ export const useWidgetFetch = ({config, getData = DashboardService.getWidget, on
 
     useEffect(() => {
         fetchData();
-    }, []);
+    }, [config]);
 
     return {
         data,

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

@@ -5,7 +5,14 @@ import { renderDateFormatted } from '../../../../../helpers/Forms.js';
 import CustomIcon from '../../../../core/components/Icon/CustomIcon.jsx';
 import AvatarGroup from '../../../../core/components/AvatarGroup/index.jsx';
 
-export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, dataOptions}) => [
+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'),
@@ -42,7 +49,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const category = findOptions(v, dataOptions?.locationCategories);
+          const category = findOptions(v, data?.options?.locationCategories);
     
           return category ? <Tooltip title={category}>{category}</Tooltip> : '-';
         },
@@ -72,9 +79,9 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const country = findOptions(v, options?.countries);
+          const region = getLinkValue(v, all?.linking?.SCL);
 
-          return  '-';
+          return region ? <Tooltip title={region}>{region}</Tooltip> : '-';
         },
     },    
     {
@@ -87,9 +94,9 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const country = findOptions(v, options?.countries);
+          const district = getLinkValue(v, all?.linking?.SCL);
 
-          return  '-';
+          return district ? <Tooltip title={district}>{district}</Tooltip> : '-';
         },
     },     
     {
@@ -116,9 +123,8 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             if (all.empty) {
                 return <div className="daf-default-cell" />;
             }
-            if (!val || val?.length === 0) {
-                return "--";
-            }
+
+            console.log({val, all})
 
             return <AvatarGroup items={val}></AvatarGroup>;
         },

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

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

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

@@ -32,10 +32,10 @@ const LocationsTable = ({
     formData = {},
     formValue = {},
     form = {},
-    dataOptions = {},
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState();
+
     const columns = useMemo(() => getColumns({
         t, 
         goTo, 
@@ -44,10 +44,9 @@ const LocationsTable = ({
         activeTab,
         getRedirectLink, 
         theme,
-        subject: 'location',
+        subject: 'locations',
         data,
-        dataOptions
-    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, dataOptions]);
+    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data]);
 
     const breadCrumbs = [];
 
@@ -62,6 +61,8 @@ const LocationsTable = ({
         }, 'locations')
     }, [paginationQuery, otherParams, searchParams, activeTab]);
 
+    console.log({data})
+
     const selectFiltersConfig = useMemo(() => {
         return getFiltersConfig({t});
     }, [t]);
@@ -121,7 +122,7 @@ const LocationsTable = ({
                                 t("affirmations::subject-created-successfully") || m,
                             );
                             // goTo(`/app/edit/stakeholders/${data.datastakeId}`);
-                            window.location.reload();
+                            goTo('/app/locations')
                         }
                     }}
                     onCancel={onDrawerClose}

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 = [];
@@ -117,7 +117,7 @@ const StakeholdersTable = ({
                                 type,
                                 t("affirmations::subject-created-successfully") || m,
                             );
-                            goTo(`/app/locations`);
+                            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),