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 filter to cms_pages admin UI

Matthew Kennedyeefef6bda863
diff --git a/backend/app/controllers/spree/admin/cms_pages_controller.rb b/backend/app/controllers/spree/admin/cms_pages_controller.rb
index f723c2f7fe..646c0ed8ce 100644
--- a/backend/app/controllers/spree/admin/cms_pages_controller.rb
+++ b/backend/app/controllers/spree/admin/cms_pages_controller.rb
@@ -3,6 +3,16 @@ module Spree
class CmsPagesController < ResourceController
private
+ def collection
+ return @collection if @collection.present?
+
+ params[:q] ||= {}
+ @collection = super
+
+ @search = @collection.ransack(params[:q])
+ @collection = @search.result.page(params[:page]).per(params[:per_page])
+ end
+
def location_after_save
spree.edit_admin_cms_page_path(@cms_page)
end
diff --git a/backend/app/views/spree/admin/cms_pages/index.html.erb b/backend/app/views/spree/admin/cms_pages/index.html.erb
index 6741eb4c99..572b80a366 100644
--- a/backend/app/views/spree/admin/cms_pages/index.html.erb
+++ b/backend/app/views/spree/admin/cms_pages/index.html.erb
@@ -6,6 +6,48 @@
<%= button_link_to Spree.t('admin.cms.add_new_page'), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'new_page' } %>
<% end if can?(:create, Spree::CmsPage) %>
+<% content_for :table_filter do %>
+ <div data-hook="admin_menus_sidebar">
+ <%= search_form_for [:admin, @search] do |f| %>
+ <%- locals = {f: f} %>
+ <div class="row">
+ <div class="col-12 col-lg-6">
+ <div class="form-group">
+ <%= f.label :title_cont, Spree.t('admin.cms.title') %>
+ <%= f.text_field :title_cont, size: 15, class: "form-control js-quick-search-target js-filterable" %>
+ </div>
+ </div>
+
+ <div class="col-12 col-lg-6">
+ <div class="form-group">
+ <%= label_tag :q_type_eq, Spree.t(:type) %>
+ <%= f.select(:type_eq, spree_humanize_dropdown_values('Spree::CmsPage', {const: 'TYPES'}), {include_blank: true}, class: 'select2-clear js-filterable') %>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-12 col-lg-6">
+ <div class="form-group">
+ <%= label_tag :q_locale_eq, Spree.t(:language) %>
+ <%= f.select :locale_eq, all_locales_options, { include_blank: true }, class: 'select2-clear js-filterable' %>
+ </div>
+ </div>
+ <div class="col-12 col-lg-6">
+ <div class="form-group">
+ <%= label_tag :q_store_id_in, Spree.t(:store) %>
+ <%= f.collection_select(:store_id_in, @stores, :id, :unique_name, { include_blank: true }, { class: 'select2-clear js-filterable' }) %>
+ </div>
+ </div>
+ </div>
+
+ <div data-hook="admin_menus_index_search_buttons" class="form-actions">
+ <%= button Spree.t(:search), 'search.svg' %>
+ </div>
+ <% end %>
+ </div>
+<% end %>
+
<% if @cms_pages.any? %>
<div class="table-responsive">
<table class="table" id="pagesTable">
diff --git a/backend/spec/features/admin/cms_pages/edit_feature_page_spec.rb b/backend/spec/features/admin/cms_pages/edit_feature_page_spec.rb
index 42b41017af..2b17764f48 100644
--- a/backend/spec/features/admin/cms_pages/edit_feature_page_spec.rb
+++ b/backend/spec/features/admin/cms_pages/edit_feature_page_spec.rb
@@ -4,7 +4,7 @@ describe 'Edit Feature Page', type: :feature do
stub_authorization!
context 'when a user creates a Feature Page' do
- let!(:store_1) { create(:store, name: 'Super Store', supported_locales: 'en,fr') }
+ let!(:store_fp) { create(:store, name: 'Super Store', supported_locales: 'en,fr') }
before do
I18n.backend.store_translations(:fr,
diff --git a/backend/spec/features/admin/cms_pages/edit_homepage_spec.rb b/backend/spec/features/admin/cms_pages/edit_homepage_spec.rb
index 845727457f..cd2845b33b 100644
--- a/backend/spec/features/admin/cms_pages/edit_homepage_spec.rb
+++ b/backend/spec/features/admin/cms_pages/edit_homepage_spec.rb
@@ -4,7 +4,7 @@ describe 'Edit Homepage', type: :feature do
stub_authorization!
context 'when a user creates a Homepage' do
- let!(:store_1) { create(:store, name: 'Super Store', supported_locales: 'en,fr') }
+ let!(:store_hp) { create(:store, name: 'Super Store', supported_locales: 'en,fr') }
before do
I18n.backend.store_translations(:fr,
diff --git a/backend/spec/features/admin/cms_pages/edit_standard_page_spec.rb b/backend/spec/features/admin/cms_pages/edit_standard_page_spec.rb
index 147204be9f..ee820c9d43 100644
--- a/backend/spec/features/admin/cms_pages/edit_standard_page_spec.rb
+++ b/backend/spec/features/admin/cms_pages/edit_standard_page_spec.rb
@@ -4,7 +4,7 @@ describe 'Edit Standard Page', type: :feature do
stub_authorization!
context 'when a user creates a Standard Page' do
- let!(:store_1) { create(:store, name: 'Super Store', supported_locales: 'en,fr') }
+ let!(:store_sp) { create(:store, name: 'Super Store', supported_locales: 'en,fr') }
before do
visit spree.new_admin_cms_page_path
diff --git a/core/app/models/spree/cms_page.rb b/core/app/models/spree/cms_page.rb
index 1f16482d72..c06c804ce9 100644
--- a/core/app/models/spree/cms_page.rb
+++ b/core/app/models/spree/cms_page.rb
@@ -22,7 +22,7 @@ module Spree
scope :by_slug, ->(slug) { where(slug: slug) }
scope :linkable, -> { where.not(slug: nil, type: 'Spree::Cms::Pages::Homepage') }
- self.whitelisted_ransackable_attributes = %w[title type]
+ self.whitelisted_ransackable_attributes = %w[title type locale store_id]
def seo_title
if meta_title.present?
diff --git a/frontend/spec/features/homepage_spec.rb b/frontend/spec/features/homepage_spec.rb
index f0a28a5584..7eda09bede 100644
--- a/frontend/spec/features/homepage_spec.rb
+++ b/frontend/spec/features/homepage_spec.rb
@@ -1,31 +1,34 @@
require 'spec_helper'
describe 'homepage', type: :feature, js: true do
- let!(:eu_store) { create(:store, default: true, supported_currencies: 'EUR', default_locale: 'de', supported_locales: 'de,fr') }
- let!(:us_store) { create(:store, supported_currencies: 'USD', default_locale: 'en', supported_locales: 'en') }
+ let!(:eu_store_hp) { create(:store, default: true, supported_currencies: 'EUR', default_locale: 'de', supported_locales: 'de,fr') }
+ let!(:us_store_hp) { create(:store, supported_currencies: 'USD', default_locale: 'en', supported_locales: 'en') }
+
+ after do
+ eu_store_hp.update(default: false)
+ eu_store_hp.save!
+ eu_store_hp.reload
+ end
context 'meta title' do
- let!(:current_store) { create(:store) }
- let!(:homepage_mt) { create(:cms_homepage, store: eu_store, locale: 'de') }
+ let!(:homepage_mt) { create(:cms_homepage, store: eu_store_hp, locale: 'de') }
before { visit spree.root_path }
it 'displays page title as page title if no meta_title is set' do
- expect(page).to have_title("#{homepage_mt.title} - #{current_store.name}")
+ expect(page).to have_title("#{homepage_mt.title} - #{eu_store_hp.name}")
end
it 'displays page meta_title as page title if meta_title is set' do
- expect(page).to have_title("#{homepage_mt.meta_title} - #{current_store.name}")
+ expect(page).to have_title("#{homepage_mt.meta_title} - #{eu_store_hp.name}")
end
end
context 'meta description - when no cms_homepage is set and store has no meta data set' do
- let!(:current_store) { create(:store) }
-
before { visit spree.root_path }
it 'returns store_seo_description falling back to store name' do
- expect(page).to have_meta(:description, current_store.name)
+ expect(page).to have_meta(:description, eu_store_hp.name)
end
end
@@ -50,17 +53,17 @@ describe 'homepage', type: :feature, js: true do
end
context 'meta description - when cms_homepage is set and has no meta description' do
- let!(:homepage_with_no_meta_description) { create(:cms_homepage, store: eu_store, locale: 'de') }
+ let!(:homepage_with_no_meta_description) { create(:cms_homepage, store: eu_store_hp, locale: 'de') }
before { visit spree.root_path }
it 'falls back to store seo_meta_description' do
- expect(page).to have_meta(:description, eu_store.name)
+ expect(page).to have_meta(:description, eu_store_hp.name)
end
end
context 'meta description - when cms_homepage is set and has meta description' do
- let!(:homepage_with_meta_description) { create(:cms_homepage, store: eu_store, locale: 'de', meta_description: 'Page Meta Description') }
+ let!(:homepage_with_meta_description) { create(:cms_homepage, store: eu_store_hp, locale: 'de', meta_description: 'Page Meta Description') }
before { visit spree.root_path }
@@ -78,7 +81,7 @@ describe 'homepage', type: :feature, js: true do
end
context 'when homepage is set' do
- let!(:homepage) { create(:cms_homepage, store: eu_store, locale: 'de') }
+ let!(:homepage) { create(:cms_homepage, store: eu_store_hp, locale: 'de') }
let!(:hp_section) { create(:cms_featured_article_section, cms_page: homepage) }
before do
@@ -97,7 +100,7 @@ describe 'homepage', type: :feature, js: true do
end
context 'when the index page is viewed using a none default language but no cms_homepage is available for the current language' do
- let!(:homepage_de) { create(:cms_homepage, store: eu_store, locale: 'de') }
+ let!(:homepage_de) { create(:cms_homepage, store: eu_store_hp, locale: 'de') }
let!(:hp_section_de) { create(:cms_featured_article_section, cms_page: homepage_de) }
before do
@@ -124,8 +127,8 @@ describe 'homepage', type: :feature, js: true do
end
context 'when the index page is viewed using none default language and translation is present' do
- let!(:homepage_de) { create(:cms_homepage, store: eu_store, locale: 'de') }
- let!(:homepage_fr) { create(:cms_homepage, store: eu_store, locale: 'fr') }
+ let!(:homepage_de) { create(:cms_homepage, store: eu_store_hp, locale: 'de') }
+ let!(:homepage_fr) { create(:cms_homepage, store: eu_store_hp, locale: 'fr') }
let!(:hp_section_de) { create(:cms_featured_article_section, cms_page: homepage_de) }
let!(:hp_section_fr) { create(:cms_featured_article_section, cms_page: homepage_fr) }
@@ -159,14 +162,14 @@ describe 'homepage', type: :feature, js: true do
end
context 'homepage is displayed for the current store' do
- let!(:homepage_eu_store) { create(:cms_homepage, store: eu_store, locale: 'de') }
- let!(:homepage_us_store) { create(:cms_homepage, store: us_store, locale: 'en') }
+ let!(:homepage_eu_store) { create(:cms_homepage, store: eu_store_hp, locale: 'de') }
+ let!(:homepage_us_store) { create(:cms_homepage, store: us_store_hp, locale: 'en') }
let!(:hp_section_de) { create(:cms_featured_article_section, cms_page: homepage_eu_store) }
let!(:hp_section_us) { create(:cms_featured_article_section, cms_page: homepage_us_store) }
before do
- eu_store.update(default: false)
- us_store.update(default: true)
+ eu_store_hp.update(default: false)
+ us_store_hp.update(default: true)
hp_eu_sec = Spree::CmsSection.find(homepage_eu_store.id)
hp_eu_sec.content[:title] = 'Willkommen in unserem EU-Shop'
@@ -183,8 +186,8 @@ describe 'homepage', type: :feature, js: true do
end
after do
- eu_store.update(default: true)
- us_store.update(default: false)
+ eu_store_hp.update(default: true)
+ us_store_hp.update(default: false)
end
it 'displays the correct homepage for the current store' do