From 29a098624196ccc7c42516d9bd5fad0448bce43a Mon Sep 17 00:00:00 2001
From: Denis Bykhov <bykhov.denis@gmail.com>
Date: Fri, 17 Mar 2023 15:47:54 +0600
Subject: [PATCH] Fix links resolvers (#2761)

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
---
 plugins/chunter-resources/src/utils.ts | 6 +++---
 plugins/contact-resources/src/utils.ts | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/chunter-resources/src/utils.ts b/plugins/chunter-resources/src/utils.ts
index b6d0f02f59..f0bd7d0f7a 100644
--- a/plugins/chunter-resources/src/utils.ts
+++ b/plugins/chunter-resources/src/utils.ts
@@ -1,6 +1,6 @@
 import { chunterId, ChunterMessage, Comment, ThreadMessage } from '@hcengineering/chunter'
 import contact, { EmployeeAccount, getName } from '@hcengineering/contact'
-import { Class, Client, Doc, getCurrentAccount, Obj, Ref, SortingOrder, Space, Timestamp } from '@hcengineering/core'
+import { Class, Client, Doc, getCurrentAccount, Obj, Ref, Space, Timestamp } from '@hcengineering/core'
 import { Asset } from '@hcengineering/platform'
 import { getClient } from '@hcengineering/presentation'
 import { getCurrentLocation, getPanelURI, Location, navigate } from '@hcengineering/ui'
@@ -156,7 +156,7 @@ async function generateLocation (loc: Location, shortLink: string): Promise<Loca
     return undefined
   }
   const classLabel = tokens[0]
-  const lastId = tokens[1]
+  const lastId = tokens[1] as Ref<Doc>
   const client = getClient()
   const hierarchy = client.getHierarchy()
   const classes = [chunter.class.Message, chunter.class.ThreadMessage, chunter.class.Comment]
@@ -171,7 +171,7 @@ async function generateLocation (loc: Location, shortLink: string): Promise<Loca
     console.error(`Could not find class ${classLabel}.`)
     return undefined
   }
-  const doc = await client.findOne(_class, { _id: { $like: `%${lastId}` } }, { sort: { _id: SortingOrder.Descending } })
+  const doc = await client.findOne(_class, { _id: lastId })
   if (doc === undefined) {
     console.error(`Could not find message ${lastId}.`)
     return undefined
diff --git a/plugins/contact-resources/src/utils.ts b/plugins/contact-resources/src/utils.ts
index 08b37c7973..8f7562ed10 100644
--- a/plugins/contact-resources/src/utils.ts
+++ b/plugins/contact-resources/src/utils.ts
@@ -23,7 +23,7 @@ import {
   formatName,
   getName
 } from '@hcengineering/contact'
-import { Doc, getCurrentAccount, ObjQueryType, Ref, SortingOrder, Timestamp, toIdMap } from '@hcengineering/core'
+import { Doc, getCurrentAccount, ObjQueryType, Ref, Timestamp, toIdMap } from '@hcengineering/core'
 import { createQuery, getClient } from '@hcengineering/presentation'
 import { TemplateDataProvider } from '@hcengineering/templates'
 import { getPanelURI, Location } from '@hcengineering/ui'
@@ -185,7 +185,7 @@ async function generateLocation (loc: Location, shortLink: string): Promise<Loca
     return undefined
   }
   const classLabel = tokens[0]
-  const lastId = tokens[1]
+  const lastId = tokens[1] as Ref<Contact>
   const client = getClient()
   const hierarchy = client.getHierarchy()
   const classes = hierarchy.getDescendants(contact.class.Contact)
@@ -196,7 +196,7 @@ async function generateLocation (loc: Location, shortLink: string): Promise<Loca
       break
     }
   }
-  const doc = await client.findOne(_class, { _id: { $like: `%${lastId}` } }, { sort: { _id: SortingOrder.Descending } })
+  const doc = await client.findOne(_class, { _id: lastId })
   if (doc === undefined) {
     console.error(`Could not find contact ${lastId}.`)
     return undefined