spree_admin 5.0.2 → 5.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (46) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/spree/admin/dashboard_controller.rb +11 -12
  3. data/app/controllers/spree/admin/page_blocks_controller.rb +10 -2
  4. data/app/controllers/spree/admin/page_sections_controller.rb +13 -1
  5. data/app/controllers/spree/admin/webhooks_subscribers_controller.rb +32 -13
  6. data/app/helpers/spree/admin/base_helper.rb +1 -1
  7. data/app/helpers/spree/admin/navigation_helper.rb +1 -1
  8. data/app/helpers/spree/admin/orders_helper.rb +3 -1
  9. data/app/helpers/spree/admin/products_helper.rb +4 -0
  10. data/app/helpers/spree/admin/tags_helper.rb +1 -1
  11. data/app/javascript/spree/admin/application.js +0 -2
  12. data/app/javascript/spree/admin/controllers/asset_uploader_controller.js +3 -2
  13. data/app/javascript/spree/admin/controllers/variants_form_controller.js +22 -2
  14. data/app/javascript/spree/admin/helpers/trix/video_embed.js +2 -2
  15. data/app/views/spree/admin/dashboard/_top_products.html.erb +1 -1
  16. data/app/views/spree/admin/orders/_filters.html.erb +11 -1
  17. data/app/views/spree/admin/orders/_summary.html.erb +1 -1
  18. data/app/views/spree/admin/page_blocks/forms/_image.html.erb +9 -0
  19. data/app/views/spree/admin/page_builder/_sidebar_block.html.erb +10 -9
  20. data/app/views/spree/admin/page_builder/_sidebar_sections_toolbar.html.erb +152 -39
  21. data/app/views/spree/admin/payment_methods/_form.html.erb +1 -1
  22. data/app/views/spree/admin/products/form/_inventory.html.erb +1 -1
  23. data/app/views/spree/admin/products/form/_properties.html.erb +1 -1
  24. data/app/views/spree/admin/products/form/_variants.html.erb +1 -0
  25. data/app/views/spree/admin/shared/_head.html.erb +6 -1
  26. data/app/views/spree/admin/shared/_tax_nav.html.erb +1 -0
  27. data/app/views/spree/admin/shared/_user.html.erb +1 -1
  28. data/app/views/spree/admin/shared/sidebar/_store_nav.html.erb +3 -2
  29. data/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb +2 -0
  30. data/app/views/spree/admin/stores/form/_basic.html.erb +1 -1
  31. data/app/views/spree/admin/taxons/_form.html.erb +2 -2
  32. data/app/views/spree/admin/users/_form.html.erb +1 -1
  33. data/app/views/spree/admin/users/_user.html.erb +7 -6
  34. data/app/views/spree/admin/users/index.html.erb +6 -5
  35. data/app/views/spree/admin/variants/form/_media.html.erb +1 -0
  36. data/app/views/spree/admin/webhooks_subscribers/_form.html.erb +37 -19
  37. data/app/views/spree/admin/webhooks_subscribers/_webhooks_subscriber.html.erb +12 -6
  38. data/app/views/spree/admin/webhooks_subscribers/edit.html.erb +2 -2
  39. data/app/views/spree/admin/webhooks_subscribers/show.html.erb +58 -47
  40. data/config/importmap.rb +2 -2
  41. data/config/locales/en.yml +1 -1
  42. data/lib/spree/admin/engine.rb +9 -1
  43. data/vendor/javascript/bootstrap--dist--js--bootstrap.bundle.min.js.js +4 -4
  44. data/vendor/javascript/dompurify.js +24 -24
  45. metadata +8 -9
  46. data/app/javascript/spree/admin/controllers/webhook_subscriber_events_controller.js +0 -19
@@ -1,54 +1,65 @@
1
+ <% content_for :title do %>
2
+ <%= @webhooks_subscriber.url %>
3
+ <% end %>
4
+
1
5
  <% content_for :page_title do %>
2
6
  <%= page_header_back_button spree.admin_webhooks_subscribers_path %>
3
7
  <%= @webhooks_subscriber.url %>
4
8
  <% end %>
5
- <fieldset class="card mb-4">
6
- <table class="table card-body pb-0">
7
- <tr>
8
- <td><strong class="text-uppercase"><%= Spree.t(:url) %></strong></td>
9
- <td><%= external_link_to @webhooks_subscriber.url, @webhooks_subscriber.url %></td>
10
- </tr>
11
- <tr>
12
- <td><strong><%= Spree.t(:active) %></strong></td>
13
- <td><%= active_badge(@webhooks_subscriber.active) %></td>
14
- </tr>
15
- <tr>
16
- <td><strong><%= Spree.t('admin.webhooks_subscribers.subscriptions') %></strong></td>
17
- <td>
18
- <% @webhooks_subscriber.subscriptions&.sort&.each do |subscription| %>
19
- <span class="badge badge-light"><%= subscription %></span>
20
- <% end %>
21
- </td>
22
- </tr>
23
- </table>
24
- </fieldset>
25
- <% if @events.any? %>
26
- <div class="card mb-4">
27
- <div class="card-header">
28
- <h5 class="card-title">
29
- <%= Spree.t('admin.webhooks_subscribers.webhooks_events') %>
30
- </h5>
9
+
10
+ <% content_for :page_actions do %>
11
+ <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_webhooks_subscriber_path(@webhooks_subscriber), class: 'btn btn-primary' %>
12
+ <% end %>
13
+
14
+ <ul class="list-group bg-white mb-4 rounded-lg">
15
+ <li class="list-group-item d-flex justify-content-between">
16
+ <strong class="text-uppercase"><%= Spree.t(:url) %></strong>
17
+ <%= external_link_to @webhooks_subscriber.url, @webhooks_subscriber.url, class: 'text-blue text-decoration-none' %>
18
+ </li>
19
+ <li class="list-group-item d-flex justify-content-between">
20
+ <strong><%= Spree.t(:active) %></strong>
21
+ <%= active_badge(@webhooks_subscriber.active) %>
22
+ </li>
23
+ <li class="list-group-item d-flex justify-content-between">
24
+ <strong><%= Spree.t('admin.webhooks_subscribers.subscriptions') %></strong>
25
+ <div>
26
+ <% @webhooks_subscriber.subscriptions&.sort&.each do |subscription| %>
27
+ <span class="badge badge-light"><%= subscription %></span>
28
+ <% end %>
31
29
  </div>
32
- <table class="table card-body pb-0">
33
- <thead class="text-muted">
30
+ </li>
31
+ </ul>
32
+
33
+ <div class="card mb-4">
34
+ <div class="card-header">
35
+ <h5 class="card-title">
36
+ <%= Spree.t('admin.webhooks_subscribers.webhooks_events') %>
37
+ </h5>
38
+ </div>
39
+ <table class="table card-body pb-0">
40
+ <thead>
41
+ <tr>
42
+ <th><%= Spree.t('admin.name') %></th>
43
+ <th><%= Spree.t('admin.successful') %></th>
44
+ <th><%= Spree.t('admin.created_at') %></th>
45
+ <th><%= Spree.t('admin.response_code') %></th>
46
+ <th><%= Spree.t('admin.execution_time') %></th>
47
+ <th><%= Spree.t('admin.errors') %></th>
48
+ <th></th>
49
+ </tr>
50
+ </thead>
51
+ <tbody>
52
+ <% if @events.any? %>
53
+ <%= render partial: 'spree/admin/webhook_events/webhook_event', collection: @events, cached: spree_base_cache_scope %>
54
+ <% else %>
34
55
  <tr>
35
- <th><%= Spree.t('admin.name') %></th>
36
- <th><%= Spree.t('admin.successful') %></th>
37
- <th><%= Spree.t('admin.created_at') %></th>
38
- <th><%= Spree.t('admin.response_code') %></th>
39
- <th><%= Spree.t('admin.execution_time') %></th>
40
- <th><%= Spree.t('admin.errors') %></th>
41
- <th></th>
56
+ <td colspan="7" class="text-center">
57
+ <%= render 'spree/admin/shared/no_resource_found', new_object_url: nil, model_class: Spree::Webhooks::Event %>
58
+ </td>
42
59
  </tr>
43
- </thead>
44
- <tbody>
45
- <%= render partial: 'spree/admin/webhook_events/webhook_event', collection: @events, cached: spree_base_cache_scope %>
46
- </tbody>
47
- </table>
48
- <%= render 'spree/admin/shared/index_table_options', collection: @events %>
49
- </div>
50
- <% else %>
51
- <div class="text-center no-objects-found m-5">
52
- <%= Spree.t('admin.webhooks_subscribers.no_events') %>
53
- </div>
54
- <% end %>
60
+ <% end %>
61
+ </tbody>
62
+ </table>
63
+ <%= render 'spree/admin/shared/index_table_options', collection: @events %>
64
+ </div>
65
+
data/config/importmap.rb CHANGED
@@ -15,8 +15,8 @@ pin 'Chart.bundle', to: 'Chart.bundle.js', preload: ['application-spree-admin']
15
15
  pin 'local-time', preload: ['application-spree-admin'] # @3.0.2
16
16
  pin 'mapkick/bundle', to: 'mapkick.bundle.js', preload: ['application-spree-admin']
17
17
  pin "jquery", to: 'jquery.min.js', preload: ['application-spree-admin'] # @3.7.1
18
- pin 'bootstrap', to: 'bootstrap--dist--js--bootstrap.bundle.min.js.js', preload: ['application-spree-admin'] # @4.6.1
19
- pin 'dompurify', preload: ['application-spree-admin'] # @3.2.3
18
+ pin 'bootstrap', to: 'bootstrap--dist--js--bootstrap.bundle.min.js.js', preload: ['application-spree-admin'] # @4.6.2
19
+ pin 'dompurify', preload: ['application-spree-admin'] # @3.2.5
20
20
 
21
21
  # Stimulus components
22
22
  pin '@stimulus-components/rails-nested-form', to: '@stimulus-components--rails-nested-form.js', preload: ['application-spree-admin'] # @5.0.0
@@ -224,7 +224,7 @@ en:
224
224
  taxon_type: Taxon type
225
225
  taxon_types:
226
226
  automatic: Automatic
227
- automatic_info: Automatically match products to this taxon based on the conditions you set.
227
+ automatic_info: Automatically add products to this taxon if they match the rules you set.
228
228
  manual: Manual
229
229
  manual_info: Curate products manually. You can add or remove them in bulk.
230
230
  upload_new_asset: Upload new asset
@@ -21,9 +21,13 @@ module Spree
21
21
  :orders_filters_partials,
22
22
  :store_form_partials,
23
23
  :store_nav_partials,
24
+ :settings_nav_partials,
24
25
  :store_settings_nav_partials,
25
26
  :store_orders_nav_partials,
26
- :store_products_nav_partials
27
+ :store_products_nav_partials,
28
+ :storefront_nav_partials,
29
+ :tax_nav_partials,
30
+ :user_dropdown_partials
27
31
  )
28
32
 
29
33
  # accessible via Rails.application.config.spree_admin
@@ -92,9 +96,13 @@ module Spree
92
96
  Rails.application.config.spree_admin.orders_filters_partials = []
93
97
  Rails.application.config.spree_admin.store_form_partials = []
94
98
  Rails.application.config.spree_admin.store_nav_partials = []
99
+ Rails.application.config.spree_admin.settings_nav_partials = []
95
100
  Rails.application.config.spree_admin.store_settings_nav_partials = []
96
101
  Rails.application.config.spree_admin.store_orders_nav_partials = []
97
102
  Rails.application.config.spree_admin.store_products_nav_partials = []
103
+ Rails.application.config.spree_admin.storefront_nav_partials = []
104
+ Rails.application.config.spree_admin.tax_nav_partials = []
105
+ Rails.application.config.spree_admin.user_dropdown_partials = []
98
106
  end
99
107
  end
100
108
  end