datastake-daf 0.6.842 → 0.6.844

package/src/@daf/pages/ResetPassword/index.jsx

@@ -1,228 +1,228 @@
-// import React from "react";
-// import DafButton from "../../../Button/index.jsx";
-// import Loading from "../../../Loading/index.jsx";
-// import AuthForm from "../../../AuthForm/index.jsx";
-
-// const step = 1;
-
-// export default function ResetPassword({
-//   resetRequestSuccedded,
-//   resetRequestError,
-//   submitting,
-//   requestResetPassword,
-//   resetPassword,
-//   params: propParams = {},
-//   Layout,
-//   goTo,
-//   t,
-//   theme,
-//   errors,
-
-//   loginPath: loginPathProp,
-// }) {
-//   const { app, confirmationToken } = propParams;
-
-//   const getLogInLink = () => {
-//     if (loginPathProp) return loginPathProp;
-//     if (app) return `/${app}/login`;
-//     return "/login";
-//   };
-
-//   const handleGoToLogin = () => {
-//     const link = getLogInLink();
-//     if (goTo && typeof goTo === "function") {
-//       goTo(link);
-//     } else {
-//       window.location.href = link;
-//     }
-//   };
-
-//   const title = !confirmationToken
-//     ? resetRequestSuccedded
-//       ? "Thank you"
-//       : "Reset Password"
-//     : resetRequestSuccedded
-//       ? "Password updated"
-//       : "Create Password";
-
-//   const subTitle = !confirmationToken
-//     ? resetRequestSuccedded
-//       ? "A password reset link has been sent to your email address. If you can’t find the message in your inbox, please check your spam folder!"
-//       : "Please enter your email, to get a link and request a new password."
-//     : resetRequestSuccedded
-//       ? "Your password has been updated, click in the button below to log in."
-//       : "Please set up your new password.";
-
-//   const requestResetFields = [
-//     {
-//       name: "email",
-//       label: t("Email"),
-//       type: "input",
-//       required: true,
-//       rules: [
-//         {
-//           required: true,
-//           message: t("errors::email should not be empty"),
-//         },
-//         {
-//           pattern:
-//             /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/,
-//           message: t("errors::email is not valid"),
-//         },
-//       ],
-//       placeholder: t("Email"),
-//     },
-//   ];
-
-//   const resetPasswordFields = [
-//     {
-//       name: "password",
-//       label: t("Enter password"),
-//       type: "password",
-//       required: true,
-//       rules: [
-//         {
-//           required: true,
-//           message: t("errors::password should not be empty"),
-//         },
-//       ],
-//       placeholder: t("••••••••"),
-//     },
-//     {
-//       name: "confirmPassword",
-//       label: t("Confirm password"),
-//       type: "password",
-//       required: true,
-//       dependencies: ["password"],
-//       rules: [
-//         {
-//           required: true,
-//           message: t("errors::password should not be empty"),
-//         },
-//         ({ getFieldValue }) => ({
-//           validator(rule, value) {
-//             if (!value || getFieldValue("password") === value) {
-//               return Promise.resolve();
-//             }
-//             return Promise.reject(t("errors::passwordNotMatch"));
-//           },
-//         }),
-//       ],
-//       placeholder: t("••••••••"),
-//     },
-//   ];
-
-//   const handleRequestResetSubmit = (values) => {
-//     requestResetPassword(values);
-//   };
-
-//   const handleResetPasswordSubmit = (values) => {
-
-//     resetPassword({
-//       ...values,
-//       passConfirmationToken: confirmationToken,
-//     });
-//   };
-
-//   const currentTheme = theme || window.theme;
-
-//   const Content = (
-//     <>
-//       {!resetRequestSuccedded && !confirmationToken && (
-//         <>
-//           <AuthForm
-//             fields={requestResetFields}
-//             onSubmit={handleRequestResetSubmit}
-//             submitText={t("Get Link")}
-//             errors={errors}
-//             t={t}
-//             executeRecaptcha={() => Promise.resolve(true)}
-//             theme={currentTheme}
-//             submitButtonProps={{
-//               loading: submitting,
-//             }}
-//           />
-//           <div className="mt-4">
-//             <DafButton
-//               type="default"
-//               className="normal-br"
-//               style={
-//                 currentTheme
-//                   ? {
-//                       borderColor: currentTheme.colorPrimary,
-//                       color: currentTheme.colorPrimary,
-//                     }
-//                   : {}
-//               }
-//               onClick={handleGoToLogin}
-//             >
-//               {t("Back")}
-//             </DafButton>
-//           </div>
-
-//           {resetRequestError ? (
-//             <div
-//               className="ant-form-item-explain errors-cont no-pt mt-3"
-//               style={{ color: "#ff4d4f" }}
-//             >
-//               {t(resetRequestError)}
-//             </div>
-//           ) : null}
-//         </>
-//       )}
-
-//       {!resetRequestSuccedded && confirmationToken && (
-//         <AuthForm
-//           fields={resetPasswordFields}
-//           onSubmit={handleResetPasswordSubmit}
-//           submitText={t("Reset Password")}
-//           errors={errors}
-//           t={t}
-//           executeRecaptcha={() => Promise.resolve(true)}
-//           theme={currentTheme}
-//           submitButtonProps={{
-//             loading: submitting,
-//           }}
-//         />
-//       )}
-
-//       {resetRequestSuccedded && confirmationToken && (
-//         <div className="buttons">
-//           <DafButton
-//             type="primary"
-//             className="normal-br"
-//             style={
-//               currentTheme
-//                 ? {
-//                     backgroundColor: currentTheme.colorPrimary,
-//                     borderColor: currentTheme.colorPrimary,
-//                   }
-//                 : {}
-//             }
-//             onClick={handleGoToLogin}
-//           >
-//             {t("Log In")}
-//           </DafButton>
-//         </div>
-//       )}
-
-//       {resetRequestSuccedded && !confirmationToken && null}
-//     </>
-//   );
-
-//   if (Layout) {
-//     return (
-//       <Layout app={app} step={step} title={title} subTitle={subTitle}>
-//         {Content}
-//       </Layout>
-//     );
-//   }
-
-//   return (
-//     <div style={{ padding: 20, maxWidth: 400, margin: "0 auto" }}>
-//       <h2>{title}</h2>
-//       <p>{subTitle}</p>
-//       {Content}
-//     </div>
-//   );
-// }
+import React from "react";
+import DafButton from "../../../Button/index.jsx";
+import Loading from "../../../Loading/index.jsx";
+import AuthForm from "../../../AuthForm/index.jsx";
+
+const step = 1;
+
+export default function ResetPassword({
+  resetRequestSuccedded,
+  resetRequestError,
+  submitting,
+  requestResetPassword,
+  resetPassword,
+  params: propParams = {},
+  Layout,
+  goTo,
+  t,
+  theme,
+  errors,
+
+  loginPath: loginPathProp,
+}) {
+  const { app, confirmationToken } = propParams;
+
+  const getLogInLink = () => {
+    if (loginPathProp) return loginPathProp;
+    if (app) return `/${app}/login`;
+    return "/login";
+  };
+
+  const handleGoToLogin = () => {
+    const link = getLogInLink();
+    if (goTo && typeof goTo === "function") {
+      goTo(link);
+    } else {
+      window.location.href = link;
+    }
+  };
+
+  const title = !confirmationToken
+    ? resetRequestSuccedded
+      ? "Thank you"
+      : "Reset Password"
+    : resetRequestSuccedded
+      ? "Password updated"
+      : "Create Password";
+
+  const subTitle = !confirmationToken
+    ? resetRequestSuccedded
+      ? "A password reset link has been sent to your email address. If you can’t find the message in your inbox, please check your spam folder!"
+      : "Please enter your email, to get a link and request a new password."
+    : resetRequestSuccedded
+      ? "Your password has been updated, click in the button below to log in."
+      : "Please set up your new password.";
+
+  const requestResetFields = [
+    {
+      name: "email",
+      label: t("Email"),
+      type: "input",
+      required: true,
+      rules: [
+        {
+          required: true,
+          message: t("errors::email should not be empty"),
+        },
+        {
+          pattern:
+            /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/,
+          message: t("errors::email is not valid"),
+        },
+      ],
+      placeholder: t("Email"),
+    },
+  ];
+
+  const resetPasswordFields = [
+    {
+      name: "password",
+      label: t("Enter password"),
+      type: "password",
+      required: true,
+      rules: [
+        {
+          required: true,
+          message: t("errors::password should not be empty"),
+        },
+      ],
+      placeholder: t("••••••••"),
+    },
+    {
+      name: "confirmPassword",
+      label: t("Confirm password"),
+      type: "password",
+      required: true,
+      dependencies: ["password"],
+      rules: [
+        {
+          required: true,
+          message: t("errors::password should not be empty"),
+        },
+        ({ getFieldValue }) => ({
+          validator(rule, value) {
+            if (!value || getFieldValue("password") === value) {
+              return Promise.resolve();
+            }
+            return Promise.reject(t("errors::passwordNotMatch"));
+          },
+        }),
+      ],
+      placeholder: t("••••••••"),
+    },
+  ];
+
+  const handleRequestResetSubmit = (values) => {
+    requestResetPassword(values);
+  };
+
+  const handleResetPasswordSubmit = (values) => {
+
+    resetPassword({
+      ...values,
+      passConfirmationToken: confirmationToken,
+    });
+  };
+
+  const currentTheme = theme || window.theme;
+
+  const Content = (
+    <>
+      {!resetRequestSuccedded && !confirmationToken && (
+        <>
+          <AuthForm
+            fields={requestResetFields}
+            onSubmit={handleRequestResetSubmit}
+            submitText={t("Get Link")}
+            errors={errors}
+            t={t}
+            executeRecaptcha={() => Promise.resolve(true)}
+            theme={currentTheme}
+            submitButtonProps={{
+              loading: submitting,
+            }}
+          />
+          <div className="mt-4">
+            <DafButton
+              type="default"
+              className="normal-br"
+              style={
+                currentTheme
+                  ? {
+                      borderColor: currentTheme.colorPrimary,
+                      color: currentTheme.colorPrimary,
+                    }
+                  : {}
+              }
+              onClick={handleGoToLogin}
+            >
+              {t("Back")}
+            </DafButton>
+          </div>
+
+          {resetRequestError ? (
+            <div
+              className="ant-form-item-explain errors-cont no-pt mt-3"
+              style={{ color: "#ff4d4f" }}
+            >
+              {t(resetRequestError)}
+            </div>
+          ) : null}
+        </>
+      )}
+
+      {!resetRequestSuccedded && confirmationToken && (
+        <AuthForm
+          fields={resetPasswordFields}
+          onSubmit={handleResetPasswordSubmit}
+          submitText={t("Reset Password")}
+          errors={errors}
+          t={t}
+          executeRecaptcha={() => Promise.resolve(true)}
+          theme={currentTheme}
+          submitButtonProps={{
+            loading: submitting,
+          }}
+        />
+      )}
+
+      {resetRequestSuccedded && confirmationToken && (
+        <div className="buttons">
+          <DafButton
+            type="primary"
+            className="normal-br"
+            style={
+              currentTheme
+                ? {
+                    backgroundColor: currentTheme.colorPrimary,
+                    borderColor: currentTheme.colorPrimary,
+                  }
+                : {}
+            }
+            onClick={handleGoToLogin}
+          >
+            {t("Log In")}
+          </DafButton>
+        </div>
+      )}
+
+      {resetRequestSuccedded && !confirmationToken && null}
+    </>
+  );
+
+  if (Layout) {
+    return (
+      <Layout app={app} step={step} title={title} subTitle={subTitle}>
+        {Content}
+      </Layout>
+    );
+  }
+
+  return (
+    <div style={{ padding: 20, maxWidth: 400, margin: "0 auto" }}>
+      <h2>{title}</h2>
+      <p>{subTitle}</p>
+      {Content}
+    </div>
+  );
+}

package/src/@daf/pages/Summary/Operator/components/KeyInformation/config.js

@@ -43,7 +43,6 @@ export const getKeyIndicatorConfig = ({ t, data = {}, options = {} }) => [
 		label: t("Legal Form"),
 		render: () => {
             const subCategory = findOptions(data?.subCategory, options?.subCategoriesOptions || options?.subCategory);
-			console.log({subCategory, initialSub: data?.subCategory, options: options?.subCategoriesOptions || options?.subCategory})
 			if(subCategory?.length > 22) {
 				const _subCategory = truncateString(subCategory, 22);
 				return <Tooltip title={subCategory}>

package/src/@daf/pages/Summary/Operator/components/TradeRelationships/helper.js

@@ -2,6 +2,7 @@ import { leftIcons, leftBackgroundColorLocation, leftBackgroundColorStakeholder,
 import { findOptions } from '../../../../../../helpers/StringHelper.js';
 
 export const getFilterConfig = ({operatorData = {}, options = {}, filters = {}, t = () => {}, APP}) => {
+    console.log({operatorData})
     const productSet = new Set();
     const allTradeMineralOptions = [
         ...(operatorData?.suppliers || []),
@@ -33,17 +34,18 @@ const label = options?.[
         return option && index === self.findIndex((o) => o.value === option.value);
     });
 
-    const value = filters.products ? { value: filters.products } : {};
-    return [
-        {
+    const value = filters?.products ? { value: filters?.products } : {};
+    return {
+        products: {
             label: t("Products"),
             placeholder: t("Select"),
             key: "products",
             type: "select",
-            ...value,
+            // ...value,
+            style: { flex: 1 },
             options: combinedMineralOptions,
         },
-    ];
+    };
 }
 
 export const getLeft = (data = {}, mapChildren = () => {}, supplierLocations = []) => {

package/src/@daf/pages/Summary/Operator/components/TradeRelationships/hook.js

@@ -1,4 +1,4 @@
-import { useEffect, useState, useMemo } from "react";
+import { useEffect, useState, useMemo, useRef } from "react";
 import { useWidgetFetch } from "../../../../../hooks/useWidgetFetch.js";
 import { leftIcons, leftBackgroundColorLocation, leftBackgroundColorStakeholder, topIcons } from './config.js';
 import { findOptions } from '../../../../../../helpers/StringHelper.js';
@@ -8,6 +8,8 @@ import { getLeft, mapItem as _mapItem } from './helper.js';
 export const useTradeRelationship = ({
     id,
     selectedPartners,
+	isProductsFilterReady,
+	hasProducts,
     options,
     goTo,
     getRedirectLink,
@@ -19,26 +21,38 @@ export const useTradeRelationship = ({
     const [graphData, setGraphData] = useState({});
 	const [loading, setLoading] = useState(false);
 	const [fetchedProducts, setFetchedProducts] = useState(false);
-
-    const config = useMemo(() => ({
-        basepath: "analytics",
-        url: `/widgets/trade-relationship-map`,
-        filters: {
+	const initFetchDoneRef = useRef(false);
+
+	const product = useMemo(() => {
+		return filters?.products
+	}, [filters?.products]);
+
+	console.log({hasProducts, product, isProductsFilterReady, stop: !selectedPartners?.partners?.length 
+		|| selectedPartners?.loading || !isProductsFilterReady  || (isProductsFilterReady && hasProducts && !product)}, 
+		!selectedPartners?.partners?.length, 
+		selectedPartners?.loading,
+		!isProductsFilterReady,
+		(isProductsFilterReady && hasProducts && !product))
+	const config = useMemo(() => ({
+		basepath: "analytics",
+		url: `/widgets/trade-relationship-map`,
+		filters: {
 			datastakeId: id,
-            product: filters?.products,
-            sources: selectedPartners?.partners || [],
-        },
-		stop: !selectedPartners?.partners?.length || selectedPartners?.loading,
-    }), [id, filters?.products, selectedPartners?.partners, selectedPartners?.loading]);
-    
-    const { data } = useWidgetFetch({config: config});
+			...(product && {product: product}),
+			sources: selectedPartners?.partners || [],
+		},
+		stop: !selectedPartners?.partners?.length 
+			  || selectedPartners?.loading || !isProductsFilterReady  || (isProductsFilterReady && hasProducts && !product)
+	}), [id, product, selectedPartners?.partners, selectedPartners?.loading, isProductsFilterReady, hasProducts]);
+	
+    const { data, loading: dataLoading } = useWidgetFetch({config: config});
 
     const mapItem = (data) => {
         return _mapItem(data, options, goTo, getRedirectLink, operatorData, APP);
     }
 
     useEffect(() => {
-		if (id && selectedPartners?.partners?.length > 0 && fetchedProducts) {
+		if (id && selectedPartners?.partners?.length > 0) {
 			const _fetch = async () => {
 				setLoading(true);
 
@@ -156,5 +170,6 @@ export const useTradeRelationship = ({
         setGraphData,
         setLoading,
         data,
+		dataLoading
     }
 }