Fix user mention icon and link previews (#9635)

Author: kristina-fefelova

packages/presentation/src/components/markup/ObjectNode.svelte

@@ -36,7 +36,10 @@
   const withoutDoc: Ref<Doc>[] = [contact.mention.Here, contact.mention.Everyone]
 
   $: icon =
-    _class !== undefined && hierarchy.hasClass(_class) && !withoutDoc.includes(_id as any)
+    _class !== undefined &&
+    hierarchy.hasClass(_class) &&
+    !withoutDoc.includes(_id as any) &&
+    !hierarchy.isDerived(_class, contact.class.Contact)
       ? hierarchy.getClass(_class).icon
       : null
 

plugins/communication-resources/src/actions.ts

@@ -45,7 +45,7 @@ import { isCardAllowedForCommunications, showForbidden, toggleReaction, toMarkup
 import { isMessageTranslating, messageEditingStore, threadCreateMessageStore, translateMessagesStore } from './stores'
 
 export const addReaction: MessageActionFunction = async (message, card: Card, evt, onOpen, onClose) => {
-  if (!(await isCardAllowedForCommunications(card))) {
+  if (!isCardAllowedForCommunications(card)) {
     await showForbidden()
     return
   }
@@ -68,7 +68,7 @@ export const addReaction: MessageActionFunction = async (message, card: Card, ev
 }
 
 export const replyInThread: MessageActionFunction = async (message: Message, parentCard: Card): Promise<void> => {
-  if (!(await isCardAllowedForCommunications(parentCard))) {
+  if (!isCardAllowedForCommunications(parentCard)) {
     await showForbidden()
     return
   }

plugins/communication-resources/src/components/message/MessageInput.svelte

@@ -63,7 +63,6 @@
   export let message: Message | undefined = undefined
   export let title: string = ''
   export let onCancel: (() => void) | undefined = undefined
-  export let onSubmit: ((markdown: string, blobs: BlobParams[]) => Promise<void>) | undefined = undefined
 
   const throttle = new ThrottledCaller(500)
   const dispatch = createEventDispatcher()
@@ -111,14 +110,14 @@
   }
 
   async function handleSubmit (event: CustomEvent<Markup>): Promise<void> {
-    if (!(await isCardAllowedForCommunications(card))) {
+    event.preventDefault()
+    event.stopPropagation()
+
+    if (!isCardAllowedForCommunications(card)) {
       await showForbidden()
       return
     }
 
-    event.preventDefault()
-    event.stopPropagation()
-
     const markup = event.detail
     const blobsToLoad = draft.blobs
     const linksToLoad = draft.links
@@ -133,11 +132,6 @@
 
     const markdown = toMarkdown(markup)
 
-    if (onSubmit !== undefined) {
-      await onSubmit(markdown, blobsToLoad)
-      return
-    }
-
     if (message === undefined) {
       await createMessage(markdown, blobsToLoad, linksToLoad, urlsToLoad, appletsToLoad)
       dispatch('sent')

plugins/communication-resources/src/components/message/MessagePresenter.svelte

@@ -35,8 +35,6 @@
   } from '../../stores'
   import { getMessageActions } from '../../actions'
   import communication from '../../plugin'
-  import { isBlobAttachment } from '@hcengineering/communication-shared'
-  import { getCommunicationClient } from '@hcengineering/presentation'
 
   export let card: Card
   export let message: Message

plugins/communication-resources/src/utils.ts

@@ -138,7 +138,7 @@ export async function loadLinkPreviewParams (url: string): Promise<LinkPreviewPa
   }
 }
 
-export async function isCardAllowedForCommunications (card: Card): Promise<boolean> {
+export function isCardAllowedForCommunications (card: Card): boolean {
   if (getCurrentAccount().role !== AccountRole.Guest) return true
   const allowedCards = get(guestCommunicationAllowedCards)
   if (allowedCards.includes(card._id)) return true