UBERF-7690: Performance fixes

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>

desktop/src/ui/notifications.ts

@@ -67,7 +67,7 @@ async function hydrateNotificationAsYouCan (lastNotification: InboxNotification)
     body: ''
   }
 
-  const account = await client.findOne(contact.class.PersonAccount, { _id: lastNotification.modifiedBy as Ref<PersonAccount> })
+  const account = await client.getModel().findOne(contact.class.PersonAccount, { _id: lastNotification.modifiedBy as Ref<PersonAccount> })
 
   if (account == null) {
     return noPersonData

models/activity/src/index.ts

@@ -362,7 +362,6 @@ export function createModel (builder: Builder): void {
 
   builder.createDoc(core.class.DomainIndexConfiguration, core.space.Model, {
     domain: DOMAIN_ACTIVITY,
-    indexes: [{ keys: { attachedTo: 1, createdOn: 1 } }, { keys: { attachedTo: 1, createdOn: -1 } }],
     disabled: [
       { modifiedOn: 1 },
       { createdOn: -1 },

models/attachment/src/index.ts

@@ -199,7 +199,8 @@ export function createModel (builder: Builder): void {
       { modifiedBy: 1 },
       { createdBy: 1 },
       { createdOn: -1 },
-      { state: 1 }
+      { state: 1 },
+      { _class: 1 }
     ]
   })
 }

models/bitrix/src/index.ts

@@ -135,6 +135,14 @@ export function createModel (builder: Builder): void {
   )
   builder.createDoc(core.class.DomainIndexConfiguration, core.space.Model, {
     domain: DOMAIN_BITRIX,
-    disabled: [{ _id: 1 }, { _class: 1 }, { space: 1 }, { modifiedBy: 1 }, { createdBy: 1 }, { createdOn: -1 }]
+    disabled: [
+      { _id: 1 },
+      { _class: 1 },
+      { space: 1 },
+      { modifiedBy: 1 },
+      { createdBy: 1 },
+      { createdOn: -1 },
+      { modifiedOn: 1 }
+    ]
   })
 }

models/contact/src/index.ts

@@ -223,6 +223,7 @@ export class TContactsTab extends TDoc implements ContactsTab {
 @Model(contact.class.PersonSpace, core.class.Space)
 export class TPersonSpace extends TSpace implements PersonSpace {
   @Prop(TypeRef(contact.class.Person), contact.string.Person)
+  @Index(IndexKind.Indexed)
     person!: Ref<Person>
 }
 
@@ -1170,6 +1171,14 @@ export function createModel (builder: Builder): void {
   })
   builder.createDoc(core.class.DomainIndexConfiguration, core.space.Model, {
     domain: DOMAIN_CONTACT,
+    indexes: [
+      {
+        keys: {
+          _class: 1,
+          [contact.mixin.Employee + '.active']: 1
+        }
+      }
+    ],
     disabled: [{ attachedToClass: 1 }, { modifiedBy: 1 }, { createdBy: 1 }, { createdOn: -1 }, { attachedTo: 1 }]
   })
 

models/core/src/index.ts

@@ -197,6 +197,7 @@ export function createModel (builder: Builder): void {
   builder.createDoc(core.class.DomainIndexConfiguration, core.space.Model, {
     domain: DOMAIN_TX,
     disabled: [
+      { _class: 1 },
       { space: 1 },
       { objectClass: 1 },
       { createdBy: 1 },
@@ -267,7 +268,14 @@ export function createModel (builder: Builder): void {
 
   builder.createDoc(core.class.DomainIndexConfiguration, core.space.Model, {
     domain: DOMAIN_STATUS,
-    disabled: [{ modifiedOn: 1 }, { modifiedBy: 1 }, { createdBy: 1 }, { createdBy: -1 }, { createdOn: -1 }]
+    disabled: [
+      { modifiedOn: 1 },
+      { modifiedBy: 1 },
+      { createdBy: 1 },
+      { createdBy: -1 },
+      { createdOn: -1 },
+      { space: 1 }
+    ]
   })
   builder.createDoc(core.class.DomainIndexConfiguration, core.space.Model, {
     domain: DOMAIN_SPACE,
@@ -276,7 +284,15 @@ export function createModel (builder: Builder): void {
 
   builder.createDoc(core.class.DomainIndexConfiguration, core.space.Model, {
     domain: DOMAIN_BLOB,
-    disabled: [{ _class: 1 }, { space: 1 }, { modifiedBy: 1 }, { createdBy: 1 }, { createdBy: -1 }, { createdOn: -1 }]
+    disabled: [
+      { _class: 1 },
+      { space: 1 },
+      { modifiedBy: 1 },
+      { createdBy: 1 },
+      { createdBy: -1 },
+      { createdOn: -1 },
+      { modifiedOn: 1 }
+    ]
   })
 
   builder.createDoc(core.class.DomainIndexConfiguration, core.space.Model, {

models/core/src/security.ts

@@ -14,22 +14,22 @@
 //
 
 import {
+  DOMAIN_MODEL,
+  IndexKind,
   type Account,
   type AccountRole,
   type Arr,
+  type Class,
+  type CollectionSize,
   type Domain,
-  DOMAIN_MODEL,
-  IndexKind,
+  type Permission,
   type Ref,
+  type Role,
+  type RolesAssignment,
   type Space,
-  type TypedSpace,
   type SpaceType,
   type SpaceTypeDescriptor,
-  type Role,
-  type Class,
-  type Permission,
-  type CollectionSize,
-  type RolesAssignment
+  type TypedSpace
 } from '@hcengineering/core'
 import {
   ArrOf,
@@ -46,7 +46,7 @@ import {
 } from '@hcengineering/model'
 import { getEmbeddedLabel, type Asset, type IntlString } from '@hcengineering/platform'
 import core from './component'
-import { TDoc, TAttachedDoc } from './core'
+import { TAttachedDoc, TDoc } from './core'
 
 export const DOMAIN_SPACE = 'space' as Domain
 
@@ -67,6 +67,7 @@ export class TSpace extends TDoc implements Space {
     private!: boolean
 
   @Prop(TypeBoolean(), core.string.Archived)
+  @Index(IndexKind.Indexed)
     archived!: boolean
 
   @Prop(ArrOf(TypeRef(core.class.Account)), core.string.Members)

models/gmail/src/index.ts

@@ -254,7 +254,8 @@ export function createModel (builder: Builder): void {
       { modifiedBy: 1 },
       { createdBy: 1 },
       { attachedToClass: 1 },
-      { createdOn: -1 }
+      { createdOn: -1 },
+      { modifiedOn: 1 }
     ]
   })
 

models/notification/src/index.ts

@@ -16,6 +16,7 @@
 
 import activity, { type ActivityMessage } from '@hcengineering/activity'
 import chunter from '@hcengineering/chunter'
+import { type PersonSpace } from '@hcengineering/contact'
 import {
   AccountRole,
   DOMAIN_MODEL,
@@ -49,7 +50,6 @@ import {
   UX,
   type Builder
 } from '@hcengineering/model'
-import { type PersonSpace } from '@hcengineering/contact'
 import core, { TClass, TDoc } from '@hcengineering/model-core'
 import preference, { TPreference } from '@hcengineering/model-preference'
 import view, { createAction, template } from '@hcengineering/model-view'
@@ -201,7 +201,6 @@ export class TDocNotifyContext extends TDoc implements DocNotifyContext {
     objectId!: Ref<Doc>
 
   @Prop(TypeRef(core.class.Class), core.string.Class)
-  @Index(IndexKind.Indexed)
     objectClass!: Ref<Class<Doc>>
 
   @Prop(TypeRef(core.class.Space), core.string.Space)
@@ -632,7 +631,7 @@ export function createModel (builder: Builder): void {
 
   builder.createDoc(core.class.DomainIndexConfiguration, core.space.Model, {
     domain: DOMAIN_NOTIFICATION,
-    indexes: [{ keys: { user: 1, archived: 1 } }],
+    indexes: [{ keys: { user: 1, archived: 1, space: 1 } }],
     disabled: [{ modifiedOn: 1 }, { modifiedBy: 1 }, { createdBy: 1 }, { isViewed: 1 }, { hidden: 1 }]
   })
 
@@ -647,7 +646,8 @@ export function createModel (builder: Builder): void {
       { isViewed: 1 },
       { hidden: 1 },
       { createdOn: -1 },
-      { attachedTo: 1 }
+      { attachedTo: 1 },
+      { space: 1 }
     ]
   })
   builder.createDoc(core.class.DomainIndexConfiguration, core.space.Model, {

models/recruit/src/index.ts

@@ -480,7 +480,7 @@ export function createModel (builder: Builder): void {
         sortable: true
       },
       baseQuery: {
-        isDone: { $ne: true },
+        isDone: false,
         '$lookup.space.archived': false
       }
     },
@@ -500,7 +500,7 @@ export function createModel (builder: Builder): void {
         }
       },
       baseQuery: {
-        isDone: { $ne: true },
+        isDone: false,
         '$lookup.space.archived': false
       }
     },
@@ -796,7 +796,7 @@ export function createModel (builder: Builder): void {
       descriptor: task.viewlet.Kanban,
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       baseQuery: {
-        isDone: { $ne: true },
+        isDone: false,
         '$lookup.space.archived': false
       },
       viewOptions: {

models/recruit/src/migration.ts

@@ -60,6 +60,16 @@ export const recruitOperation: MigrateOperation = {
         func: async (client: MigrationClient) => {
           await migrateSpace(client, 'recruit:space:Reviews' as Ref<Space>, core.space.Workspace, [DOMAIN_CALENDAR])
         }
+      },
+      {
+        state: 'migrate-applicants',
+        func: async (client: MigrationClient) => {
+          await client.update(
+            DOMAIN_TASK,
+            { _class: recruit.class.Applicant, isDone: { $nin: [false, true] } },
+            { isDone: false }
+          )
+        }
       }
     ])
   },

packages/core/src/utils.ts

@@ -15,6 +15,7 @@
 
 import { getEmbeddedLabel, IntlString } 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)
@@ -604,9 +604,10 @@ export const isEnum =
 export async function checkPermission (
   client: TxOperations,
   _id: Ref<Permission>,
-  _space: Ref<TypedSpace>
+  _space: Ref<TypedSpace>,
+  space?: TypedSpace
 ): Promise<boolean> {
-  const space = await client.findOne(core.class.TypedSpace, { _id: _space })
+  space = space ?? (await client.findOne(core.class.TypedSpace, { _id: _space }))
   const type = await client
     .getModel()
     .findOne(core.class.SpaceType, { _id: space?.type }, { lookup: { _id: { roles: core.class.Role } } })

plugins/contact-resources/src/utils.ts

@@ -320,7 +320,7 @@ function fillStores (): void {
     const accountPersonQuery = createQuery(true)
 
     const query = createQuery(true)
-    query.query(contact.mixin.Employee, {}, (res) => {
+    query.query(contact.mixin.Employee, { [contact.mixin.Employee + '.active']: { $in: [true, false] } }, (res) => {
       employeesStore.set(res)
       employeeByIdStore.set(toIdMap(res))
     })
@@ -331,13 +331,10 @@ function fillStores (): void {
 
       const persons = res.map((it) => it.person)
 
-      accountPersonQuery.query<Person>(
-        contact.class.Person,
-        { _id: { $in: persons }, [contact.mixin.Employee]: { $exists: false } },
-        (res) => {
-          personAccountPersonByIdStore.set(toIdMap(res))
-        }
-      )
+      accountPersonQuery.query<Person>(contact.class.Person, { _id: { $in: persons } }, (res) => {
+        const personIn = toIdMap(res)
+        personAccountPersonByIdStore.set(personIn)
+      })
     })
 
     const providerQuery = createQuery(true)

plugins/notification-resources/src/inboxNotificationsClient.ts

@@ -112,12 +112,8 @@ export class InboxNotificationsClientImpl implements InboxNotificationsClient {
         user: getCurrentAccount()._id
       },
       (result: InboxNotification[]) => {
+        result.sort((a, b) => (b.createdOn ?? b.modifiedOn) - (a.createdOn ?? a.modifiedOn))
         this.otherInboxNotifications.set(result)
-      },
-      {
-        sort: {
-          createdOn: SortingOrder.Descending
-        }
       }
     )
 

plugins/tracker-resources/src/components/issues/Issues.svelte

@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import { DocumentQuery, Ref } from '@hcengineering/core'
-  import type { IntlString, Asset } from '@hcengineering/platform'
+  import type { Asset, IntlString } from '@hcengineering/platform'
   import { createQuery } from '@hcengineering/presentation'
   import { Issue, IssueStatus, Project } from '@hcengineering/tracker'
   import { IModeSelector, resolvedLocationStore } from '@hcengineering/ui'
@@ -41,18 +41,20 @@
   let query: DocumentQuery<Issue> | undefined = undefined
   let modeSelectorProps: IModeSelector | undefined = undefined
 
-  const archivedProjectQuery = createQuery()
-  let archived: Ref<Project>[] = []
+  const allProjectQuery = createQuery()
+  let allProjects: Pick<Project, '_id' | '_class' | 'archived'>[] = []
 
-  archivedProjectQuery.query(
+  allProjectQuery.query(
     tracker.class.Project,
-    { archived: true },
+    {},
     (res) => {
-      archived = res.map((it) => it._id)
+      allProjects = res
     },
-    { projection: { _id: 1 } }
+    { projection: { _id: 1, archived: 1 } }
   )
-  $: spaceQuery = currentSpace ? { space: currentSpace } : { space: { $nin: archived } }
+  $: spaceQuery = currentSpace
+    ? { space: currentSpace }
+    : { space: { $in: allProjects.filter((it) => !it.archived).map((it) => it._id) } }
 
   $: all = { ...baseQuery, ...spaceQuery }
 

plugins/tracker-resources/src/components/myissues/MyIssues.svelte

@@ -75,16 +75,16 @@
     { sort: { _id: 1 }, projection: { _id: 1 } }
   )
 
-  const archivedProjectQuery = createQuery()
-  let archived: Ref<Project>[] = []
+  const allProjectQuery = createQuery()
+  let allProjects: Pick<Project, '_class' | '_id' | 'archived'>[] = []
 
-  archivedProjectQuery.query(
+  allProjectQuery.query(
     tracker.class.Project,
-    { archived: true },
+    {},
     (res) => {
-      archived = res.map((it) => it._id)
+      allProjects = res
     },
-    { projection: { _id: 1 } }
+    { projection: { _id: 1, archived: 1 } }
   )
 
   $: queries = { assigned, active, backlog, created, subscribed }
@@ -95,7 +95,7 @@
   $: if (mode !== undefined) {
     query = { ...(queries as any)[mode] }
     if (query?.space === undefined) {
-      query = { ...query, space: { $nin: archived } }
+      query = { ...query, space: { $in: allProjects.filter((it) => !it.archived).map((it) => it._id) } }
     }
     modeSelectorProps = {
       config,