Merge remote-tracking branch 'origin/develop' into staging

Signed-off-by: Andrey Sobolev <[email protected]>
hcengineering · Dec 26, 2024 · 43f584b · 43f584b
2 parents f4fc107 + 4214ace
commit 43f584b
Show file tree

Hide file tree

Showing 38 changed files with 182 additions and 1,523 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/packages/presentation/src/utils.ts b/packages/presentation/src/utils.ts
@@ -21,6 +21,7 @@ import core, {
   TxProcessor,
   getCurrentAccount,
   reduceCalls,
+  type Account,
   type AnyAttribute,
   type ArrOf,
   type AttachedDoc,
@@ -253,6 +254,18 @@ export function getClient (): TxOperations & Client {
   return clientProxy
 }
 
+export type OnClientListener = (client: Client, account: Account) => void
+const onClientListeners: OnClientListener[] = []
+
+export function onClient (l: OnClientListener): void {
+  onClientListeners.push(l)
+  if (client !== undefined) {
+    setTimeout(() => {
+      l(client, getCurrentAccount())
+    })
+  }
+}
+
 let txQueue: Tx[] = []
 
 export type RefreshListener = () => void
@@ -306,6 +319,10 @@ export async function setClient (_client: Client): Promise<void> {
   if (needRefresh || globalQueries.length > 0) {
     await refreshClient(true)
   }
+  const acc = getCurrentAccount()
+  onClientListeners.forEach((l) => {
+    l(_client, acc)
+  })
 }
 /**
  * @public

diff --git a/plugins/activity-resources/src/activity.ts b/plugins/activity-resources/src/activity.ts
@@ -14,31 +14,21 @@
 //
 import activity, { type ActivityMessage, type SavedMessage } from '@hcengineering/activity'
 import core, { type Ref, SortingOrder, type WithLookup } from '@hcengineering/core'
+import { createQuery, onClient } from '@hcengineering/presentation'
 import { writable } from 'svelte/store'
-import { createQuery, getClient } from '@hcengineering/presentation'
 
 export const savedMessagesStore = writable<Array<WithLookup<SavedMessage>>>([])
 export const messageInFocus = writable<Ref<ActivityMessage> | undefined>(undefined)
 
 const savedMessagesQuery = createQuery(true)
 
-export function loadSavedMessages (): void {
-  const client = getClient()
-
-  if (client !== undefined) {
-    savedMessagesQuery.query(
-      activity.class.SavedMessage,
-      { space: core.space.Workspace },
-      (res) => {
-        savedMessagesStore.set(res.filter(({ $lookup }) => $lookup?.attachedTo !== undefined))
-      },
-      { lookup: { attachedTo: activity.class.ActivityMessage }, sort: { modifiedOn: SortingOrder.Descending } }
-    )
-  } else {
-    setTimeout(() => {
-      loadSavedMessages()
-    }, 50)
-  }
-}
-
-loadSavedMessages()
+onClient(() => {
+  savedMessagesQuery.query(
+    activity.class.SavedMessage,
+    { space: core.space.Workspace },
+    (res) => {
+      savedMessagesStore.set(res.filter(({ $lookup }) => $lookup?.attachedTo !== undefined))
+    },
+    { lookup: { attachedTo: activity.class.ActivityMessage }, sort: { modifiedOn: SortingOrder.Descending } }
+  )
+})
diff --git a/plugins/calendar-resources/src/utils.ts b/plugins/calendar-resources/src/utils.ts
@@ -5,12 +5,12 @@ import {
   type ReccuringInstance,
   generateEventId
 } from '@hcengineering/calendar'
-import { type IdMap, type Timestamp, getCurrentAccount, toIdMap, type DocumentUpdate } from '@hcengineering/core'
-import { createQuery, getClient } from '@hcengineering/presentation'
-import { showPopup, closePopup, DAY } from '@hcengineering/ui'
+import { type DocumentUpdate, type IdMap, type Timestamp, getCurrentAccount, toIdMap } from '@hcengineering/core'
+import { createQuery, getClient, onClient } from '@hcengineering/presentation'
+import { closePopup, DAY, showPopup } from '@hcengineering/ui'
 import { writable } from 'svelte/store'
-import calendar from './plugin'
 import UpdateRecInstancePopup from './components/UpdateRecInstancePopup.svelte'
+import calendar from './plugin'
 
 export function saveUTC (date: Timestamp): Timestamp {
   const utcdate = new Date(date)
@@ -74,24 +74,14 @@ export const calendarByIdStore = writable<IdMap<Calendar>>(new Map())
 export const calendarStore = writable<Calendar[]>([])
 export const visibleCalendarStore = writable<Calendar[]>([])
 
-function fillStores (): void {
-  const client = getClient()
-
-  if (client !== undefined) {
-    const query = createQuery(true)
-    query.query(calendar.class.Calendar, {}, (res) => {
-      calendarStore.set(res)
-      visibleCalendarStore.set(res.filter((p) => !p.hidden))
-      calendarByIdStore.set(toIdMap(res))
-    })
-  } else {
-    setTimeout(() => {
-      fillStores()
-    }, 50)
-  }
-}
-
-fillStores()
+const query = createQuery(true)
+onClient((client, account) => {
+  query.query(calendar.class.Calendar, {}, (res) => {
+    calendarStore.set(res)
+    visibleCalendarStore.set(res.filter((p) => !p.hidden))
+    calendarByIdStore.set(toIdMap(res))
+  })
+})
 
 export async function updatePast (ops: DocumentUpdate<Event>, object: ReccuringInstance): Promise<void> {
   const client = getClient()

diff --git a/plugins/chunter-resources/src/components/chat/utils.ts b/plugins/chunter-resources/src/components/chat/utils.ts
@@ -28,7 +28,7 @@ import core, {
 } from '@hcengineering/core'
 import notification, { type DocNotifyContext } from '@hcengineering/notification'
 import { InboxNotificationsClientImpl } from '@hcengineering/notification-resources'
-import { createQuery, getClient, MessageBox } from '@hcengineering/presentation'
+import { createQuery, getClient, MessageBox, onClient } from '@hcengineering/presentation'
 import { type Action, showPopup } from '@hcengineering/ui'
 import view from '@hcengineering/view'
 import workbench, { type SpecialNavModel } from '@hcengineering/workbench'
@@ -364,12 +364,9 @@ function archiveActivityChannels (contexts: DocNotifyContext[]): void {
   )
 }
 
+const savedAttachmentsQuery = createQuery(true)
 export function loadSavedAttachments (): void {
-  const client = getClient()
-
-  if (client !== undefined) {
-    const savedAttachmentsQuery = createQuery(true)
-
+  onClient(() => {
     savedAttachmentsQuery.query(
       attachment.class.SavedAttachments,
       { space: core.space.Workspace },
@@ -378,11 +375,7 @@ export function loadSavedAttachments (): void {
       },
       { lookup: { attachedTo: attachment.class.Attachment }, sort: { modifiedOn: SortingOrder.Descending } }
     )
-  } else {
-    setTimeout(() => {
-      loadSavedAttachments()
-    }, 50)
-  }
+  })
 }
 
 export async function hideActivityChannels (contexts: DocNotifyContext[]): Promise<void> {

diff --git a/plugins/contact-resources/src/utils.ts b/plugins/contact-resources/src/utils.ts
@@ -52,7 +52,7 @@ import core, {
 } from '@hcengineering/core'
 import notification, { type DocNotifyContext, type InboxNotification } from '@hcengineering/notification'
 import { type IntlString, getEmbeddedLabel, getResource, translate } from '@hcengineering/platform'
-import { createQuery, getClient } from '@hcengineering/presentation'
+import { createQuery, getClient, onClient } from '@hcengineering/presentation'
 import { type TemplateDataProvider } from '@hcengineering/templates'
 import {
   getCurrentResolvedLocation,
@@ -323,42 +323,32 @@ export const personByIdStore = derived([personAccountPersonByIdStore, employeeBy
   return new Map([...m1, ...m2])
 })
 
-function fillStores (): void {
-  const client = getClient()
-
-  if (client !== undefined) {
-    const accountPersonQuery = createQuery(true)
-
-    const query = createQuery(true)
-    query.query(contact.mixin.Employee, { active: { $in: [true, false] } }, (res) => {
-      employeesStore.set(res)
-      employeeByIdStore.set(toIdMap(res))
-    })
+const query = createQuery(true)
+const accountQ = createQuery(true)
+const accountPersonQuery = createQuery(true)
+const providerQuery = createQuery(true)
 
-    const accountQ = createQuery(true)
-    accountQ.query(contact.class.PersonAccount, {}, (res) => {
-      personAccountByIdStore.set(toIdMap(res))
+onClient(() => {
+  query.query(contact.mixin.Employee, { active: { $in: [true, false] } }, (res) => {
+    employeesStore.set(res)
+    employeeByIdStore.set(toIdMap(res))
+  })
 
-      const persons = res.map((it) => it.person)
+  accountQ.query(contact.class.PersonAccount, {}, (res) => {
+    personAccountByIdStore.set(toIdMap(res))
 
-      accountPersonQuery.query<Person>(contact.class.Person, { _id: { $in: persons } }, (res) => {
-        const personIn = toIdMap(res)
-        personAccountPersonByIdStore.set(personIn)
-      })
-    })
+    const persons = res.map((it) => it.person)
 
-    const providerQuery = createQuery(true)
-    providerQuery.query(contact.class.ChannelProvider, {}, (res) => {
-      channelProviders.set(res)
+    accountPersonQuery.query<Person>(contact.class.Person, { _id: { $in: persons } }, (res) => {
+      const personIn = toIdMap(res)
+      personAccountPersonByIdStore.set(personIn)
     })
-  } else {
-    setTimeout(() => {
-      fillStores()
-    }, 50)
-  }
-}
+  })
 
-fillStores()
+  providerQuery.query(contact.class.ChannelProvider, {}, (res) => {
+    channelProviders.set(res)
+  })
+})
 
 const userStatusesQuery = createQuery(true)