UI-related to the layouts #766

rappen · Aug 18, 2022 · 1479bea · 1479bea
1 parent 3670295
commit 1479bea
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/FetchXmlBuilder/Controls/attributeControl.cs b/FetchXmlBuilder/Controls/attributeControl.cs
@@ -84,6 +84,15 @@ protected override ControlValidationResult ValidateControl(Control control)
             return base.ValidateControl(control);
         }
 
+        protected override void SaveInternal(bool keyPress)
+        {
+            base.SaveInternal(keyPress);
+            if (IsInitialized)
+            {
+                UpdateCellFromUI();
+            }
+        }
+
         private void chkGroupBy_CheckedChanged(object sender, EventArgs e)
         {
             EnableAggregateControls();
@@ -118,10 +127,6 @@ private void helpIcon_Click(object sender, EventArgs e)
         private void cmbAttribute_SelectedIndexChanged(object sender, EventArgs e)
         {
             fxb.ShowMetadata(Metadata());
-            if (IsInitialized)
-            {
-                UpdateCellFromUI();
-            }
         }
 
         internal void UpdateUIFromCell()

diff --git a/FetchXmlBuilder/Controls/entityControl.cs b/FetchXmlBuilder/Controls/entityControl.cs
@@ -1,6 +1,7 @@
 using Microsoft.Xrm.Sdk.Metadata;
 using Rappen.XTB.FetchXmlBuilder.ControlsClasses;
 using Rappen.XTB.FetchXmlBuilder.DockControls;
+using Rappen.XTB.FetchXmlBuilder.Views;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
@@ -61,6 +62,12 @@ protected override ControlValidationResult ValidateControl(Control control)
         private void cmbEntity_SelectedIndexChanged(object sender, System.EventArgs e)
         {
             fxb.ShowMetadata(Metadata());
+            if (IsInitialized &&
+                cmbEntity.SelectedItem is EntityItem item &&
+                item.Meta?.LogicalName != fxb.dockControlBuilder.LayoutXML?.EntityMeta?.LogicalName)
+            {
+                fxb.dockControlBuilder.LayoutXML = new LayoutXML(item.Meta, fxb);
+            }
         }
 
         public override MetadataBase Metadata()