datastake-daf 0.6.733 → 0.6.735

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),