reworked map managment

Author: mikebarkmin

platforms/web/src/Teach.tsx

@@ -84,19 +84,21 @@ function Teach() {
         }
 
         const roadmapData = await response.json();
-        const storageId = roadmapData.settings?.id || jsonId;
+        const settingsId = roadmapData.settings?.id || jsonId;
 
-        // Check if map already exists
-        const existingMap = await db.getTeacherMap(storageId);
+        // Check if a map with the same settings.id already exists
+        const existingMap = await db.findTeacherMapBySettingsId(settingsId);
         if (existingMap) {
           // Show conflict dialog
-          setConflictData({ storageId, roadmapData, jsonId, existingMap });
+          setConflictData({ storageId: existingMap.id, roadmapData, jsonId, existingMap });
           setShowConflictDialog(true);
           setLoading(false);
           return;
         }
 
-        await db.addTeacherMap(storageId, roadmapData, jsonId);
+        // Generate a unique database ID
+        const dbId = `map-${Date.now()}`;
+        await db.addTeacherMap(dbId, roadmapData, jsonId);
         const maps = await db.getAllTeacherMaps();
         setAllMaps(maps);
         setNewMapUrl('');
@@ -123,20 +125,20 @@ function Teach() {
         const content = e.target?.result as string;
         const json = JSON.parse(content);
 
-        // Generate a unique ID for this uploaded map
-        const uploadId = `upload-${Date.now()}`;
-        const storageId = json.settings?.id || uploadId;
+        const settingsId = json.settings?.id;
 
-        // Check if map already exists
-        const existingMap = await db.getTeacherMap(storageId);
+        // Check if a map with the same settings.id already exists
+        const existingMap = settingsId ? await db.findTeacherMapBySettingsId(settingsId) : undefined;
         if (existingMap) {
           // Show conflict dialog
-          setConflictData({ storageId, roadmapData: json, existingMap });
+          setConflictData({ storageId: existingMap.id, roadmapData: json, existingMap });
           setShowConflictDialog(true);
           return;
         }
 
-        await db.addTeacherMap(storageId, json, undefined);
+        // Generate a unique database ID
+        const dbId = `map-${Date.now()}`;
+        await db.addTeacherMap(dbId, json, undefined);
         const maps = await db.getAllTeacherMaps();
         setAllMaps(maps);
         setShowAddDialog(false);
@@ -158,6 +160,7 @@ function Teach() {
   const handleConflictOverwrite = async () => {
     if (!conflictData) return;
 
+    // Overwrite the existing map (keep same database ID)
     await db.addTeacherMap(conflictData.storageId, conflictData.roadmapData, conflictData.jsonId);
     const maps = await db.getAllTeacherMaps();
     setAllMaps(maps);
@@ -170,19 +173,23 @@ function Teach() {
   const handleConflictNewId = async () => {
     if (!conflictData) return;
 
-    // Generate a new unique ID
-    const newId = `${conflictData.storageId}-${Date.now()}`;
+    // Generate a new unique database ID
+    const newDbId = `map-${Date.now()}`;
+    
+    // Generate a new settings.id to avoid conflicts
+    const currentSettingsId = conflictData.roadmapData.settings?.id || 'map';
+    const newSettingsId = `${currentSettingsId}-${Date.now()}`;
 
     // Update the ID in the roadmap settings
     const updatedRoadmapData = {
       ...conflictData.roadmapData,
       settings: {
         ...conflictData.roadmapData.settings,
-        id: newId,
+        id: newSettingsId,
       },
     };
 
-    await db.addTeacherMap(newId, updatedRoadmapData, conflictData.jsonId);
+    await db.addTeacherMap(newDbId, updatedRoadmapData, conflictData.jsonId);
     const maps = await db.getAllTeacherMaps();
     setAllMaps(maps);
     setNewMapUrl('');

platforms/web/src/TeacherEditor.tsx

@@ -77,25 +77,35 @@ function TeacherEditorInner() {
     saveTimeoutRef.current = window.setTimeout(async () => {
       const roadmapData = getRoadmapData();
 
-      // Generate a storage ID for this map
-      let storageId: string;
+      // Determine the database ID for this map
+      let dbId: string;
       if (mapId) {
-        // Use mapId if available (editing existing map)
-        storageId = roadmapData.settings?.id || mapId;
+        // Editing existing map - use the database ID from URL
+        dbId = mapId;
       } else {
-        // For new maps without mapId, use or create a unique ID
-        storageId = roadmapData.settings?.id || `local-${Date.now()}`;
-        // Update settings with the generated ID if it doesn't have one
-        if (!roadmapData.settings?.id) {
-          roadmapData.settings = { ...roadmapData.settings, id: storageId };
+        // New map - check if we already created a database entry
+        // Look for existing map with matching settings.id
+        const settingsId = roadmapData.settings?.id;
+        const existingMap = settingsId ? await db.findTeacherMapBySettingsId(settingsId) : undefined;
+        
+        if (existingMap) {
+          // Already saved - update existing
+          dbId = existingMap.id;
+        } else {
+          // First save - generate new database ID
+          dbId = `map-${Date.now()}`;
+          // Ensure settings.id is set
+          if (!roadmapData.settings?.id) {
+            roadmapData.settings = { ...roadmapData.settings, id: `map-${Date.now()}` };
+          }
         }
       }
 
       try {
-        // Check if this map exists in teacher's collection
-        const existingMap = await db.getTeacherMap(storageId);
+        // Get existing map to preserve jsonId
+        const existingMap = await db.getTeacherMap(dbId);
         // Save or update the map
-        await db.addTeacherMap(storageId, roadmapData, existingMap?.jsonId || undefined);
+        await db.addTeacherMap(dbId, roadmapData, existingMap?.jsonId || undefined);
       } catch (err) {
         console.error('Failed to auto-save map:', err);
       }
@@ -121,13 +131,28 @@ function TeacherEditorInner() {
         lastSavedRef.current = jsonId;
 
         // Get current roadmap data and save to teacher collection
-        const roadmapData = getRoadmapData();
-        const storageId = roadmapData.settings?.id || jsonId;
+        const saveSharedMap = async () => {
+          const roadmapData = getRoadmapData();
+          const settingsId = roadmapData.settings?.id;
+          
+          // Find existing map by database ID or settings ID
+          let dbId: string;
+          if (mapId) {
+            // Editing existing map - use the database ID from URL
+            dbId = mapId;
+          } else {
+            // New map - look for existing by settings.id
+            const existingMap = settingsId ? await db.findTeacherMapBySettingsId(settingsId) : undefined;
+            dbId = existingMap?.id || `map-${Date.now()}`;
+          }
+          
+          await db.addTeacherMap(dbId, roadmapData, jsonId);
+        };
 
-        db.addTeacherMap(storageId, roadmapData, jsonId);
+        saveSharedMap();
       }
     }
-  }, [shareLink, shareDialogOpen, getRoadmapData]);
+  }, [shareLink, shareDialogOpen, getRoadmapData, mapId]);
 
   return null;
 }

platforms/web/src/db.ts

@@ -122,6 +122,12 @@ export async function getAllTeacherMaps(): Promise<TeacherMapEntry[]> {
   return allMaps.reverse(); // Most recent first
 }
 
+export async function findTeacherMapBySettingsId(settingsId: string): Promise<TeacherMapEntry | undefined> {
+  const db = await getDB();
+  const allMaps = await db.getAll('teacherMaps');
+  return allMaps.find(map => map.roadmapData.settings?.id === settingsId);
+}
+
 export async function removeTeacherMap(id: string) {
   const db = await getDB();
   await db.delete('teacherMaps', id);