From b9c9922540fb324e40f2180681e982a0308e31c3 Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Sun, 18 Nov 2018 20:23:19 +0100
Subject: [PATCH] Fixes in Admin UI

---
 .../EventConsumers/EventConsumersController.cs  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs b/src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs
index 1a7c459a7..0f770adff 100644
--- a/src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs
+++ b/src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs
@@ -20,12 +20,12 @@ namespace Squidex.Areas.Api.Controllers.EventConsumers
 {
     public sealed class EventConsumersController : ApiController
     {
-        private readonly IEventConsumerManagerGrain eventConsumerManagerGrain;
+        private readonly IGrainFactory grainFactory;
 
         public EventConsumersController(ICommandBus commandBus, IGrainFactory grainFactory)
             : base(commandBus)
         {
-            eventConsumerManagerGrain = grainFactory.GetGrain<IEventConsumerManagerGrain>(SingleGrain.Id);
+            this.grainFactory = grainFactory;
         }
 
         [HttpGet]
@@ -33,7 +33,7 @@ namespace Squidex.Areas.Api.Controllers.EventConsumers
         [ApiPermission(Permissions.AdminEventsRead)]
         public async Task<IActionResult> GetEventConsumers()
         {
-            var entities = await eventConsumerManagerGrain.GetConsumersAsync();
+            var entities = await GetGrain().GetConsumersAsync();
 
             var response = entities.Value.OrderBy(x => x.Name).Select(EventConsumerDto.FromEventConsumerInfo).ToList();
 
@@ -45,7 +45,7 @@ namespace Squidex.Areas.Api.Controllers.EventConsumers
         [ApiPermission(Permissions.AdminEventsManage)]
         public async Task<IActionResult> Start(string name)
         {
-            await eventConsumerManagerGrain.StartAsync(name);
+            await GetGrain().StartAsync(name);
 
             return NoContent();
         }
@@ -55,7 +55,7 @@ namespace Squidex.Areas.Api.Controllers.EventConsumers
         [ApiPermission(Permissions.AdminEventsManage)]
         public async Task<IActionResult> Stop(string name)
         {
-            await eventConsumerManagerGrain.StopAsync(name);
+            await GetGrain().StopAsync(name);
 
             return NoContent();
         }
@@ -65,9 +65,14 @@ namespace Squidex.Areas.Api.Controllers.EventConsumers
         [ApiPermission(Permissions.AdminEventsManage)]
         public async Task<IActionResult> Reset(string name)
         {
-            await eventConsumerManagerGrain.ResetAsync(name);
+            await GetGrain().ResetAsync(name);
 
             return NoContent();
         }
+
+        private IEventConsumerManagerGrain GetGrain()
+        {
+            return grainFactory.GetGrain<IEventConsumerManagerGrain>(SingleGrain.Id);
+        }
     }
 }