UBERF-4786 (#4285)

dev/generator/src/recruit.ts

@@ -102,6 +102,7 @@ async function genVacansyApplicants (
     members: [],
     archived: false,
     tasks: [],
+    classic: true,
     // TODO: Fix me.
     statuses: states.map((s) => {
       return { _id: s, taskType: '' as Ref<TaskType> }

models/board/src/migration.ts

@@ -58,7 +58,8 @@ async function createDefaultProjectType (tx: TxOperations): Promise<Ref<ProjectT
       name: 'Default board',
       descriptor: board.descriptors.BoardType,
       description: '',
-      tasks: []
+      tasks: [],
+      classic: true
     },
     [
       {

models/lead/src/migration.ts

@@ -38,7 +38,8 @@ async function createSpace (tx: TxOperations): Promise<void> {
         name: 'Default funnel',
         descriptor: lead.descriptors.FunnelType,
         description: '',
-        tasks: []
+        tasks: [],
+        classic: true
       },
       [
         {

models/recruit/src/migration.ts

@@ -136,7 +136,8 @@ async function createDefaultKanbanTemplate (tx: TxOperations): Promise<Ref<Proje
       name: 'Default vacancy',
       descriptor: recruit.descriptors.VacancyType,
       description: '',
-      tasks: []
+      tasks: [],
+      classic: true
     },
     [
       {

models/task/src/index.ts

@@ -49,7 +49,8 @@ import {
   TypeString,
   UX,
   type Builder,
-  type MigrationClient
+  type MigrationClient,
+  ReadOnly
 } from '@hcengineering/model'
 import attachment from '@hcengineering/model-attachment'
 import chunter from '@hcengineering/model-chunter'
@@ -106,6 +107,7 @@ export class TTask extends TAttachedDoc implements Task {
 
   @Prop(TypeRef(task.class.TaskType), task.string.TaskType)
   @Index(IndexKind.Indexed)
+  @ReadOnly()
     kind!: Ref<TaskType>
 
   @Prop(TypeString(), task.string.TaskNumber)
@@ -203,6 +205,9 @@ export class TProjectType extends TSpace implements ProjectType {
 
   @Prop(TypeRef(core.class.Class), getEmbeddedLabel('Target Class'))
     targetClass!: Ref<Class<Project>>
+
+  @Prop(TypeBoolean(), getEmbeddedLabel('Classic'))
+    classic!: boolean
 }
 
 @Model(task.class.TaskType, core.class.Doc, DOMAIN_TASK)
@@ -506,7 +511,7 @@ export function createModel (builder: Builder): void {
       icon: task.icon.TaskState,
       color: PaletteColorIndexes.Porpoise,
       defaultStatusName: 'New state',
-      order: 0
+      order: 1
     },
     task.statusCategory.Active
   )
@@ -520,7 +525,7 @@ export function createModel (builder: Builder): void {
       icon: task.icon.TaskState,
       color: PaletteColorIndexes.Grass,
       defaultStatusName: 'Won',
-      order: 0
+      order: 2
     },
     task.statusCategory.Won
   )
@@ -534,7 +539,7 @@ export function createModel (builder: Builder): void {
       icon: task.icon.TaskState,
       color: PaletteColorIndexes.Coin,
       defaultStatusName: 'Lost',
-      order: 0
+      order: 3
     },
     task.statusCategory.Lost
   )

models/task/src/migration.ts

@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 
-import { TxOperations, type Class, type Doc, type Ref } from '@hcengineering/core'
+import { TxOperations, type Class, type Doc, type Ref, toIdMap } from '@hcengineering/core'
 import {
   createOrUpdate,
   tryMigrate,
@@ -39,6 +39,26 @@ export async function createSequence (tx: TxOperations, _class: Ref<Class<Doc>>)
   }
 }
 
+async function reorderStates (_client: MigrationUpgradeClient): Promise<void> {
+  const client = new TxOperations(_client, core.account.System)
+  const states = toIdMap(await client.findAll(core.class.Status, {}))
+  const order = [
+    task.statusCategory.UnStarted,
+    task.statusCategory.Active,
+    task.statusCategory.Won,
+    task.statusCategory.Lost
+  ]
+  const taskTypes = await client.findAll(task.class.TaskType, {})
+  for (const taskType of taskTypes) {
+    const statuses = [...taskType.statuses].sort((a, b) => {
+      const aIndex = order.indexOf(states.get(a)?.category ?? task.statusCategory.UnStarted)
+      const bIndex = order.indexOf(states.get(b)?.category ?? task.statusCategory.UnStarted)
+      return aIndex - bIndex
+    })
+    await client.diffUpdate(taskType, { statuses })
+  }
+}
+
 async function createDefaultSequence (tx: TxOperations): Promise<void> {
   const current = await tx.findOne(core.class.Space, {
     _id: task.space.Sequence
@@ -92,6 +112,18 @@ export const taskOperation: MigrateOperation = {
         func: async (client) => {
           await client.update(DOMAIN_SPACE, { space: core.space.Model }, { space: core.space.Space })
         }
+      },
+      {
+        state: 'classicProjectTypes',
+        func: async (client) => {
+          await client.update(
+            DOMAIN_SPACE,
+            { _class: task.class.ProjectType, classic: { $exists: false } },
+            {
+              classic: true
+            }
+          )
+        }
       }
     ])
   },
@@ -113,6 +145,11 @@ export const taskOperation: MigrateOperation = {
       task.category.TaskTag
     )
 
-    await tryUpgrade(client, taskId, [])
+    await tryUpgrade(client, taskId, [
+      {
+        state: 'reorderStates',
+        func: reorderStates
+      }
+    ])
   }
 }

models/tracker/src/migration.ts

@@ -58,7 +58,8 @@ async function createDefaultProject (tx: TxOperations): Promise<void> {
         name: 'Classic project',
         descriptor: tracker.descriptors.ProjectType,
         description: '',
-        tasks: []
+        tasks: [],
+        classic: true
       },
       [
         {
@@ -88,7 +89,8 @@ async function createDefaultProject (tx: TxOperations): Promise<void> {
         name: 'Base project',
         descriptor: tracker.descriptors.ProjectType,
         description: '',
-        tasks: []
+        tasks: [],
+        classic: false
       },
       [
         {

plugins/task-assets/lang/en.json

@@ -81,6 +81,8 @@
     "StatusChange": "Status changed",
     "TaskCreated": "Task created",
     "TaskType": "Task type",
-    "ManageProjects": "Project types"
+    "ManageProjects": "Project types",
+    "CreateProjectType": "Create project type",
+    "ClassicProject": "Classic project"
   }
 }

plugins/task-assets/lang/ru.json

@@ -81,6 +81,8 @@
     "StatusChange": "Статус изменен",
     "TaskCreated": "Создана задача",
     "TaskType": "Тип задачи",
-    "ManageProjects": "Управление проектами"
+    "ManageProjects": "Управление проектами",
+    "CreateProjectType": "Создать тип проекта",
+    "ClassicProject": "Классический проект"
   }
 }

plugins/task-resources/src/components/StatusSelector.svelte

@@ -1,17 +1,15 @@
 <script lang="ts">
-  import { Attribute, Class, IdMap, Ref, Status, generateId } from '@hcengineering/core'
+  import { Class, IdMap, Ref, Status, generateId } from '@hcengineering/core'
   import { IntlString } from '@hcengineering/platform'
-  import { DocPopup, createQuery, getClient } from '@hcengineering/presentation'
-  import { Project, ProjectType, Task, getStates } from '@hcengineering/task'
+  import { DocPopup, getClient } from '@hcengineering/presentation'
+  import { Task, TaskType } from '@hcengineering/task'
   import { ObjectPresenter, statusStore } from '@hcengineering/view-resources'
   import { createEventDispatcher } from 'svelte'
-  import { typeStore } from '..'
-  import task from '../plugin'
+  import { taskTypeStore } from '..'
 
   export let value: Task | Task[]
   export let width: 'medium' | 'large' | 'full' = 'medium'
   export let placeholder: IntlString
-  export let ofAttribute: Ref<Attribute<Status>>
   export let _class: Ref<Class<Status>>
   export let embedded: boolean = false
 
@@ -43,35 +41,26 @@
       : undefined
     : value.status
 
-  $: _space = Array.isArray(value)
-    ? value.every((v) => v.space === (value as Array<Task>)[0].space)
-      ? value[0].space
+  $: kind = Array.isArray(value)
+    ? value.every((v) => v.kind === (value as Array<Task>)[0].kind)
+      ? value[0].kind
       : undefined
-    : value.space
+    : value.kind
 
-  let project: Project | undefined
-
-  const query = createQuery()
-  $: _space
-    ? query.query(task.class.Project, { _id: _space as Ref<Project> }, (res) => {
-      project = res[0]
-    })
-    : (project = undefined)
-
-  function updateStatuses (
-    space: Project | undefined,
-    types: IdMap<ProjectType>,
-    store: IdMap<Status>,
-    allStatuses: Status[]
-  ): void {
-    if (space === undefined) {
-      statuses = allStatuses.filter((p) => p.ofAttribute === ofAttribute)
+  function updateStatuses (taskTypes: IdMap<TaskType>, store: IdMap<Status>, kind: Ref<TaskType> | undefined): void {
+    if (kind === undefined) {
+      statuses = []
     } else {
-      statuses = getStates(space, types, store)
+      if (kind !== undefined) {
+        const type = taskTypes.get(kind)
+        if (type !== undefined) {
+          statuses = type.statuses.map((p) => store.get(p)).filter((p) => p !== undefined) as Status[]
+        }
+      }
     }
   }
 
-  $: updateStatuses(project, $typeStore, $statusStore.byId, $statusStore.array)
+  $: updateStatuses($taskTypeStore, $statusStore.byId, kind)
 
   let statuses: Status[] = []
 </script>

plugins/task-resources/src/components/projectTypes/CreateProjectType.svelte

@@ -0,0 +1,77 @@
+<!--
+// Copyright © 2023 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+-->
+
+<script lang="ts">
+  import { Ref, generateId } from '@hcengineering/core'
+  import { Card, getClient } from '@hcengineering/presentation'
+  import { ProjectTypeDescriptor, createProjectType } from '@hcengineering/task'
+  import { DropdownLabelsIntl, EditBox, ToggleWithLabel } from '@hcengineering/ui'
+  import { createEventDispatcher } from 'svelte'
+  import task from '../../plugin'
+
+  const client = getClient()
+
+  let name: string = ''
+  let classic: boolean = true
+
+  let descriptor: ProjectTypeDescriptor | undefined = undefined
+
+  const dispatch = createEventDispatcher()
+
+  async function createType (): Promise<void> {
+    if (descriptor === undefined) {
+      return
+    }
+    await createProjectType(
+      client,
+      {
+        name,
+        descriptor: descriptor._id,
+        description: '',
+        tasks: [],
+        classic
+      },
+      [],
+      generateId()
+    )
+    dispatch('close')
+  }
+
+  const descriptors = client.getModel().findAllSync(task.class.ProjectTypeDescriptor, {})
+  const items = descriptors.map((it) => ({
+    label: it.name,
+    id: it._id
+  }))
+
+  function selectType (evt: CustomEvent<Ref<ProjectTypeDescriptor>>): void {
+    descriptor = descriptors.find((it) => it._id === evt.detail)
+  }
+</script>
+
+<Card
+  label={task.string.CreateProjectType}
+  canSave={name.trim().length > 0 && descriptor !== undefined}
+  okAction={createType}
+  on:close={() => {
+    dispatch('close')
+  }}
+  on:changeContent
+>
+  <div class="flex-col flex-gap-2">
+    <EditBox bind:value={name} placeholder={task.string.ProjectType} />
+    <DropdownLabelsIntl {items} on:selected={selectType} />
+    <ToggleWithLabel label={task.string.ClassicProject} bind:on={classic} />
+  </div>
+</Card>

plugins/task-resources/src/components/projectTypes/ManageProjectsTools.svelte

@@ -14,46 +14,12 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { generateId } from '@hcengineering/core'
-  import { Button, IconAdd, Menu, getEventPopupPositionElement, showPopup } from '@hcengineering/ui'
+  import { Button, IconAdd, showPopup } from '@hcengineering/ui'
+  import CreateProjectType from './CreateProjectType.svelte'
 
-  import { translate } from '@hcengineering/platform'
-  import { getClient } from '@hcengineering/presentation'
-  import task, { ProjectTypeDescriptor, createProjectType } from '@hcengineering/task'
-
-  const client = getClient()
-
-  async function createType (descriptor: ProjectTypeDescriptor): Promise<void> {
-    const descriptorName = await translate(descriptor.name, {})
-
-    await createProjectType(
-      client,
-      {
-        name: `New ${descriptorName} project type`,
-        descriptor: descriptor._id,
-        description: '',
-        tasks: []
-      },
-      [],
-      generateId()
-    )
-  }
-
-  async function chooseProjectType (evt: MouseEvent): Promise<void> {
-    const descriptors = client.getModel().findAllSync(task.class.ProjectTypeDescriptor, {})
-    showPopup(
-      Menu,
-      {
-        actions: descriptors.map((it) => ({
-          label: it.name,
-          action: () => {
-            void createType(it)
-          }
-        }))
-      },
-      getEventPopupPositionElement(evt)
-    )
+  function open () {
+    showPopup(CreateProjectType, {}, 'top')
   }
 </script>
 
-<Button id="new-project-type" icon={IconAdd} kind={'link'} size="small" on:click={chooseProjectType} />
+<Button id="new-project-type" icon={IconAdd} kind={'link'} size="small" on:click={open} />

plugins/task-resources/src/plugin.ts

@@ -75,7 +75,9 @@ export default mergeIds(taskId, task, {
     StatusPopupTitle: '' as IntlString,
     NameAlreadyExists: '' as IntlString,
     StatusChange: '' as IntlString,
-    TaskCreated: '' as IntlString
+    TaskCreated: '' as IntlString,
+    CreateProjectType: '' as IntlString,
+    ClassicProject: '' as IntlString
   },
   status: {
     AssigneeRequired: '' as IntlString

plugins/task/src/index.ts

@@ -173,6 +173,9 @@ export interface ProjectType extends Space {
 
   // A mixin for project
   targetClass: Ref<Class<Project>>
+
+  // disable automation workflow
+  classic: boolean
 }
 
 /**

plugins/task/src/utils.ts

@@ -255,7 +255,8 @@ export async function createProjectType (
       members: [],
       archived: false,
       statuses: calculateStatuses({ tasks: _tasks, statuses: [] }, tasksData, []),
-      targetClass: targetProjectClassId
+      targetClass: targetProjectClassId,
+      classic: data.classic
     },
     _id
   )

tests/sanity/tests/settings.spec.ts

@@ -86,10 +86,10 @@ test.describe('contact tests', () => {
     await page.getByRole('button', { name: 'Notifications' }).click()
     // Click text=Vacancies
     await page.locator('#new-project-type').click()
-    await page.getByRole('button', { name: 'Recruiting', exact: true }).click()
-    await page.locator('#navGroup-statuses').getByText('New Recruiting project type').first().click()
-
     // TODO: Need rework.
+    // await page.getByRole('button', { name: 'Recruiting', exact: true }).click()
+    // await page.locator('#navGroup-statuses').getByText('New Recruiting project type').first().click()
+
     // // Click #create-template div
     // await page.click('#create-template div')
     // const tid = 'template-' + generateId()