From 70d2485069450aa92e42096e8cd9ec3618637dce Mon Sep 17 00:00:00 2001
From: Denis Bykhov <bykhov.denis@gmail.com>
Date: Wed, 10 Sep 2025 18:45:14 +0500
Subject: [PATCH] Process configure: show reduce funcs (#9822)

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
---
 models/process/src/index.ts                   |  1 +
 .../attributeEditors/ConfigurePopup.svelte    | 10 +++---
 .../ContextSelectorPopup.svelte               |  2 +-
 .../ContextValuePresenter.svelte              |  5 ++-
 .../ExecutionContextPresenter.svelte          |  4 +--
 .../ExecutionContextSelector.svelte           |  2 +-
 .../FunctionContextPresenter.svelte           | 11 +++++--
 .../NestedContextSelector.svelte              |  2 +-
 .../RelatedContextSelector.svelte             |  2 +-
 .../components/criterias/ArrayCriteria.svelte |  8 +----
 .../transformPresenters/RolePresenter.svelte  | 33 +++++++++++++++++++
 plugins/process-resources/src/index.ts        |  4 ++-
 plugins/process-resources/src/plugin.ts       |  3 +-
 plugins/process-resources/src/utils.ts        | 20 +++++------
 plugins/process/src/types.ts                  |  2 +-
 server-plugins/process-resources/src/utils.ts | 18 +++++-----
 16 files changed, 82 insertions(+), 45 deletions(-)
 create mode 100644 plugins/process-resources/src/components/transformPresenters/RolePresenter.svelte

diff --git a/models/process/src/index.ts b/models/process/src/index.ts
index ab4340a52e..324e5aa6bd 100644
--- a/models/process/src/index.ts
+++ b/models/process/src/index.ts
@@ -724,6 +724,7 @@ export function createModel (builder: Builder): void {
     {
       of: contact.mixin.Employee,
       editor: process.component.RoleEditor,
+      presenter: process.transformPresenter.RolePresenter,
       category: 'array',
       label: core.string.Role,
       type: 'context'
diff --git a/plugins/process-resources/src/components/attributeEditors/ConfigurePopup.svelte b/plugins/process-resources/src/components/attributeEditors/ConfigurePopup.svelte
index ba32b1367a..860a4d4673 100644
--- a/plugins/process-resources/src/components/attributeEditors/ConfigurePopup.svelte
+++ b/plugins/process-resources/src/components/attributeEditors/ConfigurePopup.svelte
@@ -105,7 +105,7 @@
 
   $: sourceFunc =
     contextValue.sourceFunction !== undefined
-      ? client.getModel().findAllSync(plugin.class.ProcessFunction, { _id: contextValue.sourceFunction })[0]
+      ? client.getModel().findAllSync(plugin.class.ProcessFunction, { _id: contextValue.sourceFunction.func })[0]
       : undefined
 
   $: functionButtonIndex = functionsLength + (sourceFunc !== undefined ? 1 : 0)
@@ -161,7 +161,7 @@
   }
 
   function onSourceFunctionSelect (e: Ref<ProcessFunction>): void {
-    contextValue.sourceFunction = e
+    contextValue.sourceFunction = { func: e, props: {} }
     onChange(contextValue)
   }
 
@@ -332,11 +332,11 @@
         />
         <!-- <div class="menu-separator" /> -->
       {/if}
-      {#if !forbidValue}
-        <div class="menu-separator" />
-      {/if}
     {/if}
     {#if !forbidValue}
+      {#if sourceFunc !== undefined || availableFunctions.length > 0 || functionsLength > 0}
+        <div class="menu-separator" />
+      {/if}
       <!-- svelte-ignore a11y-mouse-events-have-key-events -->
       <button
         bind:this={elements[functionButtonIndex + 1]}
diff --git a/plugins/process-resources/src/components/attributeEditors/ContextSelectorPopup.svelte b/plugins/process-resources/src/components/attributeEditors/ContextSelectorPopup.svelte
index 0751be0e4f..2ca296f338 100644
--- a/plugins/process-resources/src/components/attributeEditors/ContextSelectorPopup.svelte
+++ b/plugins/process-resources/src/components/attributeEditors/ContextSelectorPopup.svelte
@@ -54,7 +54,7 @@
     onClick({
       type: 'attribute',
       key: val.name,
-      functions: valueFunc !== undefined ? [{ func: valueFunc, props: {} }] : []
+      functions: valueFunc !== undefined ? [valueFunc] : []
     })
   }
 
diff --git a/plugins/process-resources/src/components/attributeEditors/ContextValuePresenter.svelte b/plugins/process-resources/src/components/attributeEditors/ContextValuePresenter.svelte
index 418aeb5cac..ceb8008aee 100644
--- a/plugins/process-resources/src/components/attributeEditors/ContextValuePresenter.svelte
+++ b/plugins/process-resources/src/components/attributeEditors/ContextValuePresenter.svelte
@@ -39,11 +39,14 @@
     {:else if contextValue.type === 'userRequest'}
       <Label label={plugin.string.RequestFromUser} />
     {:else if contextValue.type === 'function'}
-      <FunctionContextPresenter {contextValue} {context} />
+      <FunctionContextPresenter {contextValue} {context} {process} />
     {:else if contextValue.type === 'context'}
       <ExecutionContextPresenter {contextValue} {process} />
     {/if}
   </div>
+  {#if contextValue.sourceFunction}
+    <FunctionPresenter value={contextValue.sourceFunction} {context} {process} />
+  {/if}
   {#each contextValue.functions ?? [] as func}
     <FunctionPresenter value={func} {context} {process} />
   {/each}
diff --git a/plugins/process-resources/src/components/attributeEditors/ExecutionContextPresenter.svelte b/plugins/process-resources/src/components/attributeEditors/ExecutionContextPresenter.svelte
index e08f6a8ea0..c071067f98 100644
--- a/plugins/process-resources/src/components/attributeEditors/ExecutionContextPresenter.svelte
+++ b/plugins/process-resources/src/components/attributeEditors/ExecutionContextPresenter.svelte
@@ -13,10 +13,10 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Context, Process, SelectedExecutionContext } from '@hcengineering/process'
+  import { getClient } from '@hcengineering/presentation'
+  import { Process, SelectedExecutionContext } from '@hcengineering/process'
   import ui, { Label } from '@hcengineering/ui'
   import ProcessContextPresenter from '../contextEditors/ProcessContextPresenter.svelte'
-  import { getClient } from '@hcengineering/presentation'
 
   export let contextValue: SelectedExecutionContext
   export let process: Process
diff --git a/plugins/process-resources/src/components/attributeEditors/ExecutionContextSelector.svelte b/plugins/process-resources/src/components/attributeEditors/ExecutionContextSelector.svelte
index 0d27519982..db796900f2 100644
--- a/plugins/process-resources/src/components/attributeEditors/ExecutionContextSelector.svelte
+++ b/plugins/process-resources/src/components/attributeEditors/ExecutionContextSelector.svelte
@@ -47,7 +47,7 @@
       type: 'context',
       key: attr.name,
       id: context.context,
-      functions: valueFunc !== undefined ? [{ func: valueFunc, props: {} }] : []
+      functions: valueFunc !== undefined ? [valueFunc] : []
     })
   }
 </script>
diff --git a/plugins/process-resources/src/components/attributeEditors/FunctionContextPresenter.svelte b/plugins/process-resources/src/components/attributeEditors/FunctionContextPresenter.svelte
index 3acbf97c33..7101d634e6 100644
--- a/plugins/process-resources/src/components/attributeEditors/FunctionContextPresenter.svelte
+++ b/plugins/process-resources/src/components/attributeEditors/FunctionContextPresenter.svelte
@@ -14,9 +14,10 @@
 -->
 <script lang="ts">
   import { getClient } from '@hcengineering/presentation'
-  import { Context, SelectedContextFunc } from '@hcengineering/process'
-  import { Label } from '@hcengineering/ui'
+  import { Context, Process, SelectedContextFunc } from '@hcengineering/process'
+  import { Component, Label } from '@hcengineering/ui'
 
+  export let process: Process
   export let contextValue: SelectedContextFunc
   export let context: Context
 
@@ -25,5 +26,9 @@
 </script>
 
 {#if func !== undefined}
-  <Label label={func.label} />
+  {#if func.presenter !== undefined}
+    <Component is={func.presenter} props={{ context, contextValue, process }} />
+  {:else}
+    <Label label={func.label} />
+  {/if}
 {/if}
diff --git a/plugins/process-resources/src/components/attributeEditors/NestedContextSelector.svelte b/plugins/process-resources/src/components/attributeEditors/NestedContextSelector.svelte
index 678b2496b3..210122aaff 100644
--- a/plugins/process-resources/src/components/attributeEditors/NestedContextSelector.svelte
+++ b/plugins/process-resources/src/components/attributeEditors/NestedContextSelector.svelte
@@ -48,7 +48,7 @@
       type: 'nested',
       key: attr.name,
       path: context.attribute.name,
-      functions: valueFunc !== undefined ? [{ func: valueFunc, props: {} }] : [],
+      functions: valueFunc !== undefined ? [valueFunc] : [],
       sourceFunction: pathReduce
     })
   }
diff --git a/plugins/process-resources/src/components/attributeEditors/RelatedContextSelector.svelte b/plugins/process-resources/src/components/attributeEditors/RelatedContextSelector.svelte
index d810aacc26..58a0b9d4c3 100644
--- a/plugins/process-resources/src/components/attributeEditors/RelatedContextSelector.svelte
+++ b/plugins/process-resources/src/components/attributeEditors/RelatedContextSelector.svelte
@@ -53,7 +53,7 @@
       association: context.association,
       direction: context.direction,
       name: context.name,
-      functions: valueFunc !== undefined ? [{ func: valueFunc, props: {} }] : [],
+      functions: valueFunc !== undefined ? [valueFunc] : [],
       sourceFunction: reduceFunc
     })
   }
diff --git a/plugins/process-resources/src/components/criterias/ArrayCriteria.svelte b/plugins/process-resources/src/components/criterias/ArrayCriteria.svelte
index 9b4a6263d2..6a7b5dce37 100644
--- a/plugins/process-resources/src/components/criterias/ArrayCriteria.svelte
+++ b/plugins/process-resources/src/components/criterias/ArrayCriteria.svelte
@@ -196,13 +196,7 @@
       </div>
     {/if}
     <div class="button flex-row-center">
-      <Button
-        icon={IconAdd}
-        kind="ghost"
-        on:click={(e) => {
-          selectContext(e)
-        }}
-      />
+      <Button icon={IconAdd} kind="ghost" on:click={selectContext} />
       <Button
         icon={IconClose}
         kind="ghost"
diff --git a/plugins/process-resources/src/components/transformPresenters/RolePresenter.svelte b/plugins/process-resources/src/components/transformPresenters/RolePresenter.svelte
new file mode 100644
index 0000000000..86538e16e0
--- /dev/null
+++ b/plugins/process-resources/src/components/transformPresenters/RolePresenter.svelte
@@ -0,0 +1,33 @@
+<!--
+// 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 { Role } from '@hcengineering/card'
+  import { getClient } from '@hcengineering/presentation'
+  import { SelectedContextFunc } from '@hcengineering/process'
+  import { Label } from '@hcengineering/ui'
+
+  export let contextValue: SelectedContextFunc
+
+  const client = getClient()
+  const func = client.getModel().findObject(contextValue.func)
+  const role: Role | undefined =
+    contextValue.props?.target !== undefined ? client.getModel().findObject(contextValue.props?.target) : undefined
+</script>
+
+{#if role !== undefined && func !== undefined}
+  <div>
+    <Label label={func.label} />: {role.name}
+  </div>
+{/if}
diff --git a/plugins/process-resources/src/index.ts b/plugins/process-resources/src/index.ts
index 7ede1cd856..daf11a4726 100644
--- a/plugins/process-resources/src/index.ts
+++ b/plugins/process-resources/src/index.ts
@@ -73,6 +73,7 @@ import CutEditor from './components/transformEditors/CutEditor.svelte'
 import ReplaceEditor from './components/transformEditors/ReplaceEditor.svelte'
 import SplitEditor from './components/transformEditors/SplitEditor.svelte'
 import NumberPresenter from './components/transformPresenters/NumberPresenter.svelte'
+import RolePresenter from './components/transformPresenters/RolePresenter.svelte'
 import { ProcessMiddleware } from './middleware'
 import {
   continueExecution,
@@ -144,7 +145,8 @@ export default async (): Promise<Resources> => ({
     ArrayCriteria
   },
   transformPresenter: {
-    NumberPresenter
+    NumberPresenter,
+    RolePresenter
   },
   transformEditor: {
     ArrayElementEditor,
diff --git a/plugins/process-resources/src/plugin.ts b/plugins/process-resources/src/plugin.ts
index a722fed6e1..8d5bb76151 100644
--- a/plugins/process-resources/src/plugin.ts
+++ b/plugins/process-resources/src/plugin.ts
@@ -90,7 +90,8 @@ export default mergeIds(processId, process, {
     CutEditor: '' as AnyComponent
   },
   transformPresenter: {
-    NumberPresenter: '' as AnyComponent
+    NumberPresenter: '' as AnyComponent,
+    RolePresenter: '' as AnyComponent
   },
   function: {
     ShowDoneQuery: '' as ViewQueryAction,
diff --git a/plugins/process-resources/src/utils.ts b/plugins/process-resources/src/utils.ts
index 3f96be7772..c284ec7f9c 100644
--- a/plugins/process-resources/src/utils.ts
+++ b/plugins/process-resources/src/utils.ts
@@ -38,6 +38,7 @@ import {
   type Execution,
   type ExecutionContext,
   ExecutionStatus,
+  type Func,
   type Method,
   type NestedContext,
   parseContext,
@@ -364,40 +365,37 @@ export function getRelationObjectReduceFunc (
   association: Ref<Association>,
   direction: 'A' | 'B',
   target: AnyAttribute
-): Ref<ProcessFunction> | undefined {
+): Func | undefined {
   const assoc = client.getModel().findObject(association)
   if (assoc === undefined) return undefined
   if (assoc.type === '1:1') return undefined
   if (assoc.type === '1:N' && direction === 'A') return undefined
   if (target.type._class === core.class.ArrOf) return undefined
-  return process.function.FirstValue
+  return { func: process.function.FirstValue, props: {} }
 }
 
 export function getRelationReduceFunc (
   client: Client,
   association: Ref<Association>,
   direction: 'A' | 'B'
-): Ref<ProcessFunction> | undefined {
+): Func | undefined {
   const assoc = client.getModel().findObject(association)
   if (assoc === undefined) return undefined
   if (assoc.type === '1:1') return undefined
   if (assoc.type === '1:N' && direction === 'A') return undefined
-  return process.function.FirstValue
+  return { func: process.function.FirstValue, props: {} }
 }
 
-export function getValueReduceFunc (source: AnyAttribute, target: AnyAttribute): Ref<ProcessFunction> | undefined {
+export function getValueReduceFunc (source: AnyAttribute, target: AnyAttribute): Func | undefined {
   if (source.type._class !== core.class.ArrOf) return undefined
   if (target.type._class === core.class.ArrOf) return undefined
-  return process.function.FirstValue
+  return { func: process.function.FirstValue, props: {} }
 }
 
-export function getContextFunctionReduce (
-  func: ProcessFunction,
-  target: AnyAttribute
-): Ref<ProcessFunction> | undefined {
+export function getContextFunctionReduce (func: ProcessFunction, target: AnyAttribute): Func | undefined {
   if (func.category !== 'array') return undefined
   if (target.type._class === core.class.ArrOf) return undefined
-  return process.function.FirstValue
+  return { func: process.function.FirstValue, props: {} }
 }
 
 export function showDoneQuery (value: any, query: DocumentQuery<Execution>): DocumentQuery<Execution> {
diff --git a/plugins/process/src/types.ts b/plugins/process/src/types.ts
index 47ea66ed54..3711b26f19 100644
--- a/plugins/process/src/types.ts
+++ b/plugins/process/src/types.ts
@@ -39,7 +39,7 @@ interface BaseSelectedContext {
   key: string
 
   // reduce array function for source obj
-  sourceFunction?: Ref<ProcessFunction>
+  sourceFunction?: Func
 
   // process one by one
   functions?: Func[]
diff --git a/server-plugins/process-resources/src/utils.ts b/server-plugins/process-resources/src/utils.ts
index 02ab086e1b..f1ebda3d36 100644
--- a/server-plugins/process-resources/src/utils.ts
+++ b/server-plugins/process-resources/src/utils.ts
@@ -121,12 +121,12 @@ async function getNestedValue (
   if (target.length === 0) throw processError(process.error.RelatedObjectNotFound, {}, { attr: attr.label })
   const nested = control.client.getHierarchy().findAttribute(targetClass, context.key)
   if (context.sourceFunction !== undefined) {
-    const transform = control.client.getModel().findObject(context.sourceFunction)
+    const transform = control.client.getModel().findObject(context.sourceFunction.func)
     if (transform === undefined) {
-      throw processError(process.error.MethodNotFound, { methodId: context.sourceFunction }, {}, true)
+      throw processError(process.error.MethodNotFound, { methodId: context.sourceFunction.func }, {}, true)
     }
     if (!control.client.getHierarchy().hasMixin(transform, serverProcess.mixin.FuncImpl)) {
-      throw processError(process.error.MethodNotFound, { methodId: context.sourceFunction }, {}, true)
+      throw processError(process.error.MethodNotFound, { methodId: context.sourceFunction.func }, {}, true)
     }
     const funcImpl = control.client.getHierarchy().as(transform, serverProcess.mixin.FuncImpl)
     const f = await getResource(funcImpl.func)
@@ -176,12 +176,12 @@ async function getRelationValue (
   if (target.length === 0) throw processError(process.error.RelatedObjectNotFound, { attr: context.name })
   const attr = context.key !== '' ? control.client.getHierarchy().findAttribute(targetClass, context.key) : undefined
   if (context.sourceFunction !== undefined) {
-    const transform = control.client.getModel().findObject(context.sourceFunction)
+    const transform = control.client.getModel().findObject(context.sourceFunction.func)
     if (transform === undefined) {
-      throw processError(process.error.MethodNotFound, { methodId: context.sourceFunction }, {}, true)
+      throw processError(process.error.MethodNotFound, { methodId: context.sourceFunction.func }, {}, true)
     }
     if (!control.client.getHierarchy().hasMixin(transform, serverProcess.mixin.FuncImpl)) {
-      throw processError(process.error.MethodNotFound, { methodId: context.sourceFunction }, {}, true)
+      throw processError(process.error.MethodNotFound, { methodId: context.sourceFunction.func }, {}, true)
     }
     const funcImpl = control.client.getHierarchy().as(transform, serverProcess.mixin.FuncImpl)
     const f = await getResource(funcImpl.func)
@@ -224,12 +224,12 @@ async function getFunctionValue (
   const f = await getResource(impl.func)
   const res = await f(null, context.props, control, execution)
   if (context.sourceFunction !== undefined) {
-    const transform = control.client.getModel().findObject(context.sourceFunction)
+    const transform = control.client.getModel().findObject(context.sourceFunction.func)
     if (transform === undefined) {
-      throw processError(process.error.MethodNotFound, { methodId: context.sourceFunction }, {}, true)
+      throw processError(process.error.MethodNotFound, { methodId: context.sourceFunction.func }, {}, true)
     }
     if (!control.client.getHierarchy().hasMixin(transform, serverProcess.mixin.FuncImpl)) {
-      throw processError(process.error.MethodNotFound, { methodId: context.sourceFunction }, {}, true)
+      throw processError(process.error.MethodNotFound, { methodId: context.sourceFunction.func }, {}, true)
     }
     const funcImpl = control.client.getHierarchy().as(transform, serverProcess.mixin.FuncImpl)
     const f = await getResource(funcImpl.func)