fix!: update dashboard and client app routes to kafkaflow

Farfetch · Sep 19, 2023 · 4e37f85 · 4e37f85
1 parent cf040de
commit 4e37f85
Show file tree

Hide file tree

Showing 21 changed files with 948 additions and 220 deletions.
diff --git a/samples/KafkaFlow.Sample.BatchOperations/Program.cs b/samples/KafkaFlow.Sample.BatchOperations/Program.cs
@@ -30,7 +30,7 @@
                 .AddConsumer(
                     consumerBuilder => consumerBuilder
                         .Topic(batchTestTopic)
-                        .WithGroupId("kafka-flow-sample")
+                        .WithGroupId("kafkaflow-sample")
                         .WithBufferSize(10000)
                         .WithWorkersCount(1)
                         .AddMiddlewares(

diff --git a/samples/KafkaFlow.Sample.Dashboard/README.md b/samples/KafkaFlow.Sample.Dashboard/README.md
@@ -27,4 +27,4 @@ Using your terminal of choice, start the sample for the sample folder.
 dotnet run
 ```
 
-The dashboard UI will be available at `/kafka-flow`. 
+The dashboard UI will be available at `/kafkaflow`. 
diff --git a/samples/KafkaFlow.Sample.Dashboard/Startup.cs b/samples/KafkaFlow.Sample.Dashboard/Startup.cs
@@ -20,8 +20,8 @@ public void ConfigureServices(IServiceCollection services)
                         const string topicName = "topic-dashboard";
                         cluster
                             .WithBrokers(new[] { "localhost:9092" })
-                            .EnableAdminMessages("kafka-flow.admin", "kafka-flow.admin.group.id")
-                            .EnableTelemetry("kafka-flow.admin", "kafka-flow.telemetry.group.id")
+                            .EnableAdminMessages("kafkaflow.admin", "kafkaflow.admin.group.id")
+                            .EnableTelemetry("kafkaflow.admin", "kafkaflow.telemetry.group.id")
                             .CreateTopicIfNotExists(topicName, 3, 1)
                             .AddConsumer(
                                 consumer =>

diff --git a/samples/KafkaFlow.Sample.WebApi/Program.cs b/samples/KafkaFlow.Sample.WebApi/Program.cs
@@ -10,7 +10,7 @@
         .AddCluster(
             cluster => cluster
                 .WithBrokers(new[] { "localhost:9092" })
-                .EnableAdminMessages("kafka-flow.admin")
+                .EnableAdminMessages("kafkaflow.admin")
         )
 );
 
@@ -19,11 +19,11 @@
         c =>
         {
             c.SwaggerDoc(
-                "kafka-flow",
+                "kafkaflow",
                 new OpenApiInfo
                 {
                     Title = "KafkaFlow Admin",
-                    Version = "kafka-flow",
+                    Version = "kafkaflow",
                 });
         })
     .AddControllers();
@@ -37,7 +37,7 @@
 app.UseSwagger();
 app.UseSwaggerUI(c =>
 {
-    c.SwaggerEndpoint("/swagger/kafka-flow/swagger.json", "KafkaFlow Admin");
+    c.SwaggerEndpoint("/swagger/kafkaflow/swagger.json", "KafkaFlow Admin");
 });
 
 var kafkaBus = app.Services.CreateKafkaBus();

diff --git a/src/KafkaFlow.Admin.Dashboard/ApplicationBuilderExtensions.cs b/src/KafkaFlow.Admin.Dashboard/ApplicationBuilderExtensions.cs
@@ -16,7 +16,7 @@ namespace KafkaFlow.Admin.Dashboard
     public static class ApplicationBuilderExtensions
     {
         /// <summary>
-        /// Enable the KafkaFlow dashboard. The path will be `/kafka-flow`
+        /// Enable the KafkaFlow dashboard. The path will be `/kafkaflow`
         /// </summary>
         /// <param name="app">Instance of <see cref="IApplicationBuilder"/></param>
         /// <returns></returns>

diff --git a/src/KafkaFlow.Admin.Dashboard/ClientApp/angular.json b/src/KafkaFlow.Admin.Dashboard/ClientApp/angular.json
@@ -29,7 +29,7 @@
             "customWebpackConfig": {
               "path": "./webpack.config.js"
             },
-            "baseHref": "/kafka-flow/",
+            "baseHref": "/kafkaflow/",
             "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
@@ -143,4 +143,4 @@
     }
   },
   "defaultProject": "dashboard"
-}
+}
diff --git a/src/KafkaFlow.Admin.Dashboard/ClientApp/dist/index.html b/src/KafkaFlow.Admin.Dashboard/ClientApp/dist/index.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <title>KafkaFlow - Dashboard</title>
-  <base href="/kafka-flow/">
+  <base href="/kafkaflow/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css" integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l" crossorigin="anonymous">

diff --git a/src/KafkaFlow.Admin.Dashboard/ClientApp/dist/main.js b/src/KafkaFlow.Admin.Dashboard/ClientApp/dist/main.js
diff --git a/src/KafkaFlow.Admin.Dashboard/ClientApp/src/environments/environment.prod.ts b/src/KafkaFlow.Admin.Dashboard/ClientApp/src/environments/environment.prod.ts
@@ -1,4 +1,4 @@
 export const environment = {
   production: true,
-  apiUrl: "/kafka-flow"
+  apiUrl: "/kafkaflow"
 };
diff --git a/src/KafkaFlow.Admin.Dashboard/ClientApp/src/environments/environment.ts b/src/KafkaFlow.Admin.Dashboard/ClientApp/src/environments/environment.ts
@@ -4,7 +4,7 @@
 
 export const environment = {
   production: false,
-  apiUrl: 'http://localhost:5000/kafka-flow'
+  apiUrl: 'http://localhost:5000/kafkaflow'
 };
 
 /*

diff --git a/src/KafkaFlow.Admin.Dashboard/DashboardConfigurationBuilder.cs b/src/KafkaFlow.Admin.Dashboard/DashboardConfigurationBuilder.cs
@@ -6,7 +6,7 @@ namespace KafkaFlow.Admin.Dashboard
 
     internal class DashboardConfigurationBuilder : IDashboardConfigurationBuilder
     {
-        private readonly PathString basePath = "/kafka-flow";
+        private readonly PathString basePath = "/kafkaflow";
 
         private Action<IApplicationBuilder> requestHandler = _ => { };
         private Action<IEndpointConventionBuilder> endpointHandler = _ => { };

diff --git a/src/KafkaFlow.Admin.WebApi/Controllers/ConsumersController.cs b/src/KafkaFlow.Admin.WebApi/Controllers/ConsumersController.cs
@@ -12,7 +12,7 @@ namespace KafkaFlow.Admin.WebApi.Controllers
     /// <summary>
     /// Consumers controller
     /// </summary>
-    [Route("kafka-flow/groups/{groupId}/consumers")]
+    [Route("kafkaflow/groups/{groupId}/consumers")]
     [ApiController]
     public class ConsumersController : ControllerBase
     {
@@ -23,7 +23,7 @@ public class ConsumersController : ControllerBase
         /// Initializes a new instance of the <see cref="ConsumersController"/> class.
         /// </summary>
         /// <param name="consumers">The accessor class that provides access to the consumers</param>
-        /// <param name="adminProducer">The producer to publish admin messages</param>
+        /// <param name="consumerAdmin">The admin messages consumer</param>
         public ConsumersController(IConsumerAccessor consumers, IConsumerAdmin consumerAdmin)
         {
             this.consumers = consumers;

diff --git a/src/KafkaFlow.Admin.WebApi/Controllers/GroupsController.cs b/src/KafkaFlow.Admin.WebApi/Controllers/GroupsController.cs
@@ -12,7 +12,7 @@ namespace KafkaFlow.Admin.WebApi.Controllers
     /// <summary>
     /// Groups controller
     /// </summary>
-    [Route("kafka-flow/groups")]
+    [Route("kafkaflow/groups")]
     [ApiController]
     public class GroupsController : ControllerBase
     {
@@ -23,7 +23,7 @@ public class GroupsController : ControllerBase
         /// Initializes a new instance of the <see cref="GroupsController"/> class.
         /// </summary>
         /// <param name="consumers">The accessor class that provides access to the consumers</param>
-        /// <param name="adminProducer">The producer to publish admin messages</param>
+        /// <param name="consumerAdmin">The admin messages consumer</param>
         public GroupsController(IConsumerAccessor consumers, IConsumerAdmin consumerAdmin)
         {
             this.consumers = consumers;

diff --git a/src/KafkaFlow.Admin.WebApi/Controllers/TelemetryController.cs b/src/KafkaFlow.Admin.WebApi/Controllers/TelemetryController.cs
@@ -7,7 +7,7 @@ namespace KafkaFlow.Admin.WebApi.Controllers
     /// <summary>
     /// Telemetry controller
     /// </summary>
-    [Route("kafka-flow/telemetry")]
+    [Route("kafkaflow/telemetry")]
     [ApiController]
     public class TelemetryController : ControllerBase
     {

diff --git a/src/KafkaFlow.Admin/Handlers/PauseConsumerByNameHandler.cs b/src/KafkaFlow.Admin/Handlers/PauseConsumerByNameHandler.cs
@@ -27,4 +27,4 @@ public Task Handle(IMessageContext context, PauseConsumerByName message)
             return Task.CompletedTask;
         }
     }
-}
+}
diff --git a/src/KafkaFlow.Admin/Handlers/RewindConsumerOffsetToDateTimeHandler.cs b/src/KafkaFlow.Admin/Handlers/RewindConsumerOffsetToDateTimeHandler.cs
@@ -4,7 +4,7 @@ namespace KafkaFlow.Admin.Handlers
     using System.Linq;
     using System.Threading.Tasks;
     using Confluent.Kafka;
-    using Extensions;
+    using KafkaFlow.Admin.Extensions;
     using KafkaFlow.Admin.Messages;
     using KafkaFlow.Consumers;
     using KafkaFlow.TypedHandler;

diff --git a/src/KafkaFlow.IntegrationTests/ProducerTest.cs b/src/KafkaFlow.IntegrationTests/ProducerTest.cs
@@ -23,7 +23,6 @@ public void Setup()
             MessageStorage.Clear();
         }
 
-
         [TestMethod]
         public async Task ProduceNullKeyTest()
         {