diff --git a/.vscode/launch.json b/.vscode/launch.json index 090cdf176a..7c1bf86405 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -100,6 +100,7 @@ "ACCOUNTS_URL": "http://localhost:3000", "UPLOAD_URL": "/files", "SERVER_PORT": "8087", + "VERSION": null, "COLLABORATOR_URL": "ws://localhost:3078", "COLLABORATOR_API_URL": "http://localhost:3078", "CALENDAR_URL": "http://localhost:8095", diff --git a/common/scripts/version.txt b/common/scripts/version.txt index 0fa1e44bad..2974978539 100644 --- a/common/scripts/version.txt +++ b/common/scripts/version.txt @@ -1 +1 @@ -"0.6.270" \ No newline at end of file +"0.6.271" \ No newline at end of file diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml index d8fb0b1c6d..23377590e8 100644 --- a/dev/docker-compose.yaml +++ b/dev/docker-compose.yaml @@ -77,6 +77,7 @@ services: - ACCOUNTS_URL=http://account:3000 - UPLOAD_URL=/files - MONGO_URL=mongodb://mongodb:27017?compressors=snappy + - 'MONGO_OPTIONS={"appName":"collaborator","maxPoolSize":2}' - STORAGE_CONFIG=${STORAGE_CONFIG} restart: unless-stopped front: @@ -95,6 +96,7 @@ services: - SERVER_PORT=8080 - SERVER_SECRET=secret - MONGO_URL=mongodb://mongodb:27017?compressors=snappy + - 'MONGO_OPTIONS={"appName":"front","maxPoolSize":1}' - ACCOUNTS_URL=http://localhost:3000 - UPLOAD_URL=/files - ELASTIC_URL=http://elastic:9200 @@ -135,6 +137,7 @@ services: - ENABLE_COMPRESSION=true - ELASTIC_URL=http://elastic:9200 - MONGO_URL=mongodb://mongodb:27017?compressors=snappy + - 'MONGO_OPTIONS={"appName": "transactor", "maxPoolSize": 1}' - METRICS_CONSOLE=false - METRICS_FILE=metrics.txt - STORAGE_CONFIG=${STORAGE_CONFIG} @@ -165,6 +168,7 @@ services: environment: - SECRET=secret - MONGO_URL=mongodb://mongodb:27017?compressors=snappy + - 'MONGO_OPTIONS={"appName":"print","maxPoolSize":1}' - STORAGE_CONFIG=${STORAGE_CONFIG} deploy: resources: @@ -181,6 +185,7 @@ services: environment: - SECRET=secret - MONGO_URL=mongodb://mongodb:27017 + - 'MONGO_OPTIONS={"appName":"sign","maxPoolSize":1}' - MINIO_ENDPOINT=minio - MINIO_ACCESS_KEY=minioadmin - ACCOUNTS_URL=http://account:3000 @@ -201,6 +206,7 @@ services: - SECRET=secret - PORT=4007 - MONGO_URL=mongodb://mongodb:27017 + - 'MONGO_OPTIONS={"appName":"analytics","maxPoolSize":1}' - SERVICE_ID=analytics-collector-service - ACCOUNTS_URL=http://account:3000 - SUPPORT_WORKSPACE=support diff --git a/models/core/src/security.ts b/models/core/src/security.ts index c4934e58c0..fa694867e3 100644 --- a/models/core/src/security.ts +++ b/models/core/src/security.ts @@ -70,6 +70,7 @@ export class TSpace extends TDoc implements Space { archived!: boolean @Prop(ArrOf(TypeRef(core.class.Account)), core.string.Members) + @Index(IndexKind.Indexed) members!: Arr> @Prop(ArrOf(TypeRef(core.class.Account)), core.string.Owners) diff --git a/models/preference/src/index.ts b/models/preference/src/index.ts index c6cfc8477b..0e2ae21cae 100644 --- a/models/preference/src/index.ts +++ b/models/preference/src/index.ts @@ -39,6 +39,6 @@ export function createModel (builder: Builder): void { builder.createDoc(core.class.DomainIndexConfiguration, core.space.Model, { domain: DOMAIN_PREFERENCE, - disabled: [{ modifiedOn: 1 }, { createdOn: 1 }] + disabled: [{ modifiedOn: 1 }, { createdOn: 1 }, { attachedTo: 1 }, { createdOn: -1 }, { modifiedBy: 1 }] }) } diff --git a/models/tags/src/index.ts b/models/tags/src/index.ts index 64a2531fc2..ffc707da9b 100644 --- a/models/tags/src/index.ts +++ b/models/tags/src/index.ts @@ -148,6 +148,7 @@ export function createModel (builder: Builder): void { builder.createDoc(core.class.DomainIndexConfiguration, core.space.Model, { domain: DOMAIN_TAGS, disabled: [ + { _class: 1 }, { modifiedOn: 1 }, { modifiedBy: 1 }, { createdBy: 1 }, diff --git a/packages/core/src/measurements/metrics.ts b/packages/core/src/measurements/metrics.ts index fbef8f77f9..d3a9ae014d 100644 --- a/packages/core/src/measurements/metrics.ts +++ b/packages/core/src/measurements/metrics.ts @@ -1,7 +1,6 @@ // Basic performance metrics suite. import { MetricsData } from '.' -import { cutObjectArray } from '../utils' import { FullParamsType, Metrics, ParamsType } from './types' /** @@ -35,7 +34,7 @@ function getUpdatedTopResult ( const newValue = { value: time, - params: cutObjectArray(params) + params } if (result.length > 6) { diff --git a/packages/core/src/operations.ts b/packages/core/src/operations.ts index 94e45c3ec9..4c70d569a7 100644 --- a/packages/core/src/operations.ts +++ b/packages/core/src/operations.ts @@ -487,9 +487,13 @@ export class ApplyOperations extends TxOperations { extraNotify ) )) as Promise) + const dnow = Date.now() + if (typeof window === 'object' && window !== null) { + console.log(`measure ${this.measureName}`, dnow - st, 'server time', result.serverTime) + } return { result: result.success, - time: Date.now() - st, + time: dnow - st, serverTime: result.serverTime } } diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts index 2fe36d2e10..075f0f535e 100644 --- a/packages/core/src/utils.ts +++ b/packages/core/src/utils.ts @@ -13,8 +13,9 @@ // limitations under the License. // -import { getEmbeddedLabel, IntlString } from '@hcengineering/platform' +import { getEmbeddedLabel, IntlString, PlatformError, unknownError } from '@hcengineering/platform' import { deepEqual } from 'fast-equals' +import { DOMAIN_BENCHMARK } from './benchmark' import { Account, AccountRole, @@ -46,7 +47,6 @@ import { TxOperations } from './operations' import { isPredicate } from './predicate' import { DocumentQuery, FindResult } from './storage' import { DOMAIN_TX } from './tx' -import { DOMAIN_BENCHMARK } from './benchmark' function toHex (value: number, chars: number): string { const result = value.toString(16) @@ -355,7 +355,6 @@ export class DocManager implements IDocManager { export class RateLimiter { idCounter: number = 0 - processingQueue = new Map>() last: number = 0 rate: number @@ -366,21 +365,21 @@ export class RateLimiter { } notify: (() => void)[] = [] + finished: boolean = false async exec = any>(op: (args?: B) => Promise, args?: B): Promise { - const processingId = this.idCounter++ - - while (this.processingQueue.size >= this.rate) { + if (this.finished) { + throw new PlatformError(unknownError('No Possible to add/exec on finished queue')) + } + while (this.notify.length >= this.rate) { await new Promise((resolve) => { this.notify.push(resolve) }) } try { const p = op(args) - this.processingQueue.set(processingId, p as Promise) return await p } finally { - this.processingQueue.delete(processingId) const n = this.notify.shift() if (n !== undefined) { n() @@ -389,7 +388,7 @@ export class RateLimiter { } async add = any>(op: (args?: B) => Promise, args?: B): Promise { - if (this.processingQueue.size < this.rate) { + if (this.notify.length < this.rate) { void this.exec(op, args) } else { await this.exec(op, args) @@ -397,7 +396,12 @@ export class RateLimiter { } async waitProcessing (): Promise { - await Promise.all(this.processingQueue.values()) + this.finished = true + while (this.notify.length > 0) { + await new Promise((resolve) => { + this.notify.push(resolve) + }) + } } } diff --git a/packages/presentation/src/pipeline.ts b/packages/presentation/src/pipeline.ts index 79f3fe6663..cd75ef2672 100644 --- a/packages/presentation/src/pipeline.ts +++ b/packages/presentation/src/pipeline.ts @@ -9,6 +9,7 @@ import { type FindResult, type Hierarchy, type ModelDb, + type QuerySelector, type Ref, type SearchOptions, type SearchQuery, @@ -330,6 +331,22 @@ export class OptimizeQueryMiddleware extends BasePresentationMiddleware implemen const fQuery = { ...query } const fOptions = { ...options } this.optimizeQuery(fQuery, fOptions) + + // Immidiate response queries, if have some $in with empty list. + + for (const [k, v] of Object.entries(fQuery)) { + if (typeof v === 'object' && v != null) { + const vobj = v as QuerySelector + if (vobj.$in != null && vobj.$in.length === 0) { + // Emopty in, will always return [] + return toFindResult([], 0) + } else if (vobj.$in != null && vobj.$in.length === 1 && Object.keys(vobj).length === 1) { + ;(fQuery as any)[k] = vobj.$in[0] + } else if (vobj.$nin != null && vobj.$nin.length === 1 && Object.keys(vobj).length === 1) { + ;(fQuery as any)[k] = { $ne: vobj.$nin[0] } + } + } + } return await this.provideFindAll(_class, fQuery, fOptions) } diff --git a/packages/ui/src/tooltips.ts b/packages/ui/src/tooltips.ts index 14a043c543..0a3e478599 100644 --- a/packages/ui/src/tooltips.ts +++ b/packages/ui/src/tooltips.ts @@ -28,6 +28,10 @@ export function tooltip (node: HTMLElement, options?: LabelAndProps): any { if (options === undefined) { return {} } + if (options.label === undefined && options.component === undefined) { + // No tooltip + return {} + } let opt = options const show = (): void => { const shown = !!(storedValue.label !== undefined || storedValue.component !== undefined) @@ -113,7 +117,7 @@ export function showTooltip ( props, anchor, onUpdate, - kind, + kind: kind ?? 'tooltip', keys, type: 'tooltip' } diff --git a/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte b/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte index 29a3581897..c87a8ad08e 100644 --- a/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte +++ b/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte @@ -13,23 +13,23 @@ // limitations under the License. --> + + + + + +
{ + dispatch('changeContent') + }} + on:keydown={onKeydown} +> + {#if searchable} +
+ +
+ {:else} +
+ {/if} +
+
+ dispatch('changeContent')}> + + {@const item = value[itemId]} + + + + {@const obj = value[row]} + {#if obj.category && ((row === 0 && obj.category.label !== undefined) || obj.category.label !== value[row - 1]?.category?.label)} + {#if row > 0}
{/if} +
+ + +
+ {/if} + + +
+
+ {#if !embedded}
{/if} +
diff --git a/plugins/tracker-resources/src/components/issues/related/RelatedIssueSelector.svelte b/plugins/tracker-resources/src/components/issues/related/RelatedIssueSelector.svelte index 03ef6ac954..7d12c757fb 100644 --- a/plugins/tracker-resources/src/components/issues/related/RelatedIssueSelector.svelte +++ b/plugins/tracker-resources/src/components/issues/related/RelatedIssueSelector.svelte @@ -13,18 +13,16 @@ // limitations under the License. --> {#if hasSubIssues} @@ -121,10 +65,10 @@ {size} {justify} showTooltip={{ - component: SelectPopup, + component: RelatedIssuePopup, props: { - value: selectValue, - onSelect: openIssue, + refs: subIssues, + currentProject, showShadow: false, width: 'large' } diff --git a/plugins/tracker-resources/src/components/milestones/MilestoneContent.svelte b/plugins/tracker-resources/src/components/milestones/MilestoneContent.svelte index 9647cc27c3..73bee061f0 100644 --- a/plugins/tracker-resources/src/components/milestones/MilestoneContent.svelte +++ b/plugins/tracker-resources/src/components/milestones/MilestoneContent.svelte @@ -1,5 +1,5 @@ diff --git a/plugins/workbench-resources/src/components/statistics/MetricsInfo.svelte b/plugins/workbench-resources/src/components/statistics/MetricsInfo.svelte index 78108061ae..379cdc5c2c 100644 --- a/plugins/workbench-resources/src/components/statistics/MetricsInfo.svelte +++ b/plugins/workbench-resources/src/components/statistics/MetricsInfo.svelte @@ -9,7 +9,10 @@ export let level = 0 export let name: string = 'System' - $: haschilds = Object.keys(metrics.measurements).length > 0 || Object.keys(metrics.params).length > 0 + $: haschilds = + Object.keys(metrics.measurements).length > 0 || + Object.keys(metrics.params).length > 0 || + (metrics.topResult?.length ?? 0) > 0 function showAvg (name: string, time: number, ops: number): string { if (name.startsWith('#')) { @@ -76,13 +79,13 @@ {#each metrics.topResult ?? [] as r} -
+
Time:{r.value}
- 
-          {JSON.stringify(r, null, 2)}
-
+ 
+              {JSON.stringify(r, null, 2)}
+
{/each} @@ -127,9 +130,9 @@ Time:{r.value}
- 
-                  {JSON.stringify(r, null, 2)}
-
+ 
+                    {JSON.stringify(r, null, 2)}
+
{/each}
diff --git a/pods/account/package.json b/pods/account/package.json index 7afc44b506..3d3e661abe 100644 --- a/pods/account/package.json +++ b/pods/account/package.json @@ -17,6 +17,7 @@ "bundle": "mkdir -p bundle && esbuild src/__start.ts --bundle --define:process.env.MODEL_VERSION=$(node ../../common/scripts/show_version.js) --minify --platform=node > bundle/bundle.js", "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/account", "docker:tbuild": "docker build -t hardcoreeng/account . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/account", + "docker:abuild": "docker build -t hardcoreeng/account . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/account", "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/account staging", "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/account", "run-local": "cross-env MONGO_URL=mongodb://localhost:27017 MINIO_ACCESS_KEY=minioadmi MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost SERVER_SECRET='secret' TRANSACTOR_URL=ws://localhost:3333 ts-node src/__start.ts", diff --git a/pods/collaborator/package.json b/pods/collaborator/package.json index 1824082a25..feebcac7c0 100644 --- a/pods/collaborator/package.json +++ b/pods/collaborator/package.json @@ -15,6 +15,8 @@ "_phase:docker-staging": "rushx docker:staging", "bundle": "mkdir -p bundle && esbuild src/__start.ts --bundle --platform=node --keep-names > bundle/bundle.js", "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/collaborator", + "docker:tbuild": "docker build -t hardcoreeng/collaborator . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/collaborator", + "docker:abuild": "docker build -t hardcoreeng/collaborator . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/collaborator", "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/collaborator staging", "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/collaborator", "run-local": "cross-env MONGO_URL=mongodb://localhost:27017 SECRET=secret MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin ts-node src/__start.ts", diff --git a/pods/front/package.json b/pods/front/package.json index 6f5050d442..fe860f4f4b 100644 --- a/pods/front/package.json +++ b/pods/front/package.json @@ -20,6 +20,7 @@ "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/front staging", "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/front", "docker:tbuild": "docker build -t hardcoreeng/front . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/front", + "docker:abuild": "docker build -t hardcoreeng/front . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/front", "format": "format src", "run-local": "cross-env MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost SERVER_SECRET='secret' ACCOUNTS_URL=http://localhost:3000 UPLOAD_URL=/files ELASTIC_URL=http://localhost:9200 MODEL_VERSION=$(node ../../common/scripts/show_version.js) VERSION=$(node ../../common/scripts/show_tag.js) PUBLIC_DIR='.' ts-node ./src/__start.ts", "test": "jest --passWithNoTests --silent --forceExit", diff --git a/pods/server/package.json b/pods/server/package.json index 90214c6c8d..609152ce69 100644 --- a/pods/server/package.json +++ b/pods/server/package.json @@ -8,9 +8,9 @@ "template": "@hcengineering/node-package", "license": "EPL-2.0", "scripts": { - "start": "rush bundle --to @hcengineering/server && cross-env NODE_ENV=production ELASTIC_INDEX_NAME=local_storage_index MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 ELASTIC_URL=http://localhost:9200 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret node --inspect --enable-source-maps bundle/bundle.js", - "start-u": "rush bundle --to @hcengineering/server && cp ./node_modules/@hcengineering/uws/lib/*.node ./bundle/ && cross-env NODE_ENV=production SERVER_PROVIDER=uweb ELASTIC_INDEX_NAME=local_storage_index MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 ELASTIC_URL=http://localhost:9200 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret node --inspect bundle/bundle.js", - "start-flame": "rush bundle --to @hcengineering/server && cross-env NODE_ENV=production ELASTIC_INDEX_NAME=local_storage_index MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 ELASTIC_URL=http://localhost:9200 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret clinic flame --dest ./out -- node --nolazy -r ts-node/register --enable-source-maps src/__start.ts", + "start": "rush bundle --to @hcengineering/pod-server && cross-env NODE_ENV=production ELASTIC_INDEX_NAME=local_storage_index MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 ELASTIC_URL=http://localhost:9200 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret node --inspect --enable-source-maps bundle/bundle.js", + "start-u": "rush bundle --to @hcengineering/pod-server && cp ./node_modules/@hcengineering/uws/lib/*.node ./bundle/ && cross-env NODE_ENV=production SERVER_PROVIDER=uweb ELASTIC_INDEX_NAME=local_storage_index MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 ELASTIC_URL=http://localhost:9200 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret node --inspect bundle/bundle.js", + "start-flame": "rush bundle --to @hcengineering/pod-server && cross-env NODE_ENV=production ELASTIC_INDEX_NAME=local_storage_index MODEL_VERSION=$(node ../../common/scripts/show_version.js) ACCOUNTS_URL=http://localhost:3000 REKONI_URL=http://localhost:4004 MONGO_URL=mongodb://localhost:27017 ELASTIC_URL=http://localhost:9200 FRONT_URL=http://localhost:8087 UPLOAD_URL=/upload MINIO_ENDPOINT=localhost MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin METRICS_CONSOLE=true SERVER_SECRET=secret clinic flame --dest ./out -- node --nolazy -r ts-node/register --enable-source-maps src/__start.ts", "build": "compile", "_phase:bundle": "rushx bundle", "_phase:docker-build": "rushx docker:build", @@ -18,6 +18,7 @@ "bundle": "mkdir -p bundle && esbuild src/__start.ts --minify --bundle --keep-names --platform=node --external:*.node --external:bufferutil --external:utf-8-validate --define:process.env.MODEL_VERSION=$(node ../../common/scripts/show_version.js) --define:process.env.GIT_REVISION=$(../../common/scripts/git_version.sh) --outfile=bundle/bundle.js --log-level=error --sourcemap=external", "docker:build": "../../common/scripts/docker_build.sh hardcoreeng/transactor", "docker:tbuild": "docker build -t hardcoreeng/transactor . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/transactor", + "docker:abuild": "docker build -t hardcoreeng/transactor . --platform=linux/arm64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/transactor", "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/transactor staging", "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/transactor", "build:watch": "compile", diff --git a/server-plugins/activity-resources/src/index.ts b/server-plugins/activity-resources/src/index.ts index 7dbe0f77e3..d2da99eea2 100644 --- a/server-plugins/activity-resources/src/index.ts +++ b/server-plugins/activity-resources/src/index.ts @@ -136,6 +136,7 @@ export async function createReactionNotifications ( res = res.concat( await createCollabDocInfo( + control.ctx, [user] as Ref[], control, tx.tx, @@ -389,7 +390,7 @@ async function ActivityMessagesHandler (tx: TxCUD, control: TriggerControl) const messages = txes.map((messageTx) => TxProcessor.createDoc2Doc(messageTx.tx as TxCreateDoc)) const notificationTxes = await control.ctx.with( - 'createNotificationTxes', + 'createCollaboratorNotifications', {}, async (ctx) => await createCollaboratorNotifications(ctx, tx, control, messages) ) diff --git a/server-plugins/activity-resources/src/references.ts b/server-plugins/activity-resources/src/references.ts index 1aebe4fbf2..f65d49b876 100644 --- a/server-plugins/activity-resources/src/references.ts +++ b/server-plugins/activity-resources/src/references.ts @@ -248,7 +248,7 @@ async function checkSpace ( control: TriggerControl, res: Tx[] ): Promise { - const space = (await control.findAll(core.class.Space, { _id: spaceId }))[0] + const space = (await control.findAll(core.class.Space, { _id: spaceId }, { limit: 1 }))[0] const isMember = space.members.includes(user._id) if (space.private) { return isMember diff --git a/server-plugins/activity-resources/src/utils.ts b/server-plugins/activity-resources/src/utils.ts index 7a0aa17e46..632f5ce0e8 100644 --- a/server-plugins/activity-resources/src/utils.ts +++ b/server-plugins/activity-resources/src/utils.ts @@ -166,7 +166,10 @@ async function getCollaboratorsDiff ( prevValue = hierarchy.as(prevDoc, notification.mixin.Collaborators).collaborators ?? [] } else if (prevDoc !== undefined) { const mixin = hierarchy.classHierarchyMixin(prevDoc._class, notification.mixin.ClassCollaborators) - prevValue = mixin !== undefined ? await getDocCollaborators(prevDoc, mixin, control as TriggerControl) : [] + prevValue = + mixin !== undefined + ? await getDocCollaborators((control as TriggerControl).ctx, prevDoc, mixin, control as TriggerControl) + : [] } const added = value.filter((item) => !prevValue.includes(item)) as DocAttributeUpdates['added'] diff --git a/server-plugins/chunter-resources/src/index.ts b/server-plugins/chunter-resources/src/index.ts index cca3a0654b..ab757ee382 100644 --- a/server-plugins/chunter-resources/src/index.ts +++ b/server-plugins/chunter-resources/src/index.ts @@ -201,7 +201,7 @@ async function OnChatMessageCreated (tx: TxCUD, control: TriggerControl): P ) } } else { - const collaborators = await getDocCollaborators(targetDoc, mixin, control) + const collaborators = await getDocCollaborators(control.ctx, targetDoc, mixin, control) if (!collaborators.includes(message.modifiedBy)) { collaborators.push(message.modifiedBy) } @@ -542,12 +542,11 @@ async function hideOldChannels ( return res } -async function updateChatInfo (control: TriggerControl, status: UserStatus, date: Timestamp): Promise { +export async function updateChatInfo (control: TriggerControl, status: UserStatus, date: Timestamp): Promise { const account = await control.modelDb.findOne(contact.class.PersonAccount, { _id: status.user as Ref }) if (account === undefined) return - const chatUpdates = await control.queryFind(chunter.class.ChatInfo, {}) - const update = chatUpdates.find(({ user }) => user === account.person) + const update = (await control.findAll(chunter.class.ChatInfo, { user: account.person })).shift() const shouldUpdate = update === undefined || date - update.timestamp > updateChatInfoDelay if (!shouldUpdate) return @@ -608,23 +607,23 @@ async function updateChatInfo (control: TriggerControl, status: UserStatus, date } async function OnUserStatus (originTx: TxCUD, control: TriggerControl): Promise { - const tx = TxProcessor.extractTx(originTx) as TxCUD - if (tx.objectClass !== core.class.UserStatus) return [] - if (tx._class === core.class.TxCreateDoc) { - const createTx = tx as TxCreateDoc - const { online } = createTx.attributes - if (online) { - const status = TxProcessor.createDoc2Doc(createTx) - await updateChatInfo(control, status, originTx.modifiedOn) - } - } else if (tx._class === core.class.TxUpdateDoc) { - const updateTx = tx as TxUpdateDoc - const { online } = updateTx.operations - if (online === true) { - const status = (await control.findAll(core.class.UserStatus, { _id: updateTx.objectId }))[0] - await updateChatInfo(control, status, originTx.modifiedOn) - } - } + // const tx = TxProcessor.extractTx(originTx) as TxCUD + // if (tx.objectClass !== core.class.UserStatus) return [] + // if (tx._class === core.class.TxCreateDoc) { + // const createTx = tx as TxCreateDoc + // const { online } = createTx.attributes + // if (online) { + // const status = TxProcessor.createDoc2Doc(createTx) + // await updateChatInfo(control, status, originTx.modifiedOn) + // } + // } else if (tx._class === core.class.TxUpdateDoc) { + // const updateTx = tx as TxUpdateDoc + // const { online } = updateTx.operations + // if (online === true) { + // const status = (await control.findAll(core.class.UserStatus, { _id: updateTx.objectId }))[0] + // await updateChatInfo(control, status, originTx.modifiedOn) + // } + // } return [] } @@ -633,19 +632,17 @@ async function OnContextUpdate (tx: TxUpdateDoc, control: Trig const hasUpdate = 'lastUpdateTimestamp' in tx.operations && tx.operations.lastUpdateTimestamp !== undefined if (!hasUpdate) return [] - const chatUpdates = await control.queryFind(chunter.class.ChatInfo, {}) - for (const update of chatUpdates) { - if (update.hidden.includes(tx.objectId)) { - return [ - control.txFactory.createTxMixin(tx.objectId, tx.objectClass, tx.objectSpace, chunter.mixin.ChannelInfo, { - hidden: false - }), - control.txFactory.createTxUpdateDoc(update._class, update.space, update._id, { - hidden: update.hidden.filter((id) => id !== tx.objectId) - }) - ] - } - } + // const update = (await control.findAll(notification.class.DocNotifyContext, { _id: tx.objectId }, { limit: 1 })).shift() + // if (update !== undefined) { + // const as = control.hierarchy.as(update, chunter.mixin.ChannelInfo) + // if (as.hidden) { + // return [ + // control.txFactory.createTxMixin(tx.objectId, tx.objectClass, tx.objectSpace, chunter.mixin.ChannelInfo, { + // hidden: false + // }) + // ] + // } + // } return [] } diff --git a/server-plugins/notification-resources/src/index.ts b/server-plugins/notification-resources/src/index.ts index e25fd5e744..a3113231f4 100644 --- a/server-plugins/notification-resources/src/index.ts +++ b/server-plugins/notification-resources/src/index.ts @@ -284,6 +284,7 @@ async function getKeyCollaborators ( * @public */ export async function getDocCollaborators ( + ctx: MeasureContext, doc: Doc, mixin: ClassCollaborators, control: TriggerControl @@ -291,7 +292,11 @@ export async function getDocCollaborators ( const collaborators = new Set>() for (const field of mixin.fields) { const value = (doc as any)[field] - const newCollaborators = await getKeyCollaborators(doc, value, field, control) + const newCollaborators = await ctx.with( + 'getKeyCollaborators', + {}, + async () => await getKeyCollaborators(doc, value, field, control) + ) if (newCollaborators !== undefined) { for (const newCollaborator of newCollaborators) { collaborators.add(newCollaborator) @@ -544,9 +549,7 @@ export async function createPushNotification ( const privateKey = getMetadata(serverNotification.metadata.PushPrivateKey) const subject = getMetadata(serverNotification.metadata.PushSubject) ?? 'mailto:hey@huly.io' if (privateKey === undefined || publicKey === undefined) return - const subscriptions = (await control.queryFind(notification.class.PushSubscription, {})).filter( - (p) => p.user === target - ) + const subscriptions = await control.findAll(notification.class.PushSubscription, { user: target }) const data: PushData = { title, body @@ -784,6 +787,7 @@ async function updateContextsTimestamp ( } export async function createCollabDocInfo ( + ctx: MeasureContext, collaborators: Ref[], control: TriggerControl, tx: TxCUD, @@ -799,7 +803,7 @@ export async function createCollabDocInfo ( return res } - const notifyContexts = await control.findAll(notification.class.DocNotifyContext, { attachedTo: object._id }) + const notifyContexts = await control.findAllCtx(ctx, notification.class.DocNotifyContext, { attachedTo: object._id }) await updateContextsTimestamp(notifyContexts, originTx.modifiedOn, control, originTx.modifiedBy) @@ -822,7 +826,11 @@ export async function createCollabDocInfo ( return res } - const usersInfo = await getUsersInfo([...Array.from(targets), originTx.modifiedBy as Ref], control) + const usersInfo = await ctx.with( + 'get-user-info', + {}, + async (ctx) => await getUsersInfo(ctx, [...Array.from(targets), originTx.modifiedBy as Ref], control) + ) const sender = usersInfo.find(({ _id }) => _id === originTx.modifiedBy) ?? { _id: originTx.modifiedBy } @@ -888,7 +896,7 @@ async function getSpaceCollabTxes ( return [] } - const space = cache.get(doc.space) ?? (await control.findAll(core.class.Space, { _id: doc.space }))[0] + const space = cache.get(doc.space) ?? (await control.findAll(core.class.Space, { _id: doc.space }, { limit: 1 }))[0] if (space === undefined) return [] cache.set(space._id, space) @@ -901,6 +909,7 @@ async function getSpaceCollabTxes ( const collabs = control.hierarchy.as(space, notification.mixin.Collaborators) if (collabs.collaborators !== undefined) { return await createCollabDocInfo( + control.ctx, collabs.collaborators as Ref[], control, tx, @@ -916,6 +925,7 @@ async function getSpaceCollabTxes ( } async function createCollaboratorDoc ( + ctx: MeasureContext, tx: TxCreateDoc, control: TriggerControl, activityMessage: ActivityMessage[], @@ -931,28 +941,45 @@ async function createCollaboratorDoc ( } const doc = TxProcessor.createDoc2Doc(tx) - const collaborators = await getDocCollaborators(doc, mixin, control) + const collaborators = await ctx.with( + 'get-collaborators', + {}, + async (ctx) => await getDocCollaborators(ctx, doc, mixin, control) + ) const mixinTx = getMixinTx(tx, control, collaborators) - const notificationTxes = await createCollabDocInfo( - collaborators as Ref[], - control, - tx, - originTx, - doc, - activityMessage, - { isOwn: true, isSpace: false, shouldUpdateTimestamp: true }, - cache + const notificationTxes = await ctx.with( + 'create-collabdocinfo', + {}, + async () => + await createCollabDocInfo( + ctx, + collaborators as Ref[], + control, + tx, + originTx, + doc, + activityMessage, + { isOwn: true, isSpace: false, shouldUpdateTimestamp: true }, + cache + ) ) res.push(mixinTx) res.push(...notificationTxes) - res.push(...(await getSpaceCollabTxes(control, doc, tx, originTx, activityMessage, cache))) + res.push( + ...(await ctx.with( + 'get-space-collabtxes', + {}, + async () => await getSpaceCollabTxes(control, doc, tx, originTx, activityMessage, cache) + )) + ) return res } async function updateCollaboratorsMixin ( + ctx: MeasureContext, tx: TxMixin, control: TriggerControl, activityMessages: ActivityMessage[], @@ -969,17 +996,17 @@ async function updateCollaboratorsMixin ( if (tx.attributes.collaborators !== undefined) { const createTx = hierarchy.isDerived(tx.objectClass, core.class.AttachedDoc) ? ( - await control.findAll(core.class.TxCollectionCUD, { + await control.findAllCtx(ctx, core.class.TxCollectionCUD, { 'tx.objectId': tx.objectId, 'tx._class': core.class.TxCreateDoc }) )[0] : ( - await control.findAll(core.class.TxCreateDoc, { + await control.findAllCtx(ctx, core.class.TxCreateDoc, { objectId: tx.objectId }) )[0] - const mixinTxes = await control.findAll(core.class.TxMixin, { + const mixinTxes = await control.findAllCtx(ctx, core.class.TxMixin, { objectId: tx.objectId }) const prevDoc = TxProcessor.buildDoc2Doc([createTx, ...mixinTxes].filter((t) => t._id !== tx._id)) as Doc @@ -992,7 +1019,7 @@ async function updateCollaboratorsMixin ( prevCollabs = new Set(prevDocMixin.collaborators ?? []) } else { const mixin = hierarchy.classHierarchyMixin(prevDoc._class, notification.mixin.ClassCollaborators) - prevCollabs = mixin !== undefined ? new Set(await getDocCollaborators(prevDoc, mixin, control)) : new Set() + prevCollabs = mixin !== undefined ? new Set(await getDocCollaborators(ctx, prevDoc, mixin, control)) : new Set() } const type = await control.modelDb.findOne(notification.class.BaseNotificationType, { @@ -1017,12 +1044,16 @@ async function updateCollaboratorsMixin ( } if (newCollabs.length > 0) { - const docNotifyContexts = await control.findAll(notification.class.DocNotifyContext, { + const docNotifyContexts = await control.findAllCtx(ctx, notification.class.DocNotifyContext, { user: { $in: newCollabs }, attachedTo: tx.objectId }) - const infos = await getUsersInfo([...newCollabs, originTx.modifiedBy] as Ref[], control) + const infos = await ctx.with( + 'get-user-info', + {}, + async (ctx) => await getUsersInfo(ctx, [...newCollabs, originTx.modifiedBy] as Ref[], control) + ) const sender = infos.find(({ _id }) => _id === originTx.modifiedBy) ?? { _id: originTx.modifiedBy } for (const collab of newCollabs) { @@ -1050,13 +1081,14 @@ async function updateCollaboratorsMixin ( } async function collectionCollabDoc ( + ctx: MeasureContext, tx: TxCollectionCUD, control: TriggerControl, activityMessages: ActivityMessage[], cache: Map, Doc> ): Promise { const actualTx = TxProcessor.extractTx(tx) as TxCUD - let res = await createCollaboratorNotifications(control.ctx, actualTx, control, activityMessages, tx, cache) + let res = await createCollaboratorNotifications(ctx, actualTx, control, activityMessages, tx, cache) if (![core.class.TxCreateDoc, core.class.TxRemoveDoc, core.class.TxUpdateDoc].includes(actualTx._class)) { return res @@ -1068,7 +1100,12 @@ async function collectionCollabDoc ( return res } - const doc = cache.get(tx.objectId) ?? (await control.findAll(tx.objectClass, { _id: tx.objectId }, { limit: 1 }))[0] + const doc = await ctx.with( + 'get-doc', + {}, + async (ctx) => + cache.get(tx.objectId) ?? (await control.findAllCtx(ctx, tx.objectClass, { _id: tx.objectId }, { limit: 1 }))[0] + ) if (doc === undefined) { return res @@ -1076,18 +1113,28 @@ async function collectionCollabDoc ( cache.set(doc._id, doc) - const collaborators = await getCollaborators(doc, control, tx, res) + const collaborators = await ctx.with( + 'get-collaborators', + {}, + async () => await getCollaborators(doc, control, tx, res) + ) res = res.concat( - await createCollabDocInfo( - collaborators as Ref[], - control, - actualTx, - tx, - doc, - activityMessages, - { isOwn: false, isSpace: false, shouldUpdateTimestamp: true }, - cache + await ctx.with( + 'create-collab-doc-info', + {}, + async (ctx) => + await createCollabDocInfo( + ctx, + collaborators as Ref[], + control, + actualTx, + tx, + doc, + activityMessages, + { isOwn: false, isSpace: false, shouldUpdateTimestamp: true }, + cache + ) ) ) @@ -1184,6 +1231,7 @@ async function getNewCollaborators ( } async function updateCollaboratorDoc ( + ctx: MeasureContext, tx: TxUpdateDoc | TxMixin, control: TriggerControl, originTx: TxCUD, @@ -1194,7 +1242,11 @@ async function updateCollaboratorDoc ( let res: Tx[] = [] const mixin = hierarchy.classHierarchyMixin(tx.objectClass, notification.mixin.ClassCollaborators) if (mixin === undefined) return [] - const doc = (await control.findAll(tx.objectClass, { _id: tx.objectId }, { limit: 1 }))[0] + const doc = await ctx.with( + 'find-doc', + { _class: tx.objectClass }, + async () => (await control.findAllCtx(ctx, tx.objectClass, { _id: tx.objectId }, { limit: 1 }))[0] + ) if (doc === undefined) return [] const params: NotifyParams = { isOwn: true, isSpace: false, shouldUpdateTimestamp: true } if (hierarchy.hasMixin(doc, notification.mixin.Collaborators)) { @@ -1202,7 +1254,9 @@ async function updateCollaboratorDoc ( const collabMixin = hierarchy.as(doc, notification.mixin.Collaborators) const collabs = new Set(collabMixin.collaborators) const ops = isMixinTx(tx) ? tx.attributes : tx.operations - const newCollaborators = (await getNewCollaborators(ops, mixin, doc, control)).filter((p) => !collabs.has(p)) + const newCollaborators = await ctx.with('get-new-collaborators', {}, async () => + (await getNewCollaborators(ops, mixin, doc, control)).filter((p) => !collabs.has(p)) + ) if (newCollaborators.length > 0) { res.push( @@ -1217,22 +1271,33 @@ async function updateCollaboratorDoc ( ) } res = res.concat( - await createCollabDocInfo( - [...collabMixin.collaborators, ...newCollaborators] as Ref[], - control, - tx, - originTx, - doc, - activityMessages, - params, - cache + await ctx.with( + 'create-collab-docinfo', + {}, + async () => + await createCollabDocInfo( + ctx, + [...collabMixin.collaborators, ...newCollaborators] as Ref[], + control, + tx, + originTx, + doc, + activityMessages, + params, + cache + ) ) ) } else { - const collaborators = await getDocCollaborators(doc, mixin, control) + const collaborators = await ctx.with( + 'get-doc-collaborators', + {}, + async () => await getDocCollaborators(ctx, doc, mixin, control) + ) res.push(getMixinTx(tx, control, collaborators)) res = res.concat( await createCollabDocInfo( + ctx, collaborators as Ref[], control, tx, @@ -1245,8 +1310,16 @@ async function updateCollaboratorDoc ( ) } - res = res.concat(await getSpaceCollabTxes(control, doc, tx, originTx, activityMessages, cache)) - res = res.concat(await updateNotifyContextsSpace(control, tx)) + res = res.concat( + await ctx.with( + 'get-space-collabtxes', + {}, + async () => await getSpaceCollabTxes(control, doc, tx, originTx, activityMessages, cache) + ) + ) + res = res.concat( + await ctx.with('update-notify-context-space', {}, async () => await updateNotifyContextsSpace(control, tx)) + ) return res } @@ -1305,6 +1378,7 @@ export async function OnAttributeUpdate (tx: Tx, control: TriggerControl): Promi } async function applyUserTxes ( + ctx: MeasureContext, control: TriggerControl, txes: Tx[], cache: Map, Doc> = new Map, Doc>() @@ -1342,7 +1416,9 @@ async function applyUserTxes ( } for (const [user, txs] of map.entries()) { - const account = (cache.get(user) as PersonAccount) ?? (await getPersonAccountById(user, control)) + const account = + (cache.get(user) as PersonAccount) ?? + (await ctx.with('get-person-account', {}, async () => await getPersonAccountById(user, control))) if (account !== undefined) { cache.set(account._id, account) @@ -1378,21 +1454,47 @@ export async function createCollaboratorNotifications ( switch (tx._class) { case core.class.TxCreateDoc: { - const res = await createCollaboratorDoc(tx as TxCreateDoc, control, activityMessages, originTx ?? tx, cache) + const res = await ctx.with( + 'createCollaboratorDoc', + {}, + async () => + await createCollaboratorDoc(ctx, tx as TxCreateDoc, control, activityMessages, originTx ?? tx, cache) + ) - return await applyUserTxes(control, res) + return await applyUserTxes(ctx, control, res) } case core.class.TxUpdateDoc: case core.class.TxMixin: { - let res = await updateCollaboratorDoc(tx as TxUpdateDoc, control, originTx ?? tx, activityMessages, cache) - res = res.concat( - await updateCollaboratorsMixin(tx as TxMixin, control, activityMessages, originTx ?? tx) + let res = await ctx.with( + 'updateCollaboratorDoc', + {}, + async () => + await updateCollaboratorDoc(ctx, tx as TxUpdateDoc, control, originTx ?? tx, activityMessages, cache) ) - return await applyUserTxes(control, res) + res = res.concat( + await ctx.with( + 'updateCollaboratorMixin', + {}, + async () => + await updateCollaboratorsMixin( + ctx, + tx as TxMixin, + control, + activityMessages, + originTx ?? tx + ) + ) + ) + return await applyUserTxes(ctx, control, res) } case core.class.TxCollectionCUD: { - const res = await collectionCollabDoc(tx as TxCollectionCUD, control, activityMessages, cache) - return await applyUserTxes(control, res) + const res = await ctx.with( + 'collectionCollabDoc', + {}, + async (ctx) => + await collectionCollabDoc(ctx, tx as TxCollectionCUD, control, activityMessages, cache) + ) + return await applyUserTxes(ctx, control, res) } } @@ -1481,7 +1583,7 @@ export async function getCollaborators ( if (control.hierarchy.hasMixin(doc, notification.mixin.Collaborators)) { return control.hierarchy.as(doc, notification.mixin.Collaborators).collaborators } else { - const collaborators = await getDocCollaborators(doc, mixin, control) + const collaborators = await getDocCollaborators(control.ctx, doc, mixin, control) res.push(getMixinTx(tx, control, collaborators)) return collaborators diff --git a/server-plugins/notification-resources/src/utils.ts b/server-plugins/notification-resources/src/utils.ts index 713e9cce24..42a582c892 100644 --- a/server-plugins/notification-resources/src/utils.ts +++ b/server-plugins/notification-resources/src/utils.ts @@ -12,14 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // -import notification, { - BaseNotificationType, - CommonNotificationType, - NotificationContent, - NotificationProvider, - NotificationType -} from '@hcengineering/notification' -import type { TriggerControl } from '@hcengineering/server-core' +import { DocUpdateMessage } from '@hcengineering/activity' +import { Analytics } from '@hcengineering/analytics' +import contact, { formatName, PersonAccount } from '@hcengineering/contact' import core, { Account, Class, @@ -29,14 +24,25 @@ import core, { matchQuery, MixinUpdate, Ref, + toIdMap, Tx, TxCreateDoc, TxCUD, TxMixin, TxProcessor, TxRemoveDoc, - TxUpdateDoc + TxUpdateDoc, + type MeasureContext } from '@hcengineering/core' +import notification, { + BaseNotificationType, + CommonNotificationType, + NotificationContent, + NotificationProvider, + NotificationType +} from '@hcengineering/notification' +import { getResource, IntlString, translate } from '@hcengineering/platform' +import type { TriggerControl } from '@hcengineering/server-core' import serverNotification, { getPersonAccountById, HTMLPresenter, @@ -44,10 +50,6 @@ import serverNotification, { TextPresenter, UserInfo } from '@hcengineering/server-notification' -import { getResource, IntlString, translate } from '@hcengineering/platform' -import contact, { formatName, PersonAccount } from '@hcengineering/contact' -import { DocUpdateMessage } from '@hcengineering/activity' -import { Analytics } from '@hcengineering/analytics' import { NotifyResult } from './types' @@ -134,7 +136,9 @@ export async function isAllowed ( type: BaseNotificationType, provider: NotificationProvider ): Promise { - const providersSettings = await control.queryFind(notification.class.NotificationProviderSetting, {}) + const providersSettings = await control.queryFind(notification.class.NotificationProviderSetting, { + space: core.space.Workspace + }) const providerSetting = providersSettings.find( ({ attachedTo, modifiedBy }) => attachedTo === provider._id && modifiedBy === receiver ) @@ -446,13 +450,23 @@ export async function getNotificationContent ( return content } -export async function getUsersInfo (ids: Ref[], control: TriggerControl): Promise { +export async function getUsersInfo ( + ctx: MeasureContext, + ids: Ref[], + control: TriggerControl +): Promise { const accounts = await control.modelDb.findAll(contact.class.PersonAccount, { _id: { $in: ids } }) - const persons = await control.queryFind(contact.class.Person, {}) + const persons = toIdMap( + await ctx.with( + 'query-find', + {}, + async () => await control.findAll(contact.class.Person, { _id: { $in: accounts.map((it) => it.person) } }) + ) + ) return accounts.map((account) => ({ _id: account._id, account, - person: persons.find(({ _id }) => _id === account.person) + person: persons.get(account.person) })) } diff --git a/server-plugins/request-resources/src/index.ts b/server-plugins/request-resources/src/index.ts index 9e057f86bb..94e5c64bc0 100644 --- a/server-plugins/request-resources/src/index.ts +++ b/server-plugins/request-resources/src/index.ts @@ -146,7 +146,7 @@ async function getRequestNotificationTx (tx: TxCollectionCUD, cont const notifyContexts = await control.findAll(notification.class.DocNotifyContext, { attachedTo: doc._id }) - const usersInfo = await getUsersInfo([...collaborators, tx.modifiedBy] as Ref[], control) + const usersInfo = await getUsersInfo(control.ctx, [...collaborators, tx.modifiedBy] as Ref[], control) const senderInfo = usersInfo.find(({ _id }) => _id === tx.modifiedBy) ?? { _id: tx.modifiedBy } diff --git a/server-plugins/view-resources/src/index.ts b/server-plugins/view-resources/src/index.ts index 51c30800a5..04dd185a2f 100644 --- a/server-plugins/view-resources/src/index.ts +++ b/server-plugins/view-resources/src/index.ts @@ -27,7 +27,10 @@ export async function OnCustomAttributeRemove (tx: Tx, control: TriggerControl): const txes = await control.findAll>(core.class.TxCUD, { objectId: ptx.objectId }) const attribute = TxProcessor.buildDoc2Doc(txes) if (attribute === undefined) return [] - const preferences = await control.findAll(view.class.ViewletPreference, { config: attribute.name }) + const preferences = await control.findAll(view.class.ViewletPreference, { + config: attribute.name, + space: core.space.Workspace + }) const res: Tx[] = [] for (const preference of preferences) { const tx = control.txFactory.createTxUpdateDoc(preference._class, preference.space, preference._id, { diff --git a/server/mongo/src/storage.ts b/server/mongo/src/storage.ts index 5554436b05..c1ee4ec32c 100644 --- a/server/mongo/src/storage.ts +++ b/server/mongo/src/storage.ts @@ -128,11 +128,10 @@ export interface DbAdapterOptions { abstract class MongoAdapterBase implements DbAdapter { _db: DBCollectionHelper - findRateLimit = new RateLimiter(parseInt(process.env.FIND_RLIMIT ?? '10')) - rateLimit = new RateLimiter(parseInt(process.env.TX_RLIMIT ?? '1')) + findRateLimit = new RateLimiter(parseInt(process.env.FIND_RLIMIT ?? '1000')) + rateLimit = new RateLimiter(parseInt(process.env.TX_RLIMIT ?? '5')) constructor ( - readonly globalCtx: MeasureContext, protected readonly db: Db, protected readonly hierarchy: Hierarchy, protected readonly modelDb: ModelDb, @@ -216,14 +215,14 @@ abstract class MongoAdapterBase implements DbAdapter { } const baseClass = this.hierarchy.getBaseClass(clazz) if (baseClass !== core.class.Doc) { - const classes = this.hierarchy.getDescendants(baseClass) + const classes = this.hierarchy.getDescendants(baseClass).filter((it) => !this.hierarchy.isMixin(it)) // Only replace if not specified if (translated._class === undefined) { translated._class = { $in: classes } } else if (typeof translated._class === 'string') { if (!classes.includes(translated._class)) { - translated._class = { $in: classes.filter((it) => !this.hierarchy.isMixin(it)) } + translated._class = classes.length === 1 ? classes[0] : { $in: classes } } } else if (typeof translated._class === 'object' && translated._class !== null) { let descendants: Ref>[] = classes @@ -238,7 +237,8 @@ abstract class MongoAdapterBase implements DbAdapter { descendants = descendants.filter((c) => !excludedClassesIds.has(c)) } - translated._class = { $in: descendants.filter((it: any) => !this.hierarchy.isMixin(it as Ref>)) } + const desc = descendants.filter((it: any) => !this.hierarchy.isMixin(it as Ref>)) + translated._class = desc.length === 1 ? desc[0] : { $in: desc } } if (baseClass !== clazz) { @@ -279,8 +279,7 @@ abstract class MongoAdapterBase implements DbAdapter { from: domain, localField: fullKey, foreignField: '_id', - as: fullKey.split('.').join('') + '_lookup', - pipeline: [{ $project: { '%hash%': 0 } }] + as: fullKey.split('.').join('') + '_lookup' }) } await this.getLookupValue(_class, nested, result, fullKey + '_lookup') @@ -294,8 +293,7 @@ abstract class MongoAdapterBase implements DbAdapter { from: domain, localField: fullKey, foreignField: '_id', - as: fullKey.split('.').join('') + '_lookup', - pipeline: [{ $project: { '%hash%': 0 } }] + as: fullKey.split('.').join('') + '_lookup' }) } } @@ -333,10 +331,9 @@ abstract class MongoAdapterBase implements DbAdapter { pipeline: [ { $match: { - _class: { $in: desc } + _class: desc.length === 1 ? desc[0] : { $in: desc } } - }, - { $project: { '%hash%': 0 } } + } ], as: asVal } @@ -483,7 +480,7 @@ abstract class MongoAdapterBase implements DbAdapter { const pipeline: any[] = [] const match = { $match: this.translateQuery(clazz, query) } const slowPipeline = isLookupQuery(query) || isLookupSort(options?.sort) - const steps = await this.getLookups(clazz, options?.lookup) + const steps = await ctx.with('get-lookups', {}, async () => await this.getLookups(clazz, options?.lookup)) if (slowPipeline) { for (const step of steps) { pipeline.push({ $lookup: step }) @@ -507,8 +504,6 @@ abstract class MongoAdapterBase implements DbAdapter { projection[ckey] = options.projection[key] } pipeline.push({ $project: projection }) - } else { - pipeline.push({ $project: { '%hash%': 0 } }) } // const domain = this.hierarchy.getDomain(clazz) @@ -519,15 +514,16 @@ abstract class MongoAdapterBase implements DbAdapter { let total = options?.total === true ? 0 : -1 try { await ctx.with( - 'toArray', - {}, + 'aggregate', + { clazz }, async (ctx) => { result = await toArray(cursor) }, () => ({ size: result.length, domain, - pipeline + pipeline, + clazz }) ) } catch (e) { @@ -538,6 +534,11 @@ abstract class MongoAdapterBase implements DbAdapter { await ctx.with('fill-lookup', {}, async (ctx) => { await this.fillLookupValue(ctx, clazz, options?.lookup, row) }) + if (row.$lookup !== undefined) { + for (const [, v] of Object.entries(row.$lookup)) { + this.stripHash(v) + } + } this.clearExtraLookups(row) } if (options?.total === true) { @@ -545,10 +546,19 @@ abstract class MongoAdapterBase implements DbAdapter { const totalCursor = this.collection(domain).aggregate(totalPipeline, { checkKeys: false }) - const arr = await toArray(totalCursor) + const arr = await ctx.with( + 'aggregate-total', + {}, + async (ctx) => await toArray(totalCursor), + () => ({ + domain, + pipeline, + clazz + }) + ) total = arr?.[0]?.total ?? 0 } - return toFindResult(this.stripHash(result), total) + return toFindResult(this.stripHash(result) as T[], total) } private translateKey(key: string, clazz: Ref>): string { @@ -634,7 +644,7 @@ abstract class MongoAdapterBase implements DbAdapter { @withContext('groupBy') async groupBy(ctx: MeasureContext, domain: Domain, field: string): Promise> { - const result = await this.globalCtx.with( + const result = await ctx.with( 'groupBy', { domain }, async (ctx) => { @@ -697,7 +707,6 @@ abstract class MongoAdapterBase implements DbAdapter { return result } - @withContext('find-all') async findAll( ctx: MeasureContext, _class: Ref>, @@ -708,26 +717,17 @@ abstract class MongoAdapterBase implements DbAdapter { return await this.findRateLimit.exec(async () => { const st = Date.now() const result = await this.collectOps( - this.globalCtx, + ctx, this.hierarchy.findDomain(_class), 'find', async (ctx) => { + const domain = options?.domain ?? this.hierarchy.getDomain(_class) if ( options != null && (options?.lookup != null || this.isEnumSort(_class, options) || this.isRulesSort(options)) ) { - return await ctx.with( - 'pipeline', - {}, - async (ctx) => await this.findWithPipeline(ctx, _class, query, options), - { - _class, - query, - options - } - ) + return await this.findWithPipeline(ctx, _class, query, options) } - const domain = options?.domain ?? this.hierarchy.getDomain(_class) const coll = this.collection(domain) const mongoQuery = this.translateQuery(_class, query) @@ -735,7 +735,7 @@ abstract class MongoAdapterBase implements DbAdapter { // Skip sort/projection/etc. return await ctx.with( 'find-one', - {}, + { domain }, async (ctx) => { const findOptions: MongoFindOptions = {} @@ -744,8 +744,6 @@ abstract class MongoAdapterBase implements DbAdapter { } if (options?.projection !== undefined) { findOptions.projection = this.calcProjection(options, _class) - } else { - findOptions.projection = { '%hash%': 0 } } const doc = await coll.findOne(mongoQuery, findOptions) @@ -758,7 +756,7 @@ abstract class MongoAdapterBase implements DbAdapter { } return toFindResult([], total) }, - { mongoQuery } + { domain, mongoQuery } ) } @@ -769,8 +767,6 @@ abstract class MongoAdapterBase implements DbAdapter { if (projection != null) { cursor = cursor.project(projection) } - } else { - cursor = cursor.project({ '%hash%': 0 }) } let total: number = -1 if (options != null) { @@ -792,7 +788,7 @@ abstract class MongoAdapterBase implements DbAdapter { try { let res: T[] = [] await ctx.with( - 'toArray', + 'find-all', {}, async (ctx) => { res = await toArray(cursor) @@ -807,7 +803,7 @@ abstract class MongoAdapterBase implements DbAdapter { if (options?.total === true && options?.limit === undefined) { total = res.length } - return toFindResult(this.stripHash(res), total) + return toFindResult(this.stripHash(res) as T[], total) } catch (e) { console.error('error during executing cursor in findAll', _class, cutObjectArray(query), options, e) throw e @@ -882,13 +878,19 @@ abstract class MongoAdapterBase implements DbAdapter { return projection } - stripHash(docs: T[]): T[] { - docs.forEach((it) => { - if ('%hash%' in it) { - delete it['%hash%'] + stripHash(docs: T | T[]): T | T[] { + if (Array.isArray(docs)) { + docs.forEach((it) => { + if ('%hash%' in it) { + delete it['%hash%'] + } + return it + }) + } else if (typeof docs === 'object' && docs != null) { + if ('%hash%' in docs) { + delete docs['%hash%'] } - return it - }) + } return docs } @@ -1000,7 +1002,7 @@ abstract class MongoAdapterBase implements DbAdapter { } const cursor = this.db.collection(domain).find({ _id: { $in: docs } }, { limit: docs.length }) const result = await toArray(cursor) - return this.stripHash(result) + return this.stripHash(result) as Doc[] }) } @@ -1108,7 +1110,6 @@ class MongoAdapter extends MongoAdapterBase { } } - @withContext('tx') async tx (ctx: MeasureContext, ...txes: Tx[]): Promise { const result: TxResult[] = [] @@ -1147,7 +1148,7 @@ class MongoAdapter extends MongoAdapterBase { } domains.push( this.collectOps( - this.globalCtx, + ctx, domain, 'tx', async (ctx) => { @@ -1454,13 +1455,12 @@ class MongoTxAdapter extends MongoAdapterBase implements TxAdapter { await this._db.init(DOMAIN_TX) } - @withContext('tx') override async tx (ctx: MeasureContext, ...tx: Tx[]): Promise { if (tx.length === 0) { return [] } await this.collectOps( - this.globalCtx, + ctx, DOMAIN_TX, 'tx', async () => { @@ -1490,9 +1490,6 @@ class MongoTxAdapter extends MongoAdapterBase implements TxAdapter { sort: { _id: 1, modifiedOn: 1 - }, - projection: { - '%hash%': 0 } } ) @@ -1650,7 +1647,7 @@ export async function createMongoAdapter ( const client = getMongoClient(url) const db = getWorkspaceDB(await client.getClient(), workspaceId) - return new MongoAdapter(ctx.newChild('mongoDb', {}), db, hierarchy, modelDb, client, options) + return new MongoAdapter(db, hierarchy, modelDb, client, options) } /** @@ -1666,5 +1663,5 @@ export async function createMongoTxAdapter ( const client = getMongoClient(url) const db = getWorkspaceDB(await client.getClient(), workspaceId) - return new MongoTxAdapter(ctx.newChild('mongoDbTx', {}), db, hierarchy, modelDb, client) + return new MongoTxAdapter(db, hierarchy, modelDb, client) } diff --git a/server/mongo/src/utils.ts b/server/mongo/src/utils.ts index 6d5f7f0e2b..4410a07f45 100644 --- a/server/mongo/src/utils.ts +++ b/server/mongo/src/utils.ts @@ -131,7 +131,8 @@ export function getMongoClient (uri: string, options?: MongoClientOptions): Mong MongoClient.connect(uri, { appName: 'transactor', ...options, - ...extraOptions + ...extraOptions, + enableUtf8Validation: false }), () => { connections.delete(key) diff --git a/tests/sanity/tests/model/planning/planning-page.ts b/tests/sanity/tests/model/planning/planning-page.ts index 8ddf94a9e5..3cf324d284 100644 --- a/tests/sanity/tests/model/planning/planning-page.ts +++ b/tests/sanity/tests/model/planning/planning-page.ts @@ -2,6 +2,8 @@ import { type Locator, type Page, expect } from '@playwright/test' import { NewToDo, Slot } from './types' import { CalendarPage } from '../calendar-page' +const retryOptions = { intervals: [1000, 1500, 2500], timeout: 60000 } + export class PlanningPage extends CalendarPage { readonly page: Page @@ -81,14 +83,17 @@ export class PlanningPage extends CalendarPage { async dragdropTomorrow (title: string, time: string): Promise { await this.toDosContainer().getByRole('button', { name: title }).hover() - await this.page.mouse.down() - const boundingBox = await this.selectTomorrow(time).boundingBox() - expect(boundingBox).toBeTruthy() - if (boundingBox != null) { - await this.page.mouse.move(boundingBox.x + 10, boundingBox.y + 10) - await this.page.mouse.move(boundingBox.x + 10, boundingBox.y + 20) - await this.page.mouse.up() - } + + await expect(async () => { + await this.page.mouse.down() + const boundingBox = await this.selectTomorrow(time).boundingBox() + expect(boundingBox).toBeTruthy() + if (boundingBox != null) { + await this.page.mouse.move(boundingBox.x + 10, boundingBox.y + 10) + await this.page.mouse.move(boundingBox.x + 10, boundingBox.y + 20) + await this.page.mouse.up() + } + }).toPass(retryOptions) } async checkInSchedule (title: string): Promise { diff --git a/tests/sanity/tests/planning/todos.spec.ts b/tests/sanity/tests/planning/todos.spec.ts index 2f4c51d42e..67459269fa 100644 --- a/tests/sanity/tests/planning/todos.spec.ts +++ b/tests/sanity/tests/planning/todos.spec.ts @@ -1,4 +1,4 @@ -import { test } from '@playwright/test' +import { test, expect } from '@playwright/test' import { generateId, PlatformSetting, PlatformURI } from '../utils' import { PlanningPage } from '../model/planning/planning-page' import { NewToDo } from '../model/planning/types' @@ -8,6 +8,8 @@ test.use({ storageState: PlatformSetting }) +const retryOptions = { intervals: [1000, 1500, 2500], timeout: 60000 } + test.describe('Planning ToDo tests', () => { test.beforeEach(async ({ page }) => { await (await page.goto(`${PlatformURI}/workbench/sanity-ws/time`))?.finished() @@ -42,9 +44,13 @@ test.describe('Planning ToDo tests', () => { const planningPage = new PlanningPage(page) const planningNavigationMenuPage = new PlanningNavigationMenuPage(page) await planningNavigationMenuPage.clickOnButtonUnplanned() - await planningNavigationMenuPage.compareCountersUnplannedToDos() + await expect(async () => { + await planningNavigationMenuPage.compareCountersUnplannedToDos() + }).toPass(retryOptions) await planningPage.createNewToDo(newToDo) - await planningNavigationMenuPage.compareCountersUnplannedToDos() + await expect(async () => { + await planningNavigationMenuPage.compareCountersUnplannedToDos() + }).toPass(retryOptions) await planningNavigationMenuPage.clickOnButtonToDoAll() await planningPage.checkToDoExist(newToDo.title)