WEBDIENSTE/huly-platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2026-09-11 12:17:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix processes mixin work (#9876)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov
2025-09-17 11:50:04 +07:00
committed by GitHub
parent 459dec3b5d
commit 3303c213ce
3 changed files with 75 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server-plugins/process-resources/src/functions.ts
+54 -7
View File
@@ -14,7 +14,19 @@
//
import cardPlugin, { Card, MasterTag, Tag } from '@hcengineering/card'
import core, { Association, Data, Doc, generateId, matchQuery, Ref, Relation, Tx } from '@hcengineering/core'
import core, {
Association,
checkMixinKey,
Data,
Doc,
generateId,
getObjectValue,
matchQuery,
Ref,
Relation,
splitMixinUpdate,
Tx
} from '@hcengineering/core'
import process, {
Execution,
ExecutionContext,
@@ -74,7 +86,9 @@ export function OnCardUpdateCheck (
context: Record<string, any>
): boolean {
if (context.card === undefined) return false
const res = matchQuery([context.card], params, context.card._class, control.client.getHierarchy(), true)
const process = control.client.getModel().findObject(execution.process)
if (process === undefined) return false
const res = matchQuery([context.card], params, process.masterTag, control.client.getHierarchy(), true)
return res.length > 0
}
@@ -121,16 +135,49 @@ export async function UpdateCard (
if (Object.keys(params).length === 0) throw processError(process.error.RequiredParamsNotProvided, { params: 'ANY' })
const target = control.cache.get(execution.card)
if (target === undefined) throw processError(process.error.ObjectNotFound, { _id: execution.card })
const hierarchy = control.client.getHierarchy()
const _process = control.client.getModel().findObject(execution.process)
if (_process === undefined) throw processError(process.error.ObjectNotFound, { _id: execution.process })
const update: Record<string, any> = {}
const prevValue: Record<string, any> = {}
for (const key in params) {
prevValue[key] = target[key]
const prevKey = checkMixinKey(key, _process.masterTag, hierarchy)
prevValue[key] = getObjectValue(prevKey, target)
update[key] = (params as any)[key]
}
const res: Tx[] = [control.client.txFactory.createTxUpdateDoc(target._class, target.space, target._id, update)]
const rollback: Tx[] = [
control.client.txFactory.createTxUpdateDoc(target._class, target.space, target._id, prevValue)
]
const res: Tx[] = []
const rollback: Tx[] = []
if (hierarchy.isMixin(_process.masterTag)) {
const baseClass = hierarchy.getBaseClass(target._class)
const byClass = splitMixinUpdate(control.client.getHierarchy(), update, _process.masterTag, baseClass)
for (const it of byClass) {
if (hierarchy.isMixin(it[0])) {
res.push(control.client.txFactory.createTxMixin(target._id, baseClass, target.space, it[0], it[1]))
const rollbackData: Record<string, any> = {}
for (const key in it[1]) {
rollbackData[key] = prevValue[key]
}
if (Object.keys(rollbackData).length > 0) {
rollback.push(
control.client.txFactory.createTxMixin(target._id, baseClass, target.space, it[0], rollbackData)
)
}
} else {
res.push(control.client.txFactory.createTxUpdateDoc(baseClass, target.space, target._id, it[1]))
const rollbackData: Record<string, any> = {}
for (const key in it[1]) {
rollbackData[key] = prevValue[key]
}
if (Object.keys(rollbackData).length > 0) {
rollback.push(control.client.txFactory.createTxUpdateDoc(baseClass, target.space, target._id, rollbackData))
}
}
}
} else {
res.push(control.client.txFactory.createTxUpdateDoc(target._class, target.space, target._id, update))
rollback.push(control.client.txFactory.createTxUpdateDoc(target._class, target.space, target._id, prevValue))
}
return { txes: res, rollback, context: null }
}
server-plugins/process-resources/src/utils.ts
+20 -12
View File
@@ -13,7 +13,7 @@
// limitations under the License.
//
import core, { ArrOf, Doc, getObjectValue, RefTo } from '@hcengineering/core'
import core, { ArrOf, checkMixinKey, Doc, getObjectValue, RefTo } from '@hcengineering/core'
import { getEmbeddedLabel, getResource } from '@hcengineering/platform'
import process, {
Execution,
@@ -65,10 +65,18 @@ export async function getContextValue (value: any, control: ProcessControl, exec
}
}
function getValue (control: ProcessControl, execution: Execution, rawKey: string, card: Doc): any {
const hierarchy = control.client.getHierarchy()
const _process = control.client.getModel().findObject(execution.process)
if (_process === undefined) throw processError(process.error.ObjectNotFound, { _id: execution.process })
const key = checkMixinKey(rawKey, _process.masterTag, hierarchy)
return getObjectValue(key, card)
}
function getAttributeValue (control: ProcessControl, execution: Execution, context: SelectedContext): any {
const card = control.cache.get(execution.card)
if (card !== undefined) {
const val = getObjectValue(context.key, card)
const val = getValue(control, execution, context.key, card)
if (val == null) {
const attr = control.client.getHierarchy().findAttribute(card._class, context.key)
throw processError(
@@ -111,7 +119,7 @@ async function getNestedValue (
if (card === undefined) throw processError(process.error.ObjectNotFound, { _id: execution.card }, {}, true)
const attr = control.client.getHierarchy().findAttribute(card._class, context.path)
if (attr === undefined) throw processError(process.error.AttributeNotExists, { key: context.path })
const nestedValue = getObjectValue(context.path, card)
const nestedValue = getValue(control, execution, context.path, card)
if (nestedValue === undefined) throw processError(process.error.EmptyAttributeContextValue, {}, { attr: attr.label })
const parentType = attr.type._class === core.class.ArrOf ? (attr.type as ArrOf<Doc>).of : attr.type
const targetClass = parentType._class === core.class.RefTo ? (parentType as RefTo<Doc>).to : parentType._class
@@ -132,8 +140,8 @@ async function getNestedValue (
const f = await getResource(funcImpl.func)
const reduced = await f(target, {}, control, execution)
const val = Array.isArray(reduced)
? reduced.map((v) => getObjectValue(context.key, v))
: getObjectValue(context.key, reduced)
? reduced.map((v) => getValue(control, execution, context.key, v))
: getValue(control, execution, context.key, reduced)
if (val == null) {
throw processError(
process.error.EmptyRelatedObjectValue,
@@ -145,8 +153,8 @@ async function getNestedValue (
}
const val =
Array.isArray(target) && target.length > 1
? target.map((v) => getObjectValue(context.key, v))
: getObjectValue(context.key, target[0])
? target.map((v) => getValue(control, execution, context.key, v))
: getValue(control, execution, context.key, target[0])
if (val == null) {
throw processError(
process.error.EmptyRelatedObjectValue,
@@ -187,8 +195,8 @@ async function getRelationValue (
const f = await getResource(funcImpl.func)
const reduced = await f(target, {}, control, execution)
const val = Array.isArray(reduced)
? reduced.map((v) => getObjectValue(context.key, v))
: getObjectValue(context.key, reduced)
? reduced.map((v) => getValue(control, execution, context.key, v))
: getValue(control, execution, context.key, reduced)
if (val == null) {
throw processError(
process.error.EmptyRelatedObjectValue,
@@ -200,8 +208,8 @@ async function getRelationValue (
}
const val =
Array.isArray(target) && target.length > 1
? target.map((v) => getObjectValue(context.key, v))
: getObjectValue(context.key, target[0])
? target.map((v) => getValue(control, execution, context.key, v))
: getValue(control, execution, context.key, target[0])
if (val == null) {
throw processError(
process.error.EmptyRelatedObjectValue,
@@ -269,7 +277,7 @@ async function getExecutionContextValue (
if (processContext !== undefined) {
const contextVal = await control.client.findOne(processContext?._class, { _id: userContext })
if (contextVal !== undefined) {
const val = getObjectValue(context.key, contextVal)
const val = getValue(control, execution, context.key, contextVal)
return val
}
}