Skip to content

Commit 4888c7e

Browse files
haiodohaiodo
committed
Merge branch 'staging' into develop
Signed-off-by: Andrey Sobolev <[email protected]>
2 parents 7dec3cf + 9d87ce7 commit 4888c7e

File tree

95 files changed

+2256
-427
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+2256
-427
lines changed

‎dev/prod/package.json‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,6 @@
110110
"@hcengineering/inventory": "^0.6.11",
111111
"@hcengineering/inventory-assets": "^0.6.11",
112112
"@hcengineering/inventory-resources": "^0.6.0",
113-
"@hcengineering/server-attachment": "^0.6.1",
114-
"@hcengineering/server-attachment-resources": "^0.6.0",
115-
"@hcengineering/server-collaboration": "^0.6.0",
116-
"@hcengineering/server-collaboration-resources": "^0.6.0",
117-
"@hcengineering/server-contact": "^0.6.1",
118-
"@hcengineering/server-contact-resources": "^0.6.0",
119-
"@hcengineering/server-notification": "^0.6.1",
120-
"@hcengineering/server-notification-resources": "^0.6.0",
121-
"@hcengineering/server-setting": "^0.6.0",
122-
"@hcengineering/server-setting-resources": "^0.6.0",
123113
"@hcengineering/templates": "^0.6.11",
124114
"@hcengineering/templates-assets": "^0.6.11",
125115
"@hcengineering/templates-resources": "^0.6.0",
@@ -133,30 +123,10 @@
133123
"@hcengineering/tags-assets": "^0.6.0",
134124
"@hcengineering/tags": "^0.6.16",
135125
"@hcengineering/tags-resources": "^0.6.0",
136-
"@hcengineering/server-chunter": "^0.6.0",
137-
"@hcengineering/server-chunter-resources": "^0.6.0",
138-
"@hcengineering/server-inventory": "^0.6.1",
139-
"@hcengineering/server-inventory-resources": "^0.6.0",
140-
"@hcengineering/server-lead": "^0.6.0",
141-
"@hcengineering/server-lead-resources": "^0.6.0",
142-
"@hcengineering/server-recruit": "^0.6.0",
143-
"@hcengineering/server-recruit-resources": "^0.6.0",
144-
"@hcengineering/server-tags": "^0.6.0",
145-
"@hcengineering/server-tags-resources": "^0.6.0",
146-
"@hcengineering/server-task": "^0.6.0",
147-
"@hcengineering/server-task-resources": "^0.6.0",
148126
"@hcengineering/calendar": "^0.6.24",
149127
"@hcengineering/calendar-assets": "^0.6.22",
150128
"@hcengineering/calendar-resources": "^0.6.0",
151-
"@hcengineering/server-calendar": "^0.6.0",
152-
"@hcengineering/server-calendar-resources": "^0.6.0",
153-
"@hcengineering/server-gmail": "^0.6.0",
154-
"@hcengineering/server-gmail-resources": "^0.6.0",
155-
"@hcengineering/server-telegram": "^0.6.0",
156-
"@hcengineering/server-telegram-resources": "^0.6.0",
157129
"@hcengineering/presentation": "^0.6.3",
158-
"@hcengineering/server-tracker": "^0.6.0",
159-
"@hcengineering/server-tracker-resources": "^0.6.0",
160130
"@hcengineering/tracker": "^0.6.24",
161131
"@hcengineering/tracker-assets": "^0.6.0",
162132
"@hcengineering/tracker-resources": "^0.6.0",
@@ -169,20 +139,12 @@
169139
"@hcengineering/hr": "^0.6.19",
170140
"@hcengineering/hr-assets": "^0.6.19",
171141
"@hcengineering/hr-resources": "^0.6.0",
172-
"@hcengineering/server-hr": "^0.6.0",
173-
"@hcengineering/server-hr-resources": "^0.6.0",
174142
"@hcengineering/bitrix": "^0.6.52",
175143
"@hcengineering/bitrix-assets": "^0.6.0",
176144
"@hcengineering/bitrix-resources": "^0.6.0",
177145
"@hcengineering/request": "^0.6.14",
178146
"@hcengineering/request-assets": "^0.6.0",
179147
"@hcengineering/request-resources": "^0.6.0",
180-
"@hcengineering/server-request": "^0.6.0",
181-
"@hcengineering/server-request-resources": "^0.6.0",
182-
"@hcengineering/server-view": "^0.6.0",
183-
"@hcengineering/server-view-resources": "^0.6.0",
184-
"@hcengineering/server-activity": "^0.6.0",
185-
"@hcengineering/server-activity-resources": "^0.6.0",
186148
"@hcengineering/drive": "^0.6.0",
187149
"@hcengineering/drive-assets": "^0.6.0",
188150
"@hcengineering/drive-resources": "^0.6.0",

‎dev/tool/package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@
100100
"@hcengineering/server-storage": "^0.6.0",
101101
"@hcengineering/server-calendar": "^0.6.0",
102102
"@hcengineering/server-calendar-resources": "^0.6.0",
103+
"@hcengineering/server-card": "^0.6.0",
104+
"@hcengineering/server-card-resources": "^0.6.0",
103105
"@hcengineering/server-chunter": "^0.6.0",
104106
"@hcengineering/server-chunter-resources": "^0.6.0",
105107
"@hcengineering/server-contact": "^0.6.1",

‎dev/tool/src/__start.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import { devTool } from '.'
2323
import { addLocation } from '@hcengineering/platform'
2424
import { serverActivityId } from '@hcengineering/server-activity'
2525
import { serverAttachmentId } from '@hcengineering/server-attachment'
26+
import { serverCardId } from '@hcengineering/server-card'
2627
import { serverCalendarId } from '@hcengineering/server-calendar'
2728
import { serverChunterId } from '@hcengineering/server-chunter'
2829
import { serverCollaborationId } from '@hcengineering/server-collaboration'
@@ -59,6 +60,7 @@ addLocation(serverSettingId, () => import('@hcengineering/server-setting-resourc
5960
addLocation(serverTaskId, () => import('@hcengineering/server-task-resources'))
6061
addLocation(serverTrackerId, () => import('@hcengineering/server-tracker-resources'))
6162
addLocation(serverTagsId, () => import('@hcengineering/server-tags-resources'))
63+
addLocation(serverCardId, () => import('@hcengineering/server-card-resources'))
6264
addLocation(serverCalendarId, () => import('@hcengineering/server-calendar-resources'))
6365
addLocation(serverGmailId, () => import('@hcengineering/server-gmail-resources'))
6466
addLocation(serverTelegramId, () => import('@hcengineering/server-telegram-resources'))

‎models/all/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
"@hcengineering/model-bitrix": "^0.6.0",
8888
"@hcengineering/model-request": "^0.6.0",
8989
"@hcengineering/model-support": "^0.6.0",
90+
"@hcengineering/model-server-card": "^0.6.0",
9091
"@hcengineering/model-server-request": "^0.6.0",
9192
"@hcengineering/model-server-view": "^0.6.0",
9293
"@hcengineering/model-server-activity": "^0.6.0",

‎models/all/src/index.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import { requestId, createModel as requestModel } from '@hcengineering/model-req
3737
import { aiBotId, createModel as aiBotModel } from '@hcengineering/model-ai-bot'
3838
import { serverActivityId, createModel as serverActivityModel } from '@hcengineering/model-server-activity'
3939
import { serverAttachmentId, createModel as serverAttachmentModel } from '@hcengineering/model-server-attachment'
40+
import { serverCardId, createModel as serverCardModel } from '@hcengineering/model-server-card'
4041
import { serverCalendarId, createModel as serverCalendarModel } from '@hcengineering/model-server-calendar'
4142
import { serverChunterId, createModel as serverChunterModel } from '@hcengineering/model-server-chunter'
4243
import {
@@ -146,7 +147,8 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[
146147
view.class.Action,
147148
contact.class.ChannelProvider,
148149
setting.class.IntegrationType,
149-
setting.class.WorkspaceSettingCategory
150+
setting.class.WorkspaceSettingCategory,
151+
setting.class.SettingsCategory
150152
]
151153

152154
const builders: BuilderConfig[] = [
@@ -366,7 +368,7 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[
366368
{
367369
label: card.string.Cards,
368370
description: card.string.ConfigDescription,
369-
enabled: false,
371+
enabled: true,
370372
beta: true,
371373
icon: card.icon.Card,
372374
classFilter: defaultFilter
@@ -440,6 +442,7 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[
440442
[serverTagsModel, serverTagsId],
441443
[serverTaskModel, serverTaskId],
442444
[serverTrackerModel, serverTrackerId],
445+
[serverCardModel, serverCardId],
443446
[serverCalendarModel, serverCalendarId],
444447
[serverRecruitModel, serverRecruitId],
445448
[serverGmailModel, serverGmailId],

‎models/card/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
},
3030
"dependencies": {
3131
"@hcengineering/activity": "^0.6.0",
32+
"@hcengineering/contact": "^0.6.24",
3233
"@hcengineering/core": "^0.6.32",
3334
"@hcengineering/model": "^0.6.11",
3435
"@hcengineering/chunter": "^0.6.20",

‎models/card/src/index.ts‎

Lines changed: 91 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414
import activity from '@hcengineering/activity'
1515
import { CardEvents, cardId, type Card, type MasterTag, type Tag } from '@hcengineering/card'
1616
import chunter from '@hcengineering/chunter'
17+
import contact from '@hcengineering/contact'
1718
import core, {
1819
AccountRole,
20+
DOMAIN_MODEL,
21+
IndexKind,
1922
type CollectionSize,
2023
type Domain,
2124
type MarkupBlobRef,
@@ -24,12 +27,12 @@ import core, {
2427
} from '@hcengineering/core'
2528
import {
2629
Collection,
30+
Index,
2731
Model,
2832
Prop,
2933
TypeCollaborativeDoc,
3034
TypeRef,
3135
TypeString,
32-
UX,
3336
type Builder
3437
} from '@hcengineering/model'
3538
import attachment from '@hcengineering/model-attachment'
@@ -38,8 +41,9 @@ import presentation from '@hcengineering/model-presentation'
3841
import setting from '@hcengineering/model-setting'
3942
import view, { createAction } from '@hcengineering/model-view'
4043
import workbench from '@hcengineering/model-workbench'
41-
import { getEmbeddedLabel } from '@hcengineering/platform'
44+
import { getEmbeddedLabel, type IntlString } from '@hcengineering/platform'
4245
import time, { type ToDo } from '@hcengineering/time'
46+
import { type AnyComponent } from '@hcengineering/ui'
4347
import card from './plugin'
4448

4549
export { cardId } from '@hcengineering/card'
@@ -53,12 +57,12 @@ export class TMasterTag extends TClass implements MasterTag {}
5357
export class TTag extends TMixin implements Tag {}
5458

5559
@Model(card.class.Card, core.class.Doc, DOMAIN_CARD)
56-
@UX(card.string.Card)
5760
export class TCard extends TDoc implements Card {
5861
@Prop(TypeRef(card.class.MasterTag), card.string.MasterTag)
5962
declare _class: Ref<MasterTag>
6063

6164
@Prop(TypeString(), core.string.Name)
65+
@Index(IndexKind.FullText)
6266
title!: string
6367

6468
@Prop(TypeCollaborativeDoc(), card.string.Content)
@@ -75,8 +79,15 @@ export class TCard extends TDoc implements Card {
7579
todos?: CollectionSize<ToDo>
7680
}
7781

82+
@Model(card.class.MasterTagEditorSection, core.class.Doc, DOMAIN_MODEL)
83+
export class MasterTagEditorSection extends TDoc implements MasterTagEditorSection {
84+
id!: string
85+
label!: IntlString
86+
component!: AnyComponent
87+
}
88+
7889
export function createModel (builder: Builder): void {
79-
builder.createModel(TMasterTag, TTag, TCard)
90+
builder.createModel(TMasterTag, TTag, TCard, MasterTagEditorSection)
8091

8192
builder.createDoc(
8293
workbench.class.Application,
@@ -113,20 +124,6 @@ export function createModel (builder: Builder): void {
113124
card.viewlet.CardTable
114125
)
115126

116-
builder.createDoc(
117-
setting.class.WorkspaceSettingCategory,
118-
core.space.Model,
119-
{
120-
name: 'masterTags',
121-
label: card.string.Tags,
122-
icon: card.icon.Tags,
123-
role: AccountRole.User,
124-
component: card.component.MasterTags,
125-
order: 4400
126-
},
127-
card.ids.MasterTags
128-
)
129-
130127
builder.mixin(card.class.Card, core.class.Class, view.mixin.ObjectPresenter, {
131128
presenter: card.component.CardPresenter
132129
})
@@ -268,11 +265,55 @@ export function createModel (builder: Builder): void {
268265
}
269266
})
270267

268+
builder.createDoc(
269+
setting.class.WorkspaceSettingCategory,
270+
core.space.Model,
271+
{
272+
name: 'tagrelation',
273+
label: card.string.TagRelations,
274+
icon: setting.icon.Relations,
275+
props: { _classes: [card.class.Card, contact.class.Contact], exclude: [] },
276+
component: setting.component.RelationSetting,
277+
group: 'settings-editor',
278+
role: AccountRole.Maintainer,
279+
order: 4501
280+
},
281+
card.ids.TagRelations
282+
)
283+
284+
builder.createDoc(
285+
setting.class.SettingsCategory,
286+
core.space.Model,
287+
{
288+
name: 'masterTags',
289+
label: card.string.MasterTags,
290+
icon: card.icon.Card,
291+
component: card.component.ManageMasterTagsContent,
292+
extraComponents: {
293+
navigation: card.component.ManageMasterTags,
294+
tools: card.component.ManageMasterTagsTools
295+
},
296+
group: 'settings-editor',
297+
role: AccountRole.User,
298+
order: 5000,
299+
expandable: true
300+
},
301+
card.ids.ManageMasterTags
302+
)
303+
271304
builder.mixin(card.class.Card, core.class.Class, view.mixin.ClassFilters, {
272305
filters: [],
273306
ignoreKeys: ['parent']
274307
})
275308

309+
builder.createDoc(core.class.FullTextSearchContext, core.space.Model, {
310+
toClass: card.class.Card,
311+
fullTextSummary: true,
312+
forceIndex: true,
313+
childProcessingAllowed: true,
314+
propagate: []
315+
})
316+
276317
builder.createDoc(
277318
presentation.class.ObjectSearchCategory,
278319
core.space.Model,
@@ -283,10 +324,42 @@ export function createModel (builder: Builder): void {
283324
query: card.completion.CardQuery,
284325
context: ['search', 'mention', 'spotlight'],
285326
classToSearch: card.class.Card,
327+
includeChilds: true,
286328
priority: 500
287329
},
288330
card.completion.CardCategory
289331
)
332+
333+
builder.createDoc(card.class.MasterTagEditorSection, core.space.Model, {
334+
id: 'general',
335+
label: setting.string.General,
336+
component: card.component.GeneralSection
337+
})
338+
339+
builder.createDoc(card.class.MasterTagEditorSection, core.space.Model, {
340+
id: 'properties',
341+
label: setting.string.Properties,
342+
component: card.component.ProperitiesSection
343+
})
344+
345+
builder.createDoc(card.class.MasterTagEditorSection, core.space.Model, {
346+
id: 'tags',
347+
label: card.string.Tags,
348+
component: card.component.TagsSection
349+
})
350+
351+
builder.createDoc(card.class.MasterTagEditorSection, core.space.Model, {
352+
id: 'childs',
353+
label: card.string.MasterTags,
354+
masterOnly: true,
355+
component: card.component.ChildsSection
356+
})
357+
358+
builder.createDoc(card.class.MasterTagEditorSection, core.space.Model, {
359+
id: 'relations',
360+
label: core.string.Relations,
361+
component: card.component.RelationsSection
362+
})
290363
}
291364

292365
export default card

‎models/card/src/plugin.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ export default mergeIds(cardId, card, {
3434
DeleteMasterTag: '' as Ref<Action>
3535
},
3636
ids: {
37-
MasterTags: '' as Ref<Doc>
37+
MasterTags: '' as Ref<Doc>,
38+
ManageMasterTags: '' as Ref<Doc>,
39+
TagRelations: '' as Ref<Doc>
3840
},
3941
completion: {
4042
CardQuery: '' as Resource<ObjectSearchFactory>,

‎models/server-card/.eslintrc.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
module.exports = {
2+
extends: ['./node_modules/@hcengineering/platform-rig/profiles/model/eslint.config.json'],
3+
parserOptions: {
4+
tsconfigRootDir: __dirname,
5+
project: './tsconfig.json'
6+
}
7+
}

‎models/server-card/.npmignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
*
2+
!/lib/**
3+
!CHANGELOG.md
4+
/lib/**/__tests__/

0 commit comments

Comments
 (0)