datastake-daf 0.6.721 → 0.6.722

package/dist/services/index.js

@@ -872,7 +872,13 @@ class AuthenticationService extends BaseService {
       url: `/companies/${id}`
     });
   }
-  inviteUser(payload) {
+  inviteUser(payload, id) {
+    if (id) {
+      return this.apiPost({
+        url: `/companies/${id}/invite`,
+        data: payload
+      });
+    }
     return this.apiPost({
       url: '/companies/invite',
       data: payload

package/package.json

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

package/src/@daf/core/components/Screens/Admin/AdminViews/components/Users/helper.js

@@ -80,7 +80,7 @@ export const getColumns = ({
 					return <div className="daf-default-cell" />;
 				}
 
-				const role = all?.apps?.[module]?.role;
+				const role = all?.role ||all?.apps?.[module]?.role;
 				const options = (selectOptions?.userRole || []).filter(
 					(o) => all.isAdmin || o.canBeAssignedToSubUsers,
 				);

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

@@ -40,5 +40,6 @@ export const useWidgetFetch = ({config, getData = DashboardService.getWidget, on
     return {
         data,
         loading,
+		setData
     }
 } 

package/src/@daf/pages/dashboards/SupplyChain/components/ChartsContainer/components/Identification/hook.js

@@ -1,7 +1,7 @@
 import { useEffect, useState, useMemo } from "react";
 
 
-export function useIdentification({ data = undefined, theme = {}, options = {} }) {
+export function useIdentification({ data, theme = {}, options = {} }) {
     const colors = [
         theme.colorPrimary10,
         theme.colorPrimary9,

package/src/@daf/pages/dashboards/UserDashboard/components/AccumulationGraph/hook.js

@@ -0,0 +1,139 @@
+import { useState, useEffect, useMemo } from "react";
+import dayjs from "dayjs";
+import { capitalize } from "../../../../../../helpers/StringHelper.js";
+
+export const useKnowledgeAccumulation = ({
+    data: mainData = {}, 
+    timeFilter, 
+    isConsolidation,
+    t = () => {},
+    theme = {},
+    currentLanguage = "en",
+}) => {
+    const [data, setData] = useState([]);
+
+    const config = (isConsolidation) => [
+		{
+			key: "mineSites",
+			label: isConsolidation ? t("Locations Data") : t("Locations"),
+			color: theme.colorPrimary10,
+		},
+		{
+			key: "stakeholder",
+			label: isConsolidation ? t("Stakeholders Data") : t("Stakeholders"),
+			color: theme.colorPrimary,
+		},
+		{
+			key: "event",
+			label: isConsolidation ? t("Events Data") : t("Events"),
+			color: theme.colorPrimary4,
+		},
+	];
+    const fill = config(isConsolidation).map((c) => c.color);
+
+    const fetchData = () => {
+		const timeQuantity =
+			timeFilter === "monthly" ? "months" : timeFilter === "daily" ? "days" : "weeks";
+
+		const getFormatDate = (date, breakLine) => {
+			switch (timeFilter) {
+				case "daily":
+					return date.format("DD/MM");
+				case "weekly":
+					return `W${Number(date.week())}`;
+				default:
+					return breakLine
+						? `${capitalize(date.format("MMM"))}\n${date.format("YY")}`
+						: capitalize(date.format("MMM YY"));
+			}
+		};
+
+		const _data = [];
+		let end = dayjs().locale(currentLanguage);
+		let start = dayjs().locale(currentLanguage).add(-12, timeQuantity);
+		let cumulativeScores = {};
+		Object.entries(mainData)
+			.filter(([k]) =>
+				dayjs(k).isBefore(
+					start,
+					timeFilter === "daily" ? "day" : timeFilter === "weekly" ? "week" : "month",
+				),
+			)
+			.flatMap(([, v]) => v)
+			.forEach((s) => {
+				if (!cumulativeScores[s.category]) cumulativeScores[s.category] = 0;
+				cumulativeScores[s.category] += s.count;
+			});
+
+		while (start.isBefore(end) || start.isSame(end)) {
+			const scores = Object.entries(mainData)
+				.filter(([k]) => {
+					switch (timeFilter) {
+						case "daily":
+							return k === start.format("YYYY-MM-DD");
+						case "weekly":
+							return dayjs(k, "YYYY-MM-DD").week() === start.week();
+						default:
+							return dayjs(k, "YYYY-MM").isSame(start, "month");
+					}
+				})
+				.flatMap(([, v]) => v);
+
+			config(isConsolidation).forEach((c) => {
+				const currentScore = scores
+					.filter((s) => s.category === c.key)
+					.reduce((sum, score) => sum + score.count, 0);
+
+				cumulativeScores[c.key] = (cumulativeScores[c.key] || 0) + currentScore;
+				_data.push({
+					date: getFormatDate(start, true),
+					Score: cumulativeScores[c.key] || 0,
+					serie: c.key,
+				});
+			});
+
+			start = start.add(1, timeQuantity);
+		}
+
+		setData(_data);
+	};
+
+	useEffect(() => {
+		fetchData();
+	}, [mainData, timeFilter]);
+
+    const chartConfig = useMemo(() => {
+        return {
+            data: data,
+            xFieldKey: "date",
+            yFieldKey: "Score",
+            seriesField: "serie",
+            color: fill,
+            renderTooltipContent: (title, _data) => {
+                if (Array.isArray(_data) && _data[0]) {
+                    const title = _data[0].title;
+                    const values = data.filter((d) => d.date === title);
+
+                    return {
+                        title: t("Accumulation"),
+                        subTitle: title.replace("\n", " "),
+                        items: [
+                            ...config(isConsolidation).map((conf) => ({
+                                label: conf.label,
+                                color: conf.color,
+                                value: Number(
+                                    values.find((v) => v.serie === conf.key)?.Score || 0,
+                                ),
+                            })),
+                        ],
+                    };
+                }
+
+                return "";
+            },
+
+        }
+    }, [data]);
+
+    return chartConfig;
+}

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

@@ -0,0 +1,78 @@
+import React, { useState, useMemo } from 'react'
+import { Select } from 'antd'
+import Widget from '../../../../../core/components/Dashboard/Widget/index.jsx'
+import LineChart from '../../../../../core/components/Charts/LineChart/index.jsx'
+import { useWidgetFetch } from '../../../../../hooks/useWidgetFetch.js'
+import { useKnowledgeAccumulation } from './hook.js'
+
+const defaultFetchConfig = {
+	basepath: "analytics",
+	url: "/widgets/knowledge-accumulation",
+	filters: {},
+	defaultData: [],
+};
+
+function AccumulationGraph({	
+    section = "data-compilation",
+	tabSelected = "dataFlow",
+    t=() => {},
+    user = {},
+    theme = {}
+}) {
+    const [timeFilter, setTimeFilter] = useState("monthly");
+
+    const fetchConfig = useMemo(
+		() => ({
+			...defaultFetchConfig,
+			filters: {
+				section: section,
+				tabSelected: tabSelected,
+			},
+			stop: false,
+		}),
+		[section,tabSelected],
+	);
+
+    const { data, loading } = useWidgetFetch({config: fetchConfig});
+
+    const selectOptions = useMemo(
+		() => [
+			{ label: t("Daily"), value: "daily" },
+			{ label: t("Weekly"), value: "weekly" },
+			{ label: t("Monthly"), value: "monthly" },
+		],
+		[t],
+	);
+
+    const chartConfig = useKnowledgeAccumulation({
+        data, 
+        timeFilter, 
+        isConsolidation: tabSelected === "dataPoints", 
+        t, 
+        theme, 
+        currentLanguage: user?.language || "en"
+    });
+
+    return (
+       <Widget
+        title={t("Accumulation")}
+        loading={loading}
+        className="with-border-header no-px-body"
+        addedHeader={
+            <>
+                <div className="flex-1" />
+                <Select
+                    value={timeFilter}
+                    style={{ width: 100 }}
+                    onChange={setTimeFilter}
+                    options={selectOptions}
+                />
+            </>
+        }
+       >
+        <LineChart {...chartConfig} height="400px" t={t} />
+       </Widget>
+    )
+}
+
+export default AccumulationGraph

package/src/@daf/pages/dashboards/UserDashboard/components/ContributionsGraph/helper.js

@@ -0,0 +1,75 @@
+export const mapData = ({ t, data = [], tabSelected }) => {
+	if (!data.length) {
+		return [
+			{ category: "", type: t("Stakeholders"), value: 0.5 },
+			{ category: "", type: t("Locations"), value: 0.5 },
+			{ category: "", type: t("Events"), value: 0.5 },
+			{ category: " ", type: "Stakeholders", value: 0.5 },
+			{ category: " ", type: "Locations", value: 0.5 },
+			{ category: " ", type: t("Events"), value: 0.5 },
+			{ category: "  ", type: t("Stakeholders"), value: 0.5 },
+			{ category: "  ", type: t("Locations"), value: 0.5 },
+			{ category: "  ", type: t("Events"), value: 0.5 },
+			{ category: "   ", type: t("Stakeholders"), value: 0.5 },
+			{ category: "   ", type: t("Locations"), value: 0.5 },
+			{ category: "   ", type: t("Events"), value: 0.5 },
+		];
+	}
+
+	const metricTypes = {
+		stakeholders: tabSelected === "dataPoints" ? t("Stakeholders Data") : t("Stakeholders"),
+		locations: tabSelected === "dataPoints" ? t("Locations Data") : t("Locations"),
+		events: tabSelected === "dataPoints" ? t("Events Data") : t("Events"),
+	};
+
+	const flattened = [];
+	data.forEach((item) => {
+		Object.entries(metricTypes).forEach(([key, type]) => {
+			flattened.push({
+				category: (item.name || "").trim(),
+				type,
+				value: item[key] || 0,
+			});
+		});
+	});
+
+	const categoryTotals = data.reduce((acc, item) => {
+		const catName = (item.name || "").trim();
+		const total = (item.stakeholders || 0) + (item.locations || 0) + (item.events || 0);
+		acc[catName] = total;
+		return acc;
+	}, {});
+	flattened.sort((a, b) => categoryTotals[b.category] - categoryTotals[a.category]);
+
+	const uniqueCategories = [...new Set(flattened.map((d) => d.category))];
+	const topCategories = uniqueCategories.slice(0, 3);
+
+	const othersTotals = Object.keys(metricTypes).reduce((acc, key) => {
+		acc[key] = 0;
+		return acc;
+	}, {});
+
+	const result = [];
+	flattened.forEach((entry) => {
+		if (topCategories.includes(entry.category)) {
+			result.push(entry);
+		} else {
+			const foundKey = Object.entries(metricTypes).find(([, v]) => v === entry.type)?.[0];
+			if (foundKey) {
+				othersTotals[foundKey] += entry.value;
+			}
+		}
+	});
+
+	if (data.length > 3) {
+		Object.entries(metricTypes).forEach(([key, type]) => {
+			result.push({
+				category: t("Others"),
+				type,
+				value: othersTotals[key],
+			});
+		});
+	}
+
+	return result;
+}

package/src/@daf/pages/dashboards/UserDashboard/components/ContributionsGraph/hook.js

@@ -0,0 +1,46 @@
+import { useMemo } from "react";
+import { mapData } from "./helper.js";
+
+export const useContributionsGraph = ({
+    data,
+    tabSelected,
+    t = () => {},
+    theme = {}
+}) => {
+    const _data = useMemo(() => {
+		return mapData({ t, data, tabSelected });
+	}, [data, t]);
+
+    const chartConfig = useMemo(() => {
+        return {
+            data: _data,
+            xField: "value",
+            yField: "category",
+            seriesField: "type",
+            isGroup: true,
+            renderTooltipContent: (title, items) => {
+				const isEmpty = !data.length;
+
+				const tooltipItems = items.map((item) => ({
+					label: item.name,
+					color: item.color,
+					value: !isEmpty ? item.value : 0,
+				}));
+
+				return {
+					title: isEmpty ? t("Contributions") : title?.replace("\n", " "),
+					items: tooltipItems,
+					fitContent: true,
+				};
+			},
+            color: [
+                theme.colorPrimary7,
+                theme.colorPrimary4,
+                theme.colorPrimary9,
+            ],
+        }
+
+    }, [_data, t, theme]);
+
+    return chartConfig;
+}

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

@@ -0,0 +1,49 @@
+import React, { useMemo } from 'react'
+import { useWidgetFetch } from '../../../../../hooks/useWidgetFetch.js'
+import Widget from '../../../../../core/components/Dashboard/Widget/index.jsx'
+import BarChart from '../../../../../core/components/Charts/BarChart/index.jsx'
+import { useContributionsGraph } from './hook.js'
+
+const defaultFetchConfig = {
+	basepath: "analytics",
+	url: "/widgets/contributions",
+	filters: {},
+	defaultData: [],
+};
+
+function ContributionsGraph({
+	tabSelected = "dataFlow",
+	section = "data-compilation",
+	t=() => {},
+	user = {},
+	theme = {}
+}) {
+
+    const fetchConfig = useMemo(
+		() => ({
+			...defaultFetchConfig,
+			filters: {
+				section: section,
+				tabSelected: tabSelected,
+			},
+			stop: false,
+		}),
+		[section, tabSelected],
+	);
+
+    const { data, loading } = useWidgetFetch({config: fetchConfig});
+
+    const chartConfig = useContributionsGraph({data: data, tabSelected: tabSelected, t: t, theme: theme});
+
+    return (
+        <Widget
+            loading={loading}
+            title={t("Contributions")}
+            className="with-border-header h-w-btn-header no-px-body"
+        >
+            <BarChart {...chartConfig} height="400px" t={t} />
+        </Widget>
+    )
+}
+
+export default ContributionsGraph

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

@@ -0,0 +1,26 @@
+import React from 'react'
+import Segment from '../../../../../core/components/Segment/index.jsx'
+import CustomIcon from '../../../../../core/components/Icon/CustomIcon.jsx'
+
+function CustomSegment({ options = [], selected, onChange }) {
+    return (
+      <Segment
+        optionStyle={{
+          padding: "6px 12px",
+        }}
+        style={{
+          backgroundColor: "#F3F4F6",
+        }}
+        options={options.map((option) => ({
+          label: <CustomIcon name={option.label} width={18} height={18} />,
+          value: option.value,
+          disabled: option.disabled,
+          tooltip: option.tooltip,
+        }))}
+        defaultSelected={selected}
+        onChange={onChange}
+      />
+    );
+  }
+
+export default CustomSegment

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

@@ -0,0 +1,18 @@
+import React from 'react'
+
+
+const defaultFetchConfig = {
+	basepath: "analytics",
+	url: "/widgets/datachain-of-custody",
+	filters: {},
+	defaultData: [],
+};
+
+
+function DataChainOfCustody({t = () => {}, }) {
+  return (
+    <div>DataChainOfCustody</div>
+  )
+}
+
+export default DataChainOfCustody

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

@@ -0,0 +1,69 @@
+import React, { useState } from 'react'
+import Widget from '../../../../../core/components/Dashboard/Widget/index.jsx'
+import CustomSegment from '../CustomSegment/index.jsx'
+import AccumulationGraph from '../AccumulationGraph/index.jsx'
+import ContributionsGraph from '../ContributionsGraph/index.jsx'
+import Triangulation from '../Triangulation/index.jsx'
+
+function DataCompilation({
+    t = () => {},
+    user = {},
+    theme = {}
+}) {
+    const [dataCompilationSelected, setDataCompilationSelected] = useState("dataFlow");
+    return (
+        <Widget
+            title={t("Data Compilation")}
+            className="with-border-header"
+            expandable
+            defaultExpanded
+            addedHeaderFirst
+            addedHeader={
+                <>
+                    <div className="flex-1" />
+                    <CustomSegment
+                        selected={dataCompilationSelected}
+                        onChange={setDataCompilationSelected}
+                        options={[
+                        {
+                            label: "DataFlow02",
+                            value: "dataFlow",
+                            tooltip: t("Information Subjects"),
+                        },
+                        {
+                            label: "DataPoints",
+                            value: "dataPoints",
+                            tooltip: t("Data Points"),
+                        },
+                        ]}
+                    />
+                </>
+            }
+        >
+            <div className="flex flex-row flex-col-mobile gap-6">
+                <AccumulationGraph 
+                    tabSelected={dataCompilationSelected} 
+                    t={t} 
+                    user={user} 
+                    theme={theme} 
+                />
+                <ContributionsGraph 
+                    tabSelected={dataCompilationSelected} 
+                    t={t} 
+                    user={user} 
+                    theme={theme} 
+                />
+                <Triangulation
+                    tabSelected={dataCompilationSelected}
+                    isDataflow={dataCompilationSelected === "dataFlow"}
+                    t={t}
+                    user={user}
+                    theme={theme}
+                />
+            </div>
+
+        </Widget>
+  )
+}
+
+export default DataCompilation

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

@@ -0,0 +1,72 @@
+import React, { useState } from 'react'
+import Widget from '../../../../../core/components/Dashboard/Widget/index.jsx'
+import CustomSegment from '../CustomSegment/index.jsx'
+import AccumulationGraph from '../AccumulationGraph/index.jsx'
+import ContributionsGraph from '../ContributionsGraph/index.jsx'
+import Triangulation from '../Triangulation/index.jsx'
+
+function DataConsilidation({
+    t = () => {},
+    user = {},
+    theme = {}
+}) {
+    const [dataConsolidationSelected, setDataConsolidationSelected] = useState("dataFlow");
+    return (
+        <Widget
+            title={t("Data Consolidation")}
+            className="with-border-header"
+            expandable
+            defaultExpanded
+            addedHeaderFirst
+            addedHeader={
+                <>
+                    <div className="flex-1" />
+                    <CustomSegment
+                        selected={dataConsolidationSelected}
+                        onChange={(val) => setDataConsolidationSelected(val)}
+                        options={[
+                          {
+                            label: "DataFlow02",
+                            value: "dataFlow",
+                            tooltip: t("Information Subjects"),
+                          },
+                          {
+                            label: "DataPoints",
+                            value: "dataPoints",
+                            tooltip: t("Data Points"),
+                          },
+                        ]}
+                      />
+                </>
+            }
+        >
+            <div className="flex flex-row flex-col-mobile gap-6">
+                <AccumulationGraph 
+                    tabSelected={dataConsolidationSelected}
+                    section="data-consolidation"
+                    t={t} 
+                    user={user} 
+                    theme={theme} 
+                />
+                <ContributionsGraph 
+                    tabSelected={dataConsolidationSelected}
+                    section="data-consolidation" 
+                    t={t} 
+                    user={user} 
+                    theme={theme} 
+                />
+                <Triangulation
+                    tabSelected={dataConsolidationSelected}
+                    section="data-consolidation"
+                    isDataflow={dataConsolidationSelected === "dataFlow"}
+                    t={t}
+                    user={user}
+                    theme={theme}
+                />
+            </div>
+
+        </Widget>
+  )
+}
+
+export default DataConsilidation