datastake-daf 0.6.839 → 0.6.840

package/dist/components/index.js

@@ -41769,23 +41769,22 @@ function renderRepeatable(options, k, setValues, values, excludedKeys, i, formTi
   const formId = form.dataId || k;
   const allInputs = Object.keys(form.inputs).filter(i => {
     const input = form.inputs[i];
-    return !excludedKeys.includes(i) && !input.excludeFromEdit && showHideInput(input, values, undefined, undefined, setValues, "".concat(formId, ".").concat(i));
+    return !excludedKeys.includes(i) && !input.excludeFromEdit && showHideInput(input, values, undefined, undefined, setValues, `${formId}.${i}`);
   });
   return allInputs.length ? /*#__PURE__*/jsxRuntime.jsxs(React__default["default"].Fragment, {
     children: [getFormTitles(formTitles, formId, i), ['h2', 'h3', 'h4', 'h5', 'h6'].includes(form.type) ? getInputHeadLines(form.type, i, form, values) : /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
       children: [!form.repeatable ? /*#__PURE__*/jsxRuntime.jsx("h3", {
-        className: "".concat(form.titleClass ? form.titleClass : 'title-semibold-4', " mb0 ").concat(i ? 'mt-3' : ''),
+        className: `${form.titleClass ? form.titleClass : 'title-semibold-4'} mb0 ${i ? 'mt-3' : ''}`,
         children: getInputLabel(form, values)
       }) : !form.hideSectionLabel ? /*#__PURE__*/jsxRuntime.jsx("h3", {
-        className: "".concat(form.titleClass ? form.titleClass : 'title-semibold-4', " mb0 ").concat(i ? 'mt-3' : ''),
+        className: `${form.titleClass ? form.titleClass : 'title-semibold-4'} mb0 ${i ? 'mt-3' : ''}`,
         children: form.sectionLabel ? getSectionLabel(form.sectionLabel, values) : form.label ? getInputLabel(form, values) : camelCaseToTitle(k)
       }) : null, /*#__PURE__*/jsxRuntime.jsx(antd.Form.List, {
         name: formId,
-        children: (fields, _ref) => {
-          let {
-            add,
-            remove
-          } = _ref;
+        children: (fields, {
+          add,
+          remove
+        }) => {
           const formData = form.repeatable ? values[formId] || [] : values[formId] ? [values[formId]] : [];
           if (fields.length === 0) {
             const formInputs = form.inputs;
@@ -41836,7 +41835,7 @@ function renderRepeatable(options, k, setValues, values, excludedKeys, i, formTi
                     padding: '0px 5px',
                     color: '#2E90FA'
                   },
-                  children: "#".concat(field.name + 1)
+                  children: `#${field.name + 1}`
                 }), /*#__PURE__*/jsxRuntime.jsx("div", {
                   className: "remove-button-for-repeatable",
                   children: (formData.filter(k => Object.keys(k).length > 0).length >= 1 || fields.length > 1) && (typeof form.canDelete !== 'function' || form.canDelete(Array.isArray(values[formId]) ? values[formId][field.name] || {} : values[formId] || {})) ? /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
@@ -41858,8 +41857,8 @@ function renderRepeatable(options, k, setValues, values, excludedKeys, i, formTi
                   const inputId = input.dataId || inp;
                   const inputValues = Array.isArray(values[formId]) ? values[formId][field.name] || {} : values[formId] || {};
                   const value = inputValues[inputId];
-                  const commentValue = inputValues["".concat(inputId, "Comment")];
-                  const inputData = getData(formId, input, value, commentValue, "".concat(formId, "[").concat(field.name, "].").concat(inputId), "".concat(formId, ".").concat(inputId));
+                  const commentValue = inputValues[`${inputId}Comment`];
+                  const inputData = getData(formId, input, value, commentValue, `${formId}[${field.name}].${inputId}`, `${formId}.${inputId}`);
                   const subtitles = form.subtitles || null;
                   inputData.repeatIndex = field.name;
                   inputData.inputName = inputId;
@@ -41880,59 +41879,64 @@ function renderRepeatable(options, k, setValues, values, excludedKeys, i, formTi
                       message: requiredRule.message || ''
                     });
                   }
-                  return showHideInput(input, values, field.name, inputValues, setValues, "".concat(formId, "[").concat(field.name, "].").concat(inputId)) ? /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
+                  return showHideInput(input, values, field.name, inputValues, setValues, `${formId}[${field.name}].${inputId}`) ? /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
                     children: /*#__PURE__*/jsxRuntime.jsxs("div", {
-                      className: form.repeatable ? "inputs" : "",
+                      className: form.repeatable ? `inputs` : "",
                       children: [getSubtitles(subtitles, input.position, values, field.name, inputValues), ['h2', 'h3', 'h4', 'h5', 'h6'].includes(input.type) ? getInputHeadLines(input.type, i, input, values) : /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-                        children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, field), {}, {
-                          required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false
-                        }, ['total100', 'group'].includes(input.type) ? {} : {
-                          name: [field.name, inputId],
-                          fieldKey: [field.fieldKey, inputId],
-                          initialValue: inputData.value
-                        }), ['upload'].includes(input.type) ? {
-                          valuePropName: "fileList",
-                          getValueFromEvent: e => {
-                            if (Array.isArray(e)) {
-                              return e;
-                            }
-                            return e && e.fileList && e.fileList.map(f => {
-                              if (f.response) {
-                                return f.response;
+                        children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+                          ...field,
+                          required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false,
+                          ...(['total100', 'group'].includes(input.type) ? {} : {
+                            name: [field.name, inputId],
+                            fieldKey: [field.fieldKey, inputId],
+                            initialValue: inputData.value
+                          }),
+                          ...(['upload'].includes(input.type) ? {
+                            valuePropName: "fileList",
+                            getValueFromEvent: e => {
+                              if (Array.isArray(e)) {
+                                return e;
                               }
-                              return f;
-                            });
-                          }
-                        } : {}), {}, {
+                              return e && e.fileList && e.fileList.map(f => {
+                                if (f.response) {
+                                  return f.response;
+                                }
+                                return f;
+                              });
+                            }
+                          } : {}),
                           style: input.showOnView === false ? {
                             display: 'none'
-                          } : {}
-                        }, ['switch'].includes(input.type) ? {
-                          labelCol: {
-                            span: 20
-                          },
-                          style: _objectSpread2(_objectSpread2({}, input.showOnView === false ? {
-                            display: 'none'
-                          } : {}), {}, {
-                            flexDirection: 'row',
-                            justifyContent: 'space-between'
-                          })
-                        } : {}), {}, {
+                          } : {},
+                          ...(['switch'].includes(input.type) ? {
+                            labelCol: {
+                              span: 20
+                            },
+                            style: {
+                              ...(input.showOnView === false ? {
+                                display: 'none'
+                              } : {}),
+                              flexDirection: 'row',
+                              justifyContent: 'space-between'
+                            }
+                          } : {}),
                           label: getInputLabel(input, values),
                           rules: rules,
-                          className: input.comment ? "with-comment i-".concat(input.type) : "i-".concat(input.type),
+                          className: input.comment ? `with-comment i-${input.type}` : `i-${input.type}`,
                           extra: input.comment ? /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                             disabled: inputData.props.disabled,
                             type: "link",
                             onClick: () => {
                               const inputValues = Array.isArray(values[formId]) ? values[formId][field.name] || {} : values[formId] || {};
-                              inputValues["".concat(inputData.inputName, "Comment")] = !inputData.commentValue ? '' : undefined;
+                              inputValues[`${inputData.inputName}Comment`] = !inputData.commentValue ? '' : undefined;
                               if (Array.isArray(values[formId])) {
                                 values[formId][field.name] = inputValues;
                               } else {
                                 values[formId] = inputValues;
                               }
-                              setValues(_objectSpread2({}, values));
+                              setValues({
+                                ...values
+                              });
                             },
                             children: t(!inputData.commentValue ? 'Add Comment' : 'Remove Comment')
                           }) : null,
@@ -41949,9 +41953,9 @@ function renderRepeatable(options, k, setValues, values, excludedKeys, i, formTi
                             getAppHeader,
                             getApiBaseUrl
                           }) : console.log(input)
-                        })), input.comment ? /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
-                          name: [field.name, "".concat(inputData.inputName, "Comment")],
-                          fieldKey: [field.fieldKey, "".concat(inputData.inputName, "Comment")],
+                        }), input.comment ? /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+                          name: [field.name, `${inputData.inputName}Comment`],
+                          fieldKey: [field.fieldKey, `${inputData.inputName}Comment`],
                           initialValue: inputData.commentValue,
                           hidden: !inputData.commentValue,
                           children: inputTypeComponent.comment(inputData, {
@@ -41965,10 +41969,10 @@ function renderRepeatable(options, k, setValues, values, excludedKeys, i, formTi
                         }) : null]
                       })]
                     }, ii)
-                  }, "".concat(i).concat(ii)) : null;
+                  }, `${i}${ii}`) : null;
                 })
               })]
-            }, "".concat(formId, "-").concat(field.name))), form.repeatable ? /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
+            }, `${formId}-${field.name}`)), form.repeatable ? /*#__PURE__*/jsxRuntime.jsxs(antd.Button, {
               type: "dashed",
               style: {
                 margin: '10px 0px 30px',
@@ -41997,7 +42001,7 @@ const getGrouContent = (form, values, i, formId, excludedKeys, getData, setValue
   const hasLabel = label && (typeof label === 'string' && (label || '').trim() !== '' || typeof label === 'object') ? true : false;
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [hasLabel ? /*#__PURE__*/jsxRuntime.jsx("h3", {
-      className: "".concat(form.titleClass ? form.titleClass : 'title-semibold-4', " ").concat(i ? 'mt-3 mb-1' : ''),
+      className: `${form.titleClass ? form.titleClass : 'title-semibold-4'} ${i ? 'mt-3 mb-1' : ''}`,
       children: label
     }) : null, /*#__PURE__*/jsxRuntime.jsx("div", {
       className: hasLabel ? "mb-4" : "",
@@ -42006,8 +42010,8 @@ const getGrouContent = (form, values, i, formId, excludedKeys, getData, setValue
         const inputId = input.dataId || inp;
         const inputValues = Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {};
         const value = inputValues[inputId];
-        const commentValue = inputValues["".concat(inputId, "Comment")];
-        const inputData = getData(formId, input, value, commentValue, "".concat(formId, ".").concat(inputId), "".concat(formId, ".").concat(inputId));
+        const commentValue = inputValues[`${inputId}Comment`];
+        const inputData = getData(formId, input, value, commentValue, `${formId}.${inputId}`, `${formId}.${inputId}`);
         const subtitles = form.subtitles || null;
         inputData.repeatIndex = undefined;
         inputData.inputName = inputId;
@@ -42028,58 +42032,62 @@ const getGrouContent = (form, values, i, formId, excludedKeys, getData, setValue
             message: requiredRule.message || ''
           });
         }
-        return showHideInput(input, values, undefined, inputValues, setValues, "".concat(formId, ".").concat(inputId)) ? /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
+        return showHideInput(input, values, undefined, inputValues, setValues, `${formId}.${inputId}`) ? /*#__PURE__*/jsxRuntime.jsx(React__default["default"].Fragment, {
           children: /*#__PURE__*/jsxRuntime.jsxs("div", {
             children: [getSubtitles(subtitles, input.position, values, undefined, inputValues), ['h2', 'h3', 'h4', 'h5', 'h6'].includes(input.type) ? getInputHeadLines(input.type, i, input, values) : /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-              children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
-                required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false
-              }, ['total100', 'group'].includes(input.type) ? {} : {
-                name: [formId, inputId],
-                fieldKey: [formId, inputId],
-                initialValue: inputData.value
-              }), ['upload'].includes(input.type) ? {
-                valuePropName: "fileList",
-                getValueFromEvent: e => {
-                  if (Array.isArray(e)) {
-                    return e;
-                  }
-                  return e && e.fileList && e.fileList.map(f => {
-                    if (f.response) {
-                      return f.response;
+              children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+                required: inputData.rules && inputData.rules instanceof Array && inputData.rules.filter(r => r.required).length > 0 ? true : false,
+                ...(['total100', 'group'].includes(input.type) ? {} : {
+                  name: [formId, inputId],
+                  fieldKey: [formId, inputId],
+                  initialValue: inputData.value
+                }),
+                ...(['upload'].includes(input.type) ? {
+                  valuePropName: "fileList",
+                  getValueFromEvent: e => {
+                    if (Array.isArray(e)) {
+                      return e;
                     }
-                    return f;
-                  });
-                }
-              } : {}), {}, {
+                    return e && e.fileList && e.fileList.map(f => {
+                      if (f.response) {
+                        return f.response;
+                      }
+                      return f;
+                    });
+                  }
+                } : {}),
                 style: input.showOnView === false ? {
                   display: 'none'
-                } : {}
-              }, ['switch'].includes(input.type) ? {
-                labelCol: {
-                  span: 20
-                },
-                style: _objectSpread2(_objectSpread2({}, input.showOnView === false ? {
-                  display: 'none'
-                } : {}), {}, {
-                  flexDirection: 'row',
-                  justifyContent: 'space-between'
-                })
-              } : {}), {}, {
+                } : {},
+                ...(['switch'].includes(input.type) ? {
+                  labelCol: {
+                    span: 20
+                  },
+                  style: {
+                    ...(input.showOnView === false ? {
+                      display: 'none'
+                    } : {}),
+                    flexDirection: 'row',
+                    justifyContent: 'space-between'
+                  }
+                } : {}),
                 label: getInputLabel(input, values),
                 rules: rules,
-                className: input.comment ? "with-comment i-".concat(input.type) : "i-".concat(input.type),
+                className: input.comment ? `with-comment i-${input.type}` : `i-${input.type}`,
                 extra: input.comment ? /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
                   disabled: inputData.props.disabled,
                   type: "link",
                   onClick: () => {
                     const inputValues = Array.isArray(values[formId]) ? values[formId] || {} : values[formId] || {};
-                    inputValues["".concat(inputData.inputName, "Comment")] = !inputData.commentValue ? '' : undefined;
+                    inputValues[`${inputData.inputName}Comment`] = !inputData.commentValue ? '' : undefined;
                     if (Array.isArray(values[formId])) {
                       values[formId] = inputValues;
                     } else {
                       values[formId] = inputValues;
                     }
-                    setValues(_objectSpread2({}, values));
+                    setValues({
+                      ...values
+                    });
                   },
                   children: t(!inputData.commentValue ? 'Add Comment' : 'Remove Comment')
                 }) : null,
@@ -42094,9 +42102,9 @@ const getGrouContent = (form, values, i, formId, excludedKeys, getData, setValue
                   getAppHeader,
                   getApiBaseUrl
                 }) : console.log(input)
-              })), input.comment ? /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
-                name: [formId, "".concat(inputData.inputName, "Comment")],
-                fieldKey: [formId, "".concat(inputData.inputName, "Comment")],
+              }), input.comment ? /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
+                name: [formId, `${inputData.inputName}Comment`],
+                fieldKey: [formId, `${inputData.inputName}Comment`],
                 initialValue: inputData.commentValue,
                 hidden: !inputData.commentValue,
                 children: inputTypeComponent.comment(inputData, {
@@ -42110,7 +42118,7 @@ const getGrouContent = (form, values, i, formId, excludedKeys, getData, setValue
               }) : null]
             })]
           }, ii)
-        }, "".concat(i).concat(ii)) : null;
+        }, `${i}${ii}`) : null;
       })
     })]
   });
@@ -42149,10 +42157,7 @@ const useCombinedPrefilledValues = (combinedPrefilledValues, values, parentValue
       }
     });
     if (hasChanges) {
-      setValues(prevValues => ({
-        ...prevValues,
-        ...resolvedValues
-      }));
+      setValues(prevValues => _objectSpread2(_objectSpread2({}, prevValues), resolvedValues));
       MainForm.setFieldsValue(resolvedValues);
     }
   }, [values, parentValues, combinedPrefilledValues, setValues, MainForm]);

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, {
@@ -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") {
@@ -47113,6 +47117,9 @@ const TradeRelationships = ({
             return c.totalSources || 0;
           },
           renderTooltipItems: data => [{
+            label: "Product",
+            value: data?.product || "--"
+          }, {
             label: "Volume",
             value: data?.volume || "--"
           }],
@@ -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.840",
 	"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

@@ -82,6 +82,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

@@ -68,12 +68,16 @@ const TradeRelationships = ({
 						getTotal={(c) => {
 							return c.totalSources || 0;
 						}}
-						renderTooltipItems={(data) => [
-							{
-								label: "Volume",
-								value: data?.volume || "--",
-							},
-						]}
+					renderTooltipItems={(data) => [
+						{
+							label: "Product",
+							value: data?.product || "--",
+						},
+						{
+							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:

package/dist/style/datastake/mapbox-gl.css

@@ -1,330 +0,0 @@
-/* Isolated Mapbox GL CSS - Scoped to prevent Leaflet conflicts */
-
-/* Mapbox GL Core Styles - Scoped with .mapbox-gl-scope */
-.mapbox-gl-scope .mapboxgl-map {
-  font: 12px/20px Helvetica Neue, Arial, Helvetica, sans-serif;
-  overflow: hidden;
-  position: relative;
-  -webkit-tap-highlight-color: rgb(0 0 0/0);
-}
-
-.mapbox-gl-scope .mapboxgl-canvas {
-  left: 0;
-  position: absolute;
-  top: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-map:-webkit-full-screen {
-  height: 100%;
-  width: 100%;
-}
-
-.mapbox-gl-scope .mapboxgl-canary {
-  background-color: salmon;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive,
-.mapbox-gl-scope .mapboxgl-ctrl-group button.mapboxgl-ctrl-compass {
-  cursor: grab;
-  -webkit-user-select: none;
-  user-select: none;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive.mapboxgl-track-pointer {
-  cursor: pointer;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive:active,
-.mapbox-gl-scope .mapboxgl-ctrl-group button.mapboxgl-ctrl-compass:active {
-  cursor: grabbing;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate,
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate .mapboxgl-canvas {
-  touch-action: pan-x pan-y;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-drag-pan,
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-drag-pan .mapboxgl-canvas {
-  touch-action: pinch-zoom;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate.mapboxgl-touch-drag-pan,
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate.mapboxgl-touch-drag-pan .mapboxgl-canvas {
-  touch-action: none;
-}
-
-/* Control positioning */
-.mapbox-gl-scope .mapboxgl-ctrl-bottom,
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-left,
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-right,
-.mapbox-gl-scope .mapboxgl-ctrl-left,
-.mapbox-gl-scope .mapboxgl-ctrl-right,
-.mapbox-gl-scope .mapboxgl-ctrl-top,
-.mapbox-gl-scope .mapboxgl-ctrl-top-left,
-.mapbox-gl-scope .mapboxgl-ctrl-top-right {
-  pointer-events: none;
-  position: absolute;
-  z-index: 2;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top-left {
-  left: 0;
-  top: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top {
-  left: 50%;
-  top: 0;
-  transform: translateX(-50%);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top-right {
-  right: 0;
-  top: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-right {
-  right: 0;
-  top: 50%;
-  transform: translateY(-50%);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-right {
-  bottom: 0;
-  right: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom {
-  bottom: 0;
-  left: 50%;
-  transform: translateX(-50%);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-left {
-  bottom: 0;
-  left: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-left {
-  left: 0;
-  top: 50%;
-  transform: translateY(-50%);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl {
-  clear: both;
-  pointer-events: auto;
-  transform: translate(0);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top-left .mapboxgl-ctrl {
-  float: left;
-  margin: 10px 0 0 10px;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top .mapboxgl-ctrl {
-  float: left;
-  margin: 10px 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top-right .mapboxgl-ctrl {
-  float: right;
-  margin: 10px 10px 0 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-right .mapboxgl-ctrl,
-.mapbox-gl-scope .mapboxgl-ctrl-right .mapboxgl-ctrl {
-  float: right;
-  margin: 0 10px 10px 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom .mapboxgl-ctrl {
-  float: left;
-  margin: 10px 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-left .mapboxgl-ctrl,
-.mapbox-gl-scope .mapboxgl-ctrl-left .mapboxgl-ctrl {
-  float: left;
-  margin: 0 0 10px 10px;
-}
-
-/* Control group styling */
-.mapbox-gl-scope .mapboxgl-ctrl-group {
-  background: #fff;
-  border-radius: 4px;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group:not(:empty) {
-  box-shadow: 0 0 0 2px #0000001a;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button {
-  background-color: initial;
-  border: 0;
-  box-sizing: border-box;
-  cursor: pointer;
-  display: block;
-  height: 29px;
-  outline: none;
-  overflow: hidden;
-  padding: 0;
-  width: 29px;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button+button {
-  border-top: 1px solid #ddd;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl button .mapboxgl-ctrl-icon {
-  background-position: 50%;
-  background-repeat: no-repeat;
-  display: block;
-  height: 100%;
-  width: 100%;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-attrib-button:focus,
-.mapbox-gl-scope .mapboxgl-ctrl-group button:focus {
-  box-shadow: 0 0 2px 2px #0096ff;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl button:disabled {
-  cursor: not-allowed;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl button:disabled .mapboxgl-ctrl-icon {
-  opacity: .25;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button:first-child {
-  border-radius: 4px 4px 0 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button:last-child {
-  border-radius: 0 0 4px 4px;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button:only-child {
-  border-radius: inherit;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl button:not(:disabled):hover {
-  background-color: #0000000d;
-}
-
-/* Marker styles */
-.mapbox-gl-scope .mapboxgl-marker {
-  position: absolute;
-  z-index: 1;
-}
-
-.mapbox-gl-scope .mapboxgl-marker svg {
-  display: block;
-}
-
-/* Popup styles */
-.mapbox-gl-scope .mapboxgl-popup {
-  position: absolute;
-  text-align: center;
-  margin-bottom: 20px;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-content-wrapper {
-  padding: 1px;
-  text-align: left;
-  border-radius: 12px;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-content {
-  margin: 13px 24px 13px 20px;
-  line-height: 1.3;
-  font-size: 13px;
-  min-height: 1px;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-content p {
-  margin: 17px 0;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-tip-container {
-  width: 40px;
-  height: 20px;
-  position: absolute;
-  left: 50%;
-  margin-top: -1px;
-  margin-left: -20px;
-  overflow: hidden;
-  pointer-events: none;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-tip {
-  width: 17px;
-  height: 17px;
-  padding: 1px;
-  margin: -10px auto 0;
-  pointer-events: auto;
-  -webkit-transform: rotate(45deg);
-  -moz-transform: rotate(45deg);
-  -ms-transform: rotate(45deg);
-  transform: rotate(45deg);
-}
-
-.mapbox-gl-scope .mapboxgl-popup-content-wrapper,
-.mapbox-gl-scope .mapboxgl-popup-tip {
-  background: white;
-  color: #333;
-  box-shadow: 0 3px 14px rgba(0, 0, 0, 0.4);
-}
-
-.mapbox-gl-scope .mapboxgl-popup-close-button {
-  position: absolute;
-  top: 0;
-  right: 0;
-  border: none;
-  text-align: center;
-  width: 24px;
-  height: 24px;
-  font: 16px/24px Tahoma, Verdana, sans-serif;
-  color: #757575;
-  text-decoration: none;
-  background: transparent;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-close-button:hover,
-.mapbox-gl-scope .mapboxgl-popup-close-button:focus {
-  color: #585858;
-}
-
-/* Attribution */
-.mapbox-gl-scope .mapboxgl-ctrl-attribution {
-  background: #fff;
-  background: rgba(255, 255, 255, 0.8);
-  margin: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-attribution,
-.mapbox-gl-scope .mapboxgl-ctrl-scale-line {
-  padding: 0 5px;
-  color: #333;
-  line-height: 1.4;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-attribution a {
-  text-decoration: none;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-attribution a:hover,
-.mapbox-gl-scope .mapboxgl-ctrl-attribution a:focus {
-  text-decoration: underline;
-}
-
-/* Hide attribution by default */
-.mapbox-gl-scope .mapboxgl-ctrl-attribution {
-  display: none !important;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-logo {
-  display: none !important;
-}