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 showed translation keys instead of text

Damian Legawiec7a7098dcba36
diff --git a/packages/admin-sdk/src/admin-client.ts b/packages/admin-sdk/src/admin-client.ts
index de1f69e08c..c9768bb8a0 100644
--- a/packages/admin-sdk/src/admin-client.ts
+++ b/packages/admin-sdk/src/admin-client.ts
@@ -5779,7 +5779,11 @@ export class AdminClient {
): Promise<EmailTemplate> =>
this.request<EmailTemplate>('GET', `/email_templates/${id}`, {
...options,
- params: getParams(params),
+ // getParams keeps only expand and fields, so the language is added back.
+ params: {
+ ...getParams(params),
+ ...(params?.language ? { language: params.language } : {}),
+ },
}),
/** Goes back to Spree's default and discards the draft. Published versions stay in the history. */
@@ -5872,7 +5876,13 @@ export class AdminClient {
`/email_templates/${id}/revisions`,
{
...options,
- params: params ? transformListParams(params) : undefined,
+ // The language picks the version, so it stays out of the Ransack filters.
+ params: params
+ ? (({ language, ...list }) => ({
+ ...transformListParams(list),
+ ...(language ? { language } : {}),
+ }))(params)
+ : undefined,
},
),
diff --git a/packages/admin-sdk/tests/email-templates.test.ts b/packages/admin-sdk/tests/email-templates.test.ts
new file mode 100644
index 0000000000..41958d05bf
--- /dev/null
+++ b/packages/admin-sdk/tests/email-templates.test.ts
@@ -0,0 +1,42 @@
+import { HttpResponse, http } from 'msw'
+import { describe, expect, it } from 'vitest'
+import { API_PREFIX, createTestClient, paginated } from './helpers'
+import { server } from './mocks/server'
+
+const id = 'spree.order_mailer.confirm_email'
+
+describe('emailTemplates', () => {
+ it('get sends the language with the expansions', async () => {
+ let url: URL | null = null
+ server.use(
+ http.get(`${API_PREFIX}/email_templates/${id}`, ({ request }) => {
+ url = new URL(request.url)
+ return HttpResponse.json({ id })
+ }),
+ )
+
+ await createTestClient().emailTemplates.get(id, {
+ language: 'de',
+ expand: ['draft.updated_by'],
+ })
+
+ expect(url!.searchParams.get('language')).toBe('de')
+ expect(url!.searchParams.get('expand')).toBe('draft.updated_by')
+ })
+
+ it('revisions.list sends the language as itself, not as a filter', async () => {
+ let url: URL | null = null
+ server.use(
+ http.get(`${API_PREFIX}/email_templates/${id}/revisions`, ({ request }) => {
+ url = new URL(request.url)
+ return HttpResponse.json(paginated([]))
+ }),
+ )
+
+ await createTestClient().emailTemplates.revisions.list(id, { language: 'de', page: 2 })
+
+ expect(url!.searchParams.get('language')).toBe('de')
+ expect(url!.searchParams.get('q[language]')).toBeNull()
+ expect(url!.searchParams.get('page')).toBe('2')
+ })
+})