diff --git a/models/process/src/index.ts b/models/process/src/index.ts index f6aa1ec51e..a3c64390a6 100644 --- a/models/process/src/index.ts +++ b/models/process/src/index.ts @@ -12,7 +12,7 @@ // limitations under the License. import card, { type Card, type MasterTag, type Tag } from '@hcengineering/card' -import contact, { type Employee } from '@hcengineering/contact' +import contact from '@hcengineering/contact' import core, { AccountRole, type Class, @@ -25,34 +25,29 @@ import core, { type Tx, type Type } from '@hcengineering/core' -import { - ArrOf, - type Builder, - Model, - Prop, - ReadOnly, - TypeAny, - TypeBoolean, - TypeRecord, - TypeRef, - TypeString -} from '@hcengineering/model' +import { type Builder, Model, Prop, ReadOnly, TypeAny, TypeBoolean, TypeRef, TypeString } from '@hcengineering/model' import { TDoc } from '@hcengineering/model-core' import presentation from '@hcengineering/model-presentation' import { TToDo } from '@hcengineering/model-time' import view, { createAction } from '@hcengineering/model-view' import workbench from '@hcengineering/model-workbench' -import { type IntlString } from '@hcengineering/platform' +import { type Asset, type IntlString, type Resource } from '@hcengineering/platform' import { + type CheckFunc, + type ContextId, type Execution, + type ExecutionContext, type ExecutionError, + type ExecutionStatus, type Method, type Process, + type ProcessContext, type ProcessFunction, type ProcessToDo, - type Results, type State, type Step, + type Transition, + type Trigger, processId } from '@hcengineering/process' import time from '@hcengineering/time' @@ -73,41 +68,62 @@ export class TProcess extends TDoc implements Process { @Prop(TypeRef(card.class.MasterTag), card.string.MasterTag) masterTag!: Ref - @Prop(ArrOf(TypeRef(process.class.State)), process.string.States) - states!: Ref[] + @Prop(TypeRef(process.class.State), process.string.NewState) + initState!: Ref @Prop(TypeBoolean(), process.string.ParallelExecutionForbidden) parallelExecutionForbidden?: boolean @Prop(TypeBoolean(), process.string.StartAutomatically) autoStart: boolean | undefined + + context!: Record +} + +@Model(process.class.Trigger, core.class.Doc, DOMAIN_MODEL) +export class TTrigger extends TDoc implements Trigger { + label!: IntlString + + editor?: AnyComponent + + icon!: Asset + + requiredParams!: string[] + + checkFunction?: Resource +} + +@Model(process.class.Transition, core.class.Doc, DOMAIN_MODEL) +export class TTransition extends TDoc implements Transition { + @Prop(TypeRef(process.class.Process), process.string.Process) + process!: Ref + + @Prop(TypeRef(process.class.State), process.string.From) + from!: Ref + + @Prop(TypeRef(process.class.State), process.string.To) + to!: Ref | null + + @Prop(TypeAny(process.component.ActionsPresenter, process.string.Actions), process.string.Actions) + actions!: Step[] + + @Prop(TypeRef(process.class.Trigger), process.string.Trigger) + trigger!: Ref + + triggerParams!: Record } @Model(process.class.Execution, core.class.Doc, DOMAIN_PROCESS) export class TExecution extends TDoc implements Execution { - @Prop(TypeRef(contact.mixin.Employee), contact.string.Employee) - @ReadOnly() - assignee!: Ref - @Prop(TypeRef(process.class.Process), process.string.Process) @ReadOnly() - process!: Ref - - @Prop(TypeRef(process.class.ProcessToDo), time.string.ToDo) - @ReadOnly() - currentToDo!: Ref | null + process!: Ref @Prop(TypeRef(process.class.State), process.string.Step) @ReadOnly() currentState!: Ref - @Prop(TypeBoolean(), process.string.Done) - @ReadOnly() - done!: boolean - - @Prop(TypeRecord(), process.string.Rollback) - @ReadOnly() - rollback!: Record, Tx[]> + rollback!: Tx[][] @Prop(TypeRef(card.class.Card), card.string.Card) @ReadOnly() @@ -119,9 +135,11 @@ export class TExecution extends TDoc implements Execution { parentId?: Ref - context?: Record + context!: ExecutionContext - results?: Results + result?: any + + status!: ExecutionStatus } @Model(process.class.ProcessToDo, time.class.ToDo) @@ -141,7 +159,7 @@ export class TMethod extends TDoc implements Method { editor!: AnyComponent - systemOnly!: boolean + contextClass!: Ref> | null presenter?: AnyComponent @@ -153,7 +171,6 @@ export class TState extends TDoc implements State { process!: Ref title!: string actions!: Step[] - endAction?: Step | null resultType?: Type | null } @@ -170,7 +187,19 @@ export class TProcessFunction extends TDoc implements ProcessFunction { export * from './migration' export function createModel (builder: Builder): void { - builder.createModel(TProcess, TExecution, TProcessToDo, TMethod, TState, TProcessFunction) + builder.createModel(TProcess, TExecution, TProcessToDo, TMethod, TState, TProcessFunction, TTransition, TTrigger) + + createAction(builder, { + action: view.actionImpl.Delete, + label: view.string.Delete, + icon: view.icon.Delete, + keyBinding: ['Meta + Backspace'], + category: view.category.General, + input: 'any', + target: process.class.Transition, + context: { mode: ['context', 'browser'], group: 'remove' }, + visibilityTester: view.function.CanDeleteObject + }) createAction( builder, @@ -376,6 +405,14 @@ export function createModel (builder: Builder): void { presenter: process.component.ProcessPresenter }) + builder.mixin(process.class.Trigger, core.class.Class, view.mixin.AttributePresenter, { + presenter: process.component.TriggerPresenter + }) + + builder.mixin(process.class.State, core.class.Class, view.mixin.AttributePresenter, { + presenter: process.component.StatePresenter + }) + builder.createDoc( view.class.Viewlet, core.space.Model, @@ -387,7 +424,7 @@ export function createModel (builder: Builder): void { baseMenuClass: process.class.Execution }, viewOptions: { - groupBy: ['process', 'assignee', 'done'], + groupBy: ['process', 'done'], orderBy: [ ['modifiedOn', SortingOrder.Descending], ['createdOn', SortingOrder.Descending] @@ -421,11 +458,6 @@ export function createModel (builder: Builder): void { displayProps: { key: 'state', fixed: 'left' } }, { key: '', presenter: process.component.ExecutonPresenter, displayProps: { grow: true } }, - { - key: 'assignee', - displayProps: { key: 'assignee', fixed: 'right' }, - props: { kind: 'list', shouldShowName: false, avatarSize: 'x-small' } - }, { key: 'modifiedOn', displayProps: { fixed: 'right' } @@ -449,7 +481,7 @@ export function createModel (builder: Builder): void { baseMenuClass: process.class.Execution }, viewOptions: { - groupBy: ['process', 'assignee', 'done'], + groupBy: ['process', 'done'], orderBy: [ ['modifiedOn', SortingOrder.Descending], ['createdOn', SortingOrder.Descending] @@ -487,11 +519,6 @@ export function createModel (builder: Builder): void { displayProps: { key: 'state', fixed: 'left' } }, { key: '', presenter: process.component.ExecutonPresenter, displayProps: { grow: true } }, - { - key: 'assignee', - displayProps: { key: 'assignee', fixed: 'right' }, - props: { kind: 'list', shouldShowName: false, avatarSize: 'x-small' } - }, { key: 'modifiedOn', displayProps: { fixed: 'right' } @@ -511,6 +538,18 @@ export function createModel (builder: Builder): void { props: {} }) + builder.createDoc( + card.class.CardSection, + core.space.Model, + { + label: process.string.Processes, + component: process.component.ProcessesExtension, + order: 350, + navigation: [] + }, + process.section.CardProcesses + ) + builder.createDoc( process.class.Method, core.space.Model, @@ -519,7 +558,7 @@ export function createModel (builder: Builder): void { objectClass: process.class.Process, editor: process.component.SubProcessEditor, presenter: process.component.SubProcessPresenter, - systemOnly: false, + contextClass: process.class.Execution, requiredParams: ['_id'] }, process.method.RunSubProcess @@ -533,7 +572,7 @@ export function createModel (builder: Builder): void { editor: process.component.ToDoEditor, objectClass: process.class.ProcessToDo, presenter: process.component.ToDoPresenter, - systemOnly: true, + contextClass: process.class.ProcessToDo, requiredParams: ['state', 'title', 'user'] }, process.method.CreateToDo @@ -546,23 +585,48 @@ export function createModel (builder: Builder): void { label: process.string.UpdateCard, editor: process.component.UpdateCardEditor, objectClass: card.class.Card, + contextClass: null, presenter: process.component.UpdateCardPresenter, - systemOnly: false, requiredParams: [] }, process.method.UpdateCard ) builder.createDoc( - process.class.Method, + process.class.Trigger, core.space.Model, { label: process.string.OnSubProcessesDone, - objectClass: process.class.Execution, - systemOnly: true, + icon: process.icon.WaitSubprocesses, requiredParams: [] }, - process.method.WaitSubProcess + process.trigger.OnSubProcessesDone + ) + + builder.createDoc( + process.class.Trigger, + core.space.Model, + { + label: process.string.OnToDoClose, + icon: process.icon.ToDo, + editor: process.component.ToDoCloseEditor, + requiredParams: ['_id'], + checkFunction: process.triggerCheck.ToDo + }, + process.trigger.OnToDoClose + ) + + builder.createDoc( + process.class.Trigger, + core.space.Model, + { + label: process.string.OnToDoRemove, + icon: process.icon.ToDoRemove, + editor: process.component.ToDoRemoveEditor, + requiredParams: ['_id'], + checkFunction: process.triggerCheck.ToDo + }, + process.trigger.OnToDoRemove ) builder.createDoc(card.class.MasterTagEditorSection, core.space.Model, { diff --git a/models/process/src/migration.ts b/models/process/src/migration.ts index b97cd840f1..d26c1a93c7 100644 --- a/models/process/src/migration.ts +++ b/models/process/src/migration.ts @@ -75,19 +75,8 @@ async function migrateStateFuncs (client: MigrationUpgradeClient): Promise } } } - const endAction = state.endAction - if (endAction?.params != null) { - for (const key of Object.keys(endAction.params)) { - const value = (endAction.params as any)[key] - const context = getContext(value) - if (context !== undefined) { - ;(endAction.params as any)[key] = context - changed = true - } - } - } if (changed) { - await txOp.updateDoc(state._class, state.space, state._id, { actions, endAction }) + await txOp.updateDoc(state._class, state.space, state._id, { actions }) } } } diff --git a/models/process/src/plugin.ts b/models/process/src/plugin.ts index 5cdce460b3..595b4410e0 100644 --- a/models/process/src/plugin.ts +++ b/models/process/src/plugin.ts @@ -17,11 +17,15 @@ import { processId } from '@hcengineering/process' import { type PresentationMiddlewareFactory } from '@hcengineering/presentation/src/pipeline' import process from '@hcengineering/process-resources/src/plugin' import { type ViewAction, type Action } from '@hcengineering/view' +import { type CardSection } from '@hcengineering/card' export default mergeIds(processId, process, { app: { Process: '' as Ref }, + section: { + CardProcesses: '' as Ref + }, pipeline: { ProcessMiddleware: '' as Ref }, diff --git a/models/server-process/src/index.ts b/models/server-process/src/index.ts index 22123a2a6c..a62e751684 100644 --- a/models/server-process/src/index.ts +++ b/models/server-process/src/index.ts @@ -13,15 +13,16 @@ import core, { type Doc } from '@hcengineering/core' import { Mixin, type Builder } from '@hcengineering/model' -import { TMethod, TProcessFunction } from '@hcengineering/model-process' +import { TMethod, TProcessFunction, TTrigger } from '@hcengineering/model-process' import type { Resource } from '@hcengineering/platform' -import process from '@hcengineering/process' +import process, { type CheckFunc, ExecutionStatus } from '@hcengineering/process' import serverCore from '@hcengineering/server-core' import serverProcess, { type ExecuteFunc, type FuncImpl, type MethodImpl, - type TransformFunc + type TransformFunc, + type TriggerImpl } from '@hcengineering/server-process' export { serverProcessId } from '@hcengineering/server-process' @@ -36,8 +37,21 @@ export class TFuncImpl extends TProcessFunction implements FuncImpl { func!: Resource } +@Mixin(serverProcess.mixin.TriggerImpl, process.class.Trigger) +export class TTriggerImpl extends TTrigger implements TriggerImpl { + serverCheckFunc?: Resource +} + export function createModel (builder: Builder): void { - builder.createModel(TMethodImpl, TFuncImpl) + builder.createModel(TMethodImpl, TFuncImpl, TTriggerImpl) + + builder.mixin(process.trigger.OnToDoClose, process.class.Trigger, serverProcess.mixin.TriggerImpl, { + serverCheckFunc: serverProcess.func.CheckToDo + }) + + builder.mixin(process.trigger.OnToDoRemove, process.class.Trigger, serverProcess.mixin.TriggerImpl, { + serverCheckFunc: serverProcess.func.CheckToDo + }) builder.mixin(process.method.RunSubProcess, process.class.Method, serverProcess.mixin.MethodImpl, { func: serverProcess.func.RunSubProcess @@ -51,10 +65,6 @@ export function createModel (builder: Builder): void { func: serverProcess.func.UpdateCard }) - builder.mixin(process.method.WaitSubProcess, process.class.Method, serverProcess.mixin.MethodImpl, { - func: serverProcess.func.WaitSubProcess - }) - builder.mixin(process.function.FirstValue, process.class.ProcessFunction, serverProcess.mixin.FuncImpl, { func: serverProcess.transform.FirstValue }) @@ -104,20 +114,11 @@ export function createModel (builder: Builder): void { txMatch: { _class: core.class.TxUpdateDoc, objectClass: process.class.Execution, - 'operations.error': null + 'operations.status': ExecutionStatus.Active, + space: core.space.Tx }, isAsync: true }) - - builder.createDoc(serverCore.class.Trigger, core.space.Model, { - trigger: serverProcess.trigger.OnProcessRemove, - txMatch: { - _class: core.class.TxRemoveDoc, - objectClass: process.class.Process - }, - isAsync: true - }) - builder.createDoc(serverCore.class.Trigger, core.space.Model, { trigger: serverProcess.trigger.OnExecutionCreate, txMatch: { @@ -145,12 +146,34 @@ export function createModel (builder: Builder): void { isAsync: true }) + builder.createDoc(serverCore.class.Trigger, core.space.Model, { + trigger: serverProcess.trigger.OnProcessRemove, + txMatch: { + _class: core.class.TxRemoveDoc, + objectClass: process.class.Process + } + }) + builder.createDoc(serverCore.class.Trigger, core.space.Model, { trigger: serverProcess.trigger.OnStateRemove, txMatch: { _class: core.class.TxRemoveDoc, objectClass: process.class.State - }, - isAsync: true + } + }) + + builder.createDoc(serverCore.class.Trigger, core.space.Model, { + trigger: serverProcess.trigger.OnStateActionsUpdate, + txMatch: { + _class: core.class.TxUpdateDoc, + objectClass: process.class.State + } + }) + + builder.createDoc(serverCore.class.Trigger, core.space.Model, { + trigger: serverProcess.trigger.OnTransition, + txMatch: { + objectClass: process.class.Transition + } }) } diff --git a/packages/ui/src/components/DropdownPopup.svelte b/packages/ui/src/components/DropdownPopup.svelte index ccba32aaa5..1289dee211 100644 --- a/packages/ui/src/components/DropdownPopup.svelte +++ b/packages/ui/src/components/DropdownPopup.svelte @@ -17,11 +17,12 @@ import { translateCB } from '@hcengineering/platform' import { themeStore } from '@hcengineering/theme' import { createEventDispatcher, onMount } from 'svelte' - import { deviceOptionsStore, resizeObserver } from '..' + import { deviceOptionsStore, IconSearch, resizeObserver } from '..' import plugin from '../plugin' import type { AnySvelteComponent, ListItem } from '../types' import Icon from './Icon.svelte' import ListView from './ListView.svelte' + import EditWithIcon from './EditWithIcon.svelte' export let icon: Asset | AnySvelteComponent export let placeholder: IntlString = plugin.string.SearchDots @@ -36,7 +37,7 @@ }) } const dispatch = createEventDispatcher() - let searchInput: HTMLInputElement + let searchInput: EditWithIcon onMount(() => { if (searchInput && !$deviceOptionsStore.isMobile) searchInput.focus() @@ -78,13 +79,14 @@
dispatch('changeContent')} on:keydown={onKeydown}> {#if withSearch}
- {}} - on:change + {placeholder} />
{/if} diff --git a/plugins/card-resources/src/components/navigator/NewCardHeader.svelte b/plugins/card-resources/src/components/navigator/NewCardHeader.svelte index 90bc38bd32..66c9acbc8a 100644 --- a/plugins/card-resources/src/components/navigator/NewCardHeader.svelte +++ b/plugins/card-resources/src/components/navigator/NewCardHeader.svelte @@ -87,7 +87,7 @@ {:else if hasAccountRole(getCurrentAccount(), AccountRole.User) || hasSpace}
{#if hasAccountRole(getCurrentAccount(), AccountRole.User)} - {#if hasSpace} + {#if hasSpace && currentSpace !== undefined && _class !== undefined} { void dropdownItemSelected(ev.detail) }} diff --git a/plugins/process-assets/assets/icons.svg b/plugins/process-assets/assets/icons.svg index 758725a6c2..819ae87908 100644 --- a/plugins/process-assets/assets/icons.svg +++ b/plugins/process-assets/assets/icons.svg @@ -17,4 +17,8 @@ + + + + diff --git a/plugins/process-assets/lang/cs.json b/plugins/process-assets/lang/cs.json index ed4dee5a34..ab612c7baa 100644 --- a/plugins/process-assets/lang/cs.json +++ b/plugins/process-assets/lang/cs.json @@ -53,7 +53,17 @@ "OnSubProcessesDone": "Při dokončení podprocesů", "Result": "Výsledek", "NoResultRequired": "Není vyžadován žádný výsledek", - "RequestResult": "Požádat o výsledek" + "RequestResult": "Požádat o výsledek", + "From": "Od", + "To": "Do", + "Trigger": "Spouštěč", + "Actions": "Akce", + "Transition": "Přechod", + "OnToDoRemove": "Při odstranění úkolu", + "DeleteTransition": "Smazat přechod", + "DeleteTransitionConfirm": "Opravdu chcete smazat přechod?", + "AddTransition": "Přidat přechod", + "ToDo": "Úkol" }, "error": { "MethodNotFound": "Metoda nenalezena: {methodId}", @@ -66,6 +76,7 @@ "EmptyRelatedObjectValue": "Prázdná hodnota {attr} souvisejícího objektu: {parent}", "InternalServerError": "Vnitřní chyba serveru, kontaktujte podporu, chybové id: {errorId}", "ResultNotProvided": "Výsledek nebyl poskytnut", - "EmptyFunctionResult": "Prázdný výsledek funkce {func}" + "EmptyFunctionResult": "Prázdný výsledek funkce {func}", + "ContextValueNotProvided": "Hodnota kontextu nebyla poskytnuta: {name}" } } diff --git a/plugins/process-assets/lang/de.json b/plugins/process-assets/lang/de.json index 09356533f6..24d6408194 100644 --- a/plugins/process-assets/lang/de.json +++ b/plugins/process-assets/lang/de.json @@ -53,7 +53,17 @@ "OnSubProcessesDone": "Beim Abschluss von Unterprozessen", "Result": "Ergebnis", "NoResultRequired": "Kein Ergebnis erforderlich", - "RequestResult": "Ergebnis anfordern" + "RequestResult": "Ergebnis anfordern", + "From": "Von", + "To": "Bis", + "Trigger": "Auslöser", + "Actions": "Aktionen", + "Transition": "Übergang", + "OnToDoRemove": "Beim Entfernen von Aufgabe", + "DeleteTransition": "Übergang löschen", + "DeleteTransitionConfirm": "Übergang löschen?", + "AddTransition": "Übergang hinzufügen", + "ToDo": "Aufgabe" }, "error": { "MethodNotFound": "Methode nicht gefunden: {methodId}", @@ -66,6 +76,7 @@ "EmptyRelatedObjectValue": "Leerer verwandtes Objekt {parent} Wert: {attr}", "InternalServerError": "Interner Serverfehler, bitte kontaktieren Sie den Support, Fehler-ID: {errorId}", "ResultNotProvided": "Ergebnis nicht bereitgestellt", - "EmptyFunctionResult": "Leerer Funktionsresultat {func}" + "EmptyFunctionResult": "Leerer Funktionsresultat {func}", + "ContextValueNotProvided": "Kontextwert nicht bereitgestellt: {name}" } } diff --git a/plugins/process-assets/lang/en.json b/plugins/process-assets/lang/en.json index 5f2f3af802..17dc09d192 100644 --- a/plugins/process-assets/lang/en.json +++ b/plugins/process-assets/lang/en.json @@ -53,7 +53,17 @@ "OnSubProcessesDone": "On sub processes done", "Result": "Result", "RequestResult": "Request result", - "NoResultRequired": "No result required" + "NoResultRequired": "No result required", + "From": "From", + "To": "To", + "Trigger": "Trigger", + "Actions": "Actions", + "Transition": "Transition", + "OnToDoRemove": "On ToDo remove", + "DeleteTransition": "Delete transition", + "DeleteTransitionConfirm": "Do you want to delete transition?", + "AddTransition": "Add transition", + "ToDo": "ToDo" }, "error": { "MethodNotFound": "Method not found: {methodId}", @@ -66,6 +76,7 @@ "EmptyRelatedObjectValue": "Empty related object {parent} value: {attr}", "InternalServerError": "Internal server error, contact support, error id: {errorId}", "ResultNotProvided": "Result not provided", - "EmptyFunctionResult": "Empty function result {func}" + "EmptyFunctionResult": "Empty function result {func}", + "ContextValueNotProvided": "Context value not provided: {name}" } } diff --git a/plugins/process-assets/lang/es.json b/plugins/process-assets/lang/es.json index 9eb671677d..49229b8e42 100644 --- a/plugins/process-assets/lang/es.json +++ b/plugins/process-assets/lang/es.json @@ -53,7 +53,17 @@ "OnSubProcessesDone": "Al finalizar los subprocesos", "Result": "Resultado", "RequestResult": "Solicitar resultado", - "NoResultRequired": "No se requiere resultado" + "NoResultRequired": "No se requiere resultado", + "From": "De", + "To": "A", + "Trigger": "Disparador", + "Actions": "Acciones", + "Transition": "Transición", + "OnToDoRemove": "Al eliminar la tarea", + "DeleteTransition": "Eliminar transición", + "DeleteTransitionConfirm": "¿Desea eliminar la transición?", + "AddTransition": "Agregar transición", + "ToDo": "Tarea" }, "error": { "MethodNotFound": "Método no encontrado: {methodId}", @@ -66,6 +76,7 @@ "EmptyRelatedObjectValue": "Valor de objeto relacionado vacío: {parent} {attr}", "InternalServerError": "Error interno del servidor, contacte con el soporte, id de error: {errorId}", "ResultNotProvided": "Resultado no proporcionado", - "EmptyFunctionResult": "Resultado de función vacío {func}" + "EmptyFunctionResult": "Resultado de función vacío {func}", + "ContextValueNotProvided": "Valor de contexto no proporcionado: {name}" } } diff --git a/plugins/process-assets/lang/fr.json b/plugins/process-assets/lang/fr.json index c314b45f2d..8226008848 100644 --- a/plugins/process-assets/lang/fr.json +++ b/plugins/process-assets/lang/fr.json @@ -53,7 +53,17 @@ "OnSubProcessesDone": "Au fin des sous-processus", "Result": "Résultat", "RequestResult": "Demander le résultat", - "NoResultRequired": "Aucun résultat requis" + "NoResultRequired": "Aucun résultat requis", + "From": "De", + "To": "À", + "Trigger": "Déclencheur", + "Actions": "Actions", + "Transition": "Transition", + "OnToDoRemove": "Lors de la suppression de la tâche", + "DeleteTransition": "Supprimer la transition", + "DeleteTransitionConfirm": "Voulez-vous supprimer la transition ?", + "AddTransition": "Ajouter une transition", + "ToDo": "Tâche" }, "error": { "MethodNotFound": "Méthode introuvable : {methodId}", @@ -66,6 +76,7 @@ "EmptyRelatedObjectValue": "Valeur d'objet lié vide : {parent} {attr}", "InternalServerError": "Erreur interne du serveur, contactez le support, id d'erreur : {errorId}", "ResultNotProvided": "Résultat non fourni", - "EmptyFunctionResult": "Résultat de fonction vide {func}" + "EmptyFunctionResult": "Résultat de fonction vide {func}", + "ContextValueNotProvided": "Valeur de contexte non fournie : {name}" } } \ No newline at end of file diff --git a/plugins/process-assets/lang/it.json b/plugins/process-assets/lang/it.json index 8accb6135f..396b1b1861 100644 --- a/plugins/process-assets/lang/it.json +++ b/plugins/process-assets/lang/it.json @@ -53,7 +53,17 @@ "OnSubProcessesDone": "Alla fine dei sottoprocessi", "Result": "Risultato", "RequestResult": "Richiedi risultato", - "NoResultRequired": "Nessun risultato richiesto" + "NoResultRequired": "Nessun risultato richiesto", + "From": "Da", + "To": "A", + "Trigger": "Trigger", + "Actions": "Azioni", + "Transition": "Transizione", + "OnToDoRemove": "Alla rimozione dell'attività", + "DeleteTransition": "Elimina transizione", + "DeleteTransitionConfirm": "Vuoi eliminare la transizione?", + "AddTransition": "Aggiungi transizione", + "ToDo": "Attività" }, "error": { "MethodNotFound": "Metodo non trovato: {methodId}", @@ -66,6 +76,7 @@ "EmptyRelatedObjectValue": "Valore oggetto correlato vuoto: {parent} {attr}", "InternalServerError": "Errore interno del server, contatta il supporto, id errore: {errorId}", "ResultNotProvided": "Risultato non fornito", - "EmptyFunctionResult": "Risultato funzione vuoto {func}" + "EmptyFunctionResult": "Risultato funzione vuoto {func}", + "ContextValueNotProvided": "Valore di contesto non fornito: {name}" } } diff --git a/plugins/process-assets/lang/ja.json b/plugins/process-assets/lang/ja.json index 65265b2977..234cfe5bfb 100644 --- a/plugins/process-assets/lang/ja.json +++ b/plugins/process-assets/lang/ja.json @@ -50,7 +50,19 @@ "RequestFromUser": "ユーザーからのリクエスト", "EnterValue": "値を入力", "OnToDoClose": "ToDo完了時", - "OnSubProcessesDone": "サブプロセス完了時" + "OnSubProcessesDone": "サブプロセス完了時", + "RequestResult": "結果をリクエスト", + "NoResultRequired": "結果は不要", + "From": "から", + "To": "へ", + "Trigger": "トリガー", + "Actions": "アクション", + "Transition": "遷移", + "OnToDoRemove": "ToDo削除時", + "DeleteTransition": "遷移を削除", + "DeleteTransitionConfirm": "遷移を削除しますか？", + "AddTransition": "遷移を追加", + "ToDo": "ToDo" }, "error": { "MethodNotFound": "メソッドが見つかりません: {methodId}", @@ -62,6 +74,7 @@ "ObjectNotFound": "オブジェクトが見つかりません: {_id}", "EmptyRelatedObjectValue": "関連オブジェクト {parent} の値が空です: {attr}", "InternalServerError": "内部サーバーエラー。サポートにお問い合わせください。エラーID: {errorId}", - "EmptyFunctionResult": "関数結果が空です {func}" + "EmptyFunctionResult": "関数結果が空です {func}", + "ContextValueNotProvided": "コンテキスト値が提供されていません: {name}" } } diff --git a/plugins/process-assets/lang/pt.json b/plugins/process-assets/lang/pt.json index 8d9754cfa1..6445d3a7f5 100644 --- a/plugins/process-assets/lang/pt.json +++ b/plugins/process-assets/lang/pt.json @@ -53,7 +53,17 @@ "OnSubProcessesDone": "Ao concluir processos sub", "Result": "Resultado", "RequestResult": "Solicitar resultado", - "NoResultRequired": "Nenhum resultado requerido" + "NoResultRequired": "Nenhum resultado requerido", + "From": "De", + "To": "Para", + "Trigger": "Gatilho", + "Actions": "Ações", + "Transition": "Transição", + "OnToDoRemove": "Ao remover Tarefa", + "DeleteTransition": "Excluir transição", + "DeleteTransitionConfirm": "Você deseja excluir a transição?", + "AddTransition": "Adicionar transição", + "ToDo": "Tarefa" }, "error": { "MethodNotFound": "Método não encontrado: {methodId}", @@ -66,6 +76,7 @@ "EmptyRelatedObjectValue": "Valor de objeto relacionado vazio: {parent} {attr}", "InternalServerError": "Erro interno do servidor, contate o suporte, id de erro: {errorId}", "ResultNotProvided": "Resultado não fornecido", - "EmptyFunctionResult": "Resultado da função vazio {func}" + "EmptyFunctionResult": "Resultado da função vazio {func}", + "ContextValueNotProvided": "Valor de contexto não fornecido: {name}" } } diff --git a/plugins/process-assets/lang/ru.json b/plugins/process-assets/lang/ru.json index ab84f6e71f..b7e38c0872 100644 --- a/plugins/process-assets/lang/ru.json +++ b/plugins/process-assets/lang/ru.json @@ -53,7 +53,17 @@ "OnSubProcessesDone": "При завершении подпроцессов", "Result": "Результат", "NoResultRequired": "Результат не требуется", - "RequestResult": "Запросить результат" + "RequestResult": "Запросить результат", + "From": "Из", + "To": "В", + "Trigger": "Триггер", + "Actions": "Действия", + "Transition": "Переход", + "OnToDoRemove": "При удалении ToDo", + "DeleteTransition": "Удалить переход", + "DeleteTransitionConfirm": "Вы хотите удалить переход?", + "AddTransition": "Добавить переход", + "ToDo": "ToDo" }, "error": { "MethodNotFound": "Метод не найден: {methodId}", @@ -66,6 +76,7 @@ "ObjectNotFound": "Объект не найден: {_id}", "AttributeNotExists": "Атрибут не существует: {key}", "ResultNotProvided": "Результат не предоставлен", - "EmptyFunctionResult": "Отсутствуют результат функции {func}" + "EmptyFunctionResult": "Отсутствуют результат функции {func}", + "ContextValueNotProvided": "Значение контекста не предоставлено: {name}" } } diff --git a/plugins/process-assets/lang/zh.json b/plugins/process-assets/lang/zh.json index b6c511a110..0eaa311d73 100644 --- a/plugins/process-assets/lang/zh.json +++ b/plugins/process-assets/lang/zh.json @@ -53,7 +53,17 @@ "OnSubProcessesDone": "子进程完成时", "Result": "结果", "RequestResult": "请求结果", - "NoResultRequired": "无需结果" + "NoResultRequired": "无需结果", + "From": "从", + "To": "到", + "Trigger": "触发器", + "Actions": "操作", + "Transition": "转换", + "OnToDoRemove": "删除待办事项时", + "DeleteTransition": "删除转换", + "DeleteTransitionConfirm": "您确定要删除转换吗？", + "AddTransition": "添加转换", + "ToDo": "待办事项" }, "error": { "MethodNotFound": "找不到方法：{methodId}", @@ -66,6 +76,7 @@ "EmptyRelatedObjectValue": "空相关对象值：{parent} {attr}", "InternalServerError": "内部服务器错误，请联系支持，错误 ID：{errorId}", "ResultNotProvided": "未提供结果", - "EmptyFunctionResult": "空函数结果 {func}" + "EmptyFunctionResult": "空函数结果 {func}", + "ContextValueNotProvided": "未提供上下文值：{name}" } } diff --git a/plugins/process-assets/src/index.ts b/plugins/process-assets/src/index.ts index 91207988a9..9a0187e0b8 100644 --- a/plugins/process-assets/src/index.ts +++ b/plugins/process-assets/src/index.ts @@ -22,5 +22,6 @@ loadMetadata(process.icon, { States: `${icons}#trigger`, Steps: `${icons}#steps`, ToDo: `${icons}#todo`, + ToDoRemove: `${icons}#todo-remove`, WaitSubprocesses: `${icons}#subprocesses` }) diff --git a/plugins/process-resources/src/components/ExecutionPopup.svelte b/plugins/process-resources/src/components/ExecutionPopup.svelte deleted file mode 100644 index 41252c7465..0000000000 --- a/plugins/process-resources/src/components/ExecutionPopup.svelte +++ /dev/null @@ -1,115 +0,0 @@ - - - -
{ - dispatch('changeContent') - }} -> -
- - {#each values as state} -
-
- - {state.text} -
-
- {#if state.result !== undefined && state.resultPresenter !== undefined} - - {/if} -
-
- {/each} - -
-
- - diff --git a/plugins/process-resources/src/components/ExecutionResultEditor.svelte b/plugins/process-resources/src/components/ExecutionResultEditor.svelte deleted file mode 100644 index 5b0c89d20f..0000000000 --- a/plugins/process-resources/src/components/ExecutionResultEditor.svelte +++ /dev/null @@ -1,80 +0,0 @@ - - - - diff --git a/plugins/process-resources/src/components/ExecutonProgressPresenter.svelte b/plugins/process-resources/src/components/ExecutonProgressPresenter.svelte index 23080a4470..da35a8fc90 100644 --- a/plugins/process-resources/src/components/ExecutonProgressPresenter.svelte +++ b/plugins/process-resources/src/components/ExecutonProgressPresenter.svelte @@ -16,35 +16,14 @@ import { WithLookup } from '@hcengineering/core' import { getClient } from '@hcengineering/presentation' import { Execution } from '@hcengineering/process' - import { Button, eventToHTMLElement, ProgressCircle, showPopup } from '@hcengineering/ui' - import ExecutionPopup from './ExecutionPopup.svelte' export let value: WithLookup const client = getClient() - $: states = value?.$lookup?.process?.states ?? client.getModel().findObject(value.process)?.states ?? [] - $: progress = states.findIndex((it) => it === value.currentState) + 1 - - $: currentState = value.currentState != null ? client.getModel().findObject(value.currentState) : undefined - - function showDetail (e: MouseEvent): void { - showPopup(ExecutionPopup, { value }, eventToHTMLElement(e)) - } + $: currentState = client.getModel().findObject(value.currentState) -
- -
+{#if currentState} + {currentState.title} +{/if} diff --git a/plugins/process-resources/src/components/ProcessesSection.svelte b/plugins/process-resources/src/components/ProcessesSection.svelte index fea8ceb12e..2b618ed397 100644 --- a/plugins/process-resources/src/components/ProcessesSection.svelte +++ b/plugins/process-resources/src/components/ProcessesSection.svelte @@ -14,10 +14,10 @@ --> - - - -
-
-
- -
- -
- -
- {#if value.endAction != null && value.endAction.methodId !== plugin.method.WaitSubProcess} - - {/if} - {#each value.actions as action, i} - - {/each} -
-
- - diff --git a/plugins/process-resources/src/components/TransitionEditor.svelte b/plugins/process-resources/src/components/TransitionEditor.svelte deleted file mode 100644 index 23384130f6..0000000000 --- a/plugins/process-resources/src/components/TransitionEditor.svelte +++ /dev/null @@ -1,42 +0,0 @@ - - - - -{#if resultIcon} - -{/if} diff --git a/plugins/process-resources/src/components/TransitionPopup.svelte b/plugins/process-resources/src/components/TransitionPopup.svelte deleted file mode 100644 index c0ee687d5a..0000000000 --- a/plugins/process-resources/src/components/TransitionPopup.svelte +++ /dev/null @@ -1,138 +0,0 @@ - - - -
dispatch('changeContent')}> -
- - { - keyDown(event, 0) - }} - on:mouseover={() => { - elements[0]?.focus() - }} - label={plugin.string.Functions} - props={{ - value: transitions, - onSelect: onTransitionSelect - }} - options={{ component: SelectPopup }} - withHover - /> - {#if state.endAction?.methodId === plugin.method.CreateToDo} -
- - - {/if} - -
-
- - diff --git a/plugins/process-resources/src/components/attributeEditors/ContextSelectorPopup.svelte b/plugins/process-resources/src/components/attributeEditors/ContextSelectorPopup.svelte index 90feb4ea63..f927529c48 100644 --- a/plugins/process-resources/src/components/attributeEditors/ContextSelectorPopup.svelte +++ b/plugins/process-resources/src/components/attributeEditors/ContextSelectorPopup.svelte @@ -13,13 +13,13 @@ // limitations under the License. --> + +{#if ctx !== undefined} + {ctx} +{:else} +
+
+ +
+
+ {#each transitionsFrom as transition (transition._id)} + + {/each} + {#if !readonly} + + {/if} +
+
+
+ + diff --git a/plugins/process-resources/src/components/settings/StatePresenter.svelte b/plugins/process-resources/src/components/settings/StatePresenter.svelte new file mode 100644 index 0000000000..358660b4b2 --- /dev/null +++ b/plugins/process-resources/src/components/settings/StatePresenter.svelte @@ -0,0 +1,33 @@ + + + +{#if state} +
+ {state.title} +
+{/if} diff --git a/plugins/process-resources/src/components/StepEditor.svelte b/plugins/process-resources/src/components/settings/StepEditor.svelte similarity index 88% rename from plugins/process-resources/src/components/StepEditor.svelte rename to plugins/process-resources/src/components/settings/StepEditor.svelte index 6270f1c8ea..c32c4cc956 100644 --- a/plugins/process-resources/src/components/StepEditor.svelte +++ b/plugins/process-resources/src/components/settings/StepEditor.svelte @@ -15,13 +15,12 @@ - + diff --git a/plugins/process-resources/src/components/settings/ToDoParamsEditor.svelte b/plugins/process-resources/src/components/settings/ToDoParamsEditor.svelte new file mode 100644 index 0000000000..e2e7851b0b --- /dev/null +++ b/plugins/process-resources/src/components/settings/ToDoParamsEditor.svelte @@ -0,0 +1,54 @@ + + + + +
+
+ + diff --git a/plugins/process-resources/src/components/settings/TransitionEditor.svelte b/plugins/process-resources/src/components/settings/TransitionEditor.svelte new file mode 100644 index 0000000000..00b4843a8e --- /dev/null +++ b/plugins/process-resources/src/components/settings/TransitionEditor.svelte @@ -0,0 +1,202 @@ + + + +
+
+ + {/if} +
+
+ + {#if !collapsed} + {#each transition.actions as action} + + {/each} + {#if !readonly} +
+
+ + diff --git a/plugins/process-resources/src/components/settings/TransitionPresenter.svelte b/plugins/process-resources/src/components/settings/TransitionPresenter.svelte new file mode 100644 index 0000000000..e1091cc9b0 --- /dev/null +++ b/plugins/process-resources/src/components/settings/TransitionPresenter.svelte @@ -0,0 +1,38 @@ + + + + + {#if transition.to === null} + diff --git a/plugins/process-resources/src/components/settings/TriggerPresenter.svelte b/plugins/process-resources/src/components/settings/TriggerPresenter.svelte new file mode 100644 index 0000000000..ae96fefa6a --- /dev/null +++ b/plugins/process-resources/src/components/settings/TriggerPresenter.svelte @@ -0,0 +1,61 @@ + + + +{#if trigger} + {#if error} + + {/if} +
+ +
+{/if} diff --git a/plugins/process-resources/src/components/UpdateCardEditor.svelte b/plugins/process-resources/src/components/settings/UpdateCardEditor.svelte similarity index 94% rename from plugins/process-resources/src/components/UpdateCardEditor.svelte rename to plugins/process-resources/src/components/settings/UpdateCardEditor.svelte index 5876e470d1..61eb85aea8 100644 --- a/plugins/process-resources/src/components/UpdateCardEditor.svelte +++ b/plugins/process-resources/src/components/settings/UpdateCardEditor.svelte @@ -22,7 +22,6 @@ import { Button, eventToHTMLElement, SelectPopup, showPopup } from '@hcengineering/ui' export let process: Process - export let state: State export let step: Step let params = step.params @@ -90,16 +89,7 @@ } - + {#if possibleAttrs.length > 0}