Merge branch 'develop' into ai-bot-improvements

Author: RoadRoller

communication

@@ -465,6 +465,7 @@ export interface CalendarItem {
   date: Timestamp
   dueDate: Timestamp
   day: number
+  blockTime: boolean
   access: 'freeBusyReader' | 'reader' | 'writer' | 'owner'
 }
 

packages/ui/src/types.ts

@@ -118,6 +118,7 @@
             allDay: event.allDay,
             date: eventStart,
             dueDate: eventEnd,
+            blockTime: event.blockTime,
             day,
             access: event.access
           })
@@ -136,6 +137,7 @@
           result.push({
             _id: event._id,
             allDay: event.allDay,
+            blockTime: event.blockTime,
             date: eventStart,
             dueDate: eventEnd,
             day: -1,
@@ -343,8 +345,9 @@
     }
   }
 
-  const calcTime = (events: CalendarItem[]): number => {
-    if (events.length === 0) return 0
+  const calcTime = (_events: CalendarItem[]): number => {
+    if (_events.length === 0) return 0
+    const events = _events.filter((ev) => ev.blockTime)
 
     // Extract and sort intervals by start time
     const intervals = events.map((it) => [it.date, it.dueDate]).sort((a, b) => a[0] - b[0])

plugins/calendar-resources/src/components/DayCalendar.svelte

@@ -14,9 +14,9 @@
 -->
 <script lang="ts">
   import { getCurrentEmployee } from '@hcengineering/contact'
-  import { Doc, DocumentQuery, getCurrentAccount, Ref } from '@hcengineering/core'
+  import core, { DocumentQuery, getCurrentAccount, Ref } from '@hcengineering/core'
   import type { IntlString, Asset } from '@hcengineering/platform'
-  import { createQuery } from '@hcengineering/presentation'
+  import { createQuery, getClient } from '@hcengineering/presentation'
   import type { Issue, IssueStatus } from '@hcengineering/tracker'
   import { IModeSelector, resolvedLocationStore } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
@@ -28,6 +28,8 @@
   export let config: [string, IntlString, object][] = []
   export let icon: Asset | undefined = undefined
 
+  const client = getClient()
+  const hierarchy = client.getHierarchy()
   const socialIds = getCurrentAccount().socialIds
   const acc = getCurrentAccount().uuid
   const dispatch = createEventDispatcher()
@@ -64,16 +66,16 @@
 
   const subscribedQuery = createQuery()
   $: subscribedQuery.query(
-    tracker.class.Issue,
-    { 'notification:mixin:Collaborators.collaborators': acc },
-    (result) => {
-      const newSub = result.map((p) => p._id as Ref<Doc> as Ref<Issue>)
+    core.class.Collaborator,
+    { collaborator: acc, attachedToClass: { $in: hierarchy.getDescendants(tracker.class.Issue) } },
+    (collaborators) => {
+      const newSub = collaborators.map((it) => it.attachedTo as Ref<Issue>)
       const curSub = subscribed._id.$in
       if (curSub.length !== newSub.length || curSub.some((id, i) => newSub[i] !== id)) {
         subscribed = { _id: { $in: newSub } }
       }
     },
-    { sort: { _id: 1 }, projection: { _id: 1 } }
+    { sort: { attachedTo: 1 }, projection: { attachedTo: 1 } }
   )
 
   $: queries = { assigned, active, backlog, created, subscribed }

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

@@ -1 +1 @@
-huly-schedule ghcr.io/hcengineering/service_huly-schedule:v0.0.6
+huly-schedule ghcr.io/hcengineering/service_huly-schedule:v0.0.7

pods/external/services.d/huly-schedule.service

@@ -372,6 +372,7 @@ async function onEventCreate (ctx: TxCreateDoc<Event>, control: TriggerControl):
   const { _class, space, attachedTo, attachedToClass, collection, ...attr } = event
   const data = attr as any as Data<Event>
   const calendars = await control.findAll(control.ctx, calendar.class.Calendar, { hidden: false })
+  const events = await control.findAll(control.ctx, calendar.class.Event, { eventId: event.eventId })
   const access = 'reader'
   for (const part of event.participants) {
     const socialIds = await getSocialIds(control, part as Ref<Person>)
@@ -382,6 +383,7 @@ async function onEventCreate (ctx: TxCreateDoc<Event>, control: TriggerControl):
     const user = primarySocialString
     const calendar = getCalendar(calendars, socialStrings)
     if (calendar === undefined) continue
+    if (events.find((p) => p.user === user) !== undefined) continue
     const innerTx = control.txFactory.createTxCreateDoc(
       _class,
       space,

server-plugins/calendar-resources/src/index.ts

@@ -853,6 +853,7 @@ async function getTxCollabs (
       (await control.findAll(ctx, core.class.Collaborator, {
         attachedTo: doc._id
       }))
+    cache.set(doc._id, collaborators)
     const collabs = collaborators.map((c) => c.collaborator)
     const ops = isMixinTx(tx) ? tx.attributes : (tx as TxUpdateDoc<Doc>).operations
     const newCollaborators = (await getNewCollaborators(ops, mixin, doc._class, control)).filter(
@@ -1375,45 +1376,51 @@ async function updateCollaborators (
   tx: TxCUD<Doc>,
   cache: Map<Ref<Doc>, Collaborator[]>
 ): Promise<Tx[]> {
-  if (tx._class !== core.class.TxCreateDoc && tx._class !== core.class.TxRemoveDoc) return []
-  if (tx.objectClass !== core.class.Collaborator) return []
+  if (tx._class !== core.class.TxUpdateDoc && tx._class !== core.class.TxMixin) return []
 
   const hierarchy = control.hierarchy
 
+  if (hierarchy.classHierarchyMixin(tx.objectClass, activity.mixin.ActivityDoc) === undefined) return []
+
   const mixin = getClassCollaborators(control.modelDb, hierarchy, tx.objectClass)
-  if (mixin === undefined || tx.attachedToClass === undefined || tx.attachedTo === undefined) return []
+  if (mixin === undefined) return []
 
-  if (hierarchy.classHierarchyMixin(tx.attachedToClass, activity.mixin.ActivityDoc) === undefined) return []
+  const doc = (await control.findAll(ctx, tx.objectClass, { _id: tx.objectId }, { limit: 1 }))[0]
+  if (doc === undefined) return []
+
+  const collabsResult = await getTxCollabs(ctx, tx, control, cache, doc)
+  if (collabsResult.added.length === 0 && collabsResult.removed.length === 0) return []
 
-  const contexts = await control.findAll(control.ctx, notification.class.DocNotifyContext, { objectId: tx.attachedTo })
   const res: Tx[] = []
-  if (tx._class === core.class.TxCreateDoc) {
-    const collab = TxProcessor.createDoc2Doc(tx as TxCreateDoc<Collaborator>)
-    const addedInfo = await getReceiversInfo(ctx, [collab.collaborator], control)
-
-    for (const info of addedInfo.values()) {
-      const context = getDocNotifyContext(control, contexts, tx.attachedTo, info.account)
-      if (context !== undefined) {
-        if (context.hidden) {
-          res.push(control.txFactory.createTxUpdateDoc(context._class, context.space, context._id, { hidden: false }))
-        }
+
+  const { txes: collabTxes } = await createSyncCollaboratorsTxes(
+    ctx,
+    control,
+    cache,
+    doc._id,
+    doc._class,
+    doc.space,
+    collabsResult.added,
+    collabsResult.removed
+  )
+
+  res.push(...collabTxes)
+
+  const contexts = await control.findAll(control.ctx, notification.class.DocNotifyContext, { objectId: tx.attachedTo })
+  const addedInfo = collabsResult.added.length > 0 ? await getReceiversInfo(ctx, collabsResult.added, control) : []
+
+  for (const info of addedInfo) {
+    const context = getDocNotifyContext(control, contexts, doc._id, info.account)
+    if (context !== undefined) {
+      if (context.hidden) {
+        res.push(control.txFactory.createTxUpdateDoc(context._class, context.space, context._id, { hidden: false }))
       }
-      await createNotifyContext(
-        ctx,
-        control,
-        tx.attachedTo,
-        tx.attachedToClass,
-        tx.objectSpace,
-        info,
-        tx.modifiedBy,
-        undefined,
-        tx
-      )
     }
-  } else {
-    const removed = control.removedMap.get(tx.objectId) as Collaborator
-    if (removed === undefined) return []
-    await removeContexts(ctx, contexts, [removed.collaborator], control)
+    await createNotifyContext(ctx, control, doc._id, doc._class, doc.space, info, tx.modifiedBy, undefined, tx)
+  }
+
+  if (collabsResult.removed.length > 0) {
+    await removeContexts(ctx, contexts, collabsResult.removed, control)
   }
 
   return res

server-plugins/notification-resources/src/index.ts

@@ -21,6 +21,7 @@ import {
   buildSocialIdString,
   concatLink,
   isActiveMode,
+  isDeletingMode,
   isWorkspaceCreating,
   type MeasureContext,
   type Person,
@@ -1320,7 +1321,7 @@ export async function getUserWorkspaces (
   const { account } = decodeTokenVerbose(ctx, token)
 
   return (await db.getAccountWorkspaces(account)).filter(
-    (ws) => !ws.status.isDisabled || isWorkspaceCreating(ws.status.mode)
+    (ws) => isWorkspaceCreating(ws.status.mode) || !(isDeletingMode(ws.status.mode) || ws.status.isDisabled)
   )
 }
 

server/account/src/operations.ts

@@ -1488,8 +1488,8 @@ abstract class PostgresAdapterBase implements DbAdapter {
     return type === 'common'
       ? `${tlkey} = ${vars.add(value, valType)}`
       : type === 'array'
-        ? `${tkey} @> '${typeof value === 'string' ? '{"' + value + '"}' : value}'`
-        : `${tkey} @> '${typeof value === 'string' ? '"' + value + '"' : value}'`
+        ? `${tkey} @> '${typeof value === 'string' ? '{"' + escape(value) + '"}' : value}'`
+        : `${tkey} @> '${typeof value === 'string' ? '"' + escape(value) + '"' : value}'`
   }
 
   private getReverseProjection (vars: ValuesVariables, join: JoinProps): string[] {