Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Add support for table component in admin webhooks UI

Damian Legawiec360593dd1f0c
diff --git a/admin/app/controllers/spree/admin/webhook_deliveries_controller.rb b/admin/app/controllers/spree/admin/webhook_deliveries_controller.rb
index 4b45a3671c..bdaaa42711 100644
--- a/admin/app/controllers/spree/admin/webhook_deliveries_controller.rb
+++ b/admin/app/controllers/spree/admin/webhook_deliveries_controller.rb
@@ -4,6 +4,7 @@ module Spree
module Admin
class WebhookDeliveriesController < ResourceController
include Spree::Admin::SettingsConcern
+ include Spree::Admin::TableConcern
helper 'spree/admin/webhook_endpoints'
diff --git a/admin/app/controllers/spree/admin/webhook_endpoints_controller.rb b/admin/app/controllers/spree/admin/webhook_endpoints_controller.rb
index c96d56bc9b..c7f7d55208 100644
--- a/admin/app/controllers/spree/admin/webhook_endpoints_controller.rb
+++ b/admin/app/controllers/spree/admin/webhook_endpoints_controller.rb
@@ -4,6 +4,7 @@ module Spree
module Admin
class WebhookEndpointsController < ResourceController
include Spree::Admin::SettingsConcern
+ include Spree::Admin::TableConcern
helper 'spree/admin/webhook_endpoints'
diff --git a/admin/app/views/spree/admin/tables/columns/_webhook_deliveries_stats.html.erb b/admin/app/views/spree/admin/tables/columns/_webhook_deliveries_stats.html.erb
new file mode 100644
index 0000000000..74fc09f229
--- /dev/null
+++ b/admin/app/views/spree/admin/tables/columns/_webhook_deliveries_stats.html.erb
@@ -0,0 +1,3 @@
+<%# locals: (record:, column:, value:) %>
+<% endpoint = record %>
+<span class="text-green-500"><%= endpoint.webhook_deliveries.successful.count %></span> / <%= endpoint.webhook_deliveries.count %>
diff --git a/admin/app/views/spree/admin/tables/columns/_webhook_delivery_actions.html.erb b/admin/app/views/spree/admin/tables/columns/_webhook_delivery_actions.html.erb
new file mode 100644
index 0000000000..c5b7963698
--- /dev/null
+++ b/admin/app/views/spree/admin/tables/columns/_webhook_delivery_actions.html.erb
@@ -0,0 +1,5 @@
+<%# locals: (record:, column:, value:) %>
+<% delivery = record %>
+<%= link_to icon('eye'), spree.admin_webhook_endpoint_webhook_delivery_path(delivery.webhook_endpoint, delivery),
+ class: 'btn btn-sm btn-light px-2',
+ data: { action: 'drawer#open', turbo_frame: :drawer } %>
diff --git a/admin/app/views/spree/admin/tables/columns/_webhook_delivery_status.html.erb b/admin/app/views/spree/admin/tables/columns/_webhook_delivery_status.html.erb
new file mode 100644
index 0000000000..e17ec79aff
--- /dev/null
+++ b/admin/app/views/spree/admin/tables/columns/_webhook_delivery_status.html.erb
@@ -0,0 +1,2 @@
+<%# locals: (record:, column:, value:) %>
+<%= webhook_delivery_status_badge(record) %>
diff --git a/admin/app/views/spree/admin/webhook_deliveries/index.html.erb b/admin/app/views/spree/admin/webhook_deliveries/index.html.erb
index 6800adbe2c..094dd8f0a2 100644
--- a/admin/app/views/spree/admin/webhook_deliveries/index.html.erb
+++ b/admin/app/views/spree/admin/webhook_deliveries/index.html.erb
@@ -1 +1 @@
-<%= render 'spree/admin/shared/index_table', new_object_url: nil %>
+<%= render_table @collection, :webhook_deliveries %>
diff --git a/admin/app/views/spree/admin/webhook_endpoints/index.html.erb b/admin/app/views/spree/admin/webhook_endpoints/index.html.erb
index cffe722815..6dbabf062a 100644
--- a/admin/app/views/spree/admin/webhook_endpoints/index.html.erb
+++ b/admin/app/views/spree/admin/webhook_endpoints/index.html.erb
@@ -6,4 +6,4 @@
<%= link_to_with_icon 'plus', Spree.t(:new_webhook_endpoint), new_object_url, class: "btn btn-primary" if can? :create, Spree::WebhookEndpoint %>
<% end %>
-<%= render 'spree/admin/shared/index_table' %>
+<%= render_table @collection, :webhook_endpoints %>
diff --git a/admin/config/initializers/spree_admin_tables.rb b/admin/config/initializers/spree_admin_tables.rb
index b6db7b3aee..ed9b0c9176 100644
--- a/admin/config/initializers/spree_admin_tables.rb
+++ b/admin/config/initializers/spree_admin_tables.rb
@@ -1098,4 +1098,114 @@ Rails.application.config.after_initialize do
default: true,
position: 20,
method: ->(post_category) { post_category.posts.count }
+
+ # ==========================================
+ # Webhook Endpoints Table
+ # ==========================================
+ Spree.admin.tables.register(:webhook_endpoints, model_class: Spree::WebhookEndpoint, search_param: :url_cont, row_actions: false, link_to_action: :show)
+
+ Spree.admin.tables.webhook_endpoints.add :url,
+ label: :url,
+ type: :link,
+ sortable: true,
+ filterable: true,
+ default: true,
+ position: 10
+
+ Spree.admin.tables.webhook_endpoints.add :active,
+ label: :active,
+ type: :boolean,
+ sortable: true,
+ filterable: true,
+ default: true,
+ position: 20,
+ filter_type: :select,
+ value_options: [
+ { value: 'true', label: 'Active' },
+ { value: 'false', label: 'Inactive' }
+ ]
+
+ Spree.admin.tables.webhook_endpoints.add :subscriptions_count,
+ label: 'admin.webhook_endpoints.events',
+ type: :string,
+ sortable: false,
+ filterable: false,
+ default: true,
+ position: 30,
+ method: ->(endpoint) { "#{endpoint.subscriptions.size} #{I18n.t('spree.admin.webhook_endpoints.events')}" }
+
+ Spree.admin.tables.webhook_endpoints.add :deliveries_stats,
+ label: :deliveries,
+ type: :custom,
+ sortable: false,
+ filterable: false,
+ default: true,
+ position: 40,
+ partial: 'spree/admin/tables/columns/webhook_deliveries_stats'
+
+ Spree.admin.tables.webhook_endpoints.add :created_at,
+ label: :created_at,
+ type: :datetime,
+ sortable: true,
+ filterable: true,
+ default: true,
+ position: 50
+
+ # ==========================================
+ # Webhook Deliveries Table
+ # ==========================================
+ Spree.admin.tables.register(:webhook_deliveries, model_class: Spree::WebhookDelivery, search_param: :event_name_cont, row_actions: false, new_resource: false)
+
+ Spree.admin.tables.webhook_deliveries.add :event_name,
+ label: :event,
+ type: :string,
+ sortable: true,
+ filterable: true,
+ default: true,
+ position: 10,
+ method: ->(delivery) { delivery.event_name }
+
+ Spree.admin.tables.webhook_deliveries.add :status,
+ label: :status,
+ type: :custom,
+ sortable: false,
+ filterable: false,
+ default: true,
+ position: 20,
+ partial: 'spree/admin/tables/columns/webhook_delivery_status'
+
+ Spree.admin.tables.webhook_deliveries.add :delivered_at,
+ label: :delivered_at,
+ type: :datetime,
+ sortable: true,
+ filterable: true,
+ default: true,
+ position: 30
+
+ Spree.admin.tables.webhook_deliveries.add :execution_time,
+ label: :execution_time,
+ type: :string,
+ sortable: true,
+ filterable: false,
+ default: true,
+ position: 40,
+ method: ->(delivery) { delivery.execution_time ? "#{delivery.execution_time}ms" : '-' }
+
+ Spree.admin.tables.webhook_deliveries.add :response_code,
+ label: :response_code,
+ type: :string,
+ sortable: true,
+ filterable: false,
+ default: true,
+ position: 50,
+ method: ->(delivery) { delivery.response_code || '-' }
+
+ Spree.admin.tables.webhook_deliveries.add :actions,
+ label: :actions,
+ type: :custom,
+ sortable: false,
+ filterable: false,
+ default: true,
+ position: 60,
+ partial: 'spree/admin/tables/columns/webhook_delivery_actions'
end