datastake-daf 0.6.272 → 0.6.273

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.272",
+	"version": "0.6.273",
 	"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

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

@@ -0,0 +1,259 @@
+import React, { useEffect, useRef } from 'react';
+import mapboxgl from 'mapbox-gl';
+import 'mapbox-gl/dist/mapbox-gl.css';
+import Style from './style';
+
+/**
+ * SimpleGlobe - A simplified wrapper for the Globe component
+ * 
+ * This component makes it easy to display project data as pins on a 3D globe.
+ * Just pass your project data and it will automatically create pins at the specified locations.
+ * 
+ * @param {Array} projects - Array of project objects with location data
+ * @param {string} projects[].name - Project name
+ * @param {number} projects[].latitude - Latitude coordinate
+ * @param {number} projects[].longitude - Longitude coordinate
+ * @param {string} projects[].description - Project description (optional)
+ * @param {string} projects[].country - Country code (optional)
+ * @param {string} projects[].sectoralScope - Project sector (optional)
+ * @param {number} projects[].percentageCompletion - Completion percentage (optional)
+ * @param {Object} projects[].author - Author information (optional)
+ * @param {Object} mapConfig - Map configuration options (optional)
+ * @param {boolean} showSider - Whether to show the sidebar (default: false)
+ * @param {Function} onProjectClick - Callback when a project pin is clicked
+ * @param {string} type - Marker type: "default" for circular markers, "location" for map pin markers
+ * @param {string} color - Marker color (default: "var(--color-primary-60)")
+ */
+const SimpleGlobe = ({ 
+  projects = [], 
+  mapConfig = {},
+  showSider = false,
+  onProjectClick = () => {},
+  type = "default",
+  color = "var(--color-primary-60)"
+}) => {
+  const mapContainer = useRef(null);
+  const map = useRef(null);
+
+  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
+      const mapContainer = map.current.getContainer();
+      const style = document.createElement('style');
+      style.textContent = `
+        .mapboxgl-ctrl-logo,
+        .mapboxgl-ctrl-attrib,
+        .mapboxgl-ctrl-bottom-left,
+        .mapboxgl-ctrl-bottom-right {
+          display: none !important;
+        }
+        .mapboxgl-canvas-container {
+          overflow: hidden !important;
+        }
+        .mapboxgl-canvas {
+          overflow: hidden !important;
+        }
+      `;
+      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) => {
+        console.log(`📍 [SIMPLE GLOBE] Adding marker ${index}:`, project);
+        
+        // Create marker element based on type
+        const el = document.createElement('div');
+        // Use a scoped class to avoid picking up broad styles like `.map-marker { width:100% }`
+        el.className = 'daf-globe-marker';
+        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';
+        
+        if (type === "location") {
+          // Location marker - SVG map pin style
+          el.style.width = '28px';
+          el.style.height = '33px';
+          el.innerHTML = `
+            <svg
+              width="28"
+              height="33"
+              viewBox="0 0 28 33"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M5.14346 4.87419C10.0688 -0.15896 18.0528 -0.162058 22.9757 4.86861C27.6563 9.65161 27.8841 17.2616 23.6622 22.3255H23.6608C23.427 22.6141 23.1808 22.894 22.9211 23.1623L14.0671 32.2101L5.44057 23.3948L5.13868 23.096C0.215857 18.0655 0.218422 9.90737 5.14346 4.87419Z"
+                fill="${color}"
+                stroke="white"
+              />
+            </svg>
+          `;
+        } else {
+          // Default circular marker style
+          el.style.width = '30px';
+          el.style.height = '30px';
+          el.style.backgroundColor = color;
+          el.style.borderRadius = '50%';
+          el.style.border = '2px solid white';
+          el.style.color = 'white';
+          el.style.fontWeight = 'bold';
+          el.style.fontSize = '14px';
+          el.style.textAlign = 'center';
+          el.style.lineHeight = '1';
+          el.innerHTML = `<span style="display: block; line-height: 1;">${project.percentageCompletion || 0}</span>`;
+        }
+
+        // Create popup content using the same structure as minesitemap
+        const popupContent = `
+          <div class="daf-tooltip-cont">
+            <div class="daf-tooltip-head">
+              <div class="daf-tooltip-title">
+                <div>
+                  <h4>${project.name}</h4>
+                  <h5>${project.sectoralScope || 'Project'}</h5>
+                </div>
+              </div>
+            </div>
+            <div class="daf-tooltip-list">
+              <div class="daf-tooltip-list-item">
+                <span class="daf-tooltip-name">Country</span>
+                <span class="daf-tooltip-value">${project.country || 'N/A'}</span>
+              </div>
+              <div class="daf-tooltip-list-item">
+                <span class="daf-tooltip-name">Completion</span>
+                <span class="daf-tooltip-value">${project.percentageCompletion || 0}%</span>
+              </div>
+              <div class="daf-tooltip-list-item">
+                <span class="daf-tooltip-name">Author</span>
+                <span class="daf-tooltip-value">${project.author?.name || 'N/A'}</span>
+              </div>
+              <div class="daf-tooltip-list-item">
+                <span class="daf-tooltip-name">ID</span>
+                <span class="daf-tooltip-value">${project.datastakeId || 'N/A'}</span>
+              </div>
+            </div>
+          </div>
+        `;
+
+        // 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(`📍 [SIMPLE GLOBE] Marker ${index} coordinates:`, { lng, lat });
+        
+        // Validate coordinates
+        if (isNaN(lng) || isNaN(lat) || lng < -180 || lng > 180 || lat < -90 || lat > 90) {
+          console.error(`❌ [SIMPLE GLOBE] Invalid coordinates for project ${index}:`, { lng, lat });
+          return;
+        }
+
+        // Add coordinates to bounds
+        bounds.extend([lng, lat]);
+        hasValidCoordinates = true;
+
+        // Add marker to map with proper coordinate order [lng, lat]
+        const marker = 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(`✅ [SIMPLE GLOBE] Marker ${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: { top: 20, bottom: 20, left: 20, right: 20 },
+          maxZoom: 6,
+          duration: 1000
+        });
+      }
+    });
+
+    return () => {
+      if (map.current) {
+        map.current.remove();
+        map.current = null;
+      }
+    };
+  }, [projects, onProjectClick, mapConfig]);
+
+  return (
+    <Style>
+      <div 
+        ref={mapContainer} 
+        style={{ 
+          width: '100%', 
+          height: '500px',
+          overflow: 'hidden',
+          position: 'relative'
+        }} 
+      />
+    </Style>
+  );
+};
+
+export default SimpleGlobe;

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

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