A few improvements of multiple levens Fixed #1029

rappen · rappen · commit 02420ff88f4b · 2024-04-07T11:05:30.000+02:00
diff --git a/FetchXmlBuilder/Builder/TreeNodeHelper.cs b/FetchXmlBuilder/Builder/TreeNodeHelper.cs
@@ -166,11 +166,10 @@ public static void SetNodeText(TreeNode node, FetchXmlBuilder fxb, bool validate
                     {
                         text += " ";
                         AttributeMetadata attrmeta = null;
-                        if (node.Parent != null)
+                        if (node.LocalEntityName() is string attentity && !string.IsNullOrEmpty(attentity))
                         {
-                            var parent = node.Parent.Value("name");
-                            attrmeta = fxb.GetAttribute(parent, name);
-                            name = fxb.GetAttributeDisplayName(parent, name);
+                            attrmeta = fxb.GetAttribute(attentity, name);
+                            name = fxb.GetAttributeDisplayName(attentity, name);
                         }
                         if (!string.IsNullOrEmpty(agg) && !string.IsNullOrEmpty(name))
                         {
@@ -217,12 +216,11 @@ public static void SetNodeText(TreeNode node, FetchXmlBuilder fxb, bool validate
                         var val = node.Value("value");
                         var valueOf = node.Value("valueof");
                         var uiname = node.Value("uiname");
-                        if (node.Parent?.Parent != null)
+                        if (node.LocalEntityName() is string cndentity && !string.IsNullOrEmpty(cndentity))
                         {
-                            var entity = node.Parent.Parent.Value("name");
-                            val = fxb.GetContitionValue(entity, attr, val);
-                            attr = fxb.GetAttributeDisplayName(entity, attr);
-                            valueOf = fxb.GetAttributeDisplayName(entity, valueOf);
+                            val = fxb.GetContitionValue(cndentity, attr, val);
+                            attr = fxb.GetAttributeDisplayName(cndentity, attr);
+                            valueOf = fxb.GetAttributeDisplayName(cndentity, valueOf);
                         }
                         if (!string.IsNullOrEmpty(ent))
                         {
@@ -247,11 +245,10 @@ public static void SetNodeText(TreeNode node, FetchXmlBuilder fxb, bool validate
 
                 case "value":
                     var value = node.Value("#text");
-                    if (node.Parent?.Parent?.Parent != null)
+                    if (node.LocalEntityName() is string valentity && !string.IsNullOrEmpty(valentity))
                     {
-                        var entity = node.Parent.Parent.Parent.Value("name");
                         var attr = node.Parent.Value("attribute");
-                        value = fxb.GetContitionValue(entity, attr, value);
+                        value = fxb.GetContitionValue(valentity, attr, value);
                     }
                     text += " " + value;
                     break;
@@ -266,10 +263,9 @@ public static void SetNodeText(TreeNode node, FetchXmlBuilder fxb, bool validate
                         }
                         else if (!string.IsNullOrEmpty(attr))
                         {
-                            if (!string.IsNullOrEmpty(attr) && node.Parent != null)
+                            if (node.LocalEntityName() is string ordentity && !string.IsNullOrEmpty(ordentity))
                             {
-                                var parent = node.Parent.Value("name");
-                                attr = fxb.GetAttributeDisplayName(parent, attr);
+                                attr = fxb.GetAttributeDisplayName(ordentity, attr);
                             }
                             {
                                 text += " " + attr;

Original file line number	Diff line number	Diff line change
`@@ -166,11 +166,10 @@ public static void SetNodeText(TreeNode node, FetchXmlBuilder fxb, bool validate`
`166`	`166`	`{`
`167`	`167`	`text += " ";`
`168`	`168`	`AttributeMetadata attrmeta = null;`
`169`		`- if (node.Parent != null)`
	`169`	`+ if (node.LocalEntityName() is string attentity && !string.IsNullOrEmpty(attentity))`
`170`	`170`	`{`
`171`		`- var parent = node.Parent.Value("name");`
`172`		`- attrmeta = fxb.GetAttribute(parent, name);`
`173`		`- name = fxb.GetAttributeDisplayName(parent, name);`
	`171`	`+ attrmeta = fxb.GetAttribute(attentity, name);`
	`172`	`+ name = fxb.GetAttributeDisplayName(attentity, name);`
`174`	`173`	`}`
`175`	`174`	`if (!string.IsNullOrEmpty(agg) && !string.IsNullOrEmpty(name))`
`176`	`175`	`{`
`@@ -217,12 +216,11 @@ public static void SetNodeText(TreeNode node, FetchXmlBuilder fxb, bool validate`
`217`	`216`	`var val = node.Value("value");`
`218`	`217`	`var valueOf = node.Value("valueof");`
`219`	`218`	`var uiname = node.Value("uiname");`
`220`		`- if (node.Parent?.Parent != null)`
	`219`	`+ if (node.LocalEntityName() is string cndentity && !string.IsNullOrEmpty(cndentity))`
`221`	`220`	`{`
`222`		`- var entity = node.Parent.Parent.Value("name");`
`223`		`- val = fxb.GetContitionValue(entity, attr, val);`
`224`		`- attr = fxb.GetAttributeDisplayName(entity, attr);`
`225`		`- valueOf = fxb.GetAttributeDisplayName(entity, valueOf);`
	`221`	`+ val = fxb.GetContitionValue(cndentity, attr, val);`
	`222`	`+ attr = fxb.GetAttributeDisplayName(cndentity, attr);`
	`223`	`+ valueOf = fxb.GetAttributeDisplayName(cndentity, valueOf);`
`226`	`224`	`}`
`227`	`225`	`if (!string.IsNullOrEmpty(ent))`
`228`	`226`	`{`
`@@ -247,11 +245,10 @@ public static void SetNodeText(TreeNode node, FetchXmlBuilder fxb, bool validate`
`247`	`245`
`248`	`246`	`case "value":`
`249`	`247`	`var value = node.Value("#text");`
`250`		`- if (node.Parent?.Parent?.Parent != null)`
	`248`	`+ if (node.LocalEntityName() is string valentity && !string.IsNullOrEmpty(valentity))`
`251`	`249`	`{`
`252`		`- var entity = node.Parent.Parent.Parent.Value("name");`
`253`	`250`	`var attr = node.Parent.Value("attribute");`
`254`		`- value = fxb.GetContitionValue(entity, attr, value);`
	`251`	`+ value = fxb.GetContitionValue(valentity, attr, value);`
`255`	`252`	`}`
`256`	`253`	`text += " " + value;`
`257`	`254`	`break;`
`@@ -266,10 +263,9 @@ public static void SetNodeText(TreeNode node, FetchXmlBuilder fxb, bool validate`
`266`	`263`	`}`
`267`	`264`	`else if (!string.IsNullOrEmpty(attr))`
`268`	`265`	`{`
`269`		`- if (!string.IsNullOrEmpty(attr) && node.Parent != null)`
	`266`	`+ if (node.LocalEntityName() is string ordentity && !string.IsNullOrEmpty(ordentity))`
`270`	`267`	`{`
`271`		`- var parent = node.Parent.Value("name");`
`272`		`- attr = fxb.GetAttributeDisplayName(parent, attr);`
	`268`	`+ attr = fxb.GetAttributeDisplayName(ordentity, attr);`
`273`	`269`	`}`
`274`	`270`	`{`
`275`	`271`	`text += " " + attr;`