Clean Up from Dialogues (#196)

ix-ax · Jul 24, 2023 · 747e53f · 747e53f
1 parent 47f4d2d
commit 747e53f
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 121 deletions.
diff --git a/src/AXSharp.abstractions/src/AXSharp.Abstractions/Dialogs/ActionDialog/IsDialog.cs b/src/AXSharp.abstractions/src/AXSharp.Abstractions/Dialogs/ActionDialog/IsDialog.cs
diff --git a/...Sharp.abstractions/src/AXSharp.Abstractions/Dialogs/AlertDialog/AlertDialogServiceBase.cs b/...Sharp.abstractions/src/AXSharp.Abstractions/Dialogs/AlertDialog/AlertDialogServiceBase.cs
diff --git a/src/AXSharp.abstractions/src/AXSharp.Abstractions/Dialogs/AlertDialog/IAlertDialog.cs b/src/AXSharp.abstractions/src/AXSharp.Abstractions/Dialogs/AlertDialog/IAlertDialog.cs
diff --git a/src/AXSharp.abstractions/src/AXSharp.Abstractions/Dialogs/AlertDialog/IAlertDialogService.cs b/src/AXSharp.abstractions/src/AXSharp.Abstractions/Dialogs/AlertDialog/IAlertDialogService.cs
diff --git a/...azor/src/AXSharp.Presentation.Blazor.Controls/AXSharp.Presentation.Blazor.Controls.csproj b/...azor/src/AXSharp.Presentation.Blazor.Controls/AXSharp.Presentation.Blazor.Controls.csproj
@@ -87,8 +87,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="7.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="1.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...zor/src/AXSharp.Presentation.Blazor.Controls/RenderableContent/RenderableComponentBase.cs b/...zor/src/AXSharp.Presentation.Blazor.Controls/RenderableContent/RenderableComponentBase.cs
@@ -16,7 +16,6 @@
 using AXSharp.Presentation.Blazor.Interfaces;
 using AXSharp.Connector.ValueTypes.Online;
 using System.Xml.Linq;
-using AXSharp.Abstractions.Dialogs.AlertDialog;
 
 namespace AXSharp.Presentation.Blazor.Controls.RenderableContent
 {
@@ -27,10 +26,6 @@ public partial class RenderableComponentBase : ComponentBase, IRenderableCompone
     {
         [Parameter] public int PollingInterval { get; set; }
 
-        [CascadingParameter]
-        public IAlertDialogService AlertDialogService { get; set; }
-
-
         ///<inheritdoc/>        
         public virtual void Dispose()
         {

diff --git a/...or/src/AXSharp.Presentation.Blazor.Controls/RenderableContent/RenderableContentControl.cs b/...or/src/AXSharp.Presentation.Blazor.Controls/RenderableContent/RenderableContentControl.cs
@@ -20,7 +20,6 @@
 using System.Reflection;
 using System.ComponentModel;
 using AXSharp.Connector.ValueTypes;
-using AXSharp.Abstractions.Dialogs.AlertDialog;
 
 namespace AXSharp.Presentation.Blazor.Controls.RenderableContent
 {
@@ -85,20 +84,6 @@ public string Presentation
         private Type _groupContainer { get; set; }
         public Type MainLayoutType { get; set; }
 
-
-        private IAlertDialogService _alertDialogService;
-
-        [Parameter]
-        public IAlertDialogService AlertDialogService {
-            get
-            {
-                if(_alertDialogService == null)
-                    _alertDialogService = new AlertDialogServiceBase();
-                return _alertDialogService;
-            }
-            set => _alertDialogService = value;
-        }
-
         private ITwinElement _context { get; set; }
         protected override void OnInitialized()
         {

diff --git a/...src/AXSharp.Presentation.Blazor.Controls/RenderableContent/RenderableContentControl.razor b/...src/AXSharp.Presentation.Blazor.Controls/RenderableContent/RenderableContentControl.razor
@@ -1,11 +1,9 @@
 @*This class is view part of RenderableContentControl. It contains UI generation pipeline.*@
 
 @*Call rendering method over context object*@
-<CascadingValue Value="@AlertDialogService">
-    <div name="@_context.Symbol.Replace(".","-")" class="@Class">
-        @RenderComponent(_context)
-    </div>
-</CascadingValue>
+<div name="@_context.Symbol.Replace(".","-")" class="@Class">
+    @RenderComponent(_context)
+</div>
 
 
 
@@ -69,9 +67,9 @@
                     var name = String.IsNullOrEmpty(child.AttributeName) ? child.GetSymbolTail() : child.AttributeName;
                     //otherwise is value tag or has mainLayout set, add children layout and continue
                     <ChildrenLayoutPropSetter ChildName="@name"
-                          ChildrenLayout="@parentLayout"
-                          ChildContent="@Generator(child,null)"
-                          Class="@LayoutChildrenClass" />
+                                              ChildrenLayout="@parentLayout"
+                                              ChildContent="@Generator(child,null)"
+                                              Class="@LayoutChildrenClass" />
                 }
                 canEnumerate = enumerator.MoveNext();
             }
@@ -82,10 +80,10 @@
                 var groupContainer = TryLoadGroupTypeFromProperty(child);
 
                 <GroupLayoutSetter ParentLayout="@parentLayout"
-                   GroupLayout="@groupLayout"
-                   GroupContainer="@groupContainer"
-                   GroupName="@group.GroupName"
-                   LayoutClass="@LayoutClass">
+                                   GroupLayout="@groupLayout"
+                                   GroupContainer="@groupContainer"
+                                   GroupName="@group.GroupName"
+                                   LayoutClass="@LayoutClass">
                     @RenderGroup(group, groupLayout)
                 </GroupLayoutSetter>
 
@@ -109,9 +107,9 @@
             {
                 var name = String.IsNullOrEmpty(child.AttributeName) ? child.GetSymbolTail() : child.AttributeName;
                 <ChildrenLayoutPropSetter ChildName="@name"
-                          ChildrenLayout="@groupLayout"
-                          ChildContent="@Generator(child, groupLayout)"
-                          Class="@LayoutChildrenClass" />
+                                          ChildrenLayout="@groupLayout"
+                                          ChildContent="@Generator(child, groupLayout)"
+                                          Class="@LayoutChildrenClass" />
             }
         }
 
@@ -147,9 +145,9 @@
         {
             var name = String.IsNullOrEmpty(twin.AttributeName) ? twin.GetSymbolTail() : twin.AttributeName;
             <ChildrenLayoutPropSetter ChildName="@name"
-                          ChildrenLayout="layout"
-                          ChildContent="@CreateComplexComponent(twin, component)"
-                          Class="@LayoutChildrenClass" />
+                                      ChildrenLayout="layout"
+                                      ChildContent="@CreateComplexComponent(twin, component)"
+                                      Class="@LayoutChildrenClass" />
         }
         else
         {