Merge pull request #251 from TaskarCenterAtUW/undo-revert-action

iAKM · web-flow · commit 68120bc03fa5 · 2025-05-09T04:30:36.000+05:30
call undo in onRevert
diff --git a/GoInfoGame/GoInfoGame/UI/Map/MapView.swift b/GoInfoGame/GoInfoGame/UI/Map/MapView.swift
@@ -147,7 +147,7 @@ struct MapView: View {
                             onRemovePreview: {
                             },
                             onRevert: { id, type in
-                              
+                                MapUndoManager.shared.undo(for: Int64(id), type: type)
                             }
                         )
                         .padding(.bottom, 24)
diff --git a/GoInfoGame/GoInfoGame/UI/Utils/UndoButton.swift b/GoInfoGame/GoInfoGame/UI/Utils/UndoButton.swift
@@ -23,7 +23,6 @@ struct UndoButton: View {
             if showSidebar {
                 UndoSidebarView(
                     onUndo: { id, type in
-                        MapUndoManager.shared.undo(for: Int64(id), type: type)
                         onRevert(id, type)
                         undoItems = MapUndoManager.shared.getUndoItems()
                         withAnimation { showSidebar = false }
@@ -90,8 +89,7 @@ struct UndoButton: View {
                         Spacer()
 
                         Button("Revert") {
-                            MapUndoManager.shared.undo(for: Int64(item.elementId), type: item.type)
-                            onRevert(item.elementId, item.type) 
+                            onRevert(item.elementId, item.type)
                             showUndoPopup = false
                             showSidebar = false
                         }
diff --git a/GoInfoGame/GoInfoGame/quests/QuestUndoManager.swift b/GoInfoGame/GoInfoGame/quests/QuestUndoManager.swift
@@ -66,10 +66,8 @@ class MapUndoManager {
 
             do {
                 try realm.write {
-                    // Step 1: Clear all tags in edited
                     edited.tags.removeAll()
 
-                    // Step 2: Copy original tags except gig tags
                     for entry in original.tags {
                         let key = entry.key
                         let value = entry.value
@@ -78,7 +76,6 @@ class MapUndoManager {
                         }
                     }
 
-                    // Step 3: Restore location
                     edited.point = original.point
                 }
             } catch {

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ struct MapView: View {`
`147`	`147`	`onRemovePreview: {`
`148`	`148`	`},`
`149`	`149`	`onRevert: { id, type in`
`150`		`-`
	`150`	`+ MapUndoManager.shared.undo(for: Int64(id), type: type)`
`151`	`151`	`}`
`152`	`152`	`)`
`153`	`153`	`.padding(.bottom, 24)`
Original file line number	Diff line number	Diff line change
`@@ -66,10 +66,8 @@ class MapUndoManager {`
`66`	`66`
`67`	`67`	`do {`
`68`	`68`	`try realm.write {`
`69`		`- // Step 1: Clear all tags in edited`
`70`	`69`	`edited.tags.removeAll()`
`71`	`70`
`72`		`- // Step 2: Copy original tags except gig tags`
`73`	`71`	`for entry in original.tags {`
`74`	`72`	`let key = entry.key`
`75`	`73`	`let value = entry.value`
`@@ -78,7 +76,6 @@ class MapUndoManager {`
`78`	`76`	`}`
`79`	`77`	`}`
`80`	`78`
`81`		`- // Step 3: Restore location`
`82`	`79`	`edited.point = original.point`
`83`	`80`	`}`
`84`	`81`	`} catch {`