From 68ce2a23ce2d93518387ba3136c91d30bf15cf91 Mon Sep 17 00:00:00 2001 From: Ilkay Ilknur Date: Thu, 19 Nov 2020 11:04:03 +0300 Subject: [PATCH] move page alert infrastructure to the volo.abp.aspnetcore.components project. --- .../Components/WebAssembly/Alerts/AlertManager.cs | 3 ++- .../Components/WebAssembly/Alerts/IAlertManager.cs | 7 ------- .../Abp/AspNetCore/Components/AbpComponentBase.cs | 6 ++++++ .../Abp/AspNetCore/Components}/Alerts/AlertList.cs | 11 ++++++++--- .../AspNetCore/Components}/Alerts/AlertMessage.cs | 4 ++-- .../Abp/AspNetCore/Components}/Alerts/AlertType.cs | 10 ++++++++-- .../AspNetCore/Components/Alerts/IAlertManager.cs | 13 +++++++++++++ .../Volo.Abp.BlazoriseUI/Components/AlertWrapper.cs | 2 +- .../Components/PageAlert.razor.cs | 4 ++-- 9 files changed, 42 insertions(+), 18 deletions(-) delete mode 100644 framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Alerts/IAlertManager.cs rename framework/src/{Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly => Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components}/Alerts/AlertList.cs (82%) rename framework/src/{Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly => Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components}/Alerts/AlertMessage.cs (92%) rename framework/src/{Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly => Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components}/Alerts/AlertType.cs (52%) create mode 100644 framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/Alerts/IAlertManager.cs diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Alerts/AlertManager.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Alerts/AlertManager.cs index 290c36848a..02c1251f16 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Alerts/AlertManager.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Alerts/AlertManager.cs @@ -1,4 +1,5 @@ -using Volo.Abp.DependencyInjection; +using Volo.Abp.AspNetCore.Components.Alerts; +using Volo.Abp.DependencyInjection; namespace Volo.Abp.AspNetCore.Components.WebAssembly.Alerts { diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Alerts/IAlertManager.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Alerts/IAlertManager.cs deleted file mode 100644 index f30fe4c262..0000000000 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Alerts/IAlertManager.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Volo.Abp.AspNetCore.Components.WebAssembly.Alerts -{ - public interface IAlertManager - { - AlertList Alerts { get; } - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/AbpComponentBase.cs b/framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/AbpComponentBase.cs index 87740dbb76..0c78a3c784 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/AbpComponentBase.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/AbpComponentBase.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; +using Volo.Abp.AspNetCore.Components.Alerts; using Volo.Abp.AspNetCore.Components.Messages; using Volo.Abp.AspNetCore.Components.Notifications; using Volo.Abp.Localization; @@ -61,6 +62,11 @@ namespace Volo.Abp.AspNetCore.Components protected IUiNotificationService Notify => LazyGetNonScopedRequiredService(ref _notify); private IUiNotificationService _notify; + protected IAlertManager AlertManager => LazyGetNonScopedRequiredService(ref _alertManager); + private IAlertManager _alertManager; + + protected AlertList Alerts => AlertManager.Alerts; + protected IObjectMapper ObjectMapper { get diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Alerts/AlertList.cs b/framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/Alerts/AlertList.cs similarity index 82% rename from framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Alerts/AlertList.cs rename to framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/Alerts/AlertList.cs index 47a26ad9ea..866095a9b9 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Alerts/AlertList.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/Alerts/AlertList.cs @@ -1,6 +1,11 @@ -using System.Collections.ObjectModel; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace Volo.Abp.AspNetCore.Components.WebAssembly.Alerts +namespace Volo.Abp.AspNetCore.Components.Alerts { public class AlertList : ObservableCollection { @@ -29,4 +34,4 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.Alerts Add(new AlertMessage(AlertType.Success, text, title, dismissible)); } } -} \ No newline at end of file +} diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Alerts/AlertMessage.cs b/framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/Alerts/AlertMessage.cs similarity index 92% rename from framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Alerts/AlertMessage.cs rename to framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/Alerts/AlertMessage.cs index e8a8f3529a..1b6a7dd21d 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Alerts/AlertMessage.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/Alerts/AlertMessage.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; -namespace Volo.Abp.AspNetCore.Components.WebAssembly.Alerts +namespace Volo.Abp.AspNetCore.Components.Alerts { public class AlertMessage { @@ -27,4 +27,4 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.Alerts Dismissible = dismissible; } } -} \ No newline at end of file +} diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Alerts/AlertType.cs b/framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/Alerts/AlertType.cs similarity index 52% rename from framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Alerts/AlertType.cs rename to framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/Alerts/AlertType.cs index 6a61a9995f..4703158b12 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Alerts/AlertType.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/Alerts/AlertType.cs @@ -1,4 +1,10 @@ -namespace Volo.Abp.AspNetCore.Components.WebAssembly.Alerts +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Volo.Abp.AspNetCore.Components.Alerts { public enum AlertType { @@ -12,4 +18,4 @@ Light, Dark } -} \ No newline at end of file +} diff --git a/framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/Alerts/IAlertManager.cs b/framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/Alerts/IAlertManager.cs new file mode 100644 index 0000000000..542b576b01 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/Alerts/IAlertManager.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Volo.Abp.AspNetCore.Components.Alerts +{ + public interface IAlertManager + { + AlertList Alerts { get; } + } +} diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/AlertWrapper.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/AlertWrapper.cs index d5963a532f..fa3d878dcc 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/AlertWrapper.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/AlertWrapper.cs @@ -1,4 +1,4 @@ -using Volo.Abp.AspNetCore.Components.WebAssembly.Alerts; +using Volo.Abp.AspNetCore.Components.Alerts; namespace Volo.Abp.BlazoriseUI.Components { diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/PageAlert.razor.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/PageAlert.razor.cs index b0035b1f11..d952963295 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/PageAlert.razor.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/PageAlert.razor.cs @@ -5,7 +5,7 @@ using System.Linq; using Blazorise; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Routing; -using Volo.Abp.AspNetCore.Components.WebAssembly.Alerts; +using Volo.Abp.AspNetCore.Components.Alerts; namespace Volo.Abp.BlazoriseUI.Components { @@ -47,7 +47,7 @@ namespace Volo.Abp.BlazoriseUI.Components { Alerts.Add(new AlertWrapper { - AlertMessage = (AspNetCore.Components.WebAssembly.Alerts.AlertMessage)item, + AlertMessage = (AspNetCore.Components.Alerts.AlertMessage)item, IsVisible = true }); }