datastake-daf 0.6.280 → 0.6.281

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

@@ -0,0 +1,284 @@
+import SimpleGlobe from "./SimpleGlobe";
+import SimpleGlobeDebug from "./SimpleGlobeDebug";
+import ThemeLayout from "../../ThemeLayout";
+import Widget from "../Widget";
+
+// Sample project data
+const SAMPLE_PROJECTS = [
+  {
+    _id: "sample-1",
+    name: "Dakar Solar Initiative",
+    country: "SN",
+    datastakeId: "PRJ-SAMPLE-001",
+    sectoralScope: "energy",
+    percentageCompletion: 75,
+    projectDescription: "Large-scale solar energy project in Dakar region",
+    latitude: 14.7167,
+    longitude: -17.4677,
+    author: { name: "Dakar Energy Co." }
+  },
+  {
+    _id: "sample-2", 
+    name: "Saint-Louis Wind Farm",
+    country: "SN",
+    datastakeId: "PRJ-SAMPLE-002",
+    sectoralScope: "energy",
+    percentageCompletion: 45,
+    projectDescription: "Wind energy project in Saint-Louis region",
+    latitude: 16.0167,
+    longitude: -16.4833,
+    author: { name: "Wind Power Solutions" }
+  },
+  {
+    _id: "sample-3",
+    name: "Casamance Reforestation",
+    country: "SN", 
+    datastakeId: "PRJ-SAMPLE-003",
+    sectoralScope: "agricultureForestryAndOtherLandUse",
+    percentageCompletion: 60,
+    projectDescription: "Forest restoration project in Casamance region",
+    latitude: 12.5833,
+    longitude: -16.2667,
+    author: { name: "Green Casamance" }
+  },
+  {
+    _id: "sample-4",
+    name: "Lagos Tech Hub",
+    country: "NG",
+    datastakeId: "PRJ-SAMPLE-004",
+    sectoralScope: "technology",
+    percentageCompletion: 30,
+    projectDescription: "Technology innovation center in Lagos",
+    latitude: 6.5244,
+    longitude: 3.3792,
+    author: { name: "Lagos Tech Foundation" }
+  },
+  {
+    _id: "sample-5",
+    name: "Cairo Water Management",
+    country: "EG",
+    datastakeId: "PRJ-SAMPLE-005",
+    sectoralScope: "water",
+    percentageCompletion: 85,
+    projectDescription: "Water conservation project in Cairo",
+    latitude: 30.0444,
+    longitude: 31.2357,
+    author: { name: "Cairo Water Authority" }
+  }
+];
+
+export default {
+  title: "Dashboard/Globe/SimpleGlobe",
+  component: SimpleGlobe,
+  tags: ["autodocs"],
+  args: {
+    projects: SAMPLE_PROJECTS,
+    showSider: false,
+    onProjectClick: (project) => console.log('Project clicked:', project)
+  },
+  decorators: [
+    (Story) => (
+        <ThemeLayout>
+          <Widget title="Simple Globe with Project Pins" className="no-px no-pb-body">
+            <div style={{ width: '100%', height: '600px' }}>
+              <Story />
+            </div>
+          </Widget>
+        </ThemeLayout>
+    ),
+  ],
+};
+
+export const Default = {
+  name: "Default Project Globe",
+  args: {
+    projects: SAMPLE_PROJECTS,
+    showSider: false
+  }
+};
+
+export const TestSimple = {
+  name: "Test Simple Data",
+  args: {
+    projects: [
+      {
+        name: "Test Project 1",
+        latitude: 14.7167,
+        longitude: -17.4677,
+        percentageCompletion: 75,
+        projectDescription: "Test project in Dakar"
+      },
+      {
+        name: "Test Project 2",
+        latitude: 16.0167,
+        longitude: -16.4833,
+        percentageCompletion: 45,
+        projectDescription: "Test project in Saint-Louis"
+      }
+    ],
+    showSider: true
+  }
+};
+
+export const WithSidebar = {
+  name: "With Sidebar",
+  args: {
+    projects: SAMPLE_PROJECTS,
+    showSider: true
+  }
+};
+
+export const CustomMapConfig = {
+  name: "Custom Map Configuration",
+  args: {
+    projects: SAMPLE_PROJECTS,
+    showSider: true,
+    mapConfig: {
+      maxZoom: 6,
+      minZoom: 2
+    }
+  }
+};
+
+export const SingleProject = {
+  name: "Single Project",
+  args: {
+    projects: [SAMPLE_PROJECTS[0]],
+    showSider: true
+  }
+};
+
+export const EmptyState = {
+  name: "Empty State",
+  args: {
+    projects: [],
+    showSider: false
+  }
+};
+
+export const LocationMarkers = {
+  name: "Location Markers (Map Pin Style)",
+  args: {
+    projects: SAMPLE_PROJECTS,
+    showSider: true,
+    type: "location"
+  }
+};
+
+export const CustomColorMarkers = {
+  name: "Custom Color Markers",
+  args: {
+    projects: SAMPLE_PROJECTS,
+    showSider: true,
+    color: "#FF6B6B"
+  }
+};
+
+export const LocationCustomColor = {
+  name: "Location Markers with Custom Color",
+  args: {
+    projects: SAMPLE_PROJECTS,
+    showSider: true,
+    type: "location",
+    color: "#4ECDC4"
+  }
+};
+
+export const CustomTooltip = {
+  name: "Custom Tooltip Function",
+  args: {
+    projects: SAMPLE_PROJECTS,
+    showSider: true,
+    type: "location",
+    color: "#4ECDC4",
+    renderTooltip: (project) => [
+      {
+        label: "Project Name",
+        value: project.name || 'N/A'
+      },
+      {
+        label: "Completion",
+        value: `${project.percentageCompletion || 0}%`,
+        color: project.percentageCompletion > 50 ? "#12b76a" : "#FF7A45"
+      },
+      {
+        label: "Country",
+        value: project.country || 'N/A'
+      }
+    ]
+  }
+};
+
+export const AdvancedCustomTooltip = {
+  name: "Advanced Custom Tooltip with Colors",
+  args: {
+    projects: SAMPLE_PROJECTS,
+    showSider: true,
+    type: "location",
+    color: "#4ECDC4",
+    renderTooltip: (project) => [
+      {
+        label: "Project Name",
+        value: project.name || 'N/A'
+      },
+      {
+        label: "Sector",
+        value: project.sectoralScope || 'Project',
+        color: "#12b76a"
+      },
+      {
+        label: "Completion Status",
+        value: project.percentageCompletion > 75 ? "High" : project.percentageCompletion > 50 ? "Medium" : "Low",
+        color: project.percentageCompletion > 75 ? "#12b76a" : project.percentageCompletion > 50 ? "#FF7A45" : "#F04438"
+      },
+      {
+        label: "Completion %",
+        value: `${project.percentageCompletion || 0}%`
+      },
+      {
+        label: "Author",
+        value: project.author?.name || 'N/A'
+      },
+      {
+        label: "Project ID",
+        value: project.datastakeId || 'N/A'
+      }
+    ]
+  }
+};
+
+export const MinimalTooltip = {
+  name: "Minimal Custom Tooltip",
+  args: {
+    projects: SAMPLE_PROJECTS,
+    showSider: true,
+    type: "location",
+    color: "#4ECDC4",
+    renderTooltip: (project) => [
+      {
+        label: "Name",
+        value: project.name || 'N/A'
+      },
+      {
+        label: "Progress",
+        value: `${project.percentageCompletion || 0}%`
+      }
+    ]
+  }
+};
+
+export const DebugVersion = {
+  name: "Debug Version (Direct Mapbox)",
+  render: () => (
+    <div style={{ margin: "3em" }}>
+      <ThemeLayout>
+        
+        <Widget title="Debug Globe (Direct Mapbox)" className="no-px no-pb-body">
+          <div style={{ width: '100%', height: '600px' }}>
+            <SimpleGlobeDebug projects={SAMPLE_PROJECTS} />
+          </div>
+        </Widget>
+      </ThemeLayout>
+    </div>
+  )
+};

package/src/@daf/core/components/Dashboard/Globe/SimpleGlobeDebug.jsx

@@ -0,0 +1,85 @@
+import React, { useEffect, useRef } from 'react';
+import mapboxgl from 'mapbox-gl';
+import 'mapbox-gl/dist/mapbox-gl.css';
+
+const SimpleGlobeDebug = ({ projects = [] }) => {
+  const mapContainer = useRef(null);
+  const map = useRef(null);
+
+  useEffect(() => {
+    if (map.current) return; // Initialize map only once
+
+    // Set Mapbox access token
+    mapboxgl.accessToken = 'pk.eyJ1IjoicmVkaXM5OTkiLCJhIjoiY2x4YWV5MzA5MmtuZzJpcXM5Y201Z2E2YiJ9.m5bwPg-Tj4Akesl1yQUa3w';
+
+    console.log('🗺️ [DEBUG] Creating map...');
+    
+    // Create map
+    map.current = new mapboxgl.Map({
+      container: mapContainer.current,
+      style: 'mapbox://styles/mapbox/satellite-v9',
+      center: [0, 0],
+      zoom: 3,
+      projection: 'globe'
+    });
+
+    // Add markers when map loads
+    map.current.on('load', () => {
+      console.log('🗺️ [DEBUG] Map loaded, adding markers...');
+      
+      projects.forEach((project, index) => {
+        console.log(`📍 [DEBUG] Adding marker ${index}:`, project);
+        
+        // Create marker element
+        const el = document.createElement('div');
+        el.className = 'mapboxgl-marker';
+        el.style.width = '20px';
+        el.style.height = '20px';
+        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.innerHTML = `<span>${project.percentageCompletion || 0}</span>`;
+
+        // Create popup
+        const popup = new mapboxgl.Popup({ offset: 25 })
+          .setHTML(`
+            <div>
+              <h3>${project.name}</h3>
+              <p>${project.projectDescription || 'No description'}</p>
+              <p>Completion: ${project.percentageCompletion || 0}%</p>
+            </div>
+          `);
+
+        // Add marker to map
+        new mapboxgl.Marker(el)
+          .setLngLat([project.longitude, project.latitude])
+          .setPopup(popup)
+          .addTo(map.current);
+          
+        console.log(`✅ [DEBUG] Marker ${index} added at:`, [project.longitude, project.latitude]);
+      });
+    });
+
+    return () => {
+      if (map.current) {
+        map.current.remove();
+        map.current = null;
+      }
+    };
+  }, []);
+
+  return (
+    <div style={{ width: '100%', height: '600px', border: '2px solid #ccc' }}>
+      <div ref={mapContainer} style={{ width: '100%', height: '100%' }} />
+    </div>
+  );
+};
+
+export default SimpleGlobeDebug;

package/src/@daf/core/components/Dashboard/Globe/SimpleGlobeExample.jsx

@@ -0,0 +1,75 @@
+import React from 'react';
+import SimpleGlobe from './SimpleGlobe';
+
+// Your sample project data
+const SAMPLE_PROJECTS = [
+  {
+    _id: "sample-1",
+    name: "Dakar Solar Initiative",
+    country: "SN",
+    datastakeId: "PRJ-SAMPLE-001",
+    sectoralScope: "energy",
+    percentageCompletion: 75,
+    projectDescription: "Large-scale solar energy project in Dakar region",
+    latitude: 14.7167,
+    longitude: -17.4677,
+    author: { name: "Dakar Energy Co." }
+  },
+  {
+    _id: "sample-2", 
+    name: "Saint-Louis Wind Farm",
+    country: "SN",
+    datastakeId: "PRJ-SAMPLE-002",
+    sectoralScope: "energy",
+    percentageCompletion: 45,
+    projectDescription: "Wind energy project in Saint-Louis region",
+    latitude: 16.0167,
+    longitude: -16.4833,
+    author: { name: "Wind Power Solutions" }
+  },
+  {
+    _id: "sample-3",
+    name: "Casamance Reforestation",
+    country: "SN", 
+    datastakeId: "PRJ-SAMPLE-003",
+    sectoralScope: "agricultureForestryAndOtherLandUse",
+    percentageCompletion: 60,
+    projectDescription: "Forest restoration project in Casamance region",
+    latitude: 12.5833,
+    longitude: -16.2667,
+    author: { name: "Green Casamance" }
+  }
+];
+
+/**
+ * SimpleGlobeExample - Example usage of the SimpleGlobe component
+ * 
+ * This shows how easy it is to display your project data as pins on a 3D globe.
+ * Just pass your project array to the SimpleGlobe component!
+ */
+const SimpleGlobeExample = () => {
+  const handleProjectClick = (projectData) => {
+    console.log('Project clicked:', projectData);
+    // You can add your custom logic here, like:
+    // - Navigate to project details page
+    // - Show project information in a modal
+    // - Update application state
+    alert(`Clicked on: ${projectData.name}\nCompletion: ${projectData.percentageCompletion}%`);
+  };
+
+  return (
+    <div style={{ width: '100%', height: '600px' }}>
+      <SimpleGlobe
+        projects={SAMPLE_PROJECTS}
+        showSider={true}
+        onProjectClick={handleProjectClick}
+        mapConfig={{
+          maxZoom: 8,
+          minZoom: 2
+        }}
+      />
+    </div>
+  );
+};
+
+export default SimpleGlobeExample;

package/src/@daf/core/components/Dashboard/Globe/SimpleGlobeTest.jsx

@@ -0,0 +1,48 @@
+import React from 'react';
+import SimpleGlobe from './SimpleGlobe';
+
+// Test with a simple, known working dataset
+const TEST_PROJECTS = [
+  {
+    _id: "test-1",
+    name: "Test Project 1",
+    latitude: 14.7167,
+    longitude: -17.4677,
+    percentageCompletion: 75,
+    projectDescription: "Test project in Dakar"
+  },
+  {
+    _id: "test-2", 
+    name: "Test Project 2",
+    latitude: 16.0167,
+    longitude: -16.4833,
+    percentageCompletion: 45,
+    projectDescription: "Test project in Saint-Louis"
+  }
+];
+
+const SimpleGlobeTest = () => {
+  console.log('🧪 [SIMPLE GLOBE TEST] Test projects:', TEST_PROJECTS);
+
+  const handleProjectClick = (projectData) => {
+    console.log('🧪 [SIMPLE GLOBE TEST] Project clicked:', projectData);
+    alert(`Clicked: ${projectData.name} at ${projectData.gps?.latitude}, ${projectData.gps?.longitude}`);
+  };
+
+  return (
+    <div style={{ width: '100%', height: '600px', border: '2px solid #ccc' }}>
+      <h3>SimpleGlobe Test</h3>
+      <SimpleGlobe
+        projects={TEST_PROJECTS}
+        showSider={true}
+        onProjectClick={handleProjectClick}
+        mapConfig={{
+          maxZoom: 8,
+          minZoom: 2
+        }}
+      />
+    </div>
+  );
+};
+
+export default SimpleGlobeTest;

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

@@ -48,15 +48,30 @@ export const useGlobe = ({
   const isMounted = useRef(true);
 
   const addAllDataToMap = 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 => {
@@ -108,8 +123,14 @@ export const useGlobe = ({
       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 innerHtml = "";
@@ -212,6 +233,8 @@ export const useGlobe = ({
               .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
@@ -297,6 +320,8 @@ export const useGlobe = ({
               .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
@@ -330,6 +355,7 @@ export 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,
@@ -348,9 +374,13 @@ export 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({
@@ -445,9 +475,10 @@ export 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;
     }
   }, []);
@@ -460,10 +491,13 @@ export const useGlobe = ({
   // }, [initialMarkerSetIsDone]);
 
   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
@@ -552,15 +586,24 @@ export const useGlobe = ({
   }, [polygon, mapRef]);
 
   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]);
@@ -591,7 +634,20 @@ export const useGlobe = ({
   }, [user, mapRef, allData]);
 
   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();
     }

package/src/@daf/core/components/Dashboard/Globe/index.jsx

@@ -111,7 +111,7 @@ function Globe({
 	renderSider = null,
 	renderMarker = null,
 	type = "default",
-	showSider = true,
+	showSider = false,
 	filtersConfig,
 	onFilterChange = () => { },
 	isSatellite = false,
@@ -122,11 +122,29 @@ function Globe({
 }) {
 	// Map data to include marker coordinates
 	const mappedData = useMemo(
-		() =>
-			data.map((d) => ({
-				...d,
-				marker: { lat: d?.gps?.latitude, lng: d?.gps?.longitude },
-			})),
+		() => {
+			console.log('📊 [GLOBE COMPONENT] Original data received:', data);
+			console.log('📊 [GLOBE COMPONENT] Data length:', data?.length);
+			
+			if (!data || data.length === 0) {
+				console.log('❌ [GLOBE COMPONENT] No data to map');
+				return [];
+			}
+			
+			const mapped = data.map((d, i) => {
+				console.log(`📊 [GLOBE COMPONENT] Mapping item ${i}:`, d);
+				console.log(`📊 [GLOBE COMPONENT] Item ${i} GPS:`, d?.gps);
+				const result = {
+					...d,
+					marker: { lat: d?.gps?.latitude, lng: d?.gps?.longitude },
+				};
+				console.log(`📊 [GLOBE COMPONENT] Item ${i} mapped result:`, result);
+				return result;
+			});
+			
+			console.log('📊 [GLOBE COMPONENT] Final mapped data:', mapped);
+			return mapped;
+		},
 		[data],
 	);