Skip to content

Commit 9d87ce7

Browse files
BykhovDenisBykhovDenis
authored
Cards fixes (#8003)
Signed-off-by: Denis Bykhov <[email protected]>
1 parent 617a647 commit 9d87ce7

File tree

96 files changed

+2357
-435
lines changed

Some content is hidden

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

96 files changed

+2357
-435
lines changed

‎common/config/rush/pnpm-lock.yaml‎

Lines changed: 91 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎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
@@ -101,6 +101,8 @@
101101
"@hcengineering/server-storage": "^0.6.0",
102102
"@hcengineering/server-calendar": "^0.6.0",
103103
"@hcengineering/server-calendar-resources": "^0.6.0",
104+
"@hcengineering/server-card": "^0.6.0",
105+
"@hcengineering/server-card-resources": "^0.6.0",
104106
"@hcengineering/server-chunter": "^0.6.0",
105107
"@hcengineering/server-chunter-resources": "^0.6.0",
106108
"@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",

0 commit comments

Comments
 (0)