datastake-daf 0.6.723 → 0.6.725

package/dist/pages/index.js

@@ -7361,7 +7361,7 @@ function Label({
 }
 KeyIndicatorsWidget.displayName = 'KeyIndicatorsWidget';
 
-const defaultFetchConfig$6 = {
+const defaultFetchConfig$7 = {
   basepath: "analytics",
   url: '/widgets/key-informations',
   filters: {
@@ -7377,9 +7377,9 @@ function KeyIndicators$1({
   goTo = () => {}
 }) {
   const fetchConfig = o.useMemo(() => ({
-    ...defaultFetchConfig$6,
+    ...defaultFetchConfig$7,
     filters: {
-      ...defaultFetchConfig$6.filters,
+      ...defaultFetchConfig$7.filters,
       sources: selectedSources?.partners || []
     },
     stop: selectedSources?.loading
@@ -11451,7 +11451,7 @@ function withProvider(Component) {
   return wrapper;
 }
 
-const DataChainOfCustody = ({
+const DataChainOfCustody$1 = ({
   data,
   filtersConfig,
   t = s => s,
@@ -11575,9 +11575,100 @@ const DataChainOfCustody = ({
     onFilterChange: onFilterChange
   });
 };
-var DataChainOfCustody$1 = withProvider(DataChainOfCustody);
+var DataChainOfCustodyDaf = withProvider(DataChainOfCustody$1);
 
-const defaultFetchConfig$5 = {
+const theme = window.theme || {};
+const kycIcon = /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+  name: "KYC",
+  color: "#6C737F",
+  width: 18,
+  height: 18
+});
+const buildingIcon = /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+  name: "Building",
+  color: "#6C737F",
+  width: 18,
+  height: 18
+});
+const individualIcon = /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+  name: "UserCircle",
+  color: "#6C737F",
+  width: 18,
+  height: 18
+});
+const csIcon = /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+  name: "CivilSociety",
+  color: "#6C737F",
+  width: 18,
+  height: 18
+});
+const leftIcon = /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+  name: "NashirikiSmallLogo",
+  color: theme.colorPrimary8,
+  width: 16,
+  height: 16
+});
+const middleIcon = /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+  name: "NashirikiSmallLogo",
+  color: theme.colorPrimary2,
+  width: 16,
+  height: 16
+});
+const rightIcon = /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+  name: "NashirikiSmallLogo",
+  color: "white",
+  width: 16,
+  height: 16
+});
+const mapIcon = category => {
+  switch (category) {
+    case "businessEntity":
+      return buildingIcon;
+    case "civilSociety":
+      return csIcon;
+    case "government":
+      return kycIcon;
+    case "individual":
+      return individualIcon;
+    default:
+      return;
+  }
+};
+const leftBackground = theme.colorPrimary3;
+const rightBackground = theme.colorPrimary6;
+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 {
+    id: data.id,
+    number: 0,
+    name: data.name,
+    subTitle: findOptions(data.category, options),
+    leftIcon: middleIcon,
+    leftBackground: theme.colorPrimary10,
+    topIcon: mapIcon(data.category),
+    left: mapChildren(data.sources, "source", data.id),
+    right: mapChildren(data.clients, "client", data.id)
+  };
+};
+
+const defaultFetchConfig$6 = {
   basepath: "analytics",
   url: "/widgets/datachain-of-custody",
   filters: {},
@@ -11587,11 +11678,10 @@ function TradeRelationships({
   goTo,
   t = () => {},
   options = {},
-  mapDataFunction = () => {},
   hardcodedData = []
 }) {
   const fetchConfig = o.useMemo(() => ({
-    ...defaultFetchConfig$5,
+    ...defaultFetchConfig$6,
     filters: {}
   }), []);
   const {
@@ -11600,7 +11690,7 @@ function TradeRelationships({
   } = useWidgetFetch({
     config: fetchConfig
   });
-  const mappedData = mapDataFunction(Object.keys(data)?.length > 0 ? data : hardcodedData, options?.category ?? [], goTo);
+  const mappedData = mapDataForChainOfCustody(Object.keys(data)?.length > 0 ? data : hardcodedData, options?.category ?? [], goTo);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, {
     loading: loading,
     title: t("Trade Relationships"),
@@ -11609,7 +11699,7 @@ function TradeRelationships({
       style: {
         height: 600
       },
-      children: /*#__PURE__*/jsxRuntime.jsx(DataChainOfCustody$1, {
+      children: /*#__PURE__*/jsxRuntime.jsx(DataChainOfCustodyDaf, {
         data: mappedData,
         maxZoom: 1
       })
@@ -12751,7 +12841,6 @@ function SupplyChain({
   selectedPartners,
   setSelectedPartners,
   informationSources,
-  mapDataFunction,
   hardcodedData,
   breadCrumbs = []
 }) {
@@ -12817,7 +12906,6 @@ function SupplyChain({
     }), /*#__PURE__*/jsxRuntime.jsx("section", {
       children: /*#__PURE__*/jsxRuntime.jsx(TradeRelationships, {
         selectedSources: selectedPartners,
-        mapDataFunction: mapDataFunction,
         t: t,
         options: options,
         goTo: goTo,
@@ -13022,7 +13110,7 @@ const getRowConfig = ({
   })
 }];
 
-const defaultFetchConfig$4 = {
+const defaultFetchConfig$5 = {
   basepath: "analytics",
   url: "/widgets/key-informations",
   filters: {
@@ -13037,7 +13125,7 @@ function KeyIndicators({
   partners = []
 }) {
   const fetchConfig = o.useMemo(() => ({
-    ...defaultFetchConfig$4
+    ...defaultFetchConfig$5
   }), []);
   const {
     data,
@@ -13214,7 +13302,7 @@ const onClickLink = (data, getRedirectLink, activeTab, goTo, user) => {
   }
 };
 
-const defaultFetchConfig$3 = {
+const defaultFetchConfig$4 = {
   basepath: "forms",
   url: "/location"
 };
@@ -13238,7 +13326,7 @@ function MineSites({
   const [filters, setFilters] = o.useState({});
   const [activeTab, setActiveTab] = o.useState("location");
   const _formFetchConfig = o.useMemo(() => ({
-    ...defaultFetchConfig$3,
+    ...defaultFetchConfig$4,
     params: {
       scope: "create",
       language: user?.language || "en"
@@ -13623,7 +13711,7 @@ const useKnowledgeAccumulation = ({
   return chartConfig;
 };
 
-const defaultFetchConfig$2 = {
+const defaultFetchConfig$3 = {
   basepath: "analytics",
   url: "/widgets/knowledge-accumulation",
   filters: {},
@@ -13638,7 +13726,7 @@ function AccumulationGraph({
 }) {
   const [timeFilter, setTimeFilter] = o.useState("monthly");
   const fetchConfig = o.useMemo(() => ({
-    ...defaultFetchConfig$2,
+    ...defaultFetchConfig$3,
     filters: {
       section: section,
       tabSelected: tabSelected
@@ -14012,7 +14100,7 @@ const useContributionsGraph = ({
   return chartConfig;
 };
 
-const defaultFetchConfig$1 = {
+const defaultFetchConfig$2 = {
   basepath: "analytics",
   url: "/widgets/contributions",
   filters: {},
@@ -14026,7 +14114,7 @@ function ContributionsGraph({
   theme = {}
 }) {
   const fetchConfig = o.useMemo(() => ({
-    ...defaultFetchConfig$1,
+    ...defaultFetchConfig$2,
     filters: {
       section: section,
       tabSelected: tabSelected
@@ -14141,7 +14229,7 @@ const useTriangulation = ({
   };
 };
 
-const defaultFetchConfig = {
+const defaultFetchConfig$1 = {
   basepath: "analytics",
   url: "/widgets/triangulation",
   defaultData: [],
@@ -14155,7 +14243,7 @@ function Triangulation({
   theme = {}
 }) {
   const fetchConfig = o.useMemo(() => ({
-    ...defaultFetchConfig,
+    ...defaultFetchConfig$1,
     filters: {
       section: section,
       tabSelected: tabSelected
@@ -14309,6 +14397,44 @@ function DataConsilidation({
   });
 }
 
+const defaultFetchConfig = {
+  basepath: "analytics",
+  url: "/widgets/datachain-of-custody",
+  filters: {},
+  defaultData: []
+};
+function DataChainOfCustody({
+  t = () => {},
+  goTo = () => {},
+  options = {},
+  hardcodedData = []
+}) {
+  const fetchConfig = o.useMemo(() => ({
+    ...defaultFetchConfig
+  }), []);
+  const {
+    data,
+    loading
+  } = useWidgetFetch({
+    config: fetchConfig
+  });
+  const mappedData = mapDataForChainOfCustody(Object.keys(data)?.length > 0 ? data : hardcodedData, options, goTo);
+  return /*#__PURE__*/jsxRuntime.jsx(Widget, {
+    loading: loading,
+    title: t("Data Chain of Custody"),
+    className: "flex flex-1 with-border-header no-p-body",
+    children: /*#__PURE__*/jsxRuntime.jsx("div", {
+      style: {
+        height: 600
+      },
+      children: /*#__PURE__*/jsxRuntime.jsx(DataChainOfCustodyDaf, {
+        data: mappedData,
+        maxZoom: 1
+      })
+    })
+  });
+}
+
 function UserDashboard({
   t = () => {},
   goTo = () => {},
@@ -14320,7 +14446,8 @@ function UserDashboard({
   setSelectedPartners,
   informationSources,
   user = {},
-  options = {}
+  options = {},
+  hardcodedData = {}
 }) {
   const actionsWidgetsConfig = o.useMemo(() => getActionWidgetsConfig({
     goTo,
@@ -14331,6 +14458,9 @@ function UserDashboard({
   const informationSourcesCount = o.useMemo(() => {
     return informationSources > 0 ? informationSources : selectedPartners?.partners?.length > 0 ? selectedPartners?.partners?.length : 0;
   }, [informationSources, selectedPartners]);
+  o.useEffect(() => {
+    window.theme = theme;
+  }, [theme, user]);
   return /*#__PURE__*/jsxRuntime.jsxs(DashboardLayout, {
     header: /*#__PURE__*/jsxRuntime.jsx(DAFHeader, {
       title: t('Dashboard Title')
@@ -14375,6 +14505,13 @@ function UserDashboard({
         user: user,
         theme: theme
       })
+    }), /*#__PURE__*/jsxRuntime.jsx("section", {
+      children: /*#__PURE__*/jsxRuntime.jsx(DataChainOfCustody, {
+        t: t,
+        goTo: goTo,
+        options: options,
+        hardcodedData: hardcodedData
+      })
     })]
   });
 }

package/dist/style/datastake/datastake.css

@@ -4996,9 +4996,19 @@ strong {
   width: 100%;
 }
 
-.sidenav-sider.custom .ant-menu-dark .ant-menu-item-disabled {
+.components-layout:not(.nested) .sidenav-sider.custom.straatos .sidenav-cont.straatos .ant-menu-dark .ant-menu-item.ant-menu-item-disabled .ant-menu-title-content {
   color: var(--custom-sidenav-disabled-menu-item-color) !important;
 }
+.components-layout:not(.nested) .sidenav-sider.custom.straatos .sidenav-cont.straatos .ant-menu-dark .ant-menu-item.ant-menu-item-disabled svg path {
+  stroke: var(--custom-sidenav-disabled-menu-item-color) !important;
+}
+
+.components-layout:not(.nested) .sidenav-sider-collapsed.custom.straatos .sidenav-cont.straatos .ant-menu-dark .ant-menu-submenu.ant-menu-submenu-inline.ant-menu-submenu-disabled .ant-menu-submenu-title svg path {
+  stroke: var(--custom-sidenav-disabled-menu-item-color) !important;
+}
+.components-layout:not(.nested) .sidenav-sider-collapsed.custom.straatos .sidenav-cont.straatos .ant-menu-dark .ant-menu-submenu.ant-menu-submenu-inline.ant-menu-submenu-disabled .ant-menu-submenu-title .ant-menu-title-content {
+  stroke: var(--custom-sidenav-disabled-menu-item-color) !important;
+}
 
 .sidenav-sider.nested .ant-menu-dark .ant-menu-item-disabled {
   color: var(--nested-sidenav-disabled-menu-item-color) !important;

package/package.json

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

package/src/@daf/core/components/EditForm/form.jsx

@@ -56,6 +56,7 @@ export const EditForm = ({
 	evaluationConfig = [],
 	staticWidth = "614px",
 	fullWidth = false,
+	noConvert = false,
 }) => {
 	const [isSubmitting] = useState(false);
 	const formData = JSON.parse(JSON.stringify(convertUndefinedToNull(data) || {}));
@@ -369,11 +370,14 @@ export const EditForm = ({
 								}
 							});
 
-							const cleanedChangeValue =  changedValue; //convertUndefinedToNull(changedValue);
-							const cleanedAllValues =  {
+							const cleanedChangeValue =   noConvert ? changedValue : convertUndefinedToNull(changedValue) ;
+							const cleanedAllValues =  noConvert ? {
 								...values,
 								...allValues,
-							};
+							} : convertUndefinedToNull({
+								...values,
+								...allValues,
+							});
 
 							if (
 								"associatedMine" in cleanedChangeValue &&

package/src/@daf/pages/dashboards/SupplyChain/components/TradeRelationships/index.js

@@ -3,6 +3,7 @@ import { useWidgetFetch } from '../../../../../hooks/useWidgetFetch.js';
 import Widget from '../../../../../core/components/Dashboard/Widget/index.jsx';
 import DataChainOfCustody from '../../../../../core/components/Graphs/DataChainOfCustody/index.jsx';
 import PropTypes from 'prop-types';
+import { mapDataForChainOfCustody } from '../../../helper.js';
 
 const defaultFetchConfig = {
 	basepath: "analytics",
@@ -11,7 +12,7 @@ const defaultFetchConfig = {
 	defaultData: [],
 };
 
-function TradeRelationships({goTo, t = () => {}, options = {}, mapDataFunction = () => {}, hardcodedData = [] }) {
+function TradeRelationships({goTo, t = () => {}, options = {}, hardcodedData = [] }) {
 
 	const fetchConfig = useMemo(
 		() => ({
@@ -23,7 +24,7 @@ function TradeRelationships({goTo, t = () => {}, options = {}, mapDataFunction =
 
     const { data, loading } = useWidgetFetch({config: fetchConfig});
 
-    const mappedData = mapDataFunction(Object.keys(data)?.length > 0 ? data : hardcodedData, options?.category ?? [], goTo);
+    const mappedData = mapDataForChainOfCustody(Object.keys(data)?.length > 0 ? data : hardcodedData, options?.category ?? [], goTo);
 
     return (
         <Widget

package/src/@daf/pages/dashboards/SupplyChain/index.jsx

@@ -19,7 +19,6 @@ function SupplyChain({
     selectedPartners,
     setSelectedPartners, 
     informationSources,
-    mapDataFunction,
     hardcodedData,
     breadCrumbs = [],
 }) {
@@ -81,7 +80,7 @@ function SupplyChain({
                 <SupplyChainMap selectedSources={selectedPartners} t={t} goTo={goTo} options={options} getRedirectLink={getRedirectLink} />
             </section>
             <section>
-                <TradeRelationships selectedSources={selectedPartners} mapDataFunction={mapDataFunction} t={t} options={options} goTo={goTo} hardcodedData={hardcodedData} />
+                <TradeRelationships selectedSources={selectedPartners} t={t} options={options} goTo={goTo} hardcodedData={hardcodedData} />
             </section>
             <section>
                 <ChartsContainer selectedSources={selectedPartners} t={t} theme={theme} options={options} />

package/src/@daf/pages/dashboards/UserDashboard/components/DataChainOfCustody/index.jsx

@@ -1,4 +1,8 @@
-import React from 'react'
+import React, { useMemo } from 'react'
+import { useWidgetFetch } from '../../../../../hooks/useWidgetFetch.js';
+import { mapDataForChainOfCustody } from '../../../helper.js';
+import Widget from '../../../../../core/components/Dashboard/Widget/index.jsx';
+import DataChainOfCustodyDaf from '../../../../../core/components/Graphs/DataChainOfCustody/index.jsx';
 
 
 const defaultFetchConfig = {
@@ -9,10 +13,30 @@ const defaultFetchConfig = {
 };
 
 
-function DataChainOfCustody({t = () => {}, }) {
-  return (
-    <div>DataChainOfCustody</div>
-  )
+function DataChainOfCustody({
+	t = () => {}, 
+	goTo = () => {},
+	options = {},
+	hardcodedData = [],
+}) {
+	const fetchConfig = useMemo(() => ({
+		...defaultFetchConfig,}),[],
+	);
+	const { data, loading } = useWidgetFetch({config: fetchConfig});
+
+	const mappedData = mapDataForChainOfCustody(Object.keys(data)?.length > 0 ? data : hardcodedData, options, goTo);
+
+	return (
+		<Widget
+			loading={loading}
+			title={t("Data Chain of Custody")}
+			className="flex flex-1 with-border-header no-p-body"
+		>
+			<div style={{ height: 600 }}>
+				<DataChainOfCustodyDaf data={mappedData} maxZoom={1} />
+			</div>
+		</Widget>
+	)
 }
 
 export default DataChainOfCustody

package/src/@daf/pages/dashboards/UserDashboard/index.jsx

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react'
+import React, { useEffect, useMemo } from 'react'
 import { getActionWidgetsConfig } from './config'
 import ActionWidget from '../../../core/components/Dashboard/Widget/ActionWidget/index.jsx'
 import Header from '../../../core/components/Header/index.jsx'
@@ -7,6 +7,7 @@ import KeyIndicators from './components/KeyIndicators/index.jsx'
 import MineSites from './components/MineSites/index.jsx'
 import DataCompilation from './components/DataCompilation/index.jsx'
 import DataConsilidation from './components/DataConsilidation/index.jsx'
+import DataChainOfCustody from './components/DataChainOfCustody/index.jsx'
 
 function UserDashboard({
     t = () => {},
@@ -20,6 +21,7 @@ function UserDashboard({
     informationSources,
     user = {},
     options = {},
+    hardcodedData = {},
 }) {
 
     const actionsWidgetsConfig = useMemo(
@@ -35,6 +37,10 @@ function UserDashboard({
                 : 0
     }, [informationSources, selectedPartners]);
 
+    useEffect(() => {
+        window.theme = theme;
+    }, [theme, user])
+
     return (
         <DashboardLayout
             header={
@@ -91,7 +97,14 @@ function UserDashboard({
                     theme={theme} 
                 />
             </section>
-
+            <section>
+                <DataChainOfCustody 
+                    t={t} 
+                    goTo={goTo} 
+                    options={options} 
+                    hardcodedData={hardcodedData} 
+                />
+            </section>
         </DashboardLayout>
     )
 }

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

@@ -0,0 +1,79 @@
+import React from 'react';
+import CustomIcon from '../../core/components/Icon/CustomIcon.jsx';
+import { findOptions } from '../../../helpers/StringHelper.js';
+
+const theme = window.theme || {};
+
+const kycIcon = <CustomIcon name="KYC" color="#6C737F" width={18} height={18} />;
+
+const buildingIcon = <CustomIcon name="Building" color="#6C737F" width={18} height={18} />;
+const individualIcon = <CustomIcon name="UserCircle" color="#6C737F" width={18} height={18} />;
+const csIcon = <CustomIcon name="CivilSociety" color="#6C737F" width={18} height={18} />;
+const leftIcon = (
+	<CustomIcon
+		name="NashirikiSmallLogo"
+		color={theme.colorPrimary8}
+		width={16}
+		height={16}
+	/>
+);
+const middleIcon = (
+	<CustomIcon
+		name="NashirikiSmallLogo"
+		color={theme.colorPrimary2}
+		width={16}
+		height={16}
+	/>
+);
+
+const rightIcon = <CustomIcon name="NashirikiSmallLogo" color="white" width={16} height={16} />;
+
+const mapIcon = (category) => {
+	switch (category) {
+		case "businessEntity":
+			return buildingIcon;
+		case "civilSociety":
+			return csIcon;
+		case "government":
+			return kycIcon;
+		case "individual":
+			return individualIcon;
+		default:
+			return;
+	}
+};
+const leftBackground = theme.colorPrimary3;
+const rightBackground = theme.colorPrimary6;
+
+export 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 {
+		id: data.id,
+		number: 0,
+		name: data.name,
+		subTitle: findOptions(data.category, options),
+		leftIcon: middleIcon,
+		leftBackground: theme.colorPrimary10,
+		topIcon: mapIcon(data.category),
+		left: mapChildren(data.sources, "source", data.id),
+		right: mapChildren(data.clients, "client", data.id),
+	};
+};

package/src/styles/datastake/datastake.css

@@ -4996,9 +4996,19 @@ strong {
   width: 100%;
 }
 
-.sidenav-sider.custom .ant-menu-dark .ant-menu-item-disabled {
+.components-layout:not(.nested) .sidenav-sider.custom.straatos .sidenav-cont.straatos .ant-menu-dark .ant-menu-item.ant-menu-item-disabled .ant-menu-title-content {
   color: var(--custom-sidenav-disabled-menu-item-color) !important;
 }
+.components-layout:not(.nested) .sidenav-sider.custom.straatos .sidenav-cont.straatos .ant-menu-dark .ant-menu-item.ant-menu-item-disabled svg path {
+  stroke: var(--custom-sidenav-disabled-menu-item-color) !important;
+}
+
+.components-layout:not(.nested) .sidenav-sider-collapsed.custom.straatos .sidenav-cont.straatos .ant-menu-dark .ant-menu-submenu.ant-menu-submenu-inline.ant-menu-submenu-disabled .ant-menu-submenu-title svg path {
+  stroke: var(--custom-sidenav-disabled-menu-item-color) !important;
+}
+.components-layout:not(.nested) .sidenav-sider-collapsed.custom.straatos .sidenav-cont.straatos .ant-menu-dark .ant-menu-submenu.ant-menu-submenu-inline.ant-menu-submenu-disabled .ant-menu-submenu-title .ant-menu-title-content {
+  stroke: var(--custom-sidenav-disabled-menu-item-color) !important;
+}
 
 .sidenav-sider.nested .ant-menu-dark .ant-menu-item-disabled {
   color: var(--nested-sidenav-disabled-menu-item-color) !important;