UBERF-4248: Task type

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>

.gitignore

@@ -86,4 +86,4 @@ dev/tool/report*.csv
 tests/db_dump
 .build
 .format
-tools/apm/apm.js
+tools/apm/apm.js

dev/generator/src/issues.ts

@@ -37,7 +37,8 @@ const object: AttachedData<Issue> = {
   remainingTime: 0,
   estimation: 0,
   reports: 0,
-  childInfo: []
+  childInfo: [],
+  kind: tracker.taskTypes.Issue
 }
 
 export interface IssueOptions {
@@ -100,7 +101,8 @@ async function genIssue (client: TxOperations, statuses: Ref<IssueStatus>[]): Pr
     estimation: object.estimation,
     reports: 0,
     relations: [],
-    childInfo: []
+    childInfo: [],
+    kind: tracker.taskTypes.Issue
   }
   await client.addCollection(
     tracker.class.Issue,

dev/generator/src/recruit.ts

@@ -15,7 +15,7 @@ import core, {
 import { MinioService } from '@hcengineering/minio'
 import recruit from '@hcengineering/model-recruit'
 import { Applicant, Candidate, Vacancy } from '@hcengineering/recruit'
-import task, { ProjectType, genRanks } from '@hcengineering/task'
+import task, { ProjectType, TaskType, genRanks } from '@hcengineering/task'
 import faker from 'faker'
 import jpeg, { BufferRet } from 'jpeg-js'
 import { AttachmentOptions, addAttachments } from './attachments'
@@ -97,13 +97,16 @@ async function genVacansyApplicants (
     name: faker.name.title(),
     description: faker.lorem.sentences(2),
     shortDescription: faker.lorem.sentences(1),
-    category: recruit.category.VacancyTypeCategories,
+    descriptor: recruit.descriptors.VacancyType,
     private: false,
     members: [],
     archived: false,
+    tasks: [],
+    // TODO: Fix me.
     statuses: states.map((s) => {
-      return { _id: s }
-    })
+      return { _id: s, taskType: '' as Ref<TaskType> }
+    }),
+    targetClass: recruit.class.Vacancy
   }
 
   await ctx.with('update', {}, (ctx) =>
@@ -180,7 +183,8 @@ async function genApplicant (
     status: faker.random.arrayElement(states),
     rank,
     startDate: null,
-    dueDate: null
+    dueDate: null,
+    kind: recruit.taskTypes.Applicant
   }
 
   // Update or create candidate

models/board/src/index.ts

@@ -516,16 +516,26 @@ export function createModel (builder: Builder): void {
   })
 
   builder.createDoc(
-    task.class.ProjectTypeCategory,
+    task.class.ProjectTypeDescriptor,
     core.space.Model,
     {
-      name: board.string.Boards,
+      name: board.string.BoardApplication,
       description: board.string.ManageBoardStatuses,
       icon: board.component.TemplatesIcon,
-      attachedToClass: board.class.Board,
-      statusClass: core.class.Status,
-      statusCategories: [task.statusCategory.Active, task.statusCategory.Won, task.statusCategory.Lost]
+      baseClass: board.class.Board
     },
-    board.category.BoardType
+    board.descriptors.BoardType
+  )
+  builder.createDoc(
+    task.class.TaskTypeDescriptor,
+    core.space.Model,
+    {
+      baseClass: board.class.Card,
+      allowCreate: true,
+      description: board.string.Card,
+      icon: board.icon.Card,
+      name: board.string.Card
+    },
+    board.descriptors.Card
   )
 }

models/board/src/migration.ts

@@ -13,19 +13,21 @@
 // limitations under the License.
 //
 
+import { boardId } from '@hcengineering/board'
 import { type Ref, TxOperations } from '@hcengineering/core'
 import {
   type MigrateOperation,
   type MigrationClient,
   type MigrationUpgradeClient,
-  createOrUpdate
+  createOrUpdate,
+  tryMigrate
 } from '@hcengineering/model'
-import core from '@hcengineering/model-core'
-import { createProjectType, createSequence } from '@hcengineering/model-task'
-import tags from '@hcengineering/model-tags'
+import core, { DOMAIN_SPACE } from '@hcengineering/model-core'
+import { createProjectType, createSequence, fixTaskTypes } from '@hcengineering/model-task'
+import tags from '@hcengineering/tags'
 import task, { type ProjectType } from '@hcengineering/task'
-import board from './plugin'
 import { PaletteColorIndexes } from '@hcengineering/ui/src/colors'
+import board from './plugin'
 
 async function createSpace (tx: TxOperations): Promise<void> {
   const current = await tx.findOne(core.class.Space, {
@@ -54,27 +56,51 @@ async function createDefaultProjectType (tx: TxOperations): Promise<Ref<ProjectT
     tx,
     {
       name: 'Default board',
-      category: board.category.BoardType,
-      description: ''
+      descriptor: board.descriptors.BoardType,
+      description: '',
+      tasks: []
     },
     [
       {
-        color: PaletteColorIndexes.Blueberry,
-        name: 'To do',
-        category: task.statusCategory.Active,
-        ofAttribute: board.attribute.State
-      },
-      {
-        color: PaletteColorIndexes.Arctic,
-        name: 'Done',
-        category: task.statusCategory.Active,
-        ofAttribute: board.attribute.State
-      },
-      {
-        color: PaletteColorIndexes.Grass,
-        name: 'Completed',
-        category: board.statusCategory.Completed,
-        ofAttribute: board.attribute.State
+        _id: board.taskType.Card,
+        descriptor: board.descriptors.Card,
+        name: 'Card',
+        ofClass: board.class.Card,
+        targetClass: board.class.Card,
+        statusClass: core.class.Status,
+        kind: 'task',
+        factory: [
+          {
+            color: PaletteColorIndexes.Coin,
+            name: 'Unstarted',
+            category: task.statusCategory.UnStarted,
+            ofAttribute: board.attribute.State
+          },
+          {
+            color: PaletteColorIndexes.Blueberry,
+            name: 'To do',
+            category: task.statusCategory.Active,
+            ofAttribute: board.attribute.State
+          },
+          {
+            color: PaletteColorIndexes.Arctic,
+            name: 'Done',
+            category: task.statusCategory.Active,
+            ofAttribute: board.attribute.State
+          },
+          {
+            color: PaletteColorIndexes.Grass,
+            name: 'Completed',
+            category: board.statusCategory.Completed,
+            ofAttribute: board.attribute.State
+          }
+        ],
+        statusCategories: [
+          task.statusCategory.UnStarted,
+          task.statusCategory.Active,
+          task.statusCategory.Won,
+          task.statusCategory.Lost
+        ]
       }
     ],
     board.template.DefaultBoard
@@ -100,7 +126,44 @@ async function createDefaults (tx: TxOperations): Promise<void> {
 }
 
 export const boardOperation: MigrateOperation = {
-  async migrate (client: MigrationClient): Promise<void> {},
+  async migrate (client: MigrationClient): Promise<void> {
+    await tryMigrate(client, boardId, [
+      {
+        state: 'fix-category-descriptors',
+        func: async (client) => {
+          await client.update(
+            DOMAIN_SPACE,
+            { _class: task.class.ProjectType, category: 'board:category:BoardType' },
+            {
+              $set: { descriptor: board.descriptors.BoardType },
+              $unset: { category: 1 }
+            }
+          )
+        }
+      },
+      {
+        state: 'fixTaskStatus',
+        func: async (client): Promise<void> => {
+          await fixTaskTypes(client, board.descriptors.BoardType, async () => [
+            {
+              name: 'Card',
+              descriptor: board.descriptors.Card,
+              ofClass: board.class.Card,
+              targetClass: board.class.Card,
+              statusCategories: [
+                task.statusCategory.UnStarted,
+                task.statusCategory.Active,
+                task.statusCategory.Won,
+                task.statusCategory.Lost
+              ],
+              statusClass: core.class.Status,
+              kind: 'task'
+            }
+          ])
+        }
+      }
+    ])
+  },
   async upgrade (client: MigrationUpgradeClient): Promise<void> {
     const ops = new TxOperations(client, core.account.System)
     await createDefaults(ops)

models/board/src/plugin.ts

@@ -18,7 +18,7 @@ import { type Board, boardId } from '@hcengineering/board'
 import board from '@hcengineering/board-resources/src/plugin'
 import type { Ref } from '@hcengineering/core'
 import { type IntlString, mergeIds } from '@hcengineering/platform'
-import { type ProjectType, type Sequence } from '@hcengineering/task'
+import { type TaskTypeDescriptor, type ProjectType, type Sequence } from '@hcengineering/task'
 import type { AnyComponent } from '@hcengineering/ui/src/types'
 import { type Action, type ViewAction, type Viewlet, type ViewletDescriptor } from '@hcengineering/view'
 
@@ -67,5 +67,8 @@ export default mergeIds(boardId, board, {
   },
   actionImpl: {
     ConvertToCard: '' as ViewAction
+  },
+  descriptors: {
+    Card: '' as Ref<TaskTypeDescriptor>
   }
 })

models/contact/src/plugin.ts

@@ -54,7 +54,6 @@ export default mergeIds(contactId, contact, {
     ContactArrayEditor: '' as AnyComponent,
     EmployeeEditor: '' as AnyComponent,
     CreateEmployee: '' as AnyComponent,
-    AccountArrayEditor: '' as AnyComponent,
     ChannelFilter: '' as AnyComponent,
     MergePersons: '' as AnyComponent,
     ChannelPanel: '' as AnyComponent,

models/lead/src/index.ts

@@ -689,16 +689,26 @@ export function createModel (builder: Builder): void {
   })
 
   builder.createDoc(
-    task.class.ProjectTypeCategory,
+    task.class.ProjectTypeDescriptor,
     core.space.Model,
     {
-      name: lead.string.Funnels,
+      name: lead.string.LeadApplication,
       description: lead.string.ManageFunnelStatuses,
       icon: lead.component.TemplatesIcon,
-      attachedToClass: lead.class.Funnel,
-      statusClass: core.class.Status,
-      statusCategories: [task.statusCategory.Active, task.statusCategory.Won, task.statusCategory.Lost]
+      baseClass: lead.class.Funnel
     },
-    lead.category.FunnelTypeCategory
+    lead.descriptors.FunnelType
+  )
+  builder.createDoc(
+    task.class.TaskTypeDescriptor,
+    core.space.Model,
+    {
+      baseClass: lead.class.Lead,
+      allowCreate: true,
+      description: lead.string.Lead,
+      icon: lead.icon.Lead,
+      name: lead.string.Lead
+    },
+    lead.descriptors.Lead
   )
 }