From 765ee77dc7651025ca7b99b8c966dc965811aeab Mon Sep 17 00:00:00 2001
From: Denis Bykhov <bykhov.denis@gmail.com>
Date: Sat, 11 Oct 2025 00:39:55 +0500
Subject: [PATCH] ToDo complete trigger can respect results

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
---
 packages/presentation/src/utils.ts            |  24 ++--
 .../criterias/AttributeCriteria.svelte        |   4 +-
 .../criterias/BaseCriteriaEditor.svelte       |   4 +-
 .../criterias/ContextCriteria.svelte          |  99 +++++++++++++++++
 .../components/criterias/RangeCriteria.svelte |   4 +-
 .../settings/AddRelationEditor.svelte         |  26 ++---
 .../settings/CardUpdateEditor.svelte          |   4 +-
 .../settings/FieldChangesEditor.svelte        |   4 +-
 .../settings/ResultCriteriaEditor.svelte      | 104 ++++++++++++++++++
 .../src/components/settings/TimeEditor.svelte |  20 +---
 .../settings/ToDoParamsEditor.svelte          |  13 ++-
 .../transformEditors/FilterEditor.svelte      |   4 +-
 plugins/process-resources/src/utils.ts        |  18 ++-
 .../process-resources/src/functions.ts        |  15 ++-
 14 files changed, 283 insertions(+), 60 deletions(-)
 create mode 100644 plugins/process-resources/src/components/criterias/ContextCriteria.svelte
 create mode 100644 plugins/process-resources/src/components/settings/ResultCriteriaEditor.svelte

diff --git a/packages/presentation/src/utils.ts b/packages/presentation/src/utils.ts
index f4719b9d68a..ff525b327dc 100644
--- a/packages/presentation/src/utils.ts
+++ b/packages/presentation/src/utils.ts
@@ -18,6 +18,7 @@ import { Analytics } from '@hcengineering/analytics'
 import core, {
   type Account,
   AccountRole,
+  type AnyAttribute,
   type ArrOf,
   type AttachedDoc,
   type Class,
@@ -737,13 +738,8 @@ export function getAttrEditor (type: Type<any>, hierarchy: Hierarchy): AnyCompon
   return editorMixin?.inlineEditor
 }
 
-export function findAttributeEditor (
-  client: Client,
-  _class: Ref<Class<Obj>>,
-  key: KeyedAttribute | string
-): AnyComponent | undefined {
+export function findAttributeEditorByAttribute (client: Client, attribute: AnyAttribute): AnyComponent | undefined {
   const hierarchy = client.getHierarchy()
-  const attribute = typeof key === 'string' ? hierarchy.findAttribute(_class, key) : key.attr
   if (attribute === undefined) return
 
   if (attribute.type._class === core.class.TypeAny) {
@@ -779,16 +775,22 @@ export function findAttributeEditor (
   const editorMixin = hierarchy.classHierarchyMixin(presenterClass.attrClass, mixin)
 
   if (editorMixin?.inlineEditor === undefined) {
-    // if (presenterClass.category === 'array') {
-    //   // NOTE: Don't show error for array attributes for compatibility with previous implementation
-    // } else {
-    console.error(getAttributeEditorNotFoundError(_class, key))
-    // }
     return
   }
   return editorMixin.inlineEditor
 }
 
+export function findAttributeEditor (
+  client: Client,
+  _class: Ref<Class<Obj>>,
+  key: KeyedAttribute | string
+): AnyComponent | undefined {
+  const hierarchy = client.getHierarchy()
+  const attribute = typeof key === 'string' ? hierarchy.findAttribute(_class, key) : key.attr
+  if (attribute === undefined) return
+  return findAttributeEditorByAttribute(client, attribute)
+}
+
 export async function getAttributeEditor (
   client: Client,
   _class: Ref<Class<Obj>>,
diff --git a/plugins/process-resources/src/components/criterias/AttributeCriteria.svelte b/plugins/process-resources/src/components/criterias/AttributeCriteria.svelte
index 59e7f7a3549..ee27f1a9d22 100644
--- a/plugins/process-resources/src/components/criterias/AttributeCriteria.svelte
+++ b/plugins/process-resources/src/components/criterias/AttributeCriteria.svelte
@@ -19,7 +19,7 @@
   import { Process } from '@hcengineering/process'
   import { Component, Label, tooltip } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
-  import { getCirteriaEditor, getContext } from '../../utils'
+  import { getCriteriaEditor, getContext } from '../../utils'
 
   export let _class: Ref<Class<Doc>>
   export let readonly: boolean
@@ -34,7 +34,7 @@
   $: attribute = hierarchy.getAttribute(_class, key)
   $: presenterClass = getAttributePresenterClass(hierarchy, attribute.type)
 
-  $: updateCriteria = getCirteriaEditor(presenterClass.attrClass, presenterClass.category)
+  $: updateCriteria = getCriteriaEditor(presenterClass.attrClass, presenterClass.category)
   $: editor = updateCriteria?.editor
 
   $: value = params[key]
diff --git a/plugins/process-resources/src/components/criterias/BaseCriteriaEditor.svelte b/plugins/process-resources/src/components/criterias/BaseCriteriaEditor.svelte
index 72f75fad990..635782812db 100644
--- a/plugins/process-resources/src/components/criterias/BaseCriteriaEditor.svelte
+++ b/plugins/process-resources/src/components/criterias/BaseCriteriaEditor.svelte
@@ -15,7 +15,7 @@
 
 <script lang="ts">
   import { AnyAttribute } from '@hcengineering/core'
-  import { findAttributeEditor, getAttributePresenterClass, getClient } from '@hcengineering/presentation'
+  import { findAttributeEditorByAttribute, getAttributePresenterClass, getClient } from '@hcengineering/presentation'
   import { Context, createContext, parseContext, Process, SelectedContext } from '@hcengineering/process'
   import { Button, Component, eventToHTMLElement, IconAdd, IconClose, showPopup } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
@@ -60,7 +60,7 @@
   const hierarchy = client.getHierarchy()
 
   $: presenterClass = getAttributePresenterClass(hierarchy, attribute.type)
-  $: baseEditor = findAttributeEditor(client, attribute.attributeOf, attribute.name)
+  $: baseEditor = findAttributeEditorByAttribute(client, attribute)
 </script>
 
 <div class="text-input" class:context={contextValue}>
diff --git a/plugins/process-resources/src/components/criterias/ContextCriteria.svelte b/plugins/process-resources/src/components/criterias/ContextCriteria.svelte
new file mode 100644
index 00000000000..6c783522cbd
--- /dev/null
+++ b/plugins/process-resources/src/components/criterias/ContextCriteria.svelte
@@ -0,0 +1,99 @@
+<!--
+// Copyright © 2025 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+-->
+
+<script lang="ts">
+  import { getAttributePresenterClass, getClient } from '@hcengineering/presentation'
+  import {
+    Context,
+    ContextId,
+    Process,
+    SelectedExecutionContext,
+    UpdateCriteriaComponent
+  } from '@hcengineering/process'
+  import { AnyComponent, Component } from '@hcengineering/ui'
+  import { createEventDispatcher } from 'svelte'
+  import { getContext, getCriteriaEditor, getMockAttribute } from '../../utils'
+  import ExecutionContextPresenter from '../attributeEditors/ExecutionContextPresenter.svelte'
+  import { AnyAttribute } from '@hcengineering/core'
+
+  export let process: Process
+  export let value: string | undefined
+  export let contextId: string
+  export let readonly: boolean = false
+
+  const client = getClient()
+  const hierarchy = client.getHierarchy()
+  const dispatch = createEventDispatcher()
+
+  let editor: AnyComponent | undefined
+  let context: Context | undefined
+  let updateCriteria: UpdateCriteriaComponent | undefined
+  let attribute: AnyAttribute | undefined
+
+  $: fill(contextId)
+
+  function fill (contextId: string): void {
+    const _ctx = process.context[contextId as ContextId]
+    if (_ctx === undefined) {
+      editor = undefined
+      context = undefined
+      attribute = undefined
+      updateCriteria = undefined
+      return
+    }
+    const type = _ctx.type
+    if (type === undefined) {
+      editor = undefined
+      context = undefined
+      attribute = undefined
+      updateCriteria = undefined
+      return
+    }
+
+    const presenterClass = getAttributePresenterClass(hierarchy, type)
+    updateCriteria = getCriteriaEditor(presenterClass.attrClass, presenterClass.category)
+    attribute = getMockAttribute(process.masterTag, type.label, type)
+    editor = updateCriteria?.editor
+    context = getContext(client, process, presenterClass?.attrClass, presenterClass?.category)
+  }
+
+  function onChange (e: CustomEvent<any>): void {
+    if (e.detail !== undefined) {
+      dispatch('change', e.detail)
+    }
+  }
+
+  let contextValue: SelectedExecutionContext = {
+    type: 'context',
+    id: contextId as ContextId,
+    key: ''
+  }
+
+  $: contextValue = {
+    type: 'context',
+    id: contextId as ContextId,
+    key: ''
+  }
+</script>
+
+{#if editor}
+  <ExecutionContextPresenter {process} {contextValue} />
+  <Component
+    is={editor}
+    props={{ value, readonly, context, process, attribute, ...updateCriteria?.props }}
+    on:change={onChange}
+    on:delete
+  />
+{/if}
diff --git a/plugins/process-resources/src/components/criterias/RangeCriteria.svelte b/plugins/process-resources/src/components/criterias/RangeCriteria.svelte
index 1f5932c2ed0..49bff10f702 100644
--- a/plugins/process-resources/src/components/criterias/RangeCriteria.svelte
+++ b/plugins/process-resources/src/components/criterias/RangeCriteria.svelte
@@ -15,7 +15,7 @@
 
 <script lang="ts">
   import { AnyAttribute } from '@hcengineering/core'
-  import { findAttributeEditor, getAttributePresenterClass, getClient } from '@hcengineering/presentation'
+  import { findAttributeEditorByAttribute, getAttributePresenterClass, getClient } from '@hcengineering/presentation'
   import { Context, createContext, parseContext, Process, SelectedContext } from '@hcengineering/process'
   import { Button, Component, eventToHTMLElement, IconAdd, IconClose, showPopup } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
@@ -81,7 +81,7 @@
 
   $: presenterClass = getAttributePresenterClass(hierarchy, attribute.type)
 
-  $: baseEditor = findAttributeEditor(client, process.masterTag, attribute.name)
+  $: baseEditor = findAttributeEditorByAttribute(client, attribute)
 </script>
 
 <div class="flex-row-center flex-gap-2">
diff --git a/plugins/process-resources/src/components/settings/AddRelationEditor.svelte b/plugins/process-resources/src/components/settings/AddRelationEditor.svelte
index bd089e02aca..4afa96a8e06 100644
--- a/plugins/process-resources/src/components/settings/AddRelationEditor.svelte
+++ b/plugins/process-resources/src/components/settings/AddRelationEditor.svelte
@@ -13,12 +13,12 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import core, { AnyAttribute, Association, generateId, Ref, Relation } from '@hcengineering/core'
+  import core, { AnyAttribute, Association, Ref, Relation } from '@hcengineering/core'
   import { getClient } from '@hcengineering/presentation'
   import { Process, Step } from '@hcengineering/process'
   import { Label, tooltip } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
-  import { getContext } from '../../utils'
+  import { getContext, getMockAttribute } from '../../utils'
   import ProcessAttribute from '../ProcessAttribute.svelte'
   import AssociationSelector from './AssociationSelector.svelte'
 
@@ -56,23 +56,15 @@
     }
   }
 
-  let attribute: AnyAttribute
-  $: attribute = {
-    attributeOf: process.masterTag,
-    name: '',
-    type: {
-      label: core.string.Ref,
-      _class: core.class.RefTo,
-      to: targetClass
-    },
-    _id: generateId(),
-    space: core.space.Model,
-    modifiedOn: 0,
-    modifiedBy: core.account.System,
-    _class: core.class.Attribute,
-    label: core.string.Object
+  $: type = {
+    label: core.string.Ref,
+    _class: core.class.RefTo,
+    to: targetClass ?? process.masterTag
   }
 
+  let attribute: AnyAttribute
+  $: attribute = getMockAttribute(process.masterTag, core.string.Object, type)
+
   $: context = targetClass && getContext(client, process, targetClass, 'object')
 </script>
 
diff --git a/plugins/process-resources/src/components/settings/CardUpdateEditor.svelte b/plugins/process-resources/src/components/settings/CardUpdateEditor.svelte
index f5da2bfc6a7..c8f314a3b7e 100644
--- a/plugins/process-resources/src/components/settings/CardUpdateEditor.svelte
+++ b/plugins/process-resources/src/components/settings/CardUpdateEditor.svelte
@@ -20,7 +20,7 @@
   import { Process } from '@hcengineering/process'
   import { Button, eventToHTMLElement, SelectPopup, showPopup } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
-  import { getCirteriaEditor } from '../../utils'
+  import { getCriteriaEditor } from '../../utils'
   import CriteriasEditor from '../criterias/CriteriasEditor.svelte'
 
   export let readonly: boolean
@@ -46,7 +46,7 @@
       if (attr.hidden === true) continue
       if (ignoreKeys.includes(key)) continue
       const presenterClass = getAttributePresenterClass(hierarchy, attr.type)
-      const updateCriteria = getCirteriaEditor(presenterClass.attrClass, presenterClass.category)
+      const updateCriteria = getCriteriaEditor(presenterClass.attrClass, presenterClass.category)
       const editor = updateCriteria?.editor
       if (editor == null) continue
       res.push(attr)
diff --git a/plugins/process-resources/src/components/settings/FieldChangesEditor.svelte b/plugins/process-resources/src/components/settings/FieldChangesEditor.svelte
index c734c34c8c3..76b5331f01b 100644
--- a/plugins/process-resources/src/components/settings/FieldChangesEditor.svelte
+++ b/plugins/process-resources/src/components/settings/FieldChangesEditor.svelte
@@ -21,7 +21,7 @@
   import { Button, eventToHTMLElement, SelectPopup, showPopup } from '@hcengineering/ui'
   import view from '@hcengineering/view'
   import { createEventDispatcher } from 'svelte'
-  import { getCirteriaEditor } from '../../utils'
+  import { getCriteriaEditor } from '../../utils'
   import CriteriasEditor from '../criterias/CriteriasEditor.svelte'
 
   export let readonly: boolean
@@ -47,7 +47,7 @@
       if (attr.hidden === true) continue
       if (ignoreKeys.includes(key)) continue
       const presenterClass = getAttributePresenterClass(hierarchy, attr.type)
-      const updateCriteria = getCirteriaEditor(presenterClass.attrClass, presenterClass.category)
+      const updateCriteria = getCriteriaEditor(presenterClass.attrClass, presenterClass.category)
       const editor = updateCriteria?.editor
       if (editor == null) continue
       res.push(attr)
diff --git a/plugins/process-resources/src/components/settings/ResultCriteriaEditor.svelte b/plugins/process-resources/src/components/settings/ResultCriteriaEditor.svelte
new file mode 100644
index 00000000000..43115fad227
--- /dev/null
+++ b/plugins/process-resources/src/components/settings/ResultCriteriaEditor.svelte
@@ -0,0 +1,104 @@
+<!--
+// Copyright © 2025 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+-->
+
+<script lang="ts">
+  import presentation, { getClient } from '@hcengineering/presentation'
+  import { ContextId, parseContext, Process, SelectedExecutionContext, UserResult } from '@hcengineering/process'
+  import { Button, eventToHTMLElement, SelectPopup, showPopup } from '@hcengineering/ui'
+  import { createEventDispatcher } from 'svelte'
+  import ContextCriteria from '../criterias/ContextCriteria.svelte'
+
+  export let process: Process
+  export let result: Record<ContextId, any> = {}
+  export let value: string | undefined
+  export let readonly: boolean
+
+  const client = getClient()
+  const dispatch = createEventDispatcher()
+
+  let results: UserResult[] = []
+
+  let keys = Object.keys(result) as ContextId[]
+
+  function getResults (_id: string | undefined): void {
+    results = []
+    if (_id == null) return
+    const ctx = parseContext(_id)
+    if (ctx?.type !== 'context') return
+    const context = process.context[ctx.id]
+    if (context === undefined) return
+    const transition = client.getModel().findObject(context.producer)
+    if (transition == null) return
+    results = transition.actions.find((a) => a._id === context.action)?.results ?? []
+  }
+
+  $: getResults(value)
+
+  $: availableResults = results.filter((r) => !keys.includes(r._id))
+
+  function addKey (key: ContextId): void {
+    keys = [...keys, key]
+  }
+
+  function onAdd (e: MouseEvent): void {
+    showPopup(
+      SelectPopup,
+      {
+        value: availableResults.map((p) => {
+          return { id: p._id, text: p.name }
+        })
+      },
+      eventToHTMLElement(e),
+      (res) => {
+        if (res != null) {
+          addKey(res)
+        }
+      }
+    )
+  }
+
+  function change (e: CustomEvent<any>, key: string): void {
+    if (e.detail !== undefined) {
+      ;(result as any)[key] = e.detail
+      dispatch('change', result)
+    }
+  }
+
+  function remove (key: string): void {
+    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+    delete (result as any)[key]
+    keys = keys.filter((k) => k !== key)
+    dispatch('change', result)
+  }
+</script>
+
+{#each keys as key}
+  <ContextCriteria
+    {process}
+    value={result[key]}
+    contextId={key}
+    on:change={(e) => {
+      change(e, key)
+    }}
+    on:delete={() => {
+      remove(key)
+    }}
+  />
+{/each}
+{#if !readonly && availableResults.length > 0}
+  <div class="flex-center mt-4">
+    <Button label={presentation.string.Add} width={'100%'} kind={'link-bordered'} size={'large'} on:click={onAdd} />
+  </div>
+{/if}
diff --git a/plugins/process-resources/src/components/settings/TimeEditor.svelte b/plugins/process-resources/src/components/settings/TimeEditor.svelte
index da6f829ab44..b0d7ac7180a 100644
--- a/plugins/process-resources/src/components/settings/TimeEditor.svelte
+++ b/plugins/process-resources/src/components/settings/TimeEditor.svelte
@@ -21,7 +21,7 @@
   import { AnySvelteComponent } from '@hcengineering/ui'
   import view from '@hcengineering/view'
   import plugin from '../../plugin'
-  import { getContext } from '../../utils'
+  import { getContext, getMockAttribute } from '../../utils'
   import ProcessAttribute from '../ProcessAttribute.svelte'
   import { createEventDispatcher } from 'svelte'
   import { Analytics } from '@hcengineering/analytics'
@@ -34,20 +34,10 @@
   const h = client.getHierarchy()
   $: context = getContext(client, process, core.class.TypeDate, 'attribute')
 
-  const attribute: AnyAttribute = {
-    attributeOf: process.masterTag,
-    name: '',
-    type: {
-      label: core.string.Date,
-      _class: core.class.TypeDate
-    },
-    _id: generateId(),
-    space: core.space.Model,
-    modifiedOn: 0,
-    modifiedBy: core.account.System,
-    _class: core.class.Attribute,
-    label: plugin.string.WaitUntil
-  }
+  const attribute: AnyAttribute = getMockAttribute(process.masterTag, plugin.string.WaitUntil, {
+    label: core.string.Date,
+    _class: core.class.TypeDate
+  })
 
   let editor: AnySvelteComponent | undefined
 
diff --git a/plugins/process-resources/src/components/settings/ToDoParamsEditor.svelte b/plugins/process-resources/src/components/settings/ToDoParamsEditor.svelte
index 61e294dae76..b6d6b27df14 100644
--- a/plugins/process-resources/src/components/settings/ToDoParamsEditor.svelte
+++ b/plugins/process-resources/src/components/settings/ToDoParamsEditor.svelte
@@ -14,11 +14,12 @@
 -->
 
 <script lang="ts">
-  import { Process } from '@hcengineering/process'
+  import { Process, UserResult } from '@hcengineering/process'
   import { Label } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
   import plugin from '../../plugin'
   import ToDoContextSelector from '../contextEditors/ToDoContextSelector.svelte'
+  import ResultCriteriaEditor from './ResultCriteriaEditor.svelte'
 
   export let readonly: boolean
   export let process: Process
@@ -30,6 +31,13 @@
   function change (e: CustomEvent<string>): void {
     if (readonly || e.detail == null) return
     params._id = e.detail
+    params.result = undefined
+    dispatch('change', { params })
+  }
+
+  function changeResult (e: CustomEvent<any>): void {
+    if (readonly) return
+    params.result = e.detail
     dispatch('change', { params })
   }
 </script>
@@ -37,4 +45,7 @@
 <div class="editor-grid">
   <Label label={plugin.string.ToDo} />
   <ToDoContextSelector {readonly} {skipRollback} {process} value={params._id} on:change={change} />
+  {#if !skipRollback}
+    <ResultCriteriaEditor {readonly} {process} result={params.result} value={params._id} on:change={changeResult} />
+  {/if}
 </div>
diff --git a/plugins/process-resources/src/components/transformEditors/FilterEditor.svelte b/plugins/process-resources/src/components/transformEditors/FilterEditor.svelte
index def447ffeff..8c4b5dbc05e 100644
--- a/plugins/process-resources/src/components/transformEditors/FilterEditor.svelte
+++ b/plugins/process-resources/src/components/transformEditors/FilterEditor.svelte
@@ -18,7 +18,7 @@
   import { Process, ProcessFunction } from '@hcengineering/process'
   import { Button, SelectPopup, eventToHTMLElement, showPopup } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
-  import { getCirteriaEditor } from '../../utils'
+  import { getCriteriaEditor } from '../../utils'
   import CriteriasEditor from '../criterias/CriteriasEditor.svelte'
 
   export let func: ProcessFunction
@@ -45,7 +45,7 @@
       if (key === '_id' || key === '_class') continue
       if (attr.hidden === true) continue
       const presenterClass = getAttributePresenterClass(hierarchy, attr.type)
-      const updateCriteria = getCirteriaEditor(presenterClass.attrClass, presenterClass.category)
+      const updateCriteria = getCriteriaEditor(presenterClass.attrClass, presenterClass.category)
       const editor = updateCriteria?.editor
       if (editor == null) continue
       res.push(attr)
diff --git a/plugins/process-resources/src/utils.ts b/plugins/process-resources/src/utils.ts
index 195eae156e4..6c990061d82 100644
--- a/plugins/process-resources/src/utils.ts
+++ b/plugins/process-resources/src/utils.ts
@@ -28,7 +28,7 @@ import core, {
   type TxOperations,
   type Type
 } from '@hcengineering/core'
-import { getResource, PlatformError, Severity, Status } from '@hcengineering/platform'
+import { getResource, type IntlString, PlatformError, Severity, Status } from '@hcengineering/platform'
 import { getClient } from '@hcengineering/presentation'
 import {
   type Context,
@@ -656,7 +656,7 @@ export async function subProcessesDoneCheck (
   return res === undefined
 }
 
-export function getCirteriaEditor (
+export function getCriteriaEditor (
   of: Ref<Class<Doc>>,
   category: AttributeCategory
 ): UpdateCriteriaComponent | undefined {
@@ -673,3 +673,17 @@ export function getCirteriaEditor (
   })[0]
   return res
 }
+
+export function getMockAttribute (_class: Ref<Class<Doc>>, label: IntlString, type: Type<any>): AnyAttribute {
+  return {
+    attributeOf: _class,
+    name: '',
+    _id: generateId(),
+    space: core.space.Model,
+    modifiedOn: 0,
+    modifiedBy: core.account.System,
+    _class: core.class.Attribute,
+    type,
+    label
+  }
+}
diff --git a/server-plugins/process-resources/src/functions.ts b/server-plugins/process-resources/src/functions.ts
index 67b792b4eae..c3d582563bc 100644
--- a/server-plugins/process-resources/src/functions.ts
+++ b/server-plugins/process-resources/src/functions.ts
@@ -19,6 +19,7 @@ import core, {
   checkMixinKey,
   Data,
   Doc,
+  findProperty,
   generateId,
   getObjectValue,
   matchQuery,
@@ -43,6 +44,15 @@ import process, {
 import { ExecuteResult, ProcessControl, SuccessExecutionContext } from '@hcengineering/server-process'
 import time, { ToDoPriority } from '@hcengineering/time'
 
+function checkResult (execution: Execution, results: Record<string, any> | undefined): boolean {
+  if (results === undefined) return true
+  for (const [key, value] of Object.entries(results)) {
+    const res = findProperty([execution.context as any], key, value)
+    if (res.length === 0) return false
+  }
+  return true
+}
+
 export async function CheckToDoDone (
   control: ProcessControl,
   execution: Execution,
@@ -51,11 +61,12 @@ export async function CheckToDoDone (
 ): Promise<boolean> {
   if (params._id === undefined) return false
   if (context.todo !== undefined) {
-    return context.todo._id === params._id
+    const matched = context.todo._id === params._id
+    return matched && checkResult(execution, params.result)
   } else {
     const todo = await control.client.findOne(process.class.ProcessToDo, { _id: params._id })
     if (todo === undefined) return false
-    return todo.doneOn !== null
+    return todo.doneOn !== null && checkResult(execution, params.result)
   }
 }