fixed final adpater pattern implementations

Author: jhannahLCD

src/WebFormsToBlazorServerCommands/Migration/AspxToBlazorControlConverter.cs

@@ -126,7 +126,6 @@ private async Task<string> ConvertFormViewControl(string nodeContent)
 
             try
             {
-
                 var editFormNode = model.All.Where(p => p.LocalName.ToLower().Equals("asp:formview")).FirstOrDefault();
                 var newNode = parser.ParseFragment($"<EditForm Model={editFormNode.GetAttribute("ItemType")} OnValidSubmit={editFormNode.GetAttribute("SelectMethod")}></EditForm>", editFormNode);
 
@@ -143,7 +142,6 @@ private async Task<string> ConvertFormViewControl(string nodeContent)
                 foreach (var formObj in aspFormTags)
                 {
                     var migratedControlText = await _adapterHost.MigrateTagControl(formObj.NodeName, formObj.OuterHtml);
-
                     var tempNode = parser.ParseFragment(migratedControlText, null);
 
                     //ParseFragment always adds on a HTML & BODY tags, at least with this call setup.  We need to pull out *just* the element that we have migrated.
@@ -197,15 +195,13 @@ private async Task<string> ConvertContentControl(string nodeContent)
             try
             {
                 var model = await _angleSharpContext.OpenAsync(req => req.Content(nodeContent));
-
                 var contentControlObj = model.Descendents<Element>().First(c => c.TagName.ToLower().Equals("asp:content"));
 
                 //send any child asp:* controls to be converted by the a call back out to the adapterHosting class.
                 var aspFormTags = contentControlObj.Descendents<IElement>().Where(p => p.NodeName.ToLower().Contains("asp:")).ToList();
                 foreach (var formObj in aspFormTags)
                 {
                     var migratedControlText = await _adapterHost.MigrateTagControl(formObj.NodeName, formObj.OuterHtml);
-
                     var tempNode = parser.ParseFragment(migratedControlText, null);
 
                     //ParseFragment always adds on a HTML & BODY tags, at least with this call setup.  We need to pull out *just* the element that we have migrated.

src/WebFormsToBlazorServerCommands/Migration/WebFormToBlazorServerMigration.AspxFiles.cs

@@ -13,6 +13,7 @@
 using AngleSharp.Dom;
 using AngleSharp.Html.Parser;
 using AngleSharp;
+using System.ComponentModel.Design;
 
 namespace WebFormsToBlazorServerCommands.Migration
 {
@@ -249,30 +250,30 @@ await _statusTracking.UpdateCurrentStatusAsync(MigrationStepEnum.AspxPages,
         }
 
 
-
-        private static void ProcessSourceElement(Element elementToProcess, ref Element targetParentElement, ref HtmlParser htmlParser)
+        /// <summary>
+        /// This method is used to send an Element through any registered ControlConverter adapters and get back 
+        /// the migrated text from the AdapterHost.
+        /// </summary>
+        /// <param name="elementToProcess"></param>
+        /// <returns>String</returns>
+        private async Task<string> ProcessSourceElement(Element elementToProcess)
         {
             Element processedElement = null;
+            StringBuilder processedHTML = new StringBuilder();
             var converterAdapter = new ConverterAdapter();
             converterAdapter.RegisterControlConverter(new AspxToBlazorControlConverter(converterAdapter));
 
+            var htmlParser = new AngleSharp.Html.Parser.HtmlParser();
+            
             try
             {
                 //If this is an ASP:* control then call the migration code, append the *entire* migrated node, and return to the calling method.
                 if (elementToProcess.LocalName.ToLower().Contains("asp:"))
                 {
                     var newNodeText = Task.Run(() => converterAdapter.MigrateTagControl(elementToProcess.LocalName, elementToProcess.OuterHtml)).Result;
-                    var convertedNodeObj = htmlParser.ParseFragment(newNodeText, null);
-
-                    //Need to remove the HTML/HEAD/BODY tags that get added by the parser
-                    var NodeToAppend = convertedNodeObj.GetElementsByTagName("BODY").First().FirstElementChild;
-
-                    //Append the element to the targetDocumentFragment, or the lastAppendedElement depending
-                    processedElement = targetParentElement.AppendElement(NodeToAppend) as Element;
 
                     //We do *not* deal with any children of this element, as that is the responsibility of the MigratTagControl to deal with any children of the ASP control
-                    return;
-
+                    return newNodeText;
                 }
                 else
                 {
@@ -281,31 +282,25 @@ private static void ProcessSourceElement(Element elementToProcess, ref Element t
                     // - recursively call this method to deal with the children, passing in the new appended as the parent element to append children too
                     if (elementToProcess.ChildElementCount > 0)
                     {
-                        //Make sure that we are not doubling up the HTML and/or the BODY element - these get added by default from AngleSharp even to fragments.
-                        if (!elementToProcess.NodeName.ToLower().Equals(targetParentElement.NodeName.ToLower()))
-                        {
-                            processedElement = targetParentElement.AppendElement(elementToProcess.Clone(false) as Element);
-                        }
+                        processedElement = elementToProcess.Clone(false) as Element;
                         foreach (Element item in elementToProcess.Children)
                         {
-                            ProcessSourceElement(item, ref processedElement, ref htmlParser);
+                            var newElement = htmlParser.ParseFragment(await ProcessSourceElement(item), processedElement);
+                            processedElement.Append(newElement.ToArray());
                         }
-
+                        processedHTML.Append(processedElement.OuterHtml);
                     } else
                     {
-                        targetParentElement.Append(elementToProcess.Clone(false));
+                        processedHTML.Append((elementToProcess.Clone(false) as Element).OuterHtml);
                     }
 
-                    return;
-
+                    return processedHTML.ToString();
                 }
             }
             catch (Exception)
             {
-
                 throw;
             }
-
         }
 
     }

src/WebFormsToBlazorServerCommands/Migration/WebFormToBlazorServerMigration.cs

@@ -14,6 +14,7 @@
 using Newtonsoft.Json;
 using WebFormsToBlazorServerCommands.Templates;
 using CodeFactory.Formatting.CSharp;
+using System.Text;
 
 namespace WebFormsToBlazorServerCommands.Migration
 {
@@ -177,7 +178,6 @@ private async Task ConvertAspxPage(VsDocument sourcePage, VsProject targetProjec
 
                 //Drop the pageHeaderData into the Dictionary for later processing by any downstream T4 factories
                 conversionData.Add("HeaderData", pageHeaderData);
-                //just some status text for the dialog ( need to convert this to events )
 
                 //Getting the source code from the code behind file provided.
                 var codeSource = sourceCodeBehind?.SourceCode;
@@ -450,89 +450,60 @@ private async Task<Dictionary<string, string>> ReplaceAspControls(string sourceA
             var context = BrowsingContext.New(config);
             var scratchSource = sourceAspCode;
             var model = await context.OpenAsync(req => req.Content(sourceAspCode));
-            var parser = context.GetService<HtmlParser>();
-            var targetDOM = model.CreateDocumentFragment();
+            StringBuilder migratedSource = new StringBuilder();
 
-            var testElementsDesc = model.Descendents<IElement>();
-            var testNodesDesc = model.Descendents();
-            Element targetParentElement = null;
-
-            var domTree = model.Children;
-            
-            foreach (Element child in domTree)
+            try
             {
-                //append a clone of this element to the targetDOM
-                targetParentElement = targetDOM.AppendElement(child.Clone(false) as Element);
+                //Deal with HTML, HEAD and BODY tags (most *.aspx pages won't have these - but we still have to manage those that do)
+                //Look through the incoming sourceAspCode parameter and see if we have any of those three tags present.
+                var htmlTag = System.Text.RegularExpressions.Regex.Match(sourceAspCode, @"<HTML.*?>(.|\n)*?<\/HTML>", RegexOptions.IgnoreCase);
+                var headTag = System.Text.RegularExpressions.Regex.Match(sourceAspCode, @"<HEAD.*?>(.|\n)*?<\/HEAD>", RegexOptions.IgnoreCase);
+                var bodyTag = System.Text.RegularExpressions.Regex.Match(sourceAspCode, @"<BODY>(.|\n)*?<\/BODY>", RegexOptions.IgnoreCase);
 
-                //Process any children that this element may have, 
-                //The ProcessSourceElement will append the child node to the target and call itself recursively for any children of the child.
-                foreach (Element item in child.Children)
+                foreach (Element child in model.Children)
                 {
-                    ProcessSourceElement(item, ref targetParentElement, ref parser);
+                    //The first element will always be an HTML element as that gets added by the AngleSharp parser
+                    
+                    //Process the children which will be a HEAD tag and a BODY tag, at a minimum as added by the AngleSharp parser
+                    //The ProcessSourceElement will append the child node to the target and call itself recursively for any children of the child.
+                    foreach (Element item in child.Children)
+                    {
+                        if (item.NodeName.ToLower().Equals("head"))
+                        {
+                            //just take the value of the headTag Regex match from earlier in this method (there are no asp:* controls of any kind that live in the 
+                            //HEAD tag - so we can just copy it down to here)
+                            migratedSource.Append(headTag.Value);
+                        }
+                        if (item.NodeName.ToLower().Equals("body"))
+                        {
+                            //We go ahead and process this element.  Any children of the tag are actually handled by the ProcessSourceElement() method
+                            var migratedBodyElement = await ProcessSourceElement(item);
+                            if (!bodyTag.Success)
+                            {
+                                var matches = Regex.Match(migratedBodyElement, @"<body>([\S\s]*)<\/body>", RegexOptions.IgnoreCase);
+                                migratedSource.Append(matches.Groups[1].Value);
+                            } else
+                            {
+                                migratedSource.Append(migratedBodyElement);
+                            }
+                            
+                        }
+                    }
                 }
 
-            }
-
+                if (htmlTag.Success)
+                {
+                    migratedSource.Insert(0, @"<HTML>");
+                    migratedSource.Append(@"</HTML>");
+                }
 
-            //var aspContentTags = model.All.Where(p => p.LocalName.ToLower().Equals("asp:content"));
-            //if (aspContentTags.Any())
-            //{
-            //    result.Add("ContentPlaceHolderID", aspContentTags.First().Attributes.Select(p => p.Name.Equals("ContentPlaceHolderID")).First().ToString());
-            //    //There should only be a single asp:Content tag per aspx page
-            //}
-
-            ////Deal with asp:FormView tag
-            //var aspFormTags = model.All.Where(p => p.LocalName.ToLower().Equals("asp:formview")).ToList();
-            //foreach (var formObj in aspFormTags)
-            //{
-            //    var newNode = parser.ParseFragment($"<EditForm Model={formObj.GetAttribute("ItemType")} OnValidSubmit={formObj.GetAttribute("SelectMethod")}> </EditForm>", formObj);
-            //    //check for ItemTemplate tag and remove it.  There isn't one in Blazor/Razor
-            //    newNode.FirstOrDefault().AppendNodes(
-            //        formObj.Children.Any(p => p.TagName.ToLower().Equals("itemtemplate"))
-            //            ? formObj.Children.First(c => c.TagName.ToLower().Equals("itemtemplate")).Children.ToArray()
-            //            : formObj.ChildNodes.ToArray());
-            //    formObj.Replace(newNode.ToArray());
-
-            //    result.Add("ItemType", formObj.GetAttribute("ItemType"));
-            //    result.Add("SelectMethod", formObj.GetAttribute("SelectMethod"));
-
-            //    scratchSource = model.All.First(p => p.LocalName.ToLower().Equals("body")).InnerHtml;
-            //}
-
-            ////Look for any tags that have 'asp:' in them -- then drop the 'asp:' from it.
-            //var aspHelperTags = model.All.Where(p => p.LocalName.ToLower().Contains("asp:")).ToList();
-            //bool hasContentTag = false;
-            //foreach (var tagObj in aspHelperTags)
-            //{
-            //    if (tagObj.LocalName.ToLower().Contains("asp:content "))
-            //    {
-            //        hasContentTag = true;
-            //        continue;
-            //    }
-
-            //    //Removing the asp: tag from the html
-            //    var cleanedHtml = Regex.Replace(tagObj.OuterHtml, "asp:", "", RegexOptions.IgnoreCase);
-
-            //    //Having the cleanHtml reloaded into the parser.
-            //    var replacementTagNode = parser.ParseFragment(cleanedHtml, tagObj);
-
-            //    //Injecting the cleaned up parsed content back into the target tag in the dom. 
-            //    tagObj.Replace(replacementTagNode.ToArray());
-
-            //    //var replacementTagNode =
-            //    //        parser.ParseFragment(tagObj.OuterHtml.Replace("asp:", ""), tagObj);
-            //    //tagObj.Replace(replacementTagNode.ToArray());
-            //}
-
-            //scratchSource = hasContentTag
-            //        ? model.All.First(p => p.LocalName.ToLower().Equals("asp:content")).InnerHtml
-            //        : model.All.First(p => p.LocalName.ToLower().Equals("body")).InnerHtml;
-
-            scratchSource = targetDOM.Descendents<Element>().First(p => p.NodeName.ToLower().Equals("body")).InnerHtml;
-            //scratchSource = model.All.First(p => p.LocalName.ToLower().Equals("body")).InnerHtml;
-
-            result.Add("source", sourceAspCode);
-            result.Add("alteredSource", scratchSource);
+                result.Add("source", sourceAspCode);
+                result.Add("alteredSource", migratedSource.ToString());
+            }
+            catch (Exception ex)
+            {
+                throw;
+            }
 
             return result;
         }