hcengineering · haiodo · Apr 7, 2023 · Apr 7, 2023
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,22 +68,25 @@
     <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 }}
         />
       </Scroller>
     {: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
@@ -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
@@ -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
@@ -504,6 +504,7 @@
   }}
   onCancel={showConfirmationDialog}
   bind:createMore
+  on:changeContent
 >
   <svelte:fragment slot="header">
     <Button