Always load entities as sync for Condition, LinkEmtity and Value controls #1160

rappen · rappen · commit ae5ee1c152a2 · 2025-11-23T17:46:48.000+01:00
diff --git a/FetchXmlBuilder/Controls/conditionControl.cs b/FetchXmlBuilder/Controls/conditionControl.cs
@@ -240,7 +240,7 @@ protected override ControlValidationResult ValidateControl(Control control)
                                 break;
 
                             case AttributeTypeCode.DateTime:
-                                if (!DateTime.TryParse(value, out DateTime _))
+                                if (!DateTime.TryParse(value, out var _))
                                 {
                                     return new ControlValidationResult(ControlValidationLevel.Error, "Operator " + oper.ToString() + " requires date value");
                                 }
@@ -252,12 +252,12 @@ protected override ControlValidationResult ValidateControl(Control control)
                             case AttributeTypeCode.Picklist:
                             case AttributeTypeCode.BigInt:
                             case AttributeTypeCode.EntityName:
-                                if (!int.TryParse(value, out int _))
+                                if (!int.TryParse(value, out var _))
                                 {
                                     if (oper.IsMultipleValuesType && !string.IsNullOrWhiteSpace(value))
                                     {
                                         var split = value.Split(',');
-                                        if (split.Any(v => !int.TryParse(v.Trim(), out int _)))
+                                        if (split.Any(v => !int.TryParse(v.Trim(), out var _)))
                                         {
                                             return new ControlValidationResult(ControlValidationLevel.Error, "Operator " + oper.ToString() + " requires whole number values separated by commas");
                                         }
@@ -272,7 +272,7 @@ protected override ControlValidationResult ValidateControl(Control control)
                             case AttributeTypeCode.Decimal:
                             case AttributeTypeCode.Double:
                             case AttributeTypeCode.Money:
-                                if (!decimal.TryParse(value, out decimal _))
+                                if (!decimal.TryParse(value, out var _))
                                 {
                                     return new ControlValidationResult(ControlValidationLevel.Error, "Operator " + oper.ToString() + " requires decimal value");
                                 }
@@ -282,7 +282,7 @@ protected override ControlValidationResult ValidateControl(Control control)
                             case AttributeTypeCode.Customer:
                             case AttributeTypeCode.Owner:
                             case AttributeTypeCode.Uniqueidentifier:
-                                if (!Guid.TryParse(value, out Guid _))
+                                if (!Guid.TryParse(value, out var _))
                                 {
                                     return new ControlValidationResult(ControlValidationLevel.Error, "Operator " + oper.ToString() + " requires a proper guid with format: " + Guid.Empty.ToString());
                                 }
@@ -434,9 +434,12 @@ private void RefreshAttributes()
             {
                 if (!fxb.working)
                 {
-                    fxb.LoadEntityDetails(entityName, RefreshAttributes);
+                    fxb.LoadEntityDetails(entityName, null, false);
+                }
+                else
+                {
+                    return;
                 }
-                return;
             }
             BeginInit();
             var attributes = fxb.GetDisplayAttributes(entityName);
@@ -495,7 +498,8 @@ private void RefreshValueOf()
                 {
                     if (!fxb.working)
                     {
-                        fxb.LoadEntityDetails(entityName, RefreshAttributes);
+                        fxb.LoadEntityDetails(entityName, null, false);
+                        RefreshAttributes();
                     }
                     return;
                 }
@@ -635,7 +639,7 @@ enummeta.OptionSet is OptionSetMetadata options &&
                 else if (fxb.settings.UseLookup
                     && (attributeMetadata is LookupAttributeMetadata
                         || attributeMetadata.AttributeType == AttributeTypeCode.Uniqueidentifier)
-                    && Guid.TryParse(cmbValue.Text, out Guid id) && !Guid.Empty.Equals(id))
+                    && Guid.TryParse(cmbValue.Text, out var id) && !Guid.Empty.Equals(id))
                 {
                     var loookuptargets = new List<string>();
                     if (!string.IsNullOrWhiteSpace(txtUitype.Text))
@@ -727,7 +731,7 @@ enummeta.OptionSet is OptionSetMetadata options &&
             else if (valueType == AttributeTypeCode.DateTime)
             {
                 panValue.Visible = !rbDatePicker.Checked;
-                dtPicker.Value = DateTime.TryParse(cmbValue.Text, out DateTime dt) ? dt : DateTime.Now;
+                dtPicker.Value = DateTime.TryParse(cmbValue.Text, out var dt) ? dt : DateTime.Now;
                 panDateSelector.Visible = true;
                 panDatePicker.Visible = rbDatePicker.Checked;
             }
diff --git a/FetchXmlBuilder/Controls/linkEntityControl.cs b/FetchXmlBuilder/Controls/linkEntityControl.cs
@@ -47,7 +47,8 @@ protected override void PopulateControls()
             {
                 if (!fxb.working)
                 {
-                    fxb.LoadEntityDetails(parententityname, RefreshRelationships);
+                    fxb.LoadEntityDetails(parententityname, null, false);
+                    RefreshRelationships();
                 }
             }
             else
diff --git a/FetchXmlBuilder/Controls/valueControl.cs b/FetchXmlBuilder/Controls/valueControl.cs
@@ -38,13 +38,10 @@ public valueControl(TreeNode node, FetchXmlBuilder fetchXmlBuilder, TreeBuilderC
             {
                 if (!fxb.working)
                 {
-                    fxb.LoadEntityDetails(_entityName, RefreshValues);
+                    fxb.LoadEntityDetails(_entityName, null, false);
                 }
             }
-            else
-            {
-                RefreshValues();
-            }
+            RefreshValues();
         }
 
         private void RefreshValues()

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ protected override ControlValidationResult ValidateControl(Control control)`
`240`	`240`	`break;`
`241`	`241`
`242`	`242`	`case AttributeTypeCode.DateTime:`
`243`		`- if (!DateTime.TryParse(value, out DateTime _))`
	`243`	`+ if (!DateTime.TryParse(value, out var _))`
`244`	`244`	`{`
`245`	`245`	`return new ControlValidationResult(ControlValidationLevel.Error, "Operator " + oper.ToString() + " requires date value");`
`246`	`246`	`}`
`@@ -252,12 +252,12 @@ protected override ControlValidationResult ValidateControl(Control control)`
`252`	`252`	`case AttributeTypeCode.Picklist:`
`253`	`253`	`case AttributeTypeCode.BigInt:`
`254`	`254`	`case AttributeTypeCode.EntityName:`
`255`		`- if (!int.TryParse(value, out int _))`
	`255`	`+ if (!int.TryParse(value, out var _))`
`256`	`256`	`{`
`257`	`257`	`if (oper.IsMultipleValuesType && !string.IsNullOrWhiteSpace(value))`
`258`	`258`	`{`
`259`	`259`	`var split = value.Split(',');`
`260`		`- if (split.Any(v => !int.TryParse(v.Trim(), out int _)))`
	`260`	`+ if (split.Any(v => !int.TryParse(v.Trim(), out var _)))`
`261`	`261`	`{`
`262`	`262`	`return new ControlValidationResult(ControlValidationLevel.Error, "Operator " + oper.ToString() + " requires whole number values separated by commas");`
`263`	`263`	`}`
`@@ -272,7 +272,7 @@ protected override ControlValidationResult ValidateControl(Control control)`
`272`	`272`	`case AttributeTypeCode.Decimal:`
`273`	`273`	`case AttributeTypeCode.Double:`
`274`	`274`	`case AttributeTypeCode.Money:`
`275`		`- if (!decimal.TryParse(value, out decimal _))`
	`275`	`+ if (!decimal.TryParse(value, out var _))`
`276`	`276`	`{`
`277`	`277`	`return new ControlValidationResult(ControlValidationLevel.Error, "Operator " + oper.ToString() + " requires decimal value");`
`278`	`278`	`}`
`@@ -282,7 +282,7 @@ protected override ControlValidationResult ValidateControl(Control control)`
`282`	`282`	`case AttributeTypeCode.Customer:`
`283`	`283`	`case AttributeTypeCode.Owner:`
`284`	`284`	`case AttributeTypeCode.Uniqueidentifier:`
`285`		`- if (!Guid.TryParse(value, out Guid _))`
	`285`	`+ if (!Guid.TryParse(value, out var _))`
`286`	`286`	`{`
`287`	`287`	`return new ControlValidationResult(ControlValidationLevel.Error, "Operator " + oper.ToString() + " requires a proper guid with format: " + Guid.Empty.ToString());`
`288`	`288`	`}`
`@@ -434,9 +434,12 @@ private void RefreshAttributes()`
`434`	`434`	`{`
`435`	`435`	`if (!fxb.working)`
`436`	`436`	`{`
`437`		`- fxb.LoadEntityDetails(entityName, RefreshAttributes);`
	`437`	`+ fxb.LoadEntityDetails(entityName, null, false);`
	`438`	`+ }`
	`439`	`+ else`
	`440`	`+ {`
	`441`	`+ return;`
`438`	`442`	`}`
`439`		`- return;`
`440`	`443`	`}`
`441`	`444`	`BeginInit();`
`442`	`445`	`var attributes = fxb.GetDisplayAttributes(entityName);`
`@@ -495,7 +498,8 @@ private void RefreshValueOf()`
`495`	`498`	`{`
`496`	`499`	`if (!fxb.working)`
`497`	`500`	`{`
`498`		`- fxb.LoadEntityDetails(entityName, RefreshAttributes);`
	`501`	`+ fxb.LoadEntityDetails(entityName, null, false);`
	`502`	`+ RefreshAttributes();`
`499`	`503`	`}`
`500`	`504`	`return;`
`501`	`505`	`}`
`@@ -635,7 +639,7 @@ enummeta.OptionSet is OptionSetMetadata options &&`
`635`	`639`	`else if (fxb.settings.UseLookup`
`636`	`640`	`&& (attributeMetadata is LookupAttributeMetadata`
`637`	`641`	`\|\| attributeMetadata.AttributeType == AttributeTypeCode.Uniqueidentifier)`
`638`		`- && Guid.TryParse(cmbValue.Text, out Guid id) && !Guid.Empty.Equals(id))`
	`642`	`+ && Guid.TryParse(cmbValue.Text, out var id) && !Guid.Empty.Equals(id))`
`639`	`643`	`{`
`640`	`644`	`var loookuptargets = new List<string>();`
`641`	`645`	`if (!string.IsNullOrWhiteSpace(txtUitype.Text))`
`@@ -727,7 +731,7 @@ enummeta.OptionSet is OptionSetMetadata options &&`
`727`	`731`	`else if (valueType == AttributeTypeCode.DateTime)`
`728`	`732`	`{`
`729`	`733`	`panValue.Visible = !rbDatePicker.Checked;`
`730`		`- dtPicker.Value = DateTime.TryParse(cmbValue.Text, out DateTime dt) ? dt : DateTime.Now;`
	`734`	`+ dtPicker.Value = DateTime.TryParse(cmbValue.Text, out var dt) ? dt : DateTime.Now;`
`731`	`735`	`panDateSelector.Visible = true;`
`732`	`736`	`panDatePicker.Visible = rbDatePicker.Checked;`
`733`	`737`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ protected override void PopulateControls()`
`47`	`47`	`{`
`48`	`48`	`if (!fxb.working)`
`49`	`49`	`{`
`50`		`- fxb.LoadEntityDetails(parententityname, RefreshRelationships);`
	`50`	`+ fxb.LoadEntityDetails(parententityname, null, false);`
	`51`	`+ RefreshRelationships();`
`51`	`52`	`}`
`52`	`53`	`}`
`53`	`54`	`else`
Original file line number	Diff line number	Diff line change
`@@ -38,13 +38,10 @@ public valueControl(TreeNode node, FetchXmlBuilder fetchXmlBuilder, TreeBuilderC`
`38`	`38`	`{`
`39`	`39`	`if (!fxb.working)`
`40`	`40`	`{`
`41`		`- fxb.LoadEntityDetails(_entityName, RefreshValues);`
	`41`	`+ fxb.LoadEntityDetails(_entityName, null, false);`
`42`	`42`	`}`
`43`	`43`	`}`
`44`		`- else`
`45`		`- {`
`46`		`- RefreshValues();`
`47`		`- }`
	`44`	`+ RefreshValues();`
`48`	`45`	`}`
`49`	`46`
`50`	`47`	`private void RefreshValues()`