hcengineering/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2024-11-22 11:42:30 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

digest attribute fix (#5914)

Browse Source 
Signed-off-by: Vyacheslav Tumanov <me@slavatumanov.me>
This commit is contained in:
Vyacheslav Tumanov 2024-06-25 10:01:14 +05:00 committed by GitHub
parent ff96ce1497
commit a7bec96320
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/core/src/utils.ts
View File

@ -158,6 +158,7 @@ export interface IndexKeyOptions {
_class?: Ref<Class<Obj>>
docId?: Ref<DocIndexState>
extra?: string[]
digest?: boolean
}
/**
* @public
@ -171,7 +172,8 @@ export function docUpdKey (name: string, opt?: IndexKeyOptions): string {
*/
export function docKey (name: string, opt?: IndexKeyOptions): string {
const extra = opt?.extra !== undefined && opt?.extra?.length > 0 ? `#${opt.extra?.join('#') ?? ''}` : ''
return opt?._class === undefined ? name : `${opt?._class}%${name}${extra}`
const digestName = opt?.digest === true ? name + '^digest' : name
return opt?._class === undefined ? digestName : `${opt?._class}%${digestName}${extra}`
}
/**
@ -182,6 +184,7 @@ export function extractDocKey (key: string): {
attr: string
docId?: Ref<DocIndexState>
extra: string[]
digest: boolean
} {
let k = key
if (k.startsWith(attributesPrefix)) {
@ -204,8 +207,14 @@ export function extractDocKey (key: string): {
}
const extra = attr.split('#')
attr = extra.splice(0, 1)[0]
const digestPos = attr.indexOf('^digest')
let digest = false
if (digestPos !== -1) {
attr = attr.substring(0, digestPos)
digest = true
}
return { docId, attr, _class, extra }
return { docId, attr, _class, extra, digest }
}
/**

3
server-plugins/collaboration/src/fulltext.ts
View File

@ -49,7 +49,6 @@ export class CollaborativeContentRetrievalStage implements FullTextPipelineStage
stageId = contentStageId
extra = ['content', 'base64']
digest = '^digest'
enabled = true
@ -111,7 +110,7 @@ export class CollaborativeContentRetrievalStage implements FullTextPipelineStage
if (docInfo !== undefined) {
const digest = docInfo.etag
const digestKey = docKey(val.name + this.digest, { _class: val.attributeOf })
const digestKey = docKey(val.name, { _class: val.attributeOf, digest: true })
if (doc.attributes[digestKey] !== digest) {
;(update as any)[docUpdKey(digestKey)] = digest

3
server/core/src/indexer/content.ts
View File

@ -46,7 +46,6 @@ export class ContentRetrievalStage implements FullTextPipelineStage {
stageId = contentStageId
extra = ['content', 'base64']
digest = '^digest'
enabled = true
@ -110,7 +109,7 @@ export class ContentRetrievalStage implements FullTextPipelineStage {
if (!contentType.includes('image')) {
const digest = docInfo.etag
const digestKey = docKey(val.name + this.digest, { _class: val.attributeOf })
const digestKey = docKey(val.name, { _class: val.attributeOf, digest: true })
if (doc.attributes[digestKey] !== digest) {
;(update as any)[docUpdKey(digestKey)] = digest

4
server/core/src/indexer/fulltextPush.ts
View File

@ -257,7 +257,7 @@ function updateDoc2Elastic (
if (v == null) {
continue
}
let { _class, attr, docId, extra } = extractDocKey(k)
let { _class, attr, docId, extra, digest } = extractDocKey(k)
if (attr.length === 0) {
continue
}
@ -302,7 +302,7 @@ function updateDoc2Elastic (
}
continue
}
const docIdAttr = docKey(attr, { _class, extra: extra.filter((it) => it !== 'base64') })
const docIdAttr = docKey(attr, { _class, extra: extra.filter((it) => it !== 'base64'), digest })
if (vv !== null) {
// Since we replace array of values, we could ignore null
doc[docIdAttr] =