Simplify deserialization logic

Author: Snakybo

CHANGELOG.md

@@ -20,6 +20,7 @@ The format of this changelog is based on [Keep a Changelog](https://keepachangel
 * Make key options respect macro condtions where able [#251]
 * Add option to automatically fall back to action bar abilities when no other macro conditions are met [#257]
 * Automatically populate macro when converting from a spell, item, or cancelaura binding [#264] (by [Gateswong])
+* Keep the binding configuration window open when importing a profile [#252] (by [m33shoq])
 
 ### Fixed
 
@@ -29,6 +30,7 @@ The format of this changelog is based on [Keep a Changelog](https://keepachangel
 * Fix bindings sometimes not updating after changing their group [#263]
 * Fix automatic sorting of macros using the form, bonusbar, or bar macro options
 * Fix deleted bindings not being deactivated immediately
+* Fix a potential data conflict issue when importing a profile [#252] (by [m33shoq])
 
 ## [1.16.11] - 2024-11-07
 
@@ -1739,6 +1741,7 @@ The format of this changelog is based on [Keep a Changelog](https://keepachangel
 [#264]: https://github.com/Snakybo/Clicked/pull/264
 [#263]: https://github.com/Snakybo/Clicked/issues/263
 [#257]: https://github.com/Snakybo/Clicked/issues/257
+[#252]: https://github.com/Snakybo/Clicked/pull/252
 [#251]: https://github.com/Snakybo/Clicked/issues/251
 [#248]: https://github.com/Snakybo/Clicked/issues/248
 [#247]: https://github.com/Snakybo/Clicked/issues/247

Clicked/BindingConfig/Pages/ImportString.lua

@@ -217,20 +217,22 @@ function Addon.BindingConfig.ImportStringPage:RedrawToReview()
 				end
 			end
 
+			local type = review.type
 			Clicked:Import(review)
-			if review.type == "group" then
+
+			if type == "group" then
 				Addon.BindingConfig.Window:Select(review.group.uid)
-			elseif review.type == "binding" then
+			elseif type == "binding" then
 				Addon.BindingConfig.Window:Select(review.binding.uid)
-			else
-				self.controller:PopPage(self)
-				if not Addon.BindingConfig.Window:IsOpen() then
-					Addon.BindingConfig.Window:Open()
-				end
-				if type(review.groups) == "table" and review.groups[1] then
+			elseif type == "profile" then
+				if #review.groups > 0 then
+					Addon.BindingConfig.Window:SetPage(Addon.BindingConfig.Window.PAGE_GROUP)
 					Addon.BindingConfig.Window:Select(review.groups[1].uid)
-				elseif type(review.bindings) == "table" and review.binding[1] then
+				elseif #review.bindings > 0 then
+					Addon.BindingConfig.Window:SetPage(Addon.BindingConfig.Window.PAGE_BINDING)
 					Addon.BindingConfig.Window:Select(review.bindings[1].uid)
+				else
+					Addon.BindingConfig.Window:SetPage(Addon.BindingConfig.Window.PAGE_NEW)
 				end
 			end
 		end)

Clicked/Core/Serializer.lua

@@ -62,6 +62,7 @@ local function RegisterBinding(data)
 	if data.type ~= "binding" then
 		error("bad argument #1, expected binding but got " .. data.type)
 	end
+
 	data.binding.uid = nil
 	Addon:RegisterDataObject(data.binding, Clicked.DataObjectScope.PROFILE)
 	Addon:ReloadBinding(data.binding, true)
@@ -76,32 +77,24 @@ local function RegisterProfile(data)
 	data.lightweight = nil
 	data.type = nil
 
-	for key in pairs(data) do
-		Addon.db.profile[key] = data[key]
-	end
-
-	-- ensure UIDs are unique
-	if data.groups then
-		for _, group in pairs(data.groups) do
-			local oldUID = group.uid
-			group.uid = Addon:GetNextUid()
+	--- @type table<integer, integer>
+	local groupUidMap = {}
 
-			if oldUID then
-				for _, binding in pairs(data.bindings) do
-					if binding.parent == oldUID then
-						binding.parent = group.uid
-					end
-				end
-			end
-		end
+	-- Assign new UIDs to all imported groups and bindings
+	for _, group in ipairs(data.groups) do
+		local uid = Addon:GetNextUid()
+		groupUidMap[group.uid] = uid
+		group.uid = uid
 	end
 
-	if data.bindings then
-		for _, binding in pairs(data.bindings) do
-			binding.uid = Addon:GetNextUid()
-		end
+	for _, binding in ipairs(data.bindings) do
+		binding.uid = Addon:GetNextUid()
+		binding.parent = groupUidMap[binding.parent]
 	end
 
+	for key in pairs(data) do
+		Addon.db.profile[key] = data[key]
+	end
 
 	Clicked:ReloadDatabase()
 end
@@ -174,8 +167,6 @@ function Clicked:SerializeProfile(profile, printable, full)
 			version = profile.version,
 			bindings = CopyTable(profile.bindings),
 			groups = CopyTable(profile.groups),
-			nextGroupId = profile.nextGroupId,
-			nextBindingId = profile.nextBindingId,
 			type = "profile",
 			lightweight = true
 		}

Clicked/Definitions.lua

@@ -29,8 +29,6 @@
 --- @field public groups Group[]
 --- @field public bindings Binding[]
 --- @field public blacklist table<string,boolean>
---- @field public nextGroupId integer
---- @field public nextBindingId integer
 
 --- @class Profile.Options
 --- @field public onKeyDown boolean