tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #6123 from abpframework/cotur/ui-notification-service 

Remove Async Suffix from IUiMessageService
pull/6125/head
Halil İbrahim Kalkan 6 years ago
committed by GitHub
parent
d950752465 4a868ee018
commit
25e747fab7
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 25 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ExceptionHandling/UserExceptionInformer.cs
  2. 10
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Messages/SimpleUiMessageService.cs
  3. 10
      framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/Messages/IUiMessageService.cs
  4. 3
      framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/Notifications/IUiNotificationService.cs
  5. 10
      framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiMessageService.cs
  6. 2
      framework/src/Volo.Abp.BlazoriseUI/Components/EntityAction.razor.cs
  7. 6
      modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor.cs
  8. 2
      modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs

4
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ExceptionHandling/UserExceptionInformer.cs
View File

@ -31,11 +31,11 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.ExceptionHandling
if (errorInfo.Details.IsNullOrEmpty())
{
//TODO: Should we introduce MessageService.Error (sync) method instead of such a usage (without await)..?
MessageService.ErrorAsync(errorInfo.Message);
MessageService.Error(errorInfo.Message);
}
else
{
MessageService.ErrorAsync(errorInfo.Details, errorInfo.Message);
MessageService.Error(errorInfo.Details, errorInfo.Message);
}
}

10
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Messages/SimpleUiMessageService.cs
View File

@ -15,27 +15,27 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.Messages
JsRuntime = jsRuntime;
}
public async Task InfoAsync(string message, string title = null, Action<UiMessageOptions> options = null)
public async Task Info(string message, string title = null, Action<UiMessageOptions> options = null)
{
await JsRuntime.InvokeVoidAsync("alert", message);
}
public async Task SuccessAsync(string message, string title = null, Action<UiMessageOptions> options = null)
public async Task Success(string message, string title = null, Action<UiMessageOptions> options = null)
{
await JsRuntime.InvokeVoidAsync("alert", message);
}
public async Task WarnAsync(string message, string title = null, Action<UiMessageOptions> options = null)
public async Task Warn(string message, string title = null, Action<UiMessageOptions> options = null)
{
await JsRuntime.InvokeVoidAsync("alert", message);
}
public async Task ErrorAsync(string message, string title = null, Action<UiMessageOptions> options = null)
public async Task Error(string message, string title = null, Action<UiMessageOptions> options = null)
{
await JsRuntime.InvokeVoidAsync("alert", message);
}
public async Task<bool> ConfirmAsync(string message, string title = null, Action<UiMessageOptions> options = null)
public async Task<bool> Confirm(string message, string title = null, Action<UiMessageOptions> options = null)
{
return await JsRuntime.InvokeAsync<bool>("confirm", message);
}

10
framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/Messages/IUiMessageService.cs
View File

@ -5,14 +5,14 @@ namespace Volo.Abp.AspNetCore.Components.Messages
{
public interface IUiMessageService
{
Task InfoAsync(string message, string title = null, Action<UiMessageOptions> options = null);
Task Info(string message, string title = null, Action<UiMessageOptions> options = null);
Task SuccessAsync(string message, string title = null, Action<UiMessageOptions> options = null);
Task Success(string message, string title = null, Action<UiMessageOptions> options = null);
Task WarnAsync(string message, string title = null, Action<UiMessageOptions> options = null);
Task Warn(string message, string title = null, Action<UiMessageOptions> options = null);
Task ErrorAsync(string message, string title = null, Action<UiMessageOptions> options = null);
Task Error(string message, string title = null, Action<UiMessageOptions> options = null);
Task<bool> ConfirmAsync(string message, string title = null, Action<UiMessageOptions> options = null);
Task<bool> Confirm(string message, string title = null, Action<UiMessageOptions> options = null);
}
}

3
framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/Notifications/IUiNotificationService.cs
View File

@ -6,8 +6,11 @@ namespace Volo.Abp.AspNetCore.Components.Notifications
public interface IUiNotificationService
{
Task Info(string message, string title = null, Action<UiNotificationOptions> options = null);
Task Success(string message, string title = null, Action<UiNotificationOptions> options = null);
Task Warn(string message, string title = null, Action<UiNotificationOptions> options = null);
Task Error(string message, string title = null, Action<UiNotificationOptions> options = null);
}
}

10
framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiMessageService.cs
View File

@ -30,7 +30,7 @@ namespace Volo.Abp.BlazoriseUI
Logger = NullLogger<BlazoriseUiMessageService>.Instance;
}
public Task InfoAsync(string message, string title = null, Action<UiMessageOptions> options = null)
public Task Info(string message, string title = null, Action<UiMessageOptions> options = null)
{
var uiMessageOptions = CreateDefaultOptions();
options?.Invoke(uiMessageOptions);
@ -40,7 +40,7 @@ namespace Volo.Abp.BlazoriseUI
return Task.CompletedTask;
}
public Task SuccessAsync(string message, string title = null, Action<UiMessageOptions> options = null)
public Task Success(string message, string title = null, Action<UiMessageOptions> options = null)
{
var uiMessageOptions = CreateDefaultOptions();
options?.Invoke(uiMessageOptions);
@ -50,7 +50,7 @@ namespace Volo.Abp.BlazoriseUI
return Task.CompletedTask;
}
public Task WarnAsync(string message, string title = null, Action<UiMessageOptions> options = null)
public Task Warn(string message, string title = null, Action<UiMessageOptions> options = null)
{
var uiMessageOptions = CreateDefaultOptions();
options?.Invoke(uiMessageOptions);
@ -60,7 +60,7 @@ namespace Volo.Abp.BlazoriseUI
return Task.CompletedTask;
}
public Task ErrorAsync(string message, string title = null, Action<UiMessageOptions> options = null)
public Task Error(string message, string title = null, Action<UiMessageOptions> options = null)
{
var uiMessageOptions = CreateDefaultOptions();
options?.Invoke(uiMessageOptions);
@ -70,7 +70,7 @@ namespace Volo.Abp.BlazoriseUI
return Task.CompletedTask;
}
public Task<bool> ConfirmAsync(string message, string title = null, Action<UiMessageOptions> options = null)
public Task<bool> Confirm(string message, string title = null, Action<UiMessageOptions> options = null)
{
var uiMessageOptions = CreateDefaultOptions();
options?.Invoke(uiMessageOptions);

2
framework/src/Volo.Abp.BlazoriseUI/Components/EntityAction.razor.cs
View File

@ -56,7 +56,7 @@ namespace Volo.Abp.BlazoriseUI.Components
{
if (ConfirmationMessage != null)
{
if (await UiMessageService.ConfirmAsync(ConfirmationMessage()))
if (await UiMessageService.Confirm(ConfirmationMessage()))
{
await Clicked.InvokeAsync();
}

6
modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor.cs
View File

@ -43,7 +43,7 @@ namespace Volo.Abp.Account.Blazor.Pages.Account
if (ChangePasswordModel.NewPassword != ChangePasswordModel.NewPasswordConfirm)
{
await UiMessageService.WarnAsync(L["NewPasswordConfirmFailed"]);
await UiMessageService.Warn(L["NewPasswordConfirmFailed"]);
return;
}
@ -53,7 +53,7 @@ namespace Volo.Abp.Account.Blazor.Pages.Account
NewPassword = ChangePasswordModel.NewPassword
});
await UiMessageService.SuccessAsync(L["PasswordChanged"]);
await UiMessageService.Success(L["PasswordChanged"]);
}
protected async Task UpdatePersonalInfoAsync()
@ -62,7 +62,7 @@ namespace Volo.Abp.Account.Blazor.Pages.Account
ObjectMapper.Map<PersonalInfoModel, UpdateProfileDto>(PersonalInfoModel)
);
await UiMessageService.SuccessAsync(L["PersonalSettingsSaved"]);
await UiMessageService.Success(L["PersonalSettingsSaved"]);
}
}

2
modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs
View File

@ -108,7 +108,7 @@ namespace Volo.Abp.FeatureManagement.Blazor.Components
}
else
{
await UiMessageService.WarnAsync(L["Volo.Abp.FeatureManagement:InvalidFeatureValue", feature.DisplayName]);
await UiMessageService.Warn(L["Volo.Abp.FeatureManagement:InvalidFeatureValue", feature.DisplayName]);
}
}

Write Preview
Loading…
Cancel
Save