datastake-daf 0.6.265 → 0.6.267

package/dist/components/index.js

@@ -18246,7 +18246,6 @@ function useMapHelper$1({
 
   // Actions to do when active marker is changed
   React.useEffect(() => {
-    console.log("RERENDER");
     if (mapRef) {
       if (activeMarker) {
         mapRef.eachLayer(layer => {
@@ -19929,14 +19928,26 @@ const useGlobe = ({
   const addedSources = React.useRef(new Set());
   const isMounted = React.useRef(true);
   const addAllDataToMap = React.useCallback(() => {
-    if (!data || !mapRef || !mapRef.isStyleLoaded()) {
+    console.log('🚀 [GLOBE HOOK] addAllDataToMap called');
+    console.log('🚀 [GLOBE HOOK] data:', data);
+    console.log('🚀 [GLOBE HOOK] mapRef exists:', !!mapRef);
+    console.log('🚀 [GLOBE HOOK] style loaded:', mapRef?.isStyleLoaded());
+    if (!data || !mapRef) {
+      console.log('❌ [GLOBE HOOK] addAllDataToMap early return - missing data or mapRef');
+      return;
+    }
+    if (!mapRef.isStyleLoaded()) {
+      console.log('⏳ [GLOBE HOOK] Style not loaded yet, retrying in 100ms...');
+      setTimeout(() => {
+        addAllDataToMap();
+      }, 100);
       return;
     }
-
-    // Prevent multiple calls with empty data
     if (data.length === 0) {
+      console.log('❌ [GLOBE HOOK] addAllDataToMap early return - no data');
       return;
     }
+    console.log('✅ [GLOBE HOOK] Starting to add markers to map...');
 
     // Clear existing markers using functional update to avoid dependency issues
     setMapMarkers(currentMarkers => {
@@ -19988,8 +19999,13 @@ const useGlobe = ({
     if (data && mapRef) {
       const newMarkers = [];
       const maxTotal = Math.max(...(data || []).map(d => d.total || 0));
+      console.log('🎯 [GLOBE HOOK] Processing data items:', data.length);
       data.forEach((d, i) => {
+        console.log(`🎯 [GLOBE HOOK] Processing item ${i}:`, d);
+        console.log(`🎯 [GLOBE HOOK] Item ${i} marker:`, d?.marker);
+        console.log(`🎯 [GLOBE HOOK] Item ${i} lat/lng:`, d?.marker?.lat, d?.marker?.lng);
         if (d?.marker?.lat && d?.marker?.lng) {
+          console.log(`✅ [GLOBE HOOK] Item ${i} has valid coordinates, creating marker...`);
           let marker;
           let iconClassName = "";
           let iconSize = [25, 25];
@@ -20069,6 +20085,7 @@ const useGlobe = ({
             el.style.fontWeight = 'bold';
             el.innerHTML = `<span>${d.total || 0}</span>`;
             marker = new mapboxgl.Marker(el).setLngLat([d.marker.lng, d.marker.lat]).setPopup(new mapboxgl.Popup().setDOMContent(div)).addTo(mapRef);
+            console.log(`🎉 [GLOBE HOOK] Marker ${i} added to map at:`, [d.marker.lng, d.marker.lat]);
           } else if (type === "territory") {
             // Handle territory polygons
             if (d.area && Array.isArray(d.area)) {
@@ -20138,6 +20155,7 @@ const useGlobe = ({
             }));
             roots.current.push(root);
             marker = new mapboxgl.Marker(el).setLngLat([d.marker.lng, d.marker.lat]).setPopup(new mapboxgl.Popup().setDOMContent(div)).addTo(mapRef);
+            console.log(`🎉 [GLOBE HOOK] Default marker ${i} added to map at:`, [d.marker.lng, d.marker.lat]);
           }
 
           // Add click handler
@@ -20171,6 +20189,7 @@ const useGlobe = ({
       mapboxgl.accessToken = MAP_TOKEN;
 
       // Create the map with Mapbox GL JS - 3D globe
+      console.log('🗺️ [GLOBE HOOK] Creating map with style:', STYLE_URL);
       const map = new mapboxgl.Map({
         container: container.current,
         style: STYLE_URL,
@@ -20189,8 +20208,13 @@ const useGlobe = ({
 
       // Configure the map when style loads
       map.on('style.load', () => {
+        console.log('🎨 [GLOBE HOOK] Style loaded event triggered');
+        console.log('🎨 [GLOBE HOOK] Map style loaded:', map.isStyleLoaded());
+
         // Wait a bit for the style to fully load
         setTimeout(() => {
+          console.log('🎨 [GLOBE HOOK] After timeout - Map style loaded:', map.isStyleLoaded());
+
           // Set fog for the space background effect with stars - simplified to avoid errors
           try {
             map.setFog({
@@ -20286,9 +20310,10 @@ const useGlobe = ({
 
       // Add navigation controls
       map.addControl(new mapboxgl.NavigationControl(), 'top-right');
+      console.log('🗺️ [GLOBE HOOK] Map created successfully');
       return map;
     } catch (error) {
-      console.error('Error creating Mapbox GL JS globe:', error);
+      console.error('❌ [GLOBE HOOK] Error creating Mapbox GL JS globe:', error);
       return null;
     }
   }, []);
@@ -20301,9 +20326,12 @@ const useGlobe = ({
   // }, [initialMarkerSetIsDone]);
 
   React.useEffect(() => {
+    console.log('🔄 [GLOBE HOOK] useEffect for map creation - mapRef:', !!mapRef);
     if (!mapRef) {
+      console.log('🔄 [GLOBE HOOK] Creating map instance...');
       const instance = createInstance();
       if (instance) {
+        console.log('🔄 [GLOBE HOOK] Map instance created, setting mapRef');
         setMapRef(instance);
 
         // Add comprehensive resize detection for Mapbox GL JS responsiveness
@@ -20384,14 +20412,22 @@ const useGlobe = ({
     }
   }, [polygon, mapRef]);
   React.useEffect(() => {
+    console.log('📥 [GLOBE HOOK] allData received:', allData);
+    console.log('📥 [GLOBE HOOK] allData length:', allData?.length);
     if (allData) {
       if (allData.length === 0) {
+        console.log('⚠️ [GLOBE HOOK] Empty data array');
         setEmptyStateIsVisible(true);
       } else if (emptyStateIsVisible) {
         setEmptyStateIsVisible(false);
       }
-      setData(filterValidGPS(allData));
+      console.log('🔍 [GLOBE HOOK] Filtering data with filterValidGPS...');
+      const filteredData = filterValidGPS(allData);
+      console.log('🔍 [GLOBE HOOK] filtered data result:', filteredData);
+      console.log('🔍 [GLOBE HOOK] filtered data length:', filteredData.length);
+      setData(filteredData);
     } else {
+      console.log('❌ [GLOBE HOOK] No allData provided');
       setData(null);
     }
   }, [allData, emptyStateIsVisible]);
@@ -20421,7 +20457,19 @@ const useGlobe = ({
     }
   }, [user, mapRef, allData]);
   React.useEffect(() => {
-    if (mapRef && data && !initialMarkerSetIsDone && mapRef.isStyleLoaded()) {
+    console.log('🔄 [GLOBE HOOK] useEffect triggered:', {
+      mapRef: !!mapRef,
+      data: !!data,
+      dataLength: data?.length,
+      initialMarkerSetIsDone,
+      styleLoaded: mapRef?.isStyleLoaded()
+    });
+    if (mapRef && data && !initialMarkerSetIsDone) {
+      console.log('🚀 [GLOBE HOOK] Attempting to add markers...');
+      console.log('🚀 [GLOBE HOOK] Style loaded check:', mapRef.isStyleLoaded());
+
+      // Try to add markers immediately, and if style isn't loaded, 
+      // the addAllDataToMap function will handle it
       setInitialMarkerSetIsDone(true);
       addAllDataToMap();
     }
@@ -20634,7 +20682,7 @@ function Globe(_ref) {
     renderSider = null,
     renderMarker = null,
     type = "default",
-    showSider = true,
+    showSider = false,
     filtersConfig,
     onFilterChange = () => {},
     isSatellite = false,
@@ -20644,15 +20692,29 @@ function Globe(_ref) {
     onUnmount
   } = _ref;
   // Map data to include marker coordinates
-  const mappedData = React.useMemo(() => data.map(d => {
-    var _d$gps, _d$gps2;
-    return _objectSpread2(_objectSpread2({}, d), {}, {
-      marker: {
-        lat: d === null || d === void 0 || (_d$gps = d.gps) === null || _d$gps === void 0 ? void 0 : _d$gps.latitude,
-        lng: d === null || d === void 0 || (_d$gps2 = d.gps) === null || _d$gps2 === void 0 ? void 0 : _d$gps2.longitude
-      }
+  const mappedData = React.useMemo(() => {
+    console.log('📊 [GLOBE COMPONENT] Original data received:', data);
+    console.log('📊 [GLOBE COMPONENT] Data length:', data === null || data === void 0 ? void 0 : data.length);
+    if (!data || data.length === 0) {
+      console.log('❌ [GLOBE COMPONENT] No data to map');
+      return [];
+    }
+    const mapped = data.map((d, i) => {
+      var _d$gps, _d$gps2;
+      console.log("\uD83D\uDCCA [GLOBE COMPONENT] Mapping item ".concat(i, ":"), d);
+      console.log("\uD83D\uDCCA [GLOBE COMPONENT] Item ".concat(i, " GPS:"), d === null || d === void 0 ? void 0 : d.gps);
+      const result = _objectSpread2(_objectSpread2({}, d), {}, {
+        marker: {
+          lat: d === null || d === void 0 || (_d$gps = d.gps) === null || _d$gps === void 0 ? void 0 : _d$gps.latitude,
+          lng: d === null || d === void 0 || (_d$gps2 = d.gps) === null || _d$gps2 === void 0 ? void 0 : _d$gps2.longitude
+        }
+      });
+      console.log("\uD83D\uDCCA [GLOBE COMPONENT] Item ".concat(i, " mapped result:"), result);
+      return result;
     });
-  }), [data]);
+    console.log('📊 [GLOBE COMPONENT] Final mapped data:', mapped);
+    return mapped;
+  }, [data]);
 
   // Get resize context for sidebar state changes
   const {
@@ -20836,6 +20898,162 @@ Globe.propTypes = {
   nameAsSiderTitle: PropTypes__default["default"].bool
 };
 
+const SimpleGlobe = _ref => {
+  let {
+    projects = [],
+    mapConfig = {},
+    showSider = false,
+    onProjectClick = () => {}
+  } = _ref;
+  const mapContainer = React.useRef(null);
+  const map = React.useRef(null);
+  React.useEffect(() => {
+    if (map.current) return; // Initialize map only once
+
+    console.log('🗺️ [SIMPLE GLOBE] Creating map...');
+
+    // Set Mapbox access token
+    mapboxgl.accessToken = 'pk.eyJ1IjoicmVkaXM5OTkiLCJhIjoiY2x4YWV5MzA5MmtuZzJpcXM5Y201Z2E2YiJ9.m5bwPg-Tj4Akesl1yQUa3w';
+
+    // Create map with custom Straatos style
+    map.current = new mapboxgl.Map({
+      container: mapContainer.current,
+      style: 'mapbox://styles/pietragottardo/cm9tt9zfi00d101pg1vdx26si',
+      center: [0, 0],
+      zoom: mapConfig.maxZoom || 3,
+      projection: 'globe',
+      attributionControl: false
+    });
+
+    // Add markers when map loads
+    map.current.on('load', () => {
+      console.log('🗺️ [SIMPLE GLOBE] Map loaded, adding markers...');
+
+      // Hide Mapbox logo and attribution completely
+      map.current.getContainer();
+      const style = document.createElement('style');
+      style.textContent = "\n        .mapboxgl-ctrl-logo,\n        .mapboxgl-ctrl-attrib,\n        .mapboxgl-ctrl-bottom-left,\n        .mapboxgl-ctrl-bottom-right {\n          display: none !important;\n        }\n      ";
+      document.head.appendChild(style);
+
+      // Set the space background with stars
+      try {
+        map.current.setFog({
+          'color': 'rgb(0, 0, 0)',
+          'high-color': 'rgb(0, 0, 0)',
+          'horizon-blend': 0.1,
+          'space-color': 'rgb(0, 0, 0)',
+          'star-intensity': 0.6
+        });
+        console.log('✨ [SIMPLE GLOBE] Space background with stars set');
+      } catch (e) {
+        console.log('⚠️ [SIMPLE GLOBE] Could not set fog, trying alternative...');
+        // Fallback: try simpler fog configuration
+        try {
+          map.current.setFog({
+            'color': 'rgb(0, 0, 0)',
+            'high-color': 'rgb(0, 0, 0)',
+            'horizon-blend': 0.1
+          });
+          console.log('✨ [SIMPLE GLOBE] Alternative space background set');
+        } catch (e2) {
+          console.log('⚠️ [SIMPLE GLOBE] Could not set any fog configuration');
+        }
+      }
+
+      // Calculate bounds to fit all markers
+      const bounds = new mapboxgl.LngLatBounds();
+      let hasValidCoordinates = false;
+      projects.forEach((project, index) => {
+        var _project$author;
+        console.log("\uD83D\uDCCD [SIMPLE GLOBE] Adding marker ".concat(index, ":"), project);
+
+        // Create marker element
+        const el = document.createElement('div');
+        el.className = 'mapboxgl-marker';
+        el.style.width = '25px';
+        el.style.height = '25px';
+        el.style.backgroundColor = '#00809E';
+        el.style.borderRadius = '50%';
+        el.style.border = '2px solid white';
+        el.style.cursor = 'pointer';
+        el.style.boxShadow = '0px 3.45px 3.45px 0px #00000029';
+        el.style.display = 'flex';
+        el.style.alignItems = 'center';
+        el.style.justifyContent = 'center';
+        el.style.color = 'white';
+        el.style.fontWeight = 'bold';
+        el.style.fontSize = '12px';
+        el.innerHTML = "<span>".concat(project.percentageCompletion || 0, "</span>");
+
+        // Create popup content using the same structure as minesitemap
+        const popupContent = "\n          <div class=\"daf-tooltip-cont\">\n            <div class=\"daf-tooltip-head\">\n              <div class=\"daf-tooltip-title\">\n                <div>\n                  <h4>".concat(project.name, "</h4>\n                  <h5>").concat(project.sectoralScope || 'Project', "</h5>\n                </div>\n              </div>\n            </div>\n            <div class=\"daf-tooltip-list\">\n              <div class=\"daf-tooltip-list-item\">\n                <span class=\"daf-tooltip-name\">Country</span>\n                <span class=\"daf-tooltip-value\">").concat(project.country || 'N/A', "</span>\n              </div>\n              <div class=\"daf-tooltip-list-item\">\n                <span class=\"daf-tooltip-name\">Completion</span>\n                <span class=\"daf-tooltip-value\">").concat(project.percentageCompletion || 0, "%</span>\n              </div>\n              <div class=\"daf-tooltip-list-item\">\n                <span class=\"daf-tooltip-name\">Author</span>\n                <span class=\"daf-tooltip-value\">").concat(((_project$author = project.author) === null || _project$author === void 0 ? void 0 : _project$author.name) || 'N/A', "</span>\n              </div>\n              <div class=\"daf-tooltip-list-item\">\n                <span class=\"daf-tooltip-name\">ID</span>\n                <span class=\"daf-tooltip-value\">").concat(project.datastakeId || 'N/A', "</span>\n              </div>\n            </div>\n          </div>\n        ");
+
+        // Create popup
+        const popup = new mapboxgl.Popup({
+          offset: 25,
+          closeButton: true,
+          closeOnClick: false
+        }).setHTML(popupContent);
+
+        // Ensure coordinates are valid numbers
+        const lng = Number(project.longitude);
+        const lat = Number(project.latitude);
+        console.log("\uD83D\uDCCD [SIMPLE GLOBE] Marker ".concat(index, " coordinates:"), {
+          lng,
+          lat
+        });
+
+        // Validate coordinates
+        if (isNaN(lng) || isNaN(lat) || lng < -180 || lng > 180 || lat < -90 || lat > 90) {
+          console.error("\u274C [SIMPLE GLOBE] Invalid coordinates for project ".concat(index, ":"), {
+            lng,
+            lat
+          });
+          return;
+        }
+
+        // Add coordinates to bounds
+        bounds.extend([lng, lat]);
+        hasValidCoordinates = true;
+
+        // Add marker to map with proper coordinate order [lng, lat]
+        new mapboxgl.Marker(el).setLngLat([lng, lat]).setPopup(popup).addTo(map.current);
+
+        // Add click handler
+        el.addEventListener('click', () => {
+          console.log('📍 [SIMPLE GLOBE] Marker clicked:', project);
+          onProjectClick(project);
+        });
+        console.log("\u2705 [SIMPLE GLOBE] Marker ".concat(index, " added at:"), [lng, lat]);
+      });
+
+      // Fit map to show all markers if we have valid coordinates
+      if (hasValidCoordinates && !bounds.isEmpty()) {
+        console.log('🗺️ [SIMPLE GLOBE] Fitting map to bounds:', bounds);
+        map.current.fitBounds(bounds, {
+          padding: 50,
+          maxZoom: 8
+        });
+      }
+    });
+    return () => {
+      if (map.current) {
+        map.current.remove();
+        map.current = null;
+      }
+    };
+  }, [projects, onProjectClick, mapConfig]);
+  return /*#__PURE__*/jsxRuntime.jsx(Style$A, {
+    children: /*#__PURE__*/jsxRuntime.jsx("div", {
+      ref: mapContainer,
+      style: {
+        width: '100%',
+        height: '100%'
+      }
+    })
+  });
+};
+
 function WidgetPlaceholder(_ref) {
   let {
     icon = "",
@@ -61609,6 +61827,7 @@ exports.SelectFiltersTimeFrame = Timeframe;
 exports.SettingsPopover = SettingsPopover;
 exports.Sidenav = Sidenav;
 exports.SidenavMenu = SidenavMenu;
+exports.SimpleGlobe = SimpleGlobe;
 exports.StackChart = StackChart;
 exports.StakeholderMappings = index$1;
 exports.Steps = DAFSteps;

package/package.json

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

package/src/@daf/core/components/Dashboard/Globe/Globe.stories.js

@@ -2,7 +2,7 @@ import Globe from "./index";
 import ThemeLayout from "../../ThemeLayout";
 import Widget from "../Widget";
 
-import * as configs from "../Map/storyConfig";
+import * as configs from "./storyConfig";
 
 export default {
 	title: "Dashboard/Globe",
@@ -29,14 +29,14 @@ export default {
 export const DefaultGlobe = {
 	name: "Default Globe",
 	args: {
-		...configs.DefaultMapConfig,
+		...configs.DefaultGlobeConfig,
 	},
 };
 
 export const SatelliteGlobe = {
 	name: "Satellite Globe",
 	args: {
-		...configs.DefaultMapConfig,
+		...configs.DefaultGlobeConfig,
 		isSatellite: true,
 	},
 };
@@ -44,11 +44,19 @@ export const SatelliteGlobe = {
 export const TerritoryGlobe = {
 	name: "Territory Globe",
 	args: {
-		...configs.TerritoryMapConfig,
+		...configs.TerritoryGlobeConfig,
 		type: "territory",
 	},
 };
 
+export const StakeholderGlobe = {
+	name: "Stakeholder Globe",
+	args: {
+		...configs.StakeholderGlobeConfig,
+		type: "stakeholder",
+	},
+};
+
 export const EventGlobe = {
 	name: "Event Globe",
 	args: {
@@ -57,10 +65,27 @@ export const EventGlobe = {
 	},
 };
 
+export const ChainGlobe = {
+	name: "Supply Chain Globe",
+	args: {
+		...configs.ChainGlobeConfig,
+		type: "chain",
+	},
+};
+
 export const LocationGlobe = {
 	name: "Location Globe",
 	args: {
-		...configs.DefaultMapConfig,
+		...configs.DefaultGlobeConfig,
 		type: "location",
 	},
 };
+
+export const ProjectGlobe = {
+	name: "Project Globe",
+	args: {
+		...configs.ProjectGlobeConfig,
+		type: "project",
+	},
+};
+

package/src/@daf/core/components/Dashboard/Globe/README.md

@@ -0,0 +1,106 @@
+# SimpleGlobe Component
+
+A simplified wrapper for the Globe component that makes it easy to display project data as pins on a 3D globe.
+
+## Features
+
+- 🗺️ **3D Globe Visualization**: Interactive 3D globe using Mapbox GL JS
+- 📍 **Pin-based Display**: Projects are displayed as clickable pins on the globe
+- 🎯 **Simple Integration**: Just pass your project data and it works
+- 📊 **Rich Tooltips**: Hover over pins to see project details
+- 🎨 **Customizable**: Support for custom map configurations
+
+## Quick Start
+
+```jsx
+import SimpleGlobe from './SimpleGlobe';
+
+const MyComponent = () => {
+  const projects = [
+    {
+      name: "Solar Project",
+      latitude: 14.7167,
+      longitude: -17.4677,
+      percentageCompletion: 75,
+      projectDescription: "Large-scale solar energy project"
+    }
+  ];
+
+  return (
+    <div style={{ width: '100%', height: '600px' }}>
+      <SimpleGlobe 
+        projects={projects}
+        onProjectClick={(project) => console.log('Clicked:', project)}
+      />
+    </div>
+  );
+};
+```
+
+## Props
+
+| Prop | Type | Default | Description |
+|------|------|---------|-------------|
+| `projects` | `Array` | `[]` | Array of project objects |
+| `mapConfig` | `Object` | `{}` | Map configuration options |
+| `showSider` | `boolean` | `false` | Whether to show the sidebar |
+| `onProjectClick` | `Function` | `() => {}` | Callback when a project pin is clicked |
+
+## Project Data Format
+
+Your project objects should have the following structure:
+
+```javascript
+{
+  _id: "unique-id",                    // Optional: Unique identifier
+  name: "Project Name",                // Required: Project name
+  latitude: 14.7167,                  // Required: Latitude coordinate
+  longitude: -17.4677,                 // Required: Longitude coordinate
+  projectDescription: "Description",   // Optional: Project description
+  country: "SN",                       // Optional: Country code
+  sectoralScope: "energy",            // Optional: Project sector
+  percentageCompletion: 75,             // Optional: Completion percentage
+  author: { name: "Author Name" }      // Optional: Author information
+}
+```
+
+## Examples
+
+### Basic Usage
+```jsx
+<SimpleGlobe projects={myProjects} />
+```
+
+### With Sidebar
+```jsx
+<SimpleGlobe 
+  projects={myProjects} 
+  showSider={true} 
+/>
+```
+
+### With Custom Configuration
+```jsx
+<SimpleGlobe 
+  projects={myProjects}
+  mapConfig={{
+    maxZoom: 8,
+    minZoom: 2
+  }}
+  onProjectClick={(project) => {
+    // Handle project click
+    console.log('Project clicked:', project);
+  }}
+/>
+```
+
+## Storybook
+
+You can see all examples in Storybook under "Dashboard/Globe/SimpleGlobe".
+
+## Notes
+
+- The component automatically transforms your project data to the format expected by the underlying Globe component
+- Pins are displayed as circular markers with project completion percentage
+- Tooltips show project details when hovering over pins
+- The globe is fully interactive - you can zoom, pan, and rotate