From 843ddfeb997dfac626c466bf40fc62713d100350 Mon Sep 17 00:00:00 2001
From: Denis Bykhov <bykhov.denis@gmail.com>
Date: Tue, 26 Dec 2023 11:27:51 +0600
Subject: [PATCH] UBERF-4727 (#4270)

---
 models/tracker/src/presenters.ts              |   4 +
 packages/core/src/server.ts                   |   2 +-
 .../src/components/SpaceSelect.svelte         |   3 +-
 .../src/components/SpaceSelector.svelte       |   4 +-
 .../src/components/SpacesPopup.svelte         |  22 ++-
 .../src/components/CreateApplication.svelte   |   2 +-
 .../src/components/TypeSelector.svelte        |   2 +-
 .../components/state/TypeStatesPopup.svelte   |  27 ++--
 .../taskTypes/TaskKindSelector.svelte         |  27 ++--
 plugins/task-resources/src/plugin.ts          |   1 +
 .../src/components/CreateIssue.svelte         |   4 +-
 .../components/issues/PriorityEditor.svelte   | 101 ++------------
 .../issues/PriorityInlineEditor.svelte        | 128 ++++++++++++++++++
 plugins/tracker-resources/src/index.ts        |   2 +
 plugins/tracker-resources/src/plugin.ts       |   3 +-
 plugins/tracker/src/index.ts                  |   2 +
 server/core/src/storage.ts                    |   6 +-
 server/core/src/types.ts                      |   2 +-
 18 files changed, 219 insertions(+), 123 deletions(-)
 create mode 100644 plugins/tracker-resources/src/components/issues/PriorityInlineEditor.svelte

diff --git a/models/tracker/src/presenters.ts b/models/tracker/src/presenters.ts
index 8de4f9e697..072e7f4e85 100644
--- a/models/tracker/src/presenters.ts
+++ b/models/tracker/src/presenters.ts
@@ -85,6 +85,10 @@ export function definePresenters (builder: Builder): void {
     presenter: tracker.component.PriorityRefPresenter
   })
 
+  builder.mixin(tracker.class.TypeIssuePriority, core.class.Class, view.mixin.AttributeEditor, {
+    inlineEditor: tracker.component.PriorityInlineEditor
+  })
+
   //
   // Project
   //
diff --git a/packages/core/src/server.ts b/packages/core/src/server.ts
index 1e04f31abd..c215b3a829 100644
--- a/packages/core/src/server.ts
+++ b/packages/core/src/server.ts
@@ -76,7 +76,7 @@ export interface ServerStorage extends LowLevelStorage {
   ) => Promise<FindResult<T>>
   searchFulltext: (ctx: MeasureContext, query: SearchQuery, options: SearchOptions) => Promise<SearchResult>
   tx: (ctx: MeasureContext, tx: Tx) => Promise<[TxResult, Tx[]]>
-  apply: (ctx: MeasureContext, tx: Tx[], broadcast: boolean) => Promise<Tx[]>
+  apply: (ctx: MeasureContext, tx: Tx[], broadcast: boolean) => Promise<TxResult>
   close: () => Promise<void>
   loadModel: (last: Timestamp, hash?: string) => Promise<Tx[] | LoadModelResponse>
 }
diff --git a/packages/presentation/src/components/SpaceSelect.svelte b/packages/presentation/src/components/SpaceSelect.svelte
index e39ce7b09f..b5c0d7592d 100644
--- a/packages/presentation/src/components/SpaceSelect.svelte
+++ b/packages/presentation/src/components/SpaceSelect.svelte
@@ -18,6 +18,7 @@
   import { Class, DocumentQuery, FindOptions, Ref, Space } from '@hcengineering/core'
   import { Asset, IntlString } from '@hcengineering/platform'
   import {
+    AnyComponent,
     AnySvelteComponent,
     Button,
     ButtonKind,
@@ -57,7 +58,7 @@
   export let shape: ButtonShape = undefined
   export let width: string | undefined = undefined
   export let allowDeselect = false
-  export let component: AnySvelteComponent | undefined = undefined
+  export let component: AnyComponent | AnySvelteComponent | undefined = undefined
   export let componentProps: any | undefined = undefined
   export let autoSelect = true
   export let readonly = false
diff --git a/packages/presentation/src/components/SpaceSelector.svelte b/packages/presentation/src/components/SpaceSelector.svelte
index 66c693d83f..41f7d757ed 100644
--- a/packages/presentation/src/components/SpaceSelector.svelte
+++ b/packages/presentation/src/components/SpaceSelector.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import { Class, DocumentQuery, FindOptions, Ref, Space } from '@hcengineering/core'
   import { Asset, IntlString } from '@hcengineering/platform'
-  import { AnySvelteComponent, ButtonKind, ButtonShape, ButtonSize } from '@hcengineering/ui'
+  import { AnyComponent, AnySvelteComponent, ButtonKind, ButtonShape, ButtonSize } from '@hcengineering/ui'
   import { ComponentType, createEventDispatcher } from 'svelte'
   import { ObjectCreate } from '../types'
   import SpaceSelect from './SpaceSelect.svelte'
@@ -32,7 +32,7 @@
   export let width: string | undefined = undefined
   export let allowDeselect = false
   export let focus = true
-  export let component: AnySvelteComponent | undefined = undefined
+  export let component: AnyComponent | AnySvelteComponent | undefined = undefined
   export let componentProps: any | undefined = undefined
   export let autoSelect = true
   export let iconWithEmoji: AnySvelteComponent | Asset | ComponentType | undefined = undefined
diff --git a/packages/presentation/src/components/SpacesPopup.svelte b/packages/presentation/src/components/SpacesPopup.svelte
index c6b12dc60a..a4d3d785fb 100644
--- a/packages/presentation/src/components/SpacesPopup.svelte
+++ b/packages/presentation/src/components/SpacesPopup.svelte
@@ -15,8 +15,8 @@
 -->
 <script lang="ts">
   import { Class, Doc, DocumentQuery, FindOptions, Ref, Space, getCurrentAccount } from '@hcengineering/core'
-  import { Asset } from '@hcengineering/platform'
-  import { AnySvelteComponent, ButtonSize } from '@hcengineering/ui'
+  import { Asset, getResource } from '@hcengineering/platform'
+  import { AnyComponent, AnySvelteComponent, ButtonSize } from '@hcengineering/ui'
   import { ObjectCreate } from '../types'
   import { createQuery } from '../utils'
   import DocPopup from './DocPopup.svelte'
@@ -30,7 +30,7 @@
   export let create: ObjectCreate | undefined = undefined
   export let size: ButtonSize = 'small'
   export let allowDeselect = false
-  export let component: AnySvelteComponent | undefined = undefined
+  export let component: AnyComponent | AnySvelteComponent | undefined = undefined
   export let componentProps: any | undefined = undefined
   export let iconWithEmoji: AnySvelteComponent | Asset | ComponentType | undefined = undefined
   export let defaultIcon: AnySvelteComponent | Asset | ComponentType | undefined = undefined
@@ -64,6 +64,18 @@
     spaceOptions
   )
 
+  let is: AnySvelteComponent | undefined = undefined
+
+  $: getComponent(component)
+
+  async function getComponent (component: AnySvelteComponent | AnyComponent | undefined): Promise<void> {
+    if (typeof component === 'string') {
+      is = await getResource(component)
+    } else {
+      is = component
+    }
+  }
+
   let spaces: Space[] = []
 </script>
 
@@ -80,8 +92,8 @@
   on:search={(e) => (search = e.detail)}
 >
   <svelte:fragment slot="item" let:item={space}>
-    {#if component}
-      <svelte:component this={component} {...componentProps} {size} value={space} />
+    {#if is}
+      <svelte:component this={is} {...componentProps} {size} value={space} />
     {:else}
       <SpaceInfo {size} value={space} {iconWithEmoji} {defaultIcon} />
     {/if}
diff --git a/plugins/recruit-resources/src/components/CreateApplication.svelte b/plugins/recruit-resources/src/components/CreateApplication.svelte
index ad5d352f83..24f0271300 100644
--- a/plugins/recruit-resources/src/components/CreateApplication.svelte
+++ b/plugins/recruit-resources/src/components/CreateApplication.svelte
@@ -276,7 +276,7 @@
   <svelte:fragment slot="title">
     <div class="flex-row-center gap-2">
       <Label label={recruit.string.CreateApplication} />
-      <TaskKindSelector projectType={vacancy?.type} bind:taskType={kind} baseClass={recruit.class.Applicant} />
+      <TaskKindSelector projectType={vacancy?.type} bind:value={kind} baseClass={recruit.class.Applicant} />
     </div>
   </svelte:fragment>
   <StatusControl slot="error" {status} />
diff --git a/plugins/task-resources/src/components/TypeSelector.svelte b/plugins/task-resources/src/components/TypeSelector.svelte
index 9398b59468..739ccfccd8 100644
--- a/plugins/task-resources/src/components/TypeSelector.svelte
+++ b/plugins/task-resources/src/components/TypeSelector.svelte
@@ -59,5 +59,5 @@
   />
 {/if}
 {#if !allTypes}
-  <TaskKindSelector {baseClass} projectType={$selectedTypeStore} bind:taskType={$selectedTaskTypeStore} />
+  <TaskKindSelector {baseClass} projectType={$selectedTypeStore} bind:value={$selectedTaskTypeStore} />
 {/if}
diff --git a/plugins/task-resources/src/components/state/TypeStatesPopup.svelte b/plugins/task-resources/src/components/state/TypeStatesPopup.svelte
index cee388bdfa..d51767dc39 100644
--- a/plugins/task-resources/src/components/state/TypeStatesPopup.svelte
+++ b/plugins/task-resources/src/components/state/TypeStatesPopup.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import core, { IdMap, Ref, Status, StatusCategory, toIdMap } from '@hcengineering/core'
   import { createQuery } from '@hcengineering/presentation'
-  import { ProjectType } from '@hcengineering/task'
+  import { ProjectType, TaskType } from '@hcengineering/task'
   import {
     ColorDefinition,
     getColorNumberByText,
@@ -28,13 +28,24 @@
   import { typeStore } from '../..'
 
   export let space: Ref<ProjectType>
+  export let taskType: TaskType | undefined = undefined
+
+  $: states = getStates($statusStore.byId, type, taskType)
+
+  function getStates (
+    statusStore: IdMap<Status>,
+    type: ProjectType | undefined,
+    taskType: TaskType | undefined
+  ): Status[] {
+    if (type === undefined) return []
+
+    let res = type.statuses.map((p) => statusStore.get(p._id)).filter((p) => p !== undefined) as Status[]
+    if (taskType !== undefined) {
+      res = res.filter((p) => taskType.statuses.includes(p._id))
+    }
+    return res
+  }
 
-  $: states = type
-    ? ($typeStore
-        .get(type._id)
-        ?.statuses?.map((p) => $statusStore.byId.get(p._id))
-        .filter((p) => p !== undefined) as Status[]) ?? []
-    : []
   const dispatch = createEventDispatcher()
 
   function getColor (state: Status, type: ProjectType | undefined, categories: IdMap<StatusCategory>): ColorDefinition {
@@ -51,7 +62,7 @@
   })
 
   let type: ProjectType | undefined = undefined
-  type = $typeStore.get(space)
+  $: type = $typeStore.get(space)
 </script>
 
 <div class="selectPopup" use:resizeObserver={() => dispatch('changeContent')}>
diff --git a/plugins/task-resources/src/components/taskTypes/TaskKindSelector.svelte b/plugins/task-resources/src/components/taskTypes/TaskKindSelector.svelte
index d3d94bb1b7..e4a3da4825 100644
--- a/plugins/task-resources/src/components/taskTypes/TaskKindSelector.svelte
+++ b/plugins/task-resources/src/components/taskTypes/TaskKindSelector.svelte
@@ -3,11 +3,11 @@
   import { getClient } from '@hcengineering/presentation'
   import task, { ProjectType, TaskType } from '@hcengineering/task'
   import { DropdownLabels } from '@hcengineering/ui'
-  import { onDestroy } from 'svelte'
+  import { createEventDispatcher, onDestroy } from 'svelte'
   import { selectedTaskTypeStore, taskTypeStore } from '../..'
 
+  export let value: Ref<TaskType> | undefined
   export let projectType: Ref<ProjectType> | undefined
-  export let taskType: Ref<TaskType> | undefined
   export let focusIndex: number = -1
   export let baseClass: Ref<Class<Doc>> | undefined = undefined
   export let allTypes = false
@@ -25,19 +25,30 @@
     .map((it) => ({ id: it._id, label: it.name }))
 
   $: if (
-    (taskType === undefined && items.length > 0) ||
-    (items.length > 0 && items.find((it) => it.id === taskType) === undefined)
+    (value === undefined && items.length > 0) ||
+    (items.length > 0 && items.find((it) => it.id === value) === undefined)
   ) {
-    taskType = items[0].id
+    value = items[0].id
   }
 
   onDestroy(() => {
     $selectedTaskTypeStore = undefined
   })
+
+  const dispatch = createEventDispatcher()
+
+  function change () {
+    dispatch('change', value)
+  }
 </script>
 
 {#if projectType !== undefined && items.length > 1}
-  <div class="p-1">
-    <DropdownLabels {focusIndex} kind={'regular'} {items} bind:selected={taskType} enableSearch={false} />
-  </div>
+  <DropdownLabels
+    {focusIndex}
+    kind={'regular'}
+    {items}
+    bind:selected={value}
+    enableSearch={false}
+    on:selected={change}
+  />
 {/if}
diff --git a/plugins/task-resources/src/plugin.ts b/plugins/task-resources/src/plugin.ts
index e2f4726967..fb6a80564c 100644
--- a/plugins/task-resources/src/plugin.ts
+++ b/plugins/task-resources/src/plugin.ts
@@ -81,6 +81,7 @@ export default mergeIds(taskId, task, {
     AssigneeRequired: '' as IntlString
   },
   component: {
+    TaskKindSelector: '' as AnyComponent,
     StatusFilter: '' as AnyComponent,
     TodoStatePresenter: '' as AnyComponent,
     AssignedTasks: '' as AnyComponent,
diff --git a/plugins/tracker-resources/src/components/CreateIssue.svelte b/plugins/tracker-resources/src/components/CreateIssue.svelte
index 276c520eeb..ecb93cb535 100644
--- a/plugins/tracker-resources/src/components/CreateIssue.svelte
+++ b/plugins/tracker-resources/src/components/CreateIssue.svelte
@@ -635,11 +635,11 @@
     <DocCreateExtComponent manager={docCreateManager} kind={'header'} space={currentProject} props={extraProps} />
   </svelte:fragment>
   <svelte:fragment slot="title" let:label>
-    <div class="flex-row-center gap-1">
+    <div class="flex-row-center gap-2">
       <div class="mr-2">
         <Label {label} />
       </div>
-      <TaskKindSelector projectType={project?.type} bind:taskType={kind} baseClass={tracker.class.Issue} />
+      <TaskKindSelector projectType={project?.type} bind:value={kind} baseClass={tracker.class.Issue} />
       {#if relatedTo}
         <div class="lower mr-2">
           <Label label={tracker.string.RelatedTo} />
diff --git a/plugins/tracker-resources/src/components/issues/PriorityEditor.svelte b/plugins/tracker-resources/src/components/issues/PriorityEditor.svelte
index 9a9887e86a..04e9be3491 100644
--- a/plugins/tracker-resources/src/components/issues/PriorityEditor.svelte
+++ b/plugins/tracker-resources/src/components/issues/PriorityEditor.svelte
@@ -16,19 +16,9 @@
   import { AttachedData } from '@hcengineering/core'
   import { getClient } from '@hcengineering/presentation'
   import { Issue, IssueDraft, IssuePriority, IssueTemplateData } from '@hcengineering/tracker'
-  import {
-    Button,
-    ButtonKind,
-    ButtonSize,
-    eventToHTMLElement,
-    Icon,
-    Label,
-    SelectPopup,
-    showPopup
-  } from '@hcengineering/ui'
+  import { ButtonKind, ButtonSize } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
-  import tracker from '../../plugin'
-  import { defaultPriorities, issuePriorities } from '../../utils'
+  import PriorityInlineEditor from './PriorityInlineEditor.svelte'
 
   export let value: Issue | AttachedData<Issue> | IssueTemplateData | IssueDraft
   export let isEditable: boolean = true
@@ -44,21 +34,6 @@
   const dispatch = createEventDispatcher()
   $: selectedPriority = value.priority
 
-  const handlePriorityEditorOpened = (event: MouseEvent) => {
-    event.stopPropagation()
-
-    if (!isEditable) {
-      return
-    }
-
-    showPopup(
-      SelectPopup,
-      { value: prioritiesInfo, placeholder: tracker.string.SetPriority, searchable: true },
-      eventToHTMLElement(event),
-      changePriority
-    )
-  }
-
   const changePriority = async (newPriority: IssuePriority | undefined) => {
     if (!isEditable || newPriority === undefined || value.priority === newPriority) {
       return
@@ -71,66 +46,16 @@
       await client.update(value, { priority: newPriority })
     }
   }
-
-  $: prioritiesInfo = defaultPriorities.map((p) => {
-    return {
-      id: p,
-      isSelected: selectedPriority === p,
-      ...issuePriorities[p]
-    }
-  })
 </script>
 
-{#if value}
-  {#if kind === 'list' || kind === 'list-header'}
-    <!-- svelte-ignore a11y-click-events-have-key-events -->
-    <!-- svelte-ignore a11y-no-static-element-interactions -->
-    <div class="priority-container" class:cursor-pointer={isEditable} on:click={handlePriorityEditorOpened}>
-      <div class="icon">
-        {#if issuePriorities[value.priority]?.icon}<Icon icon={issuePriorities[value.priority]?.icon} {size} />{/if}
-      </div>
-      {#if shouldShowLabel}
-        <span class="{kind === 'list' ? 'ml-2 text-md' : 'ml-3 text-base'} overflow-label disabled content-color">
-          <Label label={issuePriorities[value.priority]?.label} />
-        </span>
-      {/if}
-    </div>
-  {:else}
-    <Button
-      showTooltip={isEditable ? { label: tracker.string.SetPriority } : undefined}
-      label={shouldShowLabel ? issuePriorities[value.priority]?.label : undefined}
-      icon={issuePriorities[value.priority]?.icon}
-      {justify}
-      {focusIndex}
-      {width}
-      {size}
-      {kind}
-      disabled={!isEditable}
-      on:click={handlePriorityEditorOpened}
-    />
-  {/if}
-{/if}
-
-<style lang="scss">
-  .priority-container {
-    display: flex;
-    align-items: center;
-    flex-shrink: 0;
-    min-width: 0;
-
-    .icon {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      flex-shrink: 0;
-      width: 1rem;
-      height: 1rem;
-      color: var(--theme-caption-color);
-    }
-    &:hover {
-      .icon {
-        color: var(--theme-caption-color) !important;
-      }
-    }
-  }
-</style>
+<PriorityInlineEditor
+  {kind}
+  {size}
+  {justify}
+  {width}
+  {focusIndex}
+  {shouldShowLabel}
+  {isEditable}
+  bind:value={selectedPriority}
+  on:change={(e) => changePriority(e.detail)}
+/>
diff --git a/plugins/tracker-resources/src/components/issues/PriorityInlineEditor.svelte b/plugins/tracker-resources/src/components/issues/PriorityInlineEditor.svelte
new file mode 100644
index 0000000000..25a4d05615
--- /dev/null
+++ b/plugins/tracker-resources/src/components/issues/PriorityInlineEditor.svelte
@@ -0,0 +1,128 @@
+<!--
+// Copyright © 2022 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 { IssuePriority } from '@hcengineering/tracker'
+  import {
+    Button,
+    ButtonKind,
+    ButtonSize,
+    Icon,
+    Label,
+    SelectPopup,
+    eventToHTMLElement,
+    showPopup
+  } from '@hcengineering/ui'
+  import { createEventDispatcher } from 'svelte'
+  import tracker from '../../plugin'
+  import { defaultPriorities, issuePriorities } from '../../utils'
+
+  export let value: IssuePriority = IssuePriority.NoPriority
+  export let isEditable: boolean = true
+  export let shouldShowLabel: boolean = true
+
+  export let kind: ButtonKind = 'no-border'
+  export let size: ButtonSize = 'small'
+  export let justify: 'left' | 'center' = 'left'
+  export let width: string | undefined = 'min-content'
+  export let focusIndex: number | undefined = undefined
+  export let onChange: (value: IssuePriority) => void = () => {}
+
+  const dispatch = createEventDispatcher()
+
+  const handlePriorityEditorOpened = (event: MouseEvent) => {
+    event.stopPropagation()
+
+    if (!isEditable) {
+      return
+    }
+
+    showPopup(
+      SelectPopup,
+      { value: prioritiesInfo, placeholder: tracker.string.SetPriority, searchable: true },
+      eventToHTMLElement(event),
+      changePriority
+    )
+  }
+
+  const changePriority = async (newPriority: IssuePriority | undefined) => {
+    if (!isEditable || newPriority === undefined || value === newPriority) {
+      return
+    }
+
+    value = newPriority
+    dispatch('change', newPriority)
+    onChange(newPriority)
+  }
+
+  $: prioritiesInfo = defaultPriorities.map((p) => {
+    return {
+      id: p,
+      isSelected: value === p,
+      ...issuePriorities[p]
+    }
+  })
+</script>
+
+{#if kind === 'list' || kind === 'list-header'}
+  <!-- svelte-ignore a11y-click-events-have-key-events -->
+  <!-- svelte-ignore a11y-no-static-element-interactions -->
+  <div class="priority-container" class:cursor-pointer={isEditable} on:click={handlePriorityEditorOpened}>
+    <div class="icon">
+      {#if issuePriorities[value]?.icon}<Icon icon={issuePriorities[value]?.icon} {size} />{/if}
+    </div>
+    {#if shouldShowLabel}
+      <span class="{kind === 'list' ? 'ml-2 text-md' : 'ml-3 text-base'} overflow-label disabled content-color">
+        <Label label={issuePriorities[value]?.label} />
+      </span>
+    {/if}
+  </div>
+{:else}
+  <Button
+    showTooltip={isEditable ? { label: tracker.string.SetPriority } : undefined}
+    label={shouldShowLabel ? issuePriorities[value]?.label : undefined}
+    icon={issuePriorities[value]?.icon}
+    {justify}
+    {focusIndex}
+    {width}
+    {size}
+    {kind}
+    disabled={!isEditable}
+    on:click={handlePriorityEditorOpened}
+  />
+{/if}
+
+<style lang="scss">
+  .priority-container {
+    display: flex;
+    align-items: center;
+    flex-shrink: 0;
+    min-width: 0;
+
+    .icon {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      flex-shrink: 0;
+      width: 1rem;
+      height: 1rem;
+      color: var(--theme-caption-color);
+    }
+    &:hover {
+      .icon {
+        color: var(--theme-caption-color) !important;
+      }
+    }
+  }
+</style>
diff --git a/plugins/tracker-resources/src/index.ts b/plugins/tracker-resources/src/index.ts
index d262570834..052689c1f6 100644
--- a/plugins/tracker-resources/src/index.ts
+++ b/plugins/tracker-resources/src/index.ts
@@ -58,6 +58,7 @@ import KanbanView from './components/issues/KanbanView.svelte'
 import ModificationDatePresenter from './components/issues/ModificationDatePresenter.svelte'
 import NotificationIssuePresenter from './components/issues/NotificationIssuePresenter.svelte'
 import PriorityEditor from './components/issues/PriorityEditor.svelte'
+import PriorityInlineEditor from './components/issues/PriorityInlineEditor.svelte'
 import PriorityFilterValuePresenter from './components/issues/PriorityFilterValuePresenter.svelte'
 import PriorityPresenter from './components/issues/PriorityPresenter.svelte'
 import PriorityRefPresenter from './components/issues/PriorityRefPresenter.svelte'
@@ -446,6 +447,7 @@ export default async (): Promise<Resources> => ({
     ModificationDatePresenter,
     PriorityPresenter,
     PriorityEditor,
+    PriorityInlineEditor,
     PriorityRefPresenter,
     MilestoneRefPresenter,
     ComponentEditor,
diff --git a/plugins/tracker-resources/src/plugin.ts b/plugins/tracker-resources/src/plugin.ts
index bec94b813a..bbbd7b46ea 100644
--- a/plugins/tracker-resources/src/plugin.ts
+++ b/plugins/tracker-resources/src/plugin.ts
@@ -85,7 +85,6 @@ export default mergeIds(trackerId, tracker, {
     NewIssuePlaceholder: '' as IntlString,
     ResumeDraft: '' as IntlString,
     NewSubIssue: '' as IntlString,
-    Project: '' as IntlString,
     SelectIssue: '' as IntlString,
     SelectProject: '' as IntlString,
     SaveIssue: '' as IntlString,
@@ -327,6 +326,7 @@ export default mergeIds(trackerId, tracker, {
     ProjectFilterValuePresenter: '' as AnyComponent,
     ComponentFilterValuePresenter: '' as AnyComponent,
     PriorityEditor: '' as AnyComponent,
+    PriorityInlineEditor: '' as AnyComponent,
     PriorityRefPresenter: '' as AnyComponent,
     PriorityIconPresenter: '' as AnyComponent,
     ComponentEditor: '' as AnyComponent,
@@ -339,7 +339,6 @@ export default mergeIds(trackerId, tracker, {
     EditIssueTemplate: '' as AnyComponent,
     CreateProject: '' as AnyComponent,
     ProjectSpacePresenter: '' as AnyComponent,
-    ProjectPresenter: '' as AnyComponent,
     NewIssueHeader: '' as AnyComponent,
     IconPresenter: '' as AnyComponent,
     LeadPresenter: '' as AnyComponent,
diff --git a/plugins/tracker/src/index.ts b/plugins/tracker/src/index.ts
index 789f477e2f..e395113472 100644
--- a/plugins/tracker/src/index.ts
+++ b/plugins/tracker/src/index.ts
@@ -426,6 +426,7 @@ const pluginState = plugin(trackerId, {
     RelatedIssueTemplates: '' as AnyComponent,
     EditIssue: '' as AnyComponent,
     CreateIssue: '' as AnyComponent,
+    ProjectPresenter: '' as AnyComponent,
     CreateIssueTemplate: '' as AnyComponent
   },
   attribute: {
@@ -528,6 +529,7 @@ const pluginState = plugin(trackerId, {
     IssueNotificationChangedProperty: '' as IntlString,
     IssueNotificationMessage: '' as IntlString,
     IssueAssigneedToYou: '' as IntlString,
+    Project: '' as IntlString,
     RelatedIssues: '' as IntlString
   },
   extensions: {
diff --git a/server/core/src/storage.ts b/server/core/src/storage.ts
index ad202d131e..a41422284e 100644
--- a/server/core/src/storage.ts
+++ b/server/core/src/storage.ts
@@ -575,7 +575,7 @@ class TServerStorage implements ServerStorage {
       modelDb: this.modelDb,
       hierarchy: this.hierarchy,
       apply: async (tx, broadcast) => {
-        await this.apply(ctx, tx, broadcast)
+        return await this.apply(ctx, tx, broadcast)
       }
     }
     const triggers = await ctx.with('process-triggers', {}, async (ctx) => {
@@ -654,7 +654,7 @@ class TServerStorage implements ServerStorage {
     return { passed, onEnd }
   }
 
-  async apply (ctx: MeasureContext, txes: Tx[], broadcast: boolean): Promise<Tx[]> {
+  async apply (ctx: MeasureContext, txes: Tx[], broadcast: boolean): Promise<TxResult> {
     const result = await this.processTxes(ctx, txes)
     let derived: Tx[] = []
 
@@ -664,7 +664,7 @@ class TServerStorage implements ServerStorage {
       this.options?.broadcast?.([...txes, ...derived])
     }
 
-    return [...txes, ...derived]
+    return result[0]
   }
 
   fillTxes (txes: Tx[], txToStore: Tx[], modelTx: Tx[], txToProcess: Tx[], applyTxes: Tx[]): void {
diff --git a/server/core/src/types.ts b/server/core/src/types.ts
index 89d8e09c78..b3cf6aa717 100644
--- a/server/core/src/types.ts
+++ b/server/core/src/types.ts
@@ -121,7 +121,7 @@ export interface TriggerControl {
   fx: (f: () => Promise<void>) => void
 
   // Bulk operations in case trigger require some
-  apply: (tx: Tx[], broadcast: boolean) => Promise<void>
+  apply: (tx: Tx[], broadcast: boolean) => Promise<TxResult>
 }
 
 /**