From a58d0d937481982803af232ca12c94896f46fc66 Mon Sep 17 00:00:00 2001
From: Denis Bykhov <80476319+BykhovDenis@users.noreply.github.com>
Date: Fri, 6 May 2022 13:01:17 +0600
Subject: [PATCH] Tasks custom attributes hot fix (#1667)

Signed-off-by: Denis Bykhov <80476319+BykhovDenis@users.noreply.github.com>
---
 .../task-resources/src/components/TaskHeader.svelte | 13 +++++++++----
 .../view-resources/src/components/EditDoc.svelte    |  6 +++++-
 plugins/view-resources/src/index.ts                 |  3 ++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/plugins/task-resources/src/components/TaskHeader.svelte b/plugins/task-resources/src/components/TaskHeader.svelte
index 190a2586a3..31fb9982f1 100644
--- a/plugins/task-resources/src/components/TaskHeader.svelte
+++ b/plugins/task-resources/src/components/TaskHeader.svelte
@@ -15,14 +15,17 @@
 -->
 <script lang="ts">
   import contact from '@anticrm/contact'
-  import core, { Class, Doc, Ref, RefTo } from '@anticrm/core'
+  import core, { Class, Doc, Mixin, Ref, RefTo } from '@anticrm/core'
   import { AttributesBar, getClient, KeyedAttribute, UserBox } from '@anticrm/presentation'
   import { Label } from '@anticrm/ui'
   import { Task } from '@anticrm/task'
   import task from '../plugin'
+  import { DocAttributeBar } from '@anticrm/view-resources'
 
   export let object: Task
   export let keys: KeyedAttribute[]
+  export let mixins: Mixin<Doc>[]
+  export let ignoreKeys: string[]
   export let vertical: boolean = false
 
   const client = getClient()
@@ -51,7 +54,9 @@
     return contact.class.Employee
   }
 
-  $: filtredKeys = keys.filter((p) => p.key !== 'state' && p.key !== 'assignee' && p.key !== 'doneState') // todo
+  const taskKeys = ['state', 'assignee', 'doneState']
+
+  $: filtredKeys = keys.filter((p) => !taskKeys.includes(p.key)) // todo
 </script>
 
 {#if !vertical}
@@ -73,7 +78,7 @@
     <AttributesBar {object} keys={['doneState', 'state']} showHeader={false} />
   </div>
 {:else}
-  <div class="task-attr-prop">
+  <div class="task-attr-prop mb-4">
     <span class="fs-bold"><Label label={task.string.TaskAssignee} /></span>
     <UserBox
       _class={getAssigneeClass(object)}
@@ -88,9 +93,9 @@
     />
     <div style:grid-column={'1/3'}>
       <AttributesBar {object} keys={['doneState', 'state']} vertical />
-      <AttributesBar {object} keys={filtredKeys} vertical />
     </div>
   </div>
+  <DocAttributeBar {object} ignoreKeys={[...ignoreKeys, ...taskKeys]} {mixins} on:update />
 {/if}
 
 <style lang="scss">
diff --git a/plugins/view-resources/src/components/EditDoc.svelte b/plugins/view-resources/src/components/EditDoc.svelte
index 230af00bfb..f86c54dddb 100644
--- a/plugins/view-resources/src/components/EditDoc.svelte
+++ b/plugins/view-resources/src/components/EditDoc.svelte
@@ -240,7 +240,11 @@
     <svelte:fragment slot="attributes" let:direction={dir}>
       {#if !headerLoading}
         {#if headerEditor !== undefined}
-          <Component is={headerEditor} props={{ object, keys, vertical: dir === 'column' }} />
+          <Component
+            is={headerEditor}
+            props={{ object, keys, mixins, ignoreKeys, vertical: dir === 'column' }}
+            on:update={updateKeys}
+          />
         {:else if dir === 'column'}
           <DocAttributeBar {object} {mixins} {ignoreKeys} on:update={updateKeys} />
         {:else}
diff --git a/plugins/view-resources/src/index.ts b/plugins/view-resources/src/index.ts
index ad9ce527a4..4b0a370394 100644
--- a/plugins/view-resources/src/index.ts
+++ b/plugins/view-resources/src/index.ts
@@ -43,6 +43,7 @@ import StringTypeEditor from './components/typeEditors/StringTypeEditor.svelte'
 import BooleanTypeEditor from './components/typeEditors/BooleanTypeEditor.svelte'
 import DateTypeEditor from './components/typeEditors/DateTypeEditor.svelte'
 import NumberTypeEditor from './components/typeEditors/NumberTypeEditor.svelte'
+import DocAttributeBar from './components/DocAttributeBar.svelte'
 
 export { getActions } from './actions'
 export { default as ActionContext } from './components/ActionContext.svelte'
@@ -53,7 +54,7 @@ export { default as LinkPresenter } from './components/LinkPresenter.svelte'
 export * from './context'
 export * from './selection'
 export { buildModel, getCollectionCounter, getObjectPresenter, LoadingProps } from './utils'
-export { Table, TableView, EditDoc, ColorsPopup, Menu, SpacePresenter, UpDownNavigator }
+export { Table, TableView, DocAttributeBar, EditDoc, ColorsPopup, Menu, SpacePresenter, UpDownNavigator }
 
 export default async (): Promise<Resources> => ({
   actionImpl: actionImpl,