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.

Use update for viability.

Matthew Kennedyc4c06b002b7a
diff --git a/api/app/controllers/spree/api/v2/platform/cms_pages_controller.rb b/api/app/controllers/spree/api/v2/platform/cms_pages_controller.rb
index e0b7d74491..1e36ca1779 100644
--- a/api/app/controllers/spree/api/v2/platform/cms_pages_controller.rb
+++ b/api/app/controllers/spree/api/v2/platform/cms_pages_controller.rb
@@ -5,22 +5,6 @@ module Spree
class CmsPagesController < ResourceController
before_action -> { doorkeeper_authorize! :write, :admin }, only: WRITE_ACTIONS << :toggle_visibility
- def toggle_visibility
- spree_authorize! :update, @toggle_page if spree_current_user.present?
-
- @toggle_page = scope.find(params[:id])
-
- if @toggle_page
- @toggle_page.toggle!(:visible)
- else
- head :bad_request
- end
-
- if @toggle_page.save
- head :no_content
- end
- end
-
private
def model_class
diff --git a/api/spec/requests/spree/api/v2/platform/cms_pages_spec.rb b/api/spec/requests/spree/api/v2/platform/cms_pages_spec.rb
deleted file mode 100644
index f42888a611..0000000000
--- a/api/spec/requests/spree/api/v2/platform/cms_pages_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe 'Platform API v2 CmsPages', type: :request do
- include_context 'API v2 tokens'
- include_context 'Platform API v2'
-
- let(:store) { Spree::Store.default }
- let(:page) { create(:cms_homepage, store: store) }
- let(:bearer_token) { { 'Authorization' => valid_authorization } }
-
- describe 'cms_page#toggle_visibility' do
- context 'with no params' do
- let(:params) { {id: nil} }
-
- before do
- patch '/api/v2/platform/cms_pages/toggle_visibility', headers: bearer_token, params: params
- end
-
- it_behaves_like 'returns 404 HTTP status'
- end
-
- context 'with correct params' do
- before do
- patch "/api/v2/platform/cms_pages/#{page.id}/toggle_visibility", headers: bearer_token
- end
-
- it_behaves_like 'returns 204 HTTP status'
-
- it 'sets page.visible from true to false' do
- page.reload
- expect(page.visible).to be false
- end
- end
- end
-end
diff --git a/backend/app/assets/javascripts/spree/backend/cms/page.es6 b/backend/app/assets/javascripts/spree/backend/cms/page.es6
index acccd603a3..369598ef90 100644
--- a/backend/app/assets/javascripts/spree/backend/cms/page.es6
+++ b/backend/app/assets/javascripts/spree/backend/cms/page.es6
@@ -29,14 +29,24 @@ document.addEventListener('DOMContentLoaded', function() {
})
function handleTogglePageVisibility(obj) {
+ let checkedState = null
+ if (obj.checked) checkedState = true
+
const pageId = parseInt(obj.dataset.cmsPageId, 10)
- fetch(Spree.routes.pages_api_v2 + `/${pageId}/toggle_visibility`, {
+ const data = {
+ cms_page: {
+ visible: checkedState
+ }
+ }
+
+ fetch(Spree.routes.pages_api_v2 + `/${pageId}`, {
method: 'PATCH',
headers: {
Authorization: 'Bearer ' + OAUTH_TOKEN,
'Content-Type': 'application/json'
- }
+ },
+ body: JSON.stringify(data)
})
.then(response => {
if (response.ok) {
diff --git a/core/lib/spree/permitted_attributes.rb b/core/lib/spree/permitted_attributes.rb
index 39248e2b4b..aba81b279b 100644
--- a/core/lib/spree/permitted_attributes.rb
+++ b/core/lib/spree/permitted_attributes.rb
@@ -24,7 +24,9 @@ module Spree
:taxon_attributes,
:taxonomy_attributes,
:user_attributes,
- :variant_attributes
+ :variant_attributes,
+ :cms_page_attributes,
+ :cms_section_attributes
]
mattr_reader *ATTRIBUTES
@@ -43,6 +45,10 @@ module Spree
:user_id, :bill_address_id, :ship_address_id
]
+ @@cms_page_attributes = [:title, :meta_title, :content, :meta_description, :visible, :slug, :locale]
+
+ @@cms_section_attributes = [:name, :content, :settings, :fit, :destination]
+
@@customer_return_attributes = [:stock_location_id, return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount, :acceptance_status, :exchange_variant_id, :resellable]]
@@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]