Only warn about invalid entity/Attribute when metadata is available

rappen · Feb 22, 2020 · 70dd26a · 70dd26a
1 parent 7138c0d
commit 70dd26a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/FetchXmlBuilder/Controls/attributeControl.cs b/FetchXmlBuilder/Controls/attributeControl.cs
@@ -52,8 +52,7 @@ protected override ControlValidationResult ValidateControl(Control control)
                 {
                     return new ControlValidationResult(ControlValidationLevel.Error, "Attribute is required");
                 }
-
-                if (cmbAttribute.Items.Count > 0 && !cmbAttribute.Items.Cast<AttributeItem>().Any(a => a.ToString() == cmbAttribute.Text))
+                if (fxb.Service != null && !cmbAttribute.Items.OfType<AttributeItem>().Any(a => a.ToString() == cmbAttribute.Text))
                 {
                     return new ControlValidationResult(ControlValidationLevel.Warning, "Attribute is not valid");
                 }

diff --git a/FetchXmlBuilder/Controls/conditionControl.cs b/FetchXmlBuilder/Controls/conditionControl.cs
@@ -235,7 +235,7 @@ protected override ControlValidationResult ValidateControl(Control control)
                     return new ControlValidationResult(ControlValidationLevel.Error, "Attribute is required");
                 }
 
-                if (!cmbAttribute.Items.OfType<AttributeItem>().Any(i => i.ToString() == cmbAttribute.Text))
+                if (fxb.Service != null && !cmbAttribute.Items.OfType<AttributeItem>().Any(i => i.ToString() == cmbAttribute.Text))
                 {
                     return new ControlValidationResult(ControlValidationLevel.Warning, "Attribute is not valid");
                 }

diff --git a/FetchXmlBuilder/Controls/entityControl.cs b/FetchXmlBuilder/Controls/entityControl.cs
@@ -40,7 +40,7 @@ protected override ControlValidationResult ValidateControl(Control control)
                     return new ControlValidationResult(ControlValidationLevel.Error, "Entity is required");
                 }
 
-                if (!cmbEntity.Items.OfType<EntityItem>().Any(i => i.ToString() == cmbEntity.Text))
+                if (fxb.Service != null && !cmbEntity.Items.OfType<EntityItem>().Any(i => i.ToString() == cmbEntity.Text))
                 {
                     return new ControlValidationResult(ControlValidationLevel.Warning, "Entity is not valid");
                 }

diff --git a/FetchXmlBuilder/Controls/linkEntityControl.cs b/FetchXmlBuilder/Controls/linkEntityControl.cs
@@ -250,7 +250,7 @@ protected override ControlValidationResult ValidateControl(Control control)
                     return new ControlValidationResult(ControlValidationLevel.Error, "Entity is required");
                 }
 
-                if (!cmbEntity.Items.OfType<string>().Any(i => i == cmbEntity.Text))
+                if (fxb.Service != null && !cmbEntity.Items.OfType<string>().Any(i => i == cmbEntity.Text))
                 {
                     return new ControlValidationResult(ControlValidationLevel.Warning, "Entity is not valid");
                 }
@@ -263,7 +263,7 @@ protected override ControlValidationResult ValidateControl(Control control)
                     return new ControlValidationResult(ControlValidationLevel.Error, "From attribute is required");
                 }
 
-                if (!cmbFrom.Items.OfType<string>().Any(i => i == cmbFrom.Text))
+                if (fxb.Service != null && !cmbFrom.Items.OfType<string>().Any(i => i == cmbFrom.Text))
                 {
                     return new ControlValidationResult(ControlValidationLevel.Warning, "From attribute is not valid");
                 }
@@ -276,7 +276,7 @@ protected override ControlValidationResult ValidateControl(Control control)
                     return new ControlValidationResult(ControlValidationLevel.Error, "To attribute is required");
                 }
 
-                if (!cmbTo.Items.OfType<string>().Any(i => i == cmbTo.Text))
+                if (fxb.Service != null && !cmbTo.Items.OfType<string>().Any(i => i == cmbTo.Text))
                 {
                     return new ControlValidationResult(ControlValidationLevel.Warning, "To attribute is not valid");
                 }

diff --git a/FetchXmlBuilder/Controls/orderControl.cs b/FetchXmlBuilder/Controls/orderControl.cs
@@ -82,7 +82,7 @@ protected override ControlValidationResult ValidateControl(Control control)
                     return new ControlValidationResult(ControlValidationLevel.Error, "Attribute is required");
                 }
 
-                if (!cmbAttribute.Items.OfType<AttributeItem>().Any(i => i.ToString() == cmbAttribute.Text))
+                if (fxb.Service != null && !cmbAttribute.Items.OfType<AttributeItem>().Any(i => i.ToString() == cmbAttribute.Text))
                 {
                     return new ControlValidationResult(ControlValidationLevel.Warning, "Attribute is not valid");
                 }