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 loses work and reports false conflicts

Damian Legawiecd975952a9c00
diff --git a/packages/dashboard/src/hooks/use-email-templates.ts b/packages/dashboard/src/hooks/use-email-templates.ts
index 999ca51387..d53c0d5278 100644
--- a/packages/dashboard/src/hooks/use-email-templates.ts
+++ b/packages/dashboard/src/hooks/use-email-templates.ts
@@ -3,6 +3,7 @@ import {
type EmailTemplateDraftParams,
type EmailTemplatePreview,
type EmailTemplatePreviewParams,
+ type EmailTemplateVersionParams,
SpreeError,
} from '@spree/admin-sdk'
import { adminClient, useResourceKey, useResourceMutation } from '@spree/dashboard-core'
@@ -32,10 +33,11 @@ export function useEmailTemplates(language = 'any') {
})
}
-export function useEmailTemplate(id: string, language: string) {
+export function useEmailTemplate(id: string, language: string, enabled = true) {
return useQuery({
queryKey: useResourceKey(RESOURCE, id, language),
queryFn: () => adminClient.emailTemplates.get(id, { language, expand: ['draft.updated_by'] }),
+ enabled,
})
}
@@ -63,16 +65,17 @@ export function useSaveEmailTemplateDraft(id: string) {
}
export function useDiscardEmailTemplateDraft(id: string) {
- return useResourceMutation<EmailTemplate, Error, string>({
- mutationFn: (language) => adminClient.emailTemplates.draft.delete(id, { language }),
+ return useResourceMutation<EmailTemplate, Error, EmailTemplateVersionParams>({
+ mutationFn: (params) => adminClient.emailTemplates.draft.delete(id, params),
invalidate: [[RESOURCE]],
+ errorMessage: false,
successMessage: i18n.t('admin.email_templates.messages.draft_discarded'),
})
}
export function usePublishEmailTemplate(id: string) {
- return useResourceMutation<EmailTemplate, Error, string>({
- mutationFn: (language) => adminClient.emailTemplates.publish(id, { language }),
+ return useResourceMutation<EmailTemplate, Error, EmailTemplateVersionParams>({
+ mutationFn: (params) => adminClient.emailTemplates.publish(id, params),
invalidate: [[RESOURCE]],
successMessage: i18n.t('admin.email_templates.messages.published'),
errorMessage: false,
@@ -80,9 +83,10 @@ export function usePublishEmailTemplate(id: string) {
}
export function useRevertEmailTemplate(id: string) {
- return useResourceMutation<EmailTemplate, Error, string>({
- mutationFn: (language) => adminClient.emailTemplates.revert(id, { language }),
+ return useResourceMutation<EmailTemplate, Error, EmailTemplateVersionParams>({
+ mutationFn: (params) => adminClient.emailTemplates.revert(id, params),
invalidate: [[RESOURCE]],
+ errorMessage: false,
successMessage: i18n.t('admin.email_templates.messages.reverted'),
})
}
diff --git a/packages/dashboard/src/locales/ar.json b/packages/dashboard/src/locales/ar.json
index 5e304f0da1..b2988bf216 100644
--- a/packages/dashboard/src/locales/ar.json
+++ b/packages/dashboard/src/locales/ar.json
@@ -6217,7 +6217,10 @@
"revert_title": "العودة إلى القالب الافتراضي من Spree؟",
"revert_message": "سيتلقى العملاء من الآن رسالة Spree الافتراضية وستُحذف المسودة. تبقى النسخ المنشورة في السجل لتتمكن من استعادة إحداها لاحقًا.",
"restore_title": "استعادة هذه النسخة؟",
- "restore_message": "تحل هذه النسخة محل المسودة. انشرها ليتلقاها العملاء."
+ "restore_message": "تحل هذه النسخة محل المسودة. انشرها ليتلقاها العملاء.",
+ "leave_title": "المغادرة دون حفظ؟",
+ "leave_message": "ستفقد تغييراتك غير المحفوظة على هذا القالب.",
+ "leave": "مغادرة"
},
"editor": {
"title": "القالب",
@@ -6239,7 +6242,8 @@
"shown_in": "عرض داخل",
"record": "معاينة باستخدام سجل",
"record_placeholder": "الأحدث، أو معرّف مثل or_m3Rp9wXz",
- "unavailable": "تعذر عرض المعاينة."
+ "unavailable": "تعذر عرض المعاينة.",
+ "needs_permission": "تُعرض المعاينات لمن يملك صلاحية تعديل قوالب الرسائل."
},
"problems": {
"title": "لا يمكن عرض هذا القالب",
@@ -6267,7 +6271,8 @@
"conflict": {
"title": "حفظ شخص آخر هذه المسودة",
"keep_editing": "متابعة التعديل",
- "reload": "تحميل نسخته"
+ "reload": "تحميل نسخته",
+ "overwrite": "حفظ نسختي فوق نسخته"
},
"variables": {
"title": "المتغيرات",
diff --git a/packages/dashboard/src/locales/de.json b/packages/dashboard/src/locales/de.json
index 8035d78974..7b36e04c99 100644
--- a/packages/dashboard/src/locales/de.json
+++ b/packages/dashboard/src/locales/de.json
@@ -6177,7 +6177,10 @@
"revert_title": "Auf den Spree-Standard zurücksetzen?",
"revert_message": "Kunden erhalten ab sofort die Standard-E-Mail von Spree und der Entwurf wird gelöscht. Veröffentlichte Versionen bleiben im Verlauf, sodass Sie eine später wiederherstellen können.",
"restore_title": "Diese Version wiederherstellen?",
- "restore_message": "Diese Version ersetzt den Entwurf. Veröffentlichen Sie sie, damit Kunden sie erhalten."
+ "restore_message": "Diese Version ersetzt den Entwurf. Veröffentlichen Sie sie, damit Kunden sie erhalten.",
+ "leave_title": "Ohne Speichern verlassen?",
+ "leave_message": "Ihre ungespeicherten Änderungen an dieser Vorlage gehen verloren.",
+ "leave": "Verlassen"
},
"editor": {
"title": "Vorlage",
@@ -6199,7 +6202,8 @@
"shown_in": "Anzeigen in",
"record": "Vorschau mit Datensatz",
"record_placeholder": "Neuester oder eine ID wie or_m3Rp9wXz",
- "unavailable": "Die Vorschau konnte nicht angezeigt werden."
+ "unavailable": "Die Vorschau konnte nicht angezeigt werden.",
+ "needs_permission": "Vorschauen werden für Personen erstellt, die E-Mail-Vorlagen bearbeiten dürfen."
},
"problems": {
"title": "Diese Vorlage lässt sich nicht darstellen",
@@ -6227,7 +6231,8 @@
"conflict": {
"title": "Jemand anderes hat diesen Entwurf gespeichert",
"keep_editing": "Weiter bearbeiten",
- "reload": "Deren Version laden"
+ "reload": "Deren Version laden",
+ "overwrite": "Meine Version darüber speichern"
},
"variables": {
"title": "Variablen",
diff --git a/packages/dashboard/src/locales/en.json b/packages/dashboard/src/locales/en.json
index 83f97437a3..7ff5e244d3 100644
--- a/packages/dashboard/src/locales/en.json
+++ b/packages/dashboard/src/locales/en.json
@@ -6177,7 +6177,10 @@
"revert_title": "Revert to Spree's default?",
"revert_message": "Customers receive Spree's default email from now on and the draft is deleted. Published versions stay in the history, so you can restore one later.",
"restore_title": "Restore this version?",
- "restore_message": "This version replaces the draft. Publish it for customers to receive it."
+ "restore_message": "This version replaces the draft. Publish it for customers to receive it.",
+ "leave_title": "Leave without saving?",
+ "leave_message": "Your unsaved changes to this template will be lost.",
+ "leave": "Leave"
},
"editor": {
"title": "Template",
@@ -6199,7 +6202,8 @@
"shown_in": "Show inside",
"record": "Preview with record",
"record_placeholder": "Latest, or an ID such as or_m3Rp9wXz",
- "unavailable": "The preview could not be shown."
+ "unavailable": "The preview could not be shown.",
+ "needs_permission": "Previews are rendered for people who can edit email templates."
},
"problems": {
"title": "This template does not render",
@@ -6227,7 +6231,8 @@
"conflict": {
"title": "Someone else saved this draft",
"keep_editing": "Keep editing",
- "reload": "Load their version"
+ "reload": "Load their version",
+ "overwrite": "Save mine over theirs"
},
"variables": {
"title": "Variables",
diff --git a/packages/dashboard/src/locales/es.json b/packages/dashboard/src/locales/es.json
index aa9e71fd6b..b2038fc06d 100644
--- a/packages/dashboard/src/locales/es.json
+++ b/packages/dashboard/src/locales/es.json
@@ -6177,7 +6177,10 @@
"revert_title": "¿Volver a la versión predeterminada de Spree?",
"revert_message": "A partir de ahora los clientes reciben el correo predeterminado de Spree y se elimina el borrador. Las versiones publicadas quedan en el historial para restaurarlas más tarde.",
"restore_title": "¿Restaurar esta versión?",
- "restore_message": "Esta versión reemplaza el borrador. Publícala para que la reciban los clientes."
+ "restore_message": "Esta versión reemplaza el borrador. Publícala para que la reciban los clientes.",
+ "leave_title": "¿Salir sin guardar?",
+ "leave_message": "Se perderán los cambios sin guardar de esta plantilla.",
+ "leave": "Salir"
},
"editor": {
"title": "Plantilla",
@@ -6199,7 +6202,8 @@
"shown_in": "Mostrar dentro de",
"record": "Vista previa con registro",
"record_placeholder": "El más reciente o un ID como or_m3Rp9wXz",
- "unavailable": "No se pudo mostrar la vista previa."
+ "unavailable": "No se pudo mostrar la vista previa.",
+ "needs_permission": "Las vistas previas se generan para quienes pueden editar plantillas de correo."
},
"problems": {
"title": "Esta plantilla no se puede mostrar",
@@ -6227,7 +6231,8 @@
"conflict": {
"title": "Otra persona guardó este borrador",
"keep_editing": "Seguir editando",
- "reload": "Cargar su versión"
+ "reload": "Cargar su versión",
+ "overwrite": "Guardar la mía encima"
},
"variables": {
"title": "Variables",
diff --git a/packages/dashboard/src/locales/fr.json b/packages/dashboard/src/locales/fr.json
index 062960bbec..3c53cd2396 100644
--- a/packages/dashboard/src/locales/fr.json
+++ b/packages/dashboard/src/locales/fr.json
@@ -6177,7 +6177,10 @@
"revert_title": "Revenir au modèle par défaut de Spree ?",
"revert_message": "Les clients reçoivent désormais l'e-mail par défaut de Spree et le brouillon est supprimé. Les versions publiées restent dans l'historique pour être restaurées plus tard.",
"restore_title": "Restaurer cette version ?",
- "restore_message": "Cette version remplace le brouillon. Publiez-la pour que les clients la reçoivent."
+ "restore_message": "Cette version remplace le brouillon. Publiez-la pour que les clients la reçoivent.",
+ "leave_title": "Quitter sans enregistrer ?",
+ "leave_message": "Vos modifications non enregistrées de ce modèle seront perdues.",
+ "leave": "Quitter"
},
"editor": {
"title": "Modèle",
@@ -6199,7 +6202,8 @@
"shown_in": "Afficher dans",
"record": "Aperçu avec l'enregistrement",
"record_placeholder": "Le plus récent, ou un ID comme or_m3Rp9wXz",
- "unavailable": "L'aperçu n'a pas pu être affiché."
+ "unavailable": "L'aperçu n'a pas pu être affiché.",
+ "needs_permission": "Les aperçus sont générés pour les personnes autorisées à modifier les modèles d'e-mail."
},
"problems": {
"title": "Ce modèle ne s'affiche pas",
@@ -6227,7 +6231,8 @@
"conflict": {
"title": "Quelqu'un d'autre a enregistré ce brouillon",
"keep_editing": "Continuer la modification",
- "reload": "Charger sa version"
+ "reload": "Charger sa version",
+ "overwrite": "Enregistrer ma version par-dessus"
},
"variables": {
"title": "Variables",
diff --git a/packages/dashboard/src/locales/pl.json b/packages/dashboard/src/locales/pl.json
index 16a1c94968..650d93eb3b 100644
--- a/packages/dashboard/src/locales/pl.json
+++ b/packages/dashboard/src/locales/pl.json
@@ -6245,7 +6245,10 @@
"revert_title": "Przywrócić domyślny szablon Spree?",
"revert_message": "Od teraz klienci otrzymują domyślny e-mail Spree, a szkic zostanie usunięty. Opublikowane wersje zostają w historii, więc możesz później przywrócić jedną z nich.",
"restore_title": "Przywrócić tę wersję?",
- "restore_message": "Ta wersja zastąpi szkic. Opublikuj ją, aby otrzymali ją klienci."
+ "restore_message": "Ta wersja zastąpi szkic. Opublikuj ją, aby otrzymali ją klienci.",
+ "leave_title": "Wyjść bez zapisywania?",
+ "leave_message": "Niezapisane zmiany w tym szablonie zostaną utracone.",
+ "leave": "Wyjdź"
},
"editor": {
"title": "Szablon",
@@ -6267,7 +6270,8 @@
"shown_in": "Pokaż w",
"record": "Podgląd z rekordem",
"record_placeholder": "Najnowszy lub ID, np. or_m3Rp9wXz",
- "unavailable": "Nie udało się wyświetlić podglądu."
+ "unavailable": "Nie udało się wyświetlić podglądu.",
+ "needs_permission": "Podgląd jest generowany dla osób, które mogą edytować szablony e-maili."
},
"problems": {
"title": "Tego szablonu nie da się wyświetlić",
@@ -6295,7 +6299,8 @@
"conflict": {
"title": "Ktoś inny zapisał ten szkic",
"keep_editing": "Edytuj dalej",
- "reload": "Wczytaj jego wersję"
+ "reload": "Wczytaj jego wersję",
+ "overwrite": "Zapisz moją wersję zamiast jego"
},
"variables": {
"title": "Zmienne",
diff --git a/packages/dashboard/src/locales/zh-CN.json b/packages/dashboard/src/locales/zh-CN.json
index a063b561db..47ef505897 100644
--- a/packages/dashboard/src/locales/zh-CN.json
+++ b/packages/dashboard/src/locales/zh-CN.json
@@ -6164,7 +6164,10 @@
"revert_title": "恢复为 Spree 默认?",
"revert_message": "从现在起客户将收到 Spree 的默认邮件,草稿将被删除。已发布的版本保留在历史记录中,以后可以恢复。",
"restore_title": "恢复此版本?",
- "restore_message": "此版本将替换草稿。发布后客户才会收到。"
+ "restore_message": "此版本将替换草稿。发布后客户才会收到。",
+ "leave_title": "不保存就离开?",
+ "leave_message": "您对此模板未保存的更改将会丢失。",
+ "leave": "离开"
},
"editor": {
"title": "模板",
@@ -6186,7 +6189,8 @@
"shown_in": "显示于",
"record": "使用记录预览",
"record_placeholder": "最新记录,或如 or_m3Rp9wXz 的 ID",
- "unavailable": "无法显示预览。"
+ "unavailable": "无法显示预览。",
+ "needs_permission": "只有可以编辑邮件模板的人才能生成预览。"
},
"problems": {
"title": "此模板无法渲染",
@@ -6214,7 +6218,8 @@
"conflict": {
"title": "其他人保存了此草稿",
"keep_editing": "继续编辑",
- "reload": "加载对方的版本"
+ "reload": "加载对方的版本",
+ "overwrite": "用我的版本覆盖"
},
"variables": {
"title": "变量",
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 953528f8d0..13a0fac0a2 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
@@ -52,7 +52,7 @@ import {
Trash2Icon,
} from '@spree/dashboard-ui/icons'
import { CodeEditor, type CodeEditorCompletion } from '@spree/dashboard-ui/ui/code-editor'
-import { createFileRoute } from '@tanstack/react-router'
+import { createFileRoute, useBlocker } from '@tanstack/react-router'
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { DefaultDiffDialog } from '../../../../../../components/spree/email-templates/default-diff-dialog'
@@ -96,9 +96,20 @@ const PREVIEW_DELAY_MS = 600
function EmailTemplateEditorPage() {
const { t } = useTranslation()
const { templateId } = Route.useParams()
+ const { permissions } = usePermissions()
+ const canRead = permissions.can('read', Subject.EmailTemplate)
const [language, setLanguage] = useState(ANY_LANGUAGE)
const [reloads, setReloads] = useState(0)
- const { data: template, isLoading, error, refetch } = useEmailTemplate(templateId, language)
+ const {
+ data: template,
+ isLoading,
+ error,
+ refetch,
+ } = useEmailTemplate(templateId, language, canRead)
+
+ if (!canRead) {
+ return <ErrorState title={t('admin.email_templates.errors.not_allowed')} />
+ }
if (error) {
return (
@@ -129,6 +140,7 @@ function EmailTemplateEditorPage() {
await refetch()
setReloads((count) => count + 1)
}}
+ onFetchLatest={async () => (await refetch()).data}
/>
)
}
@@ -149,11 +161,13 @@ function EmailTemplateEditor({
language,
onLanguageChange,
onReload,
+ onFetchLatest,
}: {
template: EmailTemplate
language: string
onLanguageChange: (language: string) => void
onReload: () => void
+ onFetchLatest: () => Promise<EmailTemplate | undefined>
}) {
const { t } = useTranslation()
const confirm = useConfirm()
@@ -172,6 +186,23 @@ function EmailTemplateEditor({
const [diffOpen, setDiffOpen] = useState(false)
const dirty = subject !== saved.subject || body !== saved.body
+ // Problems from a save or publish describe the text as it was sent.
+ // biome-ignore lint/correctness/useExhaustiveDependencies: cleared whenever the text changes
+ useEffect(() => setProblems([]), [subject, body])
+
+ // Leaving the page, or the tab, would lose unsaved changes.
+ useBlocker({
+ shouldBlockFn: async () =>
+ dirty &&
+ !(await confirm({
+ title: t('admin.email_templates.confirm.leave_title'),
+ message: t('admin.email_templates.confirm.leave_message'),
+ confirmLabel: t('admin.email_templates.confirm.leave'),
+ variant: 'destructive',
+ })),
+ enableBeforeUnload: () => dirty,
+ })
+
const save = useSaveEmailTemplateDraft(template.id)
const discard = useDiscardEmailTemplateDraft(template.id)
const publish = usePublishEmailTemplate(template.id)
@@ -180,11 +211,15 @@ function EmailTemplateEditor({
const sendTest = useSendTestEmail(template.id)
const revisions = useEmailTemplateRevisions(template.id, language, historyOpen)
- const applyResponse = useCallback((next: EmailTemplate) => {
+ /**
+ * Takes the server's version after a write. With `sent`, text typed while
+ * the request was out is kept rather than replaced.
+ */
+ const applyResponse = useCallback((next: EmailTemplate, sent?: Version) => {
const version = startingVersion(next)
setSaved(version)
- setSubject(version.subject)
- setBody(version.body)
+ setSubject((current) => (!sent || current === sent.subject ? version.subject : current))
+ setBody((current) => (!sent || current === sent.body ? version.body : current))
setLockVersion(next.draft?.lock_version)
setHasDraft(!!next.draft)
setProblems([])
@@ -200,14 +235,16 @@ function EmailTemplateEditor({
else if (error instanceof Error) toastManager.add({ type: 'error', title: error.message })
}
- const saveDraft = async (extra: { rebase?: boolean; version?: Version } = {}) => {
+ const saveDraft = async (
+ extra: { rebase?: boolean; version?: Version; lockVersion?: number } = {},
+ ) => {
const version = extra.version ?? { subject, body }
try {
const next = await save.mutateAsync({
language,
body: version.body,
...(isEmail ? { subject: version.subject } : {}),
- lock_version: lockVersion,
+ lock_version: 'lockVersion' in extra ? extra.lockVersion : lockVersion,
rebase: extra.rebase,
})
// Keep what is being typed: only the saved copy moves on.
@@ -223,9 +260,12 @@ function EmailTemplateEditor({
}
const handlePublish = async () => {
- if ((dirty || !hasDraft) && !(await saveDraft())) return
+ const sent = { subject, body }
+ const draft = dirty || !hasDraft ? await saveDraft() : undefined
+ if (draft === null) return
try {
- applyResponse(await publish.mutateAsync(language))
+ const lock_version = draft ? draft.draft?.lock_version : lockVersion
+ applyResponse(await publish.mutateAsync({ language, lock_version }), sent)
} catch (error) {
handleError(error)
}
@@ -240,9 +280,9 @@ function EmailTemplateEditor({
})
if (!confirmed) return
try {
- applyResponse(await discard.mutateAsync(language))
- } catch {
- // The mutation already reported the failure.
+ applyResponse(await discard.mutateAsync({ language, lock_version: lockVersion }))
+ } catch (error) {
+ handleError(error)
}
}
@@ -255,9 +295,9 @@ function EmailTemplateEditor({
})
if (!confirmed) return
try {
- applyResponse(await revert.mutateAsync(language))
- } catch {
- // The mutation already reported the failure.
+ applyResponse(await revert.mutateAsync({ language, lock_version: lockVersion }))
+ } catch (error) {
+ handleError(error)
}
}
@@ -277,6 +317,15 @@ function EmailTemplateEditor({
}
}
+ const handleOverwrite = async () => {
+ setConflict(null)
+ const latest = await onFetchLatest()
+ if (!latest) return
+ const latestLockVersion = latest.draft?.lock_version
+ setLockVersion(latestLockVersion)
+ await saveDraft({ lockVersion: latestLockVersion })
+ }
+
const handleKeepMine = async () => {
if (await saveDraft({ rebase: true })) setDiffOpen(false)
}
@@ -290,11 +339,11 @@ function EmailTemplateEditor({
}
}
- const preview = useLivePreview(template.id, {
- language,
- subject: isEmail ? subject : undefined,
- body,
- })
+ const preview = useLivePreview(
+ template.id,
+ { language, subject: isEmail ? subject : undefined, body },
+ canEdit,
+ )
const handleSendTest = async () => {
try {
@@ -319,7 +368,12 @@ function EmailTemplateEditor({
.filter((problem) => !problem.email || problem.email === template.id)
.map((problem) => ({ line: problem.line, message: problem.message }))
- const busy = save.isPending || publish.isPending || discard.isPending || revert.isPending
+ const busy =
+ save.isPending ||
+ publish.isPending ||
+ discard.isPending ||
+ revert.isPending ||
+ restore.isPending
return (
<ResourceLayout
@@ -420,7 +474,7 @@ function EmailTemplateEditor({
completions={preview.completions}
filters={FILTER_COMPLETIONS}
diagnostics={diagnostics}
- onSave={() => canEdit && dirty && saveDraft()}
+ onSave={() => canEdit && dirty && !busy && saveDraft()}
className="h-[36rem]"
/>
</CardContent>
@@ -452,6 +506,7 @@ function EmailTemplateEditor({
<ConflictDialog
message={conflict}
onClose={() => setConflict(null)}
+ onOverwrite={handleOverwrite}
onReload={() => {
setConflict(null)
onReload()
@@ -568,6 +623,7 @@ interface LivePreview {
function useLivePreview(
templateId: string,
unsaved: { language: string; subject?: string; body: string },
+ enabled: boolean,
): LivePreview {
const { t } = useTranslation()
const [recordId, setRecordId] = useState('')
@@ -588,6 +644,7 @@ function useLivePreview(
)
useEffect(() => {
+ if (!enabled) return
const id = ++latest.current
mutateAsync(JSON.parse(request))
.then((result) => {
@@ -602,7 +659,7 @@ function useLivePreview(
setProblems(listed)
setUnavailable(listed.length > 0 ? undefined : (error as Error).message)
})
- }, [request, mutateAsync])
+ }, [request, mutateAsync, enabled])
const completions = useMemo(() => {
const documented = [...(EMAIL_TEMPLATE_VARIABLES[templateId] ?? []), ...SHARED_EMAIL_VARIABLES]
@@ -621,7 +678,16 @@ function useLivePreview(
return [...fromPreview, ...documentedOnly]
}, [data, templateId, t])
- return { data, problems, unavailable, completions, recordId, setRecordId, emailKey, setEmailKey }
+ return {
+ data,
+ problems,
+ unavailable: enabled ? unavailable : t('admin.email_templates.preview.needs_permission'),
+ completions,
+ recordId,
+ setRecordId,
+ emailKey,
+ setEmailKey,
+ }
}
function PreviewCard({ template, preview }: { template: EmailTemplate; preview: LivePreview }) {
@@ -765,10 +831,12 @@ function VariablesCard({ templateId }: { templateId: string }) {
function ConflictDialog({
message,
onReload,
+ onOverwrite,
onClose,
}: {
message: string | null
onReload: () => void
+ onOverwrite: () => void
onClose: () => void
}) {
const { t } = useTranslation()
@@ -784,9 +852,12 @@ function ConflictDialog({
<Button variant="outline" onClick={onClose}>
{t('admin.email_templates.conflict.keep_editing')}
</Button>
- <Button variant="destructive" onClick={onReload}>
+ <Button variant="outline" onClick={onReload}>
{t('admin.email_templates.conflict.reload')}
</Button>
+ <Button variant="destructive" onClick={onOverwrite}>
+ {t('admin.email_templates.conflict.overwrite')}
+ </Button>
</DialogFooter>
</DialogContent>
</Dialog>