datastake-daf 0.6.839 → 0.6.841

package/dist/pages/index.js

@@ -16580,7 +16580,8 @@ function ProductionSites({
   goTo = () => {},
   getRedirectLink = () => {},
   data = [],
-  loading = false
+  loading = false,
+  APP
 }) {
   const productionSites = React.useMemo(() => {
     if (Array.isArray(data?.productionSites)) {
@@ -16601,7 +16602,7 @@ function ProductionSites({
     });
   }, [t, options, user, goTo, getRedirectLink]);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, {
-    title: t("Production Sites"),
+    title: t(APP === 'wazi' ? "Operating Sites" : "Production Site"),
     className: "with-border-header no-px-body",
     loading: loading,
     children: /*#__PURE__*/jsxRuntime.jsx(Wrapper, {
@@ -17183,7 +17184,8 @@ function SelfAssesment({
   theme = {},
   options = {},
   data,
-  loading
+  loading,
+  APP
 }) {
   return /*#__PURE__*/jsxRuntime.jsxs(DashboardLayout, {
     header: /*#__PURE__*/jsxRuntime.jsx(DAFHeader, {
@@ -17208,7 +17210,8 @@ function SelfAssesment({
         goTo: goTo,
         getRedirectLink: getRedirectLink,
         data: data,
-        loading: loading
+        loading: loading,
+        APP: APP
       })
     }), /*#__PURE__*/jsxRuntime.jsx("section", {
       children: /*#__PURE__*/jsxRuntime.jsx(AssociatedInformation$1, {
@@ -46550,7 +46553,7 @@ const getFilterConfig = ({
   const productSet = new Set();
   const allTradeMineralOptions = [...(operatorData?.suppliers || []), ...(operatorData?.clients || []), ...(operatorData?.locationSuppliers || [])].flatMap(trade => (trade?.products || []).filter(product => !!product?.typeOfProduct && !productSet.has(product.typeOfProduct)).map(product => {
     productSet.add(product.typeOfProduct);
-    const label = options?.[APP !== 'nashiriki' ? 'mineralOptions' : 'minerals']?.find(mineral => mineral.value === product.typeOfProduct)?.label;
+    const label = options?.[APP === 'nashiriki' || APP === 'wazi' ? 'mineralOptions' : 'minerals']?.find(mineral => mineral.value === product.typeOfProduct)?.label;
     return {
       value: product.typeOfProduct,
       label: label ?? product.typeOfProduct
@@ -46600,6 +46603,7 @@ const mapItem = (data, options, goTo, getRedirectLink, operatorData = {}, APP) =
       value: data.country || operatorData?.country
     },
     totalSources: data.sources ?? 0,
+    product: data?.product || "",
     volume: data?.volume || "",
     onClick: function () {
       if (data.type === "mineSite") {
@@ -47060,7 +47064,7 @@ const TradeRelationships = ({
       t,
       APP
     });
-  }, [filters.products, t, options?.mineralOptions, operatorData, options?.mineral, APP]);
+  }, [filters.products, t, options?.mineralOptions, operatorData, options?.minerals, APP]);
   const {
     graphData,
     loading,
@@ -47113,8 +47117,11 @@ const TradeRelationships = ({
             return c.totalSources || 0;
           },
           renderTooltipItems: data => [{
+            label: "Product",
+            value: findOptions(data?.product, options?.mineralOptions) || "-"
+          }, {
             label: "Volume",
-            value: data?.volume || "--"
+            value: data?.volume || "-"
           }],
           maxZoom: 1.2,
           minZoom: 0.4,
@@ -47151,7 +47158,7 @@ const IconNodesConfig$1 = {
     emptyName: "no-management"
   },
   shareholders: {
-    name: "Stakeholders",
+    name: "Shareholders",
     icon: "PercentCircle",
     order: 4,
     emptyName: "no-stakeholders"
@@ -64496,7 +64503,7 @@ function ProblemSolvers({
   }, [data]);
   const isEmpty = !pieData.length;
   const getTooltipChildren = React.useCallback(items => {
-    const item = items[0];
+    const item = Array.isArray(items) ? items[0] : items;
     return renderTooltipJsx({
       title: item?.label || t("Undetermined"),
       link: true,

package/dist/utils/index.js

@@ -7850,6 +7850,7 @@ function mapUser(user) {
 }
 
 const en = {
+  "Operating Sites": "Operating Sites",
   "Identified Mine Sites": "Identified Mine Sites",
   "Associated Documents": "Associated Documents",
   "Male": "Male",
@@ -7878,6 +7879,7 @@ const en = {
   "events": "Events",
   "merge-locations": "Merge Locations",
   "edit-account": "Edit Account",
+  "testimonials": "Testimonials",
   "Are-you-sure-you-want-to-remove-the-user-from-this-account?": "Are you sure you want to remove the user from this account?",
   "The-user-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.": "The user will lose access to the application and to all data created for this account.",
   "merge": "Merge",
@@ -9221,6 +9223,7 @@ const en = {
 };
 
 const fr = {
+  "Operating Sites": "Sites d’Exploitation",
   "Identified Mine Sites": "Sites miniers identifiés",
   "Associated Documents": "Documents associés",
   "Male": "Masculin",
@@ -11158,6 +11161,7 @@ const fr = {
 };
 
 const sp = {
+  "Operating Sites": "Sitios de Operación",
   "Identified Mine Sites": "Sitios mineros identificados",
   "Associated Documents": "Documentos asociados",
   "Male": "Masculino",

package/package.json

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

package/src/@daf/pages/Dashboards/ConflictManagement/components/RisksWidget/components/ProblemSolver/index.js

@@ -58,7 +58,7 @@ function ProblemSolvers({ selectedPartners = {}, loading: parentLoading = false,
     const isEmpty = !pieData.length;
 
     const getTooltipChildren = useCallback((items) => {
-        const item = items[0]; 
+        const item = Array.isArray(items) ? items[0] : items;
         
         return renderTooltipJsx({
             title: item?.label || t("Undetermined"),

package/src/@daf/pages/Dashboards/SelfAssesment/components/ProductionSites/index.jsx

@@ -13,6 +13,7 @@ function ProductionSites({
     getRedirectLink = () => {},
     data = [],
     loading = false,
+    APP,
 }) {
 
     const productionSites = useMemo(() => {
@@ -32,7 +33,7 @@ function ProductionSites({
 
     return (
         <Widget
-            title={t("Production Sites")}
+            title={t(APP === 'wazi' ? "Operating Sites" : "Production Site")}
             className="with-border-header no-px-body"
             loading={loading}
         >

package/src/@daf/pages/Dashboards/SelfAssesment/index.jsx

@@ -14,7 +14,8 @@ function SelfAssesment({
     theme = {},
     options = {},
     data,
-    loading
+    loading,
+    APP,
 }) {
     return (
         <DashboardLayout
@@ -29,7 +30,7 @@ function SelfAssesment({
                 <OrganisationInformation t={t} user={user} goTo={goTo} getRedirectLink={getRedirectLink} theme={theme} data={data} loading={loading}/>
             </section>
             <section>
-                <ProductionSites t={t} options={options} user={user} goTo={goTo} getRedirectLink={getRedirectLink} data={data} loading={loading} />
+                <ProductionSites t={t} options={options} user={user} goTo={goTo} getRedirectLink={getRedirectLink} data={data} loading={loading} APP={APP} />
             </section>
             <section>
                 <AssociatedInformation t={t} user={user} goTo={goTo} getRedirectLink={getRedirectLink} data={data} loading={loading} theme={theme} options={options} />

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

@@ -0,0 +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>
+//   );
+// }

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

@@ -18,7 +18,7 @@ export const IconNodesConfig = {
 		emptyName: "no-management",
 	},
 	shareholders: {
-		name: "Stakeholders",
+		name: "Shareholders",
 		icon: "PercentCircle",
 		order: 4,
 		emptyName: "no-stakeholders",

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

@@ -15,8 +15,11 @@ export const getFilterConfig = ({operatorData = {}, options = {}, filters = {},
             .map((product) => {
                 productSet.add(product.typeOfProduct);
 
-                const label = options?.[APP !== 'nashiriki' ? 'mineralOptions' : 'minerals']?.find(
-                    (mineral) => mineral.value === product.typeOfProduct,
+const label = options?.[
+  APP === 'nashiriki' || APP === 'wazi'
+    ? 'mineralOptions'
+    : 'minerals'
+]?.find((mineral) => mineral.value === product.typeOfProduct,
                 )?.label;
 
                 return {
@@ -82,6 +85,7 @@ export const mapItem = (data, options, goTo, getRedirectLink, operatorData = {},
             value: data.country || operatorData?.country,
         },
         totalSources: data.sources ?? 0,
+        product: data?.product || "",
         volume: data?.volume || "",
         onClick: function () {
             if (data.type === "mineSite") {

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

@@ -3,6 +3,9 @@ import { getFilterConfig } from './helper.js';
 import { useTradeRelationship } from './hook.js';
 import Widget from '../../../../../core/components/Dashboard/Widget/index.jsx';
 import TradeRelationship from '../../../../../core/components/Graphs/TradeRelationship/index.jsx';
+import { findOptions } from '../../../../../../helpers/StringHelper.js';
+
+
 
 const TradeRelationships = ({
     t = () => {},
@@ -23,7 +26,7 @@ const TradeRelationships = ({
 
     const filterConfig = useMemo(() => {
         return getFilterConfig({operatorData, options, filters, t, APP});
-	}, [filters.products, t, options?.mineralOptions, operatorData, options?.mineral, APP]);
+	}, [filters.products, t, options?.mineralOptions, operatorData, options?.minerals, APP]);
 
     const { graphData, loading, fetchedProducts, setFetchedProducts } = useTradeRelationship({
         id,
@@ -68,12 +71,16 @@ const TradeRelationships = ({
 						getTotal={(c) => {
 							return c.totalSources || 0;
 						}}
-						renderTooltipItems={(data) => [
-							{
-								label: "Volume",
-								value: data?.volume || "--",
-							},
-						]}
+					renderTooltipItems={(data) => [
+						{
+							label: "Product",
+							value: findOptions(data?.product, options?.mineralOptions )|| "-",
+						},
+						{
+							label: "Volume",
+							value: data?.volume || "-",
+						},
+					]}
 						maxZoom={1.2}
 						minZoom={0.4}
 						tooltipTitle="Trade"

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

@@ -1,4 +1,5 @@
 const en = {
+  "Operating Sites": "Operating Sites",
   "Identified Mine Sites": "Identified Mine Sites",
   "Associated Documents": "Associated Documents",
   "Male": "Male",
@@ -27,6 +28,7 @@ const en = {
   "events": "Events",
   "merge-locations": "Merge Locations",
   "edit-account": "Edit Account",
+  "testimonials": "Testimonials",
   "Are-you-sure-you-want-to-remove-the-user-from-this-account?": "Are you sure you want to remove the user from this account?",
   "The-user-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.": "The user will lose access to the application and to all data created for this account.",
   "merge": "Merge",

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

@@ -1,4 +1,5 @@
 const fr = {
+  "Operating Sites": "Sites d’Exploitation",
 	"Identified Mine Sites": "Sites miniers identifiés",
 	"Associated Documents": "Documents associés",
 	"Male": "Masculin",

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

@@ -1,4 +1,5 @@
 const sp = {
+  "Operating Sites": "Sitios de Operación",
   "Identified Mine Sites": "Sitios mineros identificados",
   "Associated Documents": "Documentos asociados",
   "Male": "Masculino",

package/src/index.js

@@ -209,4 +209,9 @@ export { default as SettingsView } from "./@daf/core/components/Screens/Settings
 export { default as SettingsEdit } from "./@daf/core/components/Screens/Settings/Edit/index.js";
 export { default as SettingsHeader } from "./@daf/core/components/Screens/Settings/components/Header/index.js";
 export { default as SettingsMenu } from "./@daf/core/components/Screens/Settings/components/Menu/index.js";
-export { INPUT_TYPES, ACTIVE_FORM_KEY, PLACEHOLDER, getDefaultActiveForm } from "./@daf/core/components/Screens/Settings/config.js";
+export { INPUT_TYPES, ACTIVE_FORM_KEY, PLACEHOLDER, getDefaultActiveForm } from "./@daf/core/components/Screens/Settings/config.js";
+
+
+
+// Reset Password
+// export { default as ResetPassword } from "./@daf/pages/ResetPassword/index.jsx";

package/build/manifest.json

@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}

package/build/robots.txt

@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow: