Get rid of 'ne'/'nin' in chat queries (#6265)

models/chunter/src/migration.ts

@@ -63,7 +63,8 @@ export async function createDocNotifyContexts (
       await tx.createDoc(notification.class.DocNotifyContext, core.space.Space, {
         user: user._id,
         attachedTo,
-        attachedToClass
+        attachedToClass,
+        isPinned: false
       })
     }
   }

models/notification/src/index.ts

@@ -210,7 +210,7 @@ export class TDocNotifyContext extends TDoc implements DocNotifyContext {
     lastUpdateTimestamp?: Timestamp
 
   @Prop(TypeBoolean(), notification.string.Pinned)
-    isPinned?: boolean
+    isPinned!: boolean
 }
 
 @Model(notification.class.InboxNotification, core.class.Doc, DOMAIN_NOTIFICATION)

models/notification/src/migration.ts

@@ -187,6 +187,16 @@ export const notificationOperation: MigrateOperation = {
             { archived: false }
           )
         }
+      },
+      {
+        state: 'fill-contexts-pinned-field-v1',
+        func: async (client) => {
+          await client.update<DocNotifyContext>(
+            DOMAIN_DOC_NOTIFY,
+            { _class: notification.class.DocNotifyContext, isPinned: { $exists: false } },
+            { isPinned: false }
+          )
+        }
       }
     ])
     await client.deleteMany<BrowserNotification>(DOMAIN_USER_NOTIFY, {

plugins/chunter-resources/src/components/chat/create/CreateChannel.svelte

@@ -63,7 +63,8 @@
     await client.createDoc(notification.class.DocNotifyContext, channelId, {
       user: accountId,
       attachedTo: channelId,
-      attachedToClass: chunter.class.Channel
+      attachedToClass: chunter.class.Channel,
+      isPinned: false
     })
 
     openChannel(channelId, chunter.class.Channel)

plugins/chunter-resources/src/components/chat/create/CreateDirectChat.svelte

@@ -89,7 +89,8 @@
     await client.createDoc(notification.class.DocNotifyContext, dmId, {
       user: myAccId,
       attachedTo: dmId,
-      attachedToClass: chunter.class.DirectMessage
+      attachedToClass: chunter.class.DirectMessage,
+      isPinned: false
     })
 
     openChannel(dmId, chunter.class.DirectMessage)

plugins/chunter-resources/src/components/chat/navigator/ChatNavGroup.svelte

@@ -14,8 +14,8 @@
 -->
 <script lang="ts">
   import activity from '@hcengineering/activity'
-  import { Class, Doc, getCurrentAccount, groupByArray, reduceCalls, Ref, SortingOrder } from '@hcengineering/core'
+  import { Class, Doc, groupByArray, reduceCalls, Ref } from '@hcengineering/core'
-  import notification, { DocNotifyContext } from '@hcengineering/notification'
+  import { DocNotifyContext } from '@hcengineering/notification'
   import { InboxNotificationsClientImpl } from '@hcengineering/notification-resources'
   import { IntlString } from '@hcengineering/platform'
   import { createQuery, getClient, LiveQuery } from '@hcengineering/presentation'
@@ -40,32 +40,23 @@
   const hierarchy = client.getHierarchy()
   const inboxClient = InboxNotificationsClientImpl.getClient()
   const contextByDocStore = inboxClient.contextByDoc
-
+  const contextsStore = inboxClient.contexts
-  const contextsQuery = createQuery()
   const objectsQueryByClass = new Map<Ref<Class<Doc>>, { query: LiveQuery, limit: number }>()
 
-  let objectsByClass = new Map<Ref<Class<Doc>>, { docs: Doc[], total: number }>()
   let contexts: DocNotifyContext[] = []
+  let objectsByClass = new Map<Ref<Class<Doc>>, { docs: Doc[], total: number }>()
 
   let shouldPushObject = false
 
   let sections: Section[] = []
 
-  $: contextsQuery.query(
+  $: contexts = $contextsStore.filter(({ attachedToClass, isPinned }) => {
-    notification.class.DocNotifyContext,
+    if (model.isPinned !== isPinned) return false
-    {
+    if (model._class !== undefined && model._class !== attachedToClass) return false
-      ...model.query,
+    if (model.skipClasses !== undefined && model.skipClasses.includes(attachedToClass)) return false
-      [`${chunter.mixin.ChannelInfo}.hidden`]: { $ne: true },
+    if (hierarchy.classHierarchyMixin(attachedToClass, activity.mixin.ActivityDoc) === undefined) return false
-      user: getCurrentAccount()._id
+    return true
-    },
+  })
-    (res: DocNotifyContext[]) => {
-      contexts = res.filter(
-        ({ attachedToClass }) =>
-          hierarchy.classHierarchyMixin(attachedToClass, activity.mixin.ActivityDoc) !== undefined
-      )
-    },
-    { sort: { createdOn: SortingOrder.Ascending } }
-  )
 
   $: loadObjects(contexts)
 

plugins/chunter-resources/src/components/chat/types.ts

@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 import { type Asset, type IntlString } from '@hcengineering/platform'
-import { type Account, type Doc, type DocumentQuery, type IdMap, type Ref, type UserStatus } from '@hcengineering/core'
+import { type Account, type Class, type Doc, type IdMap, type Ref, type UserStatus } from '@hcengineering/core'
 import { type DocNotifyContext } from '@hcengineering/notification'
 import { type AnySvelteComponent, type IconSize, type Action } from '@hcengineering/ui'
 import { type PersonAccount } from '@hcengineering/contact'
@@ -29,11 +29,13 @@ export interface SortFnOptions {
 export interface ChatNavGroupModel {
   id: ChatGroup
   label?: IntlString
-  query: DocumentQuery<DocNotifyContext>
   sortFn: (items: ChatNavItemModel[], options: SortFnOptions) => ChatNavItemModel[]
   wrap: boolean
   getActionsFn?: (contexts: DocNotifyContext[]) => Action[]
   maxSectionItems?: number
+  isPinned: boolean
+  _class?: Ref<Class<Doc>>
+  skipClasses?: Array<Ref<Class<Doc>>>
 }
 
 export interface ChatNavItemModel {

plugins/chunter-resources/src/components/chat/utils.ts

@@ -139,29 +139,23 @@ export const chatNavGroupModels: ChatNavGroupModel[] = [
     sortFn: sortAlphabetically,
     wrap: false,
     getActionsFn: getPinnedActions,
-    query: {
+    isPinned: true
-      isPinned: true
-    }
   },
   {
     id: 'channels',
     sortFn: sortAlphabetically,
     wrap: true,
     getActionsFn: getChannelsActions,
-    query: {
+    isPinned: false,
-      isPinned: { $ne: true },
+    _class: chunter.class.Channel
-      attachedToClass: { $in: [chunter.class.Channel] }
-    }
   },
   {
     id: 'direct',
     sortFn: sortDirects,
     wrap: true,
     getActionsFn: getDirectActions,
-    query: {
+    isPinned: false,
-      isPinned: { $ne: true },
+    _class: chunter.class.DirectMessage
-      attachedToClass: { $in: [chunter.class.DirectMessage] }
-    }
   },
   {
     id: 'activity',
@@ -169,13 +163,8 @@ export const chatNavGroupModels: ChatNavGroupModel[] = [
     wrap: true,
     getActionsFn: getActivityActions,
     maxSectionItems: 5,
-    query: {
+    isPinned: false,
-      isPinned: { $ne: true },
+    skipClasses: [chunter.class.DirectMessage, chunter.class.Channel, contact.class.Channel]
-      attachedToClass: {
-        // Ignore external channels until support is provided for them
-        $nin: [chunter.class.DirectMessage, chunter.class.Channel, contact.class.Channel]
-      }
-    }
   }
 ]
 

plugins/notification-resources/src/utils.ts

@@ -91,11 +91,11 @@ export function loadNotificationSettings (): void {
 loadNotificationSettings()
 
 export async function hasDocNotifyContextPinAction (docNotifyContext: DocNotifyContext): Promise<boolean> {
-  return docNotifyContext.isPinned !== true
+  return !docNotifyContext.isPinned
 }
 
 export async function hasDocNotifyContextUnpinAction (docNotifyContext: DocNotifyContext): Promise<boolean> {
-  return docNotifyContext.isPinned === true
+  return docNotifyContext.isPinned
 }
 
 /**

plugins/notification/src/index.ts

@@ -276,7 +276,7 @@ export interface DocNotifyContext extends Doc {
   attachedTo: Ref<Doc>
   attachedToClass: Ref<Class<Doc>>
 
-  isPinned?: boolean
+  isPinned: boolean
   lastViewedTimestamp?: Timestamp
   lastUpdateTimestamp?: Timestamp
 }

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

@@ -423,7 +423,8 @@ async function OnChannelMembersChanged (tx: TxUpdateDoc<Channel>, control: Trigg
         attachedTo: tx.objectId,
         attachedToClass: tx.objectClass,
         user: addedMember,
-        lastViewedTimestamp: tx.modifiedOn
+        lastViewedTimestamp: tx.modifiedOn,
+        isPinned: false
       })
 
       await control.apply([createTx])
@@ -553,7 +554,7 @@ export async function updateChatInfo (control: TriggerControl, status: UserStatu
 
   const contexts = await control.findAll(notification.class.DocNotifyContext, {
     user: account._id,
-    isPinned: { $ne: true }
+    isPinned: false
   })
 
   if (contexts.length === 0) return

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

@@ -105,7 +105,8 @@ export async function OnMessageCreate (tx: Tx, control: TriggerControl): Promise
             user: tx.modifiedBy,
             attachedTo: channel._id,
             attachedToClass: channel._class,
-            lastUpdateTimestamp: tx.modifiedOn
+            lastUpdateTimestamp: tx.modifiedOn,
+            isPinned: false
             // TODO: push inbox notification
             // txes: [
             //   { _id: tx._id as Ref<TxCUD<Doc>>, modifiedOn: tx.modifiedOn, modifiedBy: tx.modifiedBy, isNew: true }

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

@@ -362,7 +362,8 @@ export async function pushInboxNotifications (
       user: account._id,
       attachedTo,
       attachedToClass,
-      lastUpdateTimestamp: shouldUpdateTimestamp ? modifiedOn : undefined
+      lastUpdateTimestamp: shouldUpdateTimestamp ? modifiedOn : undefined,
+      isPinned: false
     })
     await control.apply([createContextTx])
     if (target.account?.email !== undefined) {

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

@@ -100,7 +100,8 @@ export async function OnMessageCreate (tx: Tx, control: TriggerControl): Promise
             user: tx.modifiedBy,
             attachedTo: channel._id,
             attachedToClass: channel._class,
-            lastUpdateTimestamp: tx.modifiedOn
+            lastUpdateTimestamp: tx.modifiedOn,
+            isPinned: false
             // TODO: push inbox notifications
             // txes: [
             //   { _id: tx._id as Ref<TxCUD<Doc>>, modifiedOn: tx.modifiedOn, modifiedBy: tx.modifiedBy, isNew: true }