Skip to content

feat(emailPreview): i18n fix, open links in new tab, HTML/text switcher #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rubenhensen merged 5 commits into from
Jun 3, 2026
Merged

feat(emailPreview): i18n fix, open links in new tab, HTML/text switcher #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a11cce
chore: bump @e4a/pg-js to ^2.0.1
rubenhensen Jun 3, 2026
d2cba06
fix(i18n): move emailPreview keys out of encryptPanel
rubenhensen Jun 3, 2026
b7819d0
fix(emailPreview): open in-body links in a new tab via injected <base>
rubenhensen Jun 3, 2026
5b811b2
feat(emailPreview): HTML / plain-text body switcher
rubenhensen Jun 3, 2026
cd3d040
chore(dev-stack): dedupe FileInput; bump cryptify + pkg submodules
rubenhensen Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cryptify
Open in desktop
Submodule cryptify updated 16 files
+14 −0 .github/workflows/pr-title.yml
+18 −0 CHANGELOG.md
+37 −11 Cargo.lock
+12 −2 Cargo.toml
+2 −0 Dockerfile
+33 −0 api-description.yaml
+31 −0 build.rs
+2 −0 conf/config.dev.toml
+34 −0 src/config.rs
+674 −64 src/email.rs
+1,031 −40 src/main.rs
+418 −0 src/metrics.rs
+35 −15 src/store.rs
+1 −1 templates/email/email.html
+25 −0 templates/email/email.txt
+ − templates/email/pg_logo.png
6 changes: 6 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ services:
- ./cryptify/conf/config.dev.toml:/app/config.toml:ro
- ./cryptify/src:/app/src
- ./cryptify/templates:/app/templates
# build.rs feeds `PG_CORE_VERSION` (used by the X-PostGuard
# mail header) from Cargo.lock at compile time. Both files
# need to be visible inside the container, or cargo bails
# on `env!("PG_CORE_VERSION")`.
- ./cryptify/build.rs:/app/build.rs:ro
- ./cryptify/Cargo.lock:/app/Cargo.lock:ro
- cryptify-target:/app/target
environment:
- RUST_LOG=info
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
},
"dependencies": {
"@deltablot/dropzone": "^7.4.3",
"@e4a/pg-js": "^2.0.0",
"@e4a/pg-js": "^2.0.1",
"@iconify/svelte": "^5.2.1",
"@privacybydesign/yivi-css": "^1.0.1",
"country-flag-icons": "^1.6.17",
Expand Down
2 changes: 1 addition & 1 deletion postguard
Open in desktop
Submodule postguard updated 29 files
+19 −0 .cargo/audit.toml
+14 −0 .github/workflows/pr-title.yml
+831 −275 Cargo.lock
+1 −1 Dockerfile
+9 −0 pg-cli/CHANGELOG.md
+7 −7 pg-cli/Cargo.toml
+6 −4 pg-cli/src/decrypt.rs
+9 −5 pg-cli/src/encrypt.rs
+6 −0 pg-core/CHANGELOG.md
+4 −4 pg-core/Cargo.toml
+89 −2 pg-core/src/api.rs
+23 −19 pg-core/src/artifacts.rs
+72 −0 pg-core/src/bincode_compat.rs
+4 −4 pg-core/src/client/header.rs
+6 −6 pg-core/src/client/rust/mod.rs
+9 −9 pg-core/src/client/rust/stream.rs
+7 −6 pg-core/src/client/web/mod.rs
+10 −10 pg-core/src/client/web/stream.rs
+15 −8 pg-core/src/error.rs
+2 −0 pg-core/src/lib.rs
+6 −0 pg-ffi/CHANGELOG.md
+2 −2 pg-ffi/Cargo.toml
+21 −0 pg-pkg/CHANGELOG.md
+6 −7 pg-pkg/Cargo.toml
+2 −2 pg-pkg/src/generate.rs
+2 −2 pg-pkg/src/handlers/key.rs
+102 −19 pg-pkg/src/handlers/start.rs
+26 −28 pg-pkg/src/util.rs
+1 −1 pg-wasm/Cargo.toml
106 changes: 100 additions & 6 deletions src/lib/components/filesharing/EmailPreviewModal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@
let data = $state<PreviewResponse | null>(null)
/** Index into the flat list of [...recipients, confirmation?] */
let activeIdx = $state(0)
/** Which MIME alternative to show in the body. Mail clients pick
* HTML when available; the plain-text branch is what text-only
* clients (or accessibility tools) actually render. */
let bodyView: 'html' | 'text' = $state('html')

let allEmails = $derived.by<RenderedEmail[]>(() => {
if (!data) return []
Expand Down Expand Up @@ -83,6 +87,24 @@
function handleKey(e: KeyboardEvent) {
if (e.key === 'Escape') onClose()
}

/** Inject `<base target="_blank">` into the rendered email HTML so
* anchor clicks open in a new top-level tab instead of trying to
* navigate the sandboxed iframe (which has no `allow-top-navigation`
* and would otherwise blank the body). The `allow-popups` /
* `allow-popups-to-escape-sandbox` flags already permit the new
* tab. We try to splice into an existing `<head>`; if cryptify ever
* changes the template shape, the prepended fallback still works
* because browsers tolerate a `<base>` before `<html>`. */
function withBaseTarget(html: string): string {
const tag = '<base target="_blank" rel="noopener">'
const headIdx = html.search(/<head[^>]*>/i)
if (headIdx >= 0) {
const end = html.indexOf('>', headIdx) + 1
return html.slice(0, end) + tag + html.slice(end)
}
return tag + html
}
</script>

<svelte:window onkeydown={handleKey} />
Expand Down Expand Up @@ -182,12 +204,37 @@
</div>
</section>

<iframe
class="email-frame"
title={$_('filesharing.emailPreview.iframeTitle')}
srcdoc={active.html}
sandbox="allow-popups allow-popups-to-escape-sandbox"
></iframe>
<div class="body-tabs" role="tablist">
<button
type="button"
role="tab"
aria-selected={bodyView === 'html'}
class="body-tab"
class:active={bodyView === 'html'}
onclick={() => (bodyView = 'html')}
>{$_('filesharing.emailPreview.viewHtml')}</button
>
<button
type="button"
role="tab"
aria-selected={bodyView === 'text'}
class="body-tab"
class:active={bodyView === 'text'}
onclick={() => (bodyView = 'text')}
>{$_('filesharing.emailPreview.viewText')}</button
>
</div>

{#if bodyView === 'html'}
<iframe
class="email-frame"
title={$_('filesharing.emailPreview.iframeTitle')}
srcdoc={withBaseTarget(active.html)}
sandbox="allow-popups allow-popups-to-escape-sandbox"
></iframe>
{:else}
<pre class="email-text">{active.text}</pre>
{/if}
{/if}
</div>
</div>
Expand Down Expand Up @@ -313,13 +360,60 @@
font-size: var(--pg-font-size-sm);
}

.body-tabs {
display: flex;
gap: 0.25rem;
padding: 0.5rem 1.5rem 0;
background: var(--pg-soft-background);
border-bottom: 1px solid var(--pg-strong-background);
}

.body-tab {
background: transparent;
border: 0;
border-bottom: 2px solid transparent;
padding: 0.4rem 0.8rem;
font-family: var(--pg-font-family);
font-size: var(--pg-font-size-sm);
color: var(--pg-text-secondary);
cursor: pointer;
}

.body-tab:hover {
color: var(--pg-text);
}

.body-tab.active {
color: var(--pg-text);
border-bottom-color: var(--pg-primary-contrast);
}

.body-tab:focus-visible {
outline: 2px solid var(--pg-text);
outline-offset: 2px;
}

.email-frame {
width: 100%;
height: min(70vh, 720px);
border: 0;
background: var(--pg-soft-background);
}

.email-text {
margin: 0;
padding: 1rem 1.5rem;
max-height: min(70vh, 720px);
overflow: auto;
background: var(--pg-soft-background);
color: var(--pg-text);
font-family: ui-monospace, SFMono-Regular, Menlo, monospace;
font-size: var(--pg-font-size-sm);
line-height: 1.5;
white-space: pre-wrap;
word-break: break-word;
}

.state {
padding: 2rem 1.5rem;
text-align: center;
Expand Down
11 changes: 11 additions & 0 deletions src/lib/components/filesharing/inputs/FileInput.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,17 @@
})

myDropzone.on('addedfile', (file) => {
const isDuplicate = files.some(
(f) =>
f.name === file.name &&
f.size === file.size &&
f.lastModified === file.lastModified
)
if (isDuplicate) {
myDropzone!.removeFile(file)
return
}

files = files.concat([file])
percentages = percentages.concat([0])
done = done.concat([false])
Expand Down
32 changes: 17 additions & 15 deletions src/lib/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,21 +229,6 @@
"addRecipient": "recipient",
"addRecipientButton": "Add another recipient",
"emailSenderConfirm": "Send me a confirmation",
"emailPreview": {
"title": "Notification email preview",
"subtitle": "Staging only — cryptify does not actually send notification emails on staging. This is what each recipient would have received.",
"loading": "Loading preview…",
"error": "Could not load preview.",
"empty": "No recipients to preview.",
"close": "Close",
"from": "From",
"replyTo": "Reply to",
"subject": "Subject",
"to": "To",
"confirmationTag": "sender copy",
"iframeTitle": "Notification email body",
"reopen": "Show email preview"
},
"timeremaining": {
"estimate": "Estimating...",
"unknown": "More then one day left.",
Expand Down Expand Up @@ -271,6 +256,23 @@
"serverBlocked": "The server rejected this upload because you have used {used} GB of your {limit} GB 2-week limit. Your limit resets on {resets}."
}
},
"emailPreview": {
"title": "Notification email preview",
"subtitle": "Staging only — cryptify does not actually send notification emails on staging. This is what each recipient would have received.",
"loading": "Loading preview…",
"error": "Could not load preview.",
"empty": "No recipients to preview.",
"close": "Close",
"from": "From",
"replyTo": "Reply to",
"subject": "Subject",
"to": "To",
"confirmationTag": "sender copy",
"iframeTitle": "Notification email body",
"reopen": "Show email preview",
"viewHtml": "HTML",
"viewText": "Plain text"
},
"attributes": {
"pbdf.sidn-pbdf.mobilenumber.mobilenumber": "Mobile phone number",
"pbdf.sidn-pbdf.mobilenumber.mobilenumber.placeholder": "612345678",
Expand Down
32 changes: 17 additions & 15 deletions src/lib/locales/nl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,21 +228,6 @@
"addRecipient": "ontvanger",
"addRecipientButton": "Voeg nog een ontvanger toe",
"emailSenderConfirm": "Stuur mij een bevestiging",
"emailPreview": {
"title": "Voorbeeld notificatie-e-mail",
"subtitle": "Alleen staging — cryptify verstuurt op staging geen e-mails. Dit is wat elke ontvanger zou hebben gezien.",
"loading": "Voorbeeld laden…",
"error": "Voorbeeld kon niet worden geladen.",
"empty": "Geen ontvangers om weer te geven.",
"close": "Sluiten",
"from": "Van",
"replyTo": "Antwoord aan",
"subject": "Onderwerp",
"to": "Aan",
"confirmationTag": "bevestigingskopie",
"iframeTitle": "Inhoud van de notificatie-e-mail",
"reopen": "Toon e-mailvoorbeeld"
},
"timeremaining": {
"estimate": "Estimating...",
"unknown": "Nog meer dan een dag",
Expand Down Expand Up @@ -270,6 +255,23 @@
"serverBlocked": "De server weigerde deze upload omdat je {used} GB van je {limit} GB-limiet (2 weken) hebt gebruikt. De limiet reset op {resets}."
}
},
"emailPreview": {
"title": "Voorbeeld notificatie-e-mail",
"subtitle": "Alleen staging — cryptify verstuurt op staging geen e-mails. Dit is wat elke ontvanger zou hebben gezien.",
"loading": "Voorbeeld laden…",
"error": "Voorbeeld kon niet worden geladen.",
"empty": "Geen ontvangers om weer te geven.",
"close": "Sluiten",
"from": "Van",
"replyTo": "Antwoord aan",
"subject": "Onderwerp",
"to": "Aan",
"confirmationTag": "bevestigingskopie",
"iframeTitle": "Inhoud van de notificatie-e-mail",
"reopen": "Toon e-mailvoorbeeld",
"viewHtml": "HTML",
"viewText": "Platte tekst"
},
"attributes": {
"pbdf.sidn-pbdf.mobilenumber.mobilenumber": "Mobiel telefoonnummer",
"pbdf.sidn-pbdf.mobilenumber.mobilenumber.placeholder": "612345678",
Expand Down