diff --git a/.gitignore b/.gitignore index dd04f4bb42..3041f95273 100644 --- a/.gitignore +++ b/.gitignore @@ -86,4 +86,4 @@ dev/tool/report*.csv tests/db_dump .build .format -tools/apm/apm.js \ No newline at end of file +tools/apm/apm.js diff --git a/dev/generator/src/issues.ts b/dev/generator/src/issues.ts index 4b2e74e5b9..01c29b9ba5 100644 --- a/dev/generator/src/issues.ts +++ b/dev/generator/src/issues.ts @@ -37,7 +37,8 @@ const object: AttachedData = { 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[]): Pr estimation: object.estimation, reports: 0, relations: [], - childInfo: [] + childInfo: [], + kind: tracker.taskTypes.Issue } await client.addCollection( tracker.class.Issue, diff --git a/dev/generator/src/recruit.ts b/dev/generator/src/recruit.ts index 53c397cc0b..322bc2208f 100644 --- a/dev/generator/src/recruit.ts +++ b/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 } + }), + 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 diff --git a/models/board/src/index.ts b/models/board/src/index.ts index fc711f3c11..5853e75734 100644 --- a/models/board/src/index.ts +++ b/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 ) } diff --git a/models/board/src/migration.ts b/models/board/src/migration.ts index 1e8442941f..31d462d5cb 100644 --- a/models/board/src/migration.ts +++ b/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 { const current = await tx.findOne(core.class.Space, { @@ -54,27 +56,51 @@ async function createDefaultProjectType (tx: TxOperations): Promise { } export const boardOperation: MigrateOperation = { - async migrate (client: MigrationClient): Promise {}, + async migrate (client: MigrationClient): Promise { + 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 => { + 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 { const ops = new TxOperations(client, core.account.System) await createDefaults(ops) diff --git a/models/board/src/plugin.ts b/models/board/src/plugin.ts index 0a54d05957..a1156e9c3e 100644 --- a/models/board/src/plugin.ts +++ b/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 } }) diff --git a/models/contact/src/plugin.ts b/models/contact/src/plugin.ts index ead8c97e1e..ebf5cafc66 100644 --- a/models/contact/src/plugin.ts +++ b/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, diff --git a/models/lead/src/index.ts b/models/lead/src/index.ts index f27cb85ed5..038a923d43 100644 --- a/models/lead/src/index.ts +++ b/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 ) } diff --git a/models/lead/src/migration.ts b/models/lead/src/migration.ts index e795f8d92c..29ae04487b 100644 --- a/models/lead/src/migration.ts +++ b/models/lead/src/migration.ts @@ -16,15 +16,14 @@ import { TxOperations } from '@hcengineering/core' import { leadId } from '@hcengineering/lead' import { + tryMigrate, + tryUpgrade, type MigrateOperation, type MigrationClient, - type MigrationUpgradeClient, - tryUpgrade + type MigrationUpgradeClient } from '@hcengineering/model' -import core from '@hcengineering/model-core' -import { createProjectType, createSequence } from '@hcengineering/model-task' -import tracker from '@hcengineering/model-tracker' -import task from '@hcengineering/task' +import core, { DOMAIN_SPACE } from '@hcengineering/model-core' +import task, { createProjectType, createSequence, fixTaskTypes } from '@hcengineering/model-task' import { PaletteColorIndexes } from '@hcengineering/ui/src/colors' import lead from './plugin' @@ -37,42 +36,66 @@ async function createSpace (tx: TxOperations): Promise { tx, { name: 'Default funnel', - category: lead.category.FunnelTypeCategory, - description: '' + descriptor: lead.descriptors.FunnelType, + description: '', + tasks: [] }, [ { - color: PaletteColorIndexes.Coin, - name: 'Incoming', - ofAttribute: lead.attribute.State, - category: task.statusCategory.Active - }, - { - color: PaletteColorIndexes.Arctic, - name: 'Negotation', - ofAttribute: lead.attribute.State, - category: task.statusCategory.Active - }, - { - color: PaletteColorIndexes.Watermelon, - name: 'Offer preparing', - ofAttribute: lead.attribute.State, - category: task.statusCategory.Active - }, - { - color: PaletteColorIndexes.Orange, - name: 'Make a decision', - ofAttribute: lead.attribute.State, - category: task.statusCategory.Active - }, - { - color: PaletteColorIndexes.Ocean, - name: 'Contract conclusion', - ofAttribute: lead.attribute.State, - category: task.statusCategory.Active - }, - { name: 'Won', ofAttribute: lead.attribute.State, category: task.statusCategory.Won }, - { name: 'Lost', ofAttribute: lead.attribute.State, category: task.statusCategory.Lost } + _id: lead.taskType.Lead, + name: 'Lead', + descriptor: lead.descriptors.Lead, + ofClass: lead.class.Lead, + targetClass: lead.class.Lead, + statusClass: core.class.Status, + statusCategories: [ + task.statusCategory.UnStarted, + task.statusCategory.Active, + task.statusCategory.Won, + task.statusCategory.Lost + ], + kind: 'task', + factory: [ + { + color: PaletteColorIndexes.Coin, + name: 'Backlog', + ofAttribute: lead.attribute.State, + category: task.statusCategory.UnStarted + }, + { + color: PaletteColorIndexes.Coin, + name: 'Incoming', + ofAttribute: lead.attribute.State, + category: task.statusCategory.Active + }, + { + color: PaletteColorIndexes.Arctic, + name: 'Negotation', + ofAttribute: lead.attribute.State, + category: task.statusCategory.Active + }, + { + color: PaletteColorIndexes.Watermelon, + name: 'Offer preparing', + ofAttribute: lead.attribute.State, + category: task.statusCategory.Active + }, + { + color: PaletteColorIndexes.Orange, + name: 'Make a decision', + ofAttribute: lead.attribute.State, + category: task.statusCategory.Active + }, + { + color: PaletteColorIndexes.Ocean, + name: 'Contract conclusion', + ofAttribute: lead.attribute.State, + category: task.statusCategory.Active + }, + { name: 'Won', ofAttribute: lead.attribute.State, category: task.statusCategory.Won }, + { name: 'Lost', ofAttribute: lead.attribute.State, category: task.statusCategory.Lost } + ] + } ], lead.template.DefaultFunnel ) @@ -98,24 +121,48 @@ async function createDefaults (tx: TxOperations): Promise { } export const leadOperation: MigrateOperation = { - async migrate (client: MigrationClient): Promise {}, + async migrate (client: MigrationClient): Promise { + await tryMigrate(client, leadId, [ + { + state: 'fix-category-descriptors', + func: async (client) => { + await client.update( + DOMAIN_SPACE, + { _class: task.class.ProjectType, category: 'lead:category:FunnelTypeCategory' }, + { + $set: { descriptor: lead.descriptors.FunnelType }, + $unset: { category: 1 } + } + ) + } + }, + { + state: 'fixTaskStatus', + func: async (client): Promise => { + await fixTaskTypes(client, lead.descriptors.FunnelType, async () => [ + { + name: 'Lead', + descriptor: lead.descriptors.Lead, + ofClass: lead.class.Lead, + targetClass: lead.class.Lead, + statusCategories: [ + task.statusCategory.UnStarted, + task.statusCategory.Active, + task.statusCategory.Won, + task.statusCategory.Lost + ], + statusClass: core.class.Status, + kind: 'task' + } + ]) + } + } + ]) + }, async upgrade (client: MigrationUpgradeClient): Promise { const ops = new TxOperations(client, core.account.System) await createDefaults(ops) - await tryUpgrade(client, leadId, [ - { - state: 'related-targets', - func: async (client): Promise => { - const ops = new TxOperations(client, core.account.ConfigUser) - await ops.createDoc(tracker.class.RelatedIssueTarget, core.space.Configuration, { - rule: { - kind: 'classRule', - ofClass: lead.class.Lead - } - }) - } - } - ]) + await tryUpgrade(client, leadId, []) } } diff --git a/models/lead/src/plugin.ts b/models/lead/src/plugin.ts index 49ce0b10f7..aef8a17b7b 100644 --- a/models/lead/src/plugin.ts +++ b/models/lead/src/plugin.ts @@ -21,7 +21,7 @@ import lead from '@hcengineering/lead-resources/src/plugin' import { type NotificationGroup, type NotificationType } from '@hcengineering/notification' import type { IntlString } from '@hcengineering/platform' import { mergeIds } from '@hcengineering/platform' -import { type ProjectType } from '@hcengineering/task' +import { type TaskTypeDescriptor, type ProjectType } from '@hcengineering/task' import type { AnyComponent } from '@hcengineering/ui/src/types' import { type Action, type ActionCategory, type Viewlet } from '@hcengineering/view' @@ -72,5 +72,8 @@ export default mergeIds(leadId, lead, { LeadCreateNotification: '' as Ref, AssigneeNotification: '' as Ref, LeadChatMessageViewlet: '' as Ref + }, + descriptors: { + Lead: '' as Ref } }) diff --git a/models/notification/src/index.ts b/models/notification/src/index.ts index 7f10819853..30303d05de 100644 --- a/models/notification/src/index.ts +++ b/models/notification/src/index.ts @@ -276,9 +276,9 @@ export function createModel (builder: Builder): void { label: notification.string.Notifications, icon: notification.icon.Notifications, component: notification.component.NotificationSettings, - group: 'settings', + group: 'settings-account', secured: false, - order: 2500 + order: 1500 }, notification.ids.NotificationSettings ) diff --git a/models/recruit/src/index.ts b/models/recruit/src/index.ts index 8e3fe4a357..c126b262ca 100644 --- a/models/recruit/src/index.ts +++ b/models/recruit/src/index.ts @@ -316,7 +316,7 @@ export function createModel (builder: Builder): void { label: recruit.string.Applications, createLabel: recruit.string.ApplicationCreateLabel, createComponent: recruit.component.CreateApplication, - category: recruit.category.VacancyTypeCategories, + descriptor: recruit.descriptors.VacancyType, descriptors: [ view.viewlet.Table, view.viewlet.List, @@ -1750,17 +1750,28 @@ export function createModel (builder: Builder): void { ) builder.createDoc( - task.class.ProjectTypeCategory, + task.class.ProjectTypeDescriptor, core.space.Model, { - name: recruit.string.Vacancies, + name: recruit.string.RecruitApplication, description: recruit.string.ManageVacancyStatuses, icon: recruit.component.TemplatesIcon, editor: recruit.component.VacancyTemplateEditor, - attachedToClass: recruit.class.Vacancy, - statusClass: core.class.Status, - statusCategories: [task.statusCategory.Active, task.statusCategory.Won, task.statusCategory.Lost] + baseClass: recruit.class.Vacancy }, - recruit.category.VacancyTypeCategories + recruit.descriptors.VacancyType + ) + + builder.createDoc( + task.class.TaskTypeDescriptor, + core.space.Model, + { + baseClass: recruit.class.Applicant, + allowCreate: true, + description: recruit.string.Application, + icon: recruit.icon.Application, + name: recruit.string.Application + }, + recruit.descriptors.Application ) } diff --git a/models/recruit/src/migration.ts b/models/recruit/src/migration.ts index b0bc111a33..2e93a63717 100644 --- a/models/recruit/src/migration.ts +++ b/models/recruit/src/migration.ts @@ -14,70 +14,67 @@ // import { getCategories } from '@anticrm/skillset' -import core, { type Ref, TxOperations } from '@hcengineering/core' +import core, { TxOperations, type Ref } from '@hcengineering/core' import { + createOrUpdate, + tryMigrate, + tryUpgrade, type MigrateOperation, type MigrationClient, - type MigrationUpgradeClient, - createOrUpdate, - tryUpgrade + type MigrationUpgradeClient } from '@hcengineering/model' import tags, { type TagCategory } from '@hcengineering/model-tags' -import { createProjectType, createSequence } from '@hcengineering/model-task' -import tracker from '@hcengineering/model-tracker' +import { createProjectType, createSequence, fixTaskTypes } from '@hcengineering/model-task' import { recruitId } from '@hcengineering/recruit' import task, { type ProjectType } from '@hcengineering/task' import { PaletteColorIndexes } from '@hcengineering/ui/src/colors' import recruit from './plugin' +import { DOMAIN_SPACE } from '@hcengineering/model-core' export const recruitOperation: MigrateOperation = { - async migrate (client: MigrationClient): Promise {}, + async migrate (client: MigrationClient): Promise { + await tryMigrate(client, recruitId, [ + { + state: 'fix-category-descriptors', + func: async (client) => { + await client.update( + DOMAIN_SPACE, + { _class: task.class.ProjectType, category: 'recruit:category:VacancyTypeCategories' }, + { + $set: { descriptor: recruit.descriptors.VacancyType }, + $unset: { category: 1 } + } + ) + } + }, + { + state: 'fixTaskStatus', + func: async (client): Promise => { + await fixTaskTypes(client, recruit.descriptors.VacancyType, async () => [ + { + name: 'Applicant', + descriptor: recruit.descriptors.Application, + ofClass: recruit.class.Applicant, + targetClass: recruit.class.Applicant, + statusCategories: [ + task.statusCategory.UnStarted, + task.statusCategory.Active, + task.statusCategory.Won, + task.statusCategory.Lost + ], + statusClass: core.class.Status, + kind: 'task' + } + ]) + } + } + ]) + }, async upgrade (client: MigrationUpgradeClient): Promise { const tx = new TxOperations(client, core.account.System) await createDefaults(tx) await tryUpgrade(client, recruitId, [ - { - state: 'related-targets', - func: async (client): Promise => { - const ops = new TxOperations(client, core.account.ConfigUser) - await ops.createDoc(tracker.class.RelatedIssueTarget, core.space.Configuration, { - rule: { - kind: 'classRule', - ofClass: recruit.class.Vacancy - } - }) - - await ops.createDoc(tracker.class.RelatedIssueTarget, core.space.Configuration, { - rule: { - kind: 'classRule', - ofClass: recruit.class.Applicant - } - }) - } - }, - { - state: 'wrong-categories', - func: async (client): Promise => { - const ops = new TxOperations(client, core.account.System) - while (true) { - const docs = await ops.findAll( - tags.class.TagElement, - { - targetClass: recruit.mixin.Candidate, - category: { $in: [tracker.category.Other, 'document:category:Other' as Ref] } - }, - { limit: 1000 } - ) - for (const d of docs) { - await ops.update(d, { category: recruit.category.Other }) - } - if (docs.length === 0) { - break - } - } - } - }, { state: 'remove-members', func: async (client): Promise => { @@ -137,36 +134,60 @@ async function createDefaultKanbanTemplate (tx: TxOperations): Promise, TableVacancyList: '' as Ref, ApplicantDashboard: '' as Ref + }, + descriptors: { + Application: '' as Ref } }) diff --git a/models/setting/src/index.ts b/models/setting/src/index.ts index f16cbfe21d..3ca2e06b9f 100644 --- a/models/setting/src/index.ts +++ b/models/setting/src/index.ts @@ -15,23 +15,22 @@ import activity from '@hcengineering/activity' import contact from '@hcengineering/contact' -import { type Account, type Domain, DOMAIN_MODEL, type Ref } from '@hcengineering/core' -import { type Builder, Mixin, Model } from '@hcengineering/model' +import { DOMAIN_MODEL, type Account, type Domain, type Ref } from '@hcengineering/core' +import { Mixin, Model, type Builder } from '@hcengineering/model' import core, { TClass, TConfiguration, TDoc } from '@hcengineering/model-core' import view, { createAction } from '@hcengineering/model-view' import notification from '@hcengineering/notification' import type { Asset, IntlString } from '@hcengineering/platform' import { + settingId, type Editable, type Handler, type Integration, type IntegrationType, type InviteSettings, - settingId, type SettingsCategory, type UserMixin } from '@hcengineering/setting' -import task from '@hcengineering/task' import templates from '@hcengineering/templates' import setting from './plugin' @@ -39,8 +38,8 @@ import workbench from '@hcengineering/model-workbench' import { type AnyComponent } from '@hcengineering/ui/src/types' export { settingId } from '@hcengineering/setting' -export { default } from './plugin' export { settingOperation } from './migration' +export { default } from './plugin' export const DOMAIN_SETTING = 'setting' as Domain @@ -153,6 +152,9 @@ export function createModel (builder: Builder): void { label: setting.string.WorkspaceSetting, icon: setting.icon.Setting, component: setting.component.WorkspaceSettings, + extraComponents: { + navigation: setting.component.WorkspaceSettings + }, group: 'settings', secured: false, order: 2000 @@ -167,9 +169,9 @@ export function createModel (builder: Builder): void { label: setting.string.Integrations, icon: setting.icon.Integrations, component: setting.component.Integrations, - group: 'settings', + group: 'settings-account', secured: false, - order: 3000 + order: 1500 }, setting.ids.Integrations ) @@ -200,21 +202,7 @@ export function createModel (builder: Builder): void { setting.ids.Configure ) builder.createDoc( - setting.class.WorkspaceSettingCategory, - core.space.Model, - { - name: 'statuses', - label: setting.string.ManageProjects, - icon: task.icon.ManageTemplates, - component: setting.component.ManageProjects, - group: 'settings-editor', - secured: false, - order: 4000 - }, - setting.ids.ManageProjects - ) - builder.createDoc( - setting.class.WorkspaceSettingCategory, + setting.class.SettingsCategory, core.space.Model, { name: 'classes', @@ -237,7 +225,8 @@ export function createModel (builder: Builder): void { component: setting.component.EnumSetting, group: 'settings-editor', secured: false, - order: 4600 + order: 4600, + expandable: true }, setting.ids.EnumSetting ) diff --git a/models/task/package.json b/models/task/package.json index cddd74705b..1fa555532f 100644 --- a/models/task/package.json +++ b/models/task/package.json @@ -42,6 +42,7 @@ "@hcengineering/task-resources": "^0.6.0", "@hcengineering/ui": "^0.6.11", "@hcengineering/view": "^0.6.9", - "@hcengineering/workbench": "^0.6.9" + "@hcengineering/setting": "^0.6.11", + "@hcengineering/notification": "^0.6.16" } } diff --git a/models/task/src/index.ts b/models/task/src/index.ts index d65735874b..dbe770f162 100644 --- a/models/task/src/index.ts +++ b/models/task/src/index.ts @@ -16,18 +16,25 @@ import type { Employee, Person } from '@hcengineering/contact' import contact from '@hcengineering/contact' import { - type Class, + ClassifierKind, DOMAIN_MODEL, + DOMAIN_STATUS, + DOMAIN_TX, + IndexKind, + generateId, + type Class, + type Data, type Doc, type Domain, - IndexKind, type Ref, type Status, type StatusCategory, - type Timestamp + type Timestamp, + type TxCreateDoc, + type TxMixin } from '@hcengineering/core' import { - type Builder, + ArrOf, Collection, Hidden, Index, @@ -37,34 +44,50 @@ import { TypeBoolean, TypeDate, TypeMarkup, + TypeRecord, TypeRef, TypeString, - UX + UX, + type Builder, + type MigrationClient } from '@hcengineering/model' import attachment from '@hcengineering/model-attachment' -import core, { TAttachedDoc, TClass, TDoc, TSpace } from '@hcengineering/model-core' -import view, { createAction, template, actionTemplates as viewTemplates } from '@hcengineering/model-view' -import { type IntlString } from '@hcengineering/platform' -import { PaletteColorIndexes } from '@hcengineering/ui/src/colors' +import chunter from '@hcengineering/model-chunter' +import core, { DOMAIN_SPACE, TAttachedDoc, TClass, TDoc, TSpace } from '@hcengineering/model-core' +import view, { + classPresenter, + createAction, + template, + actionTemplates as viewTemplates +} from '@hcengineering/model-view' +import { getEmbeddedLabel, type Asset, type IntlString } from '@hcengineering/platform' +import setting from '@hcengineering/setting' import tags from '@hcengineering/tags' import { + calculateStatuses, + findStatusAttr, type KanbanCard, type Project, type ProjectStatus, type ProjectType, - type ProjectTypeCategory, + type ProjectTypeClass, + type ProjectTypeDescriptor, type Sequence, type Task, + type TaskType, + type TaskTypeClass, + type TaskTypeDescriptor, + type TaskTypeKind, type TodoItem } from '@hcengineering/task' -import type { AnyComponent } from '@hcengineering/ui/src/types' +import type { AnyComponent } from '@hcengineering/ui' +import { PaletteColorIndexes } from '@hcengineering/ui/src/colors' import { type ViewAction } from '@hcengineering/view' -import chunter from '@hcengineering/model-chunter' import task from './plugin' -export { taskId } from '@hcengineering/task' -export { createProjectType, createSequence, taskOperation } from './migration' +export { createProjectType, taskId } from '@hcengineering/task' +export { createSequence, taskOperation } from './migration' export { default } from './plugin' export const DOMAIN_TASK = 'task' as Domain @@ -80,6 +103,10 @@ export class TTask extends TAttachedDoc implements Task { @Index(IndexKind.Indexed) status!: Ref + @Prop(TypeRef(task.class.TaskType), task.string.TaskType) + @Index(IndexKind.Indexed) + kind!: Ref + @Prop(TypeString(), task.string.TaskNumber) @Index(IndexKind.FullText) @Hidden() @@ -132,27 +159,91 @@ export class TKanbanCard extends TClass implements KanbanCard { card!: AnyComponent } +@Model(task.class.TaskTypeDescriptor, core.class.Doc, DOMAIN_MODEL) +export class TTaskTypeDescriptor extends TDoc implements TaskTypeDescriptor { + name!: IntlString + description!: IntlString + icon!: Asset + baseClass!: Ref> + + // If specified, will allow to be created by users, system type overwize + allowCreate!: boolean +} + +@Mixin(task.mixin.TaskTypeClass, core.class.Class) +export class TTaskTypeClass extends TClass implements TaskTypeClass { + taskType!: Ref + projectType!: Ref +} + +@Mixin(task.mixin.ProjectTypeClass, core.class.Class) +export class TProjectTypeClass extends TClass implements ProjectTypeClass { + projectType!: Ref +} + @Model(task.class.Project, core.class.Space) export class TProject extends TSpace implements Project { - type!: Ref + @Prop(TypeRef(task.class.ProjectType), task.string.ProjectType) + type!: Ref } @Model(task.class.ProjectType, core.class.Space) export class TProjectType extends TSpace implements ProjectType { - statuses!: ProjectStatus[] shortDescription?: string - category!: Ref + + @Prop(TypeRef(task.class.ProjectTypeDescriptor), getEmbeddedLabel('Descriptor')) + descriptor!: Ref + + @Prop(ArrOf(TypeRef(task.class.TaskType)), getEmbeddedLabel('Tasks')) + tasks!: Ref[] + + @Prop(ArrOf(TypeRecord()), getEmbeddedLabel('Project statuses')) + statuses!: ProjectStatus[] + + @Prop(TypeRef(core.class.Class), getEmbeddedLabel('Target Class')) + targetClass!: Ref> } -@Model(task.class.ProjectTypeCategory, core.class.Doc, DOMAIN_MODEL) -export class TProjectTypeCategory extends TDoc implements ProjectTypeCategory { +@Model(task.class.TaskType, core.class.Doc, DOMAIN_TASK) +export class TTaskType extends TDoc implements TaskType { + @Prop(TypeString(), getEmbeddedLabel('Name')) + name!: string + + @Prop(TypeRef(task.class.TaskTypeDescriptor), getEmbeddedLabel('Descriptor')) + descriptor!: Ref + + @Prop(TypeRef(task.class.ProjectType), getEmbeddedLabel('Task class')) + parent!: Ref // Base class for task + + @Prop(TypeString(), getEmbeddedLabel('Kind')) + kind!: TaskTypeKind + + @Prop(ArrOf(TypeRef(task.class.TaskType)), getEmbeddedLabel('Parent')) + allowedAsChildOf!: Ref[] // In case of specified, task type is for sub-tasks + + @Prop(TypeRef(core.class.Class), getEmbeddedLabel('Task class')) + ofClass!: Ref> // Base class for task + + @Prop(TypeRef(core.class.Class), getEmbeddedLabel('Task target class')) + targetClass!: Ref> // Class or Mixin mixin to hold all user defined attributes. + + @Prop(ArrOf(TypeRef(core.class.Status)), getEmbeddedLabel('Task statuses')) + statuses!: Ref[] + + @Prop(TypeRef(core.class.Class), getEmbeddedLabel('Task status class')) + statusClass!: Ref> + + @Prop(TypeRef(core.class.StatusCategory), getEmbeddedLabel('Task status categories')) + statusCategories!: Ref[] +} + +@Model(task.class.ProjectTypeDescriptor, core.class.Doc, DOMAIN_MODEL) +export class TProjectTypeDescriptor extends TDoc implements ProjectTypeDescriptor { name!: IntlString description!: IntlString icon!: AnyComponent editor?: AnyComponent - attachedToClass!: Ref> - statusClass!: Ref> - statusCategories!: Ref[] + baseClass!: Ref> } @Model(task.class.Sequence, core.class.Doc, DOMAIN_KANBAN) @@ -218,7 +309,19 @@ export const actionTemplates = template({ }) export function createModel (builder: Builder): void { - builder.createModel(TKanbanCard, TSequence, TTask, TTodoItem, TProject, TProjectType, TProjectTypeCategory) + builder.createModel( + TKanbanCard, + TSequence, + TTask, + TTodoItem, + TProject, + TProjectType, + TTaskType, + TProjectTypeDescriptor, + TTaskTypeDescriptor, + TTaskTypeClass, + TProjectTypeClass + ) builder.createDoc( view.class.ViewletDescriptor, @@ -243,6 +346,10 @@ export function createModel (builder: Builder): void { editor: task.component.TaskHeader }) + builder.mixin(task.class.ProjectType, core.class.Class, view.mixin.IgnoreActions, { + actions: [view.action.Open] + }) + builder.createDoc( view.class.ActionCategory, core.space.Model, @@ -312,6 +419,16 @@ export function createModel (builder: Builder): void { presenter: task.component.TodoItemPresenter }) + builder.mixin(task.class.TaskType, core.class.Class, view.mixin.ObjectPresenter, { + presenter: task.component.TaskTypePresenter + }) + + builder.mixin(task.class.ProjectType, core.class.Class, view.mixin.ObjectPresenter, { + presenter: task.component.ProjectTypePresenter + }) + + classPresenter(builder, task.class.TaskType, task.component.TaskTypePresenter, task.component.TaskTypePresenter) + createAction(builder, { label: task.string.MarkAsDone, icon: task.icon.TodoCheck, @@ -370,7 +487,21 @@ export function createModel (builder: Builder): void { core.space.Model, { ofAttribute: task.attribute.State, - label: core.string.Status, + label: task.string.StateBacklog, + icon: task.icon.TaskState, + color: PaletteColorIndexes.Coin, + defaultStatusName: 'Backlog', + order: 0 + }, + task.statusCategory.UnStarted + ) + + builder.createDoc( + core.class.StatusCategory, + core.space.Model, + { + ofAttribute: task.attribute.State, + label: task.string.StateActive, icon: task.icon.TaskState, color: PaletteColorIndexes.Blueberry, defaultStatusName: 'New state', @@ -431,4 +562,252 @@ export function createModel (builder: Builder): void { // }, // task.ids.AssigneedNotification // ) + + builder.mixin(task.mixin.TaskTypeClass, core.class.Class, view.mixin.ObjectPresenter, { + presenter: task.component.TaskTypeClassPresenter + }) + builder.mixin(task.mixin.ProjectTypeClass, core.class.Class, view.mixin.ObjectPresenter, { + presenter: task.component.ProjectTypeClassPresenter + }) + + builder.mixin(task.class.Task, core.class.Class, setting.mixin.Editable, { + value: true + }) + + builder.mixin(task.class.Project, core.class.Class, setting.mixin.Editable, { + value: true + }) + + builder.createDoc( + setting.class.SettingsCategory, + core.space.Model, + { + name: 'statuses', + label: task.string.ManageProjects, + icon: task.icon.ManageTemplates, + component: task.component.ManageProjectsContent, + extraComponents: { + navigation: task.component.ManageProjects, + tools: task.component.ManageProjectsTools + }, + group: 'settings-editor', + secured: false, + order: 6000, + expandable: true + }, + task.ids.ManageProjects + ) +} + +/** + * @public + */ +export type FixTaskData = Omit, 'space' | 'statuses' | 'parent'> & { _id?: TaskType['_id'] } +export interface FixTaskResult { + taskTypes: TaskType[] + projectTypes: ProjectType[] + projects: Project[] +} +/** + * @public + */ +export async function fixTaskTypes ( + client: MigrationClient, + descriptor: Ref, + dataFactory: (t: ProjectType) => Promise +): Promise { + const categoryObj = client.model.findObject(descriptor) + if (categoryObj === undefined) { + throw new Error('category is not found in model') + } + + const projectTypes = await client.find(DOMAIN_SPACE, { + _class: task.class.ProjectType, + descriptor + }) + const baseClassClass = client.hierarchy.getClass(categoryObj.baseClass) + + const resultTaskTypes: TaskType[] = [] + const resultProjects: Project[] = [] + + for (const t of projectTypes) { + t.tasks = [...(t.tasks ?? [])] + if (t.targetClass === undefined) { + const targetProjectClassId: Ref> = generateId() + t.targetClass = targetProjectClassId + + await client.create>(DOMAIN_TX, { + _id: generateId(), + objectId: targetProjectClassId, + _class: core.class.TxCreateDoc, + objectClass: core.class.Class, + objectSpace: core.space.Model, + modifiedBy: core.account.ConfigUser, + modifiedOn: Date.now(), + space: core.space.Model, + attributes: { + extends: categoryObj.baseClass, + kind: ClassifierKind.MIXIN, + label: baseClassClass.label, + icon: baseClassClass.icon + } + }) + + await client.create, ProjectTypeClass>>(DOMAIN_TX, { + _class: core.class.TxMixin, + _id: generateId(), + space: core.space.Model, + modifiedBy: core.account.ConfigUser, + modifiedOn: Date.now(), + objectId: targetProjectClassId, + objectClass: core.class.Class, + objectSpace: core.space.Model, + mixin: task.mixin.ProjectTypeClass, + attributes: { + projectType: t._id + } + }) + await client.update( + DOMAIN_SPACE, + { + _id: t._id + }, + { $set: { targetClass: targetProjectClassId } } + ) + } + + const dataTypes = await dataFactory(t) + + const projects = await client.find(DOMAIN_SPACE, { type: t._id }) + resultProjects.push(...projects) + + for (const data of dataTypes) { + const taskTypeId: Ref = data._id ?? generateId() + const descr = client.model.getObject(data.descriptor) + + const statuses = await client.find(DOMAIN_STATUS, { + _id: { $in: t.statuses.map((it) => it._id) }, + _class: data.statusClass + }) + + const dStatuses = [...t.statuses.map((it) => it._id)] + const statusAttr = findStatusAttr(client.hierarchy, data.ofClass) + // Ensure we have at leas't one item in every category. + for (const c of data.statusCategories) { + const cat = await client.model.findOne(core.class.StatusCategory, { _id: c }) + const st = statuses.find((it) => it.category === c) + if (st === undefined) { + // We need to add new status into missing category + const statusId: Ref = generateId() + await client.create(DOMAIN_STATUS, { + _id: statusId, + _class: data.statusClass, + category: c, + modifiedBy: core.account.ConfigUser, + modifiedOn: Date.now(), + name: cat?.defaultStatusName ?? 'New state', + space: task.space.Statuses, + ofAttribute: statusAttr._id + }) + dStatuses.push(statusId) + + await client.update( + DOMAIN_SPACE, + { + _id: t._id + }, + { $push: { statuses: { _id: statusId } } } + ) + t.statuses.push({ _id: statusId, taskType: taskTypeId }) + } + } + const taskType: TaskType = { + ...data, + parent: t._id, + _id: taskTypeId, + _class: task.class.TaskType, + space: t._id, + statuses: dStatuses, + modifiedBy: core.account.System, + modifiedOn: Date.now(), + kind: 'both', + icon: data.icon ?? descr.icon + } + + const ofClassClass = client.hierarchy.getClass(data.ofClass) + + taskType.icon = ofClassClass.icon + + // Create target class for custom field. + const targetClassId: Ref> = generateId() + taskType.targetClass = targetClassId + + await client.create>(DOMAIN_TX, { + _id: generateId(), + objectId: targetClassId, + _class: core.class.TxCreateDoc, + objectClass: core.class.Class, + objectSpace: core.space.Model, + modifiedBy: core.account.ConfigUser, + modifiedOn: Date.now(), + space: core.space.Model, + attributes: { + extends: data.ofClass, + kind: ClassifierKind.MIXIN, + label: getEmbeddedLabel(data.name), + icon: ofClassClass.icon + } + }) + + await client.create, TaskTypeClass>>(DOMAIN_TX, { + _class: core.class.TxMixin, + _id: generateId(), + space: core.space.Model, + modifiedBy: core.account.ConfigUser, + modifiedOn: Date.now(), + objectId: targetClassId, + objectClass: core.class.Class, + objectSpace: core.space.Model, + mixin: task.mixin.TaskTypeClass, + attributes: { + taskType: taskTypeId, + projectType: t._id + } + }) + + await client.create(DOMAIN_TASK, taskType) + resultTaskTypes.push(taskType) + + await client.update( + DOMAIN_SPACE, + { + _id: t._id + }, + { $push: { tasks: taskTypeId } } + ) + t.tasks.push(taskTypeId) + // Update kind and target classId + await client.update( + DOMAIN_TASK, + { space: { $in: projects.map((it) => it._id) }, _class: data.ofClass }, + { $set: { kind: taskTypeId } } + ) + } + + // We need to fix project statuses field, for proper icon calculation. + } + for (const t of projectTypes) { + const ttypes = await client.find(DOMAIN_TASK, { _id: { $in: t.tasks } }) + const newStatuses = calculateStatuses(t, new Map(ttypes.map((it) => [it._id, it])), []) + await client.update( + DOMAIN_SPACE, + { _id: t._id }, + { + $set: { + statuses: newStatuses + } + } + ) + } + return { taskTypes: resultTaskTypes, projectTypes, projects: resultProjects } } diff --git a/models/task/src/migration.ts b/models/task/src/migration.ts index 95afff3843..d8500e281f 100644 --- a/models/task/src/migration.ts +++ b/models/task/src/migration.ts @@ -13,46 +13,20 @@ // limitations under the License. // +import { TxOperations, type Class, type Doc, type Ref } from '@hcengineering/core' import { - type Attribute, - type Class, - DOMAIN_STATUS, - DOMAIN_TX, - type Data, - type Doc, - type Ref, - type Space, - type Status, - TxOperations, - generateId, - toIdMap -} from '@hcengineering/core' -import { - type MigrateOperation, - type MigrationClient, - type MigrationUpgradeClient, createOrUpdate, tryMigrate, - tryUpgrade + tryUpgrade, + type MigrateOperation, + type MigrationClient, + type MigrationUpgradeClient } from '@hcengineering/model' import core, { DOMAIN_SPACE } from '@hcengineering/model-core' import tags from '@hcengineering/model-tags' -import { - type Project, - type ProjectStatus, - type ProjectType, - type ProjectTypeCategory, - type Task, - createState, - taskId -} from '@hcengineering/task' -import view, { type Filter } from '@hcengineering/view' -import { DOMAIN_KANBAN, DOMAIN_TASK } from '.' +import { taskId } from '@hcengineering/task' import task from './plugin' -type ProjectData = Omit, 'statuses' | 'private' | 'members' | 'archived'> -type OldStatus = Status & { rank: string } - /** * @public */ @@ -65,47 +39,6 @@ export async function createSequence (tx: TxOperations, _class: Ref>) } } -/** - * @public - */ -export async function createProjectType ( - client: TxOperations, - data: ProjectData, - states: Data[], - _id: Ref, - stateClass: Ref> = core.class.Status -): Promise> { - const current = await client.findOne(task.class.ProjectType, { _id }) - if (current !== undefined) { - return current._id - } - - const statuses: Ref[] = [] - for (const st of states) { - statuses.push(await createState(client, stateClass, st)) - } - - const tmpl = await client.createDoc( - task.class.ProjectType, - core.space.Model, - { - description: data.description, - shortDescription: data.shortDescription, - category: data.category, - statuses: statuses.map((p) => { - return { _id: p } - }), - name: data.name, - private: false, - members: [], - archived: false - }, - _id - ) - - return tmpl -} - async function createDefaultSequence (tx: TxOperations): Promise { const current = await tx.findOne(core.class.Space, { _id: task.space.Sequence @@ -151,469 +84,9 @@ async function createDefaults (tx: TxOperations): Promise { await createDefaultStatesSpace(tx) } -async function renameState (client: MigrationClient): Promise { - const toUpdate = await client.find(DOMAIN_TASK, { state: { $exists: true } }) - if (toUpdate.length > 0) { - for (const doc of toUpdate) { - await client.update( - DOMAIN_TX, - { objectId: doc._id }, - { $rename: { 'attributes.state': 'attributes.status', 'operations.state': 'operations.status' } } - ) - await client.update( - DOMAIN_TX, - { 'tx.objectId': doc._id }, - { $rename: { 'tx.attributes.state': 'tx.attributes.status', 'tx.operations.state': 'tx.operations.status' } } - ) - } - await client.update(DOMAIN_TASK, { _id: { $in: toUpdate.map((p) => p._id) } }, { $rename: { state: 'status' } }) - } -} - -async function renameStatePrefs (client: MigrationUpgradeClient): Promise { - const txop = new TxOperations(client, core.account.System) - const prefs = await client.findAll(view.class.ViewletPreference, {}) - for (const pref of prefs) { - let update = false - const config = pref.config - for (let index = 0; index < config.length; index++) { - const conf = config[index] - if (typeof conf === 'string') { - if (conf === 'state') { - config[index] = 'status' - update = true - } else if (conf === '$lookup.state') { - config[index] = '$lookup.status' - update = true - } - } else if (conf.key === 'state') { - conf.key = 'status' - update = true - } - } - if (update) { - await txop.update(pref, { - config - }) - } - } - const res = await client.findAll(view.class.FilteredView, { filters: /"key":"state"/ as any }) - if (res.length > 0) { - for (const doc of res) { - const filters = JSON.parse(doc.filters) as Filter[] - for (const filter of filters) { - if (filter.key.key === 'state') { - filter.key.key = 'status' - } - } - await txop.update(doc, { - filters: JSON.stringify(filters) - }) - } - } -} - -async function fixStatusAttributes (client: MigrationClient): Promise { - const spaces = await client.find(DOMAIN_SPACE, {}) - const map = toIdMap(spaces) - const oldStatuses = await client.find(DOMAIN_STATUS, { ofAttribute: { $exists: false } }) - for (const oldStatus of oldStatuses) { - const space = map.get(oldStatus.space) - if (space !== undefined) { - try { - let ofAttribute = task.attribute.State - if (space._class === ('recruit:class:Vacancy' as Ref>)) { - ofAttribute = 'recruit:attribute:State' as Ref> - } - if (space._class === ('lead:class:Funnel' as Ref>)) { - ofAttribute = 'lead:attribute:State' as Ref> - } - if (space._class === ('board:class:Board' as Ref>)) { - ofAttribute = 'board:attribute:State' as Ref> - } - if (space._class === ('tracker:class:Project' as Ref>)) { - ofAttribute = 'tracker:attribute:IssueStatus' as Ref> - } - if (ofAttribute !== oldStatus.ofAttribute) { - await client.update(DOMAIN_STATUS, { _id: oldStatus._id }, { ofAttribute }) - } - } catch (err) { - console.log(err) - } - } - } -} - -function getTemplateOfAttribute (space: Ref): Ref> { - let ofAttribute = task.attribute.State - if (space === ('recruit:space:VacancyTemplates' as Ref)) { - ofAttribute = 'recruit:attribute:State' as Ref> - } - if (space === ('lead:space:FunnelTemplates' as Ref)) { - ofAttribute = 'lead:attribute:State' as Ref> - } - if (space === ('board:space:BoardTemplates' as Ref)) { - ofAttribute = 'board:attribute:State' as Ref> - } - return ofAttribute -} - -async function fixStatusDoneAttributes (client: MigrationClient): Promise { - const oldStatuses = await client.find(DOMAIN_STATUS, {}) - for (const oldStatus of oldStatuses) { - if (!oldStatus.ofAttribute.includes('DoneState')) continue - const ofAttribute = oldStatus.ofAttribute.replace('DoneState', 'State') - await client.update(DOMAIN_STATUS, { _id: oldStatus._id }, { ofAttribute }) - } -} - -async function removeDoneStatuses (client: MigrationClient): Promise { - const tasks = await client.find(DOMAIN_TASK, { doneState: { $exists: true } }) - for (const task of tasks) { - if ((task as any).doneState != null) { - await client.update(DOMAIN_TASK, { _id: task._id }, { status: (task as any).doneState, isDone: true }) - } - await client.update(DOMAIN_TASK, { _id: task._id }, { $unset: { doneState: '' } }) - } - await client.update( - DOMAIN_TX, - { 'tx.operations.doneState': { $ne: null } }, - { $rename: { 'tx.operations.doneState': 'tx.operations.status' } } - ) - await client.update( - DOMAIN_TX, - { 'tx.attributes.doneState': { $ne: null } }, - { $rename: { 'tx.attributes.doneState': 'tx.attributes.status' } } - ) - await client.update( - DOMAIN_TX, - { 'tx.operations.doneState': { $exists: true } }, - { $unset: { 'tx.operations.doneState': '' } } - ) - await client.update( - DOMAIN_TX, - { 'tx.attributes.doneState': { $exists: true } }, - { $unset: { 'tx.attributes.doneState': '' } } - ) - - // we need join doneStates to states for all projects - const classes = client.hierarchy.getDescendants(task.class.Project) - const projects = await client.find(DOMAIN_SPACE, { _class: { $in: classes }, doneStates: { $exists: true } }) - for (const project of projects) { - await client.update( - DOMAIN_SPACE, - { _id: project._id }, - { states: (project as any).states.concat((project as any).doneStates) } - ) - await client.update(DOMAIN_SPACE, { _id: project._id }, { $unset: { doneStates: '' } }) - } -} - -async function removeStateClass (client: MigrationClient): Promise { - await client.update( - DOMAIN_STATUS, - { _class: 'task:class:State' as Ref> }, - { _class: core.class.Status, category: task.statusCategory.Active } - ) - await client.update(DOMAIN_TX, { objectClass: 'task:class:State' }, { objectClass: core.class.Status }) - await client.update( - DOMAIN_STATUS, - { _class: 'task:class:WonState' as Ref> }, - { _class: core.class.Status, category: task.statusCategory.Won } - ) - await client.update(DOMAIN_TX, { objectClass: 'task:class:WonState' }, { objectClass: core.class.Status }) - await client.update( - DOMAIN_STATUS, - { _class: 'task:class:LostState' as Ref> }, - { _class: core.class.Status, category: task.statusCategory.Lost } - ) - await client.update(DOMAIN_TX, { objectClass: 'task:class:LostState' }, { objectClass: core.class.Status }) - await client.update( - DOMAIN_STATUS, - { _class: 'task:class:DoneState' as Ref> }, - { _class: core.class.Status } - ) - await client.update(DOMAIN_TX, { objectClass: 'task:class:DoneState' }, { objectClass: core.class.Status }) -} - -async function migrateTemplatesToTypes (client: MigrationClient): Promise { - interface KanbanTemplate extends Doc { - title: string - description?: string - shortDescription?: string - } - - interface KanbanTemplateSpace extends Space { - attachedToClass: Ref> - } - - interface StateTemplate extends Doc, Status { - attachedTo: Ref - rank: string - } - - const classes = client.hierarchy.getDescendants(task.class.Project) - const templates = await client.find(DOMAIN_KANBAN, { - _class: 'task:class:KanbanTemplate' as Ref> - }) - for (const template of templates) { - const used = await client.find(DOMAIN_SPACE, { templateId: template._id }) - if (used.length === 0) { - await client.delete(DOMAIN_KANBAN, template._id) - continue - } - const space = ( - await client.find(DOMAIN_SPACE, { _id: template.space as Ref }) - )[0] - if (space === undefined) continue - const states = await client.find( - DOMAIN_KANBAN, - { _class: 'task:class:StateTemplate' as Ref>, attachedTo: template._id }, - { sort: { rank: 1 } } - ) - const wonStates = await client.find( - DOMAIN_KANBAN, - { _class: 'task:class:WonStateTemplate' as Ref>, attachedTo: template._id }, - { sort: { rank: 1 } } - ) - const lostStates = await client.find( - DOMAIN_KANBAN, - { _class: 'task:class:LostStateTemplate' as Ref>, attachedTo: template._id }, - { sort: { rank: 1 } } - ) - - const statuses: ProjectStatus[] = [] - const currentStates = await client.find(DOMAIN_STATUS, {}) - for (const st of states) { - const exists = currentStates.find((p) => p.name.toLocaleLowerCase() === st.name.toLocaleLowerCase()) - if (exists !== undefined) { - statuses.push({ _id: exists._id, color: st.color }) - } else { - const id = generateId() - await client.create(DOMAIN_STATUS, { - ofAttribute: getTemplateOfAttribute(st.space), - name: st.name, - _id: id, - space: task.space.Statuses, - modifiedOn: st.modifiedOn, - modifiedBy: st.modifiedBy, - _class: core.class.Status, - color: st.color ?? 9, - createdBy: st.createdBy, - createdOn: st.createdOn, - category: task.statusCategory.Active - }) - statuses.push({ _id: id, color: st.color }) - } - } - - for (const st of wonStates) { - const exists = currentStates.find((p) => p.name.toLocaleLowerCase() === st.name.toLocaleLowerCase()) - if (exists !== undefined) { - statuses.push({ _id: exists._id, color: st.color }) - } else { - const id = generateId() - await client.create(DOMAIN_STATUS, { - ofAttribute: getTemplateOfAttribute(st.space), - name: st.name, - _id: id, - space: task.space.Statuses, - modifiedOn: st.modifiedOn, - modifiedBy: st.modifiedBy, - _class: core.class.Status, - color: st.color ?? 15, - createdBy: st.createdBy, - createdOn: st.createdOn, - category: task.statusCategory.Won - }) - statuses.push({ _id: id, color: st.color }) - } - } - - for (const st of lostStates) { - const exists = currentStates.find((p) => p.name.toLocaleLowerCase() === st.name.toLocaleLowerCase()) - if (exists !== undefined) { - statuses.push({ _id: exists._id, color: st.color }) - } else { - const id = generateId() - await client.create(DOMAIN_STATUS, { - ofAttribute: getTemplateOfAttribute(st.space), - name: st.name, - _id: id, - space: task.space.Statuses, - modifiedOn: st.modifiedOn, - modifiedBy: st.modifiedBy, - _class: core.class.Status, - color: st.color ?? 0, - createdBy: st.createdBy, - createdOn: st.createdOn, - category: task.statusCategory.Lost - }) - statuses.push({ _id: id, color: st.color }) - } - } - - const category = await getProjectTypeCategory(client, space.attachedToClass) - await client.create(DOMAIN_SPACE, { - name: template.title, - description: template.description ?? '', - shortDescription: template.shortDescription, - category: category ?? (template.space as Ref as Ref), - private: false, - members: [], - archived: false, - _id: template._id as Ref as Ref, - space: core.space.Space, - modifiedOn: template.modifiedOn, - modifiedBy: template.modifiedBy, - _class: task.class.ProjectType, - statuses - }) - await client.delete(DOMAIN_KANBAN, template._id) - } - - // we should found all projects without types and has templateID we should just rename it to type (if it exists) - const projectsWithTemplate = await client.find(DOMAIN_SPACE, { - _class: { $in: classes }, - type: { $exists: false }, - templateId: { $exists: true } - }) - for (const project of projectsWithTemplate) { - await client.update(DOMAIN_SPACE, { _id: project._id }, { type: (project as any).templateId }) - } - - // we should remove all state templates - const stateClasses = [ - 'task:class:StateTemplate' as Ref>, - 'task:class:WonStateTemplate' as Ref>, - 'task:class:LostStateTemplate' as Ref> - ] - const states = await client.find(DOMAIN_KANBAN, { _class: { $in: stateClasses } }) - for (const st of states) { - await client.delete(DOMAIN_KANBAN, st._id) - } -} - -async function getProjectTypeCategory ( - client: MigrationClient, - _class: Ref> -): Promise | undefined> { - let clazz = _class - while (true) { - const res = await client.model.findAll(task.class.ProjectTypeCategory, { attachedToClass: clazz }) - if (res[0] !== undefined) return res[0]._id - const parent = client.hierarchy.getClass(clazz) - if (parent.extends === undefined) return - clazz = parent.extends - } -} - -async function migrateProjectTypes (client: MigrationClient): Promise { - const classes = client.hierarchy.getDescendants(task.class.Project) - // we should found all projects without types and group by class and then by statuses and create new type - const projects = await client.find(DOMAIN_SPACE, { _class: { $in: classes }, type: { $exists: false } }) - const projectsByCategory = new Map, Project[]>() - for (const project of projects) { - const category = await getProjectTypeCategory(client, project._class) - if (category === undefined) continue - const arr = projectsByCategory.get(category) ?? [] - arr.push(project) - projectsByCategory.set(category, arr) - } - for (const [category, projects] of projectsByCategory) { - const gouped = group(projects) - for (const gr of gouped) { - await client.create(DOMAIN_SPACE, { - category, - name: gr.projects[0].name, - description: '', - private: false, - members: [], - archived: false, - _id: gr.type, - space: core.space.Space, - modifiedOn: Date.now(), - modifiedBy: core.account.System, - _class: task.class.ProjectType, - statuses: gr.statuses.map((p) => { - return { _id: p } - }) - }) - - await client.update(DOMAIN_SPACE, { _id: { $in: gr.projects.map((p) => p._id) } }, { type: gr.type }) - } - } - - // we need remove states from all projects - const allProjects = await client.find(DOMAIN_SPACE, { _class: { $in: classes } }) - await Promise.all( - allProjects.map(async (project) => { - await client.update( - DOMAIN_SPACE, - { _id: project._id }, - { $unset: { states: '', templateId: '', doneStates: '' } } - ) - }) - ) -} - -interface ProjectTypeGroup { - statuses: Ref[] - projects: Project[] - type: Ref -} - -function group (projects: Project[]): ProjectTypeGroup[] { - const map = new Map() - - for (const project of projects) { - const ids = getIds((project as any).states ?? []) - const obj: ProjectTypeGroup = map.get(ids) ?? { - statuses: (project as any).states ?? [], - projects: [], - type: generateId() - } - obj.projects.push(project) - map.set(ids, obj) - } - return Array.from(map.values()) -} - -function getIds (states: Ref[]): string { - return states.join(',') -} - export const taskOperation: MigrateOperation = { async migrate (client: MigrationClient): Promise { await tryMigrate(client, taskId, [ - { - state: 'fixStatusAttributes', - func: fixStatusAttributes - }, - { - state: 'renameState', - func: renameState - }, - { - state: 'removeDoneStatuses', - func: removeDoneStatuses - }, - { - state: 'fixStatusDoneAttributes', - func: fixStatusDoneAttributes - }, - { - state: 'removeStateClass', - func: removeStateClass - }, - { - state: 'migrateTemplatesToTypes', - func: migrateTemplatesToTypes - }, - { - state: 'migrateProjectTypes', - func: migrateProjectTypes - }, { state: 'projectTypeSpace', func: async (client) => { @@ -640,11 +113,6 @@ export const taskOperation: MigrateOperation = { task.category.TaskTag ) - await tryUpgrade(client, taskId, [ - { - state: 'renameStatePrefs', - func: renameStatePrefs - } - ]) + await tryUpgrade(client, taskId, []) } } diff --git a/models/task/src/plugin.ts b/models/task/src/plugin.ts index a8d397cd88..c0de8d6984 100644 --- a/models/task/src/plugin.ts +++ b/models/task/src/plugin.ts @@ -14,8 +14,9 @@ // limitations under the License. // +import {} from '@hcengineering/notification' import type { Ref, Space } from '@hcengineering/core' -import { mergeIds } from '@hcengineering/platform' +import { mergeIds, type IntlString } from '@hcengineering/platform' import { type TagCategory } from '@hcengineering/tags' import { taskId } from '@hcengineering/task' import task from '@hcengineering/task-resources/src/plugin' @@ -59,7 +60,14 @@ export default mergeIds(taskId, task, { StatusSelector: '' as AnyComponent, TemplatesIcon: '' as AnyComponent, TypesView: '' as AnyComponent, - StateIconPresenter: '' as AnyComponent + StateIconPresenter: '' as AnyComponent, + TaskTypePresenter: '' as AnyComponent, + ProjectTypePresenter: '' as AnyComponent, + TaskTypeClassPresenter: '' as AnyComponent, + ProjectTypeClassPresenter: '' as AnyComponent, + ManageProjects: '' as AnyComponent, + ManageProjectsTools: '' as AnyComponent, + ManageProjectsContent: '' as AnyComponent }, space: { TasksPublic: '' as Ref @@ -67,5 +75,10 @@ export default mergeIds(taskId, task, { viewlet: { TableIssue: '' as Ref, KanbanIssue: '' as Ref + }, + string: { + ManageProjects: '' as IntlString, + StateBacklog: '' as IntlString, + StateActive: '' as IntlString } }) diff --git a/models/tracker/src/index.ts b/models/tracker/src/index.ts index 3c94010807..ab96d2faca 100644 --- a/models/tracker/src/index.ts +++ b/models/tracker/src/index.ts @@ -211,6 +211,7 @@ function defineFilters (builder: Builder): void { // builder.mixin(tracker.class.Issue, core.class.Class, view.mixin.ClassFilters, { filters: [ + 'kind', 'status', 'priority', 'space', @@ -359,7 +360,8 @@ function defineApplication ( ['all', tracker.string.All, {}], ['active', tracker.string.Active, {}], ['backlog', tracker.string.Backlog, {}] - ] + ], + allProjectsTypes: true } }, { @@ -368,7 +370,6 @@ function defineApplication ( icon: view.icon.Archive, label: tracker.string.AllProjects, position: 'bottom', - visibleIf: workbench.function.IsOwner, spaceClass: tracker.class.Project, componentProps: { _class: tracker.class.Project, @@ -686,22 +687,27 @@ export function createModel (builder: Builder): void { ) builder.createDoc( - task.class.ProjectTypeCategory, + task.class.ProjectTypeDescriptor, core.space.Model, { - name: tracker.string.Projects, + name: tracker.string.TrackerApplication, description: tracker.string.ManageWorkflowStatuses, icon: task.component.TemplatesIcon, - attachedToClass: tracker.class.Project, - statusClass: tracker.class.IssueStatus, - statusCategories: [ - tracker.issueStatusCategory.Backlog, - tracker.issueStatusCategory.Unstarted, - tracker.issueStatusCategory.Started, - tracker.issueStatusCategory.Completed, - tracker.issueStatusCategory.Canceled - ] + baseClass: tracker.class.Project }, - tracker.category.ProjectTypeCategory + tracker.descriptors.ProjectType + ) + + builder.createDoc( + task.class.TaskTypeDescriptor, + core.space.Model, + { + baseClass: tracker.class.Issue, + allowCreate: true, + description: tracker.string.Issue, + icon: tracker.icon.Issue, + name: tracker.string.Issue + }, + tracker.descriptors.Issue ) } diff --git a/models/tracker/src/migration.ts b/models/tracker/src/migration.ts index cff9771d5f..3adb25162f 100644 --- a/models/tracker/src/migration.ts +++ b/models/tracker/src/migration.ts @@ -13,31 +13,20 @@ // limitations under the License. // -import core, { - DOMAIN_TX, - type Data, - type Ref, - SortingOrder, - type Status, - type TxCollectionCUD, - type TxCreateDoc, - TxOperations, - type TxUpdateDoc, - toIdMap -} from '@hcengineering/core' +import core, { SortingOrder, TxOperations, generateId, type Data, type Ref, type Status } from '@hcengineering/core' import { + createOrUpdate, + tryMigrate, type MigrateOperation, type MigrationClient, - type MigrationUpgradeClient, - createOrUpdate, - tryMigrate + type MigrationUpgradeClient } from '@hcengineering/model' -import { DOMAIN_TASK, createProjectType } from '@hcengineering/model-task' +import { DOMAIN_SPACE } from '@hcengineering/model-core' +import { createProjectType, fixTaskTypes } from '@hcengineering/model-task' import tags from '@hcengineering/tags' -import { type Issue, TimeReportDayType, type TimeSpendReport } from '@hcengineering/tracker' -import view from '@hcengineering/view' +import task, { type TaskType } from '@hcengineering/task' +import { TimeReportDayType } from '@hcengineering/tracker' import tracker from './plugin' -import { DOMAIN_TRACKER } from './types' async function createDefaultProject (tx: TxOperations): Promise { const current = await tx.findOne(tracker.class.Project, { @@ -48,14 +37,12 @@ async function createDefaultProject (tx: TxOperations): Promise { objectId: tracker.project.DefaultProject }) - // Create new if not deleted by customers. - if (current === undefined && currentDeleted === undefined) { + if ((await tx.findOne(task.class.ProjectType, { _id: tracker.ids.ClassingProjectType })) === undefined) { const categories = await tx.findAll( core.class.StatusCategory, { ofAttribute: tracker.attribute.IssueStatus }, { sort: { order: SortingOrder.Ascending } } ) - const states: Omit, 'rank'>[] = [] for (const category of categories) { @@ -65,22 +52,85 @@ async function createDefaultProject (tx: TxOperations): Promise { category: category._id }) } + await createProjectType( + tx, + { + name: 'Classic project', + descriptor: tracker.descriptors.ProjectType, + description: '', + tasks: [] + }, + [ + { + _id: tracker.taskTypes.Issue, + descriptor: tracker.descriptors.Issue, + name: 'Issue', + factory: states, + ofClass: tracker.class.Issue, + targetClass: tracker.class.Issue, + statusCategories: categories.map((it) => it._id), + statusClass: core.class.Status, + kind: 'both', + allowedAsChildOf: [tracker.taskTypes.Issue] + } + ], + tracker.ids.ClassingProjectType + ) + } - const typeId = await createProjectType( + if ((await tx.findOne(task.class.ProjectType, { _id: tracker.ids.BaseProjectType })) === undefined) { + const issueId: Ref = generateId() + const baseCategories = [ + task.statusCategory.UnStarted, + task.statusCategory.Active, + task.statusCategory.Won, + task.statusCategory.Lost + ] + const categories = await tx.findAll( + core.class.StatusCategory, + { _id: { $in: baseCategories } }, + { sort: { order: SortingOrder.Ascending } } + ) + const states: Omit, 'rank'>[] = [] + + for (const category of categories) { + states.push({ + ofAttribute: tracker.attribute.IssueStatus, + name: category.defaultStatusName, + category: category._id + }) + } + await createProjectType( tx, { name: 'Base project', - category: tracker.category.ProjectTypeCategory, - description: '' + descriptor: tracker.descriptors.ProjectType, + description: '', + tasks: [] }, - states, - tracker.ids.BaseProjectType, - tracker.class.IssueStatus + [ + { + _id: issueId, + name: 'Issue', + descriptor: tracker.descriptors.Issue, + factory: states, + ofClass: tracker.class.Issue, + targetClass: tracker.class.Issue, + statusCategories: baseCategories, + statusClass: core.class.Status, + kind: 'both', + allowedAsChildOf: [issueId] + } + ], + tracker.ids.BaseProjectType ) + } + // Create new if not deleted by customers. + if (current === undefined && currentDeleted === undefined) { const state = await tx.findOne( tracker.class.IssueStatus, - { space: typeId }, + { space: tracker.ids.DefaultProjectType }, { sort: { rank: SortingOrder.Ascending } } ) if (state !== undefined) { @@ -98,7 +148,7 @@ async function createDefaultProject (tx: TxOperations): Promise { defaultIssueStatus: state._id, defaultTimeReportDay: TimeReportDayType.PreviousWorkDay, defaultAssignee: undefined, - type: typeId + type: tracker.ids.DefaultProjectType }, tracker.project.DefaultProject ) @@ -123,184 +173,55 @@ async function createDefaults (tx: TxOperations): Promise { ) } -async function fixIconsWithEmojis (tx: TxOperations): Promise { - const projectsWithWrongIcon = await tx.findAll(tracker.class.Project, { icon: tracker.component.IconWithEmoji }) - const promises = [] - for (const project of projectsWithWrongIcon) { - promises.push(tx.update(project, { icon: view.ids.IconWithEmoji })) - } - await Promise.all(promises) -} - -async function fixSpentTime (client: MigrationClient): Promise { - const issues = await client.find(DOMAIN_TASK, { reportedTime: { $gt: 0 } }) - for (const issue of issues) { - const childInfo = issue.childInfo - for (const child of childInfo ?? []) { - child.reportedTime = child.reportedTime * 8 - } - await client.update(DOMAIN_TASK, { _id: issue._id }, { reportedTime: issue.reportedTime * 8, childInfo }) - } - const reports = await client.find(DOMAIN_TRACKER, {}) - for (const report of reports) { - await client.update(DOMAIN_TRACKER, { _id: report._id }, { value: report.value * 8 }) - } - const createTxes = await client.find>(DOMAIN_TX, { - 'tx.objectClass': tracker.class.TimeSpendReport, - 'tx._class': core.class.TxCreateDoc, - 'tx.attributes.value': { $exists: true } - }) - for (const tx of createTxes) { - await client.update( - DOMAIN_TX, - { _id: tx._id }, - { 'tx.attributes.value': (tx.tx as TxCreateDoc).attributes.value * 8 } - ) - } - const updateTxes = await client.find>(DOMAIN_TX, { - 'tx.objectClass': tracker.class.TimeSpendReport, - 'tx._class': core.class.TxUpdateDoc, - 'tx.operations.value': { $exists: true } - }) - for (const tx of updateTxes) { - const val = (tx.tx as TxUpdateDoc).operations.value - if (val !== undefined) { - await client.update(DOMAIN_TX, { _id: tx._id }, { 'tx.operations.value': val * 8 }) - } - } -} - -async function fixEstimation (client: MigrationClient): Promise { - const issues = await client.find(DOMAIN_TASK, { estimation: { $gt: 0 } }) - for (const issue of issues) { - const childInfo = issue.childInfo - for (const child of childInfo ?? []) { - child.estimation = child.estimation * 8 - } - await client.update(DOMAIN_TASK, { _id: issue._id }, { estimation: issue.estimation * 8, childInfo }) - } - const createTxes = await client.find>(DOMAIN_TX, { - 'tx.objectClass': tracker.class.Issue, - 'tx._class': core.class.TxCreateDoc, - 'tx.attributes.estimation': { $gt: 0 } - }) - for (const tx of createTxes) { - await client.update( - DOMAIN_TX, - { _id: tx._id }, - { 'tx.attributes.estimation': (tx.tx as TxCreateDoc).attributes.estimation * 8 } - ) - } - const updateTxes = await client.find>(DOMAIN_TX, { - 'tx.objectClass': tracker.class.Issue, - 'tx._class': core.class.TxUpdateDoc, - 'tx.operations.estimation': { $exists: true } - }) - for (const tx of updateTxes) { - const val = (tx.tx as TxUpdateDoc).operations.estimation - if (val !== undefined) { - await client.update(DOMAIN_TX, { _id: tx._id }, { 'tx.operations.estimation': val * 8 }) - } - } -} - -async function fixRemainingTime (client: MigrationClient): Promise { - while (true) { - const issues = await client.find( - DOMAIN_TASK, - { _class: tracker.class.Issue, remainingTime: { $exists: false } }, - { limit: 1000 } - ) - for (const issue of issues) { - await client.update( - DOMAIN_TASK, - { _id: issue._id }, - { remainingTime: Math.max(0, issue.estimation - issue.reportedTime) } - ) - } - if (issues.length === 0) { - break - } - } - await client.update( - DOMAIN_TASK, - { _class: { $ne: tracker.class.Issue }, remainingTime: { $exists: true } }, - { $unset: { remainingTime: '' } } - ) -} - -async function fixParentsSpace (client: MigrationClient): Promise { - while (true) { - const issues = await client.find( - DOMAIN_TASK, - { _class: tracker.class.Issue, 'parents.space': { $exists: false }, parents: { $exists: true, $ne: [] } }, - { limit: 1000 } - ) - - const parentIds = new Set>() - for (const i of issues) { - for (const p of i.parents ?? []) { - parentIds.add(p.parentId) +async function fixTrackerTaskTypes (client: MigrationClient): Promise { + await fixTaskTypes(client, tracker.descriptors.ProjectType, async (t) => { + const typeId: Ref = generateId() + return [ + { + _id: typeId, + name: 'Issue', + descriptor: tracker.descriptors.Issue, + ofClass: tracker.class.Issue, + targetClass: tracker.class.Issue, + statusCategories: [ + tracker.issueStatusCategory.Backlog, + tracker.issueStatusCategory.Unstarted, + tracker.issueStatusCategory.Started, + tracker.issueStatusCategory.Completed, + tracker.issueStatusCategory.Canceled + ], + statusClass: tracker.class.IssueStatus, + kind: 'task', + allowedAsChildOf: [typeId] } - } - - const parentIssues = toIdMap( - await client.find(DOMAIN_TASK, { _class: tracker.class.Issue, _id: { $in: Array.from(parentIds) } }) - ) - - for (const issue of issues) { - await client.update( - DOMAIN_TASK, - { _id: issue._id }, - { parents: issue.parents.map((it) => ({ ...it, space: parentIssues.get(it.parentId)?.space ?? it.space })) } - ) - } - if (issues.length === 0) { - break - } - } - await client.update( - DOMAIN_TASK, - { _class: { $ne: tracker.class.Issue }, remainingTime: { $exists: true } }, - { $unset: { remainingTime: '' } } - ) -} - -async function moveIssues (client: MigrationClient): Promise { - const docs = await client.find(DOMAIN_TRACKER, { _class: tracker.class.Issue }) - if (docs.length > 0) { - await client.move(DOMAIN_TRACKER, { _class: tracker.class.Issue }, DOMAIN_TASK) - } + ] + }) } export const trackerOperation: MigrateOperation = { async migrate (client: MigrationClient): Promise { await tryMigrate(client, 'tracker', [ { - state: 'moveIssues', - func: moveIssues + state: 'fix-category-descriptors', + func: async (client) => { + await client.update( + DOMAIN_SPACE, + { _class: task.class.ProjectType, category: 'tracker:category:ProjectTypeCategory' }, + { + $set: { descriptor: tracker.descriptors.ProjectType }, + $unset: { category: 1 } + } + ) + } }, { - state: 'reportTimeDayToHour', - func: fixSpentTime - }, - { - state: 'estimationDayToHour', - func: fixEstimation - }, - { - state: 'fixRemainingTime', - func: fixRemainingTime - }, - { - state: 'fixParentsSpace', - func: fixParentsSpace + state: 'fixTaskTypes', + func: fixTrackerTaskTypes } ]) }, async upgrade (client: MigrationUpgradeClient): Promise { const tx = new TxOperations(client, core.account.System) await createDefaults(tx) - await fixIconsWithEmojis(tx) } } diff --git a/models/tracker/src/plugin.ts b/models/tracker/src/plugin.ts index 1cd9f61d83..a0e324c192 100644 --- a/models/tracker/src/plugin.ts +++ b/models/tracker/src/plugin.ts @@ -13,18 +13,18 @@ // See the License for the specific language governing permissions and // limitations under the License. // +import { type DocUpdateMessageViewlet, type TxViewlet } from '@hcengineering/activity' +import { type ChatMessageViewlet } from '@hcengineering/chunter' import { type Doc, type Ref } from '@hcengineering/core' import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineering/model-presentation' -import { type IntlString, type Resource, mergeIds } from '@hcengineering/platform' -import { type ProjectType } from '@hcengineering/task' +import { type NotificationGroup, type NotificationType } from '@hcengineering/notification' +import { mergeIds, type IntlString, type Resource } from '@hcengineering/platform' +import { type ProjectType, type TaskTypeDescriptor } from '@hcengineering/task' import { trackerId } from '@hcengineering/tracker' import tracker from '@hcengineering/tracker-resources/src/plugin' import type { AnyComponent } from '@hcengineering/ui/src/types' import { type Action, type ViewAction, type Viewlet } from '@hcengineering/view' import { type Application } from '@hcengineering/workbench' -import { type DocUpdateMessageViewlet, type TxViewlet } from '@hcengineering/activity' -import { type NotificationGroup, type NotificationType } from '@hcengineering/notification' -import { type ChatMessageViewlet } from '@hcengineering/chunter' export default mergeIds(trackerId, tracker, { string: { @@ -59,7 +59,8 @@ export default mergeIds(trackerId, tracker, { MilestoneFilter: '' as AnyComponent, EditRelatedTargets: '' as AnyComponent, EditRelatedTargetsPopup: '' as AnyComponent, - IssueSearchIcon: '' as AnyComponent + IssueSearchIcon: '' as AnyComponent, + MembersArrayEditor: '' as AnyComponent }, app: { Tracker: '' as Ref @@ -85,7 +86,9 @@ export default mergeIds(trackerId, tracker, { IssueChatMessageViewlet: '' as Ref, IssueTemplateChatMessageViewlet: '' as Ref, ComponentChatMessageViewlet: '' as Ref, - MilestoneChatMessageViewlet: '' as Ref + MilestoneChatMessageViewlet: '' as Ref, + ClassingProjectType: '' as Ref, + DefaultProjectType: '' as Ref }, completion: { IssueQuery: '' as Resource, @@ -106,5 +109,8 @@ export default mergeIds(trackerId, tracker, { DeleteProject: '' as Ref>>, DeleteProjectClean: '' as Ref>>, DeleteIssue: '' as Ref>> + }, + descriptors: { + Issue: '' as Ref } }) diff --git a/models/tracker/src/types.ts b/models/tracker/src/types.ts index bf3c9a54b2..aac243f985 100644 --- a/models/tracker/src/types.ts +++ b/models/tracker/src/types.ts @@ -69,7 +69,7 @@ import chunter from '@hcengineering/chunter' export const DOMAIN_TRACKER = 'tracker' as Domain @Model(tracker.class.IssueStatus, core.class.Status) -@UX(tracker.string.IssueStatuses, undefined, undefined, 'rank', 'name') +@UX(tracker.string.IssueStatus, undefined, undefined, 'rank', 'name') export class TIssueStatus extends TStatus implements IssueStatus {} /** * @public @@ -120,7 +120,7 @@ export class TProject extends TTaskProject implements Project { declare defaultTimeReportDay: TimeReportDayType - @Prop(Collection(tracker.class.RelatedIssueTarget), tracker.string.RelatedIssue) + @Prop(Collection(tracker.class.RelatedIssueTarget), tracker.string.RelatedIssues) relatedIssueTargets!: number } /** diff --git a/models/tracker/src/viewlets.ts b/models/tracker/src/viewlets.ts index 5d604aeba4..9ad3ec976a 100644 --- a/models/tracker/src/viewlets.ts +++ b/models/tracker/src/viewlets.ts @@ -26,6 +26,7 @@ import tags from '@hcengineering/tags' export const issuesOptions = (kanban: boolean): ViewOptionsModel => ({ groupBy: [ 'status', + 'kind', 'assignee', 'priority', 'component', @@ -38,6 +39,7 @@ export const issuesOptions = (kanban: boolean): ViewOptionsModel => ({ ], orderBy: [ ['status', SortingOrder.Ascending], + ['kind', SortingOrder.Ascending], ['priority', SortingOrder.Ascending], ['modifiedOn', SortingOrder.Descending], ['createdOn', SortingOrder.Descending], @@ -95,6 +97,13 @@ export function issueConfig ( props: { kind: 'list', size: 'small', justify: 'center' }, displayProps: { key: key + 'status' } }, + // { + // key: 'kind', + // label: task.string.TaskType, + // presenter: task.component.TaskTypePresenter, + // props: { kind: 'list', size: 'small', justify: 'center' }, + // displayProps: { key: key + 'kind' } + // }, { key: '', label: tracker.string.Title, @@ -230,9 +239,10 @@ export function defineViewlets (builder: Builder): void { ) const subIssuesOptions: ViewOptionsModel = { - groupBy: ['status', 'assignee', 'priority', 'milestone', 'createdBy', 'modifiedBy'], + groupBy: ['status', 'kind', 'assignee', 'priority', 'milestone', 'createdBy', 'modifiedBy'], orderBy: [ ['rank', SortingOrder.Ascending], + ['kind', SortingOrder.Ascending], ['status', SortingOrder.Ascending], ['priority', SortingOrder.Ascending], ['modifiedOn', SortingOrder.Descending], @@ -508,8 +518,9 @@ export function defineViewlets (builder: Builder): void { attachTo: tracker.class.Project, descriptor: view.viewlet.List, viewOptions: { - groupBy: ['createdBy'], + groupBy: ['type', 'createdBy'], orderBy: [ + ['type', SortingOrder.Descending], ['modifiedOn', SortingOrder.Descending], ['createdOn', SortingOrder.Descending] ], @@ -524,7 +535,26 @@ export function defineViewlets (builder: Builder): void { key: '', props: { kind: 'list' } }, - { key: '', displayProps: { grow: true } } + { key: '', displayProps: { grow: true } }, + { + key: '', + presenter: tracker.component.MembersArrayEditor, + sortingKey: 'members', + props: { readonly: true, kind: 'list' } + }, + { + key: 'type', + props: { kind: 'list' } + }, + { + key: 'defaultAssignee', + props: { kind: 'list' } + }, + { + key: 'modifiedOn', + presenter: tracker.component.ModificationDatePresenter, + displayProps: { fixed: 'right', dividerBefore: true } + } ] }, tracker.viewlet.ProjectList diff --git a/packages/core/src/hierarchy.ts b/packages/core/src/hierarchy.ts index f8bbd9c25a..3597a4bd13 100644 --- a/packages/core/src/hierarchy.ts +++ b/packages/core/src/hierarchy.ts @@ -427,7 +427,11 @@ export class Hierarchy { this.classifierProperties.delete(attribute.attributeOf) } - getAllAttributes (clazz: Ref, to?: Ref): Map { + getAllAttributes ( + clazz: Ref, + to?: Ref, + traverse?: (name: string, attr: AnyAttribute) => void + ): Map { const result = new Map() let ancestors = this.getAncestors(clazz) if (to !== undefined) { @@ -448,6 +452,7 @@ export class Hierarchy { const attributes = this.attributes.get(cls) if (attributes !== undefined) { for (const [name, attr] of attributes) { + traverse?.(name, attr) result.set(name, attr) } } diff --git a/packages/platform-rig/profiles/package/eslint.config.json b/packages/platform-rig/profiles/package/eslint.config.json index f91dabca82..5fc789658b 100644 --- a/packages/platform-rig/profiles/package/eslint.config.json +++ b/packages/platform-rig/profiles/package/eslint.config.json @@ -7,5 +7,5 @@ "@typescript-eslint/array-type": "off", "@typescript-eslint/promise-function-async": "off", "@typescript-eslint/consistent-type-imports": "off" - } + } } diff --git a/packages/platform-rig/profiles/ui/eslint.config.json b/packages/platform-rig/profiles/ui/eslint.config.json index f2dfc00197..9397f5f415 100644 --- a/packages/platform-rig/profiles/ui/eslint.config.json +++ b/packages/platform-rig/profiles/ui/eslint.config.json @@ -19,6 +19,14 @@ }, "plugins": ["@typescript-eslint", "import"], "ignorePatterns": ["*.json", "node_modules/*", ".eslintrc.js"], + "settings": { + "import/resolver": { + "node": { + "extensions": [".ts"], + "moduleDirectory": ["src", "node_modules"] + } + } + }, "overrides": [ { "files": ["**/*.svelte"], @@ -30,13 +38,13 @@ "@typescript-eslint/array-type": "off", "@typescript-eslint/promise-function-async": "off", "@typescript-eslint/consistent-type-imports": "off", - "import/first": "off", - "import/no-duplicates": "off", + "import/first": "warn", + "import/no-duplicates": "warn", "import/no-mutable-exports": "off", - "import/no-unresolved": "off", - "no-multiple-empty-lines": "off", + "import/no-unresolved": "warn", + "no-multiple-empty-lines": "warn", "no-undef-init": "off", - "no-use-before-define": "off", + "no-use-before-define": "warn", // This need to be enabled eventually "@typescript-eslint/explicit-function-return-type": "warn", "@typescript-eslint/strict-boolean-expressions":"warn", diff --git a/packages/platform/src/i18n.ts b/packages/platform/src/i18n.ts index f996a5bfdb..eaf74cde80 100644 --- a/packages/platform/src/i18n.ts +++ b/packages/platform/src/i18n.ts @@ -21,7 +21,7 @@ import type { IntlString, Plugin } from './platform' import { Severity, Status, unknownError } from './status' import { getMetadata } from './metadata' -import platform from './platform' +import platform, { _EmbeddedId } from './platform' /** * @public @@ -119,7 +119,7 @@ export async function translate

> ( } else { try { const id = _parseId(message) - if (id.component === 'embedded') { + if (id.component === _EmbeddedId) { return id.name } const translation = (await getTranslation(id, locale)) ?? message diff --git a/packages/presentation/src/components/AttributeEditor.svelte b/packages/presentation/src/components/AttributeEditor.svelte index 9cd1986659..4b1712bf16 100644 --- a/packages/presentation/src/components/AttributeEditor.svelte +++ b/packages/presentation/src/components/AttributeEditor.svelte @@ -17,9 +17,9 @@ // import core from '@hcengineering/core' import type { Class, Doc, Ref } from '@hcengineering/core' import { getResource } from '@hcengineering/platform' - import type { AnySvelteComponent } from '@hcengineering/ui' + import type { AnySvelteComponent, EditStyle } from '@hcengineering/ui' import view from '@hcengineering/view' - import { getAttribute, KeyedAttribute, updateAttribute } from '../attributes' + import { KeyedAttribute, getAttribute, updateAttribute } from '../attributes' import { getAttributePresenterClass, getClient } from '../utils' export let _class: Ref> @@ -29,6 +29,7 @@ export let focus: boolean = false export let editable = true export let focusIndex = -1 + export let editKind: EditStyle | undefined = undefined const client = getClient() const hierarchy = client.getHierarchy() @@ -42,7 +43,9 @@ $: if (presenterClass !== undefined) { const typeClass = hierarchy.getClass(presenterClass.attrClass) const editorMixin = hierarchy.as(typeClass, view.mixin.AttributeEditor) - editor = getResource(editorMixin.inlineEditor) + if (editorMixin.inlineEditor !== undefined) { + editor = getResource(editorMixin.inlineEditor) + } } function onChange (value: any) { @@ -67,6 +70,7 @@ {onChange} {focus} {focusIndex} + {editKind} /> {/await} {/if} diff --git a/packages/presentation/src/components/Card.svelte b/packages/presentation/src/components/Card.svelte index 01fa03f89d..f8f8c89292 100644 --- a/packages/presentation/src/components/Card.svelte +++ b/packages/presentation/src/components/Card.svelte @@ -15,10 +15,17 @@ --> { - space = evt.detail - dispatch('change', space) - }} - on:space + on:object {findDefaultSpace} /> diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss index 0ced03b22e..6478e5ebe0 100644 --- a/packages/theme/styles/_layouts.scss +++ b/packages/theme/styles/_layouts.scss @@ -692,6 +692,7 @@ input.search { .min-w-60 { min-width: 15rem; } .min-w-80 { min-width: 20rem; } .min-w-100 { min-width: 25rem; } +.min-w-144 { min-width: 25rem; } .min-w-168 { min-width: 42rem; } .min-w-min { min-width: min-content; } .min-h-0 { min-height: 0; } @@ -841,6 +842,7 @@ a.no-line { .uppercase { text-transform: uppercase; } .lower { text-transform: lowercase; } .text-left { text-align: left; } +.text-right { text-align: right !important; } .text-center { text-align: center; } .leading-16px { line-height: 16px; } .leading-3 { line-height: .75rem; } diff --git a/packages/ui/src/components/DropdownLabels.svelte b/packages/ui/src/components/DropdownLabels.svelte index 6a63dbc3fb..9c743395b1 100644 --- a/packages/ui/src/components/DropdownLabels.svelte +++ b/packages/ui/src/components/DropdownLabels.svelte @@ -97,7 +97,9 @@ }} > - {#if Array.isArray(selectedItem)} + {#if $$slots.content} + + {:else if Array.isArray(selectedItem)} {#if selectedItem.length > 0} {#each selectedItem as seleceted, i} {seleceted.label} diff --git a/packages/ui/src/components/DropdownLabelsPopup.svelte b/packages/ui/src/components/DropdownLabelsPopup.svelte index 92dbd4b9cc..0d4d75d947 100644 --- a/packages/ui/src/components/DropdownLabelsPopup.svelte +++ b/packages/ui/src/components/DropdownLabelsPopup.svelte @@ -107,7 +107,7 @@ /> {/if} -

+
diff --git a/packages/ui/src/components/EditBox.svelte b/packages/ui/src/components/EditBox.svelte index bdc2ae9195..2b24872209 100644 --- a/packages/ui/src/components/EditBox.svelte +++ b/packages/ui/src/components/EditBox.svelte @@ -147,7 +147,7 @@ class:flex-grow={fullSize} class:w-full={focusable || fullSize} class:uppercase - on:click={() => { + on:click|stopPropagation={() => { input.focus() }} use:resizeObserver={(element) => { @@ -181,7 +181,9 @@ on:change on:keydown on:keypress - on:blur + on:blur={() => { + dispatch('blur', value) + }} /> {:else if format === 'number'} { + dispatch('blur', value) + }} /> {:else} { + dispatch('blur', value) + }} /> {/if}
diff --git a/packages/ui/src/components/Label.svelte b/packages/ui/src/components/Label.svelte index c982384cfb..3480344e33 100644 --- a/packages/ui/src/components/Label.svelte +++ b/packages/ui/src/components/Label.svelte @@ -20,7 +20,7 @@ export let label: IntlString export let params: Record = {} - let _value: string | undefined = undefined + let _value: string | undefined $: if (label !== undefined) { translate(label, params ?? {}, $themeStore.language) diff --git a/packages/ui/src/components/ListView.svelte b/packages/ui/src/components/ListView.svelte index fd5478b057..fc2a646299 100644 --- a/packages/ui/src/components/ListView.svelte +++ b/packages/ui/src/components/ListView.svelte @@ -21,6 +21,7 @@ export let addClass: string | undefined = undefined export let noScroll: boolean = false export let kind: 'default' | 'thin' = 'default' + export let updateOnMouse = true const refs: HTMLElement[] = [] @@ -75,10 +76,14 @@ class="list-item{addClass ? ` ${addClass}` : ''}" class:selection={row === selection} on:mouseover={mouseAttractor(() => { - onRow(row) + if (updateOnMouse) { + onRow(row) + } })} on:mouseenter={mouseAttractor(() => { - onRow(row) + if (updateOnMouse) { + onRow(row) + } })} on:focus={() => {}} bind:this={refs[row]} @@ -100,6 +105,9 @@ margin: 0 0.5rem; min-width: 0; border-radius: 0.25rem; + &:hover { + background-color: var(--theme-popup-divider); + } } &.thin { .list-item { diff --git a/packages/ui/src/components/Scroller.svelte b/packages/ui/src/components/Scroller.svelte index 8c75430482..d818aa4fa2 100644 --- a/packages/ui/src/components/Scroller.svelte +++ b/packages/ui/src/components/Scroller.svelte @@ -19,10 +19,10 @@ import { closeTooltip, tooltipstore } from '../tooltips' import type { FadeOptions } from '../types' import { defaultSP } from '../types' - import IconUpOutline from './icons/UpOutline.svelte' + import { DelayedCaller } from '../utils' import IconDownOutline from './icons/DownOutline.svelte' import HalfUpDown from './icons/HalfUpDown.svelte' - import { DelayedCaller } from '../utils' + import IconUpOutline from './icons/UpOutline.svelte' export let padding: string | undefined = undefined export let autoscroll: boolean = false diff --git a/packages/ui/src/components/calendar/DatePresenter.svelte b/packages/ui/src/components/calendar/DatePresenter.svelte index 6ced13b297..39fe9f914e 100644 --- a/packages/ui/src/components/calendar/DatePresenter.svelte +++ b/packages/ui/src/components/calendar/DatePresenter.svelte @@ -14,7 +14,7 @@ --> + + + + + + + + + + + diff --git a/packages/ui/src/components/internal/LangSelector.svelte b/packages/ui/src/components/internal/LangSelector.svelte index 89c7aded4c..8c389d03db 100644 --- a/packages/ui/src/components/internal/LangSelector.svelte +++ b/packages/ui/src/components/internal/LangSelector.svelte @@ -15,9 +15,8 @@
- +
diff --git a/plugins/board-resources/src/components/UserBoxList.svelte b/plugins/board-resources/src/components/UserBoxList.svelte index 65abaa0c4d..4ddc0e121b 100644 --- a/plugins/board-resources/src/components/UserBoxList.svelte +++ b/plugins/board-resources/src/components/UserBoxList.svelte @@ -1,8 +1,7 @@
- +
diff --git a/plugins/lead/src/index.ts b/plugins/lead/src/index.ts index 4bd1f3792e..7ecccb8308 100644 --- a/plugins/lead/src/index.ts +++ b/plugins/lead/src/index.ts @@ -19,7 +19,7 @@ import type { Attribute, Class, Doc, Ref, Status, Timestamp } from '@hcengineeri import { Mixin } from '@hcengineering/core' import type { Asset, IntlString, Plugin } from '@hcengineering/platform' import { plugin } from '@hcengineering/platform' -import type { Project, ProjectTypeCategory, Task } from '@hcengineering/task' +import type { Project, ProjectTypeDescriptor, Task, TaskType } from '@hcengineering/task' /** * @public @@ -82,8 +82,11 @@ const lead = plugin(leadId, { LeadApplication: '' as Asset, CreateCustomer: '' as Asset }, - category: { - FunnelTypeCategory: '' as Ref + descriptors: { + FunnelType: '' as Ref + }, + taskType: { + Lead: '' as Ref } }) diff --git a/plugins/login-resources/src/components/Form.svelte b/plugins/login-resources/src/components/Form.svelte index bdebb1c3a4..d46a4f19d3 100644 --- a/plugins/login-resources/src/components/Form.svelte +++ b/plugins/login-resources/src/components/Form.svelte @@ -20,13 +20,12 @@ StylishEdit, Label, Button, - deviceOptionsStore as deviceInfo + deviceOptionsStore as deviceInfo, + themeStore } from '@hcengineering/ui' import StatusControl from './StatusControl.svelte' - import { OK, Status, Severity } from '@hcengineering/platform' + import { OK, Status, Severity, translate } from '@hcengineering/platform' import type { IntlString } from '@hcengineering/platform' - import { translate } from '@hcengineering/platform' - import { themeStore } from '@hcengineering/ui' import login from '../plugin' import { onMount } from 'svelte' diff --git a/plugins/login-resources/src/components/LoginApp.svelte b/plugins/login-resources/src/components/LoginApp.svelte index 10fa933da3..56228b0172 100644 --- a/plugins/login-resources/src/components/LoginApp.svelte +++ b/plugins/login-resources/src/components/LoginApp.svelte @@ -14,11 +14,10 @@ // limitations under the License. --> -
-
+
+
-
-
{#each preferencesGroups as preferenceGroup} { currentPreferenceGroup = preferenceGroup group = undefined + const loc = getCurrentResolvedLocation() + loc.path.length = 4 + navigate(loc) }} /> {/each} @@ -96,6 +104,10 @@ on:click={() => { group = gr._id currentPreferenceGroup = undefined + const loc = getCurrentResolvedLocation() + loc.path[4] = group + loc.path.length = 5 + navigate(loc) }} /> {/each} @@ -103,8 +115,6 @@
- -
{#if group} diff --git a/plugins/recruit-resources/src/components/CandidateCard.svelte b/plugins/recruit-resources/src/components/CandidateCard.svelte index 358bd78dd8..e8563c2a97 100644 --- a/plugins/recruit-resources/src/components/CandidateCard.svelte +++ b/plugins/recruit-resources/src/components/CandidateCard.svelte @@ -15,13 +15,12 @@
- +
diff --git a/plugins/recruit-resources/src/components/VacancyCard.svelte b/plugins/recruit-resources/src/components/VacancyCard.svelte index f6ecbd2903..f1257dd9d8 100644 --- a/plugins/recruit-resources/src/components/VacancyCard.svelte +++ b/plugins/recruit-resources/src/components/VacancyCard.svelte @@ -23,7 +23,7 @@ import { NavLink } from '@hcengineering/view-resources' import recruit from '../plugin' import VacancyIcon from './icons/Vacancy.svelte' - import notification from '@hcengineering/notification' + import chunter from '@hcengineering/chunter' export let vacancy: WithLookup | undefined export let disabled: boolean = false @@ -97,7 +97,7 @@
key.attr.isCustom) async function onDescriptionChange (value: string) { - await client.update(type, { description: value }) - } - - async function onShortDescriptionChange (value: string) { - await client.update(type, { shortDescription: value }) + await client.diffUpdate(type, { description: value }) } -
-
-
- onShortDescriptionChange(type.shortDescription ?? '')} - /> -
-
+
@@ -56,6 +42,7 @@ onDescriptionChange(evt.detail)} diff --git a/plugins/recruit-resources/src/index.ts b/plugins/recruit-resources/src/index.ts index e77d136b55..49ff9555b4 100644 --- a/plugins/recruit-resources/src/index.ts +++ b/plugins/recruit-resources/src/index.ts @@ -14,17 +14,17 @@ // import { + toIdMap, type Client, type Doc, type DocumentQuery, type FindResult, type ObjQueryType, type Ref, - type RelatedDocument, - toIdMap + type RelatedDocument } from '@hcengineering/core' -import { OK, type Resources, Severity, Status } from '@hcengineering/platform' -import { type ObjectSearchResult, createQuery } from '@hcengineering/presentation' +import { OK, Severity, Status, type Resources } from '@hcengineering/platform' +import { createQuery, type ObjectSearchResult } from '@hcengineering/presentation' import { type Applicant, type Candidate, type Vacancy } from '@hcengineering/recruit' import task from '@hcengineering/task' import { showPopup } from '@hcengineering/ui' @@ -49,13 +49,13 @@ import SkillsView from './components/SkillsView.svelte' import TemplatesIcon from './components/TemplatesIcon.svelte' import Vacancies from './components/Vacancies.svelte' import VacancyCountPresenter from './components/VacancyCountPresenter.svelte' +import VacancyEditor from './components/VacancyEditor.svelte' import VacancyItem from './components/VacancyItem.svelte' import VacancyItemPresenter from './components/VacancyItemPresenter.svelte' import VacancyList from './components/VacancyList.svelte' import VacancyModifiedPresenter from './components/VacancyModifiedPresenter.svelte' import VacancyPresenter from './components/VacancyPresenter.svelte' import VacancyTemplateEditor from './components/VacancyTemplateEditor.svelte' -import VacancyEditor from './components/VacancyEditor.svelte' import CreateOpinion from './components/review/CreateOpinion.svelte' import CreateReview from './components/review/CreateReview.svelte' import EditReview from './components/review/EditReview.svelte' @@ -78,8 +78,8 @@ import { resolveLocation } from './utils' -import { MoveApplicant } from './actionImpl' import { get } from 'svelte/store' +import { MoveApplicant } from './actionImpl' async function createOpinion (object: Doc): Promise { showPopup(CreateOpinion, { space: object.space, review: object._id }) diff --git a/plugins/recruit/src/index.ts b/plugins/recruit/src/index.ts index fb579b6a27..1428d58285 100644 --- a/plugins/recruit/src/index.ts +++ b/plugins/recruit/src/index.ts @@ -30,7 +30,7 @@ import type { import type { Asset, IntlString, Plugin, Resource } from '@hcengineering/platform' import { plugin } from '@hcengineering/platform' import { TagReference } from '@hcengineering/tags' -import type { Project, ProjectTypeCategory, Task } from '@hcengineering/task' +import type { Project, ProjectTypeDescriptor, Task, TaskType } from '@hcengineering/task' import { AnyComponent, ResolvedLocation } from '@hcengineering/ui' /** @@ -162,8 +162,8 @@ const recruit = plugin(recruitId, { Review: '' as Ref>, Opinion: '' as Ref> }, - category: { - VacancyTypeCategories: '' as Ref + descriptors: { + VacancyType: '' as Ref }, mixin: { Candidate: '' as Ref>, @@ -200,6 +200,9 @@ const recruit = plugin(recruitId, { }, space: { Reviews: '' as Ref + }, + taskTypes: { + Applicant: '' as Ref } }) diff --git a/plugins/setting-assets/lang/en.json b/plugins/setting-assets/lang/en.json index 6de31c1ee7..f0510384b6 100644 --- a/plugins/setting-assets/lang/en.json +++ b/plugins/setting-assets/lang/en.json @@ -1,7 +1,6 @@ { "string": { - "Setting": "Setting", - "ManageProjects": "Manage Projects", + "Setting": "Setting", "Integrations": "Integrations", "Support": "Support", "Privacy": "Privacy", diff --git a/plugins/setting-assets/lang/ru.json b/plugins/setting-assets/lang/ru.json index 5099ff5b6e..4566f2a5bb 100644 --- a/plugins/setting-assets/lang/ru.json +++ b/plugins/setting-assets/lang/ru.json @@ -1,7 +1,6 @@ { "string": { "Setting": "Настройки", - "ManageProjects": "Управление проектами", "Integrations": "Интеграции", "Support": "Поддержка", "Privacy": "Конфиденциальность", diff --git a/plugins/setting-resources/src/components/CategoryElement.svelte b/plugins/setting-resources/src/components/CategoryElement.svelte index 037aaeefc5..b352e6663d 100644 --- a/plugins/setting-resources/src/components/CategoryElement.svelte +++ b/plugins/setting-resources/src/components/CategoryElement.svelte @@ -28,34 +28,29 @@
{ dispatch('click') }} > -
- {#if icon} - - {/if} +
+
+
+ {#if icon} + + {/if} +
+ + {#if label} +
+
- - {#if label}
diff --git a/plugins/setting-resources/src/components/ClassAttributes.svelte b/plugins/setting-resources/src/components/ClassAttributes.svelte index f4fc431186..514614a5a6 100644 --- a/plugins/setting-resources/src/components/ClassAttributes.svelte +++ b/plugins/setting-resources/src/components/ClassAttributes.svelte @@ -26,33 +26,34 @@ RefTo, Type } from '@hcengineering/core' - import { getResource, IntlString } from '@hcengineering/platform' - import presentation, { createQuery, getClient, MessageBox } from '@hcengineering/presentation' + import { IntlString, getResource } from '@hcengineering/platform' + import presentation, { MessageBox, createQuery, getClient } from '@hcengineering/presentation' import { Action, ActionIcon, AnySvelteComponent, CircleButton, - Component, - getEventPositionElement, Icon, IconAdd, IconDelete, IconEdit, - IconMoreV, + IconMoreV2, Label, Menu, + getEventPositionElement, showPopup } from '@hcengineering/ui' - import view from '@hcengineering/view' - import { getContextActions } from '@hcengineering/view-resources/src/actions' + import { getContextActions } from '@hcengineering/view-resources' import settings from '../plugin' import CreateAttribute from './CreateAttribute.svelte' import EditAttribute from './EditAttribute.svelte' import EditClassLabel from './EditClassLabel.svelte' export let _class: Ref> - export let ofClass: Ref> | undefined + export let ofClass: Ref> | undefined = undefined + export let useOfClassAttributes = true + export let showTitle = true + export let showCreate = true export let attributeMapper: | { @@ -60,7 +61,7 @@ label: IntlString props: Record } - | undefined + | undefined = undefined const client = getClient() const hierarchy = client.getHierarchy() @@ -77,9 +78,10 @@ function getCustomAttributes (_class: Ref>): AnyAttribute[] { const cl = hierarchy.getClass(_class) const attributes = Array.from( - hierarchy.getAllAttributes(_class, _class === ofClass ? core.class.Doc : cl.extends).values() + hierarchy + .getAllAttributes(_class, _class === ofClass && useOfClassAttributes ? core.class.Doc : cl.extends) + .values() ) - // const filtred = attributes.filter((p) => !p.hidden) return attributes } @@ -89,19 +91,19 @@ attributes = getCustomAttributes(_class) }) - function update () { + function update (): void { attributes = getCustomAttributes(_class) } - function createAttribute () { + export function createAttribute (): void { showPopup(CreateAttribute, { _class }, 'top', update) } - async function editAttribute (attribute: AnyAttribute, exist: boolean): Promise { + export async function editAttribute (attribute: AnyAttribute, exist: boolean): Promise { showPopup(EditAttribute, { attribute, exist }, 'top', update) } - async function removeAttribute (attribute: AnyAttribute, exist: boolean): Promise { + export async function removeAttribute (attribute: AnyAttribute, exist: boolean): Promise { showPopup( MessageBox, { @@ -110,7 +112,7 @@ }, 'top', async (result) => { - if (result) { + if (result != null) { await client.remove(attribute) update() } @@ -118,7 +120,7 @@ ) } - async function showMenu (ev: MouseEvent, attribute: AnyAttribute) { + async function showMenu (ev: MouseEvent, attribute: AnyAttribute): Promise { const exist = (await client.findOne(attribute.attributeOf, { [attribute.name]: { $exists: true } })) !== undefined const actions: Action[] = [ @@ -126,16 +128,16 @@ label: presentation.string.Edit, icon: IconEdit, action: async () => { - editAttribute(attribute, exist) + await editAttribute(attribute, exist) } } ] - if (attribute.isCustom) { + if (attribute.isCustom === true) { actions.push({ label: presentation.string.Remove, icon: IconDelete, action: async () => { - removeAttribute(attribute, exist) + await removeAttribute(attribute, exist) } }) } @@ -146,7 +148,7 @@ icon: it.icon, action: async (_: any, evt: Event) => { const r = await getResource(it.action) - r(attribute, evt, it.actionProps) + await r(attribute, evt, it.actionProps) } })) ) @@ -176,106 +178,105 @@ } -
- {#if clazz?.icon} -
- - {#if clazz.kind === ClassifierKind.MIXIN && hierarchy.hasMixin(clazz, settings.mixin.UserMixin)} - - {/if} -
- {/if} - {#if clazz} -
diff --git a/plugins/setting-resources/src/components/Settings.svelte b/plugins/setting-resources/src/components/Settings.svelte index 6ac36e912f..48902a0cc7 100644 --- a/plugins/setting-resources/src/components/Settings.svelte +++ b/plugins/setting-resources/src/components/Settings.svelte @@ -71,8 +71,12 @@ } function selectCategory (id: string): void { const loc = getCurrentResolvedLocation() - loc.path[3] = id - loc.path.length = 4 + if (loc.path[3] === id) { + loc.path.length = 3 + } else { + loc.path[3] = id + loc.path.length = 4 + } navigate(loc) } function signOut (): void { @@ -86,7 +90,7 @@ setMetadata(presentation.metadata.Token, null) setMetadataLocalStorage(login.metadata.LoginEndpoint, null) setMetadataLocalStorage(login.metadata.LoginEmail, null) - closeClient() + void closeClient() navigate({ path: [loginId] }) } function selectWorkspace (): void { @@ -105,20 +109,43 @@
- - {#each categories as category, i} - {#if i > 0 && categories[i - 1].group !== category.group} + + {#each categories as _category, i} + {#if i > 0 && categories[i - 1].group !== _category.group}
{/if} { - selectCategory(category.name) + selectCategory(_category.name) }} - /> + > + + {#if _category.extraComponents?.tools} + + {/if} + + + {#if _category.extraComponents?.navigation} + + {/if} {/each}
diff --git a/plugins/setting-resources/src/components/WorkspaceSettings.svelte b/plugins/setting-resources/src/components/WorkspaceSettings.svelte index 6affd4fe11..f4ae694a80 100644 --- a/plugins/setting-resources/src/components/WorkspaceSettings.svelte +++ b/plugins/setting-resources/src/components/WorkspaceSettings.svelte @@ -17,21 +17,12 @@ import { AccountRole, getCurrentAccount } from '@hcengineering/core' import { createQuery } from '@hcengineering/presentation' import setting, { SettingsCategory } from '@hcengineering/setting' - import { - Component, - Label, - Location, - Scroller, - Separator, - defineSeparators, - getCurrentResolvedLocation, - navigate, - resolvedLocationStore, - settingsSeparators - } from '@hcengineering/ui' + import { Component, Location, getCurrentResolvedLocation, navigate, resolvedLocationStore } from '@hcengineering/ui' import { onDestroy } from 'svelte' import CategoryElement from './CategoryElement.svelte' + export let kind: 'navigation' | undefined + export let categoryName: string let category: SettingsCategory | undefined let categoryId: string = '' @@ -66,42 +57,38 @@ function selectCategory (id: string): void { const loc = getCurrentResolvedLocation() - loc.path[4] = id - loc.path.length = 5 + loc.path[3] = categoryName + if (loc.path[4] === id) { + loc.path.length = 4 + } else { + loc.path[4] = id + loc.path.length = 5 + } navigate(loc) } - - defineSeparators('settingWorkspace', settingsSeparators) -
- {#if visibleNav} -
-
-
-
- - {#each categories as category} - { - selectCategory(category.name) - }} - /> - {/each} -
- -
+{#if kind === 'navigation'} +
+
+ {#each categories as category} + { + selectCategory(category.name) + }} + /> + {#if category.name === categoryId && category.extraComponents?.navigation} + + {/if} + {/each}
- - {/if} - -
- {#if category} - - {/if}
-
+{:else if category} + +{/if} diff --git a/plugins/setting-resources/src/components/statuses/ManageProjects.svelte b/plugins/setting-resources/src/components/statuses/ManageProjects.svelte deleted file mode 100644 index 29e5f63e1c..0000000000 --- a/plugins/setting-resources/src/components/statuses/ManageProjects.svelte +++ /dev/null @@ -1,63 +0,0 @@ - - - -
-
-
-
-
-
-
- -
-
- {#if category !== undefined} - - {/if} -
-
- {#if type !== undefined} - - {/if} -
-
-
diff --git a/plugins/setting-resources/src/components/statuses/Types.svelte b/plugins/setting-resources/src/components/statuses/Types.svelte deleted file mode 100644 index 5390049e97..0000000000 --- a/plugins/setting-resources/src/components/statuses/Types.svelte +++ /dev/null @@ -1,110 +0,0 @@ - - - -
-
-
- {#each types as t (t._id)} - - -
{ - select(t) - }} - > - - {#if types.length > 1} -
{ - showPopup(ContextMenu, { object: t }, eventToHTMLElement(ev), () => {}) - }} - > - -
- {/if} -
- {/each} -
diff --git a/plugins/setting-resources/src/index.ts b/plugins/setting-resources/src/index.ts index f98660efc2..d84938cc1d 100644 --- a/plugins/setting-resources/src/index.ts +++ b/plugins/setting-resources/src/index.ts @@ -29,7 +29,7 @@ import Password from './components/Password.svelte' import Privacy from './components/Privacy.svelte' import Profile from './components/Profile.svelte' import Settings from './components/Settings.svelte' -import ManageProjects from './components/statuses/ManageProjects.svelte' + import Support from './components/Support.svelte' import Terms from './components/Terms.svelte' import BooleanTypeEditor from './components/typeEditors/BooleanTypeEditor.svelte' @@ -45,9 +45,10 @@ import InviteSetting from './components/InviteSetting.svelte' import Configure from './components/Configure.svelte' import setting from './plugin' import IntegrationPanel from './components/IntegrationPanel.svelte' -import { getOwnerFirstName, getOwnerLastName, getOwnerPosition, getValue } from './utils' +import { getOwnerFirstName, getOwnerLastName, getOwnerPosition, getValue, filterDescendants } from './utils' +import ClassAttributes from './components/ClassAttributes.svelte' -export { ClassSetting } +export { ClassSetting, filterDescendants, ClassAttributes } async function DeleteMixin (object: Mixin>): Promise { const docs = await getClient().findAll(object._id, {}, { limit: 1 }) @@ -86,7 +87,6 @@ export default async (): Promise => ({ Support, Privacy, Terms, - ManageProjects, ClassSetting, StringTypeEditor, HyperlinkTypeEditor, diff --git a/plugins/setting/src/index.ts b/plugins/setting/src/index.ts index f5b8494629..9349094b6c 100644 --- a/plugins/setting/src/index.ts +++ b/plugins/setting/src/index.ts @@ -73,11 +73,18 @@ export interface SettingsCategory extends Doc { label: IntlString icon: Asset component: AnyComponent + props?: Record + + // If defined, will pass kind with key to component + extraComponents?: Record + group?: string // If defined, will sort using order. order?: number secured: boolean + + expandable?: boolean } /** @@ -101,7 +108,6 @@ export default plugin(settingId, { Password: '' as Ref, Setting: '' as Ref, Integrations: '' as Ref, - ManageProjects: '' as Ref, Support: '' as Ref, Privacy: '' as Ref, Terms: '' as Ref, @@ -129,7 +135,6 @@ export default plugin(settingId, { Password: '' as AnyComponent, WorkspaceSettings: '' as AnyComponent, Integrations: '' as AnyComponent, - ManageProjects: '' as AnyComponent, Support: '' as AnyComponent, Privacy: '' as AnyComponent, Terms: '' as AnyComponent, @@ -140,7 +145,6 @@ export default plugin(settingId, { Setting: '' as IntlString, WorkspaceSetting: '' as IntlString, Integrations: '' as IntlString, - ManageProjects: '' as IntlString, Support: '' as IntlString, Privacy: '' as IntlString, Terms: '' as IntlString, diff --git a/plugins/tags-resources/src/components/CategoryBar.svelte b/plugins/tags-resources/src/components/CategoryBar.svelte index 489666730f..dc72b4836a 100644 --- a/plugins/tags-resources/src/components/CategoryBar.svelte +++ b/plugins/tags-resources/src/components/CategoryBar.svelte @@ -19,9 +19,8 @@ import { Button, getPlatformColorForTextDef, showPopup, themeStore } from '@hcengineering/ui' import { createEventDispatcher } from 'svelte' import tags from '../plugin' - import { getTagStyle } from '../utils' + import { getTagStyle, TagElementInfo } from '../utils' import TagsCategoryPopup from './TagsCategoryPopup.svelte' - import { TagElementInfo } from '../utils' export let targetClass: Ref> export let category: Ref | undefined = undefined diff --git a/plugins/task-assets/assets/icons.svg b/plugins/task-assets/assets/icons.svg index df93685155..6b572ebeb6 100644 --- a/plugins/task-assets/assets/icons.svg +++ b/plugins/task-assets/assets/icons.svg @@ -1,32 +1,217 @@ - - + + - + - - + + - + - - + + - - + + - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/task-assets/lang/en.json b/plugins/task-assets/lang/en.json index c5da82c64e..facb08d0e5 100644 --- a/plugins/task-assets/lang/en.json +++ b/plugins/task-assets/lang/en.json @@ -54,6 +54,8 @@ "ActiveStates": "Active statuses", "DoneStatesWon": "Done status / Won", "DoneStatesLost": "Done status / Lost", + "StateBacklog": "Backlog", + "StateActive": "Active", "AllStates": "All states", "DoneStates": "Done states", "States": "States", @@ -77,6 +79,8 @@ "ProjectType": "Project type", "ProjectTypes": "Project types", "StatusChange": "Status changed", - "TaskCreated": "Task created" + "TaskCreated": "Task created", + "TaskType": "Task type", + "ManageProjects": "Project types" } } \ No newline at end of file diff --git a/plugins/task-assets/lang/ru.json b/plugins/task-assets/lang/ru.json index 95777019b4..0433302131 100644 --- a/plugins/task-assets/lang/ru.json +++ b/plugins/task-assets/lang/ru.json @@ -54,6 +54,8 @@ "ActiveStates": "Активные статусы", "DoneStatesWon": "Завершено / Выиграно", "DoneStatesLost": "Завершено / Потеряно", + "StateBacklog": "Пул задач", + "StateActive": "Активные", "AllStates": "Все статусы", "DoneStates": "Завершенные статусы", "States": "Статусы", @@ -77,6 +79,8 @@ "ProjectType": "Тип проекта", "ProjectTypes": "Типы проектов", "StatusChange": "Статус изменен", - "TaskCreated": "Создана задача" + "TaskCreated": "Создана задача", + "TaskType": "Тип задачи", + "ManageProjects": "Управление проектами" } } \ No newline at end of file diff --git a/plugins/task-resources/package.json b/plugins/task-resources/package.json index c4e0d97610..8b55b9c80d 100644 --- a/plugins/task-resources/package.json +++ b/plugins/task-resources/package.json @@ -56,6 +56,8 @@ "@hcengineering/tags": "^0.6.12", "@hcengineering/tags-resources": "^0.6.0", "@hcengineering/kanban": "^0.6.0", - "@hcengineering/contact-resources": "^0.6.0" + "@hcengineering/contact-resources": "^0.6.0", + "@hcengineering/setting": "^0.6.11", + "@hcengineering/setting-resources": "^0.6.0" } } diff --git a/plugins/task-resources/src/components/CreateStatePopup.svelte b/plugins/task-resources/src/components/CreateStatePopup.svelte index 8b0972d26a..7219cadddd 100644 --- a/plugins/task-resources/src/components/CreateStatePopup.svelte +++ b/plugins/task-resources/src/components/CreateStatePopup.svelte @@ -15,23 +15,25 @@
dispatch('changeContent')}> diff --git a/plugins/task-resources/src/components/TemplatesIcon.svelte b/plugins/task-resources/src/components/TemplatesIcon.svelte index 3fd45f1d19..c8a379a449 100644 --- a/plugins/task-resources/src/components/TemplatesIcon.svelte +++ b/plugins/task-resources/src/components/TemplatesIcon.svelte @@ -1,17 +1,16 @@
- +
diff --git a/plugins/task-resources/src/components/TypeSelector.svelte b/plugins/task-resources/src/components/TypeSelector.svelte new file mode 100644 index 0000000000..9398b59468 --- /dev/null +++ b/plugins/task-resources/src/components/TypeSelector.svelte @@ -0,0 +1,63 @@ + + +{#if !typeFixed} + ({ id: it._id, label: it.name }))} + bind:selected={$selectedTypeStore} + /> +{/if} +{#if !allTypes} + +{/if} diff --git a/plugins/task-resources/src/components/TypesView.svelte b/plugins/task-resources/src/components/TypesView.svelte index 2dfb188075..d1c273a916 100644 --- a/plugins/task-resources/src/components/TypesView.svelte +++ b/plugins/task-resources/src/components/TypesView.svelte @@ -14,27 +14,15 @@ -->
- - {#if modeSelectorProps !== undefined && modeSelectorProps.config.length > 1} - - {/if} + +
@@ -121,7 +89,7 @@ ...(descriptors !== undefined ? { descriptor: { $in: descriptors } } : {}) }} /> - {#if createLabel && createComponent} + {#if createLabel !== undefined && createComponent}
- {#if f._id === category?._id} -
+ {#if f._id === descriptor?._id} +
+ + + +
{/if}
+ {/if} {/each}
@@ -80,8 +84,8 @@ min-height: 1.75rem; } .item { - padding: 1.25rem 1rem 1.25rem 1.25rem; - background-color: var(--theme-button-default); + padding: 0.25rem 0.25rem 0.25rem 0.25rem; + // background-color: var(--theme-button-default); border: 1px solid var(--theme-button-border); border-radius: 0.75rem; cursor: pointer; diff --git a/plugins/task-resources/src/components/projectTypes/ManageProjects.svelte b/plugins/task-resources/src/components/projectTypes/ManageProjects.svelte new file mode 100644 index 0000000000..9357e7c961 --- /dev/null +++ b/plugins/task-resources/src/components/projectTypes/ManageProjects.svelte @@ -0,0 +1,75 @@ + + + +
+ { + selectProjectType(evt.detail) + }} + /> +
diff --git a/plugins/task-resources/src/components/projectTypes/ManageProjectsContent.svelte b/plugins/task-resources/src/components/projectTypes/ManageProjectsContent.svelte new file mode 100644 index 0000000000..8089a80f69 --- /dev/null +++ b/plugins/task-resources/src/components/projectTypes/ManageProjectsContent.svelte @@ -0,0 +1,43 @@ + + + +
+ {#if type !== undefined} + + {/if} +
diff --git a/plugins/task-resources/src/components/projectTypes/ManageProjectsTools.svelte b/plugins/task-resources/src/components/projectTypes/ManageProjectsTools.svelte new file mode 100644 index 0000000000..c50b8b1e2c --- /dev/null +++ b/plugins/task-resources/src/components/projectTypes/ManageProjectsTools.svelte @@ -0,0 +1,59 @@ + + + +
+ +
+ +
{ + selectTaskType(undefined) + }} + > +
+ {#if selectedTaskType !== undefined} + / + {selectedTaskType.name} + {/if} +
+
+
+
+ + {#if selectedTaskType === undefined} + +
+
+
+
+
+ +
+
+ + {projects.length} projects +
+
+ { + if (type !== undefined) { + void client.diffUpdate(type, { name: evt.detail }) + } + }} + /> +
+ onShortDescriptionChange(type?.shortDescription ?? '')} + /> +
+ {#if descriptor?.editor} + + {/if} +
+ +
+ + +
+
+
+
+
+
+
+ + {#each taskTypes as taskType} + +
{ + selectTaskType(taskType._id) + }} + > +
+ +
+
+ {taskType.name} +
+
+ +
+
+ {/each} +
+
+ +
+ + +
+
+
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+ {:else} + + {/if} + +
+
+ {/if} +
+ + diff --git a/plugins/task-resources/src/components/projectTypes/ProjectTypePresenter.svelte b/plugins/task-resources/src/components/projectTypes/ProjectTypePresenter.svelte new file mode 100644 index 0000000000..763940dcac --- /dev/null +++ b/plugins/task-resources/src/components/projectTypes/ProjectTypePresenter.svelte @@ -0,0 +1,38 @@ + + + +{#if _value !== undefined} + + {#if descriptor?.icon} + + {/if} + + {_value.name} + + +{/if} diff --git a/plugins/task-resources/src/components/kanban/ProjectTypeSelector.svelte b/plugins/task-resources/src/components/projectTypes/ProjectTypeSelector.svelte similarity index 86% rename from plugins/task-resources/src/components/kanban/ProjectTypeSelector.svelte rename to plugins/task-resources/src/components/projectTypes/ProjectTypeSelector.svelte index 11d1ef683a..d1582f0ed0 100644 --- a/plugins/task-resources/src/components/kanban/ProjectTypeSelector.svelte +++ b/plugins/task-resources/src/components/projectTypes/ProjectTypeSelector.svelte @@ -15,14 +15,14 @@ + +
+ { + select(types[evt.detail]) + }} + updateOnMouse={false} + > + + {@const typeItem = types[item]} +
+
+
+ {#if typeItem.$lookup?.descriptor?.icon} +
+ +
+ {/if} + {typeItem.name} +
+ {#if typeItem.$lookup?.descriptor} +
+
+ {/if} +
+
+ + +
diff --git a/plugins/task-resources/src/components/state/StateEditor.svelte b/plugins/task-resources/src/components/state/StateEditor.svelte index 178a3973cb..46bd95c5b2 100644 --- a/plugins/task-resources/src/components/state/StateEditor.svelte +++ b/plugins/task-resources/src/components/state/StateEditor.svelte @@ -21,6 +21,7 @@ import { statusStore } from '@hcengineering/view-resources' import StatePresenter from './StatePresenter.svelte' import StatesPopup from './StatesPopup.svelte' + import { selectedTaskTypeStore, selectedTypeStore } from '../../index' export let value: Ref export let space: Ref @@ -51,7 +52,16 @@ {#if kind === 'list' || kind === 'list-header'} - + {:else}
+
+ + + + {#each classes as clazz2} + + {/each} + +
+
diff --git a/plugins/task-resources/src/index.ts b/plugins/task-resources/src/index.ts index 363ae66f73..0b87032718 100644 --- a/plugins/task-resources/src/index.ts +++ b/plugins/task-resources/src/index.ts @@ -16,6 +16,7 @@ import { get, writable } from 'svelte/store' import { + toIdMap, type Attribute, type Class, type Doc, @@ -23,12 +24,18 @@ import { type IdMap, type Ref, type Status, - type TxOperations, - toIdMap + type TxOperations } from '@hcengineering/core' import { type IntlString, type Resources } from '@hcengineering/platform' import { createQuery, getClient } from '@hcengineering/presentation' -import task, { type Project, type ProjectType, type Task, calcRank } from '@hcengineering/task' +import task, { + calcRank, + getStatusIndex, + type Project, + type ProjectType, + type Task, + type TaskType +} from '@hcengineering/task' import { getCurrentLocation, navigate, showPopup } from '@hcengineering/ui' import { type ViewletDescriptor } from '@hcengineering/view' import { CategoryQuery, statusStore } from '@hcengineering/view-resources' @@ -46,33 +53,43 @@ import TaskPresenter from './components/TaskPresenter.svelte' import TemplatesIcon from './components/TemplatesIcon.svelte' import TypesView from './components/TypesView.svelte' import KanbanView from './components/kanban/KanbanView.svelte' -import ProjectEditor from './components/kanban/ProjectEditor.svelte' -import ProjectTypeSelector from './components/kanban/ProjectTypeSelector.svelte' +import ProjectEditor from './components/projectTypes/ProjectEditor.svelte' +import ProjectTypeSelector from './components/projectTypes/ProjectTypeSelector.svelte' import StateEditor from './components/state/StateEditor.svelte' import StatePresenter from './components/state/StatePresenter.svelte' -import TypeStatesPopup from './components/state/TypeStatesPopup.svelte' import StateRefPresenter from './components/state/StateRefPresenter.svelte' +import TypeStatesPopup from './components/state/TypeStatesPopup.svelte' +import TaskTypeClassPresenter from './components/taskTypes/TaskTypeClassPresenter.svelte' +import ProjectTypeClassPresenter from './components/taskTypes/ProjectTypeClassPresenter.svelte' +import TaskTypePresenter from './components/taskTypes/TaskTypePresenter.svelte' +import ProjectTypePresenter from './components/projectTypes/ProjectTypePresenter.svelte' import TodoItemPresenter from './components/todos/TodoItemPresenter.svelte' import TodoItemsPopup from './components/todos/TodoItemsPopup.svelte' import TodoStatePresenter from './components/todos/TodoStatePresenter.svelte' import Todos from './components/todos/Todos.svelte' import StateIconPresenter from './components/state/StateIconPresenter.svelte' +import TaskKindSelector from './components/taskTypes/TaskKindSelector.svelte' + +import ManageProjects from './components/projectTypes/ManageProjects.svelte' +import ManageProjectsTools from './components/projectTypes/ManageProjectsTools.svelte' +import ManageProjectsContent from './components/projectTypes/ManageProjectsContent.svelte' export { default as AssigneePresenter } from './components/AssigneePresenter.svelte' -export { StateRefPresenter, StatePresenter, TypeStatesPopup } +export { default as TypeSelector } from './components/TypeSelector.svelte' export * from './utils' +export { StatePresenter, StateRefPresenter, TypeStatesPopup, TaskKindSelector } async function editStatuses (object: Project, ev: Event): Promise { const client = getClient() - const category = await client.findOne(task.class.ProjectTypeCategory, { attachedToClass: object._class }) + const descriptor = await client.findOne(task.class.ProjectTypeDescriptor, { attachedToClass: object._class }) const loc = getCurrentLocation() loc.path[2] = 'setting' loc.path[3] = 'setting' loc.path[4] = 'statuses' loc.query = - category != null + descriptor != null ? { - categoryId: category._id, + descriptorId: descriptor._id, typeId: object.type } : { @@ -123,7 +140,14 @@ export default async (): Promise => ({ TemplatesIcon, TypesView, StateIconPresenter, - StatusFilter + StatusFilter, + TaskTypePresenter, + TaskTypeClassPresenter, + ProjectTypeClassPresenter, + ManageProjects, + ManageProjectsTools, + ManageProjectsContent, + ProjectTypePresenter }, actionImpl: { EditStatuses: editStatuses, @@ -142,10 +166,18 @@ async function getAllStates ( attr: Attribute ): Promise { const typeId = get(selectedTypeStore) + const taskTypeId = get(selectedTaskTypeStore) + if (taskTypeId === undefined) { + return [] + } const type = typeId !== undefined ? get(typeStore).get(typeId) : undefined + const taskType = get(taskTypeStore).get(taskTypeId) + if (taskType === undefined) { + return [] + } if (type !== undefined) { const statusMap = get(statusStore).byId - const statuses = (type.statuses?.map((p) => statusMap.get(p._id)) as Status[]) ?? [] + const statuses = (taskType.statuses.map((p) => statusMap.get(p)) as Status[]) ?? [] return statuses .filter((p) => p?.category !== task.statusCategory.Lost && p?.category !== task.statusCategory.Won) .map((p) => p?._id) @@ -156,10 +188,8 @@ async function getAllStates ( let refresh: boolean = false const lq = CategoryQuery.getLiveQuery(queryId) refresh = lq.query(task.class.Project, { _id: _space as Ref }, (res) => { - const typeId = res[0]?.type - const type = get(typeStore).get(typeId) const statusMap = get(statusStore).byId - const statuses = (type?.statuses?.map((p) => statusMap.get(p._id)) as Status[]) ?? [] + const statuses = (taskType.statuses.map((p) => statusMap.get(p)) as Status[]) ?? [] const result = statuses .filter((p) => p?.category !== task.statusCategory.Lost && p?.category !== task.statusCategory.Won) .map((p) => p?._id) @@ -191,14 +221,15 @@ async function statusSort ( const typeId = get(selectedTypeStore) const type = typeId !== undefined ? get(typeStore).get(typeId) : undefined const statuses = get(statusStore).byId + const taskTypes = get(taskTypeStore) if (type !== undefined) { value.sort((a, b) => { const aVal = statuses.get(a) as Status const bVal = statuses.get(b) as Status if (type != null) { - const aIndex = type.statuses.findIndex((s) => s._id === a) - const bIndex = type.statuses.findIndex((s) => s._id === b) + const aIndex = getStatusIndex(type, taskTypes, a) + const bIndex = getStatusIndex(type, taskTypes, b) return aIndex - bIndex } else { return aVal.name.localeCompare(bVal.name) @@ -210,18 +241,22 @@ async function statusSort ( const types = await client.findAll(task.class.ProjectType, {}) for (const state of value) { if (res.has(state)) continue - const index = types.findIndex((p) => p.statuses.some((s) => s._id === state)) + const index = types.findIndex((p) => p.tasks.some((q) => taskTypes.get(q)?.statuses.includes(state))) if (index === -1) break const type = types.splice(index, 1)[0] - for (let index = 0; index < type.statuses.length; index++) { - const st = type.statuses[index] - const prev = index > 0 ? res.get(type.statuses[index - 1]._id) : prevRank - const next = index < type.statuses.length - 1 ? res.get(type.statuses[index + 1]._id) : undefined + const statuses = + type.tasks.map((it) => taskTypes.get(it)).find((it) => it?.statuses.includes(state))?.statuses ?? [] + + // TODO: Check correctness + for (let index = 0; index < statuses.length; index++) { + const st = statuses[index] + const prev = index > 0 ? res.get(statuses[index - 1]) : prevRank + const next = index < statuses.length - 1 ? res.get(statuses[index + 1]) : undefined const rank = calcRank( prev !== undefined ? { rank: prev } : undefined, next !== undefined ? { rank: next } : undefined ) - res.set(st._id, rank) + res.set(st, rank) prevRank = rank } } @@ -239,6 +274,8 @@ async function statusSort ( } export const typeStore = writable>(new Map()) +export const taskTypeStore = writable>(new Map()) + function fillStores (): void { const client = getClient() @@ -247,6 +284,11 @@ function fillStores (): void { query.query(task.class.ProjectType, {}, (res) => { typeStore.set(toIdMap(res)) }) + + const taskQuery = createQuery(true) + taskQuery.query(task.class.TaskType, {}, (res) => { + taskTypeStore.set(toIdMap(res)) + }) } else { setTimeout(() => { fillStores() @@ -257,3 +299,11 @@ function fillStores (): void { fillStores() export const selectedTypeStore = writable | undefined>(undefined) +export const selectedTaskTypeStore = writable | undefined>(undefined) + +export const activeProjects = writable>(new Map()) +const activeProjectsQuery = createQuery(true) + +activeProjectsQuery.query(task.class.Project, { archived: false }, (projects) => { + activeProjects.set(toIdMap(projects)) +}) diff --git a/plugins/task-resources/src/plugin.ts b/plugins/task-resources/src/plugin.ts index d0060e9371..e2f4726967 100644 --- a/plugins/task-resources/src/plugin.ts +++ b/plugins/task-resources/src/plugin.ts @@ -13,12 +13,12 @@ // limitations under the License. // +import {} from '@hcengineering/notification' import type { IntlString } from '@hcengineering/platform' import { mergeIds } from '@hcengineering/platform' import task, { taskId } from '@hcengineering/task' -import { type AnyComponent } from '@hcengineering/ui' +import { type AnyComponent } from '@hcengineering/ui/src/types' import { type GetAllValuesFunc, type SortFunc } from '@hcengineering/view' -import {} from '@hcengineering/notification' export default mergeIds(taskId, task, { string: { diff --git a/plugins/task/src/index.ts b/plugins/task/src/index.ts index b6a98b3f0c..43ab491f4e 100644 --- a/plugins/task/src/index.ts +++ b/plugins/task/src/index.ts @@ -30,7 +30,8 @@ import { import type { Asset, IntlString, Plugin } from '@hcengineering/platform' import { plugin } from '@hcengineering/platform' import type { AnyComponent, ComponentExtensionId } from '@hcengineering/ui' -import { Action, ViewletDescriptor } from '@hcengineering/view' +import { Action, IconProps, ViewletDescriptor } from '@hcengineering/view' +import { NotificationType } from '../../notification/lib/index' /** * @public @@ -47,6 +48,7 @@ export interface Project extends Space { * @public */ export interface Task extends AttachedDoc, DocWithRank { + kind: Ref status: Ref isDone?: boolean number: number @@ -84,26 +86,96 @@ export interface Sequence extends Doc { sequence: number } -export interface ProjectStatus { +export interface ProjectStatus extends IconProps { _id: Ref - // Optional color - color?: number + taskType: Ref } +/** + * @public + */ +export type TaskTypeKind = 'task' | 'subtask' | 'both' + +/** + * @public + */ +export interface TaskTypeDescriptor extends Doc { + name: IntlString + description: IntlString + icon: Asset + baseClass: Ref> + + // If specified, will allow to be created by users, system type overwise + allowCreate: boolean +} + +/** + * @public + */ +export interface TaskType extends Doc, IconProps { + parent: Ref + descriptor: Ref + + name: string + + kind: TaskTypeKind + // Specify if task is allowed to be used as subtask of following tasks. + allowedAsChildOf?: Ref[] + + ofClass: Ref> // Base class for task + targetClass: Ref> // Class or Mixin mixin to hold all user defined attributes. + + // Allowed statuses and ordering + statuses: Ref[] + statusClass: Ref> + statusCategories: Ref[] +} + +/** + * @public + * + * A a mixin for Class bind to taskType. + */ +export interface TaskTypeClass extends Class { + taskType: Ref + projectType: Ref +} + +/** + * @public + * + * A a mixin for Class bind to taskType. + */ +export interface ProjectTypeClass extends Class { + projectType: Ref +} +/** + * @public + * + * Define a user customized project type. + */ export interface ProjectType extends Space { shortDescription?: string - category: Ref + descriptor: Ref + tasks: Ref[] + + // Color and extra options per project type. + // All statuses per project has same color. statuses: ProjectStatus[] + + // A mixin for project + targetClass: Ref> } -export interface ProjectTypeCategory extends Doc { +/** + * @public + */ +export interface ProjectTypeDescriptor extends Doc { name: IntlString description: IntlString icon: AnyComponent editor?: AnyComponent - attachedToClass: Ref> - statusClass: Ref> - statusCategories: Ref[] + baseClass: Ref> } /** @@ -141,7 +213,9 @@ const task = plugin(taskId, { Move: '' as Ref }, mixin: { - KanbanCard: '' as Ref> + KanbanCard: '' as Ref>, + TaskTypeClass: '' as Ref>, + ProjectTypeClass: '' as Ref> }, attribute: { State: '' as Ref> @@ -170,15 +244,18 @@ const task = plugin(taskId, { AssignedToMe: '' as IntlString, Dashboard: '' as IntlString, ProjectTypes: '' as IntlString, + TaskType: '' as IntlString, ProjectType: '' as IntlString }, class: { - Task: '' as Ref>, Sequence: '' as Ref>, TodoItem: '' as Ref>, + ProjectTypeDescriptor: '' as Ref>, ProjectType: '' as Ref>, - ProjectTypeCategory: '' as Ref>, - Project: '' as Ref> + Project: '' as Ref>, + TaskTypeDescriptor: '' as Ref>, + TaskType: '' as Ref>, + Task: '' as Ref> }, viewlet: { Kanban: '' as Ref, @@ -203,6 +280,7 @@ const task = plugin(taskId, { Statuses: '' as Ref }, statusCategory: { + UnStarted: '' as Ref, Active: '' as Ref, Won: '' as Ref, Lost: '' as Ref @@ -213,6 +291,10 @@ const task = plugin(taskId, { TodoItemsPopup: '' as AnyComponent, CreateStatePopup: '' as AnyComponent }, + ids: { + AssigneedNotification: '' as Ref, + ManageProjects: '' as Ref + }, extensions: { ProjectEditorExtension: '' as ComponentExtensionId } diff --git a/plugins/task/src/utils.ts b/plugins/task/src/utils.ts index c5e6e32756..92dc12a5cf 100644 --- a/plugins/task/src/utils.ts +++ b/plugins/task/src/utils.ts @@ -13,10 +13,26 @@ // limitations under the License. // -import { Class, Data, DocumentQuery, IdMap, Ref, Status, TxOperations } from '@hcengineering/core' +import core, { + Class, + Data, + DocumentQuery, + Hierarchy, + IdMap, + Ref, + Status, + StatusCategory, + TxOperations, + type AnyAttribute, + type RefTo, + Doc, + generateId, + ClassifierKind +} from '@hcengineering/core' import { LexoDecimal, LexoNumeralSystem36, LexoRank } from 'lexorank' import LexoRankBucket from 'lexorank/lib/lexoRank/lexoRankBucket' -import task, { Project, ProjectType } from '.' +import task, { Project, ProjectStatus, ProjectType, Task, TaskType } from '.' +import { getEmbeddedLabel } from '@hcengineering/platform' /** * @public @@ -50,16 +66,58 @@ export const calcRank = (prev?: { rank: string }, next?: { rank: string }): stri /** * @public */ -export function getStates (space: Project | undefined, types: IdMap, statuses: IdMap): Status[] { - if (space === undefined) return [] +export function getProjectTypeStates ( + projectType: Ref | undefined, + types: IdMap, + statuses: IdMap +): Status[] { + if (projectType === undefined) return [] return ( (types - .get(space.type) + .get(projectType) ?.statuses?.map((p) => statuses.get(p._id)) ?.filter((p) => p !== undefined) as Status[]) ?? [] ) } +/** + * @public + */ +export function getStates (space: Project | undefined, types: IdMap, statuses: IdMap): Status[] { + if (space === undefined) return [] + return getProjectTypeStates(space.type, types, statuses) +} + +/** + * @public + */ +export function getTaskTypeStates ( + taskType: Ref | undefined, + types: IdMap, + statuses: IdMap +): Status[] { + if (taskType === undefined) return [] + return ( + (types + .get(taskType) + ?.statuses?.map((p) => statuses.get(p)) + ?.filter((p) => p !== undefined) as Status[]) ?? [] + ) +} + +/** + * @public + */ +export function getStatusIndex (type: ProjectType, taskTypes: IdMap, status: Ref): number { + return ( + type.tasks + .map((it) => taskTypes.get(it)) + .flatMap((it) => it?.statuses.indexOf(status)) + .filter((it) => (it ?? 0) >= 0) + .reduce((p, c) => (p ?? 0) + (c ?? 0), 0) ?? -1 + ) +} + /** * @public */ @@ -79,3 +137,177 @@ export async function createState ( const res = await client.createDoc(_class, task.space.Statuses, data) return res } + +/** + * @public + */ +export function isTaskCategory (category: Ref): boolean { + return ( + category === task.statusCategory.Active || + category === task.statusCategory.Active || + category === task.statusCategory.Won || + category === task.statusCategory.Lost + ) +} + +/** + * @public + */ +export function calculateStatuses ( + projectType: { statuses: ProjectType['statuses'], tasks: ProjectType['tasks'] }, + taskTypes: Map, Data>, + override: Array<{ taskTypeId: Ref, statuses: Array> }> +): ProjectStatus[] { + const stIds = new Map(projectType.statuses.map((p) => [p._id, p])) + const processed = new Set() + const result: ProjectStatus[] = [] + + for (const tt of projectType.tasks) { + const statusesList = override.find((it) => it.taskTypeId === tt)?.statuses ?? taskTypes.get(tt)?.statuses ?? [] + for (const tts of statusesList) { + const prjStatus = stIds.get(tts) + const key = `${tts}:${tt}` + if (!processed.has(key)) { + processed.add(key) + result.push({ ...(prjStatus ?? {}), _id: tts, taskType: tt }) + } + } + } + return result +} + +/** + * @public + */ +export function findStatusAttr (h: Hierarchy, _class: Ref>): AnyAttribute { + const attrs = h.getAllAttributes(_class) + for (const it of attrs.values()) { + if (it.type._class === core.class.RefTo && h.isDerived((it.type as RefTo).to, core.class.Status)) { + return it + } + } + return h.getAttribute(task.class.Task, 'status') +} + +export type TaskTypeWithFactory = Omit, 'statuses' | 'parent' | 'targetClass'> & { + _id: TaskType['_id'] + factory: Data[] +} & Partial> + +type ProjectData = Omit, 'statuses' | 'private' | 'members' | 'archived' | 'targetClass'> + +/** + * @public + */ +export async function createProjectType ( + client: TxOperations, + data: ProjectData, + tasks: TaskTypeWithFactory[], + _id: Ref +): Promise> { + const current = await client.findOne(task.class.ProjectType, { _id }) + if (current !== undefined) { + return current._id + } + + async function createStates (states: Data[], stateClass: Ref>): Promise[]> { + const statuses: Ref[] = [] + for (const st of states) { + statuses.push(await createState(client, stateClass, st)) + } + return statuses + } + + const _tasks: Ref[] = [] + const tasksData = new Map, Data>() + const _statues = new Set>() + for (const it of tasks) { + const { factory, _id: taskId, ...data } = it + const statuses = await createStates(factory, data.statusClass) + for (const st of statuses) { + _statues.add(st) + } + const tdata = { + ...data, + parent: _id, + statuses + } + + const ofClassClass = client.getHierarchy().getClass(data.ofClass) + + tdata.icon = ofClassClass.icon + + if (tdata.targetClass === undefined) { + // Create target class for custom field. + const targetClassId: Ref> = generateId() + tdata.targetClass = targetClassId + + await client.createDoc( + core.class.Mixin, + core.space.Model, + { + extends: data.ofClass, + kind: ClassifierKind.MIXIN, + label: ofClassClass.label, + icon: ofClassClass.icon + }, + targetClassId + ) + + await client.createMixin(targetClassId, core.class.Mixin, core.space.Model, task.mixin.TaskTypeClass, { + taskType: taskId, + projectType: _id + }) + } + await client.createDoc(task.class.TaskType, core.space.Model, tdata as Data, taskId) + tasksData.set(taskId, tdata as Data) + _tasks.push(taskId) + } + + const categoryObj = client.getModel().findObject(data.descriptor) + if (categoryObj === undefined) { + throw new Error('category is not found in model') + } + + const baseClassClass = client.getHierarchy().getClass(categoryObj.baseClass) + + const targetProjectClassId: Ref> = generateId() + + await client.createDoc( + core.class.Mixin, + core.space.Model, + { + extends: categoryObj.baseClass, + kind: ClassifierKind.MIXIN, + label: getEmbeddedLabel(data.name), + icon: baseClassClass.icon + }, + targetProjectClassId, + undefined, + core.account.ConfigUser + ) + + await client.createMixin(targetProjectClassId, core.class.Mixin, core.space.Model, task.mixin.ProjectTypeClass, { + projectType: _id + }) + + const tmpl = await client.createDoc( + task.class.ProjectType, + core.space.Model, + { + description: data.description, + shortDescription: data.shortDescription, + descriptor: data.descriptor, + tasks: _tasks, + name: data.name, + private: false, + members: [], + archived: false, + statuses: calculateStatuses({ tasks: _tasks, statuses: [] }, tasksData, []), + targetClass: targetProjectClassId + }, + _id + ) + + return tmpl +} diff --git a/plugins/telegram-resources/src/components/PinPad.svelte b/plugins/telegram-resources/src/components/PinPad.svelte index a4e2166702..54775b7013 100644 --- a/plugins/telegram-resources/src/components/PinPad.svelte +++ b/plugins/telegram-resources/src/components/PinPad.svelte @@ -13,8 +13,7 @@ // limitations under the License. --> - - -{#if subIssues.length > 0} -
-
- - -
- - - -
- -{/if} - - diff --git a/plugins/tracker-resources/src/components/components/ComponentBrowser.svelte b/plugins/tracker-resources/src/components/components/ComponentBrowser.svelte index edb506a01f..77b5cf0e3c 100644 --- a/plugins/tracker-resources/src/components/components/ComponentBrowser.svelte +++ b/plugins/tracker-resources/src/components/components/ComponentBrowser.svelte @@ -47,7 +47,7 @@ let docWidth: number let docSize = false - function showCreateDialog () { + function showCreateDialog (): void { showPopup(NewComponent, { space, targetElement: null }, 'top') } diff --git a/plugins/tracker-resources/src/components/icons/StatusIcon.svelte b/plugins/tracker-resources/src/components/icons/StatusIcon.svelte index f993486a17..9b5a577d5a 100644 --- a/plugins/tracker-resources/src/components/icons/StatusIcon.svelte +++ b/plugins/tracker-resources/src/components/icons/StatusIcon.svelte @@ -3,6 +3,7 @@ import { ColorDefinition, IconSize, getPlatformColorDef, themeStore } from '@hcengineering/ui' import { createEventDispatcher, onMount } from 'svelte' import tracker from '../../plugin' + import task from '@hcengineering/task' export let size: IconSize @@ -37,7 +38,7 @@ viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" > - {#if category._id === tracker.issueStatusCategory.Backlog} + {#if category._id === tracker.issueStatusCategory.Backlog || category._id === task.statusCategory.UnStarted} export let disabled: boolean = false @@ -36,17 +38,24 @@ let currentProject: Project | undefined = value?.$lookup?.space $: if (value !== undefined) { - currentProject = $activeProjects.get(value?.space) + currentProject = $activeProjects.get(value?.space) as Project } $: title = currentProject ? `${currentProject.identifier}-${value?.number}` : `${value?.number}` $: presenters = value !== undefined ? getClient().getHierarchy().findMixinMixins(value, view.mixin.ObjectPresenter) : [] + + $: taskType = $taskTypeStore.get(value.kind) {#if value} -
+
+ {#if taskType !== undefined} +
+ +
+ {/if} -{#if icon !== undefined && color !== undefined && category !== undefined} +{#if category !== undefined && isTaskCategory(category._id)} + +{:else if icon !== undefined && color !== undefined && category !== undefined} {/if} diff --git a/plugins/tracker-resources/src/components/issues/Issues.svelte b/plugins/tracker-resources/src/components/issues/Issues.svelte index c077b89c92..088162a780 100644 --- a/plugins/tracker-resources/src/components/issues/Issues.svelte +++ b/plugins/tracker-resources/src/components/issues/Issues.svelte @@ -17,10 +17,11 @@ import { IntlString } from '@hcengineering/platform' import { createQuery } from '@hcengineering/presentation' import { Issue, IssueStatus, Project } from '@hcengineering/tracker' - import { resolvedLocationStore } from '@hcengineering/ui' + import { IModeSelector, resolvedLocationStore } from '@hcengineering/ui' + import view, { Viewlet } from '@hcengineering/view' import { createEventDispatcher } from 'svelte' - import { IModeSelector } from '@hcengineering/ui' + import { TypeSelector, selectedTaskTypeStore, selectedTypeStore, taskTypeStore } from '@hcengineering/task-resources' import tracker from '../../plugin' import IssuesView from './IssuesView.svelte' @@ -28,8 +29,12 @@ export let baseQuery: DocumentQuery = {} export let title: IntlString export let config: [string, IntlString, object][] + export let allProjectsTypes: boolean = false + + export let baseClass = tracker.class.Issue const dispatch = createEventDispatcher() + let query: DocumentQuery | undefined = undefined let modeSelectorProps: IModeSelector | undefined = undefined @@ -89,8 +94,29 @@ onChange: (newMode: string) => dispatch('action', { mode: newMode }) } } + + $: allTypes = Array.from($taskTypeStore.values()) + .filter((it) => it.parent === $selectedTypeStore) + .map((it) => it._id) + + $: finalQuery = { + ...query, + ...(allProjectsTypes + ? {} + : $selectedTaskTypeStore !== undefined + ? { kind: $selectedTaskTypeStore } + : { kind: { $in: allTypes } }) + } + + const toVL = (data: any): Viewlet | undefined => data as Viewlet {#if query !== undefined && modeSelectorProps !== undefined} - + + + {#if !allProjectsTypes} + + {/if} + + {/if} diff --git a/plugins/tracker-resources/src/components/issues/IssuesView.svelte b/plugins/tracker-resources/src/components/issues/IssuesView.svelte index bbb459464f..b366058ade 100644 --- a/plugins/tracker-resources/src/components/issues/IssuesView.svelte +++ b/plugins/tracker-resources/src/components/issues/IssuesView.svelte @@ -29,7 +29,7 @@ let resultQuery: DocumentQuery = { ...searchQuery } $: if (!label && title) { - translate(title, {}, $themeStore.language).then((res) => { + void translate(title, {}, $themeStore.language).then((res) => { label = res }) } @@ -61,6 +61,11 @@ + + + + + = { ...query } const client = getClient() @@ -194,6 +194,7 @@ $: listProvider.update(tasks) let categories: CategoryType[] = [] + let loadCategories = true const queryId = generateId() @@ -211,6 +212,7 @@ queryId ).then((res) => { categories = res + loadCategories = false }) } @@ -227,6 +229,7 @@ queryId ).then((res) => { categories = res + loadCategories = false }) const fullFilled: Record = {} @@ -305,7 +308,7 @@ } -{#if categories.length === 0} +{#if loadCategories} {:else} diff --git a/plugins/tracker-resources/src/components/issues/StatusEditor.svelte b/plugins/tracker-resources/src/components/issues/StatusEditor.svelte index 22c239cabf..fb7e417019 100644 --- a/plugins/tracker-resources/src/components/issues/StatusEditor.svelte +++ b/plugins/tracker-resources/src/components/issues/StatusEditor.svelte @@ -15,7 +15,8 @@ {#if value} - + {/if} diff --git a/plugins/tracker-resources/src/components/issues/StatusSelector.svelte b/plugins/tracker-resources/src/components/issues/StatusSelector.svelte index c1aae3c224..25fd526ce2 100644 --- a/plugins/tracker-resources/src/components/issues/StatusSelector.svelte +++ b/plugins/tracker-resources/src/components/issues/StatusSelector.svelte @@ -23,6 +23,7 @@ ButtonSize, IconSize, SelectPopup, + SelectPopupValueType, TooltipAlignment, eventToHTMLElement, showPopup @@ -59,19 +60,6 @@ dispatch('change', newStatus) } - const handleStatusEditorOpened = (event: MouseEvent) => { - if (!isEditable) { - return - } - - showPopup( - SelectPopup, - { value: statusesInfo, placeholder: tracker.string.SetStatus }, - eventToHTMLElement(event), - changeStatus - ) - } - $: statuses = getStatuses($statusStore.byId, $typeStore, type) function getStatuses ( @@ -100,16 +88,32 @@ return current } + let statusesInfo: SelectPopupValueType[] + $: selectedStatus = getSelectedStatus(statuses, value) $: selectedStatusLabel = selectedStatus?.name - $: statusesInfo = statuses?.map((s) => { - return { - id: s._id, - component: StatusPresenter, - props: { value: s, size: 'small' }, - isSelected: selectedStatus?._id === s._id ?? false + $: statusesInfo = + statuses?.map((s) => { + return { + id: s._id, + component: StatusPresenter, + props: { value: s, size: 'small' }, + isSelected: selectedStatus?._id === s._id ?? false + } + }) ?? [] + const handleStatusEditorOpened = (event: MouseEvent) => { + if (!isEditable) { + return } - }) + + showPopup( + SelectPopup, + { value: statusesInfo, placeholder: tracker.string.SetStatus }, + eventToHTMLElement(event), + changeStatus + ) + } + $: smallgap = size === 'inline' || size === 'small' diff --git a/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportsList.svelte b/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportsList.svelte index c040198efc..3de801fee8 100644 --- a/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportsList.svelte +++ b/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportsList.svelte @@ -22,9 +22,9 @@ eventToHTMLElement, getEventPositionElement, ListView, - showPopup + showPopup, + DatePresenter } from '@hcengineering/ui' - import { DatePresenter } from '@hcengineering/ui' import { ContextMenu, FixedColumn, ListSelectionProvider } from '@hcengineering/view-resources' import { getIssueId } from '../../../issues' import tracker from '../../../plugin' diff --git a/plugins/tracker-resources/src/components/myissues/MyIssues.svelte b/plugins/tracker-resources/src/components/myissues/MyIssues.svelte index 0e34d6fcac..107ead88ff 100644 --- a/plugins/tracker-resources/src/components/myissues/MyIssues.svelte +++ b/plugins/tracker-resources/src/components/myissues/MyIssues.svelte @@ -18,10 +18,9 @@ import type { IntlString } from '@hcengineering/platform' import { createQuery } from '@hcengineering/presentation' import type { Issue, IssueStatus, Project } from '@hcengineering/tracker' - import { resolvedLocationStore } from '@hcengineering/ui' + import { resolvedLocationStore, IModeSelector } from '@hcengineering/ui' import { createEventDispatcher } from 'svelte' - import { IModeSelector } from '@hcengineering/ui' import tracker from '../../plugin' import IssuesView from '../issues/IssuesView.svelte' diff --git a/plugins/tracker-resources/src/components/projects/CreateProject.svelte b/plugins/tracker-resources/src/components/projects/CreateProject.svelte index 9ae5ec97a0..ac37c9dd61 100644 --- a/plugins/tracker-resources/src/components/projects/CreateProject.svelte +++ b/plugins/tracker-resources/src/components/projects/CreateProject.svelte @@ -15,7 +15,7 @@ + + { + void getClient().diffUpdate(value, { members: evt }) + }} +/> diff --git a/plugins/tracker-resources/src/components/templates/DraftIssueChildEditor.svelte b/plugins/tracker-resources/src/components/templates/DraftIssueChildEditor.svelte index 354ffbae84..e445ef3e34 100644 --- a/plugins/tracker-resources/src/components/templates/DraftIssueChildEditor.svelte +++ b/plugins/tracker-resources/src/components/templates/DraftIssueChildEditor.svelte @@ -26,13 +26,12 @@ Milestone } from '@hcengineering/tracker' import { Button, Component, EditBox } from '@hcengineering/ui' - import { createEventDispatcher } from 'svelte' + import { createEventDispatcher, onDestroy } from 'svelte' import tracker from '../../plugin' import AssigneeEditor from '../issues/AssigneeEditor.svelte' import PriorityEditor from '../issues/PriorityEditor.svelte' import StatusEditor from '../issues/StatusEditor.svelte' import EstimationEditor from './EstimationEditor.svelte' - import { onDestroy } from 'svelte' export let parendIssueId: Ref export let project: Project diff --git a/plugins/tracker-resources/src/index.ts b/plugins/tracker-resources/src/index.ts index 6982f6024e..d262570834 100644 --- a/plugins/tracker-resources/src/index.ts +++ b/plugins/tracker-resources/src/index.ts @@ -77,6 +77,7 @@ import RelationsPopup from './components/RelationsPopup.svelte' import SetDueDateActionPopup from './components/SetDueDateActionPopup.svelte' import SetParentIssueActionPopup from './components/SetParentIssueActionPopup.svelte' import CreateIssueTemplate from './components/templates/CreateIssueTemplate.svelte' +import MembersArrayEditor from './components/projects/MembersArrayEditor.svelte' import { getIssueId, getIssueTitle, @@ -227,7 +228,7 @@ async function editWorkflowStatuses (project: Project): Promise { loc.path[3] = settingId loc.path[4] = 'statuses' loc.query = { - categoryId: tracker.category.ProjectTypeCategory, + descriptorId: tracker.descriptors.ProjectType, typeId: project.type } navigate(loc) @@ -508,7 +509,8 @@ export default async (): Promise => ({ IssueStatusIcon, MilestoneStatusIcon, PriorityIconPresenter, - IssueSearchIcon + IssueSearchIcon, + MembersArrayEditor }, completion: { IssueQuery: async (client: Client, query: string, filter?: { in?: RelatedDocument[], nin?: RelatedDocument[] }) => diff --git a/plugins/tracker-resources/src/plugin.ts b/plugins/tracker-resources/src/plugin.ts index 8e79b0d5c8..bec94b813a 100644 --- a/plugins/tracker-resources/src/plugin.ts +++ b/plugins/tracker-resources/src/plugin.ts @@ -82,6 +82,7 @@ export default mergeIds(trackerId, tracker, { ChooseIcon: '' as IntlString, AddIssue: '' as IntlString, NewIssue: '' as IntlString, + NewIssuePlaceholder: '' as IntlString, ResumeDraft: '' as IntlString, NewSubIssue: '' as IntlString, Project: '' as IntlString, @@ -106,7 +107,7 @@ export default mergeIds(trackerId, tracker, { Description: '' as IntlString, Status: '' as IntlString, DefaultIssueStatus: '' as IntlString, - IssueStatuses: '' as IntlString, + IssueStatus: '' as IntlString, EditWorkflowStatuses: '' as IntlString, EditProject: '' as IntlString, DeleteProject: '' as IntlString, diff --git a/plugins/tracker-resources/src/utils.ts b/plugins/tracker-resources/src/utils.ts index 07048c0517..0b9f131d38 100644 --- a/plugins/tracker-resources/src/utils.ts +++ b/plugins/tracker-resources/src/utils.ts @@ -25,7 +25,6 @@ import core, { type Doc, type DocumentQuery, type DocumentUpdate, - type IdMap, type Ref, type Space, type StatusCategory, @@ -37,7 +36,8 @@ import core, { } from '@hcengineering/core' import { type Asset, type IntlString } from '@hcengineering/platform' import { createQuery, getClient } from '@hcengineering/presentation' -import task, { calcRank, type ProjectType } from '@hcengineering/task' +import task, { calcRank, getStatusIndex, type ProjectType } from '@hcengineering/task' +import { activeProjects as taskActiveProjects, taskTypeStore } from '@hcengineering/task-resources' import { IssuePriority, IssuesDateModificationPeriod, @@ -68,10 +68,16 @@ import { statusStore, type SelectDirection } from '@hcengineering/view-resources' -import { get, writable } from 'svelte/store' +import { derived, get } from 'svelte/store' import tracker from './plugin' import { defaultMilestoneStatuses, defaultPriorities } from './types' +export const activeProjects = derived(taskActiveProjects, (projects) => { + const client = getClient() + return toIdMap( + Array.from(projects.values()).filter((it) => client.getHierarchy().isDerived(it._class, tracker.class.Project)) + ) as Map, Project> +}) export * from './types' export const UNSET_COLOR = -1 @@ -311,6 +317,7 @@ export async function issueStatusSort ( ) type = _space?.$lookup?.type } + const taskTypes = get(taskTypeStore) const statuses = get(statusStore).byId // TODO: How we track category updates. @@ -323,8 +330,8 @@ export async function issueStatusSort ( listIssueKanbanStatusOrder.indexOf(bVal?.category as Ref) if (res === 0) { if (type != null) { - const aIndex = type.statuses.findIndex((s) => s._id === a) - const bIndex = type.statuses.findIndex((s) => s._id === b) + const aIndex = getStatusIndex(type, taskTypes, a) + const bIndex = getStatusIndex(type, taskTypes, b) return aIndex - bIndex } else { return aVal.name.localeCompare(bVal.name) @@ -341,8 +348,8 @@ export async function issueStatusSort ( listIssueStatusOrder.indexOf(bVal?.category as Ref) if (res === 0) { if (type != null) { - const aIndex = type.statuses.findIndex((s) => s._id === a) - const bIndex = type.statuses.findIndex((s) => s._id === b) + const aIndex = getStatusIndex(type, taskTypes, a) + const bIndex = getStatusIndex(type, taskTypes, b) return aIndex - bIndex } else { return aVal.name.localeCompare(bVal.name) @@ -378,14 +385,6 @@ export async function milestoneSort ( }) }) } - -export const activeProjects = writable>(new Map()) -const activeProjectsQuery = createQuery(true) - -activeProjectsQuery.query(tracker.class.Project, { archived: false }, (projects) => { - activeProjects.set(toIdMap(projects)) -}) - export async function moveIssuesToAnotherMilestone ( client: TxOperations, oldMilestone: Milestone, diff --git a/plugins/tracker-resources/tsconfig.json b/plugins/tracker-resources/tsconfig.json index 1a2db3ba83..1bc118e9e9 100644 --- a/plugins/tracker-resources/tsconfig.json +++ b/plugins/tracker-resources/tsconfig.json @@ -5,4 +5,4 @@ "rootDir": "./src", "outDir": "./lib" } -} \ No newline at end of file +} diff --git a/plugins/tracker/src/index.ts b/plugins/tracker/src/index.ts index 779cd7d48e..956533c8c5 100644 --- a/plugins/tracker/src/index.ts +++ b/plugins/tracker/src/index.ts @@ -33,7 +33,7 @@ import { } from '@hcengineering/core' import { Asset, IntlString, Plugin, Resource, plugin } from '@hcengineering/platform' import { TagCategory, TagElement, TagReference } from '@hcengineering/tags' -import { ProjectTypeCategory, Task, Project as TaskProject } from '@hcengineering/task' +import { ProjectTypeDescriptor, Task, Project as TaskProject, TaskType } from '@hcengineering/task' import { AnyComponent, ComponentExtensionId, Location, ResolvedLocation } from '@hcengineering/ui' import { Action, ActionCategory, IconProps } from '@hcengineering/view' @@ -201,6 +201,7 @@ export interface Issue extends Task { * @public */ export interface IssueDraft { + kind?: Ref _id: Ref title: string description: Markup @@ -450,8 +451,10 @@ export default plugin(trackerId, { }, category: { Other: '' as Ref, - Tracker: '' as Ref, - ProjectTypeCategory: '' as Ref + Tracker: '' as Ref + }, + descriptors: { + ProjectType: '' as Ref }, action: { SetDueDate: '' as Ref, @@ -495,5 +498,9 @@ export default plugin(trackerId, { extensions: { IssueListHeader: '' as ComponentExtensionId, EditIssueHeader: '' as ComponentExtensionId + }, + taskTypes: { + Issue: '' as Ref, + SubIssue: '' as Ref } }) diff --git a/plugins/view-resources/src/components/ActionsPopup.svelte b/plugins/view-resources/src/components/ActionsPopup.svelte index 05af2e5304..f854cf2aac 100644 --- a/plugins/view-resources/src/components/ActionsPopup.svelte +++ b/plugins/view-resources/src/components/ActionsPopup.svelte @@ -34,14 +34,15 @@ deviceOptionsStore, capitalizeFirstLetter, formatKey, - themeStore + themeStore, + ListView, + resizeObserver } from '@hcengineering/ui' import { Action, ActionCategory, ViewContext } from '@hcengineering/view' import { filterActions, getSelection } from '../actions' import view from '../plugin' import { focusStore, selectionStore } from '../selection' import { openDoc } from '../utils' - import { ListView, resizeObserver } from '@hcengineering/ui' import ObjectPresenter from './ObjectPresenter.svelte' import { createEventDispatcher, tick } from 'svelte' diff --git a/plugins/view-resources/src/components/ClassPresenter.svelte b/plugins/view-resources/src/components/ClassPresenter.svelte index 306b03dba7..98da8146d9 100644 --- a/plugins/view-resources/src/components/ClassPresenter.svelte +++ b/plugins/view-resources/src/components/ClassPresenter.svelte @@ -14,9 +14,21 @@ --> -