Fix issue with groups not being saved internally properly

Author: TeodorVecerdi

CodeGraph_Unity/Assets/CodeGraph/CodeGraph/Editor/CodeGraphView.cs

@@ -142,7 +142,7 @@ public void GroupSelection() {
 
             editorWindow.InvalidateSaveButton();
             var group = new Group {title = "New Group"};
-            var groupData = new GroupData("New Group", new Vector2(10f, 10f), group);
+            var groupData = new GroupData("New Group", group);
             editorWindow.GraphObject.CodeGraphData.AddGroup(groupData);
             foreach (var node in validSelection) {
                 if (node.GetContainingScope() is Group previousGroup) {
@@ -164,6 +164,7 @@ public void UngroupSelection() {
                 if (!(selectable is Node node) || !(node.GetContainingScope() is Group group))
                     continue;
 
+                ((IGroupItem) node).GroupGuid = Guid.Empty;
                 group.RemoveElement(node);
                 if (!group.containedElements.Any())
                     RemoveGroup(group);

CodeGraph_Unity/Assets/CodeGraph/CodeGraph/Editor/GroupData.cs

@@ -27,18 +27,10 @@ public string Title {
             set => title = value;
         }
 
-        [SerializeField]
-        private Vector2 position;
-
-        public Vector2 Position {
-            get => position;
-            set => position = value;
-        }
 
-        public GroupData(string title, Vector2 position, Group groupReference) {
+        public GroupData(string title, Group groupReference) {
             guid = Guid.NewGuid();
             this.title = title;
-            this.position = position;
             GroupReference = groupReference;
         }
 

CodeGraph_Unity/Assets/CodeGraph/CodeGraph/Editor/SaveUtility.cs

@@ -23,8 +23,11 @@ public CodeGraphObject Save(string fileName, bool shouldRefreshAssets = true) {
             graphObject.CodeGraphData.Edges.AddRange(SerializationHelper.SerializeEdges(connectedEdges));
             graphObject.CodeGraphData.Nodes.AddRange(SerializationHelper.SerializeNodes(Nodes));
             graphObject.CodeGraphData.LastEditedAt = DateTime.Now.ToString(CultureInfo.InvariantCulture);
-            graphObject.CodeGraphData.Groups = CodeGraph.Instance.GraphObject.CodeGraphData.Groups;
+            graphObject.CodeGraphData.Groups = new List<GroupData>(CodeGraph.Instance.GraphObject.CodeGraphData.Groups);
             graphObject.CodeGraphData.Groups.ForEach(group => { group.Title = group.GroupReference.title; });
+            foreach (var groupItem in CodeGraph.Instance.GraphObject.CodeGraphData.GroupItems) {
+                graphObject.CodeGraphData.GroupItems.Add(groupItem.Key, CodeGraph.Instance.GraphObject.CodeGraphData.GroupItems[groupItem.Key]);
+            }
             graphObject.CodeGraphData.GraphName = CodeGraph.Instance.GraphObject.CodeGraphData.GraphName;
             graphObject.CodeGraphData.SchemaVersion = CodeGraph.Instance.GraphObject.CodeGraphData.SchemaVersion;
             graphObject.CodeGraphData.IsMonoBehaviour = CodeGraph.Instance.GraphObject.CodeGraphData.IsMonoBehaviour;
@@ -39,6 +42,7 @@ public void LoadGraph(CodeGraphObject graphObject) {
             ClearGraph();
             CreateGroups();
             GenerateNodes();
+            ClearEmptyGroups();
             ConnectNodes();
             PostInitNodes();
         }
@@ -84,6 +88,18 @@ private void GenerateNodes() {
             });
         }
 
+        private void ClearEmptyGroups() {
+            foreach (var group in graphView.GroupDictionary.ToDictionary(pair => pair.Key, pair => pair.Value)) {
+                if (graphObject.CodeGraphData.GroupItems[group.Value.Guid].Count == 0) {
+                    graphView.RemoveElement(group.Key);
+                    graphObject.CodeGraphData.Groups.Remove(group.Value);
+                    graphObject.CodeGraphData.GroupItems.Remove(group.Value.Guid);
+                    graphView.GroupGuidDictionary.Remove(group.Value.Guid);
+                    graphView.GroupDictionary.Remove(group.Key);
+                }
+            }
+        }
+
         private void ConnectNodes() {
             SerializationHelper.DeserializeAndLinkEdges(graphObject.CodeGraphData.Edges, Nodes).ForEach(graphView.Add);
         }

CodeGraph_Unity/Assets/CodeGraph/CodeGraph/Runtime/CodeGraphData.cs

@@ -27,7 +27,6 @@ public void AddGroup(GroupData groupData) {
         public void SetGroup(IGroupItem node, GroupData group) {
             var groupGuid = group?.Guid ?? Guid.Empty;
             if (node.GroupGuid != Guid.Empty) {
-                Debug.Log(groupGuid);
                 var oldGroupNodes = GroupItems[groupGuid];
                 oldGroupNodes.Remove(node);
             }