Skip to content

Commit 36d2fd7

Browse files
authored
473 fix unable to reply to bug (#474)
* fix unable to reply to bug * docs(changeset): fix unable to reply to bug
1 parent 1895ef3 commit 36d2fd7

4 files changed

Lines changed: 19 additions & 5 deletions

File tree

.changeset/funny-ducks-look.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@kurrier/web": patch
3+
"@kurrier/repo": patch
4+
---
5+
6+
fix unable to reply to bug

apps/web/components/mailbox/default/email-renderer.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ function EmailRenderer({
9191
markSmtp,
9292
activeMailboxId,
9393
mailSubscription,
94+
identityMailboxes,
9495
children,
9596
}: {
9697
threadIndex: number;
@@ -103,6 +104,7 @@ function EmailRenderer({
103104
markSmtp: boolean;
104105
activeMailboxId: string;
105106
mailSubscription: FetchThreadMailSubsResult["byMessageId"] | null;
107+
identityMailboxes: FetchIdentityMailboxListResult;
106108
children?: React.ReactNode;
107109
}) {
108110
const formatted = Temporal.Instant.from(message.createdAt.toISOString())
@@ -439,6 +441,7 @@ function EmailRenderer({
439441
ref={editorRef}
440442
publicConfig={publicConfig}
441443
message={message}
444+
identityMailboxes={identityMailboxes}
442445
onReady={(el) => {
443446
scrollToEditor(el, { offsetTop: 96, minBottomGap: 64 });
444447
requestAnimationFrame(() => editorRef.current?.focus());

apps/web/components/mailbox/default/thread-item.tsx

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ import { MessageEntity } from "@db";
33
import EmailViewer from "@/components/mailbox/default/email-viewer";
44
import EmailRenderer from "@/components/mailbox/default/email-renderer";
55
import { Avatar } from "@mantine/core";
6-
import {fetchMessageAttachments, FetchThreadMailSubsResult, getSignedUrlsForMessage} from "@/lib/actions/mailbox";
6+
import {
7+
fetchIdentityMailboxList,
8+
fetchMessageAttachments,
9+
FetchThreadMailSubsResult,
10+
getSignedUrlsForMessage
11+
} from "@/lib/actions/mailbox";
712
import { getPublicEnv } from "@schema";
813
import { getMessageAddress, getMessageName } from "@common/mail-client";
914
import { Container } from "@/components/common/containers";
@@ -29,11 +34,10 @@ export default async function ThreadItem({
2934
identityPublicId: string;
3035
mailSubscription: FetchThreadMailSubsResult["byMessageId"] | null;
3136
}) {
32-
// const { attachments } = await fetchMessageAttachments(message.id);
3337
const attachments = await getSignedUrlsForMessage(message.id)
34-
// console.log("attachs", attachs)
3538
const publicConfig = getPublicEnv();
3639
const preview = await fetchEventPreviewItems(attachments, identityPublicId)
40+
const identityMailboxes = await fetchIdentityMailboxList();
3741

3842
return (
3943
<>
@@ -64,6 +68,7 @@ export default async function ThreadItem({
6468
markSmtp={markSmtp}
6569
activeMailboxId={activeMailboxId}
6670
mailSubscription={mailSubscription}
71+
identityMailboxes={identityMailboxes}
6772
>
6873
<EmailViewer message={message} />
6974
</EmailRenderer>

apps/web/lib/actions/dashboard.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {
3232
SYSTEM_MAILBOXES,
3333
} from "@schema";
3434
import { currentSession, isSignedIn } from "@/lib/actions/auth";
35-
import {and, count, eq, sql, gte, desc, inArray, sum} from "drizzle-orm";
35+
import {and, count, eq, sql, gte, desc, inArray, sum, countDistinct} from "drizzle-orm";
3636
import { revalidatePath } from "next/cache";
3737
import { decode } from "decode-formdata";
3838
import { PgColumn, PgTable } from "drizzle-orm/pg-core";
@@ -954,7 +954,7 @@ export const getDashboardStats = async () => {
954954
.from(messages)
955955
.where(gte(messages.createdAt, sql`now() - interval '24 hours'`)),
956956

957-
tx.select({ count: count() }).from(threads),
957+
tx.select({ count: countDistinct(messages.threadId) }).from(messages),
958958

959959
tx.select({ count: count() }).from(draftMessages),
960960

0 commit comments

Comments
 (0)