Skip to content

A modern platform for visual, flexible, and extensible graph-based investigations. For cybersecurity analysts and investigators.

feat: latest changes

dextmorgn6681073317b8
diff --git a/flowsint-api/alembic/versions/2da47dbd4a52_add_cascade_delete_to_scans_and_logs.py b/flowsint-api/alembic/versions/2da47dbd4a52_add_cascade_delete_to_scans_and_logs.py
new file mode 100644
index 00000000..ca0ee0b0
--- /dev/null
+++ b/flowsint-api/alembic/versions/2da47dbd4a52_add_cascade_delete_to_scans_and_logs.py
@@ -0,0 +1,40 @@
+"""add cascade delete to scans and logs
+
+Revision ID: 2da47dbd4a52
+Revises: 71a3e5b4db2a
+Create Date: 2025-06-08 22:09:41.393963
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = '2da47dbd4a52'
+down_revision: Union[str, None] = '71a3e5b4db2a'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+ """Upgrade schema."""
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.alter_column('scans', 'status',
+ existing_type=postgresql.ENUM('PENDING', 'RUNNING', 'COMPLETED', 'FAILED', name='scannerstatus'),
+ nullable=True)
+ op.drop_constraint('scans_sketch_id_fkey', 'scans', type_='foreignkey')
+ op.create_foreign_key(None, 'scans', 'sketches', ['sketch_id'], ['id'], onupdate='CASCADE', ondelete='CASCADE')
+ # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+ """Downgrade schema."""
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.drop_constraint(None, 'scans', type_='foreignkey')
+ op.create_foreign_key('scans_sketch_id_fkey', 'scans', 'sketches', ['sketch_id'], ['id'])
+ op.alter_column('scans', 'status',
+ existing_type=postgresql.ENUM('PENDING', 'RUNNING', 'COMPLETED', 'FAILED', name='scannerstatus'),
+ nullable=False)
+ # ### end Alembic commands ###
diff --git a/flowsint-api/alembic/versions/71a3e5b4db2a_update_scan_status_enum.py b/flowsint-api/alembic/versions/71a3e5b4db2a_update_scan_status_enum.py
new file mode 100644
index 00000000..b57033ae
--- /dev/null
+++ b/flowsint-api/alembic/versions/71a3e5b4db2a_update_scan_status_enum.py
@@ -0,0 +1,103 @@
+"""update_scan_status_enum
+
+Revision ID: 71a3e5b4db2a
+Revises: faceebd6a580
+Create Date: 2025-06-08 16:29:38.093854
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = '71a3e5b4db2a'
+down_revision: Union[str, None] = 'faceebd6a580'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+ """Upgrade schema."""
+ # Create the enum type first using raw SQL to ensure it exists
+ op.execute("CREATE TYPE scannerstatus AS ENUM ('PENDING', 'RUNNING', 'COMPLETED', 'FAILED')")
+
+ # Add new columns
+ op.add_column('scans', sa.Column('started_at', sa.DateTime(), nullable=True))
+ op.add_column('scans', sa.Column('completed_at', sa.DateTime(), nullable=True))
+ op.add_column('scans', sa.Column('error', sa.Text(), nullable=True))
+ op.add_column('scans', sa.Column('details', sa.JSON(), nullable=True))
+
+ # Add new status column with enum type
+ op.add_column('scans', sa.Column('status_new', postgresql.ENUM('PENDING', 'RUNNING', 'COMPLETED', 'FAILED', name='scannerstatus'), nullable=True))
+
+ # Copy data from old status to new status with proper casting
+ op.execute("""
+ UPDATE scans
+ SET status_new = CASE
+ WHEN status = 'PENDING' THEN 'PENDING'::scannerstatus
+ WHEN status = 'RUNNING' THEN 'RUNNING'::scannerstatus
+ WHEN status = 'COMPLETED' THEN 'COMPLETED'::scannerstatus
+ WHEN status = 'FAILED' THEN 'FAILED'::scannerstatus
+ ELSE 'PENDING'::scannerstatus
+ END
+ """)
+
+ # Make the new status column not nullable
+ op.alter_column('scans', 'status_new', nullable=False)
+
+ # Drop the old status column
+ op.drop_column('scans', 'status')
+
+ # Rename the new status column
+ op.alter_column('scans', 'status_new', new_column_name='status')
+
+ # Update other columns
+ op.alter_column('scans', 'sketch_id',
+ existing_type=sa.UUID(),
+ nullable=False)
+ op.drop_index('idx_scans_sketch_id', table_name='scans')
+ op.drop_constraint('scans_sketch_id_fkey', 'scans', type_='foreignkey')
+ op.create_foreign_key(None, 'scans', 'sketches', ['sketch_id'], ['id'])
+ op.drop_column('scans', 'values')
+ op.drop_column('scans', 'results')
+ op.drop_column('scans', 'created_at')
+
+
+def downgrade() -> None:
+ """Downgrade schema."""
+ # Add back old columns
+ op.add_column('scans', sa.Column('created_at', postgresql.TIMESTAMP(timezone=True), server_default=sa.text('now()'), autoincrement=False, nullable=True))
+ op.add_column('scans', sa.Column('results', postgresql.JSON(astext_type=sa.Text()), autoincrement=False, nullable=True))
+ op.add_column('scans', sa.Column('values', postgresql.ARRAY(sa.TEXT()), autoincrement=False, nullable=True))
+
+ # Add new VARCHAR status column
+ op.add_column('scans', sa.Column('status_old', sa.String(), nullable=True))
+
+ # Copy data from enum status to VARCHAR status
+ op.execute("UPDATE scans SET status_old = status::VARCHAR")
+
+ # Make the new status column not nullable
+ op.alter_column('scans', 'status_old', nullable=False)
+
+ # Drop the enum status column
+ op.drop_column('scans', 'status')
+
+ # Rename the new status column
+ op.alter_column('scans', 'status_old', new_column_name='status')
+
+ # Update other columns
+ op.drop_constraint(None, 'scans', type_='foreignkey')
+ op.create_foreign_key('scans_sketch_id_fkey', 'scans', 'sketches', ['sketch_id'], ['id'], onupdate='CASCADE', ondelete='CASCADE')
+ op.create_index('idx_scans_sketch_id', 'scans', ['sketch_id'], unique=False)
+ op.alter_column('scans', 'sketch_id',
+ existing_type=sa.UUID(),
+ nullable=True)
+ op.drop_column('scans', 'details')
+ op.drop_column('scans', 'error')
+ op.drop_column('scans', 'completed_at')
+ op.drop_column('scans', 'started_at')
+
+ # Drop the enum type
+ op.execute("DROP TYPE scannerstatus")
\ No newline at end of file
diff --git a/flowsint-api/alembic/versions/ba3d00e11612_add_cascade_delete_to_scans_and_logs.py b/flowsint-api/alembic/versions/ba3d00e11612_add_cascade_delete_to_scans_and_logs.py
new file mode 100644
index 00000000..554c95f7
--- /dev/null
+++ b/flowsint-api/alembic/versions/ba3d00e11612_add_cascade_delete_to_scans_and_logs.py
@@ -0,0 +1,36 @@
+"""add cascade delete to scans and logs
+
+Revision ID: ba3d00e11612
+Revises: 2da47dbd4a52
+Create Date: 2025-06-08 22:11:30.281117
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'ba3d00e11612'
+down_revision: Union[str, None] = '2da47dbd4a52'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+ """Upgrade schema."""
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.alter_column('scans', 'sketch_id',
+ existing_type=sa.UUID(),
+ nullable=True)
+ # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+ """Downgrade schema."""
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.alter_column('scans', 'sketch_id',
+ existing_type=sa.UUID(),
+ nullable=False)
+ # ### end Alembic commands ###
diff --git a/flowsint-api/alembic/versions/faceebd6a580_remove_scan_id_of_logs.py b/flowsint-api/alembic/versions/faceebd6a580_remove_scan_id_of_logs.py
new file mode 100644
index 00000000..3c5f6060
--- /dev/null
+++ b/flowsint-api/alembic/versions/faceebd6a580_remove_scan_id_of_logs.py
@@ -0,0 +1,34 @@
+"""remove scan_id of logs
+
+Revision ID: faceebd6a580
+Revises: fa0ab51b2f64
+Create Date: 2025-06-07 20:03:48.966194
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'faceebd6a580'
+down_revision: Union[str, None] = 'fa0ab51b2f64'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+ """Upgrade schema."""
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.drop_constraint('logs_scan_id_fkey', 'logs', type_='foreignkey')
+ op.drop_column('logs', 'scan_id')
+ # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+ """Downgrade schema."""
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.add_column('logs', sa.Column('scan_id', sa.UUID(), autoincrement=False, nullable=True))
+ op.create_foreign_key('logs_scan_id_fkey', 'logs', 'scans', ['scan_id'], ['id'], ondelete='CASCADE')
+ # ### end Alembic commands ###
diff --git a/flowsint-api/app/api/routes/logs.py b/flowsint-api/app/api/routes/logs.py
index c060f9b8..c6f6321a 100644
--- a/flowsint-api/app/api/routes/logs.py
+++ b/flowsint-api/app/api/routes/logs.py
@@ -1,54 +1,42 @@
-from fastapi import APIRouter, Depends, HTTPException
+import uuid
+from fastapi import APIRouter, Depends, HTTPException, Request
from sqlalchemy.orm import Session
from app.core.postgre_db import get_db
-from app.models.models import Log
-from app.core.events import event_emitter, GLOBAL_STREAM
+from app.models.models import Log, Sketch
+from app.core.events import event_emitter
from sse_starlette.sse import EventSourceResponse
-from asyncio import Queue
+from app.api.deps import get_current_user
+from app.models.models import Profile, Sketch
import json
import asyncio
from datetime import datetime, timedelta
+from enum import Enum
-router = APIRouter()
-
-async def stream_global_logs():
- """Stream all logs in real-time"""
- print("[EventEmitter] New client requesting global stream")
- return await stream_logs(GLOBAL_STREAM)
+class ScannerStatus(str, Enum):
+ PENDING = "pending"
+ RUNNING = "running"
+ COMPLETED = "completed"
+ FAILED = "failed"
[email protected]("/{scan_id}/stream")
-async def stream_logs(scan_id: str):
- """Stream logs for a specific scan in real-time"""
- async def event_generator():
- queue = await event_emitter.subscribe(scan_id)
- try:
- while True:
- data = await queue.get()
- yield {
- "event": "log",
- "data": json.dumps(data)
- }
- except asyncio.CancelledError:
- print(f"[EventEmitter] Client disconnected from scan_id: {scan_id}")
- await event_emitter.unsubscribe(scan_id, queue)
-
- return EventSourceResponse(event_generator())
+router = APIRouter()
-def get_logs(
[email protected]("/sketch/{sketch_id}")
+def get_logs_by_sketch(
+ sketch_id: str,
limit: int = 100,
- scan_id: str | None = None,
since: datetime | None = None,
- db: Session = Depends(get_db)
+ db: Session = Depends(get_db),
+ # current_user: Profile = Depends(get_current_user)
):
- """Get historical logs with optional filtering"""
- print(f"[EventEmitter] Fetching logs (limit: {limit}, scan_id: {scan_id}, since: {since})")
- query = db.query(Log).order_by(Log.created_at.desc())
+ """Get historical logs for a specific sketch with optional filtering"""
+ # Check if sketch exists
+ sketch = db.query(Sketch).filter(Sketch.id == sketch_id).first()
+ if not sketch:
+ raise HTTPException(status_code=404, detail=f"Sketch with id {sketch_id} not found")
+
+ print(f"[EventEmitter] Fetching logs for sketch {sketch_id} (limit: {limit}, since: {since})")
+ query = db.query(Log).filter(Log.sketch_id == sketch_id).order_by(Log.created_at.asc())
- if scan_id and scan_id != GLOBAL_STREAM:
- query = query.filter(Log.scan_id == scan_id)
-
if since:
query = query.filter(Log.created_at > since)
else:
@@ -59,34 +47,131 @@ def get_logs(
results = [{
"id": str(log.id),
- "scan_id": str(log.scan_id) if log.scan_id else None,
"sketch_id": str(log.sketch_id) if log.sketch_id else None,
"type": log.type,
"content": log.content.split("] ", 1)[1] if "] " in log.content else log.content, # Remove prefix if exists
"created_at": log.created_at.isoformat()
} for log in logs]
- print(f"[EventEmitter] Returning {len(results)} logs")
return results
-def delete_all_logs(db: Session = Depends(get_db)):
- """Delete all logs"""
- try:
- db.query(Log).delete()
- db.commit()
- return {"message": "All logs have been deleted successfully"}
- except Exception as e:
- db.rollback()
- raise HTTPException(status_code=500, detail=f"Failed to delete logs: {str(e)}")
[email protected]("/{scan_id}")
-def delete_scan_logs(db: Session = Depends(get_db)):
[email protected]("/sketch/{sketch_id}/stream")
+async def stream_logs(request: Request, sketch_id: str,
+ db: Session = Depends(get_db),
+ # current_user: Profile = Depends(get_current_user)
+ ):
+ """Stream logs for a specific scan in real-time"""
+
+ # Check if sketch exists
+ sketch = db.query(Sketch).filter(Sketch.id == sketch_id).first()
+ if not sketch:
+ raise HTTPException(status_code=404, detail=f"Sketch with id {sketch_id} not found")
+
+ async def event_generator():
+ print("[EventEmitter] Start generator")
+ channel = sketch_id
+ await event_emitter.subscribe(channel)
+ try:
+ # Initial connection message
+ yield "data: {\"event\": \"connected\", \"data\": \"Connected to log stream\"}\n\n"
+
+ while True:
+ if await request.is_disconnected():
+ print(f"[EventEmitter] Client disconnected from sketch_id: {sketch_id}")
+ break
+
+ data = await event_emitter.get_message(channel)
+ if data is None:
+ await asyncio.sleep(0.1) # avoid tight loop on None
+ continue
+
+ print(f"[EventEmitter] Received data: {data}")
+
+ # Handle different types of events
+ if isinstance(data, dict) and data.get('type') == 'scanner_complete':
+ # Send scanner completion event
+ yield json.dumps({'event': 'scanner_complete', 'data': data})
+ else:
+ # Send regular log event
+ yield json.dumps({'event': 'log', 'data': data})
+
+ except asyncio.CancelledError:
+ print(f"[EventEmitter] Client disconnected from sketch_id: {sketch_id}")
+ except Exception as e:
+ print(f"[EventEmitter] Error in stream_logs: {str(e)}")
+ finally:
+ await event_emitter.unsubscribe(channel)
+
+ return EventSourceResponse(
+ event_generator(),
+ media_type="text/event-stream",
+ headers={
+ "Cache-Control": "no-cache",
+ "Connection": "keep-alive",
+ "X-Accel-Buffering": "no"
+ }
+ )
+
[email protected]("/sketch/{sketch_id}")
+def delete_scan_logs(sketch_id:str, db: Session = Depends(get_db), current_user: Profile = Depends(get_current_user)):
"""Delete all logs for a specific scan"""
try:
- db.query(Log).delete()
+ db.query(Log).filter(Log.sketch_id == sketch_id).delete()
db.commit()
return {"message": f"All logs have been deleted successfully"}
except Exception as e:
db.rollback()
- raise HTTPException(status_code=500, detail=f"Failed to delete logs: {str(e)}")
\ No newline at end of file
+ raise HTTPException(status_code=500, detail=f"Failed to delete logs: {str(e)}")
+
[email protected]("/status/scan/{scan_id}/stream")
+async def stream_status(request: Request, scan_id: str,
+ db: Session = Depends(get_db)):
+ """Stream status updates for a specific scan in real-time"""
+
+ async def status_generator():
+ print("[EventEmitter] Start status generator")
+ await event_emitter.subscribe(f"scan_{scan_id}_status")
+ try:
+ # Initial connection message
+ yield "data: {\"event\": \"connected\", \"data\": \"Connected to status stream\"}\n\n"
+
+ while True:
+ data = await event_emitter.get_message(f"scan_{scan_id}_status")
+ if data is None:
+ await asyncio.sleep(0.1)
+ continue
+ print(f"[EventEmitter] Received status data: {data}")
+ yield f"data: {json.dumps({'event': 'status_update', 'data': data})}\n\n"
+
+ except asyncio.CancelledError:
+ print(f"[EventEmitter] Client disconnected from status stream for scan_id: {scan_id}")
+ finally:
+ await event_emitter.unsubscribe(f"scan_{scan_id}_status")
+
+ return EventSourceResponse(
+ status_generator(),
+ media_type="text/event-stream",
+ headers={
+ "Cache-Control": "no-cache",
+ "Connection": "keep-alive",
+ "X-Accel-Buffering": "no"
+ }
+ )
+
[email protected]("/status/scan/{scan_id}")
+async def update_status(
+ scan_id: str,
+ status: ScannerStatus,
+ details: dict = None,
+ db: Session = Depends(get_db)
+):
+ """Update the status of a scan"""
+ status_data = {
+ "status": status,
+ "timestamp": datetime.utcnow().isoformat(),
+ "details": details or {}
+ }
+
+ await event_emitter.emit(f"scan_{scan_id}_status", status_data)
+ return {"message": "Status updated successfully"}
\ No newline at end of file
diff --git a/flowsint-api/app/api/routes/sketches.py b/flowsint-api/app/api/routes/sketches.py
index 6f0ad1ec..3b1eda0c 100644
--- a/flowsint-api/app/api/routes/sketches.py
+++ b/flowsint-api/app/api/routes/sketches.py
@@ -7,7 +7,7 @@ from app.utils import flatten
from typing import Dict, Any, List
from sqlalchemy.orm import Session
from app.api.schemas.sketch import SketchCreate, SketchRead, SketchUpdate
-from app.models.models import Sketch, Profile, Investigation
+from app.models.models import Sketch, Profile
from sqlalchemy.orm import Session
from uuid import UUID
from app.core.graph_db import neo4j_connection
@@ -76,7 +76,7 @@ def delete_sketch(id: UUID, db: Session = Depends(get_db), current_user: Profile
@router.get("/{id}/graph")
async def get_sketch_nodes(id: str, db: Session = Depends(get_db), current_user: Profile = Depends(get_current_user)):
- sketch = db.query(Sketch).filter(Sketch.id == id).first()
+ sketch = db.query(Sketch).filter(Sketch.id == id, Sketch.owner_id == current_user.id).first()
if not sketch:
raise HTTPException(status_code=404, detail="Graph not found")
import random
@@ -138,7 +138,7 @@ def dict_to_cypher_props(props: dict, prefix: str = "") -> str:
@router.post("/{sketch_id}/nodes/add")
def add_node(sketch_id: str, node: NodeInput, current_user: Profile = Depends(get_current_user)):
- node_type = getattr(node, "type", "unknown")
+ node_type = getattr(node, "type", "unknown").lower()
node_data = getattr(node, "data", {})
properties = {
diff --git a/flowsint-api/app/api/schemas/log.py b/flowsint-api/app/api/schemas/log.py
index 134f4a19..75625c70 100644
--- a/flowsint-api/app/api/schemas/log.py
+++ b/flowsint-api/app/api/schemas/log.py
@@ -5,23 +5,20 @@ from typing import Optional
from datetime import datetime
class LogCreate(BaseModel):
- scan_id: UUID4
content: str
- sketch_id: Optional[UUID4] = None
+ sketch_id: UUID4
type: Optional[str] = "INFO"
class LogRead(ORMBase):
id: UUID4
- scan_id: UUID4
content: str
created_at: datetime
- sketch_id: Optional[UUID4]
+ sketch_id: UUID4
type: str
class LogSchema(BaseModel):
id: int
- scan_id: UUID
- sketch_id: UUID | None = None
+ sketch_id: UUID
type: str
content: str
created_at: datetime
\ No newline at end of file
diff --git a/flowsint-api/app/core/enums.py b/flowsint-api/app/core/enums.py
new file mode 100644
index 00000000..77798513
--- /dev/null
+++ b/flowsint-api/app/core/enums.py
@@ -0,0 +1,7 @@
+from enum import Enum
+
+class ScannerStatus(str, Enum):
+ PENDING = "pending"
+ RUNNING = "running"
+ COMPLETED = "completed"
+ FAILED = "failed"
\ No newline at end of file
diff --git a/flowsint-api/app/core/events.py b/flowsint-api/app/core/events.py
index b77070db..11fcc73f 100644
--- a/flowsint-api/app/core/events.py
+++ b/flowsint-api/app/core/events.py
@@ -1,67 +1,70 @@
-from typing import Dict, Set, List
+from typing import Dict, Set
+import uuid
from fastapi import FastAPI
-from asyncio import Queue
import json
import asyncio
-from datetime import datetime, timedelta
-
-GLOBAL_STREAM = "global"
+from uuid import UUID
+import redis.asyncio as redis
+import os
class EventEmitter:
def __init__(self):
- self.clients: Dict[str, Set[Queue]] = {}
- print("[EventEmitter] Initialized")
+ self.id = uuid.uuid4()
+ self.redis = redis.from_url(os.getenv("REDIS_URI", "redis://localhost:6379/0"))
+ self.pubsubs: Dict[str, redis.client.PubSub] = {}
+ print(f"[EventEmitter] Initialized with id {self.id}")
+
+ async def subscribe(self, channel: str):
+ """Subscribe to Redis channel"""
+ if channel not in self.pubsubs:
+ pubsub = self.redis.pubsub()
+ await pubsub.subscribe(channel)
+ self.pubsubs[channel] = pubsub
+ print(f"[EventEmitter] Subscribed to Redis channel {channel}")
- async def subscribe(self, scan_id: str) -> Queue:
- if scan_id not in self.clients:
- self.clients[scan_id] = set()
- print(f"[EventEmitter] New stream created for scan_id: {scan_id}")
-
- queue = Queue()
- self.clients[scan_id].add(queue)
- print(f"[EventEmitter] Client subscribed to scan_id: {scan_id}, total clients: {len(self.clients[scan_id])}")
- return queue
+ async def unsubscribe(self, channel: str):
+ """Unsubscribe from Redis channel"""
+ if channel in self.pubsubs:
+ await self.pubsubs[channel].unsubscribe(channel)
+ await self.pubsubs[channel].close()
+ del self.pubsubs[channel]
+ print(f"[EventEmitter] Unsubscribed from Redis channel {channel}")
- async def unsubscribe(self, scan_id: str, queue: Queue):
- if scan_id in self.clients:
- self.clients[scan_id].remove(queue)
- print(f"[EventEmitter] Client unsubscribed from scan_id: {scan_id}, remaining clients: {len(self.clients[scan_id])}")
- if not self.clients[scan_id]:
- del self.clients[scan_id]
- print(f"[EventEmitter] Stream removed for scan_id: {scan_id} (no more clients)")
+ async def get_message(self, channel: str = None):
+ """Get the next message from Redis for a specific channel"""
+ if channel not in self.pubsubs:
+ print(f"[EventEmitter] No subscription found for channel {channel}")
+ return None
+
+ message = await self.pubsubs[channel].get_message(ignore_subscribe_messages=True)
+ if message is None:
+ await asyncio.sleep(0.1)
+ return None
+
+ print(f"[EventEmitter] Raw message from Redis: {str(message)}")
+ if message:
+ data = message["data"]
+ if isinstance(data, bytes):
+ decoded = data.decode("utf-8")
+ print(f"[EventEmitter] Decoded message: {decoded}")
+ return decoded
+ print(f"[EventEmitter] Non-bytes message: {str(data)}")
+ return str(data)
+ return None
- async def emit(self, scan_id: str, data: dict):
- print(f"[EventEmitter] Emitting event to scan_id: {scan_id}, data: {json.dumps(data)}")
- # Always emit to global stream
- if GLOBAL_STREAM in self.clients:
- print(f"[EventEmitter] Broadcasting to {len(self.clients[GLOBAL_STREAM])} global listeners")
- for queue in self.clients[GLOBAL_STREAM]:
- await queue.put(data)
- else:
- print("[EventEmitter] No global listeners")
-
- # Emit to specific scan stream if it exists
- if scan_id in self.clients and scan_id != GLOBAL_STREAM:
- print(f"[EventEmitter] Broadcasting to {len(self.clients[scan_id])} scan-specific listeners")
- for queue in self.clients[scan_id]:
- await queue.put(data)
- elif scan_id != GLOBAL_STREAM:
- print(f"[EventEmitter] No listeners for scan_id: {scan_id}")
+ async def emit(self, channel: str, data: any):
+ """Emit an event to a Redis channel"""
+ print(f"[EventEmitter] Emitting to channel {channel}: {data}")
+ await self.redis.publish(channel, json.dumps(data))
+ print(f"[EventEmitter] Successfully emitted to channel {channel}")
- def emit_sync(self, scan_id: str, data: dict):
- """Synchronous version of emit for use in Celery tasks"""
- loop = asyncio.get_event_loop()
- if loop.is_running():
- # If we're in an async context, create a new event loop
- new_loop = asyncio.new_event_loop()
- asyncio.set_event_loop(new_loop)
- try:
- new_loop.run_until_complete(self.emit(scan_id, data))
- finally:
- new_loop.close()
- else:
- # If we're not in an async context, use the existing loop
- loop.run_until_complete(self.emit(scan_id, data))
+ def _is_valid_uuid(self, uuid_str: str) -> bool:
+ """Validate if the string is a valid UUID"""
+ try:
+ UUID(uuid_str)
+ return True
+ except ValueError:
+ return False
event_emitter = EventEmitter()
diff --git a/flowsint-api/app/core/graph_db.py b/flowsint-api/app/core/graph_db.py
index c8e96156..1d8d1503 100644
--- a/flowsint-api/app/core/graph_db.py
+++ b/flowsint-api/app/core/graph_db.py
@@ -18,7 +18,38 @@ class Neo4jConnection:
URI = os.getenv("NEO4J_URI_BOLT")
+URI = "bolt://localhost:7687"
USERNAME = os.getenv("NEO4J_USERNAME")
PASSWORD = os.getenv("NEO4J_PASSWORD")
-neo4j_connection = Neo4jConnection(URI, USERNAME, PASSWORD)
\ No newline at end of file
+neo4j_connection = Neo4jConnection(URI, USERNAME, PASSWORD)
+
+
+
+# import os
+# from neo4j import GraphDatabase
+# from dotenv import load_dotenv
+# from pydantic_neo4j import PydanticNeo4j
+# load_dotenv()
+
+# class Neo4jConnection:
+# def __init__(self, uri: str, user: str, password: str):
+# self.__uri = uri
+# self.__user = user
+# self.__password = password
+# self.__driver = GraphDatabase.driver(self.__uri, auth=(self.__user, self.__password))
+
+# def query(self, query: str, parameters: dict = None):
+# with self.__driver.session() as session:
+# result = session.run(query, parameters)
+# return result.data()
+
+
+# URI = os.getenv("NEO4J_URI_BOLT")
+# USERNAME = os.getenv("NEO4J_USERNAME")
+# PASSWORD = os.getenv("NEO4J_PASSWORD")
+
+# neo4j_connection = PydanticNeo4j(URI, USERNAME, PASSWORD)
+# match_util = neo4j_connection.match_utilities
+# create_util = neo4j_connection.create_utilities
+# database_operations = neo4j_connection.database_operations
diff --git a/flowsint-api/app/core/logger.py b/flowsint-api/app/core/logger.py
index dca7f042..5f063b8c 100644
--- a/flowsint-api/app/core/logger.py
+++ b/flowsint-api/app/core/logger.py
@@ -1,9 +1,6 @@
from uuid import UUID
-from sqlalchemy.orm import Session
-from typing import Literal, Optional, Union
-from datetime import datetime
+from typing import Literal, Union
from app.models.models import Log
-from app.core.events import event_emitter, GLOBAL_STREAM
from app.tasks.logging import emit_log_task
from app.core.postgre_db import get_db
import logging
@@ -22,65 +19,64 @@ LEVEL_MAP = {
class Logger:
- def __init__(self, scan_id: Optional[Union[str, UUID]] = None, sketch_id: Optional[Union[str, UUID]] = None):
- self.scan_id = str(scan_id) if scan_id and not isinstance(scan_id, Session) else None
- self.sketch_id = str(sketch_id) if sketch_id and not isinstance(sketch_id, Session) else None
- self.db = next(get_db())
- logger.debug(f"Logger initialized for scan_id: {scan_id}, sketch_id: {sketch_id}")
-
- def _create_log(self, type: str, content: str) -> Log:
+ @staticmethod
+ def _create_log(sketch_id: Union[str, UUID], type: str, content: str) -> Log:
"""Create a log entry in the database"""
- log = Log(
- scan_id=self.scan_id,
- sketch_id=self.sketch_id,
- type=type,
- content=content
- )
- self.db.add(log)
- self.db.commit()
- self.db.refresh(log)
- return log
+ db = next(get_db())
+ try:
+ log = Log(
+ sketch_id=str(sketch_id),
+ type=type,
+ content=content
+ )
+ db.add(log)
+ db.commit()
+ db.refresh(log)
+ return log
+ finally:
+ db.close()
- def _format_message(self, type: str, message: str) -> str:
+ @staticmethod
+ def _format_message(type: str, message: str) -> str:
"""Format the log message with type prefix"""
return f"[{type.upper()}] {message}"
- def info(self, message: str):
+ @staticmethod
+ def info(sketch_id: Union[str, UUID], message: str):
"""Log an info message"""
- formatted_message = self._format_message("INFO", message)
+ formatted_message = Logger._format_message("INFO", message)
logger.info(formatted_message)
- log = self._create_log("INFO", formatted_message)
- emit_log_task.delay(str(log.id), self.scan_id, "INFO", formatted_message)
+ log = Logger._create_log(sketch_id, "INFO", formatted_message)
+ emit_log_task.delay(str(log.id), str(sketch_id), "INFO", formatted_message)
- def error(self, message: str):
+ @staticmethod
+ def error(sketch_id: Union[str, UUID], message: str):
"""Log an error message"""
- formatted_message = self._format_message("ERROR", message)
+ formatted_message = Logger._format_message("ERROR", message)
logger.error(formatted_message)
- log = self._create_log("ERROR", formatted_message)
- emit_log_task.delay(str(log.id), self.scan_id, "ERROR", formatted_message)
+ log = Logger._create_log(sketch_id, "ERROR", formatted_message)
+ emit_log_task.delay(str(log.id), str(sketch_id), "ERROR", formatted_message)
- def warn(self, message: str):
+ @staticmethod
+ def warn(sketch_id: Union[str, UUID], message: str):
"""Log a warning message"""
- formatted_message = self._format_message("WARNING", message)
+ formatted_message = Logger._format_message("WARNING", message)
logger.warn(formatted_message)
- log = self._create_log("WARNING", formatted_message)
- emit_log_task.delay(str(log.id), self.scan_id, "WARNING", formatted_message)
+ log = Logger._create_log(sketch_id, "WARNING", formatted_message)
+ emit_log_task.delay(str(log.id), str(sketch_id), "WARNING", formatted_message)
- def debug(self, message: str):
+ @staticmethod
+ def debug(sketch_id: Union[str, UUID], message: str):
"""Log a debug message"""
- formatted_message = self._format_message("DEBUG", message)
+ formatted_message = Logger._format_message("DEBUG", message)
logger.debug(formatted_message)
- log = self._create_log("DEBUG", formatted_message)
- emit_log_task.delay(str(log.id), self.scan_id, "DEBUG", formatted_message)
+ log = Logger._create_log(sketch_id, "DEBUG", formatted_message)
+ emit_log_task.delay(str(log.id), str(sketch_id), "DEBUG", formatted_message)
- def success(self, message: str):
+ @staticmethod
+ def success(sketch_id: Union[str, UUID], message: str):
"""Log a success message"""
- formatted_message = self._format_message("SUCCESS", message)
+ formatted_message = Logger._format_message("SUCCESS", message)
logger.info(formatted_message)
- log = self._create_log("SUCCESS", formatted_message)
- emit_log_task.delay(str(log.id), self.scan_id, "SUCCESS", formatted_message)
-
- def __del__(self):
- """Clean up database connection"""
- if hasattr(self, 'db'):
- self.db.close()
+ log = Logger._create_log(sketch_id, "SUCCESS", formatted_message)
+ emit_log_task.delay(str(log.id), str(sketch_id), "SUCCESS", formatted_message)
diff --git a/flowsint-api/app/main.py b/flowsint-api/app/main.py
index 7e5ce30e..c6198927 100644
--- a/flowsint-api/app/main.py
+++ b/flowsint-api/app/main.py
@@ -54,6 +54,3 @@ app.include_router(investigations.router, prefix="/api/investigations", tags=["i
app.include_router(transforms.router, prefix="/api/transforms", tags=["transforms"])
app.include_router(logs.router, prefix="/api/logs", tags=["logs"])
app.include_router(analysis.router, prefix="/api/analyses", tags=["analyses"])
-
-# Initialize event system
-init_events(app)
diff --git a/flowsint-api/app/models/models.py b/flowsint-api/app/models/models.py
index f9e3b426..6ff8717d 100644
--- a/flowsint-api/app/models/models.py
+++ b/flowsint-api/app/models/models.py
@@ -1,13 +1,15 @@
import uuid
+from datetime import datetime
from sqlalchemy import (
String, Text, DateTime, ForeignKey,
- Index, func, text, JSON
+ Index, func, text, JSON, Column, Integer, Enum as SQLEnum
)
from sqlalchemy.dialects.postgresql import UUID as PGUUID, ARRAY
from sqlalchemy.orm import Mapped, mapped_column, relationship
from .base import Base
+from app.core.enums import ScannerStatus
class Feedback(Base):
@@ -58,7 +60,6 @@ class Log(Base):
__tablename__ = "logs"
id: Mapped[uuid.UUID] = mapped_column(PGUUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
- scan_id = mapped_column(PGUUID(as_uuid=True), ForeignKey("scans.id", ondelete="CASCADE"), nullable=True)
content = mapped_column(Text)
created_at = mapped_column(DateTime(timezone=True), server_default=func.now())
sketch_id = mapped_column(PGUUID(as_uuid=True), ForeignKey("sketches.id", onupdate="CASCADE", ondelete="CASCADE"), nullable=True)
@@ -81,15 +82,18 @@ class Scan(Base):
__tablename__ = "scans"
id: Mapped[uuid.UUID] = mapped_column(PGUUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
- created_at = mapped_column(DateTime(timezone=True), server_default=func.now())
- status = mapped_column(String, nullable=True)
- results = mapped_column(JSON, nullable=True)
- values = mapped_column(ARRAY(Text), nullable=True)
- sketch_id = mapped_column(PGUUID(as_uuid=True), ForeignKey("sketches.id", onupdate="CASCADE", ondelete="CASCADE"), nullable=True)
-
- __table_args__ = (
- Index("idx_scans_sketch_id", "sketch_id"),
- )
+ sketch_id: Mapped[uuid.UUID] = mapped_column(PGUUID(as_uuid=True), ForeignKey("sketches.id", onupdate="CASCADE", ondelete="CASCADE"), nullable=True)
+ status = Column(SQLEnum(ScannerStatus), default=ScannerStatus.PENDING)
+ started_at = Column(DateTime, default=datetime.utcnow)
+ completed_at = Column(DateTime, nullable=True)
+ error = Column(Text, nullable=True)
+ details = Column(JSON, nullable=True)
+
+ # Relationships
+ sketch = relationship("Sketch", back_populates="scans")
+
+ def __repr__(self):
+ return f"<Scan(id={self.id}, status={self.status})>"
class Sketch(Base):
@@ -104,6 +108,7 @@ class Sketch(Base):
investigation_id = mapped_column(PGUUID(as_uuid=True), ForeignKey("investigations.id", onupdate="CASCADE", ondelete="CASCADE"))
investigation = relationship("Investigation", back_populates="sketches")
last_updated_at = mapped_column(DateTime(timezone=True), server_default=func.now())
+ scans = relationship("Scan", back_populates="sketch")
__table_args__ = (
Index("idx_sketches_investigation_id", "investigation_id"),
diff --git a/flowsint-api/app/scanners/base.py b/flowsint-api/app/scanners/base.py
index c25e511a..edc1f8e6 100644
--- a/flowsint-api/app/scanners/base.py
+++ b/flowsint-api/app/scanners/base.py
@@ -8,13 +8,11 @@ class Scanner(ABC):
self,
sketch_id: Optional[str],
scan_id: str,
- logger: Logger,
neo4j_conn: Optional[Neo4jConnection] = None,
):
self.scan_id = scan_id
self.sketch_id = sketch_id or "system"
self.neo4j_conn = neo4j_conn
- self.logger = logger
@classmethod
@abstractmethod
@@ -48,16 +46,16 @@ class Scanner(ABC):
def execute(self, values: List[str]) -> List[Dict[str, Any]]:
if self.name() != "transform_orchestrator":
- self.logger.info(message=f"Scanner {self.name()} started.")
+ Logger.info(self.sketch_id, f"Scanner {self.name()} started.")
try:
preprocessed = self.preprocess(values)
results = self.scan(preprocessed)
processed = self.postprocess(results, preprocessed)
if self.name() != "transform_orchestrator":
- self.logger.success(message=f"Scanner {self.name()} finished.")
+ Logger.success(self.sketch_id, f"Scanner {self.name()} finished.")
return processed
except Exception as e:
if self.name() != "transform_orchestrator":
- self.logger.error(message=f"Scanner {self.name()} errored: '{str(e)}'.")
+ Logger.error(self.sketch_id, f"Scanner {self.name()} errored: '{str(e)}'.")
return []
diff --git a/flowsint-api/app/scanners/domains/domain_to_asn.py b/flowsint-api/app/scanners/domains/domain_to_asn.py
new file mode 100644
index 00000000..143c8ca6
--- /dev/null
+++ b/flowsint-api/app/scanners/domains/domain_to_asn.py
@@ -0,0 +1,139 @@
+import json
+import socket
+import subprocess
+from typing import List, Dict, Any, TypeAlias, Union
+from pydantic import TypeAdapter
+from app.scanners.base import Scanner
+from app.types.cidr import CIDR
+from app.types.domain import MinimalDomain
+from app.types.asn import ASN
+from app.utils import is_valid_domain, resolve_type
+from app.core.logger import Logger
+
+InputType: TypeAlias = List[MinimalDomain]
+OutputType: TypeAlias = List[ASN]
+
+class DomainToAsnScanner(Scanner):
+ """Takes a domain and returns its corresponding ASN."""
+
+ @classmethod
+ def name(cls) -> str:
+ return "domain_to_asn_scanner"
+
+ @classmethod
+ def category(cls) -> str:
+ return "domains"
+
+ @classmethod
+ def key(cls) -> str:
+ return "domain"
+
+ @classmethod
+ def input_schema(cls) -> Dict[str, Any]:
+ adapter = TypeAdapter(InputType)
+ schema = adapter.json_schema()
+ type_name, details = list(schema["$defs"].items())[0]
+ return {
+ "type": type_name,
+ "properties": [
+ {"name": prop, "type": resolve_type(info)}
+ for prop, info in details["properties"].items()
+ ]
+ }
+
+ @classmethod
+ def output_schema(cls) -> Dict[str, Any]:
+ adapter = TypeAdapter(OutputType)
+ schema = adapter.json_schema()
+ type_name, details = list(schema["$defs"].items())[0]
+ return {
+ "type": type_name,
+ "properties": [
+ {"name": prop, "type": resolve_type(info)}
+ for prop, info in details["properties"].items()
+ ]
+ }
+
+ def preprocess(self, data: Union[List[str], List[dict], InputType]) -> InputType:
+ cleaned: InputType = []
+ for item in data:
+ domain_obj = None
+ if isinstance(item, str):
+ domain_obj = MinimalDomain(domain=item)
+ elif isinstance(item, dict) and "domain" in item:
+ domain_obj = MinimalDomain(domain=item["domain"])
+ elif isinstance(item, MinimalDomain):
+ domain_obj = item
+ if domain_obj and is_valid_domain(domain_obj.domain):
+ cleaned.append(domain_obj)
+ return cleaned
+
+ def scan(self, data: InputType) -> OutputType:
+ """Find ASN information for domain name using asnmap."""
+ asns: OutputType = []
+ for domain in data:
+ asn_data = self.__get_asn_from_asnmap(domain.domain)
+ if asn_data:
+ Logger.info(self.sketch_id, f"Domain {domain.domain} has ASN {asn_data['as_number']}.")
+ asns.append(ASN(
+ number=int(asn_data["as_number"].lstrip("AS")),
+ name=asn_data["as_name"],
+ country=asn_data["as_country"],
+ cidrs=[CIDR(network=cidr) for cidr in asn_data["as_range"]]
+ ))
+ else:
+ Logger.info(self.sketch_id, f"No ASN found for domain {domain.domain}")
+ return asns
+
+ def __get_asn_from_asnmap(self, domain: str) -> Dict[str, Any]:
+ try:
+ command = f"echo {domain} | asnmap -silent -json | jq"
+ result = subprocess.run(
+ command,
+ shell=True,
+ capture_output=True, text=True, timeout=60
+ )
+ if not result.stdout.strip():
+ return None
+ return json.loads(result.stdout)
+ except Exception as e:
+ Logger.error(self.sketch_id, f"asnmap exception for {domain}: {str(e)}")
+ return None
+
+ def postprocess(self, results: OutputType, original_input: InputType) -> OutputType:
+ # Create Neo4j relationships between domain and their corresponding ASNs
+ for input_ip, result_asn in zip(original_input, results):
+ # Skip if no valid ASN was found
+ if result_asn.number == 0:
+ continue
+
+ query = """
+ MERGE (domain:domain {domain: $domain})
+ SET domain.sketch_id = $sketch_id,
+ domain.label = $domain,
+ domain.caption = $domain,
+ domain.type = "domain"
+
+ MERGE (asn:asn {number: $asn_number})
+ SET asn.sketch_id = $sketch_id,
+ asn.name = $asn_name,
+ asn.country = $asn_country,
+ asn.label = $asn_label,
+ asn.caption = $asn_caption,
+ asn.type = "asn"
+
+ MERGE (domain)-[:BELONGS_TO {sketch_id: $sketch_id}]->(asn)
+ """
+
+ if self.neo4j_conn:
+ self.neo4j_conn.query(query, {
+ "domain": input_ip.domain,
+ "asn_number": result_asn.number,
+ "asn_name": result_asn.name,
+ "asn_country": result_asn.country,
+ "asn_label": f"AS{result_asn.number}",
+ "asn_caption": f"AS{result_asn.number} - {result_asn.name}",
+ "sketch_id": self.sketch_id,
+ })
+
+ return results
\ No newline at end of file
diff --git a/flowsint-api/app/scanners/domains/subdomains.py b/flowsint-api/app/scanners/domains/subdomains.py
index 0ce18eb4..fae7e37b 100644
--- a/flowsint-api/app/scanners/domains/subdomains.py
+++ b/flowsint-api/app/scanners/domains/subdomains.py
@@ -6,6 +6,7 @@ from app.scanners.base import Scanner
from app.types.domain import MinimalDomain, Domain
from app.utils import is_valid_domain, resolve_type
from pydantic import TypeAdapter
+from app.core.logger import Logger
InputType: TypeAlias = List[MinimalDomain]
OutputType: TypeAlias = List[MinimalDomain]
@@ -54,7 +55,6 @@ class SubdomainScanner(Scanner):
def preprocess(self, data: Union[List[str], List[dict], InputType]) -> InputType:
cleaned: InputType = []
- self.logger.debug(message=f"[SUBDOMAIN_SCANNER]: preprocessed: {str(data)}")
for item in data:
domain_obj = None
if isinstance(item, str):
@@ -65,24 +65,22 @@ class SubdomainScanner(Scanner):
domain_obj = item
if domain_obj and is_valid_domain(domain_obj.domain):
cleaned.append(domain_obj)
- self.logger.debug(message=f"[SUBDOMAIN_SCANNER]: postprocessed: {str(cleaned)}")
return cleaned
def scan(self, data: InputType) -> OutputType:
"""Find subdomains using subfinder (if available) or fallback to crt.sh."""
domains: OutputType = []
use_subfinder = self.__is_subfinder_installed()
- self.logger.debug(message=f"[SUBDOMAIN_SCANNER]: input data: {str(data)}")
for md in data:
d = Domain(domain=md.domain)
if use_subfinder:
subdomains = self.__get_subdomains_from_subfinder(d.domain)
if not subdomains:
- self.logger.warn(message=f"subfinder failed for {d.domain}, falling back to crt.sh")
+ Logger.warn(self.sketch_id, f"subfinder failed for {d.domain}, falling back to crt.sh")
subdomains = self.__get_subdomains_from_crtsh(d.domain)
else:
- self.logger.info(message="subfinder not found, using crt.sh only")
+ Logger.info(self.sketch_id, "subfinder not found, using crt.sh only")
subdomains = self.__get_subdomains_from_crtsh(d.domain)
d.subdomains = sorted(subdomains)
@@ -109,9 +107,9 @@ class SubdomainScanner(Scanner):
if "*" not in sub and is_valid_domain(sub) and sub.endswith(domain) and sub != domain:
subdomains.add(sub)
elif "*" in sub:
- self.logger.debug(message=f"Ignored wildcard subdomain: {sub}")
+ continue
except Exception as e:
- self.logger.error(message=f"crt.sh failed for {domain}: {e}")
+ Logger.error(self.sketch_id, f"crt.sh failed for {domain}: {e}")
return subdomains
def __get_subdomains_from_subfinder(self, domain: str) -> set[str]:
@@ -127,9 +125,9 @@ class SubdomainScanner(Scanner):
if is_valid_domain(sub) and sub.endswith(domain) and sub != domain and not sub.startswith("."):
subdomains.add(sub)
else:
- self.logger.error(message=f"subfinder failed for {domain}: {result.stderr.strip()}")
+ Logger.error(self.sketch_id, f"subfinder failed for {domain}: {result.stderr.strip()}")
except Exception as e:
- self.logger.error(message=f"subfinder exception for {domain}: {e}")
+ Logger.error(self.sketch_id, f"subfinder exception for {domain}: {e}")
return subdomains
def postprocess(self, results: OutputType, original_input: InputType) -> OutputType:
@@ -139,6 +137,7 @@ class SubdomainScanner(Scanner):
continue
for subdomain in domain_obj.subdomains:
output.append(MinimalDomain(domain=subdomain))
+ Logger.info(self.sketch_id, f"{domain_obj.domain} -> {subdomain}")
self.neo4j_conn.query("""
MERGE (sub:domain {domain: $subdomain})
SET sub.sketch_id = $sketch_id,
@@ -155,6 +154,6 @@ class SubdomainScanner(Scanner):
"caption": subdomain,
"type": "subdomain"
})
- self.logger.info(message=f"{domain_obj.domain} -> {len(domain_obj.subdomains)} subdomain(s) found.")
+ Logger.success(self.sketch_id, f"{domain_obj.domain} -> {len(domain_obj.subdomains)} subdomain(s) found.")
return output
diff --git a/flowsint-api/app/scanners/ips/asn_to_cidrs.py b/flowsint-api/app/scanners/ips/asn_to_cidrs.py
index 30c776b4..b52197e1 100644
--- a/flowsint-api/app/scanners/ips/asn_to_cidrs.py
+++ b/flowsint-api/app/scanners/ips/asn_to_cidrs.py
@@ -8,6 +8,7 @@ from app.types.cidr import CIDR
from app.types.ip import MinimalIp
from app.types.asn import ASN
from app.utils import is_valid_asn, parse_asn, resolve_type
+from app.core.logger import Logger
InputType: TypeAlias = List[ASN]
OutputType: TypeAlias = List[CIDR]
@@ -63,7 +64,7 @@ class AsnToCidrsScanner(Scanner):
if asn_obj and is_valid_asn(str(asn_obj.number)):
cleaned.append(asn_obj)
except ValueError:
- self.logger.warn(f"Invalid ASN format: {item}")
+ Logger.warn(self.sketch_id, f"Invalid ASN format: {item}")
continue
return cleaned
@@ -71,7 +72,6 @@ class AsnToCidrsScanner(Scanner):
"""Find CIDR from ASN using asnmap."""
cidrs: OutputType = []
self._asn_to_cidrs_map = [] # Store mapping for postprocess
- self.logger.debug(message=f"[ASN_TO_CIDRS_SCANNER]: input data: {str(data)}")
for asn in data:
asn_cidrs = []
@@ -84,14 +84,14 @@ class AsnToCidrsScanner(Scanner):
cidrs.append(cidr)
asn_cidrs.append(cidr)
except Exception as e:
- self.logger.error(f"Failed to parse CIDR {cidr_str}: {str(e)}")
+ Logger.error(self.sketch_id, f"Failed to parse CIDR {cidr_str}: {str(e)}")
# If no valid CIDRs were added, add the default one
if not any(str(c.network) != "0.0.0.0/0" for c in asn_cidrs):
default_cidr = CIDR(network="0.0.0.0/0")
cidrs.append(default_cidr)
asn_cidrs.append(default_cidr)
else:
- self.logger.warn(f"No CIDRs found for ASN {asn.number}")
+ Logger.warn(self.sketch_id, f"No CIDRs found for ASN {asn.number}")
# Add an empty CIDR to maintain input/output mapping
default_cidr = CIDR(network="0.0.0.0/0")
cidrs.append(default_cidr)
@@ -108,7 +108,7 @@ class AsnToCidrsScanner(Scanner):
capture_output=True, text=True, timeout=60
)
if not result.stdout.strip():
- self.logger.info(f"No CIDRs found for {asn}.")
+ Logger.info(self.sketch_id, f"No CIDRs found for {asn}.")
return None
try:
# Parse the JSON array
@@ -136,11 +136,11 @@ class AsnToCidrsScanner(Scanner):
return combined_data if combined_data["as_range"] else None
except json.JSONDecodeError:
- self.logger.error(f"Failed to parse JSON from asnmap output: {result.stdout}")
+ Logger.error(self.sketch_id, f"Failed to parse JSON from asnmap output: {result.stdout}")
return None
except Exception as e:
- self.logger.error(message=f"asnmap exception for {asn}: {str(e)}")
+ Logger.error(self.sketch_id, f"asnmap exception for {asn}: {str(e)}")
return None
def postprocess(self, results: OutputType, original_input: InputType) -> OutputType:
@@ -154,7 +154,7 @@ class AsnToCidrsScanner(Scanner):
continue # Skip default CIDR for unknown ASN
if self.neo4j_conn:
query = """
- MERGE (asn:ASN {number: $asn_number})
+ MERGE (asn:asn {number: $asn_number})
SET asn.sketch_id = $sketch_id,
asn.name = $asn_name,
asn.country = $asn_country,
@@ -162,7 +162,7 @@ class AsnToCidrsScanner(Scanner):
asn.caption = $asn_caption,
asn.type = "asn"
- MERGE (cidr:CIDR {network: $cidr_network})
+ MERGE (cidr:cidr {network: $cidr_network})
SET cidr.sketch_id = $sketch_id,
cidr.label = $cidr_network,
cidr.caption = $cidr_network,
diff --git a/flowsint-api/app/scanners/ips/cidr_to_ips.py b/flowsint-api/app/scanners/ips/cidr_to_ips.py
index 668f73cb..29e5ca93 100644
--- a/flowsint-api/app/scanners/ips/cidr_to_ips.py
+++ b/flowsint-api/app/scanners/ips/cidr_to_ips.py
@@ -5,6 +5,7 @@ from app.scanners.base import Scanner
from app.types.cidr import CIDR
from app.types.ip import MinimalIp
from app.utils import resolve_type
+from app.core.logger import Logger
InputType: TypeAlias = List[CIDR]
OutputType: TypeAlias = List[MinimalIp]
@@ -60,14 +61,13 @@ class CidrToIpsScanner(Scanner):
if cidr_obj:
cleaned.append(cidr_obj)
except ValueError:
- self.logger.warn(f"Invalid CIDR format: {item}")
+ Logger.warn(self.sketch_id, f"Invalid CIDR format: {item}")
continue
return cleaned
def scan(self, data: InputType) -> OutputType:
"""Find IP addresses from CIDR using dnsx."""
ips: OutputType = []
- self.logger.debug(message=f"[CIDR_TO_IPS_SCANNER]: input data: {str(data)}")
for cidr in data:
ip_addresses = self.__get_ips_from_cidr(cidr.network)
if ip_addresses:
@@ -76,9 +76,9 @@ class CidrToIpsScanner(Scanner):
ip = MinimalIp(address=ip_str.strip())
ips.append(ip)
except Exception as e:
- self.logger.error(f"Failed to parse IP {ip_str}: {str(e)}")
+ Logger.error(self.sketch_id, f"Failed to parse IP {ip_str}: {str(e)}")
else:
- self.logger.warn(f"No IPs found for CIDR {cidr.network}")
+ Logger.warn(self.sketch_id, f"No IPs found for CIDR {cidr.network}")
return ips
def __get_ips_from_cidr(self, cidr: str) -> List[str]:
@@ -92,7 +92,7 @@ class CidrToIpsScanner(Scanner):
timeout=60
)
if not result.stdout.strip():
- self.logger.info(f"No IPs found for {cidr}.")
+ Logger.info(self.sketch_id, f"No IPs found for {cidr}.")
return []
# Split the output by newlines and filter out empty lines
@@ -100,22 +100,22 @@ class CidrToIpsScanner(Scanner):
return ip_addresses
except Exception as e:
- self.logger.error(message=f"dnsx exception for {cidr}: {str(e)}")
+ Logger.error(self.sketch_id, f"dnsx exception for {cidr}: {str(e)}")
return []
def postprocess(self, results: OutputType, original_input: InputType) -> OutputType:
# Create Neo4j relationships between CIDRs and their corresponding IPs
- self.logger.info(message=f"RESULTS for CIDRTOIPS {str(results)}")
+ Logger.info(self.sketch_id, f"RESULTS for CIDRTOIPS {str(results)}")
for cidr, ip in zip(original_input, results):
if self.neo4j_conn:
query = """
- MERGE (cidr:CIDR {network: $cidr_network})
+ MERGE (cidr:cidr {network: $cidr_network})
SET cidr.sketch_id = $sketch_id,
cidr.label = $cidr_network,
cidr.caption = $cidr_network,
cidr.type = "cidr"
- MERGE (ip:IP {address: $ip_address})
+ MERGE (ip:ip {address: $ip_address})
SET ip.sketch_id = $sketch_id,
ip.label = $ip_address,
ip.caption = $ip_address,
diff --git a/flowsint-api/app/scanners/ips/ip_to_asn.py b/flowsint-api/app/scanners/ips/ip_to_asn.py
index 11f1e121..971e16b7 100644
--- a/flowsint-api/app/scanners/ips/ip_to_asn.py
+++ b/flowsint-api/app/scanners/ips/ip_to_asn.py
@@ -8,16 +8,17 @@ from app.types.cidr import CIDR
from app.types.ip import MinimalIp
from app.types.asn import ASN
from app.utils import is_valid_ip, resolve_type
+from app.core.logger import Logger
InputType: TypeAlias = List[MinimalIp]
OutputType: TypeAlias = List[ASN]
-class AsnScanner(Scanner):
+class IpToAsnScanner(Scanner):
"""Takes an IP addreses and returns its corresponding ASN."""
@classmethod
def name(cls) -> str:
- return "asn_resolve_scanner"
+ return "ip_to_asn_scanner"
@classmethod
def category(cls) -> str:
@@ -70,12 +71,11 @@ class AsnScanner(Scanner):
def scan(self, data: InputType) -> OutputType:
"""Find ASN information for IP addresses using asnmap."""
asns: OutputType = []
- self.logger.debug(message=f"[ASN_SCANNER]: input data: {str(data)}")
for ip in data:
asn_data = self.__get_asn_from_asnmap(ip.address)
if asn_data:
- self.logger.info(message=f"IP {ip.address} has ASN {asn_data['as_number']}.")
+ Logger.info(self.sketch_id, f"IP {ip.address} has ASN {asn_data['as_number']}.")
asns.append(ASN(
number=int(asn_data["as_number"].lstrip("AS")),
name=asn_data["as_name"],
@@ -83,24 +83,52 @@ class AsnScanner(Scanner):
cidrs=[CIDR(network=cidr) for cidr in asn_data["as_range"]]
))
else:
- self.logger.info(f"No ASN found for IP {ip.address}")
+ Logger.info(self.sketch_id, f"No ASN found for IP {ip.address}")
return asns
def __get_asn_from_asnmap(self, ip: str) -> Dict[str, Any]:
try:
# Properly run the shell pipeline using shell=True
- command = f"echo {ip} | asnmap -silent -json | jq"
+ command = f"echo {ip} | asnmap -silent -json | jq -s '.'"
result = subprocess.run(
command,
shell=True,
capture_output=True, text=True, timeout=60
)
if not result.stdout.strip():
- self.logger.info(f"No ASN found for {ip}.")
+ Logger.info(self.sketch_id, f"No ASN found for {ip}.")
return None
- return json.loads(result.stdout)
+ try:
+ # Parse the JSON array
+ data_array = json.loads(result.stdout)
+ if not data_array:
+ return None
+
+ combined_data = {
+ "as_number": None,
+ "as_name": None,
+ "as_country": None,
+ "as_range": []
+ }
+
+ for data in data_array:
+ if data.get("as_number") and not combined_data["as_number"]:
+ combined_data["as_number"] = data["as_number"]
+ if data.get("as_name") and not combined_data["as_name"]:
+ combined_data["as_name"] = data["as_name"]
+ if data.get("as_country") and not combined_data["as_country"]:
+ combined_data["as_country"] = data["as_country"]
+ if "as_range" in data:
+ combined_data["as_range"].extend(data["as_range"])
+
+ return combined_data if combined_data["as_number"] else None
+
+ except json.JSONDecodeError:
+ Logger.error(self.sketch_id, f"Failed to parse JSON from asnmap output: {result.stdout}")
+ return None
+
except Exception as e:
- self.logger.error(message=f"asnmap exception for {ip}: {str(e)}")
+ Logger.error(self.sketch_id, f"asnmap exception for {ip}: {str(e)}")
return None
def postprocess(self, results: OutputType, original_input: InputType) -> OutputType:
@@ -111,13 +139,13 @@ class AsnScanner(Scanner):
continue
query = """
- MERGE (ip:IP {address: $ip_address})
+ MERGE (ip:ip {address: $ip_address})
SET ip.sketch_id = $sketch_id,
ip.label = $ip_address,
ip.caption = $ip_address,
ip.type = "ip"
- MERGE (asn:ASN {number: $asn_number})
+ MERGE (asn:asn {number: $asn_number})
SET asn.sketch_id = $sketch_id,
asn.name = $asn_name,
asn.country = $asn_country,
diff --git a/flowsint-api/app/scanners/ips/reverse_resolve.py b/flowsint-api/app/scanners/ips/reverse_resolve.py
index 6f17224e..82590f9b 100644
--- a/flowsint-api/app/scanners/ips/reverse_resolve.py
+++ b/flowsint-api/app/scanners/ips/reverse_resolve.py
@@ -5,6 +5,7 @@ import dns.resolver
import requests
from typing import List, Dict, Any, TypeAlias, Union
from pydantic import TypeAdapter
+from app.core.logger import Logger
from app.scanners.base import Scanner
from app.types.domain import MinimalDomain
from app.types.ip import MinimalIp
@@ -79,14 +80,14 @@ class ReverseResolveScanner(Scanner):
def postprocess(self, results: OutputType, original_input: InputType) -> OutputType:
for ip_obj, domain_obj in zip(original_input, results):
- self.logger.success(message=f"Resolved {ip_obj.address} to {domain_obj.domain}")
+ Logger.success(self.sketch_id, message=f"Resolved {ip_obj.address} to {domain_obj.domain}")
query = """
- MERGE (ip:IP {address: $address})
+ MERGE (ip:ip {address: $address})
SET ip.sketch_id = $sketch_id,
ip.label = $label,
ip.caption = $caption,
ip.type = $type
- MERGE (domain:Domain {domain: $domain})
+ MERGE (domain:domain {domain: $domain})
MERGE (ip)-[:REVERSE_RESOLVES_TO {sketch_id: $sketch_id}]->(domain)
"""
if self.neo4j_conn:
diff --git a/flowsint-api/app/scanners/orchestrator.py b/flowsint-api/app/scanners/orchestrator.py
index 6df57bd1..1d904653 100644
--- a/flowsint-api/app/scanners/orchestrator.py
+++ b/flowsint-api/app/scanners/orchestrator.py
@@ -1,15 +1,20 @@
-from typing import List, Dict, Any, Tuple, Set
+from typing import List, Dict, Any
from uuid import UUID
from datetime import datetime
+import uuid
from pydantic import BaseModel, ValidationError
from app.scanners.base import Scanner
from app.scanners.registry import ScannerRegistry
from app.types.transform import FlowBranch, FlowStep
from app.core.logger import Logger
+from app.tasks.logging import emit_log_task
+from app.api.routes.logs import ScannerStatus
+import asyncio
+import json
class TransformOrchestrator(Scanner):
- def __init__(self, sketch_id: str, scan_id: str, transform_branches: List[FlowBranch],logger: Logger, neo4j_conn=None ):
- super().__init__(sketch_id, scan_id, neo4j_conn=neo4j_conn, logger=logger)
+ def __init__(self, sketch_id: str, scan_id: str, transform_branches: List[FlowBranch], neo4j_conn=None):
+ super().__init__(sketch_id, scan_id, neo4j_conn=neo4j_conn)
self.transform_branches = transform_branches
self.scanners = {} # Map of nodeId -> scanner instance
self._load_scanners()
@@ -39,10 +44,9 @@ class TransformOrchestrator(Scanner):
if not ScannerRegistry.scanner_exists(scanner_name):
raise ValueError(f"Scanner '{scanner_name}' not found in registry")
- scanner = ScannerRegistry.get_scanner(scanner_name, self.sketch_id, self.scan_id, neo4j_conn=self.neo4j_conn, logger=self.logger)
+ scanner = ScannerRegistry.get_scanner(scanner_name, self.sketch_id, self.scan_id, neo4j_conn=self.neo4j_conn)
self.scanners[node_id] = scanner
-
def resolve_reference(self, ref_value: str, results_mapping: Dict[str, Any]) -> Any:
"""
Resolve a reference value from the results mapping.
@@ -85,16 +89,11 @@ class TransformOrchestrator(Scanner):
scanner = self.scanners.get(step.nodeId)
if scanner:
primary_key = scanner.key()
- self.logger.debug(message=f"No resolved inputs for scanner {scanner.name()} (nodeId={step.nodeId}), using initial values: {initial_values}")
return {primary_key: initial_values}
else:
- scanner = self.scanners.get(step.nodeId)
- if scanner:
- self.logger.debug(message=f"Prepared inputs for scanner {scanner.name()} (nodeId={step.nodeId}): {inputs}")
-
+ scanner = self.scanners.get(step.nodeId)
return inputs[input_key]
-
def update_results_mapping(self, outputs: Dict[str, Any], step_outputs: Dict[str, str], results_mapping: Dict[str, Any]) -> None:
"""
Update the results mapping with new outputs from a scanner.
@@ -102,7 +101,6 @@ class TransformOrchestrator(Scanner):
for output_key, output_ref in step_outputs.items():
if output_key in outputs:
results_mapping[output_ref] = outputs[output_key]
- self.logger.debug(message=f"Updated results_mapping: '{output_ref}' -> {outputs[output_key]}")
@classmethod
def name(cls) -> str:
@@ -128,17 +126,46 @@ class TransformOrchestrator(Scanner):
}
def scan(self, values: List[str]) -> Dict[str, Any]:
+ """
+ Synchronous implementation of scan that runs the async version in an event loop
+ """
+ loop = asyncio.new_event_loop()
+ asyncio.set_event_loop(loop)
+ try:
+ results = loop.run_until_complete(self._async_scan(values))
+ return results
+ finally:
+ loop.close()
+
+ async def _async_scan(self, values: List[str]) -> Dict[str, Any]:
+ """
+ The actual async implementation of the scan logic
+ """
results = {
"initial_values": values,
"branches": [],
"results": {}
}
+ # Update status to running
+ status_data = {
+ "status": ScannerStatus.RUNNING,
+ "timestamp": datetime.utcnow().isoformat(),
+ "details": {
+ "message": "Starting scan",
+ "total_steps": sum(len(branch.steps) for branch in self.transform_branches)
+ }
+ }
+ emit_log_task.delay(str(uuid.uuid4()), self.sketch_id, "INFO", json.dumps(status_data))
+
# Global mapping of output references to actual values
results_mapping = {}
# Cache for scanner results to avoid recomputation
scanner_results_cache = {}
+ total_steps = sum(len(branch.steps) for branch in self.transform_branches)
+ completed_steps = 0
+
# Process each branch
for branch in self.transform_branches:
branch_id = branch.id
@@ -154,11 +181,12 @@ class TransformOrchestrator(Scanner):
for step in branch.steps:
if step.type == "type":
continue
+
node_id = step.nodeId
scanner = self.scanners.get(node_id)
if not scanner:
- self.logger.error(message=f"Scanner not found for node {node_id}")
+ Logger.error(self.sketch_id, f"Scanner not found for node {node_id}")
continue
scanner_name = scanner.name()
@@ -169,28 +197,38 @@ class TransformOrchestrator(Scanner):
}
try:
+ # Update status for current step
+ completed_steps += 1
+ status_data = {
+ "status": ScannerStatus.RUNNING,
+ "timestamp": datetime.utcnow().isoformat(),
+ "details": {
+ "message": f"Running {scanner_name}",
+ "current_step": completed_steps,
+ "total_steps": total_steps,
+ "progress": (completed_steps / total_steps) * 100
+ }
+ }
+ emit_log_task.delay(str(uuid.uuid4()), self.sketch_id, "INFO", json.dumps(status_data))
+
if not scanner_inputs:
- self.logger.warn(message=f"No inputs available for scanner {scanner_name}, skipping")
step_result["error"] = "No inputs available"
branch_results["steps"].append(step_result)
continue
-
- self.logger.debug(message=f"Executing scanner {scanner_name} (nodeId={node_id}) with inputs: {scanner_inputs}")
+
# Check if we already have results for this scanner with these inputs
cache_key = f"{node_id}:{str(scanner_inputs)}"
if cache_key in scanner_results_cache:
outputs = scanner_results_cache[cache_key]
- self.logger.info(message=f"Using cached results for {scanner_name}")
+ Logger.info(self.sketch_id, f"Using cached results for {scanner_name}")
else:
# Execute the scanner
outputs = scanner.execute(scanner_inputs)
if not isinstance(outputs, (dict, list)):
raise ValueError(f"Scanner '{scanner_name}' returned unsupported output format")
- self.logger.success(message=f"Found {str(len(outputs))} for scanner {scanner.name()}")
# Cache the results
scanner_results_cache[cache_key] = outputs
- self.logger.debug(message=f"Scanner {scanner_name} (nodeId={node_id}) returned outputs: {outputs}")
# Store the outputs in the step result
step_result["outputs"] = outputs
step_result["status"] = "completed"
@@ -204,20 +242,56 @@ class TransformOrchestrator(Scanner):
except ValidationError as e:
error_msg = f"Validation error: {str(e)}"
- self.logger.error(message=f"Validation error in {scanner_name}: {str(e)}")
+ Logger.error(self.sketch_id, f"Validation error in {scanner_name}: {str(e)}")
step_result["error"] = error_msg
results["results"][node_id] = {"error": error_msg}
+ # Update status to failed
+ status_data = {
+ "status": ScannerStatus.FAILED,
+ "timestamp": datetime.utcnow().isoformat(),
+ "details": {
+ "error": error_msg,
+ "failed_step": scanner_name
+ }
+ }
+ emit_log_task.delay(str(uuid.uuid4()), self.sketch_id, "ERROR", json.dumps(status_data))
+ return results
+
except Exception as e:
error_msg = f"Error during scan: {str(e)}"
- self.logger.error(message=f"Error during scan {scanner_name}: {str(e)}")
+ Logger.error(self.sketch_id, f"Error during scan {scanner_name}: {str(e)}")
step_result["error"] = error_msg
results["results"][node_id] = {"error": error_msg}
+
+ # Update status to failed
+ status_data = {
+ "status": ScannerStatus.FAILED,
+ "timestamp": datetime.utcnow().isoformat(),
+ "details": {
+ "error": error_msg,
+ "failed_step": scanner_name
+ }
+ }
+ emit_log_task.delay(str(uuid.uuid4()), self.sketch_id, "ERROR", json.dumps(status_data))
+ return results
branch_results["steps"].append(step_result)
results["branches"].append(branch_results)
+ # Update status to completed
+ status_data = {
+ "status": ScannerStatus.COMPLETED,
+ "timestamp": datetime.utcnow().isoformat(),
+ "details": {
+ "message": "Scan completed successfully",
+ "total_steps": total_steps,
+ "completed_steps": completed_steps
+ }
+ }
+ emit_log_task.delay(str(uuid.uuid4()), self.sketch_id, "INFO", json.dumps(status_data))
+
# Include the final reference mapping for debugging
results["reference_mapping"] = results_mapping
diff --git a/flowsint-api/app/scanners/organizations/org_to_asn.py b/flowsint-api/app/scanners/organizations/org_to_asn.py
index a409c95e..014eb48b 100644
--- a/flowsint-api/app/scanners/organizations/org_to_asn.py
+++ b/flowsint-api/app/scanners/organizations/org_to_asn.py
@@ -1,18 +1,19 @@
import json
+import socket
import subprocess
from typing import List, Dict, Any, TypeAlias, Union
from pydantic import TypeAdapter
from app.scanners.base import Scanner
-from app.types.cidr import CIDR
from app.types.organization import MinimalOrganization
from app.types.asn import ASN
from app.utils import resolve_type
+from app.core.logger import Logger
InputType: TypeAlias = List[MinimalOrganization]
OutputType: TypeAlias = List[ASN]
class OrgToAsnScanner(Scanner):
- """Takes an organization and returns the ASN(s) if any."""
+ """Takes an organization and returns its corresponding ASN."""
@classmethod
def name(cls) -> str:
@@ -55,55 +56,60 @@ class OrgToAsnScanner(Scanner):
def preprocess(self, data: Union[List[str], List[dict], InputType]) -> InputType:
cleaned: InputType = []
for item in data:
+ org_obj = None
if isinstance(item, str):
- cleaned.append(MinimalOrganization(name=item))
+ org_obj = MinimalOrganization(name=item)
elif isinstance(item, dict) and "name" in item:
- cleaned.append(MinimalOrganization(**item))
+ org_obj = MinimalOrganization(name=item["name"])
elif isinstance(item, MinimalOrganization):
- cleaned.append(item)
+ org_obj = item
+ if org_obj:
+ cleaned.append(org_obj)
return cleaned
def scan(self, data: InputType) -> OutputType:
- """Find ASN information for organization name using asnmap."""
+ """Find ASN information for organizations using asnmap."""
asns: OutputType = []
- self.logger.debug(message=f"[ASN_SCANNER]: input data: {str(data)}")
for org in data:
asn_data = self.__get_asn_from_asnmap(org.name)
if asn_data:
- self.logger.info(message=f"ASN {asn_data['as_number']} found for org {org.name}.")
+ Logger.info(self.sketch_id, f"ASN {asn_data['as_number']} found for org {org.name}.")
asns.append(ASN(
number=int(asn_data["as_number"].lstrip("AS")),
name=asn_data["as_name"],
country=asn_data["as_country"],
- cidrs=[CIDR(network=cidr) for cidr in asn_data["as_range"]]
+ cidrs=[]
))
else:
- self.logger.info(f"No ASN found for org {org.name}")
+ Logger.info(self.sketch_id, f"No ASN found for org {org.name}")
return asns
def __get_asn_from_asnmap(self, name: str) -> Dict[str, Any]:
try:
- command = f"echo '{name}' | asnmap -silent -json | jq -s '.'"
+ # Properly run the shell pipeline using shell=True
+ command = f"echo {name} | asnmap -silent -json | jq"
result = subprocess.run(
command,
shell=True,
capture_output=True, text=True, timeout=60
)
if not result.stdout.strip():
- self.logger.info(f"No ASN found for {name}.")
+ Logger.info(self.sketch_id, f"No ASN found for {name}.")
return None
try:
+ # Parse the JSON array
data_array = json.loads(result.stdout)
if not data_array:
return None
- # Merge results if multiple, or just return the first
+
combined_data = {
"as_range": [],
"as_name": None,
"as_country": None,
"as_number": None
}
+
for data in data_array:
if "as_range" in data:
combined_data["as_range"].extend(data["as_range"])
@@ -113,48 +119,53 @@ class OrgToAsnScanner(Scanner):
combined_data["as_country"] = data["as_country"]
if data.get("as_number") and not combined_data["as_number"]:
combined_data["as_number"] = data["as_number"]
- return combined_data if combined_data["as_range"] else None
+
+ return combined_data if combined_data["as_number"] else None
+
except json.JSONDecodeError:
- self.logger.error(f"Failed to parse JSON from asnmap output: {result.stdout}")
+ Logger.error(self.sketch_id, f"Failed to parse JSON from asnmap output: {result.stdout}")
return None
+
except Exception as e:
- self.logger.error(message=f"asnmap exception for {name}: {str(e)}")
+ Logger.error(self.sketch_id, f"asnmap exception for {name}: {str(e)}")
return None
def postprocess(self, results: OutputType, original_input: InputType) -> OutputType:
# Create Neo4j relationships between organizations and their corresponding ASNs
- self.logger.info(message=f"Postprocessing {len(results)} ASNs for {len(original_input)} organizations")
- self.logger.info(message=f"RESULTS for ORGTOASN {str(results)}")
-
- for org, asn in zip(original_input, results):
- if asn.number == 0:
+ Logger.info(self.sketch_id, f"Postprocessing {len(results)} ASNs for {len(original_input)} organizations")
+ Logger.info(self.sketch_id, f"RESULTS for ORGTOASN {str(results)}")
+ for input_org, result_asn in zip(original_input, results):
+ # Skip if no valid ASN was found
+ if result_asn.number == 0:
continue
- if self.neo4j_conn:
- query = """
- MERGE (org:Organization {name: $org_name, country: $org_country})
- SET org.sketch_id = $sketch_id,
- org.label = $org_name,
- org.caption = $org_name,
- org.type = "organization"
-
- MERGE (asn:ASN {number: $asn_number})
- SET asn.sketch_id = $sketch_id,
- asn.name = $asn_name,
- asn.country = $asn_country,
- asn.label = $asn_label,
- asn.caption = $asn_caption,
- asn.type = "asn"
- MERGE (org)-[:OWNS {sketch_id: $sketch_id}]->(asn)
- """
+ query = """
+ MERGE (org:organization {name: $org_name})
+ SET org.sketch_id = $sketch_id,
+ org.label = $org_name,
+ org.caption = $org_name,
+ org.type = "organization"
+
+ MERGE (asn:asn {number: $asn_number})
+ SET asn.sketch_id = $sketch_id,
+ asn.name = $asn_name,
+ asn.country = $asn_country,
+ asn.label = $asn_label,
+ asn.caption = $asn_caption,
+ asn.type = "asn"
+
+ MERGE (org)-[:BELONGS_TO {sketch_id: $sketch_id}]->(asn)
+ """
+
+ if self.neo4j_conn:
self.neo4j_conn.query(query, {
- "org_name": org.name,
- "org_country": getattr(org, 'country', None) or "Unknown",
- "asn_number": asn.number,
- "asn_name": asn.name,
- "asn_country": asn.country,
- "asn_label": f"AS{asn.number}",
- "asn_caption": f"AS{asn.number} - {asn.name}",
+ "org_name": input_org.name,
+ "asn_number": result_asn.number,
+ "asn_name": result_asn.name,
+ "asn_country": result_asn.country,
+ "asn_label": f"AS{result_asn.number}",
+ "asn_caption": f"AS{result_asn.number} - {result_asn.name}",
"sketch_id": self.sketch_id,
})
+
return results
\ No newline at end of file
diff --git a/flowsint-api/app/scanners/organizations/sirene.py b/flowsint-api/app/scanners/organizations/sirene.py
index 8fb8849f..911735bb 100644
--- a/flowsint-api/app/scanners/organizations/sirene.py
+++ b/flowsint-api/app/scanners/organizations/sirene.py
@@ -104,7 +104,7 @@ class SireneScanner(Scanner):
for org in results:
self.neo4j_conn.query("""
- MERGE (o:Organization {name: $name, country: $country})
+ MERGE (o:organization {name: $name, country: $country})
SET o.founding_date = $founding_date,
o.description = $description,
o.label = $label,
diff --git a/flowsint-api/app/scanners/registry.py b/flowsint-api/app/scanners/registry.py
index cb52a642..759edc09 100644
--- a/flowsint-api/app/scanners/registry.py
+++ b/flowsint-api/app/scanners/registry.py
@@ -9,10 +9,11 @@ from app.scanners.ips.geolocation import GeolocationScanner
from app.scanners.socials.maigret import MaigretScanner
from app.scanners.emails.holehe import HoleheScanner
from app.scanners.organizations.sirene import SireneScanner
-from app.scanners.ips.ip_to_asn import AsnScanner
+from app.scanners.ips.ip_to_asn import IpToAsnScanner
from app.scanners.ips.asn_to_cidrs import AsnToCidrsScanner
from app.scanners.ips.cidr_to_ips import CidrToIpsScanner
from app.scanners.organizations.org_to_asn import OrgToAsnScanner
+from app.scanners.domains.domain_to_asn import DomainToAsnScanner
class ScannerRegistry:
@@ -73,7 +74,8 @@ ScannerRegistry.register(GeolocationScanner)
ScannerRegistry.register(MaigretScanner)
ScannerRegistry.register(HoleheScanner)
ScannerRegistry.register(SireneScanner)
-ScannerRegistry.register(AsnScanner)
+ScannerRegistry.register(IpToAsnScanner)
ScannerRegistry.register(AsnToCidrsScanner)
ScannerRegistry.register(CidrToIpsScanner)
-ScannerRegistry.register(OrgToAsnScanner)
\ No newline at end of file
+ScannerRegistry.register(OrgToAsnScanner)
+ScannerRegistry.register(DomainToAsnScanner)
\ No newline at end of file
diff --git a/flowsint-api/app/tasks/logging.py b/flowsint-api/app/tasks/logging.py
index dcde3600..8c1d6bba 100644
--- a/flowsint-api/app/tasks/logging.py
+++ b/flowsint-api/app/tasks/logging.py
@@ -1,23 +1,31 @@
# tasks/logging.py
from app.core.celery import celery
-from app.core.events import event_emitter
+import redis
+import json
import logging
+import os
logger = logging.getLogger(__name__)
@celery.task(name="emit_log")
-def emit_log_task(log_id: str, scan_id: str, log_type: str, content: str):
+def emit_log_task(log_id: str, sketch_id: str, log_type: str, content: str):
"""Celery task to emit a log event"""
try:
- logger.debug(f"Emitting log event: {log_id} for scan {scan_id}")
+ logger.debug(f"Emitting log event: {log_id} for sketch {sketch_id}")
log_data = {
"id": log_id,
- "scan_id": scan_id,
+ "sketch_id": sketch_id,
"type": log_type,
"content": content
}
- event_emitter.emit_sync(scan_id, log_data)
- logger.debug(f"Successfully emitted log event: {log_id}")
+ print('########################################################')
+ print(f"[EventEmitter] Publishing log event: {log_id} for sketch {sketch_id}")
+ print('########################################################')
+
+ # Connect to Redis and publish directly
+ redis_client = redis.from_url(os.getenv("REDIS_URI", "redis://127.0.0.1:6379/0"))
+ redis_client.publish(sketch_id, json.dumps(log_data))
+ logger.debug(f"Successfully published log event: {log_id}")
except Exception as e:
- logger.error(f"Error emitting log event: {str(e)}")
+ logger.error(f"Error publishing log event: {str(e)}")
raise
diff --git a/flowsint-api/app/tasks/transform.py b/flowsint-api/app/tasks/transform.py
index 0a678e79..0b2d3306 100644
--- a/flowsint-api/app/tasks/transform.py
+++ b/flowsint-api/app/tasks/transform.py
@@ -15,16 +15,18 @@ from app.core.logger import Logger
load_dotenv()
URI = os.getenv("NEO4J_URI_BOLT")
+URI="bolt://localhost:7687"
USERNAME = os.getenv("NEO4J_USERNAME")
PASSWORD = os.getenv("NEO4J_PASSWORD")
neo4j_connection = Neo4jConnection(URI, USERNAME, PASSWORD)
db: Session = next(get_db())
-logger = Logger(db)
+logger = Logger()
@celery.task(name="run_transform", bind=True)
def run_scan(self, transform_branches, values: List[str], sketch_id: str | None):
session = SessionLocal()
+
try:
if not transform_branches:
raise ValueError("transform_branches not provided in the input transform")
@@ -34,9 +36,7 @@ def run_scan(self, transform_branches, values: List[str], sketch_id: str | None)
scan = Scan(
id=scan_id,
status="pending",
- values=values,
sketch_id=uuid.UUID(sketch_id) if sketch_id else None,
- results={}
)
session.add(scan)
session.commit()
@@ -47,11 +47,12 @@ def run_scan(self, transform_branches, values: List[str], sketch_id: str | None)
scan_id=str(scan_id),
transform_branches=transform_branches,
neo4j_conn=neo4j_connection,
- logger=logger
)
- results = scanner.execute(values=values)
+
+ # Use the synchronous scan method which internally handles the async operations
+ results = scanner.scan(values=values)
- scan.status = "finished" if "error" not in results else "error"
+ scan.status = "completed"
scan.results = scanner.results_to_json(results)
session.commit()
@@ -64,7 +65,7 @@ def run_scan(self, transform_branches, values: List[str], sketch_id: str | None)
scan = session.query(Scan).filter(Scan.id == uuid.UUID(self.request.id)).first()
if scan:
- scan.status = "error"
+ scan.status = "failed"
scan.results = {"error": error_logs}
session.commit()
diff --git a/flowsint-api/app/types/social.py b/flowsint-api/app/types/social.py
index aa153ec5..42636c0f 100644
--- a/flowsint-api/app/types/social.py
+++ b/flowsint-api/app/types/social.py
@@ -1,4 +1,4 @@
-from pydantic import BaseModel, Field, HttpUrl
+from pydantic import BaseModel, Field
from typing import Optional
class MinimalSocial(BaseModel):
diff --git a/flowsint-api/app/types/whois.py b/flowsint-api/app/types/whois.py
index fc22d686..42cdd15b 100644
--- a/flowsint-api/app/types/whois.py
+++ b/flowsint-api/app/types/whois.py
@@ -1,7 +1,6 @@
from typing import Optional
from pydantic import BaseModel, Field
from app.types.email import Email
-from app.types.domain import Domain
class Whois(BaseModel):
registrar: Optional[str] = Field(None, description="Domain registrar name")
diff --git a/flowsint-api/requirements.txt b/flowsint-api/requirements.txt
index 05f39ead..1f74c240 100644
--- a/flowsint-api/requirements.txt
+++ b/flowsint-api/requirements.txt
@@ -26,3 +26,4 @@ alembic
passlib[bcrypt]
sse-starlette
networkx
+pydantic_neo4j
\ No newline at end of file
diff --git a/flowsint-api/resume.cfg b/flowsint-api/resume.cfg
index f61f62ad..18ee135b 100644
--- a/flowsint-api/resume.cfg
+++ b/flowsint-api/resume.cfg
@@ -1,2 +1,2 @@
-resume_from=
-index=0
+index=3635
+resume_from=5.250.190.143
diff --git a/flowsint-api/tests/scanners/__init__.py b/flowsint-api/scanners/__init__.py
similarity index 100%
rename from flowsint-api/tests/scanners/__init__.py
rename to flowsint-api/scanners/__init__.py
diff --git a/flowsint-api/tests/scanners/domains/__init__.py b/flowsint-api/scanners/domains/__init__.py
similarity index 100%
rename from flowsint-api/tests/scanners/domains/__init__.py
rename to flowsint-api/scanners/domains/__init__.py
diff --git a/flowsint-api/tests/scanners/domains/resolve.py b/flowsint-api/scanners/domains/resolve.py
similarity index 100%
rename from flowsint-api/tests/scanners/domains/resolve.py
rename to flowsint-api/scanners/domains/resolve.py
diff --git a/flowsint-api/tests/scanners/domains/subdomains.py b/flowsint-api/scanners/domains/subdomains.py
similarity index 100%
rename from flowsint-api/tests/scanners/domains/subdomains.py
rename to flowsint-api/scanners/domains/subdomains.py
diff --git a/flowsint-api/tests/scanners/domains/whois.py b/flowsint-api/scanners/domains/whois.py
similarity index 100%
rename from flowsint-api/tests/scanners/domains/whois.py
rename to flowsint-api/scanners/domains/whois.py
diff --git a/flowsint-api/tests/scanners/emails/__init__.py b/flowsint-api/scanners/emails/__init__.py
similarity index 100%
rename from flowsint-api/tests/scanners/emails/__init__.py
rename to flowsint-api/scanners/emails/__init__.py
diff --git a/flowsint-api/tests/scanners/emails/holehe.py b/flowsint-api/scanners/emails/holehe.py
similarity index 100%
rename from flowsint-api/tests/scanners/emails/holehe.py
rename to flowsint-api/scanners/emails/holehe.py
diff --git a/flowsint-api/tests/scanners/ips/__init__.py b/flowsint-api/scanners/ips/__init__.py
similarity index 100%
rename from flowsint-api/tests/scanners/ips/__init__.py
rename to flowsint-api/scanners/ips/__init__.py
diff --git a/flowsint-api/tests/scanners/ips/asn_to_cidrs.py b/flowsint-api/scanners/ips/asn_to_cidrs.py
similarity index 100%
rename from flowsint-api/tests/scanners/ips/asn_to_cidrs.py
rename to flowsint-api/scanners/ips/asn_to_cidrs.py
diff --git a/flowsint-api/tests/scanners/ips/cidr_to_ips.py b/flowsint-api/scanners/ips/cidr_to_ips.py
similarity index 100%
rename from flowsint-api/tests/scanners/ips/cidr_to_ips.py
rename to flowsint-api/scanners/ips/cidr_to_ips.py
diff --git a/flowsint-api/tests/scanners/ips/geolocation.py b/flowsint-api/scanners/ips/geolocation.py
similarity index 100%
rename from flowsint-api/tests/scanners/ips/geolocation.py
rename to flowsint-api/scanners/ips/geolocation.py
diff --git a/flowsint-api/tests/scanners/ips/ip_to_asn.py b/flowsint-api/scanners/ips/ip_to_asn.py
similarity index 98%
rename from flowsint-api/tests/scanners/ips/ip_to_asn.py
rename to flowsint-api/scanners/ips/ip_to_asn.py
index 94a99970..efee8f19 100644
--- a/flowsint-api/tests/scanners/ips/ip_to_asn.py
+++ b/flowsint-api/scanners/ips/ip_to_asn.py
@@ -1,7 +1,7 @@
import pytest
import json
from unittest.mock import Mock
-from app.scanners.ips.ip_to_asn import AsnScanner
+from app.scanners.ips.ip_to_asn import IpToAsnScanner
from app.types.ip import MinimalIp
from app.types.asn import ASN
from app.types.cidr import CIDR
@@ -9,7 +9,7 @@ from tests.logger import TestLogger
logger = TestLogger()
# The scanner will get a mock logger from conftest.py automatically
-scanner = AsnScanner("sketch_123", "scan_123", logger)
+scanner = IpToAsnScanner("sketch_123", "scan_123", logger)
def test_preprocess_valid_ips():
ips = [
diff --git a/flowsint-api/tests/scanners/orchestrator.py b/flowsint-api/scanners/orchestrator.py
similarity index 100%
rename from flowsint-api/tests/scanners/orchestrator.py
rename to flowsint-api/scanners/orchestrator.py
diff --git a/flowsint-api/tests/scanners/organizations/__init__.py b/flowsint-api/scanners/organizations/__init__.py
similarity index 100%
rename from flowsint-api/tests/scanners/organizations/__init__.py
rename to flowsint-api/scanners/organizations/__init__.py
diff --git a/flowsint-api/tests/scanners/organizations/sirene.py b/flowsint-api/scanners/organizations/sirene.py
similarity index 100%
rename from flowsint-api/tests/scanners/organizations/sirene.py
rename to flowsint-api/scanners/organizations/sirene.py
diff --git a/flowsint-api/tests/scanners/socials/__init__.py b/flowsint-api/scanners/socials/__init__.py
similarity index 100%
rename from flowsint-api/tests/scanners/socials/__init__.py
rename to flowsint-api/scanners/socials/__init__.py
diff --git a/flowsint-api/tests/scanners/socials/maigret.py b/flowsint-api/scanners/socials/maigret.py
similarity index 100%
rename from flowsint-api/tests/scanners/socials/maigret.py
rename to flowsint-api/scanners/socials/maigret.py
diff --git a/flowsint-app/package.json b/flowsint-app/package.json
index c2553b39..b481b2c9 100644
--- a/flowsint-app/package.json
+++ b/flowsint-app/package.json
@@ -92,6 +92,8 @@
"lucide-react": "^0.511.0",
"next-themes": "^0.4.6",
"react-day-picker": "8.10.1",
+ "react-force-graph-2d": "^1.27.1",
+ "react-force-graph-3d": "^1.26.1",
"react-hook-form": "^7.56.4",
"react-medium-image-zoom": "^5.2.14",
"react-resizable-panels": "^3.0.2",
@@ -100,6 +102,7 @@
"sonner": "^2.0.4",
"tailwindcss": "^4.1.8",
"tailwindcss-animate": "^1.0.7",
+ "three-spritetext": "^1.9.6",
"tw-animate-css": "^1.3.2",
"usehooks-ts": "^3.1.1",
"vaul": "^1.1.2",
diff --git a/flowsint-app/src/renderer/src/api/log-service.ts b/flowsint-app/src/renderer/src/api/log-service.ts
index c0fb6f8a..69deb2fc 100644
--- a/flowsint-app/src/renderer/src/api/log-service.ts
+++ b/flowsint-app/src/renderer/src/api/log-service.ts
@@ -2,13 +2,13 @@ import { fetchWithAuth } from './api';
export const logService = {
- get: async (): Promise<any> => {
- return fetchWithAuth('/api/logs', {
+ get: async (sketch_id: string): Promise<any> => {
+ return fetchWithAuth(`/api/logs/sketch/${sketch_id}`, {
method: 'GET',
});
},
- delete: async (): Promise<any> => {
- return fetchWithAuth(`/api/logs`, {
+ delete: async (sketch_id: string): Promise<any> => {
+ return fetchWithAuth(`/api/logs/sketch/${sketch_id}`, {
method: 'DELETE',
});
},
diff --git a/flowsint-app/src/renderer/src/api/scan-service.ts b/flowsint-app/src/renderer/src/api/scan-service.ts
new file mode 100644
index 00000000..462c1166
--- /dev/null
+++ b/flowsint-app/src/renderer/src/api/scan-service.ts
@@ -0,0 +1,8 @@
+import { fetchWithAuth } from './api'
+
+export const scanService = {
+ get: (scan_id: string) => fetchWithAuth(`/api/scans/${scan_id}`, { method: 'GET' }),
+ delete: (scan_id: string) => fetchWithAuth(`/api/scans/${scan_id}`, { method: 'DELETE' }),
+ getSketchScans: (sketch_id: string) => fetchWithAuth(`/api/scans/sketch/${sketch_id}`, { method: 'GET' }),
+ deleteAll: () => fetchWithAuth('/api/scans/all', { method: 'DELETE' })
+}
\ No newline at end of file
diff --git a/flowsint-app/src/renderer/src/components/graphs/graph-panel.tsx b/flowsint-app/src/renderer/src/components/graphs/graph-panel.tsx
index f44a011f..5ee6ff9e 100644
--- a/flowsint-app/src/renderer/src/components/graphs/graph-panel.tsx
+++ b/flowsint-app/src/renderer/src/components/graphs/graph-panel.tsx
@@ -1,5 +1,5 @@
import { useLoaderData } from '@tanstack/react-router'
-import { useEffect, useRef, memo, useState } from 'react'
+import { useEffect, useRef, memo, useState, lazy, Suspense } from 'react'
// import Graph from '../sketches/graph'
import { useSketchStore } from '@/stores/sketch-store'
import { Toolbar } from '../sketches/toolbar'
@@ -7,7 +7,11 @@ import { cn } from '@/lib/utils'
import { ArrowDownToLineIcon } from 'lucide-react'
import { CreateRelationDialog } from './create-relation'
// import GraphSigma from '../sketches/graph-sigma'
-import Graph from '../sketches/graph'
+import type { InvestigationGraph, NodeData, EdgeData } from '@/types'
+import GraphLoader from './graph-loader'
+
+const GraphReactForce = lazy(() => import('../sketches/graph-react-force'))
+const Graph = lazy(() => import('../sketches/graph'))
// Separate component for the drag overlay
const DragOverlay = memo(({ isDragging }: { isDragging: boolean }) => (
@@ -24,11 +28,17 @@ const DragOverlay = memo(({ isDragging }: { isDragging: boolean }) => (
))
DragOverlay.displayName = 'DragOverlay'
-const GraphPanel = () => {
+interface GraphPanelProps {
+ graphData: { nds: NodeData[]; rls: EdgeData[] } | null;
+ isLoading: boolean;
+}
+
+const GraphPanel = ({ graphData, isLoading }: GraphPanelProps) => {
const graphPanelRef = useRef<HTMLDivElement>(null)
const handleOpenFormModal = useSketchStore(s => s.handleOpenFormModal)
+ const nodes = useSketchStore(s => s.nodes)
const updateGraphData = useSketchStore(s => s.updateGraphData)
- const { sketch, graphData } = useLoaderData({
+ const { sketch } = useLoaderData({
from: '/_auth/dashboard/investigations/$investigationId/$type/$id',
})
const [isDraggingOver, setIsDraggingOver] = useState(false)
@@ -66,6 +76,9 @@ const GraphPanel = () => {
}
}
}
+ if (isLoading) {
+ return <GraphLoader />
+ }
if (!sketch || !graphData) {
return (
@@ -91,11 +104,20 @@ const GraphPanel = () => {
onDragLeave={handleDragLeave}
onDrop={handleDrop}
>
- <Graph />
+ <Suspense fallback={
+ <div className="h-full w-full flex items-center justify-center">
+ <div className="text-center">
+ <p className="text-muted-foreground">Loading graph...</p>
+ </div>
+ </div>
+ }>
+ {nodes?.length > 2000 ? <Graph /> : <GraphReactForce />}
+ </Suspense>
+ {/* <Graph /> */}
{/* <GraphSigma /> */}
<DragOverlay isDragging={isDraggingOver} />
<div className='absolute w-10 right-3 top-3 h-min shadow-sm border rounded-full overflow-y-auto'>
- <Toolbar />
+ <Toolbar isLoading={isLoading} />
</div>
<CreateRelationDialog />
</div>
diff --git a/flowsint-app/src/renderer/src/components/investigations/investigation-list.tsx b/flowsint-app/src/renderer/src/components/investigations/investigation-list.tsx
index 51bbe35a..983695f8 100644
--- a/flowsint-app/src/renderer/src/components/investigations/investigation-list.tsx
+++ b/flowsint-app/src/renderer/src/components/investigations/investigation-list.tsx
@@ -1,14 +1,12 @@
import { investigationService } from "@/api/investigation-service"
import type { Investigation } from "@/types/investigation"
import { useQuery } from "@tanstack/react-query"
-import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/ui/accordion"
import type { Sketch } from "@/types/sketch"
import NewInvestigation from "./new-investigation"
import { Button } from "../ui/button"
-import { MoreVertical, PlusIcon, Search, Trash2, Waypoints } from "lucide-react"
+import { MoreVertical, PlusIcon, Trash2, Waypoints } from "lucide-react"
import { Input } from "../ui/input"
import { cn } from "@/lib/utils"
-import { Badge } from "../ui/badge"
import { Link, useParams } from "@tanstack/react-router"
import { SkeletonList } from "../shared/skeleton-list"
import { useSketchNavigation } from "@/hooks/use-sketch-navigation"
@@ -17,6 +15,7 @@ import { useConfirm } from "@/components/use-confirm-dialog"
import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "../ui/dropdown-menu"
import { toast } from "sonner"
import { sketchService } from "@/api/sketch-service"
+import { useState, useMemo } from "react"
export const SketchListItem = ({ sketch, investigationId, refetch }: { sketch: Sketch, investigationId: string, refetch: () => void }) => {
const { navigateToSketch } = useSketchNavigation({
@@ -35,54 +34,48 @@ export const SketchListItem = ({ sketch, investigationId, refetch }: { sketch: S
});
if (confirmed) {
- try {
- await sketchService.delete(sketch.id);
- refetch()
- toast.success("Sketch deleted successfully");
- } catch (error) {
- toast.error("Failed to delete sketch");
- }
+ const deletePromise = () => sketchService.delete(sketch.id).then(() => refetch());
+
+ toast.promise(deletePromise, {
+ loading: 'Deleting sketch...',
+ success: () => `Sketch "${sketch.title}" has been deleted`,
+ error: 'Failed to delete sketch'
+ });
}
};
return (
- <li>
- <TabLink
- id={sketch.id}
- type="graph"
- investigationId={investigationId}
- onNavigate={navigateToSketch}
- >
- {({ isActive }) => (
- <div className={cn(
- "px-2 text-muted-foreground hover:text-foreground hover:bg-muted/50 group",
- isActive && "bg-muted text-foreground"
- )}>
- <div className="text-left flex items-center gap-2 w-full py-1 h-full truncate text-ellipsis">
- <Badge variant={"outline"} className="text-[.5rem] p-1 !py-.5 text-yellow-500 border-none">
- <Waypoints className="h-3 w-3" /> GRAPH
- </Badge>
- <span className="truncate text-ellipsis">{sketch.title}</span>
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <div className="ml-auto">
- <Button variant="ghost" size="icon" className="h-6 w-6 ml-auto opacity-0 group-hover:opacity-100">
- <MoreVertical className="h-4 w-4" />
- </Button>
- </div>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end">
- <DropdownMenuItem variant="destructive" onClick={handleDelete}>
- <Trash2 className="h-4 w-4 mr-2" />
- Delete
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
- </div>
- </div>
- )}
- </TabLink>
- </li>
+ <TabLink
+ id={sketch.id}
+ type="graph"
+ investigationId={investigationId}
+ onNavigate={navigateToSketch}
+ >
+ {({ isActive }) => (
+ <div className={cn(
+ "flex items-center gap-2 px-3 py-2",
+ isActive ? "bg-muted" : "hover:bg-muted/50"
+ )}>
+ <Waypoints className="h-4 w-4 text-yellow-500" />
+ <span className="flex-1 text-sm truncate">{sketch.title}</span>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <div>
+ <Button variant="ghost" size="icon" className="h-6 w-6">
+ <MoreVertical className="h-4 w-4" />
+ </Button>
+ </div>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ <DropdownMenuItem variant="destructive" onClick={handleDelete}>
+ <Trash2 className="h-4 w-4 mr-2" />
+ Delete
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </div>
+ )}
+ </TabLink>
);
};
@@ -93,6 +86,21 @@ const InvestigationList = () => {
})
const { investigationId } = useParams({ strict: false })
const { confirm } = useConfirm();
+ const [searchQuery, setSearchQuery] = useState("")
+
+ const filteredInvestigations = useMemo(() => {
+ if (!data) return []
+ if (!searchQuery.trim()) return data
+
+ const query = searchQuery.toLowerCase().trim()
+ return data.filter((investigation) => {
+ const matchesInvestigation = investigation.name.toLowerCase().includes(query)
+ const matchesSketches = investigation.sketches?.some(sketch =>
+ sketch.title.toLowerCase().includes(query)
+ )
+ return matchesInvestigation || matchesSketches
+ })
+ }, [data, searchQuery])
const handleDeleteInvestigation = async (investigation: Investigation, e: React.MouseEvent) => {
e.preventDefault();
@@ -104,104 +112,104 @@ const InvestigationList = () => {
});
if (confirmed) {
- try {
- await investigationService.delete(investigation.id);
- refetch()
- toast.success("Investigation deleted successfully");
- } catch (error) {
- toast.error("Failed to delete investigation");
- }
+ const deletePromise = () => investigationService.delete(investigation.id).then(() => refetch());
+ toast.promise(deletePromise, {
+ loading: 'Deleting investigation...',
+ success: () => `Investigation "${investigation.name}" has been deleted`,
+ error: 'Failed to delete investigation'
+ });
}
};
if (error) return <div>Error: {(error as Error).message}</div>
return (
<div className="w-full h-full bg-card flex flex-col overflow-hidden">
- <div className="p-2 flex items-center gap-2 border-b shrink-0">
+ <div className="p-2 flex items-center gap-2 border-b">
<NewInvestigation noDropDown>
<Button variant="ghost" size="icon" className="h-7 w-7">
<PlusIcon className="h-4 w-4" />
</Button>
</NewInvestigation>
- <Input type="search" className="!border border-border h-7" placeholder="Search an investigation..." />
+ <Input
+ type="search"
+ className="h-7"
+ placeholder="Search..."
+ value={searchQuery}
+ onChange={(e) => setSearchQuery(e.target.value)}
+ />
</div>
{isLoading ? (
<div className="p-2">
<SkeletonList rowCount={7} />
</div>
- ) : data && data.length > 0 ? (
- <Accordion
- type="multiple"
- defaultValue={investigationId ? [investigationId] : []}
- className="w-full overflow-auto my-0 !py-0"
- >
- {data?.map((investigation: Investigation) => (
- <AccordionItem key={investigation.id} value={investigation.id}>
- <AccordionTrigger className="px-2 py-1.5 text-muted-foreground text-sm hover:no-underline hover:bg-muted/50 group">
- <div className="flex items-center gap-2 w-full">
- <Link
- to="/dashboard/investigations/$investigationId"
- params={{
- investigationId: investigation.id,
- }}
- className="truncate text-ellipsis hover:underline"
- >{investigation.name}</Link>
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <div className="ml-auto">
- <Button variant="ghost" size="icon" className="h-6 w-6 ml-auto opacity-0 group-hover:opacity-100">
- <MoreVertical className="h-4 w-4" />
- </Button>
- </div>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end">
- <DropdownMenuItem variant="destructive" onClick={(e) => handleDeleteInvestigation(investigation, e)}>
- <Trash2 className="h-4 w-4 mr-2" />
- Delete
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ ) : filteredInvestigations.length > 0 ? (
+ <div className="overflow-auto">
+ {filteredInvestigations.map((investigation: Investigation) => (
+ <div key={investigation.id}>
+ <div className="flex items-center gap-2 px-3 py-2 border-b">
+ <Link
+ to="/dashboard/investigations/$investigationId"
+ params={{
+ investigationId: investigation.id,
+ }}
+ className={cn(
+ "flex-1 text-sm font-medium hover:underline",
+ investigationId === investigation.id && "text-primary"
+ )}
+ >
+ {investigation.name}
+ </Link>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <div>
+ <Button variant="ghost" size="icon" className="h-6 w-6">
+ <MoreVertical className="h-4 w-4" />
+ </Button>
+ </div>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ <DropdownMenuItem variant="destructive" onClick={(e) => handleDeleteInvestigation(investigation, e)}>
+ <Trash2 className="h-4 w-4 mr-2" />
+ Delete
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </div>
+
+ {investigation.sketches && investigation.sketches.length > 0 ? (
+ <div className="pl-4">
+ {investigation.sketches.map((sketch: Sketch) => (
+ <SketchListItem
+ refetch={refetch}
+ key={sketch.id}
+ sketch={sketch}
+ investigationId={investigation.id}
+ />
+ ))}
</div>
- </AccordionTrigger>
- <AccordionContent className="!py-0">
- {investigation.sketches && investigation.sketches.length > 0 ? (
- <ul className="py-2 ml-6 border-l">
- {investigation.sketches.map((sketch: Sketch) => (
- <SketchListItem
- refetch={refetch}
- key={sketch.id}
- sketch={sketch}
- investigationId={investigation.id}
- />
- ))}
- </ul>
- ) : (
- <p className="px-6 text-sm text-muted-foreground italic opacity-60">This investigation is empty.</p>
- )}
- </AccordionContent>
- </AccordionItem>
+ ) : (
+ <p className="px-7 py-2 text-sm text-muted-foreground">
+ Empty
+ </p>
+ )}
+ </div>
))}
- </Accordion>
+ </div>
) : (
- <div className="p-6 flex flex-col items-center text-center gap-3 text-muted-foreground">
- <Search className="h-10 w-10" />
- <div className="space-y-1">
- <h3 className="text-sm font-semibold text-foreground">No investigations yet</h3>
- <p className="text-xs opacity-70 max-w-xs">
- You don't have any investigations yet. Create one to start organizing your sketches.
- </p>
- </div>
+ <div className="flex-1 flex flex-col items-center justify-center text-center gap-2 p-4">
+ <p className="text-sm text-muted-foreground">
+ No investigations yet
+ </p>
<NewInvestigation noDropDown>
<Button size="sm" variant="outline">
<PlusIcon className="w-4 h-4 mr-2" />
- Create your first investigation
+ Create investigation
</Button>
</NewInvestigation>
</div>
- )
- }
- </div >
+ )}
+ </div>
)
}
diff --git a/flowsint-app/src/renderer/src/components/investigations/sketch-list.tsx b/flowsint-app/src/renderer/src/components/investigations/sketch-list.tsx
index f86b2b11..427eebea 100644
--- a/flowsint-app/src/renderer/src/components/investigations/sketch-list.tsx
+++ b/flowsint-app/src/renderer/src/components/investigations/sketch-list.tsx
@@ -8,7 +8,7 @@ import { useParams } from "@tanstack/react-router"
import { SkeletonList } from "../shared/skeleton-list"
import NewSketch from "../sketches/new-sketch"
import { SketchListItem } from "./investigation-list"
-
+import { useState, useMemo } from "react"
const SketchList = () => {
const { investigationId } = useParams({ strict: false })
@@ -16,6 +16,17 @@ const SketchList = () => {
queryKey: ["investigations", "sketches", investigationId],
queryFn: () => investigationService.getById(investigationId as string),
})
+ const [searchQuery, setSearchQuery] = useState("")
+
+ const filteredSketches = useMemo(() => {
+ if (!investigation?.sketches) return []
+ if (!searchQuery.trim()) return investigation.sketches
+
+ const query = searchQuery.toLowerCase().trim()
+ return investigation.sketches.filter((sketch) =>
+ sketch.title.toLowerCase().includes(query)
+ )
+ }, [investigation?.sketches, searchQuery])
if (error) return <div>Error: {(error as Error).message}</div>
return (
@@ -26,7 +37,13 @@ const SketchList = () => {
<PlusIcon className="h-4 w-4" />
</Button>
</NewSketch>
- <Input type="search" className="!border border-border h-7" placeholder="Search a sketch..." />
+ <Input
+ type="search"
+ className="!border border-border h-7"
+ placeholder="Search..."
+ value={searchQuery}
+ onChange={(e) => setSearchQuery(e.target.value)}
+ />
</div>
<div className="flex-1 overflow-auto">
@@ -34,9 +51,9 @@ const SketchList = () => {
<div className="p-2">
<SkeletonList rowCount={7} />
</div>
- ) : investigation?.sketches && investigation.sketches.length > 0 ? (
+ ) : filteredSketches.length > 0 ? (
<ul>
- {investigation.sketches.map((sketch: Sketch) => (
+ {filteredSketches.map((sketch: Sketch) => (
<SketchListItem
refetch={refetch}
key={sketch.id}
@@ -49,9 +66,14 @@ const SketchList = () => {
<div className="p-6 flex flex-col items-center text-center gap-3 text-muted-foreground">
<Waypoints className="h-10 w-10 text-yellow-500" />
<div className="space-y-1">
- <h3 className="text-sm font-semibold text-foreground">No sketches yet</h3>
+ <h3 className="text-sm font-semibold text-foreground">
+ {searchQuery ? "No matching sketches" : "No sketches yet"}
+ </h3>
<p className="text-xs opacity-70 max-w-xs">
- This investigation doesn't contain any sketch. Sketches let you organize and visualize your data as graphs.
+ {searchQuery
+ ? "Try adjusting your search query to find what you're looking for."
+ : "This investigation doesn't contain any sketch. Sketches let you organize and visualize your data as graphs."
+ }
</p>
</div>
<NewSketch noDropDown>
diff --git a/flowsint-app/src/renderer/src/components/layout/log-panel.tsx b/flowsint-app/src/renderer/src/components/layout/log-panel.tsx
index f5b965f7..a9d0f114 100644
--- a/flowsint-app/src/renderer/src/components/layout/log-panel.tsx
+++ b/flowsint-app/src/renderer/src/components/layout/log-panel.tsx
@@ -3,40 +3,52 @@ import { useLogs } from "@/hooks/use-logs"
import { Button } from "../ui/button"
import { logService } from "@/api/log-service"
import { useConfirm } from "../use-confirm-dialog"
+import { useParams } from "@tanstack/react-router"
+import { RefreshCcwIcon } from "lucide-react"
+import { useEffect, useRef } from "react"
+import { CopyButton } from "../copy"
export function LogPanel() {
- const { logs, refetch } = useLogs()
+ const { id: sketch_id } = useParams({ strict: false })
+ const { logs, refetch } = useLogs(sketch_id)
const { confirm } = useConfirm()
+ const bottomRef = useRef<HTMLDivElement | null>(null)
+
+ useEffect(() => {
+ bottomRef.current?.scrollIntoView({ behavior: "smooth" })
+ }, [logs])
+
const handleDeleteLogs = async () => {
+ if (!sketch_id) return
if (!await confirm({
title: "Delete all logs",
message: "Are you sure you want to delete all logs?",
})) return
- await logService.delete()
+ await logService.delete(sketch_id)
refetch()
}
return (
- <div className="h-full bg-background relative">
+ <div className="h-full bg-card border rounded-md relative">
<ScrollArea className="h-full">
- <div className="space-y-1 p-2 font-mono text-xs">
+ <div className="p-4 font-mono text-sm leading-relaxed">
{logs.map((log) => (
<div
key={log.id}
- className={`flex items-start gap-2 ${log.type === "ERROR"
- ? "text-red-500"
+ className={`flex items-start gap-2 mb-1 ${log.type === "ERROR"
+ ? "text-destructive"
: log.type === "WARN"
? "text-yellow-500"
: log.type === "SUCCESS"
? "text-green-500"
- : "text-muted-foreground"
+ : "text-foreground"
}`}
>
- <span className="opacity-50">
+ <span className="text-muted-foreground min-w-[60px]">
{new Date(log.created_at).toLocaleTimeString()}
</span>
- <span>{log.content}</span>
+ <span className="flex-1">{log.content}</span>
</div>
))}
{logs.length === 0 && (
@@ -45,8 +57,18 @@ export function LogPanel() {
</div>
)}
</div>
+ <div ref={bottomRef} />
</ScrollArea>
- <Button variant={"outline"} size={"sm"} className="absolute top-2 right-2 h-7" onClick={handleDeleteLogs}>Delete all logs</Button>
+
+ <div className="absolute top-2 right-2 flex gap-2">
+ <CopyButton content={JSON.stringify(logs)} />
+ <Button variant={"ghost"} size={"sm"} onClick={() => refetch()} className="text-muted-foreground hover:text-foreground">
+ <RefreshCcwIcon className="w-4 h-4" />
+ </Button>
+ <Button variant={"ghost"} size={"sm"} onClick={handleDeleteLogs} className="text-muted-foreground hover:text-foreground">
+ Clear
+ </Button>
+ </div>
</div>
)
-}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/flowsint-app/src/renderer/src/components/layout/secondary-navigation.tsx b/flowsint-app/src/renderer/src/components/layout/secondary-navigation.tsx
index 3f381662..a17d566e 100644
--- a/flowsint-app/src/renderer/src/components/layout/secondary-navigation.tsx
+++ b/flowsint-app/src/renderer/src/components/layout/secondary-navigation.tsx
@@ -3,12 +3,21 @@ import InvestigationList from "../investigations/investigation-list"
import GraphNavigation from "../graphs/graph-navigation"
import TransformNavigation from "../transforms/transform-navigation"
import SketchList from "../investigations/sketch-list"
+import WallNavigation from "../walls/wall-navigation"
const SecondaryNavigation = () => {
const { id, investigationId, type } = useParams({ strict: false })
const { pathname } = useLocation()
+ if (pathname.includes("/dashboard/investigations/wall")) {
+ return (
+ <div className="grow w-full overflow-x-hidden">
+ <WallNavigation />
+ </div>
+ )
+ }
+
if (!investigationId && !id && !pathname.startsWith("/dashboard/transforms")) {
return (
<div className="grow w-full overflow-x-hidden">
@@ -38,6 +47,7 @@ const SecondaryNavigation = () => {
</div>
)
}
+
if (pathname.startsWith("/dashboard/transforms")) {
return (
<div className="grow w-full h-full overflow-x-hidden">
diff --git a/flowsint-app/src/renderer/src/components/layout/sidebar.tsx b/flowsint-app/src/renderer/src/components/layout/sidebar.tsx
index 99ac17e8..53c1176e 100644
--- a/flowsint-app/src/renderer/src/components/layout/sidebar.tsx
+++ b/flowsint-app/src/renderer/src/components/layout/sidebar.tsx
@@ -1,4 +1,5 @@
import {
+ BrickWall,
ChevronsRightIcon,
Fingerprint,
Home,
@@ -8,6 +9,12 @@ import {
import { Link } from "@tanstack/react-router"
import { useLayoutStore } from "@/stores/layout-store"
import { Button } from "../ui/button"
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipProvider,
+ TooltipTrigger,
+} from "../ui/tooltip"
interface NavItem {
icon: LucideIcon
@@ -16,44 +23,57 @@ interface NavItem {
}
export function Sidebar() {
-
const togglePanel = useLayoutStore(s => s.togglePanel)
const isOpenPanel = useLayoutStore(s => s.isOpenPanel)
const navItems: NavItem[] = [
{ icon: Home, label: "Dashboard", href: "/dashboard" },
{ icon: Fingerprint, label: "Cases", href: "/dashboard/investigations" },
+ { icon: BrickWall, label: "Walls", href: "/dashboard/investigations/wall" },
{ icon: Workflow, label: "Transforms", href: "/dashboard/transforms" },
]
const commonClasses =
- "flex flex-col items-center justify-center h-14 w-full rounded-sm gap-1 text-xs font-normal hover:bg-muted"
+ "flex items-center justify-center h-14 w-full rounded-sm hover:bg-muted"
return (
- <div className="w-22 border-r h-full flex flex-col shrink-0 bg-card">
+ <div className="w-16 border-r h-full flex flex-col shrink-0 bg-card">
<div className="flex flex-col items-center gap-1 p-2">
{navItems.map((item, index) => {
const IconComponent = item.icon
- // Render content consistently regardless of container
const content = (
- <>
- <IconComponent key={index} strokeWidth={1.2} className="h-4 w-4 opacity-70" />
- <span className="text-xs text-muted-foreground">{item.label}</span>
- </>
+ <IconComponent key={index} strokeWidth={1.2} className="h-4 w-4 opacity-70" />
)
return item.href ? (
- <Link
- key={index}
- to={item.href}
- className={commonClasses}
- activeProps={{ className: `${commonClasses} bg-muted` }}
- >
- {content}
- </Link>
+ <TooltipProvider key={index}>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Link
+ to={item.href}
+ className={commonClasses}
+ activeProps={{ className: `${commonClasses} bg-muted` }}
+ >
+ {content}
+ </Link>
+ </TooltipTrigger>
+ <TooltipContent side="right">
+ {item.label}
+ </TooltipContent>
+ </Tooltip>
+ </TooltipProvider>
) : (
- <button key={index} className={commonClasses}>
- {content}
- </button>
+ <TooltipProvider key={index}>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <button className={commonClasses}>
+ {content}
+ </button>
+ </TooltipTrigger>
+ <TooltipContent side="right">
+ {item.label}
+ </TooltipContent>
+ </Tooltip>
+ </TooltipProvider>
)
})}
</div>
diff --git a/flowsint-app/src/renderer/src/components/layout/status-bar.tsx b/flowsint-app/src/renderer/src/components/layout/status-bar.tsx
index c79ced3f..0cbb7ac8 100644
--- a/flowsint-app/src/renderer/src/components/layout/status-bar.tsx
+++ b/flowsint-app/src/renderer/src/components/layout/status-bar.tsx
@@ -1,20 +1,15 @@
import { Button } from "@/components/ui/button"
-import { HelpCircle, Info, Laptop, Terminal, Trash, Unlock } from "lucide-react"
+import { HelpCircle, Info, Terminal, Trash, Unlock } from "lucide-react"
import { ModeToggle } from "../mode-toggle"
import { useLayoutStore } from "@/stores/layout-store"
+import Legend from "../sketches/legend"
export function StatusBar() {
const isOpenConsole = useLayoutStore(s => s.isOpenConsole)
const toggleConsole = useLayoutStore(s => s.toggleConsole)
+
return (
<div className="flex items-center bg-card h-8 border-t px-2 text-xs text-muted-foreground">
- <div className="flex items-center gap-2">
- <Button variant="ghost" size="sm" className="h-6 gap-1 text-xs">
- <Laptop strokeWidth={1.4} className="h-3 w-3 opacity-60" />
- <span>Online</span>
- </Button>
- </div>
- <div className="flex-1"></div>
<div className="flex items-center gap-2">
<Button
variant="ghost"
@@ -25,6 +20,9 @@ export function StatusBar() {
<Terminal strokeWidth={1.4} className="h-3 w-3" />
<span>Console {isOpenConsole ? '(Open)' : ''}</span>
</Button>
+ </div>
+ <div className="flex-1"></div>
+ <div className="flex items-center gap-2">
<Button variant="ghost" size="sm" className="h-6 gap-1 text-xs">
<Unlock strokeWidth={1.4} className="h-3 w-3 opacity-60" />
<span>Vault</span>
@@ -33,9 +31,7 @@ export function StatusBar() {
<Trash strokeWidth={1.4} className="h-3 w-3 opacity-60" />
<span>Trash</span>
</Button>
- <Button variant="ghost" size="sm" className="h-6 gap-1 text-xs">
- <Info className="h-3 w-3 opacity-60" />
- </Button>
+ <Legend />
<Button variant="ghost" size="sm" className="h-6 gap-1 text-xs">
<HelpCircle className="h-3 w-3 opacity-60" />
</Button>
diff --git a/flowsint-app/src/renderer/src/components/mode-toggle.tsx b/flowsint-app/src/renderer/src/components/mode-toggle.tsx
index 23843ec1..35b51027 100644
--- a/flowsint-app/src/renderer/src/components/mode-toggle.tsx
+++ b/flowsint-app/src/renderer/src/components/mode-toggle.tsx
@@ -17,8 +17,8 @@ export function ModeToggle() {
<DropdownMenuTrigger asChild>
<div>
<Button variant="ghost" className="h-6" size="icon">
- <Sun className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
- <Moon className="absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
+ <Sun className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0 opacity-60" />
+ <Moon className="absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100 opacity-60" />
<span className="sr-only">Toggle theme</span>
</Button>
</div>
diff --git a/flowsint-app/src/renderer/src/components/shared/editor/extensions/image/hooks/use-drag-resize.ts b/flowsint-app/src/renderer/src/components/shared/editor/extensions/image/hooks/use-drag-resize.ts
index 5575ac2d..b671d540 100644
--- a/flowsint-app/src/renderer/src/components/shared/editor/extensions/image/hooks/use-drag-resize.ts
+++ b/flowsint-app/src/renderer/src/components/shared/editor/extensions/image/hooks/use-drag-resize.ts
@@ -147,6 +147,7 @@ export function useDragResize({
]
)
+ //@ts-ignore
useEffect(() => {
if (resizeDirection) {
document.addEventListener("keydown", handleKeydown)
diff --git a/flowsint-app/src/renderer/src/components/shared/editor/minimal-tiptap.tsx b/flowsint-app/src/renderer/src/components/shared/editor/minimal-tiptap.tsx
index 3cea52e4..3d81e99b 100644
--- a/flowsint-app/src/renderer/src/components/shared/editor/minimal-tiptap.tsx
+++ b/flowsint-app/src/renderer/src/components/shared/editor/minimal-tiptap.tsx
@@ -20,7 +20,7 @@ export interface MinimalTiptapProps
className?: string
editorContentClassName?: string
}
-
+//@ts-ignore
const Toolbar = ({ editor }: { editor: Editor }) => (
<div className="shrink-0 overflow-x-auto border-b border-border p-2">
<div className="flex w-max items-center gap-px">
diff --git a/flowsint-app/src/renderer/src/components/sketches/graph-react-force.tsx b/flowsint-app/src/renderer/src/components/sketches/graph-react-force.tsx
new file mode 100644
index 00000000..d33ba66a
--- /dev/null
+++ b/flowsint-app/src/renderer/src/components/sketches/graph-react-force.tsx
@@ -0,0 +1,197 @@
+import React, { useCallback, useMemo, useEffect, useRef, useState } from 'react';
+import ForceGraph2D from 'react-force-graph-2d';
+import { useSketchStore } from '@/stores/sketch-store';
+import { useNodesDisplaySettings } from '@/stores/node-display-settings';
+import { useGraphControls } from '@/stores/graph-controls-store';
+import type { NodeData, EdgeData } from '@/types';
+import type { ItemType } from '@/stores/node-display-settings';
+
+interface GraphReactForceProps {
+ style?: React.CSSProperties;
+}
+
+const GraphReactForce: React.FC<GraphReactForceProps> = () => {
+ const nodes = useSketchStore(s => s.nodes) as NodeData[];
+ const rawEdges = useSketchStore(s => s.edges) as EdgeData[];
+ const getIcon = useNodesDisplaySettings(s => s.getIcon);
+ const getSize = useNodesDisplaySettings(s => s.getSize);
+ const colors = useNodesDisplaySettings(s => s.colors) as Record<ItemType, string>;
+ const toggleNodeSelection = useSketchStore(s => s.toggleNodeSelection);
+ const clearSelectedNodes = useSketchStore(s => s.clearSelectedNodes);
+ const currentNode = useSketchStore(s => s.currentNode);
+ const setActions = useGraphControls(s => s.setActions);
+
+ // Transform data for Force Graph
+ const graphData = useMemo(() => {
+ const transformedNodes = nodes.map(node => {
+ const type = node.type || node.data?.type;
+ const color = colors[type] || '#0074D9';
+ const size = getSize(type) * 0.5;
+ let nodeLabel = node.label;
+ if (!nodeLabel && 'caption' in node) nodeLabel = (node as any).caption;
+ if (!nodeLabel) nodeLabel = node.id;
+
+ return {
+ ...node,
+ nodeLabel: nodeLabel,
+ nodeColor: color,
+ nodeSize: size,
+ val: size, // Force Graph uses val for node size
+ };
+ });
+
+ const transformedEdges = rawEdges.map(edge => ({
+ ...edge,
+ edgeLabel: edge.label,
+ source: edge.from,
+ target: edge.to,
+ }));
+
+ return {
+ nodes: transformedNodes,
+ links: transformedEdges,
+ };
+ }, [nodes, rawEdges, getIcon, getSize, colors]);
+
+ React.useEffect(() => {
+ if (graphRef.current && currentNode) {
+ console.log(currentNode, currentNode)
+ graphRef.current.zoomToFit(400);
+ }
+ }, [currentNode]);
+
+ const handleNodeClick = useCallback((node: any) => {
+ toggleNodeSelection(node, false);
+ }, [toggleNodeSelection]);
+
+ const handleBackgroundClick = useCallback(() => {
+ clearSelectedNodes()
+ }, [clearSelectedNodes]);
+
+ // Camera controls
+ const handleZoomIn = useCallback((graph: any) => {
+ const zoom = graph.zoom();
+ graph.zoom(zoom * 1.5);
+ }, []);
+
+ const handleZoomOut = useCallback((graph: any) => {
+ const zoom = graph.zoom();
+ graph.zoom(zoom * 0.75);
+ }, []);
+
+ const handleFit = useCallback((graph: any) => {
+ graph.zoomToFit(400);
+ }, []);
+
+ // Set actions in store
+ React.useEffect(() => {
+ setActions({
+ zoomIn: () => handleZoomIn(graphRef.current),
+ zoomOut: () => handleZoomOut(graphRef.current),
+ zoomToFit: () => handleFit(graphRef.current),
+ });
+ }, [setActions, handleZoomIn, handleZoomOut, handleFit]);
+
+ const graphRef = React.useRef<any>();
+ const containerRef = React.useRef<HTMLDivElement>(null);
+ const [dimensions, setDimensions] = useState({ width: 0, height: 0 });
+
+ // Handle container resize
+ useEffect(() => {
+ if (!containerRef.current) return;
+
+ const resizeObserver = new ResizeObserver(entries => {
+ const { width, height } = entries[0].contentRect;
+ setDimensions({ width, height });
+ if (graphRef.current) {
+ graphRef.current.d3ReheatSimulation();
+ }
+ });
+
+ resizeObserver.observe(containerRef.current);
+
+ return () => {
+ resizeObserver.disconnect();
+ };
+ }, []);
+
+ return (
+ <div className="relative h-full grow w-full bg-background">
+ <div ref={containerRef} style={{ width: '100%', height: '100%', minHeight: 300 }}>
+ <ForceGraph2D
+ ref={graphRef}
+ width={dimensions.width}
+ height={dimensions.height}
+ graphData={graphData}
+ nodeLabel="label"
+ nodeColor={node => node.nodeColor}
+ nodeRelSize={6}
+ linkDirectionalArrowLength={3.5}
+ linkDirectionalArrowRelPos={1}
+ cooldownTicks={100}
+ onNodeClick={handleNodeClick}
+ onBackgroundClick={handleBackgroundClick}
+ onNodeHover={(node: any) => {
+ // Highlight connected nodes and links
+ if (node) {
+ graphData.nodes.forEach((n: any) => {
+ n.__highlighted = n === node;
+ n.__dimmed = n !== node;
+ });
+ graphData.links.forEach((l: any) => {
+ l.__highlighted = l.source === node || l.target === node;
+ l.__dimmed = l.source !== node && l.target !== node;
+ });
+ } else {
+ // Reset all nodes and links
+ graphData.nodes.forEach((n: any) => {
+ n.__highlighted = false;
+ n.__dimmed = false;
+ });
+ graphData.links.forEach((l: any) => {
+ l.__highlighted = false;
+ l.__dimmed = false;
+ });
+ }
+ }}
+ nodeCanvasObject={(node: any, ctx, globalScale) => {
+ const label = node.nodeLabel;
+ const fontSize = 12 / globalScale;
+ ctx.font = `${fontSize}px Sans-Serif`;
+ const textWidth = ctx.measureText(label).width;
+ const bckgDimensions = [textWidth, fontSize].map(n => n + fontSize * 0.2);
+
+ // Draw node circle
+ ctx.beginPath();
+ ctx.arc(node.x, node.y, node.nodeSize, 0, 2 * Math.PI, false);
+ ctx.fillStyle = node.__highlighted ? node.nodeColor : node.__dimmed ? '#ccc' : node.nodeColor;
+ ctx.fill();
+
+ // Level of detail based on zoom
+ if (globalScale > 3) {
+ // Show full details: icon + label
+ const icon = getIcon(node.type || node.data?.type);
+ if (icon) {
+ ctx.font = `${fontSize * 1.2}px Sans-Serif`;
+ ctx.fillText(icon, node.x - fontSize, node.y + fontSize / 3);
+ }
+ ctx.font = `${fontSize}px Sans-Serif`;
+ ctx.fillStyle = node.__highlighted ? '#000' : node.__dimmed ? '#999' : '#000';
+ ctx.fillText(label, node.x + (icon ? fontSize : 0), node.y + fontSize / 3);
+ } else if (globalScale > 2) {
+ // Show only label
+ ctx.fillStyle = node.__highlighted ? '#000' : node.__dimmed ? '#999' : '#000';
+ ctx.fillText(label, node.x - bckgDimensions[0] / 2, node.y + fontSize / 3);
+ }
+ // When zoomed out (globalScale <= 2), show only the node circle
+ }}
+ linkColor={link => link.__highlighted ? '#000' : link.__dimmed ? '#ccc' : '#aaa'}
+ linkWidth={link => link.__highlighted ? 2 : link.__dimmed ? 0.5 : 1}
+ backgroundColor="transparent"
+ />
+ </div>
+ </div>
+ );
+};
+
+export default GraphReactForce;
\ No newline at end of file
diff --git a/flowsint-app/src/renderer/src/components/sketches/graph-sigma.tsx b/flowsint-app/src/renderer/src/components/sketches/graph-sigma.tsx
index 0d8935eb..b8d06d2e 100644
--- a/flowsint-app/src/renderer/src/components/sketches/graph-sigma.tsx
+++ b/flowsint-app/src/renderer/src/components/sketches/graph-sigma.tsx
@@ -1,5 +1,6 @@
-import React, { useMemo, useCallback } from 'react';
+import React, { useMemo, useCallback, useState } from 'react';
import Graph from 'graphology';
+import forceAtlas2 from 'graphology-layout-forceatlas2';
import { SigmaContainer, useLoadGraph, useSigma, useRegisterEvents } from '@react-sigma/core';
import { useSketchStore } from '@/stores/sketch-store';
import { useNodesDisplaySettings } from '@/stores/node-display-settings';
@@ -24,9 +25,12 @@ function GraphLoader() {
const setSelectedNodes = useSketchStore(s => s.setSelectedNodes);
const selectedNodes = useSketchStore(s => s.selectedNodes) as NodeData[];
const registerEvents = useRegisterEvents();
+ const [hoveredNode, setHoveredNode] = useState<string | null>(null);
useMemo(() => {
const graph = new Graph();
+
+ // Add nodes
nodes.forEach((node) => {
const type = node.type || node.data?.type;
const color = colors[type] || '#0074D9';
@@ -40,7 +44,7 @@ function GraphLoader() {
label: `${icon ? icon + ' ' : ''}${nodeLabel}`,
color,
size,
- x: Math.random() * 1000 - 500, // Random position between -500 and 500
+ x: Math.random() * 1000 - 500,
y: Math.random() * 1000 - 500,
type: 'circle',
...restNode,
@@ -48,6 +52,8 @@ function GraphLoader() {
hidden: false,
});
});
+
+ // Add edges
rawEdges.forEach(edge => {
const { label: edgeLabel, type: edgeType, ...restEdge } = edge;
(graph as any).addEdge(edge.from, edge.to, {
@@ -58,6 +64,11 @@ function GraphLoader() {
hidden: false,
});
});
+
+ // Apply force-directed layout
+ const settings = forceAtlas2.inferSettings(graph);
+ forceAtlas2.assign(graph, { ...settings, iterations: 50 });
+
loadGraph(graph);
}, [nodes, rawEdges, getIcon, getSize, colors, loadGraph]);
@@ -81,76 +92,77 @@ function GraphLoader() {
});
}, [setActions, handleZoomIn, handleZoomOut, handleFit]);
- // Node click event: zoom and highlight (memoized, minimal camera move)
+ // Node interaction events
React.useEffect(() => {
registerEvents({
clickNode: ({ node }) => {
const camera = sigma.getCamera();
const graph = sigma.getGraph();
const pos = graph.getNodeAttributes(node);
- // Only move camera if not already at target
- const state = camera.getState();
- if (state.x !== pos.x || state.y !== pos.y || state.ratio !== 0.3) {
- camera.setState({
- x: pos.x,
- y: pos.y,
- ratio: 0.3, // zoom level
- });
- }
- // Find the full node object from the store
+
+ // Zoom to node with a smoother animation
+ camera.animate({
+ x: pos.x,
+ y: pos.y,
+ ratio: 0.5
+ }, {
+ duration: 300,
+ easing: 'easeInOutQuad'
+ });
+
+ // Set selected node
const selected = nodes.find(n => n.id === node);
if (selected) setSelectedNodes([selected]);
},
- clickStage: () => {
- setSelectedNodes([]);
- }
- });
- }, [registerEvents, sigma, setSelectedNodes, nodes]);
+ enterNode: ({ node }) => {
+ setHoveredNode(node);
+ const graph = sigma.getGraph();
+
+ // Dim other nodes and edges
+ graph.forEachNode((n, attr) => {
+ if (n === node) {
+ graph.setNodeAttribute(n, 'highlighted', true);
+ graph.setNodeAttribute(n, 'dimmed', false);
+ } else {
+ graph.setNodeAttribute(n, 'highlighted', false);
+ graph.setNodeAttribute(n, 'dimmed', true);
+ }
+ });
- // Highlight logic: batch and only update if changed
- React.useEffect(() => {
- if (!sigma) return;
- const graph = sigma.getGraph();
- let changed = false;
- if (selectedNodes.length === 0) {
- graph.forEachNode((node, attr) => {
- if (attr.highlighted || attr.dimmed) {
+ graph.forEachEdge((edge, attr, source, target) => {
+ if (source === node || target === node) {
+ graph.setEdgeAttribute(edge, 'highlighted', true);
+ graph.setEdgeAttribute(edge, 'dimmed', false);
+ } else {
+ graph.setEdgeAttribute(edge, 'highlighted', false);
+ graph.setEdgeAttribute(edge, 'dimmed', true);
+ }
+ });
+
+ sigma.refresh();
+ },
+ leaveNode: () => {
+ setHoveredNode(null);
+ const graph = sigma.getGraph();
+
+ // Reset all nodes and edges to normal state
+ graph.forEachNode((node, attr) => {
graph.setNodeAttribute(node, 'highlighted', false);
graph.setNodeAttribute(node, 'dimmed', false);
- changed = true;
- }
- });
- graph.forEachEdge((edge, attr) => {
- if (attr.highlighted || attr.dimmed) {
+ });
+
+ graph.forEachEdge((edge, attr) => {
graph.setEdgeAttribute(edge, 'highlighted', false);
graph.setEdgeAttribute(edge, 'dimmed', false);
- changed = true;
- }
- });
- if (changed) sigma.refresh();
- return;
- }
- const selectedId = selectedNodes[0]?.id;
- const neighbors = new Set(graph.neighbors(selectedId));
- neighbors.add(selectedId);
- graph.forEachNode((node, attr) => {
- const isConnected = neighbors.has(node);
- if (!!attr.highlighted !== isConnected || !!attr.dimmed === isConnected) {
- graph.setNodeAttribute(node, 'highlighted', isConnected);
- graph.setNodeAttribute(node, 'dimmed', !isConnected);
- changed = true;
- }
- });
- graph.forEachEdge((edge, attr, source, target) => {
- const isEdgeConnected = neighbors.has(source) && neighbors.has(target);
- if (!!attr.highlighted !== isEdgeConnected || !!attr.dimmed === isEdgeConnected) {
- graph.setEdgeAttribute(edge, 'highlighted', isEdgeConnected);
- graph.setEdgeAttribute(edge, 'dimmed', !isEdgeConnected);
- changed = true;
+ });
+
+ sigma.refresh();
+ },
+ clickStage: () => {
+ setSelectedNodes([]);
}
});
- if (changed) sigma.refresh();
- }, [selectedNodes, sigma]);
+ }, [registerEvents, sigma, setSelectedNodes, nodes]);
return null;
}
@@ -161,32 +173,56 @@ const Graph3: React.FC<Graph3Props> = ({ style }) => {
<SigmaContainer
style={{ width: '100%', height: '100%', minHeight: 300, background: 'transparent', ...style }}
settings={{
- renderEdgeLabels: false,
- labelDensity: 0.03,
- labelGridCellSize: 80,
- zIndex: false,
- hideEdgesOnMove: true,
- hideLabelsOnMove: true,
+ renderEdgeLabels: true,
+ labelDensity: 0.07,
+ labelGridCellSize: 60,
+ zIndex: true,
+ hideEdgesOnMove: false,
+ hideLabelsOnMove: false,
defaultNodeColor: '#0074D9',
defaultEdgeColor: '#aaa',
allowInvalidContainer: false,
nodeReducer: (_, data) => {
if (data.dimmed) {
- return { ...data, color: '#eee', zIndex: 0, label: '' };
+ return {
+ ...data,
+ color: data.color,
+ opacity: 0.3,
+ zIndex: 0,
+ label: ''
+ };
}
if (data.highlighted) {
- return { ...data, color: '#0074D9', zIndex: 1 };
+ return {
+ ...data,
+ color: data.color,
+ opacity: 1,
+ zIndex: 2,
+ size: data.size * 1.1
+ };
}
- return data;
+ return { ...data, opacity: 1 };
},
edgeReducer: (_, data) => {
if (data.dimmed) {
- return { ...data, color: '#eee', size: 0.5 };
+ return {
+ ...data,
+ color: data.color,
+ opacity: 0.2,
+ size: 0.5,
+ zIndex: 0
+ };
}
if (data.highlighted) {
- return { ...data, color: '#0074D9', size: 2 };
+ return {
+ ...data,
+ color: data.color,
+ opacity: 1,
+ size: 1.5,
+ zIndex: 1
+ };
}
- return data;
+ return { ...data, opacity: 0.6 };
},
}}
>
diff --git a/flowsint-app/src/renderer/src/components/sketches/graph.tsx b/flowsint-app/src/renderer/src/components/sketches/graph.tsx
index 63c05143..9f1617b1 100644
--- a/flowsint-app/src/renderer/src/components/sketches/graph.tsx
+++ b/flowsint-app/src/renderer/src/components/sketches/graph.tsx
@@ -122,6 +122,7 @@ const GraphContent = memo(() => {
cosmograph?.cosmograph?.zoomToNode(node)
}, [toggleNodeSelection, cosmograph?.cosmograph])
+ //@ts-ignore
const handleNodeClick = useCallback((clickedNode?: any, index?: number, nodePosition?: [number, number], event?: MouseEvent) => {
if (!clickedNode) {
clearSelectedNodes()
@@ -278,7 +279,6 @@ const Graph = memo(() => {
</ResizablePanel> */}
</ResizablePanelGroup>
</GraphProvider>
- <Legend />
</div>
)
})
diff --git a/flowsint-app/src/renderer/src/components/sketches/legend.tsx b/flowsint-app/src/renderer/src/components/sketches/legend.tsx
index 79b770f1..b76808a3 100644
--- a/flowsint-app/src/renderer/src/components/sketches/legend.tsx
+++ b/flowsint-app/src/renderer/src/components/sketches/legend.tsx
@@ -1,84 +1,45 @@
-import { memo, useState } from 'react'
-import { Card } from '../ui/card'
+import { memo } from 'react'
import { useNodesDisplaySettings } from '@/stores/node-display-settings'
-import { AnimatePresence, motion } from 'framer-motion'
-import { cn } from '@/lib/utils'
-import { Eye, EyeOff } from 'lucide-react'
-
-const MAX_ENTRIES = 6
+import { Info } from 'lucide-react'
+import { Dialog, DialogContent, DialogTrigger } from '../ui/dialog'
+import { Button } from '../ui/button'
const Legend = () => {
- const [showAll, setShowAll] = useState(false)
- const [isVisible, setIsVisible] = useState(false)
-
const getIcon = useNodesDisplaySettings(s => s.getIcon)
const colors = useNodesDisplaySettings(s => s.colors)
const entries = Object.entries(colors)
- const visibleEntries = showAll ? entries : entries.slice(0, MAX_ENTRIES)
- const left = entries.length - MAX_ENTRIES
return (
- <div className='absolute text-xs bottom-2 left-2'>
- <div className='flex items-center gap-2'>
- <button
- onClick={() => setIsVisible(prev => !prev)}
- className='p-1.5 rounded-full bg-background/30 backdrop-blur-sm hover:bg-background/50 transition-colors'
- title={isVisible ? 'Hide legend' : 'Show legend'}
- >
- {isVisible ? <EyeOff className='opacity-70' size={14} /> : <Eye className='opacity-70' size={14} />}
- </button>
- <AnimatePresence>
- {isVisible && (
- <motion.div
- initial={{ opacity: 0, scale: 0.95 }}
- animate={{ opacity: 1, scale: 1 }}
- exit={{ opacity: 0, scale: 0.95 }}
- transition={{ duration: 0.2 }}
- >
- <Card className='p-2 rounded-mdbackdrop-blur-sm bg-background/30 border-none'>
- <div>
- <ul className={cn('grid grid-cols-2 items-center gap-1', showAll && 'grid-cols-3')}>
- <AnimatePresence initial={false}>
- {visibleEntries.map(([key, value]) => (
- <motion.li
- key={key}
- layout
- initial={{ opacity: 0, y: -5 }}
- animate={{ opacity: 1, y: 0 }}
- exit={{ opacity: 0, y: -5 }}
- transition={{ duration: 0.2 }}
- >
- <div className='flex items-center gap-2'>
- {/* @ts-ignore */}
- <span>{getIcon(key)}</span>
- <span className='capitalize'>{key.split("_").join(" ")}</span>
- <span
- className='w-2 h-2 rounded-full'
- style={{ backgroundColor: value }}
- ></span>
- </div>
- </motion.li>
- ))}
- </AnimatePresence>
- </ul>
- {entries.length > MAX_ENTRIES && (
- <motion.button
- onClick={() => setShowAll(prev => !prev)}
- className='mt-2 text-blue-500 hover:underline'
- initial={{ opacity: 0 }}
- animate={{ opacity: 1 }}
- transition={{ delay: 0.2 }}
- >
- {showAll ? 'Show less' : `Show more (${left})`}
- </motion.button>
- )}
- </div>
- </Card>
- </motion.div>
- )}
- </AnimatePresence>
- </div>
- </div>
+ <>
+ <Dialog>
+ <DialogTrigger asChild>
+ <div>
+ <Button variant="ghost" size="sm" className="h-6 gap-1 text-xs">
+ <Info className="h-3 w-3 opacity-60" />
+ </Button>
+ </div>
+ </DialogTrigger>
+ <DialogContent className='sm:max-w-md'>
+ <div className='p-2'>
+ <ul className='grid grid-cols-2 items-center gap-1'>
+ {entries.map(([key, value]) => (
+ <li key={key}>
+ <div className='flex items-center gap-2'>
+ {/* @ts-ignore */}
+ <span>{getIcon(key)}</span>
+ <span className='capitalize'>{key.split("_").join(" ")}</span>
+ <span
+ className='w-2 h-2 rounded-full'
+ style={{ backgroundColor: value }}
+ ></span>
+ </div>
+ </li>
+ ))}
+ </ul>
+ </div>
+ </DialogContent>
+ </Dialog>
+ </>
)
}
diff --git a/flowsint-app/src/renderer/src/components/sketches/toolbar.tsx b/flowsint-app/src/renderer/src/components/sketches/toolbar.tsx
index f01e517c..6514b08b 100644
--- a/flowsint-app/src/renderer/src/components/sketches/toolbar.tsx
+++ b/flowsint-app/src/renderer/src/components/sketches/toolbar.tsx
@@ -19,13 +19,16 @@ import {
Trash,
Undo,
ZoomIn,
- Settings
+ Settings,
+ RotateCw
} from "lucide-react"
import { memo, useCallback } from "react"
import { Separator } from "../ui/separator"
import { sketchService } from "@/api/sketch-service"
import { useParams } from "@tanstack/react-router"
import { toast } from "sonner"
+import { useQuery } from "@tanstack/react-query"
+import { cn } from "@/lib/utils"
// Tooltip wrapper component to avoid repetition
const ToolbarButton = memo(function ToolbarButton({
@@ -47,7 +50,7 @@ const ToolbarButton = memo(function ToolbarButton({
disabled={disabled}
variant="ghost"
size="icon"
- className="h-8 w-8"
+ className="h-8 w-8 rounded-full"
>
{icon}
</Button>
@@ -56,7 +59,7 @@ const ToolbarButton = memo(function ToolbarButton({
</Tooltip>
)
})
-export const Toolbar = memo(function Toolbar() {
+export const Toolbar = memo(function Toolbar({ isLoading }: { isLoading: boolean }) {
const selectedNodes = useSketchStore((state) => state.selectedNodes || [])
const setOpenAddRelationDialog = useSketchStore((state) => state.setOpenAddRelationDialog)
const removeNodes = useSketchStore((state) => state.removeNodes)
@@ -65,7 +68,22 @@ export const Toolbar = memo(function Toolbar() {
const zoomIn = useGraphControls((s) => s.zoomIn);
const zoomOut = useGraphControls((s) => s.zoomOut);
const { confirm } = useConfirm()
- const { id: sketchId } = useParams({ from: "/_auth/dashboard/investigations/$investigationId/$type/$id" })
+ const { id: sketchId, investigationId, type } = useParams({ from: "/_auth/dashboard/investigations/$investigationId/$type/$id" })
+
+ const { refetch } = useQuery({
+ queryKey: ["investigations", investigationId, type, sketchId, "data"],
+ queryFn: () => type === "graph" ? sketchService.getGraphDataById(sketchId) : Promise.resolve(null),
+ enabled: type === "graph"
+ })
+
+ const handleRefresh = useCallback(async () => {
+ try {
+ await refetch()
+ toast.success("Graph data refreshed");
+ } catch (error) {
+ toast.error("Failed to refresh graph data");
+ }
+ }, [refetch]);
const handleOpenRelationshipDialog = useCallback(() => {
setOpenAddRelationDialog(true)
@@ -92,11 +110,11 @@ export const Toolbar = memo(function Toolbar() {
return (
<div className="flex h-full flex-col items-center justify-start bg-background">
- <div className="flex flex-col justify-start items-center space-y-1">
+ <div className="flex flex-col justify-start items-center space-y-1 py-1">
<TooltipProvider>
- <ToolbarButton disabled icon={<Undo className="h-4 w-4 opacity-70" />} tooltip="Undo" />
+ {/* <ToolbarButton disabled icon={<Undo className="h-4 w-4 opacity-70" />} tooltip="Undo" />
<ToolbarButton disabled icon={<Redo className="h-4 w-4 opacity-70" />} tooltip="Redo" />
- <Separator orientation="horizontal" />
+ <Separator orientation="horizontal" /> */}
<ToolbarButton
icon={<Copy className="h-4 w-4 opacity-70" />}
tooltip="Copy"
@@ -137,6 +155,13 @@ export const Toolbar = memo(function Toolbar() {
<ToolbarButton disabled icon={<LayoutGrid className="h-4 w-4 opacity-70" />} tooltip="Layout" />
<ToolbarButton disabled icon={<Layers className="h-4 w-4 opacity-70" />} tooltip="Layers" />
<ToolbarButton onClick={toggleSettings} icon={<Settings className="h-4 w-4 opacity-70" />} tooltip="Settings" />
+ <Separator />
+ <ToolbarButton
+ onClick={handleRefresh}
+ disabled={isLoading}
+ icon={<RotateCw className={cn("h-4 w-4 opacity-70", isLoading && "animate-spin")} />}
+ tooltip="Refresh Graph Data"
+ />
</TooltipProvider>
</div>
</div>
diff --git a/flowsint-app/src/renderer/src/components/transforms/controls.tsx b/flowsint-app/src/renderer/src/components/transforms/controls.tsx
index 9305e8a0..332503cd 100644
--- a/flowsint-app/src/renderer/src/components/transforms/controls.tsx
+++ b/flowsint-app/src/renderer/src/components/transforms/controls.tsx
@@ -4,7 +4,7 @@ import { Button } from "@/components/ui/button"
import { Panel } from "@xyflow/react"
import { Save, Trash2, ZoomIn, ZoomOut, Maximize, LayoutGrid } from "lucide-react"
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
-import { TransformDetailsPanel } from "./transform-name-panel"
+import { TransformDetailsPanel } from "../transforms/transform-name-panel"
interface FlowControlsProps {
loading: boolean
diff --git a/flowsint-app/src/renderer/src/components/transforms/editor.tsx b/flowsint-app/src/renderer/src/components/transforms/editor.tsx
index c27c5c97..4ee31c3a 100644
--- a/flowsint-app/src/renderer/src/components/transforms/editor.tsx
+++ b/flowsint-app/src/renderer/src/components/transforms/editor.tsx
@@ -77,7 +77,6 @@ const FlowEditor = memo(({ initialEdges, initialNodes, theme, transform }: FlowE
const [currentStepIndex, setCurrentStepIndex] = useState(0)
const [simulationSpeed, setSimulationSpeed] = useState(1000) // ms per step
const [transformBranches, setTransformsBranches] = useState<any[]>([])
-
const nodes = useFlowStore(state => state.nodes)
const edges = useFlowStore(state => state.edges)
const selectedNode = useFlowStore(state => state.selectedNode)
diff --git a/flowsint-app/src/renderer/src/components/transforms/scanner-item.tsx b/flowsint-app/src/renderer/src/components/transforms/scanner-item.tsx
index f426ef07..4cda915a 100644
--- a/flowsint-app/src/renderer/src/components/transforms/scanner-item.tsx
+++ b/flowsint-app/src/renderer/src/components/transforms/scanner-item.tsx
@@ -1,10 +1,11 @@
"use client"
import type React from "react"
-import { memo, useCallback } from "react"
+import { memo, useCallback, useState } from "react"
import { Button } from "@/components/ui/button"
import { Info, GripVertical } from "lucide-react"
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
+import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog"
import { getScannerColor } from "./scanner-data"
// Types for the scanner based on the new structure
@@ -49,6 +50,7 @@ function areEqual(prevProps: ScannerItemProps, nextProps: ScannerItemProps) {
// Memoized scanner item component for the sidebar
const ScannerItem = memo(({ scanner, category }: ScannerItemProps) => {
const borderColor = getScannerColor(scanner.type, category)
+ const [isDialogOpen, setIsDialogOpen] = useState(false)
// Handler for drag start - using useCallback to prevent recreation on each render
const onDragStart = useCallback(
@@ -62,44 +64,81 @@ const ScannerItem = memo(({ scanner, category }: ScannerItemProps) => {
return (
<TooltipProvider>
- <div
- draggable
- onDragStart={onDragStart}
- className="p-3 rounded-md relative w-full overflow-hidden cursor-grab bg-card border hover:shadow-md transition-all group"
- style={{ borderLeftWidth: "4px", borderLeftColor: borderColor, cursor: "grab" }}
- >
- <div className="flex justify-between items-start">
- <div className="flex items-start gap-2">
- <GripVertical className="h-5 w-5 text-muted-foreground/50 group-hover:text-muted-foreground transition-colors" />
- <div className="space-y-1">
- <h3 className="text-sm font-medium">{scanner.class_name}</h3>
- {scanner.type !== "type" &&
- <div className="mt-2 text-xs">
- <div className="flex items-center gap-1">
- <span className="font-medium">Input:</span>
- <span className="text-muted-foreground">{scanner.inputs.type}</span>
- </div>
- <div className="flex items-center gap-1">
- <span className="font-medium">Output:</span>
- <span className="text-muted-foreground">{scanner.outputs.type}</span>
- </div>
- </div>}
+ <Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen}>
+ <div
+ draggable
+ onDragStart={onDragStart}
+ className="p-3 rounded-md relative w-full overflow-hidden cursor-grab bg-card border hover:shadow-md transition-all group"
+ style={{ borderLeftWidth: "4px", borderLeftColor: borderColor, cursor: "grab" }}
+ >
+ <div className="flex justify-between items-start">
+ <div className="flex items-start gap-2">
+ <GripVertical className="h-5 w-5 text-muted-foreground/50 group-hover:text-muted-foreground transition-colors" />
+ <div className="space-y-1">
+ <h3 className="text-sm font-medium">{scanner.class_name}</h3>
+ {scanner.type !== "type" &&
+ <div className="mt-2 text-xs">
+ <div className="flex items-center gap-1">
+ <span className="font-medium">Input:</span>
+ <span className="text-muted-foreground">{scanner.inputs.type}</span>
+ </div>
+ <div className="flex items-center gap-1">
+ <span className="font-medium">Output:</span>
+ <span className="text-muted-foreground">{scanner.outputs.type}</span>
+ </div>
+ </div>}
+ </div>
</div>
- </div>
- {scanner.doc && (
- <Tooltip>
- <TooltipTrigger asChild>
+ <div className="flex items-center gap-1">
+ <DialogTrigger asChild>
<Button variant="ghost" size="icon" className="h-6 w-6">
<Info className="h-4 w-4" />
</Button>
- </TooltipTrigger>
- <TooltipContent>
- <p className="max-w-xs text-xs">{scanner.doc}</p>
- </TooltipContent>
- </Tooltip>
- )}
+ </DialogTrigger>
+ </div>
+ </div>
</div>
- </div>
+ <DialogContent className="sm:max-w-[425px]">
+ <DialogHeader>
+ <DialogTitle className="flex items-center gap-2">
+ <div className="w-1 h-6 rounded-full" style={{ backgroundColor: borderColor }} />
+ {scanner.class_name}
+ </DialogTitle>
+ </DialogHeader>
+ <div className="grid gap-4 py-4">
+ <div className="space-y-2">
+ <h4 className="font-medium text-sm" style={{ color: borderColor }}>Description</h4>
+ <p className="text-sm text-muted-foreground">{scanner.doc || "No description available"}</p>
+ </div>
+ <div className="space-y-2">
+ <h4 className="font-medium text-sm" style={{ color: borderColor }}>Module</h4>
+ <p className="text-sm text-muted-foreground">{scanner.module}</p>
+ </div>
+ <div className="space-y-2">
+ <h4 className="font-medium text-sm" style={{ color: borderColor }}>Input Properties</h4>
+ <div className="space-y-1">
+ {scanner.inputs.properties.map((prop, index) => (
+ <div key={index} className="text-sm">
+ <span className="font-medium">{prop.name}:</span>{" "}
+ <span className="text-muted-foreground">{prop.type}</span>
+ </div>
+ ))}
+ </div>
+ </div>
+ <div className="space-y-2">
+ <h4 className="font-medium text-sm" style={{ color: borderColor }}>Output Properties</h4>
+ <div className="space-y-1">
+ {scanner.outputs.properties.map((prop, index) => (
+ <div key={index} className="text-sm">
+ <span className="font-medium">{prop.name}:</span>{" "}
+ <span className="text-muted-foreground">{prop.type}</span>
+ </div>
+ ))}
+ </div>
+ </div>
+ </div>
+ </DialogContent>
+ </Dialog>
</TooltipProvider>
)
}, areEqual)
diff --git a/flowsint-app/src/renderer/src/components/transforms/transforms-list.tsx b/flowsint-app/src/renderer/src/components/transforms/transforms-list.tsx
index bf30a25f..002a646b 100644
--- a/flowsint-app/src/renderer/src/components/transforms/transforms-list.tsx
+++ b/flowsint-app/src/renderer/src/components/transforms/transforms-list.tsx
@@ -2,39 +2,84 @@ import { transformService } from "@/api/transfrom-service"
import { useQuery } from "@tanstack/react-query"
import { Link } from "@tanstack/react-router"
import { SkeletonList } from "../shared/skeleton-list"
+import { Input } from "../ui/input"
+import { useState, useMemo } from "react"
+import { formatDistanceToNow } from "date-fns"
+import { Pencil } from "lucide-react"
const TransformsList = () => {
const { data: transforms, isLoading } = useQuery({
queryKey: ["transforms"],
queryFn: () => transformService.get(),
})
+ const [searchQuery, setSearchQuery] = useState("")
- if (isLoading) return <div className="p-2"><SkeletonList rowCount={10} /></div>
+ const filteredTransforms = useMemo(() => {
+ if (!transforms) return []
+ if (!searchQuery.trim()) return transforms
+
+ const query = searchQuery.toLowerCase().trim()
+ return transforms.filter((transform) => {
+ const matchesName = transform.name?.toLowerCase().includes(query)
+ const matchesCategory = transform.category
+ ? (Array.isArray(transform.category)
+ ? transform.category.some(cat => cat.toLowerCase().includes(query))
+ : transform.category.toLowerCase().includes(query))
+ : false
+ return matchesName || matchesCategory
+ })
+ }, [transforms, searchQuery])
- if (!transforms || transforms.length === 0)
- return <div className="p-4 text-center text-muted-foreground">No transforms found</div>
+ if (isLoading) return <div className="p-2"><SkeletonList rowCount={10} /></div>
return (
<div className="flex flex-col h-full min-h-0 overflow-hidden bg-card">
- <ul className="flex-1 overflow-auto divide-y">
- {transforms.map((transform: any) => (
- <li key={transform.id}>
- <Link
- to={`/dashboard/transforms/$transformId`}
- params={{ transformId: transform.id }}
- className="block px-4 py-3 hover:bg-muted cursor-pointer"
- title={transform.description || "No description"}
- >
- <div className="font-semibold text-sm truncate">{transform.name || "(Unnamed transform)"}</div>
- {transform.category && (
- <div className="text-xs text-muted-foreground truncate">
- Category: {Array.isArray(transform.category) ? transform.category.join(", ") : transform.category}
+ <div className="p-2 border-b">
+ <Input
+ type="search"
+ className="h-7"
+ placeholder="Search transforms..."
+ value={searchQuery}
+ onChange={(e) => setSearchQuery(e.target.value)}
+ />
+ </div>
+
+ {filteredTransforms.length > 0 ? (
+ <ul className="flex-1 overflow-auto divide-y">
+ {filteredTransforms.map((transform: any) => (
+ <li key={transform.id}>
+ <Link
+ to={`/dashboard/transforms/$transformId`}
+ params={{ transformId: transform.id }}
+ className="block px-4 py-3 hover:bg-muted cursor-pointer"
+ title={transform.description || "No description"}
+ >
+ <div className="font-semibold text-sm truncate">{transform.name || "(Unnamed transform)"}</div>
+ <div className="flex items-center gap-2 mt-1 text-xs text-muted-foreground">
+ {transform.category && (
+ <span className="truncate">
+ {Array.isArray(transform.category) ? transform.category.join(", ") : transform.category}
+ </span>
+ )}
+ {transform.last_updated_at && (
+ <>
+ {Boolean(transform.category.length) && <span>•</span>}
+ <div className="flex items-center gap-1 whitespace-nowrap">
+ <Pencil className="h-3 w-3" />
+ {formatDistanceToNow(new Date(transform.last_updated_at), { addSuffix: true })}
+ </div>
+ </>
+ )}
</div>
- )}
- </Link>
- </li>
- ))}
- </ul>
+ </Link>
+ </li>
+ ))}
+ </ul>
+ ) : (
+ <div className="flex-1 flex items-center justify-center p-4 text-center text-muted-foreground">
+ {searchQuery ? "No matching transforms found" : "No transforms found"}
+ </div>
+ )}
</div>
)
}
diff --git a/flowsint-app/src/renderer/src/components/walls/annotation-node.tsx b/flowsint-app/src/renderer/src/components/walls/annotation-node.tsx
new file mode 100644
index 00000000..5ea9cef4
--- /dev/null
+++ b/flowsint-app/src/renderer/src/components/walls/annotation-node.tsx
@@ -0,0 +1,88 @@
+import { forwardRef, HTMLAttributes } from "react";
+import { cn } from "@/lib/utils";
+
+/* ANNOTATION NODE -----------------------------------------------------------
+ A container for an annotation node.
+*/
+
+export type AnnotationNodeProps = HTMLAttributes<HTMLDivElement>;
+
+export const AnnotationNode = forwardRef<HTMLDivElement, AnnotationNodeProps>(
+ ({ className, children, ...props }, ref) => {
+ return (
+ <div
+ ref={ref}
+ {...props}
+ className={cn(
+ "relative flex max-w-[180px] items-start p-2 text-sm text-secondary-foreground",
+ className,
+ )}
+ >
+ {children}
+ </div>
+ );
+ },
+);
+
+AnnotationNode.displayName = "AnnotationNode";
+
+/* ANNOTATION NODE NUMBER -----------------------------------------------------
+ Renders the annotation node number.
+*/
+
+export type AnnotationNodeNumberProps = HTMLAttributes<HTMLDivElement>;
+
+export const AnnotationNodeNumber = forwardRef<
+ HTMLDivElement,
+ AnnotationNodeNumberProps
+>(({ className, children, ...props }, ref) => {
+ return (
+ <div ref={ref} {...props} className={cn("mr-1 leading-snug", className)}>
+ {children}
+ </div>
+ );
+});
+
+AnnotationNodeNumber.displayName = "AnnotationNodeNumber";
+
+/* ANNOTATION NODE CONTENT ----------------------------------------------------
+ Renders the main content of the annotation node.
+*/
+
+export type AnnotationNodeContentProps = HTMLAttributes<HTMLDivElement>;
+
+export const AnnotationNodeContent = forwardRef<
+ HTMLDivElement,
+ AnnotationNodeContentProps
+>(({ className, children, ...props }, ref) => {
+ return (
+ <div ref={ref} {...props} className={cn("leading-snug", className)}>
+ {children}
+ </div>
+ );
+});
+
+AnnotationNodeContent.displayName = "AnnotationNodeContent";
+
+/* ANNOTATION NODE ICON -------------------------------------------------------
+ Renders the icon for the annotation node.
+*/
+
+export type AnnotationNodeIconProps = HTMLAttributes<HTMLDivElement>;
+
+export const AnnotationNodeIcon = forwardRef<
+ HTMLDivElement,
+ AnnotationNodeIconProps
+>(({ className, children, ...props }, ref) => {
+ return (
+ <div
+ ref={ref}
+ {...props}
+ className={cn("absolute bottom-0 right-2 text-2xl", className)}
+ >
+ {children}
+ </div>
+ );
+});
+
+AnnotationNodeIcon.displayName = "AnnotationNodeIcon";
\ No newline at end of file
diff --git a/flowsint-app/src/renderer/src/components/walls/base-node.tsx b/flowsint-app/src/renderer/src/components/walls/base-node.tsx
new file mode 100644
index 00000000..d8dd68fc
--- /dev/null
+++ b/flowsint-app/src/renderer/src/components/walls/base-node.tsx
@@ -0,0 +1,378 @@
+import { forwardRef, useCallback, HTMLAttributes, ReactNode, memo } from "react";
+import { useNodeId, useReactFlow, NodeProps } from "@xyflow/react";
+import { EllipsisVertical, Trash, MessageSquarePlus } from "lucide-react";
+import { cn } from "@/lib/utils";
+import { Slot } from "@radix-ui/react-slot";
+import { Button } from "@/components/ui/button";
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+} from "@/components/ui/dropdown-menu";
+import { BaseNode } from "@/components/ui/base-node";
+import {
+ DropdownMenuItem,
+ DropdownMenuLabel,
+ DropdownMenuSeparator,
+} from "@/components/ui/dropdown-menu";
+import { Rocket } from "lucide-react";
+
+/* NODE HEADER -------------------------------------------------------------- */
+
+export type NodeHeaderProps = HTMLAttributes<HTMLElement>;
+
+/**
+ * A container for a consistent header layout intended to be used inside the
+ * `<BaseNode />` component.
+ */
+export const NodeHeader = forwardRef<HTMLElement, NodeHeaderProps>(
+ ({ className, ...props }, ref) => {
+ return (
+ <header
+ ref={ref}
+ {...props}
+ className={cn(
+ "flex items-center justify-between gap-2 px-3 py-2",
+ // Remove or modify these classes if you modify the padding in the
+ // `<BaseNode />` component.
+ className,
+ )}
+ />
+ );
+ },
+);
+
+NodeHeader.displayName = "NodeHeader";
+
+/* NODE HEADER TITLE -------------------------------------------------------- */
+
+export type NodeHeaderTitleProps = HTMLAttributes<HTMLHeadingElement> & {
+ asChild?: boolean;
+};
+
+/**
+ * The title text for the node. To maintain a native application feel, the title
+ * text is not selectable.
+ */
+export const NodeHeaderTitle = forwardRef<
+ HTMLHeadingElement,
+ NodeHeaderTitleProps
+>(({ className, asChild, ...props }, ref) => {
+ const Comp = asChild ? Slot : "h3";
+
+ return (
+ <Comp
+ ref={ref}
+ {...props}
+ className={cn(className, "user-select-none flex-1 font-semibold")}
+ />
+ );
+});
+
+NodeHeaderTitle.displayName = "NodeHeaderTitle";
+
+/* NODE HEADER ICON --------------------------------------------------------- */
+
+export type NodeHeaderIconProps = HTMLAttributes<HTMLSpanElement>;
+
+export const NodeHeaderIcon = forwardRef<HTMLSpanElement, NodeHeaderIconProps>(
+ ({ className, ...props }, ref) => {
+ return (
+ <span ref={ref} {...props} className={cn(className, "[&>*]:size-5")} />
+ );
+ },
+);
+
+NodeHeaderIcon.displayName = "NodeHeaderIcon";
+
+/* NODE HEADER ACTIONS ------------------------------------------------------ */
+
+export type NodeHeaderActionsProps = HTMLAttributes<HTMLDivElement>;
+
+/**
+ * A container for right-aligned action buttons in the node header.
+ */
+export const NodeHeaderActions = forwardRef<
+ HTMLDivElement,
+ NodeHeaderActionsProps
+>(({ className, ...props }, ref) => {
+ return (
+ <div
+ ref={ref}
+ {...props}
+ className={cn(
+ "ml-auto flex items-center gap-1 justify-self-end",
+ className,
+ )}
+ />
+ );
+});
+
+NodeHeaderActions.displayName = "NodeHeaderActions";
+
+/* NODE HEADER ACTION ------------------------------------------------------- */
+
+export type NodeHeaderActionProps = any & {
+ label: string;
+};
+
+/**
+ * A thin wrapper around the `<Button />` component with a fixed sized suitable
+ * for icons.
+ *
+ * Because the `<NodeHeaderAction />` component is intended to render icons, it's
+ * important to provide a meaningful and accessible `label` prop that describes
+ * the action.
+ */
+export const NodeHeaderAction = forwardRef<
+ HTMLButtonElement,
+ NodeHeaderActionProps
+>(({ className, label, title, ...props }, ref) => {
+ return (
+ <Button
+ ref={ref}
+ variant="ghost"
+ aria-label={label}
+ title={title ?? label}
+ className={cn(className, "nodrag size-6 p-1")}
+ {...props}
+ />
+ );
+});
+
+NodeHeaderAction.displayName = "NodeHeaderAction";
+
+//
+
+export type NodeHeaderMenuActionProps = Omit<
+ NodeHeaderActionProps,
+ "onClick"
+> & {
+ trigger?: ReactNode;
+};
+
+/**
+ * Renders a header action that opens a dropdown menu when clicked. The dropdown
+ * trigger is a button with an ellipsis icon. The trigger's content can be changed
+ * by using the `trigger` prop.
+ *
+ * Any children passed to the `<NodeHeaderMenuAction />` component will be rendered
+ * inside the dropdown menu. You can read the docs for the shadcn dropdown menu
+ * here: https://ui.shadcn.com/docs/components/dropdown-menu
+ *
+ */
+export const NodeHeaderMenuAction = forwardRef<
+ HTMLButtonElement,
+ NodeHeaderMenuActionProps
+>(({ trigger, children, ...props }, ref) => {
+ return (
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <div>
+ <NodeHeaderAction ref={ref} {...props}>
+ {trigger ?? <EllipsisVertical />}
+ </NodeHeaderAction>
+ </div>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent>{children}</DropdownMenuContent>
+ </DropdownMenu>
+ );
+});
+
+NodeHeaderMenuAction.displayName = "NodeHeaderMenuAction";
+
+/* NODE HEADER DELETE ACTION --------------------------------------- */
+
+export const NodeHeaderDeleteAction = () => {
+ const id = useNodeId();
+ const { setNodes } = useReactFlow();
+
+ const handleClick = useCallback(() => {
+ setNodes((prevNodes) => prevNodes.filter((node) => node.id !== id));
+ }, [id, setNodes]);
+
+ return (
+ <NodeHeaderAction onClick={handleClick} variant="ghost" label="Delete node">
+ <Trash />
+ </NodeHeaderAction>
+ );
+};
+
+NodeHeaderDeleteAction.displayName = "NodeHeaderDeleteAction";
+
+/* ANNOTATION NODE -----------------------------------------------------------
+ A container for an annotation node.
+*/
+
+export type AnnotationNodeProps = HTMLAttributes<HTMLDivElement>;
+
+export const AnnotationNode = forwardRef<HTMLDivElement, AnnotationNodeProps>(
+ ({ className, children, ...props }, ref) => {
+ return (
+ <div
+ ref={ref}
+ {...props}
+ className={cn(
+ "relative flex max-w-[180px] items-start p-2 text-sm text-secondary-foreground",
+ className,
+ )}
+ >
+ {children}
+ </div>
+ );
+ },
+);
+
+AnnotationNode.displayName = "AnnotationNode";
+
+/* ANNOTATION NODE NUMBER -----------------------------------------------------
+ Renders the annotation node number.
+*/
+
+export type AnnotationNodeNumberProps = HTMLAttributes<HTMLDivElement>;
+
+export const AnnotationNodeNumber = forwardRef<
+ HTMLDivElement,
+ AnnotationNodeNumberProps
+>(({ className, children, ...props }, ref) => {
+ return (
+ <div ref={ref} {...props} className={cn("mr-1 leading-snug", className)}>
+ {children}
+ </div>
+ );
+});
+
+AnnotationNodeNumber.displayName = "AnnotationNodeNumber";
+
+/* ANNOTATION NODE CONTENT ----------------------------------------------------
+ Renders the main content of the annotation node.
+*/
+
+export type AnnotationNodeContentProps = HTMLAttributes<HTMLDivElement>;
+
+export const AnnotationNodeContent = forwardRef<
+ HTMLDivElement,
+ AnnotationNodeContentProps
+>(({ className, children, ...props }, ref) => {
+ return (
+ <div ref={ref} {...props} className={cn("leading-snug", className)}>
+ {children}
+ </div>
+ );
+});
+
+AnnotationNodeContent.displayName = "AnnotationNodeContent";
+
+/* ANNOTATION NODE ICON -------------------------------------------------------
+ Renders the icon for the annotation node.
+*/
+
+export type AnnotationNodeIconProps = HTMLAttributes<HTMLDivElement>;
+
+export const AnnotationNodeIcon = forwardRef<
+ HTMLDivElement,
+ AnnotationNodeIconProps
+>(({ className, children, ...props }, ref) => {
+ return (
+ <div
+ ref={ref}
+ {...props}
+ className={cn("absolute bottom-0 right-2 text-2xl", className)}
+ >
+ {children}
+ </div>
+ );
+});
+
+AnnotationNodeIcon.displayName = "AnnotationNodeIcon";
+
+interface AnnotationNodeData {
+ type: 'annotation';
+ number?: string | number;
+ content: ReactNode;
+ icon?: ReactNode;
+}
+
+interface BaseNodeData {
+ type?: string;
+ title?: string;
+ content?: ReactNode;
+}
+
+type CustomNodeData = AnnotationNodeData | BaseNodeData;
+
+const isAnnotationNode = (data: CustomNodeData): data is AnnotationNodeData => {
+ return data.type === 'annotation';
+};
+
+const CustomNode = memo(({ selected, data }: NodeProps) => {
+ const { setNodes, getNodes } = useReactFlow();
+ const nodeId = useNodeId();
+
+ const handleAddAnnotation = useCallback(() => {
+ const nodes = getNodes();
+ const currentNode = nodes.find(n => n.id === nodeId);
+ if (!currentNode) return;
+
+ const annotationId = `annotation-${Date.now()}`;
+ const annotationNode = {
+ id: annotationId,
+ type: 'custom',
+ position: {
+ x: currentNode.position.x + 200,
+ y: currentNode.position.y
+ },
+ data: {
+ type: 'annotation',
+ content: 'New annotation',
+ number: nodes.filter(n => n.data?.type === 'annotation').length + 1
+ }
+ };
+
+ setNodes(nodes => [...nodes, annotationNode]);
+ }, [nodeId, getNodes, setNodes]);
+
+ if (!data) return null;
+
+ const customData = data as CustomNodeData;
+
+ if (isAnnotationNode(customData)) {
+ return (
+ <AnnotationNode>
+ {customData.number && <AnnotationNodeNumber>{customData.number}</AnnotationNodeNumber>}
+ <AnnotationNodeContent>{customData.content}</AnnotationNodeContent>
+ {customData.icon && <AnnotationNodeIcon>{customData.icon}</AnnotationNodeIcon>}
+ </AnnotationNode>
+ );
+ }
+
+ return (
+ <BaseNode selected={selected} className="px-3 py-2 border">
+ <NodeHeader className="-mx-3 -mt-2 border-b">
+ <NodeHeaderIcon>
+ <Rocket />
+ </NodeHeaderIcon>
+ <NodeHeaderTitle>{customData.title || 'Node Title'}</NodeHeaderTitle>
+ <NodeHeaderActions>
+ <NodeHeaderMenuAction label="Expand account options">
+ <DropdownMenuLabel>Node Actions</DropdownMenuLabel>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem onClick={handleAddAnnotation}>
+ <MessageSquarePlus className="mr-2 h-4 w-4" />
+ Add Annotation
+ </DropdownMenuItem>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem>Profile</DropdownMenuItem>
+ <DropdownMenuItem>Billing</DropdownMenuItem>
+ <DropdownMenuItem>Team</DropdownMenuItem>
+ <DropdownMenuItem>Subscription</DropdownMenuItem>
+ </NodeHeaderMenuAction>
+ <NodeHeaderDeleteAction />
+ </NodeHeaderActions>
+ </NodeHeader>
+ <div className="mt-2">{customData.content || 'Node Content'}</div>
+ </BaseNode>
+ );
+});
+
+export default CustomNode;
\ No newline at end of file
diff --git a/flowsint-app/src/renderer/src/components/walls/controls.tsx b/flowsint-app/src/renderer/src/components/walls/controls.tsx
new file mode 100644
index 00000000..12cab8c9
--- /dev/null
+++ b/flowsint-app/src/renderer/src/components/walls/controls.tsx
@@ -0,0 +1,110 @@
+"use client"
+
+import { Button } from "@/components/ui/button"
+import { Panel } from "@xyflow/react"
+import { Save, Trash2, ZoomIn, ZoomOut, Maximize, LayoutGrid } from "lucide-react"
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
+
+interface FlowControlsProps {
+ loading: boolean
+ handleSaveWall: () => void
+ handleDeleteWall: () => void
+ onLayout: () => void
+ fitView: () => void
+ zoomIn: () => void
+ zoomOut: () => void
+ isSaved: boolean,
+ wall?: any
+}
+
+export function FlowControls({
+ loading,
+ handleSaveWall,
+ handleDeleteWall,
+ onLayout,
+ fitView,
+ zoomIn,
+ zoomOut,
+ isSaved,
+ wall
+}: FlowControlsProps) {
+ return (
+ <TooltipProvider>
+ <Panel position="bottom-right" className="flex gap-2 mt-28 mr-2 z-40">
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Button variant="outline" size="icon" className="bg-card" onClick={handleSaveWall} disabled={loading}>
+ <Save className="h-4 w-4" />
+ </Button>
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>Save Wall</p>
+ </TooltipContent>
+ </Tooltip>
+
+ {isSaved && (
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Button
+ variant="outline"
+ size="icon"
+ className="bg-card"
+ onClick={handleDeleteWall}
+ disabled={loading}
+ >
+ <Trash2 className="h-4 w-4" />
+ </Button>
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>Delete Wall</p>
+ </TooltipContent>
+ </Tooltip>
+ )}
+
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Button variant="outline" size="icon" className="bg-card" onClick={onLayout}>
+ <LayoutGrid className="h-4 w-4" />
+ </Button>
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>Auto Layout</p>
+ </TooltipContent>
+ </Tooltip>
+
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Button variant="outline" size="icon" className="bg-card" onClick={fitView}>
+ <Maximize className="h-4 w-4" />
+ </Button>
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>Fit View</p>
+ </TooltipContent>
+ </Tooltip>
+
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Button variant="outline" size="icon" className="bg-card" onClick={zoomIn}>
+ <ZoomIn className="h-4 w-4" />
+ </Button>
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>Zoom In</p>
+ </TooltipContent>
+ </Tooltip>
+
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Button variant="outline" size="icon" className="bg-card" onClick={zoomOut}>
+ <ZoomOut className="h-4 w-4" />
+ </Button>
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>Zoom Out</p>
+ </TooltipContent>
+ </Tooltip>
+ </Panel>
+ </TooltipProvider>
+ )
+}
diff --git a/flowsint-app/src/renderer/src/components/walls/details-panel.tsx b/flowsint-app/src/renderer/src/components/walls/details-panel.tsx
new file mode 100644
index 00000000..7fc77531
--- /dev/null
+++ b/flowsint-app/src/renderer/src/components/walls/details-panel.tsx
@@ -0,0 +1,53 @@
+"use client"
+import { memo } from "react"
+import { cn } from "@/lib/utils"
+import { CopyButton } from "@/components/copy"
+
+export default function DetailsPanel({ data }: { data: any }) {
+ return (
+ <div className="overflow-y-auto overflow-x-hidden w-full min-w-0 h-full min-h-0">
+ <div className="flex items-center sticky w-full bg-card top-0 border-b justify-start px-4 py-2 gap-2 z-50">
+ <h1 className="text-md font-semibold truncate">{data?.label}</h1>
+ <div className="grow" />
+ <div className="flex items-center gap-2">
+ {/* <LaunchTransform values={[data.label]} type={data?.type} /> */}
+ </div>
+ </div>
+ <KeyValueDisplay data={data} />
+ </div>
+ )
+}
+
+interface KeyValueDisplayProps {
+ data: Record<string, any>
+ className?: string
+}
+
+function KeyValueDisplay({ data, className }: KeyValueDisplayProps) {
+ return (
+ <div className={cn("w-full border-collapse", className)}>
+ {data && Object.entries(data)
+ .filter(([key]) => !["sketch_id", "caption", "size", "color"].includes(key))
+ .map(([key, value], index) => {
+ const val = Array.isArray(value) ? `${value.length} items` : value?.toString() || null
+ const display = (typeof val === "string" && val.startsWith("https://"))
+ ? <a href={val} className="underline text-primary truncate" target="_blank" rel="noopener noreferrer">{val}</a>
+ : val
+ return (
+ <div
+ key={index}
+ className="flex w-full bg-card items-center divide-x divide-border border-b border-border p-0"
+ >
+ <div className="w-1/2 px-4 p-2 text-sm text-muted-foreground font-normal truncate">{key}</div>
+ <div className="w-1/2 px-4 p-2 text-sm font-medium flex items-center justify-between min-w-0">
+ <div className="truncate font-semibold">{display || <span className="italic text-muted-foreground">N/A</span>}</div>
+ {display && <CopyButton className="h-6 w-6 shrink-0" content={val} />}
+ </div>
+ </div>
+ )
+ })}
+ </div>
+ )
+}
+
+export const MemoizedKeyValueDisplay = memo(KeyValueDisplay)
diff --git a/flowsint-app/src/renderer/src/components/walls/investigations-wall.tsx b/flowsint-app/src/renderer/src/components/walls/investigations-wall.tsx
new file mode 100644
index 00000000..d6af9f24
--- /dev/null
+++ b/flowsint-app/src/renderer/src/components/walls/investigations-wall.tsx
@@ -0,0 +1,192 @@
+import { useCallback, useState } from "react"
+import {
+ ReactFlow,
+ Background,
+ MiniMap,
+ Node,
+ Connection,
+ addEdge,
+ useNodesState,
+ useEdgesState,
+ useReactFlow,
+ ReactFlowProvider
+} from "@xyflow/react"
+import "@xyflow/react/dist/style.css"
+import { useWallStore } from "@/stores/wall-store"
+import CustomNode from "./base-node";
+import { FlowControls } from "./controls"
+import { useTheme } from "../theme-provider"
+
+const nodeTypes = {
+ custom: CustomNode,
+};
+
+function FlowContent() {
+ const [loading, setLoading] = useState(false)
+ const reactFlowInstance = useReactFlow()
+ const initialNodes = useWallStore(s => s.nodes)
+ const initialEdges = useWallStore(s => s.edges)
+ const onNodesChange = useWallStore(s => s.onNodesChange)
+ const onEdgesChange = useWallStore(s => s.onEdgesChange)
+ const onConnect = useWallStore(s => s.onConnect)
+ const setCurrentNode = useWallStore(s => s.setCurrentNode)
+ const setSelectedNodes = useWallStore(s => s.setSelectedNodes)
+ const saveWall = useWallStore(s => s.saveWall)
+ const deleteWall = useWallStore(s => s.deleteWall)
+
+ const { theme } = useTheme()
+
+ const [nodes, setNodes, onNodesChangeLocal] = useNodesState(initialNodes)
+ const [edges, setEdges, onEdgesChangeLocal] = useEdgesState(initialEdges)
+
+ const handleSaveWall = useCallback(async () => {
+ setLoading(true)
+ try {
+ await saveWall(nodes, edges)
+ } catch (error) {
+ console.error('Failed to save wall:', error)
+ } finally {
+ setLoading(false)
+ }
+ }, [nodes, edges, saveWall])
+
+ const handleDeleteWall = useCallback(async () => {
+ setLoading(true)
+ try {
+ await deleteWall()
+ } catch (error) {
+ console.error('Failed to delete wall:', error)
+ } finally {
+ setLoading(false)
+ }
+ }, [deleteWall])
+
+ const onLayout = useCallback(() => {
+ if (!reactFlowInstance) return
+ const { fitView } = reactFlowInstance
+ // You can implement your own layout logic here
+ // For now, we'll just fit the view
+ fitView({ duration: 800 })
+ }, [reactFlowInstance])
+
+ const handleNodesChange = useCallback(
+ (changes: any) => {
+ onNodesChangeLocal(changes)
+ onNodesChange(changes)
+ },
+ [onNodesChangeLocal, onNodesChange]
+ )
+
+ const handleEdgesChange = useCallback(
+ (changes: any) => {
+ onEdgesChangeLocal(changes)
+ onEdgesChange(changes)
+ },
+ [onEdgesChangeLocal, onEdgesChange]
+ )
+
+ const handleConnect = useCallback(
+ (connection: Connection) => {
+ setEdges((eds) => addEdge(connection, eds))
+ onConnect(connection)
+ },
+ [setEdges, onConnect]
+ )
+
+ const onDragOver = useCallback((event: React.DragEvent<HTMLDivElement>) => {
+ event.preventDefault()
+ event.dataTransfer.dropEffect = "move"
+ }, [])
+
+ const onDrop = useCallback(
+ (event: React.DragEvent<HTMLDivElement>) => {
+ event.preventDefault()
+
+ const reactFlowBounds = event.currentTarget.getBoundingClientRect()
+ const data = JSON.parse(event.dataTransfer.getData("text/plain"))
+
+ const position = {
+ x: event.clientX - reactFlowBounds.left,
+ y: event.clientY - reactFlowBounds.top,
+ }
+
+ const newNode: Node = {
+ id: `${data.type}-${Date.now()}`,
+ type: "custom",
+ position,
+ data: { ...data },
+ }
+
+ setNodes((nds) => nds.concat(newNode))
+ onNodesChange([{ type: "add", item: newNode }])
+ setCurrentNode(newNode)
+ },
+ [setNodes, onNodesChange, setCurrentNode]
+ )
+
+ const onNodeClick = useCallback(
+ (_: React.MouseEvent, node: Node) => {
+ setCurrentNode(node)
+ },
+ [setCurrentNode]
+ )
+
+ const onSelectionChange = useCallback(
+ ({ nodes }: { nodes: Node[] }) => {
+ setSelectedNodes(nodes)
+ },
+ [setSelectedNodes]
+ )
+
+ const onPaneClick = useCallback(
+ () => {
+ setCurrentNode(null)
+ setSelectedNodes([])
+ },
+ [setCurrentNode, setSelectedNodes]
+ )
+
+ return (
+ <div className="h-full w-full flex flex-col">
+ <div className="flex-1 w-full h-full bg-background">
+ <ReactFlow
+ nodes={nodes}
+ proOptions={{ hideAttribution: true }}
+ edges={edges}
+ colorMode={theme}
+ nodeTypes={nodeTypes}
+ onNodesChange={handleNodesChange}
+ onEdgesChange={handleEdgesChange}
+ onConnect={handleConnect}
+ onDragOver={onDragOver}
+ onDrop={onDrop}
+ onNodeClick={onNodeClick}
+ onPaneClick={onPaneClick}
+ onSelectionChange={onSelectionChange}
+ fitView
+ >
+ <Background bgColor="var(--background)" />
+ <FlowControls
+ loading={loading}
+ handleSaveWall={handleSaveWall}
+ handleDeleteWall={handleDeleteWall}
+ onLayout={onLayout}
+ fitView={() => reactFlowInstance?.fitView({ duration: 800 })}
+ zoomIn={() => reactFlowInstance?.zoomIn({ duration: 800 })}
+ zoomOut={() => reactFlowInstance?.zoomOut({ duration: 800 })}
+ isSaved={true}
+ />
+ <MiniMap position="bottom-left" />
+ </ReactFlow>
+ </div>
+ </div>
+ )
+}
+
+export default function InvestigationsWall() {
+ return (
+ <ReactFlowProvider>
+ <FlowContent />
+ </ReactFlowProvider>
+ )
+}
\ No newline at end of file
diff --git a/flowsint-app/src/renderer/src/components/walls/nodes-panel.tsx b/flowsint-app/src/renderer/src/components/walls/nodes-panel.tsx
new file mode 100644
index 00000000..eb9f1fc5
--- /dev/null
+++ b/flowsint-app/src/renderer/src/components/walls/nodes-panel.tsx
@@ -0,0 +1,359 @@
+import type React from "react"
+import { memo, useMemo, useState, useCallback, useRef } from "react"
+import { useVirtualizer } from '@tanstack/react-virtual'
+import { Button } from "@/components/ui/button"
+import { Badge } from "@/components/ui/badge"
+import { TypeBadge } from "@/components/type-badge"
+import { Search, FilterIcon, XIcon } from "lucide-react"
+import { usePlatformIcons } from "@/hooks/use-platform-icons"
+import { Input } from "@/components/ui/input"
+import { actionItems } from "@/lib/action-items"
+import { cn } from "@/lib/utils"
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuLabel,
+ DropdownMenuSeparator,
+ DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu"
+import type { NodeData } from "@/types"
+import { Checkbox } from "@/components/ui/checkbox"
+import { useWallStore } from "@/stores/wall-store"
+
+// Hauteur fixe pour chaque item (en pixels)
+const ITEM_HEIGHT = 40
+
+// Mémoiser le composant SocialNode
+const SocialNode = memo(
+ ({
+ node,
+ setCurrentNode,
+ onCheckboxChange,
+ isNodeChecked,
+ }: {
+ node: any
+ setCurrentNode: (node: NodeData) => void
+ onCheckboxChange: (node: NodeData, checked: boolean) => void
+ isNodeChecked: (nodeId: string) => boolean
+ }) => {
+ const platformsIcons = usePlatformIcons()
+ const platformIcon = useMemo(() => {
+ // @ts-ignore
+ return platformsIcons?.[node?.data?.platform]?.icon
+ }, [platformsIcons, node?.data?.platform])
+
+ const handleClick = useCallback(() => setCurrentNode(node), [node, setCurrentNode])
+
+ const handleCheckboxChange = useCallback(
+ (checked: boolean) => {
+ onCheckboxChange(node, checked)
+ },
+ [node, onCheckboxChange],
+ )
+
+ return (
+ <div className="flex items-center border-b h-full">
+ <div className="pl-2">
+ <Checkbox checked={isNodeChecked(node.id)} onCheckedChange={handleCheckboxChange} className="mr-1" />
+ </div>
+ <Button
+ variant={"ghost"}
+ className={cn(
+ "flex-1 flex items-center justify-start p-4 !py-5 rounded-none text-left border-l-2 border-l-transparent h-full gap-2"
+ )}
+ onClick={handleClick}
+ >
+ <Badge variant="secondary" className="h-7 w-7 p-0 rounded-full flex-shrink-0">
+ {platformIcon}
+ </Badge>
+ <div className="min-w-0 grow truncate text-ellipsis">
+ {node?.data?.username || <span className="italic opacity-60">Unknown</span>}
+ </div>
+ <div className="flex-shrink-0">
+ <TypeBadge type={node?.data?.type as string} />
+ </div>
+ </Button>
+ </div>
+ )
+ },
+)
+
+// Mémoiser le composant NodeRenderer
+const NodeRenderer = memo(
+ ({
+ node,
+ setCurrentNode,
+ onCheckboxChange,
+ isNodeChecked,
+ }: {
+ node: any
+ setCurrentNode: (node: NodeData) => void
+ onCheckboxChange: (node: NodeData, checked: boolean) => void
+ isNodeChecked: (nodeId: string) => boolean
+ }) => {
+ const handleClick = useCallback(() => setCurrentNode(node), [node, setCurrentNode])
+ const handleCheckboxChange = useCallback(
+ (checked: boolean) => {
+ onCheckboxChange(node, checked)
+ },
+ [node, onCheckboxChange],
+ )
+
+ if (node.data?.type === "social") {
+ return (
+ <SocialNode
+ setCurrentNode={setCurrentNode}
+ node={node}
+ onCheckboxChange={onCheckboxChange}
+ isNodeChecked={isNodeChecked}
+ />
+ )
+ }
+
+ return (
+ <div className="flex items-center hover:bg-muted border-b h-full">
+ <div className="pl-2">
+ <Checkbox checked={isNodeChecked(node.id)} onCheckedChange={handleCheckboxChange} className="mr-1 border-border" />
+ </div>
+ <Button
+ variant={"ghost"}
+ className={cn(
+ "flex-1 flex truncate items-center justify-start p-4 !py-5 rounded-none text-left border-l-2 border-l-transparent h-full",
+ )}
+ onClick={handleClick}
+ >
+ <div className="grow truncate text-ellipsis">{node?.data?.label}</div>
+ <TypeBadge type={node?.data?.type} />
+ </Button>
+ </div>
+ )
+ },
+)
+
+// Composant pour un item virtualisé
+const VirtualizedItem = memo(({
+ node,
+ setCurrentNode,
+ onCheckboxChange,
+ isNodeChecked
+}: {
+ index: number
+ node: NodeData
+ setCurrentNode: (node: NodeData) => void
+ onCheckboxChange: (node: NodeData, checked: boolean) => void
+ isNodeChecked: (nodeId: string) => boolean
+}) => {
+ return (
+ <NodeRenderer
+ node={node}
+ setCurrentNode={setCurrentNode}
+ onCheckboxChange={onCheckboxChange}
+ isNodeChecked={isNodeChecked}
+ />
+ )
+})
+
+const NodesPanel = memo(({ nodes, isLoading }: { nodes: NodeData[]; isLoading?: boolean }) => {
+ const setCurrentNode = useWallStore((state) => state.setCurrentNode)
+ const setSelectedNodes = useWallStore((state) => state.setSelectedNodes)
+ const selectedNodes = useWallStore((state) => state.selectedNodes || [])
+ const [searchQuery, setSearchQuery] = useState<string>("")
+ const [filters, setFilters] = useState<null | string[]>(null)
+
+ // Ref pour le conteneur parent du virtualizer
+ const parentRef = useRef<HTMLDivElement>(null)
+
+ const filteredNodes = useMemo(() => {
+ const searchText = searchQuery.toLowerCase()
+ return nodes?.filter((node) => {
+ const matchesSearch =
+ //@ts-ignore
+ node?.data?.label?.toLowerCase().includes(searchText) || node?.id?.toLowerCase().includes(searchText)
+
+ const matchesFilter = !filters || filters.includes(node?.data?.type as string)
+
+ return matchesSearch && matchesFilter
+ })
+ }, [nodes, searchQuery, filters])
+
+ // Configuration du virtualizer
+ const virtualizer = useVirtualizer({
+ count: filteredNodes?.length || 0,
+ getScrollElement: () => parentRef.current,
+ estimateSize: () => ITEM_HEIGHT,
+ overscan: 5, // Nombre d'éléments à pré-rendre en dehors de la zone visible
+ })
+
+ const toggleFilter = useCallback((filter: string | null) => {
+ if (filter === null) {
+ setFilters(null)
+ } else {
+ setFilters((prev) => {
+ if (prev === null) return [filter]
+ const next = prev.includes(filter) ? prev.filter((f) => f !== filter) : [...prev, filter]
+ return next.length === 0 ? null : next
+ })
+ }
+ }, [])
+
+ const handleSearchChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
+ setSearchQuery(e.target.value)
+ }, [])
+
+ const clearFilters = useCallback(() => {
+ setFilters(null)
+ }, [])
+
+ const isNodeChecked = useCallback(
+ (nodeId: string) => {
+ return selectedNodes.some((node) => node.id === nodeId)
+ },
+ [selectedNodes],
+ )
+
+ const handleCheckboxChange = useCallback(
+ (node: NodeData, checked: boolean) => {
+ if (checked) {
+ setSelectedNodes([...selectedNodes.filter((n) => n.id !== node.id), node])
+ } else {
+ setSelectedNodes(selectedNodes.filter((n) => n.id !== node.id))
+ }
+ },
+ [selectedNodes, setSelectedNodes],
+ )
+
+ return (
+ <div className="overflow-hidden bg-card h-full flex flex-col w-full !p-0 !m-0">
+ {/* Header fixe */}
+ <div className="sticky border-b top-0 p-2 bg-card z-10 flex-shrink-0">
+ <div className="flex items-center gap-2">
+ <Badge className="h-7" variant={"outline"}>
+ <span className="font-semibold">
+ {(filters?.length || searchQuery) ? `${filteredNodes?.length} / ${nodes?.length || 0}` : nodes?.length || 0}</span>{" "}
+ <span className="font-normal opacity-60">nodes</span>
+ </Badge>
+ <div className="relative grow">
+ <Search className="absolute left-2.5 top-1.5 h-4 w-4 text-muted-foreground" />
+ <Input
+ type="search"
+ placeholder="Search..."
+ className="pl-8 h-7 border-border"
+ value={searchQuery}
+ onChange={handleSearchChange}
+ />
+ </div>
+ <DropdownMenu>
+ <div>
+ <DropdownMenuTrigger asChild>
+ <div>
+ <Button variant={"outline"} className="h-7 w-8 relative border-border border" size={"icon"}>
+ <FilterIcon className={cn("opacity-60 h-3 w-3", filters && "opacity-100")} />
+ {filters && (
+ <Badge className="absolute -top-2 -right-1 text-xs rounded-full h-4 w-4 text-white" variant={"default"}>
+ {filters.length}
+ </Badge>
+ )}
+ </Button>
+ </div>
+ </DropdownMenuTrigger>
+ </div>
+ <DropdownMenuContent className="w-48 max-h-[50vh] space-y-1 overflow-y-auto">
+ <DropdownMenuLabel>
+ {filters ? (
+ <Badge variant={"outline"} className="flex items-center gap-1 pr-1">
+ {filters?.length} filter(s)
+ <Button size={"icon"} variant={"ghost"} className="h-5 w-5 rounded-full" onClick={clearFilters}>
+ <XIcon className="h-3 w-3" />
+ </Button>
+ </Badge>
+ ) : (
+ "filters"
+ )}
+ </DropdownMenuLabel>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem className={cn(filters == null && "bg-primary")} onClick={() => toggleFilter(null)}>
+ All
+ </DropdownMenuItem>
+ {actionItems.map((item) => (
+ <DropdownMenuItem
+ className={cn(filters?.includes(item?.type) && "bg-primary/30")}
+ key={item.id}
+ onClick={() => toggleFilter(item?.type)}
+ >
+ {item?.type || "unknown"}
+ </DropdownMenuItem>
+ ))}
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </div>
+ </div>
+
+ {/* Contenu principal */}
+ <div className="flex-1 min-h-0">
+ {!isLoading && filteredNodes?.length === 0 && searchQuery === "" && (
+ <div className="text-sm p-4 text-center">
+ <p className="border rounded-md border-dashed p-4 text-center">
+ Drag and drop you first node in the "items" section.
+ </p>
+ </div>
+ )}
+ {/* {isLoading || !filteredNodes?.length && (
+ <div className="p-2"><SkeletonList rowCount={7} /></div>
+ )} */}
+
+ {filteredNodes?.length === 0 && searchQuery && (
+ <div className="p-4 text-center text-muted-foreground">
+ No nodes match your search
+ </div>
+ )}
+
+ {/* Liste virtualisée */}
+ {!isLoading && filteredNodes && filteredNodes.length > 0 && (
+ <div
+ ref={parentRef}
+ className="h-full overflow-auto"
+ style={{
+ contain: 'strict',
+ }}
+ >
+ <div
+ style={{
+ height: `${virtualizer.getTotalSize()}px`,
+ width: '100%',
+ position: 'relative',
+ }}
+ >
+ {virtualizer.getVirtualItems().map((virtualItem) => {
+ const node = filteredNodes[virtualItem.index]
+ return (
+ <div
+ key={virtualItem.key}
+ style={{
+ position: 'absolute',
+ top: 0,
+ left: 0,
+ width: '100%',
+ height: `${virtualItem.size}px`,
+ transform: `translateY(${virtualItem.start}px)`,
+ }}
+ >
+ <VirtualizedItem
+ index={virtualItem.index}
+ node={node}
+ setCurrentNode={setCurrentNode}
+ onCheckboxChange={handleCheckboxChange}
+ isNodeChecked={isNodeChecked}
+ />
+ </div>
+ )
+ })}
+ </div>
+ </div>
+ )}
+ </div>
+ </div>
+ )
+})
+
+export default NodesPanel
\ No newline at end of file
diff --git a/flowsint-app/src/renderer/src/components/walls/wall-navigation.tsx b/flowsint-app/src/renderer/src/components/walls/wall-navigation.tsx
new file mode 100644
index 00000000..14e57632
--- /dev/null
+++ b/flowsint-app/src/renderer/src/components/walls/wall-navigation.tsx
@@ -0,0 +1,64 @@
+import NodesPanel from "./nodes-panel"
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
+import { UserPlus, Users } from "lucide-react"
+import { ItemsPanel } from "../graphs/items-panel"
+import DetailsPanel from "./details-panel"
+import { ResizableHandle, ResizablePanel, ResizablePanelGroup } from "../ui/resizable"
+import { useWallStore } from "@/stores/wall-store"
+import { NodeData } from "@/types"
+
+const WallNavigation = () => {
+ const nodes = useWallStore((s) => s.nodes)
+ const currentNode = useWallStore((s) => s.currentNode)
+
+ return (
+ <div className="h-full w-full min-h-0">
+ <Tabs defaultValue="entities" className="w-full h-full gap-0 flex flex-col min-w-0">
+ <TabsList className="w-full p-0 rounded-none my-0 border-b">
+ <TabsTrigger value="entities"><Users className="h-3 w-3 opacity-60" /> Entities</TabsTrigger>
+ <TabsTrigger value="items"><UserPlus className="h-3 w-3 opacity-60" /> Items</TabsTrigger>
+ </TabsList>
+ <TabsContent
+ value="entities"
+ className="grow flex flex-col min-h-0 min-w-0 overflow-hidden"
+ >
+ <ResizablePanelGroup
+ autoSaveId="conditional"
+ direction="vertical"
+ className="flex-1 min-h-0 flex w-full flex-col"
+ >
+ {currentNode && (
+ <>
+ <ResizablePanel
+ order={2}
+ id="infos"
+ defaultSize={30}
+ className="flex flex-col w-full overflow-hidden min-h-0 min-w-0"
+ >
+ <DetailsPanel data={currentNode.data} />
+ </ResizablePanel>
+ <ResizableHandle />
+ </>
+ )}
+ <ResizablePanel
+ order={3}
+ id="nodes"
+ defaultSize={40}
+ className="flex flex-col overflow-hidden min-h-0 min-w-0"
+ >
+ <NodesPanel nodes={nodes as NodeData[]} />
+ </ResizablePanel>
+ </ResizablePanelGroup>
+ </TabsContent>
+ <TabsContent
+ value="items"
+ className="my-0 grow h-full overflow-hidden min-h-0"
+ >
+ <ItemsPanel />
+ </TabsContent>
+ </Tabs>
+ </div>
+ )
+}
+
+export default WallNavigation
diff --git a/flowsint-app/src/renderer/src/hooks/use-logs.ts b/flowsint-app/src/renderer/src/hooks/use-logs.ts
index 945fde93..fbf7dcd8 100644
--- a/flowsint-app/src/renderer/src/hooks/use-logs.ts
+++ b/flowsint-app/src/renderer/src/hooks/use-logs.ts
@@ -11,36 +11,41 @@ export interface Log {
created_at: string
}
-export function useLogs() {
+export function useLogs(sketch_id: string | undefined) {
const [realtimeLogs, setRealtimeLogs] = useState<Log[]>([])
- const [unreadCount, setUnreadCount] = useState(0)
const { data: previousLogs = [], refetch } = useQuery({
- queryKey: ["logs"],
- queryFn: logService.get,
+ queryKey: ["logs", sketch_id],
+ queryFn: () => logService.get(sketch_id as string),
refetchOnWindowFocus: false,
+ enabled: !!sketch_id,
staleTime: 30_000, // Consider data fresh for 30 seconds
})
- useEffect(() => {
- console.log("[useLogs] Setting up SSE connection")
- const eventSource = new EventSource(`http://localhost:5001/api/logs/stream`)
+ const handleRefresh = () => {
+ refetch()
+ setRealtimeLogs([]) // Clear realtime logs on refresh to avoid duplicates
+ }
- eventSource.onopen = () => {
- console.log("[useLogs] SSE connection opened")
- }
+ useEffect(() => {
+ const eventSource = new EventSource(`http://localhost:5001/api/logs/sketch/${sketch_id}/stream`)
- eventSource.addEventListener("log", (event) => {
- console.log("[useLogs] Received log event:", event.data)
+ eventSource.onmessage = (event) => {
try {
- const log = JSON.parse(event.data) as Log
- console.log("[useLogs] Parsed log:", log)
- setRealtimeLogs((prevLogs) => [...prevLogs.slice(-99), log])
- setUnreadCount((count) => count + 1)
- } catch (error) {
+ let log = JSON.parse(event.data)
+ log = JSON.parse(log["data"]) as Log
+ log.content = JSON.parse(log.content)
+ console.log("[useLogs] Received log event:", log)
+
+ setRealtimeLogs((prevLogs) => {
+ const newLogs = [...prevLogs.slice(-99), log]
+ return newLogs
+ })
+ }
+ catch (error) {
console.error("[useLogs] Failed to parse log event:", error)
}
- })
+ }
eventSource.onerror = (error) => {
console.error("[useLogs] EventSource error:", error)
@@ -51,17 +56,13 @@ export function useLogs() {
console.log("[useLogs] Cleaning up SSE connection")
eventSource.close()
}
- }, [])
+ }, [sketch_id])
// Combine previous and realtime logs, keeping the most recent 100
const logs = [...previousLogs, ...realtimeLogs].slice(-100)
- const resetUnreadCount = () => setUnreadCount(0)
-
return {
logs,
- unreadCount,
- resetUnreadCount,
- refetch
+ refetch: handleRefresh
}
}
\ No newline at end of file
diff --git a/flowsint-app/src/renderer/src/hooks/use-sketch-scans.ts b/flowsint-app/src/renderer/src/hooks/use-sketch-scans.ts
new file mode 100644
index 00000000..002fef84
--- /dev/null
+++ b/flowsint-app/src/renderer/src/hooks/use-sketch-scans.ts
@@ -0,0 +1,80 @@
+import { useEffect, useState } from "react"
+import { useQuery } from "@tanstack/react-query"
+import { scanService } from "@/api/scan-service"
+import { Scan } from "./use-scan-status"
+
+export function useSketchScans(sketch_id: string | undefined) {
+ const [realtimeScans, setRealtimeScans] = useState<Record<string, Scan>>({})
+
+ const { data: scans, refetch } = useQuery({
+ queryKey: ["sketch-scans", sketch_id],
+ queryFn: () => scanService.getSketchScans(sketch_id as string),
+ refetchOnWindowFocus: false,
+ enabled: !!sketch_id,
+ staleTime: 30_000, // Consider data fresh for 30 seconds
+ })
+
+ useEffect(() => {
+ if (!sketch_id || !scans) return
+
+ // Initialize realtime scans with current scan data
+ const initialRealtimeScans: Record<string, Scan> = {}
+ scans.forEach(scan => {
+ initialRealtimeScans[scan.scan_id] = scan
+ })
+ setRealtimeScans(initialRealtimeScans)
+
+ // Set up SSE connections for each scan
+ const eventSources: EventSource[] = []
+
+ scans.forEach(scan => {
+ const eventSource = new EventSource(`http://localhost:5001/api/scans/${scan.scan_id}/status/stream`)
+
+ eventSource.onmessage = (event) => {
+ try {
+ const statusUpdate = JSON.parse(event.data)
+ console.log("[useSketchScans] Received status update:", statusUpdate)
+
+ // Update the specific scan in our realtime state
+ setRealtimeScans(prev => {
+ const updated = { ...prev }
+ if (statusUpdate.event === 'status_update') {
+ updated[scan.scan_id] = {
+ ...updated[scan.scan_id],
+ ...statusUpdate.data
+ }
+
+ // Check if scan just completed
+ if (statusUpdate.data.status === 'completed') {
+ alert(`Refreshing ${sketch_id}`)
+ }
+ }
+ return updated
+ })
+ } catch (error) {
+ console.error("[useSketchScans] Failed to parse status update:", error)
+ }
+ }
+
+ eventSource.onerror = (error) => {
+ console.error("[useSketchScans] EventSource error:", error)
+ eventSource.close()
+ }
+
+ eventSources.push(eventSource)
+ })
+
+ return () => {
+ console.log("[useSketchScans] Cleaning up SSE connections")
+ eventSources.forEach(es => es.close())
+ }
+ }, [sketch_id, scans])
+
+ // Combine realtime updates with the base scan data
+ const currentScans = scans?.map(scan => realtimeScans[scan.scan_id] || scan) || []
+
+ return {
+ scans: currentScans,
+ refetch
+ }
+}
\ No newline at end of file
diff --git a/flowsint-app/src/renderer/src/routeTree.gen.ts b/flowsint-app/src/renderer/src/routeTree.gen.ts
index cca52a19..f8e9e0dd 100644
--- a/flowsint-app/src/renderer/src/routeTree.gen.ts
+++ b/flowsint-app/src/renderer/src/routeTree.gen.ts
@@ -24,6 +24,7 @@ import { Route as AuthDashboardToolsImport } from './routes/_auth.dashboard.tool
import { Route as AuthDashboardTransformsIndexImport } from './routes/_auth.dashboard.transforms.index'
import { Route as AuthDashboardInvestigationsIndexImport } from './routes/_auth.dashboard.investigations.index'
import { Route as AuthDashboardTransformsTransformIdImport } from './routes/_auth.dashboard.transforms.$transformId'
+import { Route as AuthDashboardInvestigationsWallImport } from './routes/_auth.dashboard.investigations.wall'
import { Route as AuthDashboardInvestigationsInvestigationIdIndexImport } from './routes/_auth.dashboard.investigations.$investigationId.index'
import { Route as AuthDashboardInvestigationsInvestigationIdTypeIdImport } from './routes/_auth.dashboard.investigations.$investigationId.$type.$id'
@@ -107,6 +108,13 @@ const AuthDashboardTransformsTransformIdRoute =
getParentRoute: () => AuthDashboardRoute,
} as any)
+const AuthDashboardInvestigationsWallRoute =
+ AuthDashboardInvestigationsWallImport.update({
+ id: '/investigations/wall',
+ path: '/investigations/wall',
+ getParentRoute: () => AuthDashboardRoute,
+ } as any)
+
const AuthDashboardInvestigationsInvestigationIdIndexRoute =
AuthDashboardInvestigationsInvestigationIdIndexImport.update({
id: '/investigations/$investigationId/',
@@ -188,6 +196,13 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof AuthDashboardIndexImport
parentRoute: typeof AuthDashboardImport
}
+ '/_auth/dashboard/investigations/wall': {
+ id: '/_auth/dashboard/investigations/wall'
+ path: '/investigations/wall'
+ fullPath: '/dashboard/investigations/wall'
+ preLoaderRoute: typeof AuthDashboardInvestigationsWallImport
+ parentRoute: typeof AuthDashboardImport
+ }
'/_auth/dashboard/transforms/$transformId': {
id: '/_auth/dashboard/transforms/$transformId'
path: '/transforms/$transformId'
@@ -231,6 +246,7 @@ declare module '@tanstack/react-router' {
interface AuthDashboardRouteChildren {
AuthDashboardToolsRoute: typeof AuthDashboardToolsRoute
AuthDashboardIndexRoute: typeof AuthDashboardIndexRoute
+ AuthDashboardInvestigationsWallRoute: typeof AuthDashboardInvestigationsWallRoute
AuthDashboardTransformsTransformIdRoute: typeof AuthDashboardTransformsTransformIdRoute
AuthDashboardInvestigationsIndexRoute: typeof AuthDashboardInvestigationsIndexRoute
AuthDashboardTransformsIndexRoute: typeof AuthDashboardTransformsIndexRoute
@@ -241,6 +257,7 @@ interface AuthDashboardRouteChildren {
const AuthDashboardRouteChildren: AuthDashboardRouteChildren = {
AuthDashboardToolsRoute: AuthDashboardToolsRoute,
AuthDashboardIndexRoute: AuthDashboardIndexRoute,
+ AuthDashboardInvestigationsWallRoute: AuthDashboardInvestigationsWallRoute,
AuthDashboardTransformsTransformIdRoute:
AuthDashboardTransformsTransformIdRoute,
AuthDashboardInvestigationsIndexRoute: AuthDashboardInvestigationsIndexRoute,
@@ -275,6 +292,7 @@ export interface FileRoutesByFullPath {
'/dashboard': typeof AuthDashboardRouteWithChildren
'/dashboard/tools': typeof AuthDashboardToolsRoute
'/dashboard/': typeof AuthDashboardIndexRoute
+ '/dashboard/investigations/wall': typeof AuthDashboardInvestigationsWallRoute
'/dashboard/transforms/$transformId': typeof AuthDashboardTransformsTransformIdRoute
'/dashboard/investigations': typeof AuthDashboardInvestigationsIndexRoute
'/dashboard/transforms': typeof AuthDashboardTransformsIndexRoute
@@ -291,6 +309,7 @@ export interface FileRoutesByTo {
'/toolbar': typeof ToolbarLazyRoute
'/dashboard/tools': typeof AuthDashboardToolsRoute
'/dashboard': typeof AuthDashboardIndexRoute
+ '/dashboard/investigations/wall': typeof AuthDashboardInvestigationsWallRoute
'/dashboard/transforms/$transformId': typeof AuthDashboardTransformsTransformIdRoute
'/dashboard/investigations': typeof AuthDashboardInvestigationsIndexRoute
'/dashboard/transforms': typeof AuthDashboardTransformsIndexRoute
@@ -309,6 +328,7 @@ export interface FileRoutesById {
'/_auth/dashboard': typeof AuthDashboardRouteWithChildren
'/_auth/dashboard/tools': typeof AuthDashboardToolsRoute
'/_auth/dashboard/': typeof AuthDashboardIndexRoute
+ '/_auth/dashboard/investigations/wall': typeof AuthDashboardInvestigationsWallRoute
'/_auth/dashboard/transforms/$transformId': typeof AuthDashboardTransformsTransformIdRoute
'/_auth/dashboard/investigations/': typeof AuthDashboardInvestigationsIndexRoute
'/_auth/dashboard/transforms/': typeof AuthDashboardTransformsIndexRoute
@@ -328,6 +348,7 @@ export interface FileRouteTypes {
| '/dashboard'
| '/dashboard/tools'
| '/dashboard/'
+ | '/dashboard/investigations/wall'
| '/dashboard/transforms/$transformId'
| '/dashboard/investigations'
| '/dashboard/transforms'
@@ -343,6 +364,7 @@ export interface FileRouteTypes {
| '/toolbar'
| '/dashboard/tools'
| '/dashboard'
+ | '/dashboard/investigations/wall'
| '/dashboard/transforms/$transformId'
| '/dashboard/investigations'
| '/dashboard/transforms'
@@ -359,6 +381,7 @@ export interface FileRouteTypes {
| '/_auth/dashboard'
| '/_auth/dashboard/tools'
| '/_auth/dashboard/'
+ | '/_auth/dashboard/investigations/wall'
| '/_auth/dashboard/transforms/$transformId'
| '/_auth/dashboard/investigations/'
| '/_auth/dashboard/transforms/'
@@ -430,6 +453,7 @@ export const routeTree = rootRoute
"children": [
"/_auth/dashboard/tools",
"/_auth/dashboard/",
+ "/_auth/dashboard/investigations/wall",
"/_auth/dashboard/transforms/$transformId",
"/_auth/dashboard/investigations/",
"/_auth/dashboard/transforms/",
@@ -445,6 +469,10 @@ export const routeTree = rootRoute
"filePath": "_auth.dashboard.index.tsx",
"parent": "/_auth/dashboard"
},
+ "/_auth/dashboard/investigations/wall": {
+ "filePath": "_auth.dashboard.investigations.wall.tsx",
+ "parent": "/_auth/dashboard"
+ },
"/_auth/dashboard/transforms/$transformId": {
"filePath": "_auth.dashboard.transforms.$transformId.tsx",
"parent": "/_auth/dashboard"
diff --git a/flowsint-app/src/renderer/src/routes/_auth.dashboard.investigations.$investigationId.$type.$id.tsx b/flowsint-app/src/renderer/src/routes/_auth.dashboard.investigations.$investigationId.$type.$id.tsx
index 2d6740ec..ea0ad254 100644
--- a/flowsint-app/src/renderer/src/routes/_auth.dashboard.investigations.$investigationId.$type.$id.tsx
+++ b/flowsint-app/src/renderer/src/routes/_auth.dashboard.investigations.$investigationId.$type.$id.tsx
@@ -1,19 +1,20 @@
import { createFileRoute, useLoaderData } from '@tanstack/react-router'
import GraphPanel from '@/components/graphs/graph-panel'
import { sketchService } from '@/api/sketch-service'
-import type { InvestigationGraph } from '@/types'
-
-// Get queryClient from where it's initialized
-import { getContext } from '@/integrations/tanstack-query/root-provider'
-import Loader from '@/components/loader'
-
-const { queryClient } = getContext();
+import { useQuery } from '@tanstack/react-query'
const GraphPageContent = () => {
- const { params: { type } } = useLoaderData({
+ const { params: { type, id, investigationId } } = useLoaderData({
from: '/_auth/dashboard/investigations/$investigationId/$type/$id',
})
+ const { data: graphData, isLoading } = useQuery({
+ queryKey: ["investigations", investigationId, type, id, "data"],
+ queryFn: () => type === "graph" ? sketchService.getGraphDataById(id) : Promise.resolve(null),
+ enabled: type === "graph",
+ refetchOnWindowFocus: false
+ })
+
if (type !== "graph") {
return (
<div className="h-full w-full flex items-center justify-center">
@@ -25,34 +26,19 @@ const GraphPageContent = () => {
)
}
- return <GraphPanel />
+ return <GraphPanel isLoading={isLoading} graphData={graphData} />
}
export const Route = createFileRoute('/_auth/dashboard/investigations/$investigationId/$type/$id')({
loader: async ({ params: { id, type, investigationId } }) => {
- // Start both requests in parallel
- const [sketch, graphData] = await Promise.all([
- sketchService.getById(id),
- type === "graph" ? sketchService.getGraphDataById(id) : Promise.resolve(null)
- ])
-
- // Update cache
- queryClient.setQueryData(["investigations", investigationId, type, id], sketch)
- if (graphData) {
- queryClient.setQueryData<InvestigationGraph>(
- ["investigations", investigationId, type, id, "data"],
- graphData as InvestigationGraph
- )
- }
-
- return { params: { id, type, investigationId }, sketch, graphData }
+ const sketch = await sketchService.getById(id)
+ return { params: { id, type, investigationId }, sketch }
},
pendingComponent: () => (
<div className="h-full w-full flex items-center justify-center">
<div className="flex flex-col items-center gap-4">
- {/* <Loader /> */}
- <p className="text-muted-foreground"><Loader /> Fetching nodes...</p>
+ <p className="text-muted-foreground">Loading...</p>
</div>
</div>
),
diff --git a/flowsint-app/src/renderer/src/routes/_auth.dashboard.investigations.$investigationId.index.tsx b/flowsint-app/src/renderer/src/routes/_auth.dashboard.investigations.$investigationId.index.tsx
index 2880c991..21632fd4 100644
--- a/flowsint-app/src/renderer/src/routes/_auth.dashboard.investigations.$investigationId.index.tsx
+++ b/flowsint-app/src/renderer/src/routes/_auth.dashboard.investigations.$investigationId.index.tsx
@@ -1,15 +1,20 @@
import { createFileRoute } from '@tanstack/react-router'
import { investigationService } from '@/api/investigation-service'
-import { Waypoints, PlusIcon, Users, FileText, Settings, Activity } from 'lucide-react'
+import { analysisService } from '@/api/analysis-service'
+import { Waypoints, PlusIcon, Users, FileText, Settings, Activity, FileText as FileTextIcon } from 'lucide-react'
import { Button } from '@/components/ui/button'
import { Badge } from '@/components/ui/badge'
import NewSketch from '@/components/sketches/new-sketch'
import { Link } from '@tanstack/react-router'
import { cn } from '@/lib/utils'
import type { Sketch } from '@/types/sketch'
+import type { Analysis } from '@/types'
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
import { formatDistanceToNow } from 'date-fns'
import { Skeleton } from '@/components/ui/skeleton'
+import { useAnalysisPanelStore } from '@/stores/analysis-panel-store'
+import { useLayoutStore } from '@/stores/layout-store'
+import { useQuery } from '@tanstack/react-query'
function InvestigationSkeleton() {
return (
@@ -28,8 +33,8 @@ function InvestigationSkeleton() {
</div>
{/* Overview Cards Skeleton */}
- <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
- {[...Array(3)].map((_, i) => (
+ <div className="grid grid-cols-1 md:grid-cols-4 gap-4">
+ {[...Array(4)].map((_, i) => (
<Card key={i}>
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<Skeleton className="h-4 w-24" />
@@ -70,6 +75,33 @@ function InvestigationSkeleton() {
</div>
</div>
+ {/* Analyses Section Skeleton */}
+ <div className="space-y-4">
+ <div className="flex items-center justify-between">
+ <Skeleton className="h-6 w-24" />
+ <Skeleton className="h-5 w-16" />
+ </div>
+ <div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-4">
+ {[...Array(3)].map((_, i) => (
+ <div key={i} className="p-4 rounded-xl border border-border bg-card">
+ <div className="space-y-2">
+ <div className="flex items-center gap-2">
+ <Skeleton className="h-4 w-4" />
+ <Skeleton className="h-4 w-32" />
+ <Skeleton className="h-4 w-12 ml-auto" />
+ </div>
+ <Skeleton className="h-3 w-full" />
+ <Skeleton className="h-3 w-3/4" />
+ <div className="flex items-center gap-2">
+ <Skeleton className="h-3 w-3" />
+ <Skeleton className="h-3 w-32" />
+ </div>
+ </div>
+ </div>
+ ))}
+ </div>
+ </div>
+
{/* Quick Actions Skeleton */}
<div className="space-y-4">
<Skeleton className="h-6 w-32" />
@@ -104,13 +136,43 @@ export const Route = createFileRoute('/_auth/dashboard/investigations/$investiga
function InvestigationPage() {
const { investigation } = Route.useLoaderData()
+ const { data: analyses, isLoading: isLoadingAnalyses } = useQuery<Analysis[]>({
+ queryKey: ['analyses', investigation.id],
+ queryFn: () => analysisService.getByInvestigationId(investigation.id),
+ })
const hasSketches = investigation?.sketches?.length > 0
+ const hasAnalyses = analyses && analyses.length > 0
+ const setCurrentAnalysisId = useAnalysisPanelStore(s => s.setCurrentAnalysisId)
+ const openChat = useLayoutStore(s => s.openChat)
// Get the most recent sketch update
const mostRecentSketch = investigation.sketches?.sort((a, b) =>
new Date(b.last_updated_at).getTime() - new Date(a.last_updated_at).getTime()
)[0]
+ // Get the most recent analysis update
+ const mostRecentAnalysis = analyses?.sort((a, b) =>
+ new Date(b.last_updated_at).getTime() - new Date(a.last_updated_at).getTime()
+ )[0]
+
+ const handleAnalysisClick = (analysisId: string) => {
+ setCurrentAnalysisId(analysisId)
+ openChat()
+ }
+
+ // Get the most recent activity between sketches and analyses
+ const getMostRecentActivity = () => {
+ if (!mostRecentSketch && !mostRecentAnalysis) return null
+ if (!mostRecentSketch) return mostRecentAnalysis
+ if (!mostRecentAnalysis) return mostRecentSketch
+
+ return new Date(mostRecentSketch.last_updated_at) > new Date(mostRecentAnalysis.last_updated_at)
+ ? mostRecentSketch
+ : mostRecentAnalysis
+ }
+
+ const mostRecentActivity = getMostRecentActivity()
+
return (
<div className="w-full h-full bg-background px-6 py-12 overflow-auto">
<div className="max-w-4xl mx-auto space-y-8">
@@ -137,7 +199,7 @@ function InvestigationPage() {
</div>
{/* Overview Cards */}
- <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
+ <div className="grid grid-cols-1 md:grid-cols-4 gap-4">
<Card>
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium">Total Sketches</CardTitle>
@@ -150,26 +212,47 @@ function InvestigationPage() {
</p>
</CardContent>
</Card>
+ <Card>
+ <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+ <CardTitle className="text-sm font-medium">Total Analyses</CardTitle>
+ <FileTextIcon className="h-4 w-4 text-muted-foreground" />
+ </CardHeader>
+ <CardContent>
+ {isLoadingAnalyses ? (
+ <>
+ <Skeleton className="h-8 w-12 mb-2" />
+ <Skeleton className="h-3 w-32" />
+ </>
+ ) : (
+ <>
+ <div className="text-2xl font-bold">{analyses?.length || 0}</div>
+ <p className="text-xs text-muted-foreground">
+ {hasAnalyses ? 'Active investigation' : 'No analyses yet'}
+ </p>
+ </>
+ )}
+ </CardContent>
+ </Card>
<Card>
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium">Recent Activity</CardTitle>
<Activity className="h-4 w-4 text-muted-foreground" />
</CardHeader>
<CardContent>
- {mostRecentSketch ? (
+ {mostRecentActivity ? (
<>
<div className="text-sm font-medium text-foreground line-clamp-1">
- {mostRecentSketch.title}
+ {mostRecentActivity.title}
</div>
<p className="text-xs text-muted-foreground">
- Updated {formatDistanceToNow(new Date(mostRecentSketch.last_updated_at), { addSuffix: true })}
+ Updated {formatDistanceToNow(new Date(mostRecentActivity.last_updated_at), { addSuffix: true })}
</p>
</>
) : (
<>
<div className="text-sm font-medium text-foreground">No recent activity</div>
<p className="text-xs text-muted-foreground">
- Create your first sketch to get started
+ Create your first sketch or analysis to get started
</p>
</>
)}
@@ -254,6 +337,84 @@ function InvestigationPage() {
)}
</div>
+ {/* Analyses Section */}
+ <div className="space-y-4">
+ <div className="flex items-center justify-between">
+ <h2 className="text-lg font-semibold">Analyses</h2>
+ {isLoadingAnalyses ? (
+ <Skeleton className="h-5 w-16" />
+ ) : (
+ <Badge variant="outline" className="text-xs">
+ {analyses?.length || 0} total
+ </Badge>
+ )}
+ </div>
+
+ {isLoadingAnalyses ? (
+ <div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-4">
+ {[...Array(3)].map((_, i) => (
+ <div key={i} className="p-4 rounded-xl border border-border bg-card">
+ <div className="space-y-2">
+ <div className="flex items-center gap-2">
+ <Skeleton className="h-4 w-4" />
+ <Skeleton className="h-4 w-32" />
+ <Skeleton className="h-4 w-12 ml-auto" />
+ </div>
+ <Skeleton className="h-3 w-full" />
+ <Skeleton className="h-3 w-3/4" />
+ <div className="flex items-center gap-2">
+ <Skeleton className="h-3 w-3" />
+ <Skeleton className="h-3 w-32" />
+ </div>
+ </div>
+ </div>
+ ))}
+ </div>
+ ) : !hasAnalyses ? (
+ <div className="flex flex-col items-center justify-center text-center gap-4 p-8 border border-dashed rounded-xl">
+ <FileTextIcon className="w-10 h-10 opacity-60" />
+ <div className="space-y-1 max-w-md">
+ <h3 className="text-lg font-semibold text-foreground">
+ No analyses yet
+ </h3>
+ <p className="text-sm text-muted-foreground">
+ Start by creating an analysis to document your findings and insights.
+ </p>
+ </div>
+ </div>
+ ) : (
+ <div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-4">
+ {analyses?.map((analysis) => (
+ <div
+ key={analysis.id}
+ onClick={() => handleAnalysisClick(analysis.id)}
+ className={cn(
+ 'group p-4 rounded-xl border border-border bg-card hover:bg-muted transition-colors',
+ 'flex flex-col justify-between h-full cursor-pointer'
+ )}
+ >
+ <div className="space-y-2">
+ <div className="flex items-center gap-2 text-sm font-medium text-foreground">
+ <FileTextIcon className="w-4 h-4 text-blue-500" />
+ {analysis.title || 'Untitled Analysis'}
+ <Badge variant="outline" className="text-[10px] py-0.5 px-1 ml-auto">ANALYSIS</Badge>
+ </div>
+ {analysis.description && (
+ <p className="text-xs text-muted-foreground line-clamp-2">
+ {analysis.description}
+ </p>
+ )}
+ <div className="flex items-center gap-2 text-xs text-muted-foreground">
+ <Activity className="w-3 h-3" />
+ <span>Last updated {formatDistanceToNow(new Date(analysis.last_updated_at), { addSuffix: true })}</span>
+ </div>
+ </div>
+ </div>
+ ))}
+ </div>
+ )}
+ </div>
+
{/* Quick Actions */}
<div className="space-y-4">
<h2 className="text-lg font-semibold">Quick Actions</h2>
diff --git a/flowsint-app/src/renderer/src/routes/_auth.dashboard.investigations.wall.tsx b/flowsint-app/src/renderer/src/routes/_auth.dashboard.investigations.wall.tsx
new file mode 100644
index 00000000..7659047f
--- /dev/null
+++ b/flowsint-app/src/renderer/src/routes/_auth.dashboard.investigations.wall.tsx
@@ -0,0 +1,9 @@
+"use client"
+
+import { createFileRoute } from "@tanstack/react-router"
+import InvestigationsWall from "@/components/walls/investigations-wall"
+
+export const Route = createFileRoute('/_auth/dashboard/investigations/wall')({
+ component: InvestigationsWall,
+ pendingComponent: () => <div>Loading...</div>,
+})
\ No newline at end of file
diff --git a/flowsint-app/src/renderer/src/stores/wall-store.ts b/flowsint-app/src/renderer/src/stores/wall-store.ts
new file mode 100644
index 00000000..449fc18a
--- /dev/null
+++ b/flowsint-app/src/renderer/src/stores/wall-store.ts
@@ -0,0 +1,73 @@
+import { create } from "zustand"
+import { Node, Edge, Connection } from "@xyflow/react"
+
+interface WallState {
+ nodes: Node[]
+ edges: Edge[]
+ currentNode: Node | null
+ selectedNodes: Node[]
+ onNodesChange: (changes: any) => void
+ onEdgesChange: (changes: any) => void
+ onConnect: (connection: Connection) => void
+ setCurrentNode: (node: Node | null) => void
+ setSelectedNodes: (nodes: Node[]) => void
+ saveWall: (nodes: Node[], edges: Edge[]) => Promise<void>
+ deleteWall: () => Promise<void>
+}
+
+export const useWallStore = create<WallState>((set) => ({
+ nodes: [],
+ edges: [],
+ currentNode: null,
+ selectedNodes: [],
+ onNodesChange: (changes) =>
+ set((state) => ({
+ nodes: changes.reduce((acc: Node[], change: any) => {
+ if (change.type === "remove") {
+ return acc.filter((node) => node.id !== change.id)
+ }
+ if (change.type === "add") {
+ return [...acc, change.item]
+ }
+ if (change.type === "position" || change.type === "dimensions") {
+ return acc.map((node) =>
+ node.id === change.id ? { ...node, ...change } : node
+ )
+ }
+ return acc
+ }, state.nodes),
+ })),
+ onEdgesChange: (changes) =>
+ set((state) => ({
+ edges: changes.reduce((acc: Edge[], change: any) => {
+ if (change.type === "remove") {
+ return acc.filter((edge) => edge.id !== change.id)
+ }
+ if (change.type === "add") {
+ return [...acc, change.item]
+ }
+ return acc
+ }, state.edges),
+ })),
+ onConnect: (connection) =>
+ set((state) => ({
+ edges: [
+ ...state.edges,
+ {
+ id: `e${state.edges.length + 1}`,
+ source: connection.source!,
+ target: connection.target!,
+ },
+ ],
+ })),
+ setCurrentNode: (node) => set({ currentNode: node }),
+ setSelectedNodes: (nodes) => set({ selectedNodes: nodes }),
+ saveWall: async (nodes, edges) => {
+ // TODO: Implement save functionality
+ console.log('Saving wall:', { nodes, edges })
+ },
+ deleteWall: async () => {
+ // TODO: Implement delete functionality
+ console.log('Deleting wall')
+ }
+}))
\ No newline at end of file
diff --git a/flowsint-app/yarn.lock b/flowsint-app/yarn.lock
index 52c9cc00..4875b1bc 100644
--- a/flowsint-app/yarn.lock
+++ b/flowsint-app/yarn.lock
@@ -2,6 +2,17 @@
# yarn lockfile v1
+"3d-force-graph@^1.76":
+ version "1.77.0"
+ resolved "https://registry.yarnpkg.com/3d-force-graph/-/3d-force-graph-1.77.0.tgz#10a47db13179371409ee42d82dba59ec7315058b"
+ integrity sha512-w2MlrCeMJxXwhz5gtRZ7mLU4xW5DD2U6VSEfFv8pvnvSNPYPuAIKjbJoZekfv7yFmMaWnNy/2RfRcgC5oGr2KQ==
+ dependencies:
+ accessor-fn "1"
+ kapsule "^1.16"
+ three ">=0.118 <1"
+ three-forcegraph "1"
+ three-render-objects "^1.35"
+
"7zip-bin@~5.2.0":
version "5.2.0"
resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.2.0.tgz#7a03314684dd6572b7dfa89e68ce31d60286854d"
@@ -159,6 +170,11 @@
dependencies:
"@babel/helper-plugin-utils" "^7.27.1"
+"@babel/runtime@^7.17.8":
+ version "7.27.6"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.6.tgz#ec4070a04d76bae8ddbb10770ba55714a417b7c6"
+ integrity sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==
+
"@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7":
version "7.27.4"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.4.tgz#a91ec580e6c00c67118127777c316dfd5a5a6abf"
@@ -2113,6 +2129,11 @@
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+"@tweenjs/tween.js@18 - 25":
+ version "25.0.0"
+ resolved "https://registry.yarnpkg.com/@tweenjs/tween.js/-/tween.js-25.0.0.tgz#7266baebcc3affe62a3a54318a3ea82d904cd0b9"
+ integrity sha512-XKLA6syeBUaPzx4j3qwMqzzq+V4uo72BnlbOjmuljLrRqdsd3qnzvZZoxvMHZ23ndsRS4aufU6JOZYpCbU6T1A==
+
"@tybys/wasm-util@^0.9.0":
version "0.9.0"
resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.9.0.tgz#3e75eb00604c8d6db470bf18c37b7d984a0e3355"
@@ -2508,6 +2529,11 @@
d3-selection "^3.0.0"
d3-zoom "^3.0.0"
+accessor-fn@1:
+ version "1.5.3"
+ resolved "https://registry.yarnpkg.com/accessor-fn/-/accessor-fn-1.5.3.tgz#5e2549d291d4ac022f532da9a554358dc525b0f7"
+ integrity sha512-rkAofCwe/FvYFUlMB0v0gWmhqtfAtV1IUkdPbfhTUyYniu5LrC0A0UJkTH0Jv3S8SvwkmfuAlY+mQIJATdocMA==
+
acorn-jsx@^5.3.2:
version "5.3.2"
resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
@@ -2805,6 +2831,11 @@ base64-js@^1.3.1, base64-js@^1.5.1:
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+"bezier-js@3 - 6":
+ version "6.1.4"
+ resolved "https://registry.yarnpkg.com/bezier-js/-/bezier-js-6.1.4.tgz#c7828f6c8900562b69d5040afb881bcbdad82001"
+ integrity sha512-PA0FW9ZpcHbojUCMu28z9Vg/fNkwTj5YhusSAjHHDfHDGLxJ6YUKrAN2vk1fP2MMOxVw4Oko16FMlRGVBGqLKg==
+
binary-extensions@^2.0.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
@@ -2979,6 +3010,13 @@ caniuse-lite@^1.0.30001702, caniuse-lite@^1.0.30001718:
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001720.tgz#c138cb6026d362be9d8d7b0e4bcd0183a850edfd"
integrity sha512-Ec/2yV2nNPwb4DnTANEV99ZWwm3ZWfdlfkQbWSDDt+PsXEVYwlhPH8tdMaPunYTKKmz7AnHi2oNEi1GcmKCD8g==
+canvas-color-tracker@^1.3:
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/canvas-color-tracker/-/canvas-color-tracker-1.3.2.tgz#b924cf94b33441b82692938fca5b936be971a46d"
+ integrity sha512-ryQkDX26yJ3CXzb3hxUVNlg1NKE4REc5crLBq661Nxzr8TNd236SaEf2ffYLXyI5tSABSeguHLqcVq4vf9L3Zg==
+ dependencies:
+ tinycolor2 "^1.6.0"
+
chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
@@ -3178,7 +3216,7 @@ cytoscape@^3.32.0:
resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.32.0.tgz#34bc2402c9bc7457ab7d9492745f034b7bf47644"
integrity sha512-5JHBC9n75kz5851jeklCPmZWcg3hUe6sjqJvyk3+hVqFaKcHwHgxsjeN1yLmggoUc6STbtm9/NQyabQehfjvWQ==
-"d3-array@2 - 3", "[email protected] - 3", d3-array@^3.1.6, d3-array@^3.2.0, d3-array@^3.2.4:
+"d3-array@1 - 3", "d3-array@2 - 3", "[email protected] - 3", d3-array@^3.1.6, d3-array@^3.2.0, d3-array@^3.2.4:
version "3.2.4"
resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.2.4.tgz#15fec33b237f97ac5d7c986dc77da273a8ed0bb5"
integrity sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==
@@ -3190,6 +3228,11 @@ d3-axis@^3.0.0:
resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-3.0.0.tgz#c42a4a13e8131d637b745fc2973824cfeaf93322"
integrity sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==
+d3-binarytree@1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/d3-binarytree/-/d3-binarytree-1.0.2.tgz#ed43ebc13c70fbabfdd62df17480bc5a425753cc"
+ integrity sha512-cElUNH+sHu95L04m92pG73t2MEJXKu+GeKUN1TJkFsu93E5W8E9Sc3kHEGJKgenGvj19m6upSn2EunvMgMD2Yw==
+
d3-brush@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-3.0.0.tgz#6f767c4ed8dcb79de7ede3e1c0f89e63ef64d31c"
@@ -3224,6 +3267,17 @@ d3-brush@^3.0.0:
resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-3.0.1.tgz#9658ac38a2140d59d346160f1f6c30fda0bd12f4"
integrity sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==
+"d3-force-3d@2 - 3":
+ version "3.0.6"
+ resolved "https://registry.yarnpkg.com/d3-force-3d/-/d3-force-3d-3.0.6.tgz#7ea4c26d7937b82993bd9444f570ed52f661d4aa"
+ integrity sha512-4tsKHUPLOVkyfEffZo1v6sFHvGFwAIIjt/W8IThbp08DYAsXZck+2pSHEG5W1+gQgEvFLdZkYvmJAbRM2EzMnA==
+ dependencies:
+ d3-binarytree "1"
+ d3-dispatch "1 - 3"
+ d3-octree "1"
+ d3-quadtree "1 - 3"
+ d3-timer "1 - 3"
+
d3-force@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-3.0.0.tgz#3e2ba1a61e70888fe3d9194e30d6d14eece155c4"
@@ -3245,6 +3299,11 @@ d3-force@^3.0.0:
dependencies:
d3-color "1 - 3"
+d3-octree@1:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/d3-octree/-/d3-octree-1.1.0.tgz#f07e353b76df872644e7130ab1a74c5ef2f4287e"
+ integrity sha512-F8gPlqpP+HwRPMO/8uOu5wjH110+6q4cgJvgJT6vlpy3BEaDIKlTZrgHKZSp/i1InRpVfh4puY/kvL6MxK930A==
+
d3-path@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-3.1.0.tgz#22df939032fb5a71ae8b1800d61ddb7851c42526"
@@ -3255,7 +3314,15 @@ d3-path@^3.1.0:
resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-3.0.1.tgz#6dca3e8be2b393c9a9d514dabbd80a92deef1a4f"
integrity sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==
-d3-scale@^4.0.2:
+"d3-scale-chromatic@1 - 3":
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz#34c39da298b23c20e02f1a4b239bd0f22e7f1314"
+ integrity sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==
+ dependencies:
+ d3-color "1 - 3"
+ d3-interpolate "1 - 3"
+
+"d3-scale@1 - 4", d3-scale@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-4.0.2.tgz#82b38e8e8ff7080764f8dcec77bd4be393689396"
integrity sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==
@@ -3308,7 +3375,7 @@ d3-shape@^3.1.0:
d3-interpolate "1 - 3"
d3-timer "1 - 3"
-d3-zoom@^3.0.0:
+"d3-zoom@2 - 3", d3-zoom@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-3.0.0.tgz#d13f4165c73217ffeaa54295cd6969b3e7aee8f3"
integrity sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==
@@ -3319,6 +3386,13 @@ d3-zoom@^3.0.0:
d3-selection "2 - 3"
d3-transition "2 - 3"
+data-bind-mapper@1:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/data-bind-mapper/-/data-bind-mapper-1.0.3.tgz#275e55fd170331b1146479f3c7eb4256b8239481"
+ integrity sha512-QmU3lyEnbENQPo0M1F9BMu4s6cqNNp8iJA+b/HP2sSb7pf3dxwF3+EP1eO69rwBfH9kFJ1apmzrtogAmVt2/Xw==
+ dependencies:
+ accessor-fn "1"
+
data-view-buffer@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.2.tgz#211a03ba95ecaf7798a8c7198d79536211f88570"
@@ -4147,6 +4221,15 @@ flatted@^3.2.9:
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.3.tgz#67c8fad95454a7c7abebf74bb78ee74a44023358"
integrity sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==
+float-tooltip@^1.7:
+ version "1.7.5"
+ resolved "https://registry.yarnpkg.com/float-tooltip/-/float-tooltip-1.7.5.tgz#7083bf78f0de5a97f9c2d6aa8e90d2139f34047f"
+ integrity sha512-/kXzuDnnBqyyWyhDMH7+PfP8J/oXiAavGzcRxASOMRHFuReDtofizLLJsf7nnDLAfEaMW4pVWaXrAjtnglpEkg==
+ dependencies:
+ d3-selection "2 - 3"
+ kapsule "^1.16"
+ preact "10"
+
for-each@^0.3.3, for-each@^0.3.5:
version "0.3.5"
resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.5.tgz#d650688027826920feeb0af747ee7b9421a41d47"
@@ -4154,6 +4237,27 @@ for-each@^0.3.3, for-each@^0.3.5:
dependencies:
is-callable "^1.2.7"
+force-graph@^1.49:
+ version "1.49.6"
+ resolved "https://registry.yarnpkg.com/force-graph/-/force-graph-1.49.6.tgz#f75ad859401656066181bc3cf047f2cfde92ba23"
+ integrity sha512-o3uZ22YMvRwcS4RZ5lMQE5mCsQ5w1AzR4bPlQ1cThqgAxRrzOO4mGOaeNGTAkGGQwL6f7RIBCaxPNtvkbgAykw==
+ dependencies:
+ "@tweenjs/tween.js" "18 - 25"
+ accessor-fn "1"
+ bezier-js "3 - 6"
+ canvas-color-tracker "^1.3"
+ d3-array "1 - 3"
+ d3-drag "2 - 3"
+ d3-force-3d "2 - 3"
+ d3-scale "1 - 4"
+ d3-scale-chromatic "1 - 3"
+ d3-selection "2 - 3"
+ d3-zoom "2 - 3"
+ float-tooltip "^1.7"
+ index-array-by "1"
+ kapsule "^1.16"
+ lodash-es "4"
+
foreground-child@^3.1.0:
version "3.3.1"
resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f"
@@ -4598,6 +4702,11 @@ imurmurhash@^0.1.4:
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
+index-array-by@1:
+ version "1.4.2"
+ resolved "https://registry.yarnpkg.com/index-array-by/-/index-array-by-1.4.2.tgz#d6f82e9fbff3201c4dab64ba415d4d2923242fea"
+ integrity sha512-SP23P27OUKzXWEC/TOyWlwLviofQkCSCKONnc62eItjp69yCZZPqDQtr3Pw5gJDnPeUMqExmKydNZaJO0FU9pw==
+
inflight@^1.0.4:
version "1.0.6"
resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -4887,6 +4996,11 @@ jake@^10.8.5:
filelist "^1.0.4"
minimatch "^3.1.2"
+jerrypick@^1.1.1:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/jerrypick/-/jerrypick-1.1.2.tgz#eb5016304aeb9ac9b7dea6714aa5fe85b24cb8ad"
+ integrity sha512-YKnxXEekXKzhpf7CLYA0A+oDP8V0OhICNCr5lv96FvSsDEmrb0GKM776JgQvHTMjr7DTTPEVv/1Ciaw0uEWzBA==
+
jiti@^2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.4.2.tgz#d19b7732ebb6116b06e2038da74a55366faef560"
@@ -4970,6 +5084,13 @@ jsonfile@^6.0.1:
object.assign "^4.1.4"
object.values "^1.1.6"
+kapsule@^1.16:
+ version "1.16.3"
+ resolved "https://registry.yarnpkg.com/kapsule/-/kapsule-1.16.3.tgz#5684ed89838b6658b30d0f2cc056dffc3ba68c30"
+ integrity sha512-4+5mNNf4vZDSwPhKprKwz3330iisPrb08JyMgbsdFrimBCKNHecua/WBwvVg3n7vwx0C1ARjfhwIpbrbd9n5wg==
+ dependencies:
+ lodash-es "4"
+
keyv@^4.0.0, keyv@^4.5.3:
version "4.5.4"
resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
@@ -5077,6 +5198,11 @@ locate-path@^6.0.0:
dependencies:
p-locate "^5.0.0"
+lodash-es@4:
+ version "4.17.21"
+ resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
+ integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
+
lodash.debounce@^4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -5335,6 +5461,37 @@ next-themes@^0.4.6:
resolved "https://registry.yarnpkg.com/next-themes/-/next-themes-0.4.6.tgz#8d7e92d03b8fea6582892a50a928c9b23502e8b6"
integrity sha512-pZvgD5L0IEvX5/9GWyHMf3m8BKiVQwsCMHfoFosXtXBMnaS0ZnIJ9ST4b4NqLVKDEm8QBxoNNGNaBv2JNF6XNA==
+ngraph.events@^1.0.0, ngraph.events@^1.2.1:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/ngraph.events/-/ngraph.events-1.2.2.tgz#3ceb92d676a04a4e7ce60a09fa8e17a4f0346d7f"
+ integrity sha512-JsUbEOzANskax+WSYiAPETemLWYXmixuPAlmZmhIbIj6FH/WDgEGCGnRwUQBK0GjOnVm8Ui+e5IJ+5VZ4e32eQ==
+
+ngraph.forcelayout@3:
+ version "3.3.1"
+ resolved "https://registry.yarnpkg.com/ngraph.forcelayout/-/ngraph.forcelayout-3.3.1.tgz#981e1baee5e0593c490bc27219169f9cedfa4f8b"
+ integrity sha512-MKBuEh1wujyQHFTW57y5vd/uuEOK0XfXYxm3lC7kktjJLRdt/KEKEknyOlc6tjXflqBKEuYBBcu7Ax5VY+S6aw==
+ dependencies:
+ ngraph.events "^1.0.0"
+ ngraph.merge "^1.0.0"
+ ngraph.random "^1.0.0"
+
+ngraph.graph@20:
+ version "20.0.1"
+ resolved "https://registry.yarnpkg.com/ngraph.graph/-/ngraph.graph-20.0.1.tgz#579470d1d805583239704dc913e2095540aaf371"
+ integrity sha512-VFsQ+EMkT+7lcJO1QP8Ik3w64WbHJl27Q53EO9hiFU9CRyxJ8HfcXtfWz/U8okuoYKDctbciL6pX3vG5dt1rYA==
+ dependencies:
+ ngraph.events "^1.2.1"
+
+ngraph.merge@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/ngraph.merge/-/ngraph.merge-1.0.0.tgz#d763cdfa48b1bbd4270ea246f06c9c8ff5d3477c"
+ integrity sha512-5J8YjGITUJeapsomtTALYsw7rFveYkM+lBj3QiYZ79EymQcuri65Nw3knQtFxQBU1r5iOaVRXrSwMENUPK62Vg==
+
+ngraph.random@^1.0.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/ngraph.random/-/ngraph.random-1.2.0.tgz#3864ffbb9971e920db6c5f33ce5abc3d2439e3d2"
+ integrity sha512-4EUeAGbB2HWX9njd6bP6tciN6ByJfoaAvmVL9QTaZSeXrW46eNGA9GajiXiPBbvFqxUWFkEbyo6x5qsACUuVfA==
+
node-addon-api@^1.6.3:
version "1.7.2"
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
@@ -5543,6 +5700,13 @@ plist@^3.0.4, plist@^3.0.5:
base64-js "^1.5.1"
xmlbuilder "^15.1.1"
+polished@4:
+ version "4.3.1"
+ resolved "https://registry.yarnpkg.com/polished/-/polished-4.3.1.tgz#5a00ae32715609f83d89f6f31d0f0261c6170548"
+ integrity sha512-OBatVyC/N7SCW/FaDHrSd+vn0o5cS855TOmYi4OkdWUMSJCET/xip//ch8xGUvtr3i44X9LVyWwQlRMTN3pwSA==
+ dependencies:
+ "@babel/runtime" "^7.17.8"
+
possible-typed-array-names@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz#93e3582bc0e5426586d9d07b79ee40fc841de4ae"
@@ -5562,6 +5726,11 @@ postcss@^8.4.35, postcss@^8.4.43:
picocolors "^1.1.1"
source-map-js "^1.2.1"
+preact@10:
+ version "10.26.8"
+ resolved "https://registry.yarnpkg.com/preact/-/preact-10.26.8.tgz#aa0cf2eae578e42eb58ae025e0bf85c4cfc91cc6"
+ integrity sha512-1nMfdFjucm5hKvq0IClqZwK4FJkGXhRrQstOQ3P4vp8HxKrJEMFcY6RdBRVTdfQS/UlnX6gfbPuTvaqx/bDoeQ==
+
prelude-ls@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -5592,7 +5761,7 @@ promise-retry@^2.0.1:
err-code "^2.0.2"
retry "^0.12.0"
-prop-types@^15.6.2, prop-types@^15.8.1:
+prop-types@15, prop-types@^15.6.2, prop-types@^15.8.1:
version "15.8.1"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -5803,6 +5972,24 @@ react-dom@^18.3.1:
loose-envify "^1.1.0"
scheduler "^0.23.2"
+react-force-graph-2d@^1.27.1:
+ version "1.27.1"
+ resolved "https://registry.yarnpkg.com/react-force-graph-2d/-/react-force-graph-2d-1.27.1.tgz#3c8be8c3a3295f8f10c1489fe1369aa52254d6dd"
+ integrity sha512-/b1k+HbW9QCzGILJibyzN2PVZdDWTFuEylqcJGkUTBs0uLcK0h2LgOUuVU+GpRGpuXmj9sBAt43zz+PTETFHGg==
+ dependencies:
+ force-graph "^1.49"
+ prop-types "15"
+ react-kapsule "^2.5"
+
+react-force-graph-3d@^1.26.1:
+ version "1.26.1"
+ resolved "https://registry.yarnpkg.com/react-force-graph-3d/-/react-force-graph-3d-1.26.1.tgz#b138adc13412da6d0c89ea4e85a59ef85ae5ed49"
+ integrity sha512-Ff520+ngcja441fAyop+oiPPEcXaRhzvTqA+4ve6Kr341g3TIg0+s/i7pafCtYhgpPXcbjiDet0wskzGaNhIlQ==
+ dependencies:
+ "3d-force-graph" "^1.76"
+ prop-types "15"
+ react-kapsule "^2.5"
+
react-hook-form@^7.56.4:
version "7.56.4"
resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.56.4.tgz#273f55d43fb24ace3e2b9409d0d5326306d7905e"
@@ -5823,6 +6010,13 @@ react-is@^18.3.1:
resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
+react-kapsule@^2.5:
+ version "2.5.7"
+ resolved "https://registry.yarnpkg.com/react-kapsule/-/react-kapsule-2.5.7.tgz#dcd957ae8e897ff48055fc8ff48ed04ebe3c5bd2"
+ integrity sha512-kifAF4ZPD77qZKc4CKLmozq6GY1sBzPEJTIJb0wWFK6HsePJatK3jXplZn2eeAt3x67CDozgi7/rO8fNQ/AL7A==
+ dependencies:
+ jerrypick "^1.1.1"
+
react-medium-image-zoom@^5.2.14:
version "5.2.14"
resolved "https://registry.yarnpkg.com/react-medium-image-zoom/-/react-medium-image-zoom-5.2.14.tgz#87032d079fce4a21a17770d6709f739872580906"
@@ -6547,6 +6741,43 @@ text-table@^0.2.0:
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
+three-forcegraph@1:
+ version "1.42.13"
+ resolved "https://registry.yarnpkg.com/three-forcegraph/-/three-forcegraph-1.42.13.tgz#4827338dece4b027532fe2f006d802b9271cf725"
+ integrity sha512-BoG5fB3nlAFeIyiLuFquvWIjt8DA2gdPWlqW/8V8xQcEO7otMmeN2/WWHCP7cWzKEImULxpJ6bNLmmt7TTJaiw==
+ dependencies:
+ accessor-fn "1"
+ d3-array "1 - 3"
+ d3-force-3d "2 - 3"
+ d3-scale "1 - 4"
+ d3-scale-chromatic "1 - 3"
+ data-bind-mapper "1"
+ kapsule "^1.16"
+ ngraph.forcelayout "3"
+ ngraph.graph "20"
+ tinycolor2 "1"
+
+three-render-objects@^1.35:
+ version "1.40.2"
+ resolved "https://registry.yarnpkg.com/three-render-objects/-/three-render-objects-1.40.2.tgz#9cf449d01fe05c6d39edc3aed2c0f5610b5c240f"
+ integrity sha512-4LAW9HJS1XcFN4+ujAWrcGAa3UalVTrtXzeWIR9hgJnYSCDBFgGzok9cDP9sXMlw5SjtDWkH6VOnGont+RzfSw==
+ dependencies:
+ "@tweenjs/tween.js" "18 - 25"
+ accessor-fn "1"
+ float-tooltip "^1.7"
+ kapsule "^1.16"
+ polished "4"
+
+three-spritetext@^1.9.6:
+ version "1.9.6"
+ resolved "https://registry.yarnpkg.com/three-spritetext/-/three-spritetext-1.9.6.tgz#f6e89dfbc158ad2f04392fc012ef390a7d7f7f99"
+ integrity sha512-+O5hGi6u4nWLefY8+Hlufd0aysWZhS2Ex61LCQVSixbYbykdPUOYYA+V+4xG4mKNDm1AsC0yHINRQS5NQb6mSg==
+
+"three@>=0.118 <1":
+ version "0.177.0"
+ resolved "https://registry.yarnpkg.com/three/-/three-0.177.0.tgz#e51f2eb2b921fbab535bdfa81c403f9993b9dd83"
+ integrity sha512-EiXv5/qWAaGI+Vz2A+JfavwYCMdGjxVsrn3oBwllUoqYeaBO75J63ZfyaQKoiLrqNHoTlUc6PFgMXnS0kI45zg==
+
tiny-invariant@^1.3.1, tiny-invariant@^1.3.3:
version "1.3.3"
resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
@@ -6562,6 +6793,11 @@ tiny-warning@^1.0.3:
resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
+tinycolor2@1, tinycolor2@^1.6.0:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.6.0.tgz#f98007460169b0263b97072c5ae92484ce02d09e"
+ integrity sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==
+
tippy.js@^6.3.7:
version "6.3.7"
resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.7.tgz#8ccfb651d642010ed9a32ff29b0e9e19c5b8c61c"