wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-03-12 00:11:17 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix documents search (#6818)

Browse Source
This commit is contained in:
Denis Bykhov 2024-10-07 07:59:34 +05:00 committed by GitHub
parent a78ec1bc19
commit c9a032eb0b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/server-document/src/index.ts
View File

@ -33,7 +33,7 @@ export function createModel (builder: Builder): void {
component: document.component.DocumentSearchIcon, component: document.component.DocumentSearchIcon,
props: ['icon', 'color'] props: ['icon', 'color']
}, },
title: 'name' title: 'title'
} }
}) })
} }

2
plugins/document-resources/src/index.ts
View File

@ -68,7 +68,7 @@ async function queryDocument (
search: string, search: string,
filter?: { in?: RelatedDocument[], nin?: RelatedDocument[] } filter?: { in?: RelatedDocument[], nin?: RelatedDocument[] }
): Promise<ObjectSearchResult[]> { ): Promise<ObjectSearchResult[]> {
const q: DocumentQuery<Document> = { name: { $like: `%${search}%` } } const q: DocumentQuery<Document> = { title: { $like: `%${search}%` } }
if (filter?.in !== undefined || filter?.nin !== undefined) { if (filter?.in !== undefined || filter?.nin !== undefined) {
q._id = {} q._id = {}
if (filter.in !== undefined) { if (filter.in !== undefined) {

12
plugins/view-resources/src/components/ParentsNavigator.svelte
View File

@ -22,8 +22,12 @@
const client = getClient() const client = getClient()
function hasParent (doc: Doc | AttachedDoc): boolean {
return 'parent' in doc && doc.parent != null
}
async function getParents (doc: Doc | AttachedDoc): Promise<readonly Doc[]> { async function getParents (doc: Doc | AttachedDoc): Promise<readonly Doc[]> {
if (!isAttachedDoc(doc)) { if (!isAttachedDoc(doc) && !hasParent(doc)) {
return [] return []
} }
@ -31,8 +35,10 @@
let currentDoc: Doc | undefined = doc let currentDoc: Doc | undefined = doc
while (currentDoc && isAttachedDoc(currentDoc)) { while (currentDoc && (isAttachedDoc(currentDoc) || hasParent(currentDoc))) {
const parent: Doc | undefined = await client.findOne(currentDoc.attachedToClass, { _id: currentDoc.attachedTo }) const parent: Doc | undefined = isAttachedDoc(currentDoc)
? await client.findOne(currentDoc.attachedToClass, { _id: currentDoc.attachedTo })
: await client.findOne(currentDoc._class, { _id: (currentDoc as any).parent })
if (parent) { if (parent) {
currentDoc = parent currentDoc = parent