Fix Set Parent bugs

EasyMicroservices · Jan 18, 2024 · 14ae9a7 · 14ae9a7
1 parent 83ef348
commit 14ae9a7
Show file tree

Hide file tree

Showing 13 changed files with 63 additions and 13 deletions.
diff --git a/...services.UI.TemplateGenerator.Blazor/EasyMicroservices.UI.TemplateGenerator.Blazor.csproj b/...services.UI.TemplateGenerator.Blazor/EasyMicroservices.UI.TemplateGenerator.Blazor.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <Authors>EasyMicroservices</Authors>
     <IsPackable>true</IsPackable>
-    <Version>0.0.0.34</Version>
+    <Version>0.0.0.35</Version>
     <Description>TemplateGenerator UI compoents.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>component,microcomponent,ui,core,templategenerator,generator,template,form,formgenerator</PackageTags>

diff --git a/...yMicroservices.UI.TemplateGenerator.Blazor/Pages/Generators/Components/CardFormItem.razor b/...yMicroservices.UI.TemplateGenerator.Blazor/Pages/Generators/Components/CardFormItem.razor
@@ -9,7 +9,7 @@
 @implements IParentComponent
 
 <MudRTLProvider RightToLeft="BaseViewModel.IsRightToLeft">
-    <FormItemListGenerator @ref="Control" FormItems="@viewModel.FormItem?.Items"/>
+    <FormItemListGenerator @ref="Control" FormItem="@viewModel.FormItem"/>
 </MudRTLProvider>
 
 @code {
@@ -34,6 +34,9 @@
     protected override void OnAfterRender(bool firstRender)
     {
         base.OnAfterRender(firstRender);
+        if (Parent != null && viewModel.FormItem != null)
+            ComponentPool.SetParent(Parent, this, viewModel.FormItem);
+
         if (viewModel.FormItem != null && Control != null)
         {
             Control.Parent = this;

diff --git a/...ces.UI.TemplateGenerator.Blazor/Pages/Generators/Components/HorizontalStackFormItem.razor b/...ces.UI.TemplateGenerator.Blazor/Pages/Generators/Components/HorizontalStackFormItem.razor
@@ -43,7 +43,10 @@
     protected override void OnAfterRender(bool firstRender)
     {
         base.OnAfterRender(firstRender);
-        if (Controls.All(x => ((FormItemSingleItemGenerator)x).ViewModel.FormItem != null))
+        if (Parent != null && viewModel.FormItem != null)
+            ComponentPool.SetParent(Parent, this, viewModel.FormItem);
+
+        if (Controls.All(x => ((FormItemSingleItemGenerator)x).ViewModel.FormItem != null) && Controls.Count == viewModel.FormItem?.Items?.Count)
         {
             foreach (var item in Controls)
             {

diff --git a/...croservices.UI.TemplateGenerator.Blazor/Pages/Generators/Components/NavMenuFormItem.razor b/...croservices.UI.TemplateGenerator.Blazor/Pages/Generators/Components/NavMenuFormItem.razor
@@ -43,7 +43,10 @@
     protected override void OnAfterRender(bool firstRender)
     {
         base.OnAfterRender(firstRender);
-        if (Controls.All(x => ((FormItemSingleItemGenerator)x).ViewModel.FormItem != null))
+        if (Parent != null && viewModel.FormItem != null)
+            ComponentPool.SetParent(Parent, this, viewModel.FormItem);
+
+        if (Controls.All(x => ((FormItemSingleItemGenerator)x).ViewModel.FormItem != null) && Controls.Count == viewModel.FormItem?.Items?.Count)
         {
             foreach (var item in Controls)
             {

diff --git a/...rvices.UI.TemplateGenerator.Blazor/Pages/Generators/Components/NavMenuGroupFormItem.razor b/...rvices.UI.TemplateGenerator.Blazor/Pages/Generators/Components/NavMenuGroupFormItem.razor
@@ -43,7 +43,10 @@
     protected override void OnAfterRender(bool firstRender)
     {
         base.OnAfterRender(firstRender);
-        if (Controls.All(x => ((FormItemSingleItemGenerator)x).ViewModel.FormItem != null))
+        if (Parent != null && viewModel.FormItem != null)
+            ComponentPool.SetParent(Parent, this, viewModel.FormItem);
+
+        if (Controls.All(x => ((FormItemSingleItemGenerator)x).ViewModel.FormItem != null) && Controls.Count == viewModel.FormItem?.Items?.Count)
         {
             foreach (var item in Controls)
             {

diff --git a/...ervices.UI.TemplateGenerator.Blazor/Pages/Generators/Components/NavMenuLinkFormItem.razor b/...ervices.UI.TemplateGenerator.Blazor/Pages/Generators/Components/NavMenuLinkFormItem.razor
@@ -40,7 +40,10 @@
     protected override void OnAfterRender(bool firstRender)
     {
         base.OnAfterRender(firstRender);
-        if (Controls.All(x => ((FormItemSingleItemGenerator)x).ViewModel.FormItem != null))
+        if (Parent != null && viewModel.FormItem != null)
+            ComponentPool.SetParent(Parent, this, viewModel.FormItem);
+
+        if (Controls.All(x => ((FormItemSingleItemGenerator)x).ViewModel.FormItem != null) && Controls.Count == viewModel.FormItem?.Items?.Count)
         {
             foreach (var item in Controls)
             {

diff --git a/...vices.UI.TemplateGenerator.Blazor/Pages/Generators/Components/VerticalStackFormItem.razor b/...vices.UI.TemplateGenerator.Blazor/Pages/Generators/Components/VerticalStackFormItem.razor
@@ -12,7 +12,7 @@
     <MudStack Spacing="5">
         @foreach (var formItem in viewModel.FormItem?.Items?.OrderBy(x => x.Index))
         {
-            <FormItemSingleItemGenerator @ref=Control FormItem="@formItem" />
+            <FormItemSingleItemGenerator @ref="ChildControl" FormItem="@formItem" />
         }
     </MudStack>
 </MudRTLProvider>
@@ -39,7 +39,10 @@
     protected override void OnAfterRender(bool firstRender)
     {
         base.OnAfterRender(firstRender);
-        if (Controls.All(x => ((FormItemSingleItemGenerator)x).ViewModel.FormItem != null))
+        if (Parent != null && viewModel.FormItem != null)
+            ComponentPool.SetParent(Parent, this, viewModel.FormItem);
+
+        if (Controls.All(x => ((FormItemSingleItemGenerator)x).ViewModel.FormItem != null) && Controls.Count == viewModel.FormItem?.Items?.Count)
         {
             foreach (var item in Controls)
             {
@@ -50,7 +53,7 @@
     }
 
     List<IParentComponent> Controls = new List<IParentComponent>();
-    public IParentComponent Control
+    public IParentComponent ChildControl
     {
         set
         {

diff --git a/...asyMicroservices.UI.TemplateGenerator.Blazor/Pages/Generators/FormItemListGenerator.razor b/...asyMicroservices.UI.TemplateGenerator.Blazor/Pages/Generators/FormItemListGenerator.razor
@@ -35,10 +35,24 @@
         }
     }
 
+    [Parameter]
+    [Category("Behavior")]
+    public FormItemContract FormItem
+    {
+        set
+        {
+            viewModel.FormItem = value;
+            _ = viewModel.InitializeFormItems(value.Items);
+        }
+    }
+
     protected override void OnAfterRender(bool firstRender)
     {
         base.OnAfterRender(firstRender);
-        if (Controls.All(x => ((FormItemSingleItemGenerator)x).ViewModel.FormItem != null))
+        if (Parent != null && viewModel.FormItem != null)
+            ComponentPool.SetParent(Parent, this, viewModel.FormItem);
+
+        if (Controls.Count == viewModel.FormItems.Count)
         {
             foreach (var item in Controls)
             {

diff --git a/...teGenerator.ProcessExecutor/EasyMicroservices.UI.TemplateGenerator.ProcessExecutor.csproj b/...teGenerator.ProcessExecutor/EasyMicroservices.UI.TemplateGenerator.ProcessExecutor.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <Authors>EasyMicroservices</Authors>
     <IsPackable>true</IsPackable>
-    <Version>0.0.0.34</Version>
+    <Version>0.0.0.35</Version>
     <Description>TemplateGenerator process maker core</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>component,microcomponent,ui,core,templategenerator,generator,template,form,formgenerator</PackageTags>

diff --git a/...res/EasyMicroservices.UI.TemplateGenerator.ProcessExecutor/Helpers/TreeComponentHelper.cs b/...res/EasyMicroservices.UI.TemplateGenerator.ProcessExecutor/Helpers/TreeComponentHelper.cs
@@ -16,6 +16,20 @@ public ICollection<IComponent> GetAllComponents(IComponent component)
         return items;
     }
 
+    public IComponent FindByInstance(object instance)
+    {
+        if (Root == null)
+            return null;
+        return GetAllComponents(Root).FirstOrDefault(x => x.ControlInstance == instance);
+    }
+
+    public IComponent FindByValueInstance(object instance)
+    {
+        if (Root == null)
+            return null;
+        return GetAllComponents(Root).FirstOrDefault(x => x.ValueInstance == instance);
+    }
+
     public IComponent GetRoot(IComponent component)
     {
         IComponent current = component;

diff --git a/...arp/Cores/EasyMicroservices.UI.TemplateGenerator.ProcessExecutor/Interfaces/IComponent.cs b/...arp/Cores/EasyMicroservices.UI.TemplateGenerator.ProcessExecutor/Interfaces/IComponent.cs
@@ -2,7 +2,11 @@
 public interface IComponent
 {
     string LocalVariableName { get; }
+    object ControlInstance { get; set; }
+    object ValueInstance { get; set; }
     IComponent Parent { get; set; }
     ICollection<IComponent> Children { get; }
     void AddChild(IComponent component);
+    void AddChildren(IEnumerable<IComponent> components);
+    void RemoveChild(IComponent component);
 }
diff --git a/....UI.TemplateGenerator.ViewModels/EasyMicroservices.UI.TemplateGenerator.ViewModels.csproj b/....UI.TemplateGenerator.ViewModels/EasyMicroservices.UI.TemplateGenerator.ViewModels.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <Authors>EasyMicroservices</Authors>
     <IsPackable>true</IsPackable>
-    <Version>0.0.0.34</Version>
+    <Version>0.0.0.35</Version>
     <Description>TemplateGenerator view model.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>component,microcomponent,ui,core,templategenerator,generator,template,form,formgenerator</PackageTags>

diff --git a/...s.UI.TemplateGenerator.ViewModels/ViewModels/Generators/FormItemListGeneratorViewModel.cs b/...s.UI.TemplateGenerator.ViewModels/ViewModels/Generators/FormItemListGeneratorViewModel.cs
@@ -3,7 +3,7 @@
 using TemplateGenerators.GeneratedServices;
 
 namespace EasyMicroservices.UI.TemplateGenerator.ViewModels.Generators;
-public class FormItemListGeneratorViewModel : BaseViewModel
+public class FormItemListGeneratorViewModel : BaseGeneratorViewModel
 {
     public FormItemListGeneratorViewModel()
     {