webhukhs 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99b94333e5ec2959d8096f909a5370fccc5b68b9388e0a7028584a5cb334d660
-  data.tar.gz: 85c0dfd6138967c9c9f0fca36666ed07f7a9b714a608c34b13ed725d73dff67f
+  metadata.gz: 4ffeb74619482ef4f9e42e69a58768c40ce5db996de005b0edd305bf44aacdb0
+  data.tar.gz: a812b122d5d561c47626fea17f0e06869545b6a06302f9b9de4ece966409b5ce
 SHA512:
-  metadata.gz: 1ee87b2fb85e85a69493977d30cc21bbba0831d5b69973d560d4229260fdd7357a1a343c7da3634b503817827632e7f6ab8c1f5b92cd081030f11c68a8086053
-  data.tar.gz: e2820a7337b24bf51cc85e400889969f4744102c3ddc3948df9ae051d2baa96af6a8ae6ffad329cac90952f9d32362232ee2cd2a812dd7059fb04b9fabcb5ed1
+  metadata.gz: 8efe8a18da360410eb87cd5d38ef2ee1788240bc6ced802660be235703f1805036b30f51846157cf9f535ad84888f16f7d8eae67f68d24cdd33fafa2cc0bcccb
+  data.tar.gz: 87997be0db27c11cfa17659360cd1a0673811473af0f356c6d3ed77ad1e1a56b2759a3c1d0c721a5355377f3015ca90f3788694063056a01e2684aad9b4eeecf

data/CHANGELOG.md

@@ -5,6 +5,12 @@ This format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 
 ## Unreleased
 
+### Changed
+- Admin URLs no longer include `/received`.
+- Restrict admin sorting to ID, with an ascending/descending toggle, to avoid expensive column sorts.
+- Abbreviate UUIDs to their first and last 4 characters in the admin listing, keeping the full ID on hover.
+- Group the admin listing's Received and Updated timestamps in the rightmost columns.
+
 ## 0.8.1
 
 ### Fixed

data/README.md

@@ -76,7 +76,11 @@ Now you will be able to accept webhooks on `/webhooks/example` path.
 
 Webhukhs comes with a read-only admin for looking at the webhooks you have received: a sortable,
 filterable list, and a page per webhook with its body (pretty-printed when it is JSON) and the
-request headers it arrived with. It is not loaded by default - require it in your Gemfile (it has to be
+request headers it arrived with.
+
+![Webhukhs admin listing with compact UUIDs, status filters, and received and updated timestamps](.github/screenshots/admin-id-sorting.png)
+
+It is not loaded by default - require it in your Gemfile (it has to be
 loaded before the app boots, so `config/routes.rb` is too late):
 
 ```ruby
@@ -92,6 +96,9 @@ Rails.application.routes.draw do
 end
 ```
 
+The list lives at the mount point itself (`/admin/webhooks` above), with each webhook at
+`/admin/webhooks/:id`.
+
 The admin does no authentication of its own, and webhook bodies tend to carry personal data and
 secrets - so mount it behind whatever guards the rest of your admin. For example, with Devise:
 
@@ -121,8 +128,13 @@ no build step.
 To try it out, run `bin/dev` from a checkout of this repository. It starts the app in `example`
 with some webhooks seeded, and the admin at http://localhost:3000/admin/webhukhs.
 
-The list defaults to descending ID order using the existing primary-key index; no extra migration is
-needed. Click **Received** to sort by timestamp instead.
+The list sorts only by ID, descending by default, using the existing primary-key index; no extra
+migration is needed. Click **ID** to switch between ascending and descending order. Other columns
+are not sortable, avoiding expensive sorts on large webhook tables. Handler and status filters are
+still available.
+
+UUIDs are abbreviated in the list, for example `01a1..6e51`; hover over the ID to see the full
+value. Detail pages and copied IDs retain the full UUID.
 
 **We strongly recommend against UUIDv4 primary keys.** Use UUIDv7 or auto-incrementing integer IDs
 instead. UUIDv4 IDs are random, so sorting by ID does not reflect creation time, and inserts have

data/lib/webhukhs/admin/assets/admin.css

@@ -339,7 +339,7 @@ p.muted {
 }
 
 .cell-id {
-  max-width: 14ch;
+  max-width: 16ch;
 }
 
 .header-value {

data/lib/webhukhs/admin/config/routes.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Webhukhs::Admin::Engine.routes.draw do
-  resources :received_webhooks, only: [:index, :show], path: "received"
+  resources :received_webhooks, only: [:index, :show], path: ""
   root to: "received_webhooks#index"
 end

data/lib/webhukhs/admin/received_webhooks_controller.rb

@@ -8,8 +8,6 @@ module Webhukhs
     class ReceivedWebhooksController < ApplicationController
       # Webhooks per index page
       PAGE_SIZE = 50
-      # Additional sortable columns beyond the default id order
-      SORTABLE_COLUMNS = %w[created_at updated_at handler_module_name handler_event_id status].freeze
 
       helper_method :handler_options, :status_options
 
@@ -17,17 +15,14 @@ module Webhukhs
       #
       # @return [void]
       def index
-        @sort = params[:sort].presence_in(SORTABLE_COLUMNS) || "id"
         @direction = (params[:direction] == "asc") ? "asc" : "desc"
         @page = [params[:page].to_i, 1].max
 
         filters = {handler_module_name: params[:handler], status: params[:status]}.compact_blank
 
-        # Most columns have plenty of ties (status especially), and without a tiebreaker the DB is free
-        # to return them in a different order for every OFFSET - rows then repeat or vanish between pages
         rows = ReceivedWebhook
           .where(filters)
-          .order(@sort => @direction, "id" => @direction)
+          .order(id: @direction)
           .offset((@page - 1) * PAGE_SIZE)
           .limit(PAGE_SIZE + 1)
         @next_page = @page + 1 if rows.length > PAGE_SIZE

data/lib/webhukhs/admin/view_helper.rb

@@ -4,6 +4,20 @@ module Webhukhs
   module Admin
     # Table-building helpers for the admin views.
     module ViewHelper
+      # Canonical UUID format, independent of UUID version.
+      UUID_RE = /\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\z/
+
+      # Displays the first 4 and last 4 UUID characters, keeping the full ID on hover.
+      #
+      # @param uuid_str [String] ID to display
+      # @return [String, ActiveSupport::SafeBuffer]
+      def short_id(uuid_str)
+        return uuid_str unless UUID_RE.match?(uuid_str)
+
+        shortened = [uuid_str.first(4), uuid_str.last(4)].join("..")
+        content_tag(:abbr, shortened, title: uuid_str)
+      end
+
       # Renders a table inside a scroll container. Cells are `white-space: nowrap`, so one long
       # column would otherwise take the whole page sideways with it.
       #
@@ -22,19 +36,14 @@ module Webhukhs
         tag.div(tag.table(safe_join([thead, tag.tbody(safe_join(rows))]), class: "admin-table"), class: "table-scroll")
       end
 
-      # Column header linking to the index sorted by that column. Clicking the active column
-      # flips the direction, any other column starts out descending.
+      # ID column header linking to the index with the sort direction reversed.
       #
-      # @param label [String] header text
-      # @param column [String] column to sort by
-      # @param sort [String] currently sorted column
       # @param direction [String] current direction, "asc" or "desc"
       # @return [ActiveSupport::SafeBuffer]
-      def sort_link(label, column, sort:, direction:)
-        active = column == sort
-        next_direction = (active && direction == "desc") ? "asc" : "desc"
-        query = request.query_parameters.except("page").merge("sort" => column, "direction" => next_direction)
-        label = safe_join([label, tag.span((direction == "asc") ? "▲" : "▼", class: "sort-arrow")], " ") if active
+      def sort_link(direction:)
+        next_direction = (direction == "desc") ? "asc" : "desc"
+        query = request.query_parameters.except("page", "sort").merge("direction" => next_direction)
+        label = safe_join(["Id", tag.span((direction == "asc") ? "▲" : "▼", class: "sort-arrow")], " ")
         link_to(label, query, class: "sort-link")
       end
 

data/lib/webhukhs/admin/views/webhukhs/admin/received_webhooks/index.html.erb

@@ -9,33 +9,32 @@
 </div>
 
 <%= form_tag received_webhooks_path, method: :get, class: "filters" do %>
-  <%= hidden_field_tag :sort, @sort, id: nil %>
   <%= hidden_field_tag :direction, @direction, id: nil %>
   <%= select_tag :handler, options_for_select([["Any handler", ""]] + handler_options, params[:handler]), "aria-label": "Handler" %>
   <%= select_tag :status, options_for_select([["Any status", ""]] + status_options.map { |status, _| [status.humanize, status] }, params[:status]), "aria-label": "Status" %>
   <%= submit_tag "Filter", name: nil %>
-  <%= link_to "Clear", received_webhooks_path(sort: @sort, direction: @direction) %>
+  <%= link_to "Clear", received_webhooks_path(direction: @direction) %>
 <% end %>
 
 <%
   columns = [
-    ["Id", "id"],
-    ["Received", "created_at"],
-    ["Handler", "handler_module_name"],
-    ["Status", "status"],
-    ["Event id", "handler_event_id"],
-    ["Updated", "updated_at"]
-  ].map { |label, column| sort_link(label, column, sort: @sort, direction: @direction) }
+    sort_link(direction: @direction),
+    "Handler",
+    "Status",
+    "Event id",
+    "Received",
+    "Updated"
+  ]
 %>
 <div id="received-webhooks">
 <%# The id cell carries the link, and the CSS stretches it over the whole row %>
 <%= admin_table(columns, @webhooks) do |webhook|
   [
-    link_to(tag.code(webhook.id, class: "cell-ellipsis cell-id", title: webhook.id), received_webhook_path(webhook), class: "row-link"),
-    time_tag(webhook.created_at, webhook.created_at.iso8601),
+    link_to(tag.code(short_id(webhook.id.to_s), class: "cell-ellipsis cell-id"), received_webhook_path(webhook), class: "row-link", title: webhook.id, "aria-label": webhook.id),
     webhook.handler_module_name,
     tag.span(webhook.status, class: ["badge", webhook.status_class]),
     tag.code(webhook.handler_event_id, class: "cell-ellipsis", title: webhook.handler_event_id),
+    time_tag(webhook.created_at, webhook.created_at.iso8601),
     time_tag(webhook.updated_at, webhook.updated_at.iso8601)
   ]
 end %>

data/lib/webhukhs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Webhukhs
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/test/admin_test.rb

@@ -20,48 +20,97 @@ class AdminTest < ActionDispatch::IntegrationTest
   end
 
   def listed_event_ids
-    css_select("table.admin-table tbody tr td:nth-child(5) code").map(&:text)
+    css_select("table.admin-table tbody tr td:nth-child(4) code").map(&:text)
   end
 
   test "lists webhooks by descending id regardless of received time by default" do
     create_webhook(handler_event_id: "first", created_at: 1.day.ago)
     create_webhook(handler_event_id: "last", created_at: 2.days.ago)
 
-    get "/admin/received"
+    get "/admin"
 
     assert_response :ok
     assert_equal ["last", "first"], listed_event_ids
     # The whole row is the link, so it has to be there in the first cell
-    assert_select "tbody tr td:first-child a.row-link[href^='/admin/received/']", count: 2
-    assert_select "th a.sort-link[href=?]", "/admin/received?direction=asc&sort=id", text: "Id ▼"
-    assert_select "th a.sort-link[href=?]", "/admin/received?direction=desc&sort=created_at", text: "Received"
+    assert_select "tbody tr td:first-child a.row-link[href^='/admin/']", count: 2
+    assert_select "th a.sort-link[href=?]", "/admin/?direction=asc", text: "Id ▼"
+    assert_select "th a", count: 1
     assert_select "th a.sort-link span.sort-arrow", text: "▼", count: 1
-    assert_select "th a.sort-link[href=?]", "/admin/received?direction=desc&sort=status", text: "Status"
+    assert_equal ["Id ▼", "Handler", "Status", "Event id", "Received", "Updated"], css_select("th").map(&:text)
+  end
+
+  test "groups receipt and update timestamps in the rightmost columns" do
+    webhook = create_webhook(created_at: 2.days.ago, updated_at: 1.day.ago)
+
+    get "/admin"
+
+    assert_select "tbody tr td:nth-child(5) time[datetime=?]", webhook.created_at.iso8601
+    assert_select "tbody tr td:nth-child(6) time[datetime=?]", webhook.updated_at.iso8601
   end
 
   test "sorts by id in ascending order when requested" do
     create_webhook(handler_event_id: "first", created_at: 1.day.ago)
     create_webhook(handler_event_id: "last", created_at: 2.days.ago)
 
-    get "/admin/received", params: {sort: "id", direction: "asc"}
+    get "/admin", params: {direction: "asc"}
 
     assert_equal ["first", "last"], listed_event_ids
-    assert_select "th a.sort-link[href=?]", "/admin/received?direction=desc&sort=id", text: "Id ▲"
+    assert_select "th a.sort-link[href=?]", "/admin/?direction=desc", text: "Id ▲"
+  end
+
+  test "short_id abbreviates UUIDs in an abbr with the full id as its title" do
+    {
+      "01a1895c-806f-7518-a388-c6c6a4496e51" => "01a1..6e51",
+      "01A1895C-806F-7518-A388-C6C6A4496E51" => "01A1..6E51",
+      "f47ac10b-58cc-4372-a567-0e02b2c3d479" => "f47a..d479"
+    }.each do |id, label|
+      assert_equal %(<abbr title="#{id}">#{label}</abbr>), Webhukhs::Admin::ApplicationController.helpers.short_id(id)
+    end
+  end
+
+  test "short_id leaves non-UUID strings unchanged" do
+    uuid = "01a1895c-806f-7518-a388-c6c6a4496e51"
+    ids = ["123", "manual-id", "prefix#{uuid}", "#{uuid}suffix", "#{uuid}\n"]
+    groups = uuid.split("-")
+    groups.each_index do |index|
+      [groups[index][0...-1], "#{groups[index]}0", "g#{groups[index][1..]}"].each do |invalid_group|
+        ids << groups.each_with_index.map { |group, i| (i == index) ? invalid_group : group }.join("-")
+      end
+    end
+
+    ids.each do |id|
+      assert_equal id, Webhukhs::Admin::ApplicationController.helpers.short_id(id)
+    end
+  end
+
+  test "keeps the full id in the row link and hover text" do
+    webhook = create_webhook
+
+    get "/admin"
+
+    assert_select "a.row-link[href=?][title=?][aria-label=?]", "/admin/#{webhook.id}", webhook.id.to_s, webhook.id.to_s do
+      assert_select "code.cell-id", text: webhook.id.to_s
+      assert_select "abbr", count: 0
+    end
   end
 
-  test "still sorts by received time when explicitly requested" do
-    create_webhook(handler_event_id: "new", created_at: 1.day.ago)
-    create_webhook(handler_event_id: "old", created_at: 2.days.ago)
+  test "ignores legacy sort columns in either direction" do
+    create_webhook(handler_event_id: "z", status: "skipped", created_at: 1.day.ago, updated_at: 1.hour.ago)
+    create_webhook(handler_event_id: "a", handler_module_name: "PrivateHandler", status: "error", created_at: 2.days.ago, updated_at: 2.hours.ago)
 
-    get "/admin/received", params: {sort: "created_at"}
+    %w[created_at updated_at handler_module_name handler_event_id status].each do |column|
+      get "/admin", params: {sort: column, direction: "desc"}
+      assert_equal ["a", "z"], listed_event_ids, column
 
-    assert_equal ["new", "old"], listed_event_ids
+      get "/admin", params: {sort: column, direction: "asc"}
+      assert_equal ["z", "a"], listed_event_ids, column
+    end
   end
 
   test "offers an auto-refresh switch, off by default, for the listing it refetches" do
     create_webhook
 
-    get "/admin/received"
+    get "/admin"
 
     assert_select ".page-heading label.switch input#auto-refresh[type=checkbox][role=switch]:not([checked])"
     # admin.js swaps this element for the one in the refetched page
@@ -76,33 +125,8 @@ class AdminTest < ActionDispatch::IntegrationTest
 
     assert_response :ok
     assert_equal ["at-root"], listed_event_ids
-  end
-
-  test "sorts by a whitelisted column in either direction" do
-    create_webhook(handler_event_id: "b", status: "skipped")
-    create_webhook(handler_event_id: "a", status: "error")
-
-    get "/admin/received", params: {sort: "status", direction: "asc"}
-    assert_equal ["a", "b"], listed_event_ids
-    # Clicking the active column again flips the direction
-    assert_select "th a.sort-link[href=?]", "/admin/received?direction=desc&sort=status", text: "Status ▲"
-
-    get "/admin/received", params: {sort: "status", direction: "desc"}
-    assert_equal ["b", "a"], listed_event_ids
-  end
-
-  test "breaks ties by id in the sort direction, so pages do not overlap" do
-    # Event ids run opposite to ids: SQLite walks the dedup index on (handler_module_name,
-    # handler_event_id) to sort by handler, and would order the ties by event id otherwise
-    first = create_webhook(handler_event_id: "z")
-    second = create_webhook(handler_event_id: "a")
-    assert_operator first.id, :<, second.id
-
-    get "/admin/received", params: {sort: "handler_module_name", direction: "desc"}
-    assert_equal ["a", "z"], listed_event_ids
-
-    get "/admin/received", params: {sort: "handler_module_name", direction: "asc"}
-    assert_equal ["z", "a"], listed_event_ids
+    assert_select ".admin-header a[href=?]", "/admin/", text: "Received webhooks"
+    assert_select "form.filters[action=?]", "/admin/"
   end
 
   test "ignores unsupported sort columns and directions" do
@@ -110,7 +134,7 @@ class AdminTest < ActionDispatch::IntegrationTest
     create_webhook(handler_event_id: "new", created_at: 1.day.ago, status: "skipped", body: "z")
     create_webhook(handler_event_id: "old", created_at: 2.days.ago, status: "error", body: "a")
 
-    get "/admin/received", params: {sort: "body", direction: "sideways"}
+    get "/admin", params: {sort: "body", direction: "sideways"}
 
     assert_response :ok
     assert_equal ["old", "new"], listed_event_ids
@@ -121,25 +145,27 @@ class AdminTest < ActionDispatch::IntegrationTest
     create_webhook(handler_event_id: "test-error", status: "error")
     create_webhook(handler_event_id: "private-processed", handler_module_name: "PrivateHandler")
 
-    get "/admin/received", params: {handler: "WebhookTestHandler"}
+    get "/admin", params: {handler: "WebhookTestHandler"}
     assert_equal ["test-error", "test-processed"], listed_event_ids.sort
 
-    get "/admin/received", params: {status: "error"}
+    get "/admin", params: {status: "error"}
     assert_equal ["test-error"], listed_event_ids
 
-    get "/admin/received", params: {handler: "", status: ""}
+    get "/admin", params: {handler: "", status: ""}
     assert_equal 3, listed_event_ids.length
   end
 
   test "offers every configured handler and status as a filter" do
-    get "/admin/received", params: {handler: "PrivateHandler"}
+    get "/admin", params: {handler: "PrivateHandler", direction: "asc"}
 
     handlers = css_select("select[name=handler] option").map { |option| option["value"] }
     assert_equal ["", *Webhukhs.configuration.active_handlers.values.uniq.sort], handlers
     assert_select "select[name=handler] option[value='']", text: "Any handler"
     assert_select "select[name=status] option[value='']", text: "Any status"
-    # Clearing the filters keeps the sort
-    assert_select "form.filters a[href=?]", "/admin/received?direction=desc&sort=id", text: "Clear"
+    # Filtering and clearing the filters keep the direction, without a sort column
+    assert_select "form.filters input[name=direction][value=asc]"
+    assert_select "form.filters input[name=sort]", count: 0
+    assert_select "form.filters a[href=?]", "/admin/?direction=asc", text: "Clear"
     assert_select "select[name=handler] option[selected]", text: "PrivateHandler"
 
     statuses = css_select("select[name=status] option").map { |option| option["value"] }
@@ -150,7 +176,7 @@ class AdminTest < ActionDispatch::IntegrationTest
     original_handlers = Webhukhs.configuration.active_handlers
     Webhukhs.configuration.active_handlers = {a: WebhookTestHandler, b: "WebhookTestHandler"}
 
-    get "/admin/received"
+    get "/admin"
 
     handlers = css_select("select[name=handler] option").map { |option| option["value"] }
     assert_equal ["", "WebhookTestHandler"], handlers
@@ -162,16 +188,16 @@ class AdminTest < ActionDispatch::IntegrationTest
     page_size = Webhukhs::Admin::ReceivedWebhooksController::PAGE_SIZE
     (page_size + 1).times { |i| create_webhook(handler_event_id: "evt-#{i}", created_at: i.minutes.ago) }
 
-    get "/admin/received", params: {sort: "status"}
+    get "/admin", params: {direction: "asc"}
     assert_equal page_size, listed_event_ids.length
-    assert_equal "evt-#{page_size}", listed_event_ids.first # all ties on status, so by id
+    assert_equal (0...page_size).map { |i| "evt-#{i}" }, listed_event_ids
     assert_select "a[rel=prev]", count: 0
-    assert_select "a[rel=next][href=?]", "/admin/received?page=2&sort=status"
+    assert_select "a[rel=next][href=?]", "/admin/?direction=asc&page=2"
 
-    get "/admin/received", params: {sort: "status", page: 2}
-    assert_equal ["evt-0"], listed_event_ids
+    get "/admin", params: {direction: "asc", page: 2}
+    assert_equal ["evt-#{page_size}"], listed_event_ids
     assert_select "a[rel=next]", count: 0
-    assert_select "a[rel=prev][href=?]", "/admin/received?page=1&sort=status"
+    assert_select "a[rel=prev][href=?]", "/admin/?direction=asc&page=1"
   end
 
   test "loads one row past the page and no more" do
@@ -181,7 +207,7 @@ class AdminTest < ActionDispatch::IntegrationTest
     loaded = 0
     counter = ->(*, payload) { loaded += payload[:record_count] if payload[:class_name] == "Webhukhs::ReceivedWebhook" }
     ActiveSupport::Notifications.subscribed(counter, "instantiation.active_record") do
-      get "/admin/received"
+      get "/admin"
     end
 
     assert_equal page_size + 1, loaded
@@ -190,7 +216,7 @@ class AdminTest < ActionDispatch::IntegrationTest
   test "shows no next page when the last page is exactly full" do
     Webhukhs::Admin::ReceivedWebhooksController::PAGE_SIZE.times { create_webhook }
 
-    get "/admin/received"
+    get "/admin"
 
     assert_select "a[rel=next]", count: 0
   end
@@ -198,20 +224,20 @@ class AdminTest < ActionDispatch::IntegrationTest
   test "treats a page below 1 as the first page" do
     create_webhook(handler_event_id: "only")
 
-    get "/admin/received", params: {page: -3}
+    get "/admin", params: {page: -3}
 
     assert_equal ["only"], listed_event_ids
     assert_select "a[rel=prev]", count: 0
   end
 
-  test "drops the page when changing the sort" do
-    get "/admin/received", params: {page: 3}
+  test "keeps filters but drops the page and legacy sort when reversing the order" do
+    get "/admin", params: {page: 3, sort: "updated_at", handler: "PrivateHandler", status: "error"}
 
-    assert_select "th a.sort-link[href=?]", "/admin/received?direction=desc&sort=status"
+    assert_select "th a.sort-link[href=?]", "/admin/?direction=asc&handler=PrivateHandler&status=error"
   end
 
   test "says so when there is nothing to list" do
-    get "/admin/received"
+    get "/admin"
 
     assert_select "div.table-scroll > table.admin-table > thead > tr > th", count: 6
     assert_select "table.admin-table > tbody > tr > td.empty[colspan='6']", text: "No records."
@@ -234,10 +260,11 @@ class AdminTest < ActionDispatch::IntegrationTest
     create_webhook(handler_event_id: "decoy", body: "not this one")
     webhook = create_webhook(body: '{"event":"thing.happened","data":{"id":1}}')
 
-    get "/admin/received/#{webhook.id}"
+    get "/admin/#{webhook.id}"
 
     assert_response :ok
     assert_select "h1", text: /WebhookTestHandler/
+    assert_select ".breadcrumb a[href=?]", "/admin/", text: "Received webhooks"
     assert_select "[role=tab][aria-selected=true]", text: "Pretty"
     assert_select "[role=tab][aria-selected=false]", text: "As sent"
     # assert_select squashes whitespace, which is the very thing under test here
@@ -250,7 +277,7 @@ class AdminTest < ActionDispatch::IntegrationTest
   test "shows a body that is not JSON as sent, replacing invalid UTF-8" do
     webhook = create_webhook(body: "event=thing&broken=\xFF".b)
 
-    get "/admin/received/#{webhook.id}"
+    get "/admin/#{webhook.id}"
 
     assert_response :ok
     assert_select "[role=tab]", count: 0
@@ -263,7 +290,7 @@ class AdminTest < ActionDispatch::IntegrationTest
     json = %({"padding":"#{"x" * limit}"})
     webhook = create_webhook(body: json)
 
-    get "/admin/received/#{webhook.id}"
+    get "/admin/#{webhook.id}"
 
     assert_response :ok
     assert_select "[role=tab]", count: 0
@@ -303,7 +330,7 @@ class AdminTest < ActionDispatch::IntegrationTest
       "action_dispatch.request.path_parameters" => {"service_id" => "test"}
     })
 
-    get "/admin/received/#{webhook.id}"
+    get "/admin/#{webhook.id}"
 
     rows = css_select("table.admin-table thead:has(th:contains('Header')) + tbody tr").map do |row|
       row.css("td").map(&:text)
@@ -318,7 +345,7 @@ class AdminTest < ActionDispatch::IntegrationTest
   test "shows webhooks stored before headers were recorded" do
     webhook = create_webhook(request_headers: nil)
 
-    get "/admin/received/#{webhook.id}"
+    get "/admin/#{webhook.id}"
 
     assert_response :ok
     assert_select "td.empty[colspan='2']", text: "No records."
@@ -327,14 +354,14 @@ class AdminTest < ActionDispatch::IntegrationTest
   test "renders copy buttons for the identifiers" do
     webhook = create_webhook(handler_event_id: "evt_123")
 
-    get "/admin/received/#{webhook.id}"
+    get "/admin/#{webhook.id}"
 
     assert_select "button.btn-copy[type=button][title='Copy to clipboard'][data-copy=?]", webhook.id.to_s
     assert_select "button.btn-copy[data-copy=?]", "evt_123"
   end
 
   test "locks the pages down with a content security policy" do
-    get "/admin/received"
+    get "/admin"
 
     assert_equal "default-src 'none'; script-src 'self'; style-src 'self'; img-src 'self' data:; " \
       "connect-src 'self'; base-uri 'none'; form-action 'self'; frame-ancestors 'none'",
@@ -342,7 +369,7 @@ class AdminTest < ActionDispatch::IntegrationTest
   end
 
   test "serves its own assets, fingerprinted, from under the mount point" do
-    get "/admin/received"
+    get "/admin"
 
     assert_select "link[rel=stylesheet][href^='/admin/admin.css?s='][integrity^='sha256-']"
     assert_select "script[type=module][src^='/admin/admin.js?s='][integrity^='sha256-']"

data/test/browser/admin_click_through.rb

@@ -89,20 +89,21 @@ class AdminClickThrough < ActiveSupport::TestCase
     PAGE_SIZE.times { |i| create_webhook(handler_event_id: "evt-#{i}", created_at: i.minutes.ago) }
     create_webhook(handler_event_id: "the-failed-one", status: "error", created_at: 2.days.ago)
 
-    visit "/received"
+    visit ""
     assert_equal "Received webhooks", @browser.at_css("h1").text
     # The stylesheet must have made it through the CSP - unstyled, the header would not be a flexbox
     assert_equal "flex", @browser.evaluate("getComputedStyle(document.querySelector('.admin-header')).display")
     assert_equal PAGE_SIZE, @browser.css("tbody tr").length
-    assert_equal "the-failed-one", texts("tbody tr td:nth-child(5)").first
+    assert_equal "the-failed-one", texts("tbody tr td:nth-child(4)").first
 
-    click_and_wait_for_page(@browser.at_xpath("//th/a[contains(., 'Received')]"))
-    assert_includes @browser.current_url, "direction=desc"
-    assert_equal "evt-0", texts("tbody tr td:nth-child(5)").first
-
-    click_and_wait_for_page(@browser.at_xpath("//th/a[contains(., 'Received')]"))
+    assert_equal 1, @browser.css("th a").length
+    click_and_wait_for_page(@browser.at_xpath("//th/a[contains(., 'Id')]"))
     assert_includes @browser.current_url, "direction=asc"
-    assert_equal "the-failed-one", texts("tbody tr td:nth-child(5)").first
+    assert_equal "evt-0", texts("tbody tr td:nth-child(4)").first
+
+    click_and_wait_for_page(@browser.at_xpath("//th/a[contains(., 'Id')]"))
+    assert_includes @browser.current_url, "direction=desc"
+    assert_equal "the-failed-one", texts("tbody tr td:nth-child(4)").first
 
     # Not Ferrum's Node#select: it blanks the select by assigning it `undefined` first, which
     # left it blank on the Chromium snapshot CI got
@@ -113,9 +114,9 @@ class AdminClickThrough < ActiveSupport::TestCase
     JS
     assert_equal "error", @browser.evaluate("document.querySelector('select[name=status]').value")
     click_and_wait_for_page(@browser.at_css("form.filters input[type=submit]"))
-    assert_equal ["the-failed-one"], texts("tbody tr td:nth-child(5)")
+    assert_equal ["the-failed-one"], texts("tbody tr td:nth-child(4)")
     # The sort survives filtering
-    assert_includes @browser.current_url, "direction=asc"
+    assert_includes @browser.current_url, "direction=desc"
 
     click_and_wait_for_page(@browser.at_xpath("//form//a[text()='Clear']"))
     assert_equal "Any status", @browser.evaluate("document.querySelector('select[name=status]').selectedOptions[0].text")
@@ -129,18 +130,18 @@ class AdminClickThrough < ActiveSupport::TestCase
   test "opens a webhook by clicking anywhere on its row" do
     webhook = create_webhook(handler_event_id: "evt-clicked")
 
-    visit "/received"
+    visit ""
     # The status cell is not a link, but the row link stretched over it takes the click
-    click_and_wait_for_page(@browser.at_css("tbody tr td:nth-child(4)"))
+    click_and_wait_for_page(@browser.at_css("tbody tr td:nth-child(3)"))
 
-    assert @browser.current_url.end_with?("/received/#{webhook.id}"), @browser.current_url
+    assert_equal "#{@base_url}/#{webhook.id}", @browser.current_url
     assert_includes @browser.at_css("h1").text, "WebhookTestHandler"
   end
 
   test "switches between the pretty and the as-sent body" do
     webhook = create_webhook(body: '{"event":"thing.happened","data":{"id":1}}')
 
-    visit "/received/#{webhook.id}"
+    visit "/#{webhook.id}"
     pretty = -> { @browser.evaluate("document.getElementById('body-pretty').hidden") == false }
     raw = -> { @browser.evaluate("document.getElementById('body-raw').hidden") == false }
     assert pretty.call
@@ -161,7 +162,7 @@ class AdminClickThrough < ActiveSupport::TestCase
   test "copies to the clipboard" do
     webhook = create_webhook(handler_event_id: "evt-to-copy")
 
-    visit "/received/#{webhook.id}"
+    visit "/#{webhook.id}"
     # Headless Chrome has no clipboard to grant, so we only check that the right text gets handed to it
     @browser.execute("navigator.clipboard.writeText = (text) => { window.copied = text; return Promise.resolve() }")
 
@@ -178,19 +179,19 @@ class AdminClickThrough < ActiveSupport::TestCase
     form = create_webhook(body: "event=paid&amount=12.50")
     large = create_webhook(body: "x" * (Webhukhs::Admin::ReceivedWebhookPresenter::DISPLAY_LIMIT + 1))
 
-    visit "/received/#{form.id}"
+    visit "/#{form.id}"
     assert_equal "This body is not valid JSON, so it is shown as it was sent", @browser.at_css(".flash.alert").text
     assert_equal "event=paid&amount=12.50", @browser.at_css("pre.body-raw code").text
     assert_empty @browser.css("[role=tab]")
 
-    visit "/received/#{large.id}"
+    visit "/#{large.id}"
     assert_equal "The body was 256 KB, display is truncated", @browser.at_css(".flash.alert").text
   end
 
   test "picks up new webhooks while auto-refresh is on, and remembers the switch" do
     create_webhook(handler_event_id: "evt-before")
 
-    visit "/received"
+    visit ""
     switch = -> { @browser.evaluate("document.getElementById('auto-refresh').checked") }
     refute switch.call
     @browser.at_css("label.switch").click
@@ -198,14 +199,14 @@ class AdminClickThrough < ActiveSupport::TestCase
 
     create_webhook(handler_event_id: "evt-arrived")
     # One poll interval, with some slack
-    wait_for("the new webhook to show up", timeout: 8) { texts("tbody tr td:nth-child(5)").include?("evt-arrived") }
-    assert_equal ["evt-arrived", "evt-before"], texts("tbody tr td:nth-child(5)")
+    wait_for("the new webhook to show up", timeout: 8) { texts("tbody tr td:nth-child(4)").include?("evt-arrived") }
+    assert_equal ["evt-arrived", "evt-before"], texts("tbody tr td:nth-child(4)")
 
-    visit "/received"
+    visit ""
     assert switch.call, "The switch should stay on after a reload"
     # After a page load only the timer refetches, so this one has to come in through a poll
     create_webhook(handler_event_id: "evt-polled")
-    wait_for("the polled webhook to show up", timeout: 8) { texts("tbody tr td:nth-child(5)").include?("evt-polled") }
+    wait_for("the polled webhook to show up", timeout: 8) { texts("tbody tr td:nth-child(4)").include?("evt-polled") }
     @browser.at_css("label.switch").click
     wait_for("the switch to turn off") { !switch.call }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webhukhs
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Stanislav Katkov