diff --git a/models/process/src/index.ts b/models/process/src/index.ts index 99f34839eb..4a362c3a48 100644 --- a/models/process/src/index.ts +++ b/models/process/src/index.ts @@ -47,6 +47,7 @@ import { type Asset, type IntlString, type Resource } from '@hcengineering/platf import { type CheckFunc, type ContextId, + type CreatedContext, type Execution, type ExecutionContext, type ExecutionError, @@ -206,7 +207,7 @@ export class TMethod extends TDoc implements Method { editor!: AnyComponent - contextClass!: Ref> | null + createdContext!: CreatedContext presenter?: AnyComponent @@ -997,7 +998,7 @@ export function createModel (builder: Builder): void { objectClass: process.class.Process, editor: process.component.SubProcessEditor, presenter: process.component.SubProcessPresenter, - contextClass: process.class.Execution, + createdContext: { _class: process.class.Execution }, requiredParams: ['_id'] }, process.method.RunSubProcess @@ -1011,8 +1012,8 @@ export function createModel (builder: Builder): void { editor: process.component.ToDoEditor, objectClass: process.class.ProcessToDo, presenter: process.component.ToDoPresenter, - contextClass: process.class.ProcessToDo, - requiredParams: ['state', 'title', 'user'], + createdContext: { _class: process.class.ProcessToDo, nameField: 'title' }, + requiredParams: ['title', 'user'], defaultParams: { withRollback: true } @@ -1039,7 +1040,7 @@ export function createModel (builder: Builder): void { label: process.string.UpdateCard, editor: process.component.UpdateCardEditor, objectClass: card.class.Card, - contextClass: null, + createdContext: null, presenter: process.component.UpdateCardPresenter, requiredParams: [] }, @@ -1054,7 +1055,7 @@ export function createModel (builder: Builder): void { objectClass: card.class.Card, editor: process.component.CreateCardEditor, presenter: process.component.CreateCardPresenter, - contextClass: card.class.Card, + createdContext: { _class: card.class.Card }, requiredParams: ['title', '_class'] }, process.method.CreateCard @@ -1068,7 +1069,7 @@ export function createModel (builder: Builder): void { objectClass: core.class.Relation, editor: process.component.AddRelationEditor, presenter: process.component.AddRelationPresenter, - contextClass: core.class.Relation, + createdContext: { _class: core.class.Relation }, requiredParams: ['association', 'direction', '_id'] }, process.method.AddRelation @@ -1082,7 +1083,7 @@ export function createModel (builder: Builder): void { objectClass: card.class.Tag, editor: process.component.AddTagEditor, presenter: process.component.AddTagPresenter, - contextClass: card.class.Card, + createdContext: { _class: card.class.Card }, requiredParams: ['_id'] }, process.method.AddTag diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss index efc6754a2e..e1c0c7c1de 100644 --- a/packages/theme/styles/_layouts.scss +++ b/packages/theme/styles/_layouts.scss @@ -561,6 +561,7 @@ input.search { .mx-2 { margin: 0 .5rem; } .mx-3 { margin: 0 .75rem; } .mx-4 { margin: 0 1rem; } +.mx-8 { margin: 0 2rem; } .mx-10 { margin: 0 2.5rem; } .mx-auto { margin: 0 auto; } .my-1 { margin: .25rem 0; } diff --git a/plugins/process-resources/src/components/contextEditors/ProcessContextPresenter.svelte b/plugins/process-resources/src/components/contextEditors/ProcessContextPresenter.svelte index f63e19fc07..f70468c515 100644 --- a/plugins/process-resources/src/components/contextEditors/ProcessContextPresenter.svelte +++ b/plugins/process-resources/src/components/contextEditors/ProcessContextPresenter.svelte @@ -13,13 +13,15 @@ // limitations under the License. --> -{context.index}: +{#if context.index !== undefined} + {context.index}: +{/if} {#if context.name !== undefined && context.name !== ''} {context.name} {:else} diff --git a/plugins/process-resources/src/components/contextEditors/ProcessContextRawPresenter.svelte b/plugins/process-resources/src/components/contextEditors/ProcessContextRawPresenter.svelte index aac7568f6e..5a383565ee 100644 --- a/plugins/process-resources/src/components/contextEditors/ProcessContextRawPresenter.svelte +++ b/plugins/process-resources/src/components/contextEditors/ProcessContextRawPresenter.svelte @@ -14,10 +14,10 @@ --> -
- - - -
- -{#if possibleAttrs.length > 0} -
-
+ {/if} + diff --git a/plugins/process-resources/src/components/settings/AsideStepEditor.svelte b/plugins/process-resources/src/components/settings/AsideStepEditor.svelte index 6cbd6af9db..ef8770cf11 100644 --- a/plugins/process-resources/src/components/settings/AsideStepEditor.svelte +++ b/plugins/process-resources/src/components/settings/AsideStepEditor.svelte @@ -16,9 +16,9 @@ {/if} - {#if step != null} - - {/if} +
+
+
+ + diff --git a/plugins/process-resources/src/components/settings/AsideTransitionEditor.svelte b/plugins/process-resources/src/components/settings/AsideTransitionEditor.svelte index 97802e0e5f..68d88af5e0 100644 --- a/plugins/process-resources/src/components/settings/AsideTransitionEditor.svelte +++ b/plugins/process-resources/src/components/settings/AsideTransitionEditor.svelte @@ -93,14 +93,10 @@ diff --git a/plugins/process-resources/src/components/settings/ContextFooter.svelte b/plugins/process-resources/src/components/settings/ContextFooter.svelte index 0a9e44c0e6..82157bde90 100644 --- a/plugins/process-resources/src/components/settings/ContextFooter.svelte +++ b/plugins/process-resources/src/components/settings/ContextFooter.svelte @@ -16,31 +16,46 @@ {#if currentContext || resultContext.length > 0} -