Merge branch 'rel-4.3' of https://github.com/abpframework/abp into rel-4.3

6 years ago · 52fe825c4f
12 changed files with 79 additions and 16 deletions
--- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs
@ -45,19 +45,26 @@ namespace Volo.Abp.AspNetCore.Auditing
            var hasError = false;
            using (var saveHandle = _auditingManager.BeginScope())
            {
+                Debug.Assert(_auditingManager.Current != null);
+
                try
                {
                    await next(context);

-                    Debug.Assert(_auditingManager.Current != null);
                    if (_auditingManager.Current.Log.Exceptions.Any())
                    {
                        hasError = true;
                    }
                }
-                catch (Exception)
+                catch (Exception ex)
                {
                    hasError = true;
+
+                    if (!_auditingManager.Current.Log.Exceptions.Contains(ex))
+                    {
+                        _auditingManager.Current.Log.Exceptions.Add(ex);
+                    }
+
                    throw;
                }
                finally
--- a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor
@ -12,7 +12,8 @@
                  ValueField="item=>item.Value"
                  SelectedValue="@SelectedValue"
                  SelectedValueChanged="@SelectedValueChanged"
-                  SearchChanged="@SearchFilterChangedAsync">
+                  SearchChanged="@SearchFilterChangedAsync"
+                  MinLength="0">
    </Autocomplete>
 </Field>
 
--- a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor.cs
@ -96,14 +96,26 @@ namespace Volo.Abp.BlazoriseUI.Components.ObjectExtending
            return selectItems;
        }

-        protected virtual void SelectedValueChanged(object selectedItem)
+        protected virtual Task SelectedValueChanged(object selectedItem)
        {
            SelectedValue = selectedItem;
+
+            return Task.CompletedTask;
        }

        protected async Task SearchFilterChangedAsync(string filter)
        {
            lookupItems = await GetLookupItemsAsync(filter);
        }
+
+        protected override async Task OnAfterRenderAsync(bool firstRender)
+        {
+            await base.OnAfterRenderAsync(firstRender);
+
+            if (firstRender)
+            {
+                await SearchFilterChangedAsync(string.Empty);
+            }
+        }
    }
 }
--- a/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
+++ b/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
@ -14,10 +14,10 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Blazorise" Version="0.9.3.3" />
-        <PackageReference Include="Blazorise.DataGrid" Version="0.9.3.3" />
-        <PackageReference Include="Blazorise.Snackbar" Version="0.9.3.3" />
-        <PackageReference Include="Blazorise.Components" Version="0.9.3.3" />
+        <PackageReference Include="Blazorise" Version="0.9.3.4" />
+        <PackageReference Include="Blazorise.DataGrid" Version="0.9.3.4" />
+        <PackageReference Include="Blazorise.Snackbar" Version="0.9.3.4" />
+        <PackageReference Include="Blazorise.Components" Version="0.9.3.4" />
    </ItemGroup>

 </Project>
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController.cs
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController.cs
@ -31,10 +31,18 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
        {
            throw new UserFriendlyException("Exception occurred!");
        }
+
        [Route("audit-fail-object")]
        public object AuditFailForGetRequestsReturningObject()
        {
            throw new UserFriendlyException("Exception occurred!");
        }
+
+        [HttpGet]
+        [Route("audit-activate-failed")]
+        public IActionResult AuditActivateFailed([FromServices] AbpAuditingOptions options)
+        {
+            return Ok();
+        }
    }
 }
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController_Tests.cs
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController_Tests.cs
@ -74,5 +74,20 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing

            await _auditingStore.Received().SaveAsync(Arg.Any<AuditLogInfo>());
        }
+
+        [Fact]
+        public async Task Should_Trigger_Middleware_And_AuditLog_Exception_When_Activate_Controller_Failed()
+        {
+            _options.IsEnabledForGetRequests = true;
+            _options.AlwaysLogOnException = true;
+
+            try
+            {
+                await GetResponseAsync("api/audit-test/audit-activate-failed", System.Net.HttpStatusCode.InternalServerError);
+            }
+            catch { }
+
+            await _auditingStore.Received().SaveAsync(Arg.Is<AuditLogInfo>(x => x.Exceptions.Any()));
+        }
    }
 }
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestPage.cshtml.cs
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestPage.cshtml.cs
@ -34,5 +34,10 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
        {
            throw new UserFriendlyException("Exception occurred!");
        }
+
+        public IActionResult OnGetAuditActivateFailed([FromServices] AbpAuditingOptions options)
+        {
+            return new OkResult();
+        }
    }
 }
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestPage_Tests.cs
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestPage_Tests.cs
@ -73,5 +73,20 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing

            await _auditingStore.Received().SaveAsync(Arg.Any<AuditLogInfo>());
        }
+
+        [Fact]
+        public async Task Should_Trigger_Middleware_And_AuditLog_Exception_When_Activate_Page_Failed()
+        {
+            _options.IsEnabledForGetRequests = true;
+            _options.AlwaysLogOnException = true;
+
+            try
+            {
+                await GetResponseAsync("/Auditing/AuditTestPage?handler=AuditActivateFailed", System.Net.HttpStatusCode.InternalServerError);
+            }
+            catch { }
+
+            await _auditingStore.Received().SaveAsync(Arg.Is<AuditLogInfo>(x => x.Exceptions.Any()));
+        }
    }
 }
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
@ -12,8 +12,8 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.3.3" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.3" />
+    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.3.4" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.4" />
    <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
    <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.*" />
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
@ -12,8 +12,8 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.3.3" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.3" />
+    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.3.4" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.4" />
    <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
    <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
  </ItemGroup>
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
@ -8,8 +8,8 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.3.3" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.3" />
+    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.3.4" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.4" />
    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.*" />
    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.*" />
  </ItemGroup>
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj
@ -8,8 +8,8 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.3.3" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.3" />
+    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.3.4" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.4" />
    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly"  Version="5.0.*" />
    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.*" />
  </ItemGroup>