Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(email): hide deleted and moved drafts in thread views (#8795)
teo939b26fd5346
diff --git a/.sqlx/query-db987b7728fbbda9a755a9b4ddfa98cc493538cd0907c9d5a983ae690516e59a.json b/.sqlx/query-7bf645e30d4dbb7e81972ce7d39f0a46d639cb96b5ae0ff190b6eb105251bb07.jsonsimilarity index 91%rename from .sqlx/query-db987b7728fbbda9a755a9b4ddfa98cc493538cd0907c9d5a983ae690516e59a.jsonrename to .sqlx/query-7bf645e30d4dbb7e81972ce7d39f0a46d639cb96b5ae0ff190b6eb105251bb07.jsonindex e8e769cf92..82ead50dd9 100644--- a/.sqlx/query-db987b7728fbbda9a755a9b4ddfa98cc493538cd0907c9d5a983ae690516e59a.json+++ b/.sqlx/query-7bf645e30d4dbb7e81972ce7d39f0a46d639cb96b5ae0ff190b6eb105251bb07.json@@ -1,6 +1,6 @@{"db_name": "PostgreSQL",- "query": "\n SELECT\n draft_generation, id, provider_id, thread_id, provider_thread_id, replying_to_id,\n global_id, link_id, provider_history_id, internal_date_ts, snippet,\n size_estimate, subject, sent_at, has_attachments, is_read, is_starred,\n is_sent, is_draft, body_text, body_html_sanitized, body_macro,\n headers_jsonb, created_at, updated_at\n FROM email_messages\n WHERE thread_id = $1\n ORDER BY COALESCE(internal_date_ts, sent_at, created_at) DESC, id DESC\n LIMIT $2 OFFSET $3\n ",+ "query": "\n SELECT\n draft_generation, id, provider_id, thread_id, provider_thread_id, replying_to_id,\n global_id, link_id, provider_history_id, internal_date_ts, snippet,\n size_estimate, subject, sent_at, has_attachments, is_read, is_starred,\n is_sent, is_draft, body_text, body_html_sanitized, body_macro,\n headers_jsonb, created_at, updated_at\n FROM email_messages\n WHERE thread_id = $1\n AND NOT (is_draft AND COALESCE((mailbox_state->>'provider_missing')::boolean, false))\n ORDER BY COALESCE(internal_date_ts, sent_at, created_at) DESC, id DESC\n LIMIT $2 OFFSET $3\n ","describe": {"columns": [{@@ -164,5 +164,5 @@false]},- "hash": "db987b7728fbbda9a755a9b4ddfa98cc493538cd0907c9d5a983ae690516e59a"+ "hash": "7bf645e30d4dbb7e81972ce7d39f0a46d639cb96b5ae0ff190b6eb105251bb07"}diff --git a/.sqlx/query-851fe05391377c57115594c61e4491d7220a657cd0aff2c0b52f3d3628abe824.json b/.sqlx/query-da79c6faa2e707ce41d41703e860fefea0c87b389fd2bfb058ad459116e55263.jsonsimilarity index 92%rename from .sqlx/query-851fe05391377c57115594c61e4491d7220a657cd0aff2c0b52f3d3628abe824.jsonrename to .sqlx/query-da79c6faa2e707ce41d41703e860fefea0c87b389fd2bfb058ad459116e55263.jsonindex c60f2ba008..292f438c89 100644--- a/.sqlx/query-851fe05391377c57115594c61e4491d7220a657cd0aff2c0b52f3d3628abe824.json+++ b/.sqlx/query-da79c6faa2e707ce41d41703e860fefea0c87b389fd2bfb058ad459116e55263.json@@ -1,6 +1,6 @@{"db_name": "PostgreSQL",- "query": "\n SELECT\n draft_generation,\n id,\n provider_id,\n global_id,\n thread_id,\n provider_thread_id,\n replying_to_id,\n link_id,\n provider_history_id,\n internal_date_ts,\n snippet,\n size_estimate,\n subject,\n from_name,\n from_contact_id,\n sent_at,\n has_attachments,\n is_read,\n is_starred,\n is_sent,\n is_draft,\n headers_jsonb,\n created_at,\n updated_at,\n -- No body attributes\n body_text as body_text,\n body_html_sanitized as body_html_sanitized,\n NULL::TEXT as body_macro\n FROM email_messages\n WHERE thread_id = $1\n ORDER BY internal_date_ts DESC NULLS LAST\n LIMIT $2 OFFSET $3\n ",+ "query": "\n SELECT\n draft_generation,\n id,\n provider_id,\n global_id,\n thread_id,\n provider_thread_id,\n replying_to_id,\n link_id,\n provider_history_id,\n internal_date_ts,\n snippet,\n size_estimate,\n subject,\n from_name,\n from_contact_id,\n sent_at,\n has_attachments,\n is_read,\n is_starred,\n is_sent,\n is_draft,\n headers_jsonb,\n created_at,\n updated_at,\n -- No body attributes\n body_text as body_text,\n body_html_sanitized as body_html_sanitized,\n NULL::TEXT as body_macro\n FROM email_messages\n WHERE thread_id = $1\n AND NOT (is_draft AND COALESCE((mailbox_state->>'provider_missing')::boolean, false))\n ORDER BY internal_date_ts DESC NULLS LAST\n LIMIT $2 OFFSET $3\n ","describe": {"columns": [{@@ -176,5 +176,5 @@null]},- "hash": "851fe05391377c57115594c61e4491d7220a657cd0aff2c0b52f3d3628abe824"+ "hash": "da79c6faa2e707ce41d41703e860fefea0c87b389fd2bfb058ad459116e55263"}diff --git a/apps/web/src/features/email-thread/core/thread-messages.test.ts b/apps/web/src/features/email-thread/core/thread-messages.test.tsindex 48933598dc..7e2a347190 100644--- a/apps/web/src/features/email-thread/core/thread-messages.test.ts+++ b/apps/web/src/features/email-thread/core/thread-messages.test.ts@@ -52,6 +52,28 @@ describe('thread message selection', () => {).toBeUndefined();expect(selectThreadSender(thread([]))).toBeUndefined();});+ it('never offers a deleted draft as the reply draft or the draft to edit', () => {+ const parent = message('parent');+ const live = message('live', {+ is_draft: true,+ replying_to_id: 'parent',+ updated_at: '2026-09-02T10:00:00Z',+ });+ const deleted = message('deleted', {+ is_draft: true,+ replying_to_id: 'parent',+ updated_at: '2026-09-03T10:00:00Z',+ operation: { state: 'DELETED', revision: '3' },+ });+ expect(+ selectThreadMessages(thread([parent, live, deleted])).draftMap+ ).toEqual({ parent: live });+ const standalone = message('standalone', {+ is_draft: true,+ operation: { state: 'DELETED', revision: '1' },+ });+ expect(selectThreadMessages(thread([standalone])).messages).toEqual([]);+ });it('orders messages chronologically without mutating the source and separates reply drafts', () => {const newer = message('new', { internal_date_ts: '2026-09-02T10:00:00Z' });const older = message('old');diff --git a/apps/web/src/features/email-thread/core/thread-messages.ts b/apps/web/src/features/email-thread/core/thread-messages.tsindex f75da93243..67cd4cf950 100644--- a/apps/web/src/features/email-thread/core/thread-messages.ts+++ b/apps/web/src/features/email-thread/core/thread-messages.ts@@ -12,7 +12,9 @@ export function selectThreadSender(thread: EmailThread, viewerEmail?: string) {/** Select chronological messages and reply drafts without mutating the source. */export function selectThreadMessages(thread: EmailThread) {- const messages = [...thread.messages];+ const messages = thread.messages.filter(+ (message) => message.operation?.state !== 'DELETED'+ );// Sort all messages by recencymessages.sort((a, b) => {if (a.internal_date_ts && b.internal_date_ts) {diff --git a/crates/email/src/outbound/email_pg_repo/draft_transfer/test.rs b/crates/email/src/outbound/email_pg_repo/draft_transfer/test.rsindex 821deced97..87437d5155 100644--- a/crates/email/src/outbound/email_pg_repo/draft_transfer/test.rs+++ b/crates/email/src/outbound/email_pg_repo/draft_transfer/test.rs@@ -4,6 +4,7 @@ use email_api_client::domain::models::EmailApiError;use macro_db_migrator::MACRO_DB_MIGRATIONS;use macro_user_id::user_id::MacroUserIdStr;use sqlx::PgPool;+use std::collections::BTreeSet;const ACTOR: &str = "macro|[email protected]";@@ -530,6 +531,62 @@ async fn expired_or_replaced_cleanup_cannot_renew_or_complete(db: PgPool) {);}+#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]+async fn thread_pages_omit_deleted_and_moved_drafts(db: PgPool) {+ let (repo, request) = fixture(&db).await;+ let thread = sqlx::query_scalar!(+ "SELECT thread_id FROM email_messages WHERE id=$1",+ request.source_id+ )+ .fetch_one(&db)+ .await+ .unwrap();+ let (parent, kept, discarded) = (Uuid::now_v7(), Uuid::now_v7(), Uuid::now_v7());+ sqlx::query!("INSERT INTO email_messages(id,thread_id,link_id,provider_id,is_draft,subject,mailbox_state) VALUES($1,$2,$3,'outlook-parent',false,'Parent','{\"in_inbox\":true}')",parent,thread,request.source_link_id).execute(&db).await.unwrap();+ for draft in [kept, discarded] {+ sqlx::query!("INSERT INTO email_messages(id,thread_id,link_id,is_draft,replying_to_id,subject,body_html_sanitized) VALUES($1,$2,$3,true,$4,'Re: Parent','<p>Reply</p>')",draft,thread,request.source_link_id,parent).execute(&db).await.unwrap();+ }+ message::delete_draft_message(+ &db,+ discarded,+ thread,+ &[request.source_link_id],+ Some(ACTOR),+ 0,+ )+ .await+ .unwrap()+ .unwrap();+ let moved = repo+ .commit_transfer(&prepare(&repo, &request).await, &contacts(), vec![])+ .await+ .unwrap();++ for (thread, expected) in [+ (thread, BTreeSet::from([parent, kept])),+ (moved.thread_id, BTreeSet::from([moved.message_id])),+ ] {+ let page: BTreeSet<Uuid> = repo+ .messages_by_thread_id_paginated(thread, 0, 50)+ .await+ .unwrap()+ .into_iter()+ .map(|message| message.db_id)+ .collect();+ assert_eq!(page, expected);+ let parsed: BTreeSet<Uuid> =+ email_db_client::messages::get_parsed::get_paginated_parsed_messages_by_thread_id(+ &db, thread, 0, 50,+ )+ .await+ .unwrap()+ .into_iter()+ .map(|message| message.db_id)+ .collect();+ assert_eq!(parsed, expected);+ }+}+#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]async fn returning_a_reply_to_its_original_inbox_never_rebinds_the_old_draft(db: PgPool) {let (repo, request) = fixture(&db).await;diff --git a/crates/email/src/outbound/email_pg_repo/thread.rs b/crates/email/src/outbound/email_pg_repo/thread.rsindex a66832150c..674c3f48bf 100644--- a/crates/email/src/outbound/email_pg_repo/thread.rs+++ b/crates/email/src/outbound/email_pg_repo/thread.rs@@ -234,6 +234,7 @@ pub(super) async fn messages_by_thread_id_paginated(headers_jsonb, created_at, updated_atFROM email_messagesWHERE thread_id = $1+ AND NOT (is_draft AND COALESCE((mailbox_state->>'provider_missing')::boolean, false))ORDER BY COALESCE(internal_date_ts, sent_at, created_at) DESC, id DESCLIMIT $2 OFFSET $3"#,diff --git a/crates/email_db_client/src/messages/get_parsed.rs b/crates/email_db_client/src/messages/get_parsed.rsindex 32ec0ebc4d..cd55e6d556 100644--- a/crates/email_db_client/src/messages/get_parsed.rs+++ b/crates/email_db_client/src/messages/get_parsed.rs@@ -266,6 +266,7 @@ pub async fn get_paginated_parsed_messages_by_thread_id(NULL::TEXT as body_macroFROM email_messagesWHERE thread_id = $1+ AND NOT (is_draft AND COALESCE((mailbox_state->>'provider_missing')::boolean, false))ORDER BY internal_date_ts DESC NULLS LASTLIMIT $2 OFFSET $3"#,