Skip to content

Commit 747e53f

Browse files
Brano5Brano5
authored
Clean Up from Dialogues (#196)
1 parent 47f4d2d commit 747e53f

File tree

8 files changed

+16
-121
lines changed

8 files changed

+16
-121
lines changed

‎src/AXSharp.abstractions/src/AXSharp.Abstractions/Dialogs/ActionDialog/IsDialog.cs‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/AXSharp.abstractions/src/AXSharp.Abstractions/Dialogs/AlertDialog/AlertDialogServiceBase.cs‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎src/AXSharp.abstractions/src/AXSharp.Abstractions/Dialogs/AlertDialog/IAlertDialog.cs‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/AXSharp.abstractions/src/AXSharp.Abstractions/Dialogs/AlertDialog/IAlertDialogService.cs‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/AXSharp.Presentation.Blazor.Controls.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@
8787
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
8888
</PackageReference>
8989
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.10" />
90-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="7.0.5" />
91-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="1.1.0" />
9290
</ItemGroup>
9391

9492
<ItemGroup>

‎src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/RenderableContent/RenderableComponentBase.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
using AXSharp.Presentation.Blazor.Interfaces;
1717
using AXSharp.Connector.ValueTypes.Online;
1818
using System.Xml.Linq;
19-
using AXSharp.Abstractions.Dialogs.AlertDialog;
2019

2120
namespace AXSharp.Presentation.Blazor.Controls.RenderableContent
2221
{
@@ -27,10 +26,6 @@ public partial class RenderableComponentBase : ComponentBase, IRenderableCompone
2726
{
2827
[Parameter] public int PollingInterval { get; set; }
2928

30-
[CascadingParameter]
31-
public IAlertDialogService AlertDialogService { get; set; }
32-
33-
3429
///<inheritdoc/>
3530
public virtual void Dispose()
3631
{

‎src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/RenderableContent/RenderableContentControl.cs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
using System.Reflection;
2121
using System.ComponentModel;
2222
using AXSharp.Connector.ValueTypes;
23-
using AXSharp.Abstractions.Dialogs.AlertDialog;
2423

2524
namespace AXSharp.Presentation.Blazor.Controls.RenderableContent
2625
{
@@ -85,20 +84,6 @@ public string Presentation
8584
private Type _groupContainer { get; set; }
8685
public Type MainLayoutType { get; set; }
8786

88-
89-
private IAlertDialogService _alertDialogService;
90-
91-
[Parameter]
92-
public IAlertDialogService AlertDialogService {
93-
get
94-
{
95-
if(_alertDialogService == null)
96-
_alertDialogService = new AlertDialogServiceBase();
97-
return _alertDialogService;
98-
}
99-
set => _alertDialogService = value;
100-
}
101-
10287
private ITwinElement _context { get; set; }
10388
protected override void OnInitialized()
10489
{

‎src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/RenderableContent/RenderableContentControl.razor‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
@*This class is view part of RenderableContentControl. It contains UI generation pipeline.*@
22

33
@*Call rendering method over context object*@
4-
<CascadingValue Value="@AlertDialogService">
5-
<div name="@_context.Symbol.Replace(".","-")" class="@Class">
6-
@RenderComponent(_context)
7-
</div>
8-
</CascadingValue>
4+
<div name="@_context.Symbol.Replace(".","-")" class="@Class">
5+
@RenderComponent(_context)
6+
</div>
97

108

119

@@ -69,9 +67,9 @@
6967
var name = String.IsNullOrEmpty(child.AttributeName) ? child.GetSymbolTail() : child.AttributeName;
7068
//otherwise is value tag or has mainLayout set, add children layout and continue
7169
<ChildrenLayoutPropSetter ChildName="@name"
72-
ChildrenLayout="@parentLayout"
73-
ChildContent="@Generator(child,null)"
74-
Class="@LayoutChildrenClass" />
70+
ChildrenLayout="@parentLayout"
71+
ChildContent="@Generator(child,null)"
72+
Class="@LayoutChildrenClass" />
7573
}
7674
canEnumerate = enumerator.MoveNext();
7775
}
@@ -82,10 +80,10 @@
8280
var groupContainer = TryLoadGroupTypeFromProperty(child);
8381

8482
<GroupLayoutSetter ParentLayout="@parentLayout"
85-
GroupLayout="@groupLayout"
86-
GroupContainer="@groupContainer"
87-
GroupName="@group.GroupName"
88-
LayoutClass="@LayoutClass">
83+
GroupLayout="@groupLayout"
84+
GroupContainer="@groupContainer"
85+
GroupName="@group.GroupName"
86+
LayoutClass="@LayoutClass">
8987
@RenderGroup(group, groupLayout)
9088
</GroupLayoutSetter>
9189

@@ -109,9 +107,9 @@
109107
{
110108
var name = String.IsNullOrEmpty(child.AttributeName) ? child.GetSymbolTail() : child.AttributeName;
111109
<ChildrenLayoutPropSetter ChildName="@name"
112-
ChildrenLayout="@groupLayout"
113-
ChildContent="@Generator(child, groupLayout)"
114-
Class="@LayoutChildrenClass" />
110+
ChildrenLayout="@groupLayout"
111+
ChildContent="@Generator(child, groupLayout)"
112+
Class="@LayoutChildrenClass" />
115113
}
116114
}
117115

@@ -147,9 +145,9 @@
147145
{
148146
var name = String.IsNullOrEmpty(twin.AttributeName) ? twin.GetSymbolTail() : twin.AttributeName;
149147
<ChildrenLayoutPropSetter ChildName="@name"
150-
ChildrenLayout="layout"
151-
ChildContent="@CreateComplexComponent(twin, component)"
152-
Class="@LayoutChildrenClass" />
148+
ChildrenLayout="layout"
149+
ChildContent="@CreateComplexComponent(twin, component)"
150+
Class="@LayoutChildrenClass" />
153151
}
154152
else
155153
{

0 commit comments

Comments
 (0)