datastake-daf 0.6.749 → 0.6.751

package/src/@daf/pages/Summary/Operator/index.jsx

@@ -66,7 +66,7 @@ const OperatorSummary = ({
         <DashboardLayout
             header={
                 <Header 
-                    title={t('Operator Summary')}
+                    title={hasSelect ? t("Operator Review") : (singleItemData?.name || "") + " " + t("Summary")}
                     className="with-border-header h-w-btn-header no-px-body"
                     goBackTo={!hasSelect && goBack}
                     addedHeaderFirst
@@ -130,7 +130,7 @@ const OperatorSummary = ({
                 selectedPartners={selectedPartners}
                 t={t}
                 id={params?.id || selectedItem}
-                data={hasSelect ? singleItemData : data}
+                data={singleItemData}
                 loading={loading}
             />
             <section>
@@ -138,6 +138,8 @@ const OperatorSummary = ({
                     selectedPartners={selectedPartners}
                     t={t}
                     id={params?.id || selectedItem}
+                    subject="stakeholder"
+                    partners={partners}
                 />
             </section>
             <section>
@@ -148,7 +150,7 @@ const OperatorSummary = ({
                     options={options}
                     goTo={goTo}
                     getRedirectLink={getRedirectLink}
-                    operatorData={hasSelect ? singleItemData : data}
+                    operatorData={singleItemData}
                 />
             </section>
             <section>
@@ -159,7 +161,7 @@ const OperatorSummary = ({
                     options={options}
                     goTo={goTo}
                     getRedirectLink={getRedirectLink}
-                    operatorData={hasSelect ? singleItemData : data}
+                    operatorData={singleItemData}
                 />
             </section>
 

package/src/@daf/pages/Summary/components/InformationAvailability/components/Contributions/index.js

@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useMemo } from 'react'
 import Widget from '../../../../../../core/components/Dashboard/Widget/index.jsx';
 import BarChart from '../../../../../../core/components/Charts/BarChart/index.jsx';
 
@@ -6,7 +6,18 @@ const Contributions = ({
     data = {},
     loading = false,
     t = () => {},
+    partners = [],
 }) => {
+    const dataPoints = data?.datapointsByAuthor || {};
+    const _data = useMemo(() => {
+        return Object.keys(dataPoints).map((key) => {
+            return {
+                name: partners?.find((partner) => partner.id === key)?.name,
+                datapoints: dataPoints[key],
+            }
+        })
+    }, [dataPoints, partners]);
+
     return (
         <Widget
             title={t("Contributions")}
@@ -14,16 +25,16 @@ const Contributions = ({
             loading={loading}
         >
             <BarChart
-                data={data?.stakeholders || []}
-                xFieldKey="completedDatapoints"
-                yFieldKey="author"
+                data={_data || []}
+                xFieldKey="datapoints"
+                yFieldKey="name"
                 renderTooltipContent={(title, item) => {
                     return {
                         title: title,
                         items: [
                             {
                                 label: t("Datapoints"),
-                                value: item?.[0]?.data?.completedDatapoints || 0,
+                                value: item?.[0]?.data?.datapoints || 0,
                             },
                         ],
                     };

package/src/@daf/pages/Summary/components/InformationAvailability/components/InformationCompleteness/index.js

@@ -7,11 +7,10 @@ const InformationCompleteness = ({
     loading = false,
     t = () => {},
 }) => {
-
     const graphData = useMemo(() => {
         const keys = {
-          ownDataCompletion: data?.ownDataCompletion || 0,
-          consolidatedCompletion: data?.consolidatedCompletion || 0,
+          ownDataCompletion: typeof data?.percentage === "object" ? data?.percentage?.percentage : data?.percentage || 0,
+          consolidatedCompletion: data?.consolidatedPercentage || 0,
         };
     
         const _data = Object.keys(keys).map((key) => {

package/src/@daf/pages/Summary/components/InformationAvailability/index.js

@@ -8,15 +8,18 @@ const InformationAvailability = ({
     selectedPartners = {},
     t = () => {},
     id,
+    subject,
+    partners
 }) => {
     const defaultFetchConfig = useMemo(
 		() => ({
-            basepath: "analytics",
-			url: "/widgets/completeness",
+            basepath: subject === "stakeholder" ? "stakeholder" : "location",
+			url: `/completion/${id}`,
 			defaultData: [],
 			stop: selectedPartners?.loading,
 			filters: {
-				datastakeId: id,
+				// datastakeId: id,
+                scope: subject === "stakeholder" ? "operatorInfo" : "locationInfo",
 				sources: selectedPartners?.partners || [],
 			},
 		}),
@@ -33,7 +36,7 @@ const InformationAvailability = ({
         >
             <div className="flex flex-row flex-col-mobile gap-6">
                 <InformationCompleteness data={data} loading={loading} t={t} />
-                <Contributions data={data} loading={loading} t={t} />
+                <Contributions data={data} loading={loading} t={t} partners={partners} />
             </div>
         </Widget>
     )

package/src/@daf/pages/Summary/hook.js

@@ -129,11 +129,11 @@ export const useSummary = ({
 	}, [params?.id, hasSelect, getOne, getMultiple, _partners, isPdf, id, filters]);
 
     	useEffect(() => {
-		if (selectedItem && _partners !== undefined) {
+		if ((selectedItem || params?.id) && _partners !== undefined) {
 			const fetchSingleItem = async () => {
 				setLoading(true);
 				try {
-					const { data } = await service.getOne(selectedItem, { sources: _partners });
+					const { data } = await service.getOne(selectedItem || params?.id, { sources: _partners });
 					setSingleItemData(data);
 				} catch (error) {
 					console.log(error);
@@ -143,7 +143,7 @@ export const useSummary = ({
 			};
 			fetchSingleItem();
 		}
-	}, [selectedItem, service, _partners]);
+	}, [selectedItem, service, _partners, params?.id]);
 
     useEffect(() => {
 		_setPartners(selectedPartners?.partners);

package/src/constants/locales/en/translation.js

@@ -1,4 +1,12 @@
 const en = {
+  "no-board-members": "No board members identified",
+  "no-management": "No management identified",
+  "no-beneficiaries": "No beneficiaries identified",
+  "no-stakeholders": "No stakeholders identified",
+  "no-operators": "No operators identified",
+  "no-traders": "No traders identified",
+  "no-government": "No government identified",
+  "no-other": "No other identified",
   "No planning required": "No planning required",
   "No evaluation required": "No evaluation required",
   "No improvement required": "No improvement required",

package/src/constants/locales/fr/translation.js

@@ -1,4 +1,12 @@
 const fr = {
+	"no-board-members": "Aucun membre du conseil d'administration identifié",
+	"no-management": "Aucun management identifié",
+	"no-beneficiaries": "Aucun bénéficiaire identifié",
+	"no-stakeholders": "Aucun stakeholder identifié",
+	"no-operators": "Aucun opérateur identifié",
+	"no-traders": "Aucun négociant identifié",
+	"no-government": "Aucun gouvernement identifié",
+	"no-other": "Aucun autre identifié",
 	"No planning required": "Pas de planification requise",
 	"No evaluation required": "Pas d'évaluation requise",
 	"No improvement required": "Pas d'amélioration requise",

package/src/constants/locales/sp/translation.js

@@ -1,4 +1,12 @@
 const sp = {
+  "no-board-members": "No hay miembros del consejo identificados",
+  "no-management": "No hay gerencia identificados",
+  "no-beneficiaries": "No hay beneficiarios identificados",
+  "no-stakeholders": "No hay partes interesadas identificadas",
+  "no-operators": "No hay operadores identificados",
+  "no-traders": "No hay comerciantes identificados",
+  "no-government": "No hay gobierno identificado",
+  "no-other": "No hay otros identificados",
   "No planning required": "No se requiere planeación",
   "No evaluation required": "No se requiere evaluación",
   "No improvement required": "No se requiere mejora",