datastake-daf 0.6.838 → 0.6.840

package/src/@daf/pages/Summary/Activities/PlantingCycle/components/CycleOutcomes/RestoredArea.jsx

@@ -7,6 +7,7 @@ const selectOptions = [
     { label: "Daily", value: "daily" },
     { label: "Weekly", value: "weekly" },
     { label: "Monthly", value: "monthly" },
+    { label: "Yearly", value: "yearly" },
 ];
 
 const RestoredArea = ({

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/@daf/utils/timeFilterUtils.js

@@ -6,18 +6,19 @@ import { renderNumber } from './numbers.js';
  * Formats a date based on the time filter
  * @param {dayjs.Dayjs} date - The date to format
  * @param {boolean} breakLine - Whether to add a line break (for tooltips)
- * @param {string} timeFilter - The time filter ('daily', 'weekly', 'monthly')
+ * @param {string} timeFilter - The time filter ('daily', 'weekly', 'monthly', 'yearly')
  * @returns {string} Formatted date string
  */
 export const getFormatDate = (date, breakLine = false, timeFilter = 'monthly') => {
     switch (timeFilter) {
         case "daily":
             return date.format("DD/MM");
-        case "weekly" :
+        case "weekly":
             return `W${renderNumber(date.week())}`;
+        case "yearly":
+            return date.format("YYYY");
         default:
             // Monthly format: "Dec 24", "Jan 25", etc.
-
             return breakLine
                 ? `${capitalize(date.format("MMM"))}\n${date.format("YY")}`
                 : `${capitalize(date.format("MMM"))} ${date.format("YY")}`;
@@ -26,15 +27,20 @@ export const getFormatDate = (date, breakLine = false, timeFilter = 'monthly') =
 
 /**
  * Gets the time quantity string for dayjs operations
- * @param {string} timeFilter - The time filter ('daily', 'weekly', 'monthly')
- * @returns {string} Time quantity string ('days', 'weeks', 'months')
+ * @param {string} timeFilter - The time filter ('daily', 'weekly', 'monthly', 'yearly')
+ * @returns {string} Time quantity string ('days', 'weeks', 'months', 'years')
  */
 export const getTimeQuantity = (timeFilter = 'monthly') => {
-    return timeFilter === "monthly"
-        ? "months"
-        : timeFilter === "daily"
-        ? "days"
-        : "weeks";
+    switch (timeFilter) {
+        case "daily":
+            return "days";
+        case "weekly":
+            return "weeks";
+        case "yearly":
+            return "years";
+        default:
+            return "months";
+    }
 };
 
 /**
@@ -62,6 +68,9 @@ export const getPreviousGraphData = (dates, startDate, timeFilter, valueField =
             case "weekly":
                 isBeforeStart = date.isBefore(startDate, 'week');
                 break;
+            case "yearly":
+                isBeforeStart = date.isBefore(startDate, 'year');
+                break;
             default:
                 isBeforeStart = date.isBefore(startDate, 'month');
                 break;
@@ -86,7 +95,7 @@ export const getPreviousGraphData = (dates, startDate, timeFilter, valueField =
  * Processes chart data with time filtering support
  * @param {Object} params - Parameters object
  * @param {Array} params.mainData - Array of data objects with date and value fields
- * @param {string} params.timeFilter - Time filter ('daily', 'weekly', 'monthly')
+ * @param {string} params.timeFilter - Time filter ('daily', 'weekly', 'monthly', 'yearly')
  * @param {Object} params.filters - Optional filters object with timeframe
  * @param {boolean} params.isCumulative - Whether to calculate cumulative values (default: false)
  * @param {string} params.valueField - Field name to extract value from (default: 'total', also checks 'count', 'jobs', 'value')
@@ -114,6 +123,9 @@ export const processChartDateData = ({
     } else if (filter === "weekly") {
         start = start.startOf('week');
         end = end.startOf('week');
+    } else if (filter === "yearly") {
+        start = start.startOf('year');
+        end = end.startOf('year');
     } else {
         start = start.startOf('month');
         end = end.startOf('month');
@@ -133,9 +145,20 @@ export const processChartDateData = ({
         cumulativeScore = hasPreviousData ? previousCumulativeScore : 0;
     }
 
+    // Get the period unit for comparison
+    const getPeriodUnit = (f) => {
+        switch (f) {
+            case "daily": return "day";
+            case "weekly": return "week";
+            case "yearly": return "year";
+            default: return "month";
+        }
+    };
+    const periodUnit = getPeriodUnit(filter);
+
     // Loop until we reach the end date
     let currentDate = start.clone();
-    while (currentDate.isBefore(end) || currentDate.isSame(end, filter === "daily" ? "day" : filter === "weekly" ? "week" : "month")) {
+    while (currentDate.isBefore(end) || currentDate.isSame(end, periodUnit)) {
         // Filter data points that fall within this period
         const score = isEmpty ? 0 : dates
             .filter((d) => {
@@ -146,6 +169,8 @@ export const processChartDateData = ({
                     case "weekly":
                         return dayjs(d.date, "YYYY-MM-DD").week() === currentDate.week() &&
                                dayjs(d.date, "YYYY-MM-DD").year() === currentDate.year();
+                    case "yearly":
+                        return dayjs(d.date, "YYYY-MM-DD").year() === currentDate.year();
                     default:
                         return (
                             dayjs(d.date, "YYYY-MM-DD").format("YYYY-MM") ===
@@ -187,7 +212,7 @@ export const processChartDateData = ({
 export const formatDateAxis = (label, getFormatDateFn) => {
     if (!label) return label;
     
-    // Check if label is already in the correct format (MMM YY, DD/MM, or W#)
+    // Check if label is already in the correct format (MMM YY, DD/MM, W#, or YYYY)
     // If it matches our format patterns, return as-is
     if (typeof label === 'string') {
         // Check for MMM YY format (e.g., "Dec 24", "Jan 25")
@@ -202,6 +227,10 @@ export const formatDateAxis = (label, getFormatDateFn) => {
         if (/^W\d+$/.test(label)) {
             return label;
         }
+        // Check for YYYY format (e.g., "2024", "2025")
+        if (/^\d{4}$/.test(label)) {
+            return label;
+        }
     }
     
     // Otherwise, try to parse and format it
@@ -209,7 +238,7 @@ export const formatDateAxis = (label, getFormatDateFn) => {
     
     // If first attempt fails, try parsing as ISO date string
     if (!date.isValid() && typeof label === 'string') {
-        date = dayjs(label, ['YYYY-MM-DD', 'YYYY-MM', 'MMM YY', 'MMM YYYY', 'DD/MM'], true);
+        date = dayjs(label, ['YYYY-MM-DD', 'YYYY-MM', 'YYYY', 'MMM YY', 'MMM YYYY', 'DD/MM'], true);
     }
     
     // If it's a valid date, format it using getFormatDate

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;
-}