@open-mercato/core 0.6.3-develop.3609.1.01983ef87a → 0.6.3-develop.3635.1.e4a05c16e8

package/src/modules/integrations/backend/integrations/[id]/page.tsx

@@ -442,15 +442,16 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
     )
   }, [integrationId])
 
-  const loadDetail = React.useCallback(async () => {
+  const loadDetail = React.useCallback(async (options?: { showLoading?: boolean }) => {
+    const showLoading = options?.showLoading ?? true
     const currentIntegrationId = resolveCurrentIntegrationId()
     if (!currentIntegrationId) {
-      setIsLoading(false)
-      setError(t('integrations.detail.loadError', 'Failed to load integration'))
+      if (showLoading) setIsLoading(false)
+      if (showLoading) setError(t('integrations.detail.loadError', 'Failed to load integration'))
       return
     }
-    setError(null)
-    setIsLoading(true)
+    if (showLoading) setError(null)
+    if (showLoading) setIsLoading(true)
     try {
       const call = await apiCall<IntegrationDetail>(
         `/api/integrations/${encodeURIComponent(currentIntegrationId)}`,
@@ -458,15 +459,16 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
         { fallback: null },
       )
       if (!call.ok || !call.result) {
-        setError(t('integrations.detail.loadError', 'Failed to load integration'))
-        setIsLoading(false)
+        if (showLoading) setError(t('integrations.detail.loadError', 'Failed to load integration'))
+        if (showLoading) setIsLoading(false)
         return
       }
       setDetail(call.result)
-      setIsLoading(false)
+      setError(null)
+      if (showLoading) setIsLoading(false)
     } catch {
-      setError(t('integrations.detail.loadError', 'Failed to load integration'))
-      setIsLoading(false)
+      if (showLoading) setError(t('integrations.detail.loadError', 'Failed to load integration'))
+      if (showLoading) setIsLoading(false)
     }
   }, [resolveCurrentIntegrationId, t])
 
@@ -522,14 +524,14 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
     spotId: detailWidgetSpotId,
   })
   const refreshDetail = React.useCallback(async () => {
-    await loadDetail()
+    await loadDetail({ showLoading: false })
     await loadCredentials()
   }, [loadCredentials, loadDetail])
   const refreshLogs = React.useCallback(async () => {
     await loadLogs()
   }, [loadLogs])
   const refreshHealthSnapshot = React.useCallback(async () => {
-    await loadDetail()
+    await loadDetail({ showLoading: false })
   }, [loadDetail])
   const runIdFromUrl = searchParams?.get('runId') ?? null
   const refreshRunActivity = React.useCallback(async (options?: { showLoading?: boolean }) => {
@@ -546,7 +548,7 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
         { fallback: null },
       )
       await loadLogs()
-      await loadDetail()
+      await loadDetail({ showLoading: false })
       if (call.ok && call.result) {
         setActiveRunDetail(call.result)
         setActiveRunRefreshedAt(new Date().toISOString())

package/src/modules/messages/commands/messages.ts

@@ -58,6 +58,28 @@ async function emitMessageDeletedEvent(_container: ContainerWithResolve, payload
   )
 }
 
+async function emitMessageGloballyDeletedEvent(_container: ContainerWithResolve, payload: {
+  messageId: string
+  actorUserId: string
+  recipientUserIds: string[]
+  tenantId: string
+  organizationId: string | null
+}) {
+  const audience = Array.from(new Set([payload.actorUserId, ...payload.recipientUserIds]))
+  await emitMessagesEvent(
+    'messages.message.deleted',
+    {
+      messageId: payload.messageId,
+      actorUserId: payload.actorUserId,
+      target: 'global',
+      recipientUserIds: audience,
+      tenantId: payload.tenantId,
+      organizationId: payload.organizationId,
+    },
+    { persistent: true },
+  )
+}
+
 async function emitMessageIndexUpsert(
   container: ContainerWithResolve,
   payload: {
@@ -346,6 +368,15 @@ const composeMessageCommand: CommandHandler<unknown, { id: string; threadId: str
     if (!message) return
     message.deletedAt = new Date()
     await em.flush()
+    if (!after.message.isDraft) {
+      await emitMessageGloballyDeletedEvent(ctx.container, {
+        messageId: after.message.id,
+        actorUserId: after.message.senderUserId,
+        recipientUserIds: after.recipients.map((recipient) => recipient.recipientUserId),
+        tenantId: after.message.tenantId,
+        organizationId: after.message.organizationId,
+      })
+    }
   },
 }
 
@@ -704,6 +735,13 @@ const replyMessageCommand: CommandHandler<unknown, { id: string; externalEmail:
     if (!message) return
     message.deletedAt = new Date()
     await em.flush()
+    await emitMessageGloballyDeletedEvent(ctx.container, {
+      messageId: after.message.id,
+      actorUserId: after.message.senderUserId,
+      recipientUserIds: after.recipients.map((recipient) => recipient.recipientUserId),
+      tenantId: after.message.tenantId,
+      organizationId: after.message.organizationId,
+    })
   },
 }
 
@@ -849,6 +887,13 @@ const forwardMessageCommand: CommandHandler<unknown, { id: string; externalEmail
     if (!message) return
     message.deletedAt = new Date()
     await em.flush()
+    await emitMessageGloballyDeletedEvent(ctx.container, {
+      messageId: after.message.id,
+      actorUserId: after.message.senderUserId,
+      recipientUserIds: after.recipients.map((recipient) => recipient.recipientUserId),
+      tenantId: after.message.tenantId,
+      organizationId: after.message.organizationId,
+    })
   },
 }
 
@@ -896,12 +941,16 @@ const deleteForActorCommand: CommandHandler<unknown, { ok: true }> = {
       return { ok: true }
     }
     if (message.senderUserId === input.userId) {
+      const recipientRows = await em.find(MessageRecipient, { messageId: input.messageId })
       message.deletedAt = new Date()
       await em.flush()
-      await emitMessageDeletedEvent(ctx.container, {
+      const recipientUserIds = recipientRows
+        .map((row) => row.recipientUserId)
+        .filter((value): value is string => typeof value === 'string' && value.length > 0)
+      await emitMessageGloballyDeletedEvent(ctx.container, {
         messageId: input.messageId,
         actorUserId: input.userId,
-        target: 'sender',
+        recipientUserIds,
         tenantId: input.tenantId,
         organizationId: input.organizationId,
       })

package/src/modules/messages/components/message-detail/hooks/useMessageDetailsActions.ts

@@ -25,11 +25,11 @@ type UseMessageDetailsActionsInput = {
   id: string
   t: TranslateFn
   detail: MessageDetail | null
-  detailQuery: UseQueryResult<MessageDetail, Error>
+  detailQuery: UseQueryResult<MessageDetail | null, Error>
   attachments: MessageAttachment[] | undefined
   isArchived: boolean
   onDeleted: () => void
-  refreshDetailWithoutAutoMarkRead: () => Promise<MessageDetail>
+  refreshDetailWithoutAutoMarkRead: () => Promise<MessageDetail | null>
 }
 
 export function useMessageDetailsActions({

package/src/modules/messages/components/message-detail/hooks/useMessageDetailsQueries.ts

@@ -26,10 +26,13 @@ export function useMessageDetailsQueries({
     [id, scopeVersion],
   )
 
-  const detailQuery = useQuery({
+  const detailQuery = useQuery<MessageDetail | null>({
     queryKey: detailQueryKey,
     queryFn: async () => {
       const call = await apiCall<MessageDetail>(`/api/messages/${encodeURIComponent(id)}`)
+      if (call.status === 404) {
+        return null
+      }
       if (!call.ok || !call.result) {
         throw new Error(
           toErrorMessage(call.result)
@@ -42,17 +45,24 @@ export function useMessageDetailsQueries({
 
   const detail = detailQuery.data ?? null
   const isLoadingDetail = detailQuery.isLoading
-  const loadErrorMessage = detailQuery.error instanceof Error
-    ? detailQuery.error.message
-    : t('messages.errors.loadDetailFailed', 'Failed to load message details.')
+  const isDetailMissing = detailQuery.isSuccess && detailQuery.data === null
+  const loadErrorMessage = isDetailMissing
+    ? t('messages.errors.messageDeleted', 'This message is no longer available.')
+    : detailQuery.error instanceof Error
+      ? detailQuery.error.message
+      : t('messages.errors.loadDetailFailed', 'Failed to load message details.')
 
-  const attachmentsQuery = useQuery({
+  const attachmentsQuery = useQuery<MessageAttachment[]>({
     queryKey: ['messages', 'detail', id, 'attachments', scopeVersion],
     queryFn: async () => {
       const call = await apiCall<{ attachments?: MessageAttachment[] }>(
         `/api/messages/${encodeURIComponent(id)}/attachments`,
       )
 
+      if (call.status === 404) {
+        return []
+      }
+
       if (!call.ok) {
         throw new Error(
           toErrorMessage(call.result)
@@ -71,6 +81,11 @@ export function useMessageDetailsQueries({
       `/api/messages/${encodeURIComponent(id)}?skipMarkRead=1`,
     )
 
+    if (call.status === 404) {
+      queryClient.setQueryData(detailQueryKey, null)
+      return null
+    }
+
     if (!call.ok || !call.result) {
       throw new Error(
         toErrorMessage(call.result)
@@ -91,6 +106,7 @@ export function useMessageDetailsQueries({
     detailQuery,
     detail,
     isLoadingDetail,
+    isDetailMissing,
     loadErrorMessage,
     attachmentsQuery,
     attachments,

package/src/modules/messages/i18n/de.json

@@ -120,6 +120,7 @@
   "messages.errors.loadObjectOptionsFailed": "Objektoptionen konnten nicht geladen werden.",
   "messages.errors.loadObjectTypesFailed": "Objekttypen konnten nicht geladen werden.",
   "messages.errors.loadTypesFailed": "Nachrichtentypen konnten nicht geladen werden.",
+  "messages.errors.messageDeleted": "Diese Nachricht ist nicht mehr verfügbar.",
   "messages.errors.noBody": "Bitte Nachrichtentext eingeben.",
   "messages.errors.noExternalEmail": "Bitte gib eine gültige externe E-Mail ein.",
   "messages.errors.noRecipients": "Füge mindestens einen Empfänger hinzu.",

package/src/modules/messages/i18n/en.json

@@ -120,6 +120,7 @@
   "messages.errors.loadObjectOptionsFailed": "Failed to load object options.",
   "messages.errors.loadObjectTypesFailed": "Failed to load object types.",
   "messages.errors.loadTypesFailed": "Failed to load message types.",
+  "messages.errors.messageDeleted": "This message is no longer available.",
   "messages.errors.noBody": "Please enter a message.",
   "messages.errors.noExternalEmail": "Please enter a valid external email.",
   "messages.errors.noRecipients": "Please add at least one recipient.",

package/src/modules/messages/i18n/es.json

@@ -120,6 +120,7 @@
   "messages.errors.loadObjectOptionsFailed": "No se pudieron cargar las opciones de objeto.",
   "messages.errors.loadObjectTypesFailed": "No se pudieron cargar los tipos de objeto.",
   "messages.errors.loadTypesFailed": "No se pudieron cargar los tipos de mensaje.",
+  "messages.errors.messageDeleted": "Este mensaje ya no está disponible.",
   "messages.errors.noBody": "Introduce el contenido del mensaje.",
   "messages.errors.noExternalEmail": "Introduce un correo externo válido.",
   "messages.errors.noRecipients": "Añade al menos un destinatario.",

package/src/modules/messages/i18n/pl.json

@@ -120,6 +120,7 @@
   "messages.errors.loadObjectOptionsFailed": "Nie udało się załadować opcji obiektów.",
   "messages.errors.loadObjectTypesFailed": "Nie udało się załadować typów obiektów.",
   "messages.errors.loadTypesFailed": "Nie udało się załadować typów wiadomości.",
+  "messages.errors.messageDeleted": "Ta wiadomość nie jest już dostępna.",
   "messages.errors.noBody": "Wpisz treść wiadomości.",
   "messages.errors.noExternalEmail": "Wpisz poprawny zewnętrzny adres e-mail.",
   "messages.errors.noRecipients": "Dodaj przynajmniej jednego odbiorcę.",