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.

Admin: small templates cleanup and developer tool links fixes

Damian Legawiec1a9438a50f39
diff --git a/admin/app/views/spree/admin/exports/index.html.erb b/admin/app/views/spree/admin/exports/index.html.erb
index 8f3b5fa4d3..af0216d99a 100644
--- a/admin/app/views/spree/admin/exports/index.html.erb
+++ b/admin/app/views/spree/admin/exports/index.html.erb
@@ -4,7 +4,7 @@
<div class="table-responsive card-lg p-0">
<table class="table">
<thead class="text-muted">
- <tr data-hook="admin_imports_index_headers">
+ <tr>
<th><%= Spree.t(:number) %></th>
<th class="text-center"><%= Spree.t(:kind) %></th>
<th class="text-center"><%= Spree.t(:status) %></th>
diff --git a/admin/app/views/spree/admin/oauth_applications/index.html.erb b/admin/app/views/spree/admin/oauth_applications/index.html.erb
index 8dc9d1cece..a8701ba27d 100644
--- a/admin/app/views/spree/admin/oauth_applications/index.html.erb
+++ b/admin/app/views/spree/admin/oauth_applications/index.html.erb
@@ -3,14 +3,14 @@
<%= content_for(:title, 'API Keys') %>
<% content_for :page_actions do %>
- <%= button_link_to 'New API key', new_object_url, class: "btn-primary", icon: 'plus', id: 'admin_new_role_link' %>
+ <%= button_link_to 'New API key', new_object_url, class: "btn-primary", icon: 'plus' %>
<% end if can? :create, Spree::OauthApplication %>
<%= content_for :page_alerts do %>
<div class="alert alert-info mb-3">
<p>
- Here you can manage API keys to access the <%= link_to 'Platform API', 'https://developers.getvendo.com/reference/authentication-2' %>.
- For headless storefronts you don't need an API key, please use the <%= link_to 'Storefront API', 'https://developers.getvendo.com/reference/api-getting-started' %>.
+ Here you can manage API keys to access the <%= link_to 'Platform API', 'https://spreecommerce.org/docs/api-reference/platform/authentication', target: '_blank' %>.
+ For headless storefronts you don't need an API key, please use the <%= link_to 'Storefront API', 'https://spreecommerce.org/docs/api-reference/storefront/authentication', target: '_blank' %>.
</p>
</div>
<% end %>
@@ -19,7 +19,7 @@
<div class="table-responsive rounded border mt-4 bg-white shadow-xs">
<table class="table">
<thead class="text-muted">
- <tr data-hook="admin_roles_index_headers">
+ <tr>
<th><%= Spree.t(:name) %></th>
<th>Client ID</th>
<th><%= Spree.t('admin.oauth_applications.scopes') %></th>
@@ -29,7 +29,7 @@
</thead>
<tbody>
<% @oauth_applications.each do |application| %>
- <tr id="<%= spree_dom_id application %>" data-hook="admin_roles_index_rows">
+ <tr id="<%= spree_dom_id application %>">
<td class="w-20"><%= application.name %></td>
<td class="w-40">
<div class="input-group" data-controller="password-toggle">
diff --git a/admin/app/views/spree/admin/option_types/_form.html.erb b/admin/app/views/spree/admin/option_types/_form.html.erb
index 0e8493b7cc..9af493439a 100644
--- a/admin/app/views/spree/admin/option_types/_form.html.erb
+++ b/admin/app/views/spree/admin/option_types/_form.html.erb
@@ -55,7 +55,7 @@
<div class="card-body p-0">
<div class="table-responsive">
<table class="table table-condensed">
- <thead data-hook="option_header" class="text-muted border-bottom">
+ <thead class="text-muted border-bottom">
<tr>
<th></th>
<th><%= raw(Spree.t(:presentation) + required_span_tag) %></th>
diff --git a/admin/app/views/spree/admin/option_types/index.html.erb b/admin/app/views/spree/admin/option_types/index.html.erb
index 4d0df7fd8d..e3501cbc7b 100644
--- a/admin/app/views/spree/admin/option_types/index.html.erb
+++ b/admin/app/views/spree/admin/option_types/index.html.erb
@@ -23,7 +23,7 @@
<div class="table-responsive">
<table class="table" id="listing_option_types">
<thead class="text-muted">
- <tr data-hook="option_header">
+ <tr>
<th class="no-border handel-head"></th>
<th><%= Spree.t(:internal_name) %></th>
<th>
diff --git a/admin/app/views/spree/admin/properties/index.html.erb b/admin/app/views/spree/admin/properties/index.html.erb
index 7baf000e3a..d9b450998f 100644
--- a/admin/app/views/spree/admin/properties/index.html.erb
+++ b/admin/app/views/spree/admin/properties/index.html.erb
@@ -13,14 +13,14 @@
<% end if can?(:create, Spree::Property) %>
<% content_for :table_filter do %>
- <div data-hook="admin_property_sidebar">
+ <div>
<%= search_form_for [:admin, @search] do |f| %>
<%- locals = {f: f} %>
<div class="row">
<div class="col-12 col-lg-6">
- <div data-hook="admin_property_index_search" class="form-group">
+ <div class="form-group">
<%= f.label :name_or_presentation_cont, Spree.t(:name) %>
<%= f.text_field :name_or_presentation_cont, class: "form-control js-quick-search-target js-filterable" %>
</div>
diff --git a/admin/app/views/spree/admin/refund_reasons/index.html.erb b/admin/app/views/spree/admin/refund_reasons/index.html.erb
index 9610170b3e..27888390bc 100644
--- a/admin/app/views/spree/admin/refund_reasons/index.html.erb
+++ b/admin/app/views/spree/admin/refund_reasons/index.html.erb
@@ -6,9 +6,9 @@
<% if @collection.any? %>
<div class="table-responsive card-lg p-0">
- <table class="table" id='listing_named_types' data-hook>
+ <table class="table" id='listing_named_types">
<thead class="text-muted">
- <tr data-hook="named_types_header">
+ <tr>
<th><%= Spree.t(:name) %></th>
<th><%= Spree.t(:status) %></th>
<th><%= Spree.t(:mutable) %></th>
diff --git a/admin/app/views/spree/admin/return_authorization_reasons/index.html.erb b/admin/app/views/spree/admin/return_authorization_reasons/index.html.erb
index f5587f9f41..6023867413 100644
--- a/admin/app/views/spree/admin/return_authorization_reasons/index.html.erb
+++ b/admin/app/views/spree/admin/return_authorization_reasons/index.html.erb
@@ -6,9 +6,9 @@
<% if @collection.any? %>
<div class="table-responsive card-lg p-0">
- <table class="table" id='listing_named_types' data-hook>
+ <table class="table" id='listing_named_types'>
<thead class="text-muted">
- <tr data-hook="named_types_header">
+ <tr>
<th><%= Spree.t(:name) %></th>
<th><%= Spree.t(:status) %></th>
<th></th>
diff --git a/admin/app/views/spree/admin/roles/index.html.erb b/admin/app/views/spree/admin/roles/index.html.erb
index 184fcd0d3b..da7e2740d2 100644
--- a/admin/app/views/spree/admin/roles/index.html.erb
+++ b/admin/app/views/spree/admin/roles/index.html.erb
@@ -10,14 +10,14 @@
<div class="table-responsive card-lg p-0">
<table class="table">
<thead class="text-muted">
- <tr data-hook="admin_roles_index_headers">
+ <tr>
<th><%= Spree.t(:role_id) %></th>
<th class="actions"></th>
</tr>
</thead>
<tbody>
<% @roles.each do |role| %>
- <tr id="<%= spree_dom_id role %>" data-hook="admin_roles_index_rows">
+ <tr id="<%= spree_dom_id role %>">
<td><%= role.name %></td>
<td class="actions">
<%= link_to_edit(role, no_text: true) if can? :edit, role %>
diff --git a/admin/app/views/spree/admin/shipping_methods/edit.html.erb b/admin/app/views/spree/admin/shipping_methods/edit.html.erb
index 4150d3587a..1f59f3afce 100644
--- a/admin/app/views/spree/admin/shipping_methods/edit.html.erb
+++ b/admin/app/views/spree/admin/shipping_methods/edit.html.erb
@@ -3,9 +3,8 @@
<%= @shipping_method.name %>
<% end %>
-<div data-hook="admin_shipping_method_edit_form_header">
- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_method } %>
-</div>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_method } %>
+
<%= form_for [:admin, @shipping_method] do |f| %>
<%= render 'form', f: f %>
diff --git a/admin/app/views/spree/admin/shipping_methods/index.html.erb b/admin/app/views/spree/admin/shipping_methods/index.html.erb
index becf9debf1..f8793a5cc9 100644
--- a/admin/app/views/spree/admin/shipping_methods/index.html.erb
+++ b/admin/app/views/spree/admin/shipping_methods/index.html.erb
@@ -24,13 +24,13 @@
<div class="table-responsive card-lg p-0">
<table class="table" id='listing_shipping_methods'>
<thead class="text-muted">
- <tr data-hook="admin_shipping_methods_index_headers">
+ <tr>
<th><%= Spree.t(:name) %></th>
<th><%= Spree.t(:zone) %></th>
<th><%= Spree.t(:estimated_delivery_time) %></th>
<th><%= Spree.t(:amount) %></th>
<th><%= Spree.t(:visibility) %></th>
- <th data-hook="admin_shipping_methods_index_header_actions" class="actions"></th>
+ <th class="actions"></th>
</tr>
</thead>
<tbody>
diff --git a/admin/app/views/spree/admin/shipping_methods/new.html.erb b/admin/app/views/spree/admin/shipping_methods/new.html.erb
index cde38d0af2..94027b6a59 100644
--- a/admin/app/views/spree/admin/shipping_methods/new.html.erb
+++ b/admin/app/views/spree/admin/shipping_methods/new.html.erb
@@ -3,11 +3,9 @@
<%= Spree.t(:new_shipping_method) %>
<% end %>
-<div data-hook="admin_shipping_method_new_form_header">
- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_method } %>
-</div>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_method } %>
-<div data-hook="admin_shipping_method_new_form">
+<div>
<%= form_for [:admin, @shipping_method] do |f| %>
<%= render 'form', f: f %>
<%= render 'spree/admin/shared/new_resource_links' %>
diff --git a/admin/app/views/spree/admin/stock_locations/index.html.erb b/admin/app/views/spree/admin/stock_locations/index.html.erb
index 68716f8f2e..49fa73f1b7 100644
--- a/admin/app/views/spree/admin/stock_locations/index.html.erb
+++ b/admin/app/views/spree/admin/stock_locations/index.html.erb
@@ -8,7 +8,7 @@
<div class="table-responsive card-lg p-0">
<table class="table" id='listing_tax_rates'>
<thead class="text-muted">
- <tr data-hook="rate_header">
+ <tr>
<th><%= Spree.t(:name) %></th>
<th><%= Spree.t(:country) %></th>
<th><%= Spree.t(:status) %></th>
diff --git a/admin/app/views/spree/admin/store_credit_categories/index.html.erb b/admin/app/views/spree/admin/store_credit_categories/index.html.erb
index 490878f6b9..09575b8cb8 100644
--- a/admin/app/views/spree/admin/store_credit_categories/index.html.erb
+++ b/admin/app/views/spree/admin/store_credit_categories/index.html.erb
@@ -10,14 +10,14 @@
<div class="table-responsive card-lg p-0">
<table class="table">
<thead class="text-muted">
- <tr data-hook="admin_store_credit_categories_index_headers">
+ <tr>
<th><%= Spree.t(:name) %></th>
<th class="actions"></th>
</tr>
</thead>
<tbody>
<% @store_credit_categories.each do |store_credit_category| %>
- <tr id="<%= spree_dom_id store_credit_category %>" data-hook="admin_store_credit_categories_index_rows">
+ <tr id="<%= spree_dom_id store_credit_category %>">
<td><%= store_credit_category.name %></td>
<td class="actions">
<%= link_to_edit(store_credit_category, no_text: true) if can? :edit, store_credit_category %>
diff --git a/admin/app/views/spree/admin/tax_categories/index.html.erb b/admin/app/views/spree/admin/tax_categories/index.html.erb
index 5046301055..4aa179a886 100644
--- a/admin/app/views/spree/admin/tax_categories/index.html.erb
+++ b/admin/app/views/spree/admin/tax_categories/index.html.erb
@@ -10,9 +10,9 @@
<% if @tax_categories.any? %>
<div class="table-responsive card-lg p-0">
- <table class="table" id='listing_tax_categories' data-hook>
+ <table class="table" id='listing_tax_categories'>
<thead class="text-muted">
- <tr data-hook="tax_header">
+ <tr>
<th><%= Spree.t(:name) %></th>
<th><%= Spree.t(:tax_code) %></th>
<th><%= Spree.t(:description) %></th>
diff --git a/admin/app/views/spree/admin/zones/_country_members.html.erb b/admin/app/views/spree/admin/zones/_country_members.html.erb
index 00cc3da0a1..33fe95ea3e 100644
--- a/admin/app/views/spree/admin/zones/_country_members.html.erb
+++ b/admin/app/views/spree/admin/zones/_country_members.html.erb
@@ -1,4 +1,4 @@
-<div id="country_members" data-hook="member">
+<div id="country_members">
<div class="card mb-4">
<div class="card-header">
<h5 class="card-title">
diff --git a/admin/app/views/spree/admin/zones/_form.html.erb b/admin/app/views/spree/admin/zones/_form.html.erb
index dde0ffd09c..cdf876ecfb 100644
--- a/admin/app/views/spree/admin/zones/_form.html.erb
+++ b/admin/app/views/spree/admin/zones/_form.html.erb
@@ -1,12 +1,12 @@
<div class="row">
- <div class="col-12 col-lg-6" data-hook="admin_zone_form_fields">
+ <div class="col-12 col-lg-6">
<div class="card mb-4">
<div class="card-header">
<h5 class="card-title"><%= Spree.t(:general_settings) %></h5>
</div>
<div class="card-body">
- <div class="form-group">
+ <div class="form-group">
<%= zone_form.label :name, Spree.t(:name) %>
<%= zone_form.text_field :name, class: 'form-control' %>
<%= zone_form.error_message_on :name %>
diff --git a/admin/app/views/spree/admin/zones/_state_members.html.erb b/admin/app/views/spree/admin/zones/_state_members.html.erb
index 80ca2e7d66..9404d1769a 100644
--- a/admin/app/views/spree/admin/zones/_state_members.html.erb
+++ b/admin/app/views/spree/admin/zones/_state_members.html.erb
@@ -1,4 +1,4 @@
-<div id="state_members" data-hook="member">
+<div id="state_members">
<div class="card mb-4">
<div class="card-header">
<h5 class="card-title">
diff --git a/admin/app/views/spree/admin/zones/index.html.erb b/admin/app/views/spree/admin/zones/index.html.erb
index fcbe57381c..8b29587df4 100644
--- a/admin/app/views/spree/admin/zones/index.html.erb
+++ b/admin/app/views/spree/admin/zones/index.html.erb
@@ -14,9 +14,9 @@
<% if @zones.any? %>
<div class="table-responsive card-lg p-0">
- <table class="table" id='listing_zones' data-hook>
+ <table class="table" id='listing_zones'>
<thead class="text-muted">
- <tr data-hook="zones_header">
+ <tr>
<th><%= sort_link @search,:name, Spree.t(:name), title: 'zones_order_by_name_title' %></th>
<th>
<%= sort_link @search,:description, Spree.t(:description), {}, {title: 'zones_order_by_description_title'} %>