diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac1ce52c4..5dfc72274 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -70,6 +70,8 @@ All notable changes to this project will be documented in this file.
- **Fix**: Create Notification is now disabled, and Edit hidden, on the transactional notifications page for members without Templates read: creating offered a template picker they could not load, and saving an edit was refused. Editing a notification managed by an integration stays available with Transactional write alone. Its edit drawer then shows the template's ID, with a note that Templates read is needed to see the template, instead of an empty field, and the page no longer requests templates without Templates read.
+- **Fix**: A member without Templates read now sees the template's ID instead of an empty field or "Untitled" in a list's double opt-in template, a broadcast's templates, an automation's email nodes and a segment's email conditions, and these screens no longer request templates such a member cannot read. The template fields carry a lock saying that Templates read is needed.
+
- **Fix**: `transactional.update`, `transactional.delete` and `templates.delete` now answer 400 with the reason, instead of 500, when they refuse to change the name or channels of a notification managed by an integration, or to delete such a notification or template. `templates.delete` also answers a missing permission with 403 and a revoked API key with 401, as the other endpoints do, instead of 500.
- **Fix**: Liquid in templates now matches Shopify Liquid in more cases: `{% if order.total == 100 %}` matches numbers from your data, accented text is no longer corrupted by `capitalize` or `truncate`, amounts are exact (`0.1 | plus: 0.2` is `0.3`), `date` supports `%-d` and formats timestamps, and conditions on a text containing "and" or "or", tags written over several lines and `{%- raw -%}` work.
diff --git a/console/src/components/automations/NodeConfigPanel.test.tsx b/console/src/components/automations/NodeConfigPanel.test.tsx
index fcc845d06..3856ad2a3 100644
--- a/console/src/components/automations/NodeConfigPanel.test.tsx
+++ b/console/src/components/automations/NodeConfigPanel.test.tsx
@@ -1,4 +1,4 @@
-import { describe, it, expect, vi } from 'vitest'
+import { describe, it, expect, vi, afterEach } from 'vitest'
import { render, screen, fireEvent } from '@testing-library/react'
import { i18n } from '@lingui/core'
import { I18nProvider } from '@lingui/react'
@@ -10,7 +10,9 @@ import type { NodeType } from '../../services/api/automation'
// The per-type forms are exercised by their own tests; stubbing the barrel keeps this one about
// the description field the panel owns, and keeps a single textbox on screen to address.
vi.mock('./config', () => {
- const Stub = () =>
+ const Stub = ({ canReadTemplates }: { canReadTemplates?: boolean }) => (
+
+ )
return {
TriggerConfigForm: Stub,
DelayConfigForm: Stub,
@@ -24,8 +26,10 @@ vi.mock('./config', () => {
}
})
+const context = vi.hoisted(() => ({ canReadTemplates: true }))
+
vi.mock('./context', () => ({
- useAutomation: () => ({ workspace: { id: 'ws-1' } })
+ useAutomation: () => ({ workspace: { id: 'ws-1' }, canReadTemplates: context.canReadTemplates })
}))
// The NodeType union has no runtime counterpart; build the list from a map typed against it so a
@@ -158,3 +162,23 @@ describe('NodeConfigPanel description', () => {
expect(container).toBeEmptyDOMElement()
})
})
+
+// Without Templates read the trigger's template filter and the email node's template are locked:
+// the panel hands the editor's permission to both forms.
+describe('NodeConfigPanel Templates read', () => {
+ afterEach(() => {
+ context.canReadTemplates = true
+ })
+
+ it.each([
+ { nodeType: 'trigger' as NodeType, canRead: false },
+ { nodeType: 'email' as NodeType, canRead: false },
+ { nodeType: 'trigger' as NodeType, canRead: true },
+ { nodeType: 'email' as NodeType, canRead: true }
+ ])('passes $canRead to the $nodeType form', ({ nodeType, canRead }) => {
+ context.canReadTemplates = canRead
+ renderPanel(makeNode('n1', nodeType, {}))
+
+ expect(screen.getByTestId('type-form').getAttribute('data-can-read-templates')).toBe(String(canRead))
+ })
+})
diff --git a/console/src/components/automations/NodeConfigPanel.tsx b/console/src/components/automations/NodeConfigPanel.tsx
index c8aff9234..bde57201c 100644
--- a/console/src/components/automations/NodeConfigPanel.tsx
+++ b/console/src/components/automations/NodeConfigPanel.tsx
@@ -71,7 +71,7 @@ export const NodeConfigPanel: React.FC = ({
onClose
}) => {
const { t } = useLingui()
- const { workspace } = useAutomation()
+ const { workspace, canReadTemplates } = useAutomation()
if (!selectedNode) {
return null
@@ -99,6 +99,7 @@ export const NodeConfigPanel: React.FC = ({
onChange={handleConfigChange}
workspaceId={workspaceId}
workspace={workspace}
+ canReadTemplates={canReadTemplates}
/>
)
case 'delay':
@@ -115,6 +116,7 @@ export const NodeConfigPanel: React.FC = ({
onChange={handleConfigChange}
workspaceId={workspaceId}
workspace={workspace}
+ canReadTemplates={canReadTemplates}
/>
)
case 'ab_test':
diff --git a/console/src/components/automations/UpsertAutomationDrawer.test.tsx b/console/src/components/automations/UpsertAutomationDrawer.test.tsx
new file mode 100644
index 000000000..0bd1b8874
--- /dev/null
+++ b/console/src/components/automations/UpsertAutomationDrawer.test.tsx
@@ -0,0 +1,75 @@
+import type { ReactNode } from 'react'
+import { describe, it, expect, vi } from 'vitest'
+import { render, screen, fireEvent } from '@testing-library/react'
+import { App } from 'antd'
+import { i18n } from '@lingui/core'
+import { I18nProvider } from '@lingui/react'
+import { UpsertAutomationDrawer } from './UpsertAutomationDrawer'
+import type { Workspace } from '../../services/api/types'
+
+// jsdom lacks matchMedia, which antd's Drawer touches.
+vi.stubGlobal('matchMedia', () => ({
+ matches: false,
+ addListener() {},
+ removeListener() {},
+ addEventListener() {},
+ removeEventListener() {}
+}))
+
+// The provider exposes only what this file checks: the permission it gets. The editor inside it
+// is exercised by its own tests.
+vi.mock('./context', () => ({
+ AutomationProvider: ({
+ canReadTemplates,
+ children
+ }: {
+ canReadTemplates: boolean
+ children: ReactNode
+ }) => (
+