Merge branch 'live-changes' of https://github.com/MarkMpn/FetchXMLBui…

…lder into MarkMpn-live-changes
rappen · Feb 20, 2020 · 72da9cd · 72da9cd
2 parents e41c4ed + 8d61eb8
commit 72da9cd
Show file tree

Hide file tree

Showing 16 changed files with 268 additions and 35 deletions.
diff --git a/FetchXmlBuilder/Controls/FetchXmlElementControlBase.cs b/FetchXmlBuilder/Controls/FetchXmlElementControlBase.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -15,16 +16,38 @@ public class FetchXmlElementControlBase : UserControl, IDefinitionSavable
         private Dictionary<string, string> collec;
         private Dictionary<string, string> original;
         private string controlsCheckSum = "";
+
+        static FetchXmlElementControlBase()
+        {
+            // Create the small warning icon to use for user feedback
+            // https://stackoverflow.com/questions/3031124/is-there-a-way-to-get-different-sizes-of-the-windows-system-icons-in-net
+            Size iconSize = SystemInformation.SmallIconSize;
+            Bitmap bitmap = new Bitmap(iconSize.Width, iconSize.Height);
+
+            using (Graphics g = Graphics.FromImage(bitmap))
+            {
+                g.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic;
+                g.DrawImage(SystemIcons.Warning.ToBitmap(), new Rectangle(Point.Empty, iconSize));
+            }
+
+            WarningIcon = Icon.FromHandle(bitmap.GetHicon());
+        }
+
+        protected static Icon WarningIcon { get; }
 
         public void InitializeFXB(Dictionary<string, string> collection, FetchXmlBuilder fetchXmlBuilder, TreeBuilderControl tree, TreeNode node)
         {
             fxb = fetchXmlBuilder;
             Node = node;
             Tree = tree;
             if (collection != null)
+            {
                 collec = collection;
+            }
             else if (node != null)
+            {
                 collec = (Dictionary<string, string>)node.Tag;
+            }
 
             original = new Dictionary<string, string>(collec);
             PopulateControls();
@@ -48,7 +71,9 @@ protected override void OnValidating(CancelEventArgs e)
             base.OnValidating(e);
 
             if (RequiresSave())
+            {
                 e.Cancel = !Save(false);
+            }
         }
 
         protected virtual bool RequiresSave()
@@ -61,14 +86,18 @@ public virtual bool Save(bool silent)
             try
             {
                 if (!ValidateControls(silent))
+                {
                     return false;
+                }
 
                 SaveInternal(silent);
             }
             catch (ArgumentNullException ex)
             {
                 if (!silent)
+                {
                     MessageBox.Show(ex.Message, "Validation", MessageBoxButtons.OK, MessageBoxIcon.Stop);
+                }
 
                 return false;
             }
@@ -126,5 +155,7 @@ protected override bool ProcessKeyPreview(ref Message m)
 
             return base.ProcessKeyPreview(ref m);
         }
+
+
     }
 }
diff --git a/FetchXmlBuilder/Controls/attributeControl.Designer.cs b/FetchXmlBuilder/Controls/attributeControl.Designer.cs
diff --git a/FetchXmlBuilder/Controls/attributeControl.cs b/FetchXmlBuilder/Controls/attributeControl.cs
@@ -4,6 +4,7 @@
 using Microsoft.Xrm.Sdk.Metadata;
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Windows.Forms;
 
 namespace Cinteros.Xrm.FetchXmlBuilder.Controls
@@ -22,6 +23,7 @@ public attributeControl(TreeNode node, AttributeMetadata[] attributes, TreeBuild
             InitializeComponent();
             this.attributes = attributes;
             InitializeFXB(null, null, tree, node);
+            warningProvider.Icon = WarningIcon;
         }
 
         protected override void PopulateControls()
@@ -52,22 +54,19 @@ protected override bool ValidateControls(bool silent)
             if (string.IsNullOrWhiteSpace(cmbAttribute.Text))
             {
                 if (!silent)
+                {
                     errorProvider.SetError(cmbAttribute, "Attribute is required");
-
-                valid = false;
-            }
-            else if (cmbAttribute.SelectedIndex == -1)
-            {
-                if (!silent)
-                    errorProvider.SetError(cmbAttribute, "Attribute is not valid");
+                }
 
                 valid = false;
             }
 
             if (TreeBuilderControl.IsFetchAggregate(Node) && string.IsNullOrWhiteSpace(txtAlias.Text))
             {
                 if (!silent)
+                {
                     errorProvider.SetError(txtAlias, "Alias must be specified in aggregate queries");
+                }
 
                 valid = false;
             }
@@ -103,20 +102,29 @@ private void EnableAggregateControls()
 
         private void cmbAttribute_Validating(object sender, System.ComponentModel.CancelEventArgs e)
         {
+            warningProvider.SetError(cmbAttribute, null);
+            errorProvider.SetError(cmbAttribute, null);
+
             if (string.IsNullOrWhiteSpace(cmbAttribute.Text))
+            {
                 errorProvider.SetError(cmbAttribute, "Attribute is required");
+            }
             else if (cmbAttribute.SelectedIndex == -1)
-                errorProvider.SetError(cmbAttribute, "Attribute is not valid");
-            else
-                errorProvider.SetError(cmbAttribute, null);
+            {
+                warningProvider.SetError(cmbAttribute, "Attribute is not valid");
+            }
         }
 
         private void txtAlias_Validating(object sender, System.ComponentModel.CancelEventArgs e)
         {
             if (TreeBuilderControl.IsFetchAggregate(Node) && string.IsNullOrWhiteSpace(txtAlias.Text))
+            {
                 errorProvider.SetError(txtAlias, "Alias must be specified in aggregate queries");
+            }
             else
+            {
                 errorProvider.SetError(txtAlias, null);
+            }
         }
     }
 }
diff --git a/FetchXmlBuilder/Controls/attributeControl.resx b/FetchXmlBuilder/Controls/attributeControl.resx
@@ -120,4 +120,7 @@
   <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="warningProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>140, 17</value>
+  </metadata>
 </root>
diff --git a/FetchXmlBuilder/Controls/conditionControl.Designer.cs b/FetchXmlBuilder/Controls/conditionControl.Designer.cs
diff --git a/FetchXmlBuilder/Controls/conditionControl.cs b/FetchXmlBuilder/Controls/conditionControl.cs
@@ -20,6 +20,7 @@ public conditionControl(TreeNode node, FetchXmlBuilder fetchXmlBuilder, TreeBuil
             InitializeComponent();
             InitializeFXB(null, fetchXmlBuilder, tree, node);
             RefreshAttributes();
+            warningProvider.Icon = WarningIcon;
         }
 
         protected override void PopulateControls()
@@ -62,7 +63,9 @@ protected override bool RequiresSave()
         protected override void SaveInternal(bool silent)
         {
             if (!silent && cmbOperator.SelectedItem != null && cmbOperator.SelectedItem is OperatorItem)
+            {
                 ExtractCommaSeparatedValues();
+            }
 
             base.SaveInternal(silent);
         }
@@ -88,11 +91,11 @@ private void ExtractCommaSeparatedValues()
 
         protected override bool ValidateControls(bool silent)
         {
-            var result = false;
+            var result = true;
             Control errorControl = null;
             var error = "";
 
-            if (cmbAttribute.SelectedIndex == -1)
+            if (string.IsNullOrWhiteSpace(cmbAttribute.Text))
             {
                 errorControl = cmbAttribute;
                 error = "Attribute is required";
@@ -237,7 +240,9 @@ protected override bool ValidateControls(bool silent)
             if (!string.IsNullOrWhiteSpace(error))
             {
                 if (!silent)
+                {
                     errorProvider.SetError(errorControl, error);
+                }
 
                 result = false;
             }
@@ -375,6 +380,37 @@ private void cmbAttribute_SelectedIndexChanged(object sender, EventArgs e)
             }
             UpdateValueField();
         }
+
+        private void cmbAttribute_Validating(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            errorProvider.SetError(cmbAttribute, null);
+            warningProvider.SetError(cmbAttribute, null);
+
+            if (string.IsNullOrWhiteSpace(cmbAttribute.Text))
+            {
+                errorProvider.SetError(cmbAttribute, "Attribute is required");
+            }
+            else if (cmbAttribute.SelectedIndex == -1)
+            {
+                warningProvider.SetError(cmbAttribute, "Attribute is not valid");
+            }
+        }
+
+        private void cmbOperator_Validating(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            if (string.IsNullOrEmpty(cmbOperator.Text))
+            {
+                errorProvider.SetError(cmbOperator, "Operator is required");
+            }
+            else if (cmbOperator.SelectedIndex == -1)
+            {
+                errorProvider.SetError(cmbOperator, "Operator is not valid");
+            }
+            else
+            {
+                errorProvider.SetError(cmbOperator, null);
+            }
+        }
     }
 
     public class EntityNode

diff --git a/FetchXmlBuilder/Controls/conditionControl.resx b/FetchXmlBuilder/Controls/conditionControl.resx
@@ -120,4 +120,7 @@
   <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="warningProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>140, 17</value>
+  </metadata>
 </root>
diff --git a/FetchXmlBuilder/Controls/entityControl.Designer.cs b/FetchXmlBuilder/Controls/entityControl.Designer.cs