Small fixes for FetchXML code type

rappen · Dec 11, 2022 · fbd37a5 · fbd37a5
1 parent d83aae8
commit fbd37a5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/FetchXmlBuilder/Converters/CSharpCodeGeneratorFetchXML.cs b/FetchXmlBuilder/Converters/CSharpCodeGeneratorFetchXML.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using Rappen.XTB.FetchXmlBuilder.Settings;
+using System.Collections.Generic;
 using System.Linq;
 using System.Security;
 using System.Text;
@@ -8,28 +9,30 @@ namespace Rappen.XTB.FetchXmlBuilder.Converters
 {
     public class CSharpCodeGeneratorFetchXML
     {
-        public static string GetCSharpFetchXMLCode(string fetchXml)
+        public static string GetCSharpFetchXMLCode(string fetchXml, CodeGenerators codesettings)
         {
             var data = new Dictionary<string, string>();
             var xml = new XmlDocument();
             xml.LoadXml(fetchXml);
 
-            var conditionAttributes = xml.SelectNodes("//condition/@value");
-
-            foreach (XmlAttribute attribute in conditionAttributes)
+            if (codesettings.FilterVariables)
             {
-                var value = AddData(attribute.OwnerElement.GetAttribute("attribute"), attribute.Value, data);
-                attribute.Value = $"{{{value}}}";
-            }
+                var conditionAttributes = xml.SelectNodes("//condition/@value");
 
-            var conditionValues = xml.SelectNodes("//condition/value");
+                foreach (XmlAttribute attribute in conditionAttributes)
+                {
+                    var value = AddData(attribute.OwnerElement.GetAttribute("attribute"), attribute.Value, data);
+                    attribute.Value = $"{{{value}}}";
+                }
 
-            foreach (XmlElement val in conditionValues)
-            {
-                var value = AddData(((XmlElement)val.ParentNode).GetAttribute("attribute"), val.InnerText.Trim(), data);
-                val.InnerText = $"{{{value}}}";
-            }
+                var conditionValues = xml.SelectNodes("//condition/value");
 
+                foreach (XmlElement val in conditionValues)
+                {
+                    var value = AddData(((XmlElement)val.ParentNode).GetAttribute("attribute"), val.InnerText.Trim(), data);
+                    val.InnerText = $"{{{value}}}";
+                }
+            }
             var cs = "";
 
             if (data.Count > 0)

diff --git a/FetchXmlBuilder/DockControls/XmlContentControl.cs b/FetchXmlBuilder/DockControls/XmlContentControl.cs
@@ -859,6 +859,15 @@ private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
         private void cmbQExStyle_SelectedIndexChanged(object sender, EventArgs e)
         {
             fxb.settings.CodeGenerators.QExStyle = (cmbQExStyle.SelectedItem is QExStyle style) ? style.Tag : QExStyleEnum.QueryExpression;
+            rbQExObjectinitializer.Enabled = fxb.settings.CodeGenerators.QExStyle != QExStyleEnum.FetchXML;
+            cmbQExFlavor.Enabled = fxb.settings.CodeGenerators.QExStyle != QExStyleEnum.FetchXML;
+            chkQExComments.Enabled = fxb.settings.CodeGenerators.QExStyle != QExStyleEnum.FetchXML;
+            if (fxb.settings.CodeGenerators.QExStyle == QExStyleEnum.FetchXML)
+            {
+                rbQExLineByLine.Checked = true;
+                cmbQExFlavor.SelectedIndex = -1;
+                chkQExComments.Checked = false;
+            }
             fxb.UpdateLiveXML();
         }
 

diff --git a/FetchXmlBuilder/FetchXmlBuilder.cs b/FetchXmlBuilder/FetchXmlBuilder.cs
@@ -391,7 +391,7 @@ private string GetQueryExpressionCode()
             {
                 case QExStyleEnum.FetchXML:
                     var fetch = dockControlBuilder.GetFetchString(true, false);
-                    return CSharpCodeGeneratorFetchXML.GetCSharpFetchXMLCode(fetch);
+                    return CSharpCodeGeneratorFetchXML.GetCSharpFetchXMLCode(fetch, settings.CodeGenerators);
 
                 case QExStyleEnum.QueryExpression:
                 case QExStyleEnum.OrganizationServiceContext: