fix issues

fast-programmer · Sep 30, 2024 · 6739956 · 6739956
1 parent d16934e
commit 6739956
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 28 deletions.
diff --git a/lib/outboxer/web.rb b/lib/outboxer/web.rb
@@ -439,6 +439,14 @@ def normalise_query_string(status: Messages::LIST_STATUS_DEFAULT,
         per_page: denormalised_query_params[:per_page],
         time_zone: denormalised_query_params[:time_zone])
 
+      normalised_query_string = normalise_query_string(
+        status: denormalised_query_params[:status],
+        sort: denormalised_query_params[:sort],
+        order: denormalised_query_params[:order],
+        page: denormalised_query_params[:page],
+        per_page: denormalised_query_params[:per_page],
+        time_zone: denormalised_query_params[:time_zone])
+
       messages_metrics = Messages.metrics
 
       message = Message.find_by_id(id: params[:id])
@@ -449,6 +457,7 @@ def normalise_query_string(status: Messages::LIST_STATUS_DEFAULT,
       erb :message, locals: {
         denormalised_query_params: denormalised_query_params,
         normalised_query_params: normalised_query_params,
+        normalised_query_string: normalised_query_string,
         messages_metrics: messages_metrics,
         message: message,
         messageable: messageable

diff --git a/lib/outboxer/web/views/message.erb b/lib/outboxer/web/views/message.erb
@@ -1,4 +1,4 @@
-<div class="container my-4"<div class="container my-4">
+<div class="container my-4">
     <div class="card">
         <div class="card-header d-flex justify-content-between align-items-center">
             <h3 class="mb-0">Message <%= message[:id] %></h3>
@@ -16,6 +16,7 @@
                 <!-- Delete Form -->
                 <form action="<%= outboxer_path("/message/#{message[:id]}/delete") %>" method="post" style="display: inline;"
                     onsubmit="return confirm('Are you sure you want to delete this message?');">
+
                     <% normalised_query_params.each do |key, param| %>
                         <input type="hidden" name="<%= key %>" value="<%= param %>">
                     <% end %>
@@ -32,6 +33,14 @@
                         <th scope="row">Id</th>
                         <td><%= message[:id] %></td>
                     </tr>
+                    <tr>
+                        <th scope="row">Messageable</th>
+                        <td>
+                            <a href="<%= outboxer_path("/message/#{message[:id]}/messageable#{normalised_query_string}") %>" class="custom-link">
+                                <%= message[:messageable_type] %>::<%= message[:messageable_id] %>
+                            </a>
+                        </td>
+                    </tr>
                     <tr>
                         <th scope="row">Status</th>
                         <td><%= message[:status] %></td>
@@ -48,35 +57,8 @@
                         <th scope="row">Updated By</th>
                         <td><%= message[:updated_by] %></td>
                     </tr>
-                    <tr>
-                        <th scope="row">Messageable</th>
-                        <td>
-                            <%= message[:messageable_type] %>::<%= message[:messageable_id] %><br/><br/>
-
-                            <div class="nested-table-wrapper mt-2">
-                                <table class="table table-bordered">
-                                    <tbody>
-                                        <% messageable.attributes.each do |key, value| %>
-                                            <tr>
-                                                <th scope="row" class="w-25"><%= key.humanize %></th>
-                                                <td>
-                                                    <% if value.is_a?(Hash) || value.is_a?(Array) %>
-                                                        <pre class="mb-0"><%= JSON.pretty_generate(value) %></pre>
-                                                    <% else %>
-                                                        <%= value %>
-                                                    <% end %>
-                                                </td>
-                                            </tr>
-                                        <% end %>
-                                    </tbody>
-                                </table>
-                            </div>
-                        </td>
-                    </tr>
                 </tbody>
             </table>
-
-            <!-- Exceptions Accordion -->
             <div class="accordion" id="exceptionsAccordion">
                 <% message[:exceptions].each_with_index do |exception, index| %>
                     <div class="accordion-item">