Merge pull request #9670 from abpframework/auto-merge/rel-4-4/497

Merge branch dev with rel-4.4

framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/LocalEventBus.cs

@@ -30,17 +30,13 @@ namespace Volo.Abp.EventBus.Local
 
         protected ConcurrentDictionary<Type, List<IEventHandlerFactory>> HandlerFactories { get; }
 
-        protected IJsonSerializer Serializer { get; }
-
         public LocalEventBus(
             IOptions<AbpLocalEventBusOptions> options,
             IServiceScopeFactory serviceScopeFactory,
             ICurrentTenant currentTenant,
-            IEventErrorHandler errorHandler,
+            IEventErrorHandler errorHandler)
-            IJsonSerializer serializer)
             : base(serviceScopeFactory, currentTenant, errorHandler)
         {
-            Serializer = serializer;
             Options = options.Value;
             Logger = NullLogger<LocalEventBus>.Instance;
 
@@ -131,10 +127,9 @@ namespace Volo.Abp.EventBus.Local
 
         public virtual async Task PublishAsync(LocalEventMessage localEventMessage)
         {
-            var rawEventData = Serializer.Serialize(localEventMessage.EventData);
             await TriggerHandlersAsync(localEventMessage.EventType, localEventMessage.EventData, errorContext =>
             {
-                errorContext.EventData = Serializer.Deserialize(localEventMessage.EventType, rawEventData);
+                errorContext.EventData = localEventMessage.EventData;
                 errorContext.SetProperty(nameof(LocalEventMessage.MessageId), localEventMessage.MessageId);
             });
         }

framework/test/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/Local/EventBus_Exception_Handler_Tests.cs

@@ -33,9 +33,7 @@ namespace Volo.Abp.EventBus.Local
             LocalEventBus.Subscribe<MyExceptionHandleEventData>(eventData =>
             {
                 eventData.Value.ShouldBe(0);
-
                 retryAttempt++;
-                eventData.Value++;
                 if (retryAttempt < 2)
                 {
                     throw new Exception("This exception is intentionally thrown!");
@@ -58,7 +56,6 @@ namespace Volo.Abp.EventBus.Local
                 eventData.Value.ShouldBe(0);
 
                 retryAttempt++;
-                eventData.Value++;
 
                 throw new Exception("This exception is intentionally thrown!");
             });

npm/ng-packs/packages/theme-shared/src/lib/constants/styles.ts

@@ -149,7 +149,7 @@ export default `
 .ngx-datatable.material {
   box-shadow: none;
 }
-ngb-typeahead-window {
+ngb-typeahead-window, ngb-typeahead-window.dropdown-menu {
   max-height: 25em;
   overflow-y: scroll !important;
   z-index: 1050;