From ef637aaacf5e5025b2cd976682a33df36e438643 Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@gmail.com>
Date: Fri, 7 Apr 2023 22:53:49 +0700
Subject: [PATCH] TSK-1007: Add comments in talent editor

Fix placement for some Card based dialogs.

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 models/recruit/src/index.ts                   | 12 +++++
 .../src/components/LinkPopup.svelte           |  1 +
 .../components/selectors/IconChooser.svelte   |  1 +
 .../src/components/BitrixConfigure.svelte     |  1 +
 .../src/components/BitrixConnect.svelte       |  1 +
 .../src/components/BitrixImport.svelte        |  1 +
 .../src/components/CreateMapping.svelte       |  2 +-
 .../components/CreateMappingAttribute.svelte  |  1 +
 .../src/components/CreateCard.svelte          |  1 +
 .../src/components/CreateEvent.svelte         |  1 +
 .../src/components/CreateReminder.svelte      |  1 +
 .../src/components/SaveEventReminder.svelte   |  1 +
 .../ConvertDmToPrivateChannel.svelte          |  1 +
 .../src/components/CreateEmployee.svelte      |  1 +
 .../src/components/CreateMember.svelte        |  1 +
 .../src/components/CreateOrganization.svelte  |  1 +
 .../src/components/CreatePerson.svelte        |  1 +
 .../components/EmployeeSetStatusPopup.svelte  |  1 +
 .../src/components/MergeEmployee.svelte       |  1 +
 .../src/components/SelectAvatarPopup.svelte   |  1 +
 .../src/components/CreateDocument.svelte      |  1 +
 .../src/components/Configure.svelte           |  1 +
 .../src/components/CreateDepartment.svelte    |  1 +
 .../src/components/CreateRequest.svelte       |  1 +
 .../src/components/EditRequestType.svelte     |  1 +
 .../schedule/CreatePublicHoliday.svelte       |  1 +
 .../components/schedule/ReportsPopup.svelte   |  1 +
 .../src/components/CreateCategory.svelte      |  1 +
 .../src/components/CreateProduct.svelte       |  1 +
 .../src/components/CreateVariant.svelte       |  1 +
 .../src/components/CreateCustomer.svelte      |  1 +
 .../src/components/CreateLead.svelte          |  1 +
 .../src/components/Applications.svelte        | 49 ++++++++++++++-----
 .../src/components/ApplicationsPopup.svelte   | 21 +++++---
 .../src/components/CreateApplication.svelte   |  1 +
 .../src/components/CreateCandidate.svelte     |  1 +
 .../src/components/CreateVacancy.svelte       |  1 +
 .../src/components/KanbanCard.svelte          | 14 +++++-
 .../src/components/MatchVacancy.svelte        |  1 +
 .../src/components/MoveApplication.svelte     |  1 +
 .../components/review/CreateOpinion.svelte    |  1 +
 .../src/components/review/CreateReview.svelte |  1 +
 .../src/components/review/EditOpinion.svelte  |  1 +
 plugins/recruit-resources/src/plugin.ts       |  3 +-
 .../src/components/CreateAttribute.svelte     |  1 +
 .../src/components/CreateMixin.svelte         |  1 +
 .../src/components/EditAttribute.svelte       |  1 +
 .../src/components/EditClassLabel.svelte      |  1 +
 .../src/components/EditEnum.svelte            |  1 +
 .../src/components/CreateTagElement.svelte    |  1 +
 .../src/components/EditTagElement.svelte      |  1 +
 .../src/components/kanban/KanbanView.svelte   |  2 +-
 .../components/state/StateRefPresenter.svelte |  2 +-
 .../src/components/todos/CreateTodo.svelte    |  1 +
 .../src/components/todos/EditTodo.svelte      |  1 +
 plugins/task-resources/src/index.ts           |  1 +
 .../src/components/Copy.svelte                |  1 +
 .../src/components/EditGroup.svelte           |  1 +
 .../src/components/Move.svelte                |  1 +
 .../components/components/NewComponent.svelte |  1 +
 .../issues/StatusRefPresenter.svelte          |  2 +-
 .../issues/timereport/EstimationPopup.svelte  |  1 +
 .../issues/timereport/ReportsPopup.svelte     |  1 +
 .../timereport/TimeSpendReportPopup.svelte    |  1 +
 .../components/projects/ChangeIdentity.svelte |  1 +
 .../components/projects/CreateProject.svelte  |  1 +
 .../projects/ProjectIconChooser.svelte        |  1 +
 .../src/components/scrums/NewScrum.svelte     |  1 +
 .../sprints/MoveAndDeleteSprintPopup.svelte   |  1 +
 .../src/components/sprints/NewSprint.svelte   |  1 +
 .../templates/CreateIssueTemplate.svelte      |  1 +
 .../src/components/ViewletSetting.svelte      |  1 +
 .../src/components/filter/FilterSave.svelte   |  1 +
 .../status/StatusRefPresenter.svelte          |  2 +-
 74 files changed, 148 insertions(+), 25 deletions(-)

diff --git a/models/recruit/src/index.ts b/models/recruit/src/index.ts
index 906d171f5c..536eb77171 100644
--- a/models/recruit/src/index.ts
+++ b/models/recruit/src/index.ts
@@ -415,6 +415,18 @@ export function createModel (builder: Builder): void {
     recruit.viewlet.VacancyApplicationsShort
   )
 
+  builder.createDoc(
+    view.class.Viewlet,
+    core.space.Model,
+    {
+      attachTo: recruit.class.Applicant,
+      descriptor: view.viewlet.Table,
+      config: ['', '$lookup.space.name', '$lookup.space.$lookup.company', 'state', 'comments', 'doneState'],
+      variant: 'short'
+    },
+    recruit.viewlet.VacancyApplicationsEmbeddeed
+  )
+
   builder.createDoc(
     view.class.Viewlet,
     core.space.Model,
diff --git a/packages/text-editor/src/components/LinkPopup.svelte b/packages/text-editor/src/components/LinkPopup.svelte
index 92d6d3cf9f..e3cfd46b1b 100644
--- a/packages/text-editor/src/components/LinkPopup.svelte
+++ b/packages/text-editor/src/components/LinkPopup.svelte
@@ -39,6 +39,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <EditBox placeholder={linkPlaceholder} bind:value={link} focus />
 </Card>
diff --git a/plugins/automation-resources/src/components/selectors/IconChooser.svelte b/plugins/automation-resources/src/components/selectors/IconChooser.svelte
index 91c115cacf..32e51a3da2 100644
--- a/plugins/automation-resources/src/components/selectors/IconChooser.svelte
+++ b/plugins/automation-resources/src/components/selectors/IconChooser.svelte
@@ -36,6 +36,7 @@
   okLabel={presentation.string.Save}
   okAction={save}
   canSave={icon !== undefined}
+  on:changeContent
   on:close={() => {
     dispatch('close')
   }}
diff --git a/plugins/bitrix-resources/src/components/BitrixConfigure.svelte b/plugins/bitrix-resources/src/components/BitrixConfigure.svelte
index e1fb713165..2f9d8f6eef 100644
--- a/plugins/bitrix-resources/src/components/BitrixConfigure.svelte
+++ b/plugins/bitrix-resources/src/components/BitrixConfigure.svelte
@@ -141,6 +141,7 @@
   okLabel={presentation.string.Ok}
   on:close={() => dispatch('close')}
   fullSize={true}
+  on:changeContent
 >
   <svelte:fragment slot="header">
     {#if profile}
diff --git a/plugins/bitrix-resources/src/components/BitrixConnect.svelte b/plugins/bitrix-resources/src/components/BitrixConnect.svelte
index 878f772107..58c3cb7bc7 100644
--- a/plugins/bitrix-resources/src/components/BitrixConnect.svelte
+++ b/plugins/bitrix-resources/src/components/BitrixConnect.svelte
@@ -38,6 +38,7 @@
   canSave={true}
   okLabel={presentation.string.Ok}
   on:close={() => dispatch('close')}
+  on:changeContent
 >
   <EditBox label={bitrix.string.BitrixTokenUrl} bind:value={url} />
   <svelte:fragment slot="pool" />
diff --git a/plugins/bitrix-resources/src/components/BitrixImport.svelte b/plugins/bitrix-resources/src/components/BitrixImport.svelte
index e78da8a7cd..fbcccb84b6 100644
--- a/plugins/bitrix-resources/src/components/BitrixImport.svelte
+++ b/plugins/bitrix-resources/src/components/BitrixImport.svelte
@@ -51,6 +51,7 @@
   }}
   okLabel={getEmbeddedLabel('Close')}
   on:close
+  on:changeContent
 >
   {#if integration && bitrixClient}
     {#each mappings as mapping}
diff --git a/plugins/bitrix-resources/src/components/CreateMapping.svelte b/plugins/bitrix-resources/src/components/CreateMapping.svelte
index a4eee0cf11..9f9eea9c48 100644
--- a/plugins/bitrix-resources/src/components/CreateMapping.svelte
+++ b/plugins/bitrix-resources/src/components/CreateMapping.svelte
@@ -55,7 +55,7 @@
   )
 </script>
 
-<Card label={bitrix.string.AddMapping} canSave={type !== ''} okAction={save} on:close>
+<Card label={bitrix.string.AddMapping} canSave={type !== ''} okAction={save} on:close on:changeContent>
   <div class="flex">
     <DropdownLabels label={bitrix.string.BitrixEntityType} {items} bind:selected={type} />
     <ObjectBox
diff --git a/plugins/bitrix-resources/src/components/CreateMappingAttribute.svelte b/plugins/bitrix-resources/src/components/CreateMappingAttribute.svelte
index 649ea89360..7fc4cba00a 100644
--- a/plugins/bitrix-resources/src/components/CreateMappingAttribute.svelte
+++ b/plugins/bitrix-resources/src/components/CreateMappingAttribute.svelte
@@ -32,6 +32,7 @@
   okAction={save}
   okLabel={presentation.string.Save}
   on:close
+  on:changeContent
 >
   <svelte:fragment slot="header">
     <Label label={attribute.label} />
diff --git a/plugins/board-resources/src/components/CreateCard.svelte b/plugins/board-resources/src/components/CreateCard.svelte
index 346908d7f0..a6f985596f 100644
--- a/plugins/board-resources/src/components/CreateCard.svelte
+++ b/plugins/board-resources/src/components/CreateCard.svelte
@@ -77,6 +77,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <svelte:fragment slot="header">
     <SpaceSelector _class={board.class.Board} label={board.string.BoardName} bind:space={_space} />
diff --git a/plugins/calendar-resources/src/components/CreateEvent.svelte b/plugins/calendar-resources/src/components/CreateEvent.svelte
index 0394801772..05ad047d07 100644
--- a/plugins/calendar-resources/src/components/CreateEvent.svelte
+++ b/plugins/calendar-resources/src/components/CreateEvent.svelte
@@ -95,6 +95,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <EditBox bind:value={title} placeholder={calendar.string.Title} kind={'large-style'} focus />
   <svelte:fragment slot="pool">
diff --git a/plugins/calendar-resources/src/components/CreateReminder.svelte b/plugins/calendar-resources/src/components/CreateReminder.svelte
index 861b4ec468..d8229d38fa 100644
--- a/plugins/calendar-resources/src/components/CreateReminder.svelte
+++ b/plugins/calendar-resources/src/components/CreateReminder.svelte
@@ -67,6 +67,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <EditBox bind:value={title} placeholder={calendar.string.Title} kind={'large-style'} focus />
   <svelte:fragment slot="pool">
diff --git a/plugins/calendar-resources/src/components/SaveEventReminder.svelte b/plugins/calendar-resources/src/components/SaveEventReminder.svelte
index 3ae208912a..26da8205aa 100644
--- a/plugins/calendar-resources/src/components/SaveEventReminder.svelte
+++ b/plugins/calendar-resources/src/components/SaveEventReminder.svelte
@@ -59,6 +59,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <Grid column={1} rowGap={1.75}>
     <div class="antiComponentBox">
diff --git a/plugins/chunter-resources/src/components/ConvertDmToPrivateChannel.svelte b/plugins/chunter-resources/src/components/ConvertDmToPrivateChannel.svelte
index 480f5e4691..32037d3597 100644
--- a/plugins/chunter-resources/src/components/ConvertDmToPrivateChannel.svelte
+++ b/plugins/chunter-resources/src/components/ConvertDmToPrivateChannel.svelte
@@ -59,6 +59,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <EditBox
     label={chunter.string.ChannelName}
diff --git a/plugins/contact-resources/src/components/CreateEmployee.svelte b/plugins/contact-resources/src/components/CreateEmployee.svelte
index 58dd60adb7..ef807821cf 100644
--- a/plugins/contact-resources/src/components/CreateEmployee.svelte
+++ b/plugins/contact-resources/src/components/CreateEmployee.svelte
@@ -122,6 +122,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <svelte:fragment slot="error">
     {#if matches.length > 0}
diff --git a/plugins/contact-resources/src/components/CreateMember.svelte b/plugins/contact-resources/src/components/CreateMember.svelte
index 51128dfa4b..4e9d07a8a8 100644
--- a/plugins/contact-resources/src/components/CreateMember.svelte
+++ b/plugins/contact-resources/src/components/CreateMember.svelte
@@ -55,6 +55,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <div class="flex-row-center clear-mins">
     <!-- <div class="mr-3">
diff --git a/plugins/contact-resources/src/components/CreateOrganization.svelte b/plugins/contact-resources/src/components/CreateOrganization.svelte
index 81d39ca9ab..641252386a 100644
--- a/plugins/contact-resources/src/components/CreateOrganization.svelte
+++ b/plugins/contact-resources/src/components/CreateOrganization.svelte
@@ -84,6 +84,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <div class="flex-row-center clear-mins">
     <div class="mr-3">
diff --git a/plugins/contact-resources/src/components/CreatePerson.svelte b/plugins/contact-resources/src/components/CreatePerson.svelte
index 31faf7d6ae..993322f64a 100644
--- a/plugins/contact-resources/src/components/CreatePerson.svelte
+++ b/plugins/contact-resources/src/components/CreatePerson.svelte
@@ -78,6 +78,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <svelte:fragment slot="error">
     {#if matches.length > 0}
diff --git a/plugins/contact-resources/src/components/EmployeeSetStatusPopup.svelte b/plugins/contact-resources/src/components/EmployeeSetStatusPopup.svelte
index 6a7c2996f2..3e3c24b3f0 100644
--- a/plugins/contact-resources/src/components/EmployeeSetStatusPopup.svelte
+++ b/plugins/contact-resources/src/components/EmployeeSetStatusPopup.svelte
@@ -41,6 +41,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <Grid column={1} rowGap={1}>
     <EditBox bind:value={statusName} />
diff --git a/plugins/contact-resources/src/components/MergeEmployee.svelte b/plugins/contact-resources/src/components/MergeEmployee.svelte
index af7568dc5b..33cb434138 100644
--- a/plugins/contact-resources/src/components/MergeEmployee.svelte
+++ b/plugins/contact-resources/src/components/MergeEmployee.svelte
@@ -210,6 +210,7 @@
   okAction={merge}
   canSave={targetEmp !== undefined}
   onCancel={() => dispatch('close')}
+  on:changeContent
 >
   <div class="flex-row flex-between">
     <div class="flex-row-center">
diff --git a/plugins/contact-resources/src/components/SelectAvatarPopup.svelte b/plugins/contact-resources/src/components/SelectAvatarPopup.svelte
index 598f507af1..baf0b06fa2 100644
--- a/plugins/contact-resources/src/components/SelectAvatarPopup.svelte
+++ b/plugins/contact-resources/src/components/SelectAvatarPopup.svelte
@@ -159,6 +159,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <div class="flex-row-center">
     <Label label={contact.string.AvatarProvider} />
diff --git a/plugins/document-resources/src/components/CreateDocument.svelte b/plugins/document-resources/src/components/CreateDocument.svelte
index c7fcd2cd53..574504efc8 100644
--- a/plugins/document-resources/src/components/CreateDocument.svelte
+++ b/plugins/document-resources/src/components/CreateDocument.svelte
@@ -104,6 +104,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <div class="flex-row-center clear-mins">
     <div class="mr-3">
diff --git a/plugins/gmail-resources/src/components/Configure.svelte b/plugins/gmail-resources/src/components/Configure.svelte
index 270d16beb0..c8c9a1895f 100644
--- a/plugins/gmail-resources/src/components/Configure.svelte
+++ b/plugins/gmail-resources/src/components/Configure.svelte
@@ -52,6 +52,7 @@
   fullSize
   okLabel={presentation.string.Ok}
   on:close={() => dispatch('close')}
+  on:changeContent
 >
   <div style="width: 25rem;">
     <Grid rowGap={1}>
diff --git a/plugins/hr-resources/src/components/CreateDepartment.svelte b/plugins/hr-resources/src/components/CreateDepartment.svelte
index eb00f24fbd..57cd86a53e 100644
--- a/plugins/hr-resources/src/components/CreateDepartment.svelte
+++ b/plugins/hr-resources/src/components/CreateDepartment.svelte
@@ -58,6 +58,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <div class="flex-row-center clear-mins">
     <div class="mr-3">
diff --git a/plugins/hr-resources/src/components/CreateRequest.svelte b/plugins/hr-resources/src/components/CreateRequest.svelte
index b506fa9442..73e180f89d 100644
--- a/plugins/hr-resources/src/components/CreateRequest.svelte
+++ b/plugins/hr-resources/src/components/CreateRequest.svelte
@@ -87,6 +87,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <svelte:fragment slot="header">
     <EmployeeBox
diff --git a/plugins/hr-resources/src/components/EditRequestType.svelte b/plugins/hr-resources/src/components/EditRequestType.svelte
index c6ce891a50..1b58668032 100644
--- a/plugins/hr-resources/src/components/EditRequestType.svelte
+++ b/plugins/hr-resources/src/components/EditRequestType.svelte
@@ -60,6 +60,7 @@
     on:close={() => {
       dispatch('close')
     }}
+    on:changeContent
   >
     <div class="mr-3">
       {#if typesToChange !== undefined}
diff --git a/plugins/hr-resources/src/components/schedule/CreatePublicHoliday.svelte b/plugins/hr-resources/src/components/schedule/CreatePublicHoliday.svelte
index d3ec655617..d27e8bb6a7 100644
--- a/plugins/hr-resources/src/components/schedule/CreatePublicHoliday.svelte
+++ b/plugins/hr-resources/src/components/schedule/CreatePublicHoliday.svelte
@@ -67,6 +67,7 @@
   okLabel={existingHoliday ? presentation.string.Save : presentation.string.Ok}
   okAction={() => saveHoliday()}
   canSave={true}
+  on:changeContent
 >
   <div class="flex-grow mt-4">
     <EditBox placeholder={hr.string.Title} bind:value={title} kind={'large-style'} focus focusIndex={1} />
diff --git a/plugins/hr-resources/src/components/schedule/ReportsPopup.svelte b/plugins/hr-resources/src/components/schedule/ReportsPopup.svelte
index 95fb875fa1..e0e31992d4 100644
--- a/plugins/hr-resources/src/components/schedule/ReportsPopup.svelte
+++ b/plugins/hr-resources/src/components/schedule/ReportsPopup.svelte
@@ -45,6 +45,7 @@
   on:changeContent
   okAction={() => {}}
   okLabel={presentation.string.Ok}
+  on:changeContent
 >
   <svelte:fragment slot="header">
     <EmployeePresenter value={employee} disableClick />
diff --git a/plugins/inventory-resources/src/components/CreateCategory.svelte b/plugins/inventory-resources/src/components/CreateCategory.svelte
index 6cf08426f9..d9679c5d7f 100644
--- a/plugins/inventory-resources/src/components/CreateCategory.svelte
+++ b/plugins/inventory-resources/src/components/CreateCategory.svelte
@@ -62,6 +62,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <StatusControl slot="error" {status} />
   <div class="flex-row-center clear-mins">
diff --git a/plugins/inventory-resources/src/components/CreateProduct.svelte b/plugins/inventory-resources/src/components/CreateProduct.svelte
index 34e3447cd7..e9a9381218 100644
--- a/plugins/inventory-resources/src/components/CreateProduct.svelte
+++ b/plugins/inventory-resources/src/components/CreateProduct.svelte
@@ -74,6 +74,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <div class="flex-row-center clear-mins">
     <div class="mr-3">
diff --git a/plugins/inventory-resources/src/components/CreateVariant.svelte b/plugins/inventory-resources/src/components/CreateVariant.svelte
index fce840945f..a75171e7d7 100644
--- a/plugins/inventory-resources/src/components/CreateVariant.svelte
+++ b/plugins/inventory-resources/src/components/CreateVariant.svelte
@@ -63,6 +63,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <Grid column={1} rowGap={1.75}>
     <EditBox label={inventory.string.Variant} bind:value={doc.name} placeholder={inventory.string.Variant} focus />
diff --git a/plugins/lead-resources/src/components/CreateCustomer.svelte b/plugins/lead-resources/src/components/CreateCustomer.svelte
index a197e8ab04..0ce1fe1c4a 100644
--- a/plugins/lead-resources/src/components/CreateCustomer.svelte
+++ b/plugins/lead-resources/src/components/CreateCustomer.svelte
@@ -165,6 +165,7 @@
     dispatch('close')
   }}
   bind:createMore
+  on:changeContent
 >
   <svelte:fragment slot="header">
     <Button
diff --git a/plugins/lead-resources/src/components/CreateLead.svelte b/plugins/lead-resources/src/components/CreateLead.svelte
index 6c812f52e0..1696b278ef 100644
--- a/plugins/lead-resources/src/components/CreateLead.svelte
+++ b/plugins/lead-resources/src/components/CreateLead.svelte
@@ -108,6 +108,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <svelte:fragment slot="header">
     <SpaceSelector
diff --git a/plugins/recruit-resources/src/components/Applications.svelte b/plugins/recruit-resources/src/components/Applications.svelte
index 12fc2754d7..a1c4d03107 100644
--- a/plugins/recruit-resources/src/components/Applications.svelte
+++ b/plugins/recruit-resources/src/components/Applications.svelte
@@ -14,9 +14,10 @@
 -->
 <script lang="ts">
   import type { Doc, Ref } from '@hcengineering/core'
+  import { createQuery } from '@hcengineering/presentation'
   import { Button, Icon, IconAdd, Label, resizeObserver, Scroller, showPopup } from '@hcengineering/ui'
-  import { BuildModelKey } from '@hcengineering/view'
-  import { Table } from '@hcengineering/view-resources'
+  import view, { Viewlet, ViewletPreference } from '@hcengineering/view'
+  import { getViewOptions, Table, ViewletSettingButton, viewOptionStore } from '@hcengineering/view-resources'
   import recruit from '../plugin'
   import CreateApplication from './CreateApplication.svelte'
   import IconApplication from './icons/Application.svelte'
@@ -29,13 +30,33 @@
   const createApp = (ev: MouseEvent): void => {
     showPopup(CreateApplication, { candidate: objectId, preserveCandidate: true }, ev.target as HTMLElement)
   }
-  const config: (BuildModelKey | string)[] = [
-    '',
-    '$lookup.space.name',
-    '$lookup.space.$lookup.company',
-    'state',
-    'doneState'
-  ]
+
+  let viewlet: Viewlet | undefined
+  let preference: ViewletPreference | undefined
+  let loading = true
+
+  const viewletQuery = createQuery()
+  $: viewletQuery.query(view.class.Viewlet, { _id: recruit.viewlet.VacancyApplicationsEmbeddeed }, (res) => {
+    ;[viewlet] = res
+  })
+
+  $: viewOptions = viewlet !== undefined ? getViewOptions(viewlet, $viewOptionStore) : undefined
+
+  const preferenceQuery = createQuery()
+
+  $: viewlet &&
+    preferenceQuery.query(
+      view.class.ViewletPreference,
+      {
+        attachedTo: viewlet._id
+      },
+      (res) => {
+        preference = res[0]
+        loading = false
+      },
+      { limit: 1 }
+    )
+
   let wSection: number
 </script>
 
@@ -47,14 +68,17 @@
     <span class="antiSection-header__title">
       <Label label={recruit.string.Applications} />
     </span>
+    {#if viewlet && viewOptions}
+      <ViewletSettingButton bind:viewOptions {viewlet} kind={'transparent'} />
+    {/if}
     <Button id="appls.add" icon={IconAdd} kind={'transparent'} shape={'circle'} on:click={createApp} />
   </div>
-  {#if applications > 0}
+  {#if applications > 0 && viewlet && !loading}
     {#if wSection < 640}
       <Scroller horizontal>
         <Table
           _class={recruit.class.Applicant}
-          {config}
+          config={preference?.config ?? viewlet.config}
           query={{ attachedTo: objectId }}
           loadingProps={{ length: applications }}
         />
@@ -62,7 +86,7 @@
     {:else}
       <Table
         _class={recruit.class.Applicant}
-        {config}
+        config={preference?.config ?? viewlet.config}
         query={{ attachedTo: objectId }}
         loadingProps={{ length: applications }}
       />
@@ -75,6 +99,7 @@
       <span class="dark-color">
         <Label label={recruit.string.NoApplicationsForTalent} />
       </span>
+      <!-- svelte-ignore a11y-click-events-have-key-events -->
       <span class="over-underline content-accent-color" on:click={createApp}>
         <Label label={recruit.string.CreateAnApplication} />
       </span>
diff --git a/plugins/recruit-resources/src/components/ApplicationsPopup.svelte b/plugins/recruit-resources/src/components/ApplicationsPopup.svelte
index 8a4f3a0f6e..4d428acf73 100644
--- a/plugins/recruit-resources/src/components/ApplicationsPopup.svelte
+++ b/plugins/recruit-resources/src/components/ApplicationsPopup.svelte
@@ -30,9 +30,18 @@
     <ObjectPresenter _class={value._class} objectId={value._id} {value} />
   </DocNavLink>
 </div>
-<Table
-  _class={recruit.class.Applicant}
-  config={['', '$lookup.space.name', '$lookup.space.company', 'state', 'doneState']}
-  query={{ attachedTo: value._id }}
-  loadingProps={{ length: value.applications ?? 0 }}
-/>
+<div class="popup-table">
+  <Table
+    _class={recruit.class.Applicant}
+    config={['', '$lookup.space.name', '$lookup.space.company', 'state', 'doneState']}
+    query={{ attachedTo: value._id }}
+    loadingProps={{ length: value.applications ?? 0 }}
+  />
+</div>
+
+<style lang="scss">
+  .popup-table {
+    overflow: auto;
+    max-height: 30rem;
+  }
+</style>
diff --git a/plugins/recruit-resources/src/components/CreateApplication.svelte b/plugins/recruit-resources/src/components/CreateApplication.svelte
index 095fb64955..688055d2bb 100644
--- a/plugins/recruit-resources/src/components/CreateApplication.svelte
+++ b/plugins/recruit-resources/src/components/CreateApplication.svelte
@@ -302,6 +302,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <svelte:fragment slot="title">
     <div class="flex-row-center gap-2">
diff --git a/plugins/recruit-resources/src/components/CreateCandidate.svelte b/plugins/recruit-resources/src/components/CreateCandidate.svelte
index 256ab4937b..f740d875b9 100644
--- a/plugins/recruit-resources/src/components/CreateCandidate.svelte
+++ b/plugins/recruit-resources/src/components/CreateCandidate.svelte
@@ -504,6 +504,7 @@
   }}
   onCancel={showConfirmationDialog}
   bind:createMore
+  on:changeContent
 >
   <svelte:fragment slot="header">
     <Button
diff --git a/plugins/recruit-resources/src/components/CreateVacancy.svelte b/plugins/recruit-resources/src/components/CreateVacancy.svelte
index 627cce7fd9..0d8c1cc515 100644
--- a/plugins/recruit-resources/src/components/CreateVacancy.svelte
+++ b/plugins/recruit-resources/src/components/CreateVacancy.svelte
@@ -240,6 +240,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <div class="flex-row-center clear-mins">
     <div class="mr-3">
diff --git a/plugins/recruit-resources/src/components/KanbanCard.svelte b/plugins/recruit-resources/src/components/KanbanCard.svelte
index 6e1bca5c58..35128bef7d 100644
--- a/plugins/recruit-resources/src/components/KanbanCard.svelte
+++ b/plugins/recruit-resources/src/components/KanbanCard.svelte
@@ -19,9 +19,10 @@
   import { Avatar } from '@hcengineering/contact-resources'
   import { Hierarchy, WithLookup } from '@hcengineering/core'
   import notification from '@hcengineering/notification'
+  import { getClient } from '@hcengineering/presentation'
   import type { Applicant, Candidate } from '@hcengineering/recruit'
   import recruit from '@hcengineering/recruit'
-  import { AssigneePresenter } from '@hcengineering/task-resources'
+  import { AssigneePresenter, StateRefPresenter } from '@hcengineering/task-resources'
   import tracker from '@hcengineering/tracker'
   import { Component, showPanel } from '@hcengineering/ui'
   import view from '@hcengineering/view'
@@ -30,6 +31,9 @@
 
   export let object: WithLookup<Applicant>
   export let dragged: boolean
+  export let groupByKey: string
+
+  const client = getClient()
 
   function showCandidate () {
     showPanel(view.component.EditDoc, object._id, Hierarchy.mixinOrClass(object), 'content')
@@ -109,4 +113,12 @@
       currentSpace={object.space}
     />
   </div>
+  {#if groupByKey !== 'state'}
+    <StateRefPresenter
+      value={object.state}
+      onChange={(state) => {
+        client.update(object, { state })
+      }}
+    />
+  {/if}
 </div>
diff --git a/plugins/recruit-resources/src/components/MatchVacancy.svelte b/plugins/recruit-resources/src/components/MatchVacancy.svelte
index 77e7c79850..8b2edc8c2c 100644
--- a/plugins/recruit-resources/src/components/MatchVacancy.svelte
+++ b/plugins/recruit-resources/src/components/MatchVacancy.svelte
@@ -150,6 +150,7 @@
   on:close
   okAction={() => {}}
   canSave={true}
+  on:changeContent
 >
   <Scroller horizontal>
     <div
diff --git a/plugins/recruit-resources/src/components/MoveApplication.svelte b/plugins/recruit-resources/src/components/MoveApplication.svelte
index 92acbccfd5..ce3a70673e 100644
--- a/plugins/recruit-resources/src/components/MoveApplication.svelte
+++ b/plugins/recruit-resources/src/components/MoveApplication.svelte
@@ -127,6 +127,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <svelte:fragment slot="title">
     <div class="flex-row-center gap-2">
diff --git a/plugins/recruit-resources/src/components/review/CreateOpinion.svelte b/plugins/recruit-resources/src/components/review/CreateOpinion.svelte
index fc871e3349..4b0a7bd841 100644
--- a/plugins/recruit-resources/src/components/review/CreateOpinion.svelte
+++ b/plugins/recruit-resources/src/components/review/CreateOpinion.svelte
@@ -86,6 +86,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <StatusControl slot="error" {status} />
   <EditBox
diff --git a/plugins/recruit-resources/src/components/review/CreateReview.svelte b/plugins/recruit-resources/src/components/review/CreateReview.svelte
index 1291604633..82ac3604da 100644
--- a/plugins/recruit-resources/src/components/review/CreateReview.svelte
+++ b/plugins/recruit-resources/src/components/review/CreateReview.svelte
@@ -152,6 +152,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <StatusControl slot="error" {status} />
   <EditBox placeholder={recruit.string.Title} bind:value={title} kind={'large-style'} focus />
diff --git a/plugins/recruit-resources/src/components/review/EditOpinion.svelte b/plugins/recruit-resources/src/components/review/EditOpinion.svelte
index 977544bed6..830b3f499a 100644
--- a/plugins/recruit-resources/src/components/review/EditOpinion.svelte
+++ b/plugins/recruit-resources/src/components/review/EditOpinion.svelte
@@ -66,6 +66,7 @@
     dispatch('close')
   }}
   okLabel={recruit.string.OpinionSave}
+  on:changeContent
 >
   <EditBox
     label={recruit.string.OpinionValue}
diff --git a/plugins/recruit-resources/src/plugin.ts b/plugins/recruit-resources/src/plugin.ts
index fd2dec5863..afe6bd2d41 100644
--- a/plugins/recruit-resources/src/plugin.ts
+++ b/plugins/recruit-resources/src/plugin.ts
@@ -24,7 +24,8 @@ import { FilterFunction, FilterMode, Viewlet } from '@hcengineering/view'
 
 export default mergeIds(recruitId, recruit, {
   viewlet: {
-    VacancyApplicationsShort: '' as Ref<Viewlet>
+    VacancyApplicationsShort: '' as Ref<Viewlet>,
+    VacancyApplicationsEmbeddeed: '' as Ref<Viewlet>
   },
   status: {
     ApplicationExists: '' as StatusCode,
diff --git a/plugins/setting-resources/src/components/CreateAttribute.svelte b/plugins/setting-resources/src/components/CreateAttribute.svelte
index 6f984a88e5..f2d35692bd 100644
--- a/plugins/setting-resources/src/components/CreateAttribute.svelte
+++ b/plugins/setting-resources/src/components/CreateAttribute.svelte
@@ -102,6 +102,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <div class="mb-2"><EditBox bind:value={name} placeholder={core.string.Name} /></div>
   <div class="flex-col mb-2">
diff --git a/plugins/setting-resources/src/components/CreateMixin.svelte b/plugins/setting-resources/src/components/CreateMixin.svelte
index bb93dcd434..bc8f148434 100644
--- a/plugins/setting-resources/src/components/CreateMixin.svelte
+++ b/plugins/setting-resources/src/components/CreateMixin.svelte
@@ -49,6 +49,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <svelte:fragment slot="header">
     <div class="flex-row-center">
diff --git a/plugins/setting-resources/src/components/EditAttribute.svelte b/plugins/setting-resources/src/components/EditAttribute.svelte
index 4d2562adca..77bf049c13 100644
--- a/plugins/setting-resources/src/components/EditAttribute.svelte
+++ b/plugins/setting-resources/src/components/EditAttribute.svelte
@@ -99,6 +99,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <div class="mb-2"><EditBox bind:value={name} placeholder={core.string.Name} /></div>
   <div class="flex-col mb-2">
diff --git a/plugins/setting-resources/src/components/EditClassLabel.svelte b/plugins/setting-resources/src/components/EditClassLabel.svelte
index b77f1df4bc..c74610df06 100644
--- a/plugins/setting-resources/src/components/EditClassLabel.svelte
+++ b/plugins/setting-resources/src/components/EditClassLabel.svelte
@@ -72,6 +72,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <div class="mb-2">
     <EditBox bind:value={name} placeholder={setting.string.NewClassName} />
diff --git a/plugins/setting-resources/src/components/EditEnum.svelte b/plugins/setting-resources/src/components/EditEnum.svelte
index 650ea7599b..942dc7d2d6 100644
--- a/plugins/setting-resources/src/components/EditEnum.svelte
+++ b/plugins/setting-resources/src/components/EditEnum.svelte
@@ -171,6 +171,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <div on:keydown={onKeydown}>
     <div class="mb-2">
diff --git a/plugins/tags-resources/src/components/CreateTagElement.svelte b/plugins/tags-resources/src/components/CreateTagElement.svelte
index 4f9c71cd5a..79aca66d02 100644
--- a/plugins/tags-resources/src/components/CreateTagElement.svelte
+++ b/plugins/tags-resources/src/components/CreateTagElement.svelte
@@ -108,6 +108,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <div class="flex-row-top clear-mins">
     <div class="mr-3">
diff --git a/plugins/tags-resources/src/components/EditTagElement.svelte b/plugins/tags-resources/src/components/EditTagElement.svelte
index 14a06d029d..4e2a553216 100644
--- a/plugins/tags-resources/src/components/EditTagElement.svelte
+++ b/plugins/tags-resources/src/components/EditTagElement.svelte
@@ -98,6 +98,7 @@
     dispatch('close')
   }}
   okLabel={tags.string.SaveLabel}
+  on:changeContent
 >
   <div class="flex-row-center">
     <div class="flex-col">
diff --git a/plugins/task-resources/src/components/kanban/KanbanView.svelte b/plugins/task-resources/src/components/kanban/KanbanView.svelte
index 02b13fc742..7aef750a69 100644
--- a/plugins/task-resources/src/components/kanban/KanbanView.svelte
+++ b/plugins/task-resources/src/components/kanban/KanbanView.svelte
@@ -257,7 +257,7 @@
       </div>
     </svelte:fragment>
     <svelte:fragment slot="card" let:object let:dragged>
-      <svelte:component this={presenter} {object} {dragged} />
+      <svelte:component this={presenter} {object} {dragged} {groupByKey} />
     </svelte:fragment>
     // eslint-disable-next-line no-undef
     <svelte:fragment slot="doneBar" let:onDone>
diff --git a/plugins/task-resources/src/components/state/StateRefPresenter.svelte b/plugins/task-resources/src/components/state/StateRefPresenter.svelte
index 7df89792ea..1f095354e5 100644
--- a/plugins/task-resources/src/components/state/StateRefPresenter.svelte
+++ b/plugins/task-resources/src/components/state/StateRefPresenter.svelte
@@ -25,7 +25,7 @@
 </script>
 
 {#if value}
-  {@const state = $statusStore.get(typeof value === 'string' ? value : value.values[0]._id)}
+  {@const state = $statusStore.get(typeof value === 'string' ? value : value.values?.[0]?._id)}
   {#if onChange !== undefined && state !== undefined}
     <StateEditor value={state._id} space={state.space} {onChange} kind="link" size="medium" />
   {:else}
diff --git a/plugins/task-resources/src/components/todos/CreateTodo.svelte b/plugins/task-resources/src/components/todos/CreateTodo.svelte
index 38365e82dd..7a76645873 100644
--- a/plugins/task-resources/src/components/todos/CreateTodo.svelte
+++ b/plugins/task-resources/src/components/todos/CreateTodo.svelte
@@ -73,6 +73,7 @@
     dispatch('close')
   }}
   okLabel={plugin.string.TodoSave}
+  on:changeContent
 >
   <Grid column={1} rowGap={1.75}>
     <EditBox
diff --git a/plugins/task-resources/src/components/todos/EditTodo.svelte b/plugins/task-resources/src/components/todos/EditTodo.svelte
index 0ce28e54d4..5930decd40 100644
--- a/plugins/task-resources/src/components/todos/EditTodo.svelte
+++ b/plugins/task-resources/src/components/todos/EditTodo.svelte
@@ -70,6 +70,7 @@
     dispatch('close')
   }}
   okLabel={plugin.string.TodoSave}
+  on:changeContent
 >
   <Grid column={1} rowGap={1.75}>
     <EditBox
diff --git a/plugins/task-resources/src/index.ts b/plugins/task-resources/src/index.ts
index 35290e0945..920f93e6e8 100644
--- a/plugins/task-resources/src/index.ts
+++ b/plugins/task-resources/src/index.ts
@@ -40,6 +40,7 @@ import DoneStateRefPresenter from './components/state/DoneStateRefPresenter.svel
 import StateRefPresenter from './components/state/StateRefPresenter.svelte'
 
 export { default as AssigneePresenter } from './components/AssigneePresenter.svelte'
+export { StateRefPresenter }
 
 async function editStatuses (object: SpaceWithStates): Promise<void> {
   showPopup(EditStatuses, { _id: object._id, spaceClass: object._class }, 'float')
diff --git a/plugins/templates-resources/src/components/Copy.svelte b/plugins/templates-resources/src/components/Copy.svelte
index 54754a0872..09a5019ba4 100644
--- a/plugins/templates-resources/src/components/Copy.svelte
+++ b/plugins/templates-resources/src/components/Copy.svelte
@@ -41,6 +41,7 @@
   on:close={() => dispatch('close')}
   fullSize
   canSave={space !== undefined && value.space !== space}
+  on:changeContent
 >
   <SpaceSelector bind:space _class={templates.class.TemplateCategory} label={templates.string.Copy} />
 </Card>
diff --git a/plugins/templates-resources/src/components/EditGroup.svelte b/plugins/templates-resources/src/components/EditGroup.svelte
index ebb97164c1..b8a2b78bab 100644
--- a/plugins/templates-resources/src/components/EditGroup.svelte
+++ b/plugins/templates-resources/src/components/EditGroup.svelte
@@ -47,6 +47,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <Grid rowGap={1}>
     <Label label={core.string.Name} />
diff --git a/plugins/templates-resources/src/components/Move.svelte b/plugins/templates-resources/src/components/Move.svelte
index eacf126b98..38720f78aa 100644
--- a/plugins/templates-resources/src/components/Move.svelte
+++ b/plugins/templates-resources/src/components/Move.svelte
@@ -41,6 +41,7 @@
   fullSize
   on:close={() => dispatch('close')}
   canSave={space !== value.space}
+  on:changeContent
 >
   <SpaceSelector bind:space _class={templates.class.TemplateCategory} label={view.string.Move} />
 </Card>
diff --git a/plugins/tracker-resources/src/components/components/NewComponent.svelte b/plugins/tracker-resources/src/components/components/NewComponent.svelte
index 43e16148a9..43a5faf910 100644
--- a/plugins/tracker-resources/src/components/components/NewComponent.svelte
+++ b/plugins/tracker-resources/src/components/components/NewComponent.svelte
@@ -59,6 +59,7 @@
   canSave={object.label !== ''}
   okLabel={tracker.string.CreateComponent}
   on:close={() => dispatch('close')}
+  on:changeContent
 >
   <svelte:fragment slot="header">
     <SpaceSelector _class={tracker.class.Project} label={tracker.string.Project} bind:space />
diff --git a/plugins/tracker-resources/src/components/issues/StatusRefPresenter.svelte b/plugins/tracker-resources/src/components/issues/StatusRefPresenter.svelte
index 0091959ca3..ea3e8d1bac 100644
--- a/plugins/tracker-resources/src/components/issues/StatusRefPresenter.svelte
+++ b/plugins/tracker-resources/src/components/issues/StatusRefPresenter.svelte
@@ -22,5 +22,5 @@
 </script>
 
 {#if value}
-  <StatusPresenter value={$statusStore.get(typeof value === 'string' ? value : value.values[0]?._id)} {size} />
+  <StatusPresenter value={$statusStore.get(typeof value === 'string' ? value : value.values?.[0]?._id)} {size} />
 {/if}
diff --git a/plugins/tracker-resources/src/components/issues/timereport/EstimationPopup.svelte b/plugins/tracker-resources/src/components/issues/timereport/EstimationPopup.svelte
index bb2002f9e7..e4e1e156e2 100644
--- a/plugins/tracker-resources/src/components/issues/timereport/EstimationPopup.svelte
+++ b/plugins/tracker-resources/src/components/issues/timereport/EstimationPopup.svelte
@@ -71,6 +71,7 @@
   on:close={() => {
     dispatch('close', null)
   }}
+  on:changeContent
 >
   <svelte:fragment slot="title">
     <div class="flex-row-center">
diff --git a/plugins/tracker-resources/src/components/issues/timereport/ReportsPopup.svelte b/plugins/tracker-resources/src/components/issues/timereport/ReportsPopup.svelte
index 9066b661f1..6f1c6fe322 100644
--- a/plugins/tracker-resources/src/components/issues/timereport/ReportsPopup.svelte
+++ b/plugins/tracker-resources/src/components/issues/timereport/ReportsPopup.svelte
@@ -59,6 +59,7 @@
   on:close
   okAction={() => {}}
   okLabel={presentation.string.Ok}
+  on:changeContent
 >
   <svelte:fragment slot="header">
     <IssuePresenter value={issue} disableClick />
diff --git a/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportPopup.svelte b/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportPopup.svelte
index c07e5a1985..18bc9a70cd 100644
--- a/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportPopup.svelte
+++ b/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportPopup.svelte
@@ -91,6 +91,7 @@
   okAction={create}
   on:close
   okLabel={value === undefined ? presentation.string.Create : presentation.string.Save}
+  on:changeContent
 >
   <svelte:fragment slot="header">
     {#if issue}
diff --git a/plugins/tracker-resources/src/components/projects/ChangeIdentity.svelte b/plugins/tracker-resources/src/components/projects/ChangeIdentity.svelte
index 604b90ad09..bda4f68910 100644
--- a/plugins/tracker-resources/src/components/projects/ChangeIdentity.svelte
+++ b/plugins/tracker-resources/src/components/projects/ChangeIdentity.svelte
@@ -32,6 +32,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <div class="float-left-box">
     <div class="float-left p-2">
diff --git a/plugins/tracker-resources/src/components/projects/CreateProject.svelte b/plugins/tracker-resources/src/components/projects/CreateProject.svelte
index 9e381a7366..30af804db8 100644
--- a/plugins/tracker-resources/src/components/projects/CreateProject.svelte
+++ b/plugins/tracker-resources/src/components/projects/CreateProject.svelte
@@ -171,6 +171,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <div class="flex-row-center flex-between">
     <EditBox
diff --git a/plugins/tracker-resources/src/components/projects/ProjectIconChooser.svelte b/plugins/tracker-resources/src/components/projects/ProjectIconChooser.svelte
index 25d113b20f..659a9e9aa9 100644
--- a/plugins/tracker-resources/src/components/projects/ProjectIconChooser.svelte
+++ b/plugins/tracker-resources/src/components/projects/ProjectIconChooser.svelte
@@ -23,6 +23,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <div class="float-left-box">
     {#each icons as obj}
diff --git a/plugins/tracker-resources/src/components/scrums/NewScrum.svelte b/plugins/tracker-resources/src/components/scrums/NewScrum.svelte
index 823e4d9f65..b29968b44d 100644
--- a/plugins/tracker-resources/src/components/scrums/NewScrum.svelte
+++ b/plugins/tracker-resources/src/components/scrums/NewScrum.svelte
@@ -65,6 +65,7 @@
   {canSave}
   okAction={onSave}
   on:close={() => dispatch('close')}
+  on:changeContent
 >
   <svelte:fragment slot="header">
     <SpaceSelector _class={tracker.class.Project} label={tracker.string.Project} bind:space />
diff --git a/plugins/tracker-resources/src/components/sprints/MoveAndDeleteSprintPopup.svelte b/plugins/tracker-resources/src/components/sprints/MoveAndDeleteSprintPopup.svelte
index 7843caa8ce..10ce150e54 100644
--- a/plugins/tracker-resources/src/components/sprints/MoveAndDeleteSprintPopup.svelte
+++ b/plugins/tracker-resources/src/components/sprints/MoveAndDeleteSprintPopup.svelte
@@ -38,6 +38,7 @@
   okLabel={tracker.string.Delete}
   okAction={() => moveAndDeleteSprint(selectedSprint)}
   on:close
+  on:changeContent
 >
   <SprintPopup
     _class={tracker.class.Sprint}
diff --git a/plugins/tracker-resources/src/components/sprints/NewSprint.svelte b/plugins/tracker-resources/src/components/sprints/NewSprint.svelte
index 83bdfc88d0..1fbb995be7 100644
--- a/plugins/tracker-resources/src/components/sprints/NewSprint.svelte
+++ b/plugins/tracker-resources/src/components/sprints/NewSprint.svelte
@@ -69,6 +69,7 @@
   canSave={object.label !== ''}
   okLabel={tracker.string.CreateSprint}
   on:close={() => dispatch('close')}
+  on:changeContent
 >
   <svelte:fragment slot="header">
     <SpaceSelector _class={tracker.class.Project} label={tracker.string.Project} bind:space />
diff --git a/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte b/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte
index 5f5aefd197..eb8ef6a94c 100644
--- a/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte
+++ b/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte
@@ -129,6 +129,7 @@
     dispatch('close')
   }}
   createMore={false}
+  on:changeContent
 >
   <svelte:fragment slot="header">
     <SpaceSelector _class={tracker.class.Project} label={tracker.string.Project} bind:space={_space} />
diff --git a/plugins/view-resources/src/components/ViewletSetting.svelte b/plugins/view-resources/src/components/ViewletSetting.svelte
index 8c4441256d..336bb0a710 100644
--- a/plugins/view-resources/src/components/ViewletSetting.svelte
+++ b/plugins/view-resources/src/components/ViewletSetting.svelte
@@ -303,6 +303,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   {#if loading}
     <Loading />
diff --git a/plugins/view-resources/src/components/filter/FilterSave.svelte b/plugins/view-resources/src/components/filter/FilterSave.svelte
index 5949f693e7..019697cd21 100644
--- a/plugins/view-resources/src/components/filter/FilterSave.svelte
+++ b/plugins/view-resources/src/components/filter/FilterSave.svelte
@@ -41,6 +41,7 @@
   on:close={() => {
     dispatch('close')
   }}
+  on:changeContent
 >
   <div class="flex-row-center clear-mins">
     <div class="mr-3">
diff --git a/plugins/view-resources/src/components/status/StatusRefPresenter.svelte b/plugins/view-resources/src/components/status/StatusRefPresenter.svelte
index 56d28ff6db..a776db01dd 100644
--- a/plugins/view-resources/src/components/status/StatusRefPresenter.svelte
+++ b/plugins/view-resources/src/components/status/StatusRefPresenter.svelte
@@ -26,5 +26,5 @@
 </script>
 
 {#if value}
-  <StatusPresenter value={$statusStore.get(typeof value === 'string' ? value : value.values[0]._id)} {size} {icon} />
+  <StatusPresenter value={$statusStore.get(typeof value === 'string' ? value : value.values?.[0]._id)} {size} {icon} />
 {/if}