UBERF-6205: add real archive for notifications

models/notification/src/index.ts

@@ -243,6 +243,9 @@ export class TInboxNotification extends TDoc implements InboxNotification {
   // @Index(IndexKind.Indexed)
     isViewed!: boolean
 
+  @Prop(TypeBoolean(), core.string.Boolean)
+    archived?: boolean
+
   title?: IntlString
   body?: IntlString
   intlParams?: Record<string, string | number>
@@ -537,15 +540,29 @@ export function createModel (builder: Builder): void {
   createAction(
     builder,
     {
-      action: notification.actionImpl.DeleteContextNotifications,
-      label: notification.string.Archive,
+      action: notification.actionImpl.ArchiveContextNotifications,
+      label: view.string.Archive,
       icon: view.icon.CheckCircle,
       input: 'focus',
       category: notification.category.Notification,
       target: notification.class.DocNotifyContext,
       context: { mode: ['panel'], application: notification.app.Notification, group: 'remove' }
     },
-    notification.action.DeleteContextNotifications
+    notification.action.ArchiveContextNotifications
+  )
+
+  createAction(
+    builder,
+    {
+      action: notification.actionImpl.UnarchiveContextNotifications,
+      label: view.string.UnArchive,
+      icon: view.icon.Circle,
+      input: 'focus',
+      category: notification.category.Notification,
+      target: notification.class.DocNotifyContext,
+      context: { mode: ['panel'], application: notification.app.Notification, group: 'remove' }
+    },
+    notification.action.UnarchiveContextNotifications
   )
 
   createAction(
@@ -669,6 +686,7 @@ export function createModel (builder: Builder): void {
   })
   builder.createDoc(core.class.DomainIndexConfiguration, core.space.Model, {
     domain: DOMAIN_NOTIFICATION,
+    indexes: [{ user: 1, archived: 1 }],
     disabled: [{ modifiedOn: 1 }, { modifiedBy: 1 }, { createdBy: 1 }, { isViewed: 1 }, { hidden: 1 }]
   })
 }

models/notification/src/plugin.ts

@@ -76,7 +76,8 @@ export default mergeIds(notificationId, notification, {
     PinDocNotifyContext: '' as ViewAction,
     UnReadNotifyContext: '' as ViewAction,
     ReadNotifyContext: '' as ViewAction,
-    DeleteContextNotifications: '' as ViewAction,
+    ArchiveContextNotifications: '' as ViewAction,
+    UnarchiveContextNotifications: '' as ViewAction,
     ArchiveAll: '' as ViewAction,
     ReadAll: '' as ViewAction,
     UnreadAll: '' as ViewAction

packages/ui/src/components/ButtonMenu.svelte

@@ -31,6 +31,7 @@
   export let disabled: boolean = false
   export let loading: boolean = false
   export let inheritColor: boolean = false
+  export let noSelection: boolean = false
 
   export let items: DropdownIntlItem[]
   export let params: Record<string, any> = {}
@@ -46,7 +47,7 @@
   function openPopup () {
     if (!opened) {
       opened = true
-      showPopup(ModernPopup, { items, selected, params }, element, (result) => {
+      showPopup(ModernPopup, { items, selected: noSelection ? undefined : selected, params }, element, (result) => {
         if (result) {
           selected = result
           dispatch('selected', result)

packages/ui/src/components/ModernToggle.svelte

@@ -3,7 +3,7 @@
   // © 2023 Hardcore Engineering, Inc. All Rights Reserved.
   // Licensed under the Eclipse Public License v2.0 (SPDX: EPL-2.0).
   //
-  import type { Asset, IntlString } from '@hcengineering/platform'
+  import type { IntlString } from '@hcengineering/platform'
   import Label from './Label.svelte'
 
   export let title: string | undefined = undefined

plugins/activity-assets/lang/en.json

@@ -38,7 +38,7 @@
     "Mentioned": "Mentioned",
     "You": "You",
     "Mentions": "Mentions",
-    "MentionedYouIn": "Mentioned you in {title}",
+    "MentionedYouIn": "Mentioned you in",
     "Messages": "Messages",
     "Thread": "Thread",
     "AddReaction": "Add reaction",

plugins/activity-assets/lang/es.json

@@ -37,6 +37,6 @@
     "Mentioned": "Mencionado",
     "You": "Tú",
     "Mentions": "Menciones",
-    "MentionedYouIn": "Has sido Mencionado en {title}"
+    "MentionedYouIn": "Has sido Mencionado en"
   }
 }

plugins/activity-assets/lang/pt.json

@@ -37,6 +37,6 @@
     "Mentioned": "Mencionado",
     "You": "Tu",
     "Mentions": "Menções",
-    "MentionedYouIn": "Foste Mencionado em {title}"
+    "MentionedYouIn": "Foste Mencionado em"
   }
 }

plugins/activity-assets/lang/ru.json

@@ -38,7 +38,7 @@
     "Mentioned": "Упомянул(а)",
     "You": "Вы",
     "Mentions": "Упоминания",
-    "MentionedYouIn": "Упомянул(а) вас в {title}",
+    "MentionedYouIn": "Упомянул(а) вас в",
     "Messages": "Cообщения",
     "Thread": "Обсуждение",
     "AddReaction": "Добавить реакцию",

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

@@ -83,7 +83,7 @@
     })
 
     const excludedActions = [
-      notification.action.DeleteContextNotifications,
+      notification.action.ArchiveContextNotifications,
       notification.action.UnReadNotifyContext,
       notification.action.ReadNotifyContext
     ]

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

@@ -272,7 +272,7 @@ export async function removeActivityChannels (contexts: DocNotifyContext[]): Pro
   try {
     for (const context of contexts) {
       const notifications = notificationsByContext.get(context._id) ?? []
-      await client.deleteNotifications(
+      await client.archiveNotifications(
         ops,
         notifications.map(({ _id }) => _id)
       )
@@ -293,7 +293,7 @@ export async function readActivityChannels (contexts: DocNotifyContext[]): Promi
   try {
     for (const context of contexts) {
       const notifications = notificationsByContext.get(context._id) ?? []
-      await client.deleteNotifications(
+      await client.archiveNotifications(
         ops,
         notifications
           .filter(({ _class }) => _class === notification.class.ActivityInboxNotification)

plugins/chunter-resources/src/utils.ts

@@ -39,7 +39,7 @@ import activity, {
   type DocUpdateMessage
 } from '@hcengineering/activity'
 import {
-  deleteContextNotifications,
+  archiveContextNotifications,
   InboxNotificationsClientImpl,
   isMentionNotification
 } from '@hcengineering/notification-resources'
@@ -396,7 +396,7 @@ export async function removeChannelAction (context?: DocNotifyContext): Promise<
 
   const client = getClient()
 
-  await deleteContextNotifications(context)
+  await archiveContextNotifications(context)
   await client.remove(context)
 }
 

plugins/notification-assets/lang/en.json

@@ -45,6 +45,7 @@
     "StarDocument": "Star document",
     "UnstarDocument": "Unstar document",
     "Unsubscribe": "Unsubscribe",
-    "Push": "Push"
+    "Push": "Push",
+    "Unreads": "Unreads"
   }
 }

plugins/notification-assets/lang/ru.json

@@ -45,6 +45,7 @@
     "StarDocument": "Добавить в избранное",
     "UnstarDocument": "Удалить из избранного",
     "Unsubscribe": "Отписаться",
-    "Push": "Push"
+    "Push": "Push",
+    "Unreads": "Непрочитанные"
   }
 }

plugins/notification-resources/src/components/DocNotifyContextCard.svelte

@@ -26,11 +26,12 @@
 
   import InboxNotificationPresenter from './inbox/InboxNotificationPresenter.svelte'
   import NotifyContextIcon from './NotifyContextIcon.svelte'
-  import { deleteContextNotifications } from '../utils'
+  import { archiveContextNotifications, unarchiveContextNotifications } from '../utils'
 
   export let value: DocNotifyContext
   export let notifications: WithLookup<DisplayInboxNotification>[]
   export let viewlets: ActivityNotificationViewlet[] = []
+  export let archived = false
 
   const maxNotifications = 3
 
@@ -67,6 +68,13 @@
       {
         object: value,
         baseMenuClass: notification.class.DocNotifyContext,
+        excludedActions: archived
+          ? [
+              notification.action.ArchiveContextNotifications,
+              notification.action.ReadNotifyContext,
+              notification.action.UnReadNotifyContext
+            ]
+          : [notification.action.UnarchiveContextNotifications],
         mode: 'panel'
       },
       ev.target as HTMLElement,
@@ -83,13 +91,13 @@
     isActionMenuOpened = false
   }
 
-  let deletingPromise: Promise<any> | undefined = undefined
+  let archivingPromise: Promise<any> | undefined = undefined
 
   async function checkContext (): Promise<void> {
-    await deletingPromise
-    deletingPromise = deleteContextNotifications(value)
-    await deletingPromise
-    deletingPromise = undefined
+    await archivingPromise
+    archivingPromise = archived ? unarchiveContextNotifications(value) : archiveContextNotifications(value)
+    await archivingPromise
+    archivingPromise = undefined
   }
 </script>
 
@@ -125,10 +133,10 @@
 
     <div class="actions clear-mins">
       <div class="flex-center">
-        {#if deletingPromise !== undefined}
+        {#if archivingPromise !== undefined}
           <Spinner size="small" />
         {:else}
-          <CheckBox checked={false} kind="todo" size="medium" on:value={checkContext} />
+          <CheckBox checked={archived} kind="todo" size="medium" on:value={checkContext} />
         {/if}
       </div>
       <ButtonIcon

plugins/notification-resources/src/components/inbox/ActivityInboxNotificationPresenter.svelte

@@ -30,25 +30,16 @@
   import { getActions } from '@hcengineering/view-resources'
   import { getResource } from '@hcengineering/platform'
 
-  import { InboxNotificationsClientImpl } from '../../inboxNotificationsClient'
-
   export let value: DisplayActivityInboxNotification
   export let viewlets: ActivityNotificationViewlet[] = []
 
   const client = getClient()
-  const inboxClient = InboxNotificationsClientImpl.getClient()
-  const activityNotificationsStore = inboxClient.activityInboxNotifications
 
   let viewlet: ActivityNotificationViewlet | undefined = undefined
   let displayMessage: DisplayActivityMessage | undefined = undefined
   let actions: Action[] = []
 
-  $: combinedNotifications = $activityNotificationsStore.filter(({ _id }) => value.combinedIds.includes(_id))
-  $: messages = combinedNotifications
-    .map((it) => it.$lookup?.attachedTo)
-    .filter((it): it is ActivityMessage => it !== undefined)
-
-  $: void updateDisplayMessage(messages)
+  $: void updateDisplayMessage(value.combinedMessages)
 
   async function updateDisplayMessage (messages: ActivityMessage[]): Promise<void> {
     const combinedMessages = await combineActivityMessages(sortActivityMessages(messages))