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.

Fix: email template editor reverted and restored the shared version with the wrong draft version

Damian Legawiecc66ef7b305f1
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/emails/templates/$templateId.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/emails/templates/$templateId.tsx
index 97da1492b2..e18c6387d2 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/emails/templates/$templateId.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/emails/templates/$templateId.tsx
@@ -300,7 +300,13 @@ function EmailTemplateEditor({
confirmLabel: t('admin.email_templates.actions.revert'),
variant: 'destructive',
},
- () => revert.mutateAsync({ language: versionLanguage, lock_version: lockVersion }),
+ // The shared version has no draft anyone edits here, so there is no copy
+ // to check against; this language's draft is not the one it affects.
+ () =>
+ revert.mutateAsync({
+ language: versionLanguage,
+ lock_version: forEveryLanguage ? undefined : lockVersion,
+ }),
)
const handleRestore = async (revisionId: string) => {
@@ -312,7 +318,8 @@ function EmailTemplateEditor({
variant: dirty ? 'destructive' : 'default',
},
() =>
- restore.mutateAsync({ revisionId, language: versionLanguage, lock_version: lockVersion }),
+ // Restored into this language's draft, even from the shared version's history.
+ restore.mutateAsync({ revisionId, language, lock_version: lockVersion }),
)
if (restored) setHistoryOpen(false)
}
diff --git a/spree/api/app/controllers/spree/api/v3/admin/email_templates/restorations_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/email_templates/restorations_controller.rb
index 7add11c8ab..04c1121752 100644
--- a/spree/api/app/controllers/spree/api/v3/admin/email_templates/restorations_controller.rb
+++ b/spree/api/app/controllers/spree/api/v3/admin/email_templates/restorations_controller.rb
@@ -8,14 +8,20 @@ module Spree
# POST /api/v3/admin/email_templates/:email_template_id/revisions/:revision_id/restoration
#
- # Copies the revision into the draft, to be published like any change.
+ # Copies the revision into the language's draft, to be published
+ # like any change. A language without a version of its own can
+ # restore one of the version for every language its customers get.
def create
authorize! :update, Spree::EmailTemplate
- revision = email_template_revisions.find_by_prefix_id!(params[:revision_id])
+ revision = Spree::EmailTemplateRevision.where(
+ email_template: current_store.email_templates.where(
+ key: email_template.key, locale: [language, Spree::EmailTemplate::ANY_LOCALE]
+ )
+ ).find_by_prefix_id!(params[:revision_id])
result = Spree.email_template_restore_revision_workflow.call(
- revision: revision, actor: current_actor, lock_version: params[:lock_version]
+ revision: revision, actor: current_actor, lock_version: params[:lock_version], locale: language
)
render_email_template_result(result, status: :created)
end
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/email_templates/restorations_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/email_templates/restorations_controller_spec.rb
index abb192749c..29b540c162 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/email_templates/restorations_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/email_templates/restorations_controller_spec.rb
@@ -19,6 +19,13 @@ RSpec.describe Spree::Api::V3::Admin::EmailTemplates::RestorationsController, ty
expect(json_response['draft']).to include('subject' => 'Old subject', 'body' => 'Old body')
end
+ it "restores a revision of the version for every language into one language's draft" do
+ post :create, params: { email_template_id: id, revision_id: revision.prefixed_id, language: 'de' }, as: :json
+
+ expect(response).to have_http_status(:created)
+ expect(store.email_template_drafts.find_by(locale: 'de').body).to eq('Old body')
+ end
+
it "does not restore another store's revision" do
other = create(:email_template_revision, email_template: create(:email_template, store: create(:store), key: editable_key))
diff --git a/spree/core/app/workflows/spree/email_templates/restore_revision.rb b/spree/core/app/workflows/spree/email_templates/restore_revision.rb
index 74f5bfa915..63f24d27f6 100644
--- a/spree/core/app/workflows/spree/email_templates/restore_revision.rb
+++ b/spree/core/app/workflows/spree/email_templates/restore_revision.rb
@@ -1,14 +1,15 @@
module Spree
module EmailTemplates
# Copies a published revision into the draft, to be checked and
- # published like any other change.
+ # published like any other change. A revision of the version for every
+ # language can be restored into one language's draft (`locale`).
class RestoreRevision < Spree::Workflow
- def perform(revision:, actor: nil, lock_version: nil)
+ def perform(revision:, actor: nil, lock_version: nil, locale: nil)
super
template = revision.email_template
Spree.email_template_save_draft_workflow.call(
- store: template.store, key: template.key, locale: template.locale, actor: actor,
+ store: template.store, key: template.key, locale: locale.presence || template.locale, actor: actor,
attributes: { subject: revision.subject, body: revision.body, lock_version: lock_version }
)
end