diff --git a/models/process/src/index.ts b/models/process/src/index.ts index 9ca9b488d4..99f34839eb 100644 --- a/models/process/src/index.ts +++ b/models/process/src/index.ts @@ -63,7 +63,6 @@ import { type Step, type Transition, type Trigger, - type TriggerResult, type UpdateCriteriaComponent, processId } from '@hcengineering/process' @@ -136,8 +135,6 @@ export class TTransition extends TDoc implements Transition { triggerParams!: Record - result?: TriggerResult | null - @Prop(TypeRank(), core.string.Rank) @Hidden() rank!: Rank diff --git a/packages/theme/styles/common.scss b/packages/theme/styles/common.scss index 5d028df294..d9b0c2e473 100644 --- a/packages/theme/styles/common.scss +++ b/packages/theme/styles/common.scss @@ -906,3 +906,17 @@ .emoji.fitSize > img { height: 1em; } + +.editor-grid { + display: grid; + grid-template-columns: 1fr 3fr; + grid-auto-rows: minmax(2rem, max-content); + justify-content: start; + align-items: center; + row-gap: 0.5rem; + margin: 0.25rem 2rem 0; + width: calc(100% - 4rem); + column-gap: 1rem; + margin-top: 0.5rem; + height: min-content; +} diff --git a/plugins/process-assets/lang/cs.json b/plugins/process-assets/lang/cs.json index f0a39d5a11..92917001fd 100644 --- a/plugins/process-assets/lang/cs.json +++ b/plugins/process-assets/lang/cs.json @@ -99,7 +99,11 @@ "Cancelled": "Zrušeno", "WaitUntil": "Čekat do", "CurrentUser": "Aktuální uživatel", - "CurrentDate": "Aktuální datum" + "CurrentDate": "Aktuální datum", + "AddResult": "Přidat výsledek", + "For": "Pro", + "Context": "Kontext", + "Attribute": "Atribut" }, "error": { "MethodNotFound": "Metoda nenalezena: {methodId}", diff --git a/plugins/process-assets/lang/de.json b/plugins/process-assets/lang/de.json index 74eb3f41b3..fac87eaebc 100644 --- a/plugins/process-assets/lang/de.json +++ b/plugins/process-assets/lang/de.json @@ -99,7 +99,11 @@ "Cancelled": "Abgebrochen", "WaitUntil": "Warten bis", "CurrentUser": "Aktueller Benutzer", - "CurrentDate": "Aktuelles Datum" + "CurrentDate": "Aktuelles Datum", + "AddResult": "Ergebnis hinzufügen", + "For": "Für", + "Context": "Kontext", + "Attribute": "Attribut" }, "error": { "MethodNotFound": "Methode nicht gefunden: {methodId}", diff --git a/plugins/process-assets/lang/en.json b/plugins/process-assets/lang/en.json index 5e55d3b07c..c2f5ad72e7 100644 --- a/plugins/process-assets/lang/en.json +++ b/plugins/process-assets/lang/en.json @@ -104,7 +104,11 @@ "Cancelled": "Cancelled", "WaitUntil": "Wait until", "CurrentUser": "Current user", - "CurrentDate": "Current date" + "CurrentDate": "Current date", + "AddResult": "Add result", + "For": "For", + "Context": "Context", + "Attribute": "Attribute" }, "error": { "MethodNotFound": "Method not found: {methodId}", diff --git a/plugins/process-assets/lang/es.json b/plugins/process-assets/lang/es.json index 7a9e9c5185..4962e4004b 100644 --- a/plugins/process-assets/lang/es.json +++ b/plugins/process-assets/lang/es.json @@ -104,7 +104,11 @@ "Cancelled": "Cancelado", "WaitUntil": "Esperar hasta", "CurrentUser": "Usuario Actual", - "CurrentDate": "Fecha Actual" + "CurrentDate": "Fecha Actual", + "AddResult": "Agregar resultado", + "For": "Para", + "Context": "Contexto", + "Attribute": "Atributo" }, "error": { "MethodNotFound": "Método no encontrado: {methodId}", diff --git a/plugins/process-assets/lang/fr.json b/plugins/process-assets/lang/fr.json index 92289e4f3a..83b1210b08 100644 --- a/plugins/process-assets/lang/fr.json +++ b/plugins/process-assets/lang/fr.json @@ -104,7 +104,11 @@ "Cancelled": "Annulé", "WaitUntil": "Attendre jusqu'à", "CurrentUser": "Utilisateur actuel", - "CurrentDate": "Date actuelle" + "CurrentDate": "Date actuelle", + "AddResult": "Ajouter un résultat", + "For": "Pour", + "Context": "Contexte", + "Attribute": "Attribut" }, "error": { "MethodNotFound": "Méthode introuvable : {methodId}", diff --git a/plugins/process-assets/lang/it.json b/plugins/process-assets/lang/it.json index 7556c1a5d7..e201ddc834 100644 --- a/plugins/process-assets/lang/it.json +++ b/plugins/process-assets/lang/it.json @@ -104,7 +104,11 @@ "Cancelled": "Annullato", "WaitUntil": "Aspetta fino a", "CurrentUser": "Utente corrente", - "CurrentDate": "Data corrente" + "CurrentDate": "Data corrente", + "AddResult": "Aggiungi risultato", + "For": "Per", + "Context": "Contesto", + "Attribute": "Attributo" }, "error": { "MethodNotFound": "Metodo non trovato: {methodId}", diff --git a/plugins/process-assets/lang/ja.json b/plugins/process-assets/lang/ja.json index 149d7c162c..043a067d19 100644 --- a/plugins/process-assets/lang/ja.json +++ b/plugins/process-assets/lang/ja.json @@ -103,7 +103,11 @@ "Cancelled": "キャンセル済み", "WaitUntil": "待機する", "CurrentUser": "現在のユーザー", - "CurrentDate": "現在の日付" + "CurrentDate": "現在の日付", + "AddResult": "結果を追加", + "For": "〜のために", + "Context": "コンテキスト", + "Attribute": "属性" }, "error": { "MethodNotFound": "メソッドが見つかりません: {methodId}", diff --git a/plugins/process-assets/lang/pt.json b/plugins/process-assets/lang/pt.json index 7e2c9a3b85..7780c84e9e 100644 --- a/plugins/process-assets/lang/pt.json +++ b/plugins/process-assets/lang/pt.json @@ -104,7 +104,11 @@ "Cancelled": "Cancelado", "WaitUntil": "Aguardar até", "CurrentUser": "Usuário Atual", - "CurrentDate": "Data Atual" + "CurrentDate": "Data Atual", + "AddResult": "Adicionar resultado", + "For": "Para", + "Attribute": "Atributo", + "Context": "Contexto" }, "error": { "MethodNotFound": "Método não encontrado: {methodId}", diff --git a/plugins/process-assets/lang/ru.json b/plugins/process-assets/lang/ru.json index 5129a0d363..b66b4009ba 100644 --- a/plugins/process-assets/lang/ru.json +++ b/plugins/process-assets/lang/ru.json @@ -104,7 +104,11 @@ "Cancelled": "Отменено", "WaitUntil": "Ждать до", "CurrentUser": "Текущий пользователь", - "CurrentDate": "Текущая дата" + "CurrentDate": "Текущая дата", + "AddResult": "Добавить результат", + "For": "Для", + "Context": "Контекст", + "Attribute": "Аттрибут" }, "error": { "MethodNotFound": "Метод не найден: {methodId}", diff --git a/plugins/process-assets/lang/zh.json b/plugins/process-assets/lang/zh.json index 296ad28b3d..1f47435704 100644 --- a/plugins/process-assets/lang/zh.json +++ b/plugins/process-assets/lang/zh.json @@ -104,7 +104,11 @@ "Cancelled": "已取消", "WaitUntil": "等待直到", "CurrentUser": "当前用户", - "CurrentDate": "当前日期" + "CurrentDate": "当前日期", + "AddResult": "添加结果", + "For": "对于", + "Context": "上下文", + "Attribute": "属性" }, "error": { "MethodNotFound": "找不到方法:{methodId}", diff --git a/plugins/process-resources/src/components/criterias/CriteriasEditor.svelte b/plugins/process-resources/src/components/criterias/CriteriasEditor.svelte index 0d6d34c5bc..d46ae832ad 100644 --- a/plugins/process-resources/src/components/criterias/CriteriasEditor.svelte +++ b/plugins/process-resources/src/components/criterias/CriteriasEditor.svelte @@ -38,7 +38,7 @@ } -
+
{#each keys as key} {/each}
- - diff --git a/plugins/process-resources/src/components/settings/AddTagEditor.svelte b/plugins/process-resources/src/components/settings/AddTagEditor.svelte index 54a615b222..11ba9d4ad5 100644 --- a/plugins/process-resources/src/components/settings/AddTagEditor.svelte +++ b/plugins/process-resources/src/components/settings/AddTagEditor.svelte @@ -93,7 +93,7 @@ } -
+
{/if} - - diff --git a/plugins/process-resources/src/components/settings/AddTransitionPopup.svelte b/plugins/process-resources/src/components/settings/AddTransitionPopup.svelte index 8586a91682..69f8090ef3 100644 --- a/plugins/process-resources/src/components/settings/AddTransitionPopup.svelte +++ b/plugins/process-resources/src/components/settings/AddTransitionPopup.svelte @@ -15,7 +15,7 @@ @@ -119,7 +114,7 @@ width={'medium'} on:close > -
+
{#if triggerValue?.editor} - + {/if} - - diff --git a/plugins/process-resources/src/components/settings/AsideTransitionEditor.svelte b/plugins/process-resources/src/components/settings/AsideTransitionEditor.svelte index 935e6472fb..97802e0e5f 100644 --- a/plugins/process-resources/src/components/settings/AsideTransitionEditor.svelte +++ b/plugins/process-resources/src/components/settings/AsideTransitionEditor.svelte @@ -20,12 +20,11 @@ export let transition: Transition let params = transition.triggerParams ?? {} - let result = transition.result ?? null const client = getClient() async function save (): Promise { - await client.update(transition, { triggerParams: params, trigger: selectedTrigger, result }) + await client.update(transition, { triggerParams: params, trigger: selectedTrigger }) clearSettingsStore() } @@ -38,9 +37,6 @@ if (e.detail?.params !== undefined) { params = e.detail.params } - if (e.detail?.result !== undefined) { - result = e.detail.result - } } let selectedTrigger: Ref = transition.trigger @@ -72,7 +68,7 @@
{#if trigger !== undefined} -
+
{#if trigger.editor !== undefined}
- +
{/if} {/if} @@ -105,18 +100,6 @@ margin: 0.25rem 2rem 0; } - .grid { - display: grid; - grid-template-columns: 1fr 3fr; - grid-auto-rows: minmax(2rem, max-content); - justify-content: start; - align-items: center; - row-gap: 0.25rem; - column-gap: 1rem; - margin: 0.25rem 2rem 0; - height: min-content; - } - .title { padding-bottom: 1rem; } diff --git a/plugins/process-resources/src/components/settings/ContextFooter.svelte b/plugins/process-resources/src/components/settings/ContextFooter.svelte index a95a85ae9b..0a9e44c0e6 100644 --- a/plugins/process-resources/src/components/settings/ContextFooter.svelte +++ b/plugins/process-resources/src/components/settings/ContextFooter.svelte @@ -24,13 +24,23 @@ export let step: Step $: currentContext = step.context ? process.context[step.context._id] : undefined + + $: resultContext = + step.results != null ? step.results.map((r) => process.context[r._id]).filter((ctx) => ctx != null) : [] -{#if currentContext} -