fix popup display message

veepee-oss · Jun 29, 2023 · 1ae06a5 · 1ae06a5
1 parent 191a1fc
commit 1ae06a5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 17 deletions.
diff --git a/KafkaTester.csproj b/KafkaTester.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Confluent.Kafka" Version="1.6.3" />
+    <PackageReference Include="Confluent.Kafka" Version="2.1.1" />
   </ItemGroup>
 
 </Project>
diff --git a/Pages/Tester.razor b/Pages/Tester.razor
@@ -140,7 +140,7 @@ else
 
 <div class="modal fade" id="seeMessageModal" tabindex="-1" role="dialog">
     <div class="modal-dialog modal-lg modal-dialog-centered" role="document">
-        @if (_selectedMessage != null)
+        @*@if (_selectedMessage != null)*@
         {
             <div class="modal-content">
                 <div class="modal-header">
@@ -150,7 +150,11 @@ else
                     </button>
                 </div>
                 <div class="modal-body">
-                    <pre><code class="@(IsValidJson(_selectedMessage.Message) ? "language-json" : "nohighlight")">Loading...</code></pre>
+                    <pre>
+                        <code class="@(IsValidJson(_selectedMessage.Message) ? "language-json" : "nohighlight")">
+                            _selectedMessage.Message
+                        </code>
+                     </pre>
                 </div>
                 <div class="modal-subbody">
                     <div class="headers">

diff --git a/Pages/Tester.razor.cs b/Pages/Tester.razor.cs
@@ -30,7 +30,7 @@ public partial class Tester
         private bool _isSearch;
         private CancellationTokenSource _cancellationToken;
         private KafkaMessage _newMessage = new KafkaMessage();
-        private KafkaMessage _selectedMessage;
+        private KafkaMessage _selectedMessage = new KafkaMessage();
         private bool _isFiltered = false;
         private readonly LinkedList<KafkaMessage> _messages = new();
         private ICollection<KafkaMessage> _filterMessages => _isFiltered ? _messages.Where(DoFilter).ToArray() : _messages;

diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "KafkaTester": {
       "commandName": "Project",
-      "dotnetRunMessages": "true",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
       "applicationUrl": "http://localhost:5000",
       "environmentVariables": {

diff --git a/wwwroot/js/site.js b/wwwroot/js/site.js
@@ -29,18 +29,7 @@ window.closeTopicSelectionModal = () => {
     $('#topicSelectionModal').modal('hide');
 };
 
-var shownEventLoaded = false;
 window.openSeeMessageModal = (message) => {
-
-    if (!shownEventLoaded) {
-        $('#seeMessageModal').on('shown.bs.modal', function() {
-            $("#seeMessageModal pre code").html(hljs.highlightAuto(message).value)
-        });
-        $('#seeMessageModal').on('hidden.bs.modal', function () {
-            $("#seeMessageModal pre code").html("Loading...")
-        });
-        shownEventLoaded = true;
-    }
-
+    $("#seeMessageModal pre code").html(hljs.highlightAuto(message).value)
     $('#seeMessageModal').modal('show');
 };