Including layout in repositories #1010

rappen · rappen · commit e6f98142ccf4 · 2024-09-01T17:02:23.000+02:00
diff --git a/FetchXmlBuilder/FetchXmlBuilder.cs b/FetchXmlBuilder/FetchXmlBuilder.cs
@@ -776,7 +776,7 @@ private void tsmiRepoOpen_Click(object sender, EventArgs e)
         {
             if (sender is ToolStripMenuItem menu && menu.Tag is QueryDefinition query)
             {
-                dockControlBuilder.Init(query.Fetch, null, false, $"open repo {query.Name}", false);
+                dockControlBuilder.Init(query.Fetch, query.Layout, false, $"open repo {query.Name}", false);
                 tsbRepo.Tag = query;
                 dockControlBuilder.SetFetchName($"Repo: {query.Name}");
             }
@@ -789,6 +789,7 @@ private void tsmiRepoSave_Click(object sender, EventArgs e)
                 return;
             }
             query.Fetch = dockControlBuilder.GetFetchString(true, false);
+            query.Layout = dockControlBuilder.LayoutXML?.ToXML();
             SaveRepository();
             MessageBox.Show($"Query {query.Name} updated in repository", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
@@ -813,7 +814,8 @@ private void tsmiRepoSaveAs_Click(object sender, EventArgs e)
                 repository.Queries.Remove(repository.Queries.FirstOrDefault(q => q.Name == queryname));
             }
             var fetch = dockControlBuilder.GetFetchString(true, false);
-            var query = new QueryDefinition { Name = queryname, Fetch = fetch };
+            var layout = dockControlBuilder.LayoutXML?.ToXML();
+            var query = new QueryDefinition { Name = queryname, Fetch = fetch, Layout = layout };
             repository.Queries.Add(query);
             repository.SortQueries();
             SaveRepository();
@@ -830,7 +832,7 @@ private void tsmiRepoExport_Click(object sender, EventArgs e)
             };
             if (sfd.ShowDialog() == DialogResult.OK)
             {
-                McTools.Xrm.Connection.XmlSerializerHelper.SerializeToFile(repository, sfd.FileName);
+                XmlSerializerHelper.SerializeToFile(repository, sfd.FileName);
                 MessageBox.Show($"The entire repository has been saved to file\n{sfd.FileName}", "Export repository", MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
         }
@@ -849,7 +851,7 @@ private void tsmiRepoImport_Click(object sender, EventArgs e)
                 {
                     var document = new XmlDocument();
                     document.Load(ofd.FileName);
-                    var repo = (QueryRepository)McTools.Xrm.Connection.XmlSerializerHelper.Deserialize(document.OuterXml, typeof(QueryRepository));
+                    var repo = (QueryRepository)XmlSerializerHelper.Deserialize(document.OuterXml, typeof(QueryRepository));
                     var reponame = Path.ChangeExtension(Path.GetFileName(ofd.FileName), "").Trim('.');
                     if (MessageBox.Show($"Confirm importing {repo.Queries.Count} queries into repository folder \"{reponame}\".", "Confirm", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) != DialogResult.OK)
                     {
diff --git a/FetchXmlBuilder/Settings/FXBSettings.cs b/FetchXmlBuilder/Settings/FXBSettings.cs
@@ -174,21 +174,16 @@ public class QueryRepository
     {
         public List<QueryDefinition> Queries { get; set; } = new List<QueryDefinition>();
 
-        public void SortQueries()
-        {
-            Queries = Queries.OrderBy(q => q.Name).ToList();
-        }
+        public void SortQueries() => Queries = Queries.OrderBy(q => q.Name).ToList();
     }
 
     public class QueryDefinition
     {
         public string Name { get; set; }
         public string Fetch { get; set; }
+        public string Layout { get; set; }
 
-        public override string ToString()
-        {
-            return Name;
-        }
+        public override string ToString() => Name;
     }
 
     public class XmlColors

Original file line number	Diff line number	Diff line change
`@@ -776,7 +776,7 @@ private void tsmiRepoOpen_Click(object sender, EventArgs e)`
`776`	`776`	`{`
`777`	`777`	`if (sender is ToolStripMenuItem menu && menu.Tag is QueryDefinition query)`
`778`	`778`	`{`
`779`		`- dockControlBuilder.Init(query.Fetch, null, false, $"open repo {query.Name}", false);`
	`779`	`+ dockControlBuilder.Init(query.Fetch, query.Layout, false, $"open repo {query.Name}", false);`
`780`	`780`	`tsbRepo.Tag = query;`
`781`	`781`	`dockControlBuilder.SetFetchName($"Repo: {query.Name}");`
`782`	`782`	`}`
`@@ -789,6 +789,7 @@ private void tsmiRepoSave_Click(object sender, EventArgs e)`
`789`	`789`	`return;`
`790`	`790`	`}`
`791`	`791`	`query.Fetch = dockControlBuilder.GetFetchString(true, false);`
	`792`	`+ query.Layout = dockControlBuilder.LayoutXML?.ToXML();`
`792`	`793`	`SaveRepository();`
`793`	`794`	`MessageBox.Show($"Query {query.Name} updated in repository", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information);`
`794`	`795`	`}`
`@@ -813,7 +814,8 @@ private void tsmiRepoSaveAs_Click(object sender, EventArgs e)`
`813`	`814`	`repository.Queries.Remove(repository.Queries.FirstOrDefault(q => q.Name == queryname));`
`814`	`815`	`}`
`815`	`816`	`var fetch = dockControlBuilder.GetFetchString(true, false);`
`816`		`- var query = new QueryDefinition { Name = queryname, Fetch = fetch };`
	`817`	`+ var layout = dockControlBuilder.LayoutXML?.ToXML();`
	`818`	`+ var query = new QueryDefinition { Name = queryname, Fetch = fetch, Layout = layout };`
`817`	`819`	`repository.Queries.Add(query);`
`818`	`820`	`repository.SortQueries();`
`819`	`821`	`SaveRepository();`
`@@ -830,7 +832,7 @@ private void tsmiRepoExport_Click(object sender, EventArgs e)`
`830`	`832`	`};`
`831`	`833`	`if (sfd.ShowDialog() == DialogResult.OK)`
`832`	`834`	`{`
`833`		`- McTools.Xrm.Connection.XmlSerializerHelper.SerializeToFile(repository, sfd.FileName);`
	`835`	`+ XmlSerializerHelper.SerializeToFile(repository, sfd.FileName);`
`834`	`836`	`MessageBox.Show($"The entire repository has been saved to file\n{sfd.FileName}", "Export repository", MessageBoxButtons.OK, MessageBoxIcon.Information);`
`835`	`837`	`}`
`836`	`838`	`}`
`@@ -849,7 +851,7 @@ private void tsmiRepoImport_Click(object sender, EventArgs e)`
`849`	`851`	`{`
`850`	`852`	`var document = new XmlDocument();`
`851`	`853`	`document.Load(ofd.FileName);`
`852`		`- var repo = (QueryRepository)McTools.Xrm.Connection.XmlSerializerHelper.Deserialize(document.OuterXml, typeof(QueryRepository));`
	`854`	`+ var repo = (QueryRepository)XmlSerializerHelper.Deserialize(document.OuterXml, typeof(QueryRepository));`
`853`	`855`	`var reponame = Path.ChangeExtension(Path.GetFileName(ofd.FileName), "").Trim('.');`
`854`	`856`	`if (MessageBox.Show($"Confirm importing {repo.Queries.Count} queries into repository folder \"{reponame}\".", "Confirm", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) != DialogResult.OK)`
`855`	`857`	`{`
Original file line number	Diff line number	Diff line change
`@@ -174,21 +174,16 @@ public class QueryRepository`
`174`	`174`	`{`
`175`	`175`	`public List<QueryDefinition> Queries { get; set; } = new List<QueryDefinition>();`
`176`	`176`
`177`		`- public void SortQueries()`
`178`		`- {`
`179`		`- Queries = Queries.OrderBy(q => q.Name).ToList();`
`180`		`- }`
	`177`	`+ public void SortQueries() => Queries = Queries.OrderBy(q => q.Name).ToList();`
`181`	`178`	`}`
`182`	`179`
`183`	`180`	`public class QueryDefinition`
`184`	`181`	`{`
`185`	`182`	`public string Name { get; set; }`
`186`	`183`	`public string Fetch { get; set; }`
	`184`	`+ public string Layout { get; set; }`
`187`	`185`
`188`		`- public override string ToString()`
`189`		`- {`
`190`		`- return Name;`
`191`		`- }`
	`186`	`+ public override string ToString() => Name;`
`192`	`187`	`}`
`193`	`188`
`194`	`189`	`public class XmlColors`