Board: Update board card model (#1329)

Signed-off-by: Anna No <anna.no@xored.com>

models/board/src/index.ts

@@ -15,10 +15,10 @@
 //
 
 // To help typescript locate view plugin properly
-import type { Board, Card, CardAction } from '@anticrm/board'
+import type { Board, Card, CardAction, CardDate, CardLabel } from '@anticrm/board'
 import type { Employee } from '@anticrm/contact'
-import { Client, Doc, DOMAIN_MODEL, FindOptions, IndexKind, Ref } from '@anticrm/core'
-import { Builder, Collection, Index, Model, Prop, TypeMarkup, TypeRef, TypeString, UX } from '@anticrm/model'
+import { TxOperations as Client, Doc, DOMAIN_MODEL, FindOptions, IndexKind, Ref } from '@anticrm/core'
+import { Builder, Collection, Index, Model, Prop, TypeBoolean, TypeMarkup, TypeRef, TypeString, UX } from '@anticrm/model'
 import attachment from '@anticrm/model-attachment'
 import chunter from '@anticrm/model-chunter'
 import contact from '@anticrm/model-contact'
@@ -27,7 +27,7 @@ import task, { TSpaceWithStates, TTask } from '@anticrm/model-task'
 import view from '@anticrm/model-view'
 import workbench from '@anticrm/model-workbench'
 import { Asset, IntlString, Resource } from '@anticrm/platform'
-import type {} from '@anticrm/view'
+import type { AnyComponent } from '@anticrm/ui'
 import board from './plugin'
 
 @Model(board.class.Board, task.class.SpaceWithStates)
@@ -44,13 +44,21 @@ export class TCard extends TTask implements Card {
   @Index(IndexKind.FullText)
   title!: string
 
+  @Prop(TypeBoolean(), board.string.IsArchived)
+  isArchived?: boolean
+
+  date?: CardDate
+
   @Prop(TypeMarkup(), board.string.Description)
   @Index(IndexKind.FullText)
   description!: string
 
+  @Prop(Collection(board.class.CardLabel), board.string.Labels)
+  labels?: Ref<CardLabel>[]
+
   @Prop(TypeString(), board.string.Location)
   @Index(IndexKind.FullText)
-  location!: string
+  location?: string
 
   @Prop(Collection(chunter.class.Comment), chunter.string.Comments)
   comments?: number
@@ -62,15 +70,16 @@ export class TCard extends TTask implements Card {
   declare assignee: Ref<Employee> | null
 
   @Prop(Collection(contact.class.Employee), board.string.Members)
-  members!: Ref<Employee>[]
+  members?: Ref<Employee>[]
 }
 
 @Model(board.class.CardAction, core.class.Doc, DOMAIN_MODEL)
 export class TCardAction extends TDoc implements CardAction {
+  component?: AnyComponent
   hint?: IntlString
   icon!: Asset
   isInline?: boolean
-  isTransparent?: boolean
+  kind?: 'primary' | 'secondary' | 'no-border' | 'transparent' | 'dangerous'
   label!: IntlString
   position!: number
   type!: string
@@ -287,7 +296,7 @@ export function createModel (builder: Builder): void {
     {
       icon: board.icon.Card,
       isInline: false,
-      isTransparent: true,
+      kind: 'transparent',
       label: board.string.AddButton,
       position: 70,
       type: board.cardActionType.Automation,

models/board/src/plugin.ts

@@ -16,7 +16,7 @@
 
 import { boardId, Card, CardAction } from '@anticrm/board'
 import board from '@anticrm/board-resources/src/plugin'
-import type { Client, Ref, Space } from '@anticrm/core'
+import type { TxOperations as Client, Ref, Space } from '@anticrm/core'
 import { mergeIds, Resource } from '@anticrm/platform'
 import { KanbanTemplate, Sequence } from '@anticrm/task'
 import type { AnyComponent } from '@anticrm/ui'

plugins/board-assets/lang/en.json

@@ -23,6 +23,7 @@
     "DescriptionPlaceholder": "Add a more detailed description...",
     "Location": "Location",
     "Members": "Members",
+    "IsArchived": "Archived",
     "BoardCreateLabel": "Board",
     "Settings": "Settings",
     "InList": "in list",

plugins/board-assets/lang/ru.json

@@ -23,6 +23,7 @@
     "DescriptionPlaceholder": "Добавьте более подробное описание...",
     "Location": "Location",
     "Members": "Участники",
+    "IsArchived": "Архивировано",
     "BoardCreateLabel": "Board",
     "Settings": "Настройки",
     "InList": "в списке",

plugins/board-resources/src/components/editor/CardActions.svelte

@@ -18,7 +18,7 @@
   import type { Card, CardAction } from '@anticrm/board'
   import { IntlString, getResource } from '@anticrm/platform'
   import { getClient } from '@anticrm/presentation'
-  import { Button, Label } from '@anticrm/ui'
+  import { Button, Component, Label } from '@anticrm/ui'
 
   import plugin from '../../plugin'
   import { cardActionSorter, getCardActions } from '../../utils/CardActionUtils'
@@ -74,18 +74,24 @@
         <div class="flex-col flex-gap-1">
           <Label label={group.label} />
           {#each group.actions as action}
-            <Button
-              icon={action.icon}
-              label={action.label}
-              kind={action.isTransparent ? 'transparent' : 'no-border'}
-              justify="left"
-              on:click={async () => {
-                if (action.handler) {
-                  const handler = await getResource(action.handler)
-                  handler(value, client)
-                }
-              }}
-            />
+            {#if action.component}
+              <Component is={action.component} props={{ object: value }}>
+                <slot />
+              </Component>
+            {:else}
+              <Button
+                icon={action.icon}
+                label={action.label}
+                kind={action.kind ?? 'no-border'}
+                justify="left"
+                on:click={async () => {
+                  if (action.handler) {
+                    const handler = await getResource(action.handler)
+                    handler(value, client)
+                  }
+                }}
+              />
+            {/if}
           {/each}
         </div>
       {/if}

plugins/board-resources/src/plugin.ts

@@ -15,7 +15,7 @@
 
 import board, { boardId } from '@anticrm/board'
 import { IntlString, mergeIds } from '@anticrm/platform'
-import { AnyComponent } from '@anticrm/ui'
+import type { AnyComponent } from '@anticrm/ui'
 
 export default mergeIds(boardId, board, {
   string: {
@@ -44,6 +44,7 @@ export default mergeIds(boardId, board, {
     DescriptionPlaceholder: '' as IntlString,
     Location: '' as IntlString,
     Members: '' as IntlString,
+    IsArchived: '' as IntlString,
     BoardCreateLabel: '' as IntlString,
     Settings: '' as IntlString,
     InList: '' as IntlString,

plugins/board/package.json

@@ -30,6 +30,7 @@
     "@anticrm/core": "~0.6.16",
     "@anticrm/platform": "~0.6.5",
     "@anticrm/view": "~0.6.0",
-    "@anticrm/task": "~0.6.0"
+    "@anticrm/task": "~0.6.0",
+    "@anticrm/ui": "~0.6.0"
   }
 }

plugins/board/src/index.ts

@@ -15,10 +15,11 @@
 //
 
 import { Employee } from '@anticrm/contact'
-import type { AttachedDoc, Class, Client, Doc, Markup, Ref } from '@anticrm/core'
+import type { AttachedDoc, Class, TxOperations as Client, Doc, Markup, Ref, Timestamp } from '@anticrm/core'
 import type { Asset, IntlString, Plugin, Resource } from '@anticrm/platform'
 import { plugin } from '@anticrm/platform'
 import type { KanbanTemplateSpace, SpaceWithStates, Task } from '@anticrm/task'
+import type { AnyComponent } from '@anticrm/ui'
 
 /**
  * @public
@@ -47,17 +48,31 @@ export interface CardLabel extends AttachedDoc {
   color: number
 }
 
+/**
+ * @public
+ */
+export interface CardDate {
+  dueDate?: Timestamp
+  isChecked?: boolean
+  startDate?: Timestamp
+}
+
 /**
  * @public
  */
 export interface Card extends Task {
   title: string
 
+  date?: CardDate
   description: Markup
 
-  members: Ref<Employee>[]
+  isArchived?: boolean
 
-  location: string
+  members?: Ref<Employee>[]
+
+  labels?: Ref<CardLabel>[]
+
+  location?: string
 
   coverColor?: number
   coverImage?: string
@@ -69,10 +84,11 @@ export interface Card extends Task {
  * @public
  */
 export interface CardAction extends Doc {
+  component?: AnyComponent
   hint?: IntlString
   icon: Asset
   isInline?: boolean
-  isTransparent?: boolean
+  kind?: 'primary' | 'secondary' | 'no-border' | 'transparent' | 'dangerous'
   label: IntlString
   position: number
   type: string
@@ -102,7 +118,8 @@ const boards = plugin(boardId, {
   class: {
     Board: '' as Ref<Class<Board>>,
     Card: '' as Ref<Class<Card>>,
-    CardAction: '' as Ref<Class<CardAction>>
+    CardAction: '' as Ref<Class<CardAction>>,
+    CardLabel: '' as Ref<Class<CardLabel>>
   },
   icon: {
     Board: '' as Asset,

plugins/task/src/index.ts

@@ -46,6 +46,7 @@ export interface DocWithRank extends Doc {
 export interface State extends DocWithRank {
   title: string
   color: number
+  isArchived?: boolean
 }
 
 /**