diff --git a/models/notification/src/index.ts b/models/notification/src/index.ts index d6148cc286..778da86387 100644 --- a/models/notification/src/index.ts +++ b/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 @@ -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 }] }) } diff --git a/models/notification/src/plugin.ts b/models/notification/src/plugin.ts index 5ed57a5c1a..24bcc9dff8 100644 --- a/models/notification/src/plugin.ts +++ b/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 diff --git a/packages/ui/src/components/ButtonMenu.svelte b/packages/ui/src/components/ButtonMenu.svelte index 8c6e178c48..151cd70df2 100644 --- a/packages/ui/src/components/ButtonMenu.svelte +++ b/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 = {} @@ -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) diff --git a/packages/ui/src/components/ModernToggle.svelte b/packages/ui/src/components/ModernToggle.svelte index 91cd05b24e..e098078439 100644 --- a/packages/ui/src/components/ModernToggle.svelte +++ b/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 diff --git a/plugins/activity-assets/lang/en.json b/plugins/activity-assets/lang/en.json index dfd9d563f2..9560807984 100644 --- a/plugins/activity-assets/lang/en.json +++ b/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", diff --git a/plugins/activity-assets/lang/es.json b/plugins/activity-assets/lang/es.json index c297301833..99eb98a1db 100644 --- a/plugins/activity-assets/lang/es.json +++ b/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" } } \ No newline at end of file diff --git a/plugins/activity-assets/lang/pt.json b/plugins/activity-assets/lang/pt.json index 8ca2b0bc42..da81bcea14 100644 --- a/plugins/activity-assets/lang/pt.json +++ b/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" } } \ No newline at end of file diff --git a/plugins/activity-assets/lang/ru.json b/plugins/activity-assets/lang/ru.json index ba7a29ce60..a89b188e2f 100644 --- a/plugins/activity-assets/lang/ru.json +++ b/plugins/activity-assets/lang/ru.json @@ -38,7 +38,7 @@ "Mentioned": "Упомянул(а)", "You": "Вы", "Mentions": "Упоминания", - "MentionedYouIn": "Упомянул(а) вас в {title}", + "MentionedYouIn": "Упомянул(а) вас в", "Messages": "Cообщения", "Thread": "Обсуждение", "AddReaction": "Добавить реакцию", diff --git a/plugins/chunter-resources/src/components/chat/navigator/ChatNavItem.svelte b/plugins/chunter-resources/src/components/chat/navigator/ChatNavItem.svelte index 71b4df1daf..7a798e377e 100644 --- a/plugins/chunter-resources/src/components/chat/navigator/ChatNavItem.svelte +++ b/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 ] diff --git a/plugins/chunter-resources/src/components/chat/utils.ts b/plugins/chunter-resources/src/components/chat/utils.ts index 80ce011326..5377c53ad1 100644 --- a/plugins/chunter-resources/src/components/chat/utils.ts +++ b/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) diff --git a/plugins/chunter-resources/src/utils.ts b/plugins/chunter-resources/src/utils.ts index 0af57f74cc..cbfbe34346 100644 --- a/plugins/chunter-resources/src/utils.ts +++ b/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) } diff --git a/plugins/notification-assets/lang/en.json b/plugins/notification-assets/lang/en.json index a1b0e4d6b6..7991414041 100644 --- a/plugins/notification-assets/lang/en.json +++ b/plugins/notification-assets/lang/en.json @@ -45,6 +45,7 @@ "StarDocument": "Star document", "UnstarDocument": "Unstar document", "Unsubscribe": "Unsubscribe", - "Push": "Push" + "Push": "Push", + "Unreads": "Unreads" } } diff --git a/plugins/notification-assets/lang/ru.json b/plugins/notification-assets/lang/ru.json index b166cc92af..1de20658a0 100644 --- a/plugins/notification-assets/lang/ru.json +++ b/plugins/notification-assets/lang/ru.json @@ -45,6 +45,7 @@ "StarDocument": "Добавить в избранное", "UnstarDocument": "Удалить из избранного", "Unsubscribe": "Отписаться", - "Push": "Push" + "Push": "Push", + "Unreads": "Непрочитанные" } } diff --git a/plugins/notification-resources/src/components/DocNotifyContextCard.svelte b/plugins/notification-resources/src/components/DocNotifyContextCard.svelte index e5cdfb17b9..80b6bdb9f9 100644 --- a/plugins/notification-resources/src/components/DocNotifyContextCard.svelte +++ b/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[] 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 | undefined = undefined + let archivingPromise: Promise | undefined = undefined async function checkContext (): Promise { - await deletingPromise - deletingPromise = deleteContextNotifications(value) - await deletingPromise - deletingPromise = undefined + await archivingPromise + archivingPromise = archived ? unarchiveContextNotifications(value) : archiveContextNotifications(value) + await archivingPromise + archivingPromise = undefined } @@ -125,10 +133,10 @@
- {#if deletingPromise !== undefined} + {#if archivingPromise !== undefined} {:else} - + {/if}
- - - diff --git a/plugins/notification-resources/src/components/inbox/ActivityInboxNotificationPresenter.svelte b/plugins/notification-resources/src/components/inbox/ActivityInboxNotificationPresenter.svelte index 4f1d4203cb..07c6e4e92b 100644 --- a/plugins/notification-resources/src/components/inbox/ActivityInboxNotificationPresenter.svelte +++ b/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 { const combinedMessages = await combineActivityMessages(sortActivityMessages(messages)) diff --git a/plugins/notification-resources/src/components/inbox/Inbox.svelte b/plugins/notification-resources/src/components/inbox/Inbox.svelte index 92d5a7ac0b..ec337d2c57 100644 --- a/plugins/notification-resources/src/components/inbox/Inbox.svelte +++ b/plugins/notification-resources/src/components/inbox/Inbox.svelte @@ -13,20 +13,18 @@ // limitations under the License. -->
- {#if inboxData.size > 0} - dropdownItemSelected(ev.detail)} - /> - {/if} - + +
@@ -390,7 +417,12 @@ - + diff --git a/plugins/notification-resources/src/components/inbox/InboxGroupedListView.svelte b/plugins/notification-resources/src/components/inbox/InboxGroupedListView.svelte index 6f0dd47ca2..6b3fe2e735 100644 --- a/plugins/notification-resources/src/components/inbox/InboxGroupedListView.svelte +++ b/plugins/notification-resources/src/components/inbox/InboxGroupedListView.svelte @@ -25,11 +25,12 @@ import { InboxNotificationsClientImpl } from '../../inboxNotificationsClient' import DocNotifyContextCard from '../DocNotifyContextCard.svelte' - import { deleteContextNotifications } from '../../utils' + import { archiveContextNotifications, unarchiveContextNotifications } from '../../utils' import { InboxData } from '../../types' export let data: InboxData export let selectedContext: Ref | undefined + export let archived = false const client = getClient() const dispatch = createEventDispatcher() @@ -83,7 +84,11 @@ const contextId = displayData[listSelection]?.[0] const context = $contextByIdStore.get(contextId) - void deleteContextNotifications(context) + if (archived) { + void unarchiveContextNotifications(context) + } else { + void archiveContextNotifications(context) + } } if (key.code === 'Enter') { key.preventDefault() @@ -121,6 +126,7 @@ { dispatch('click', event.detail) diff --git a/plugins/notification-resources/src/components/inbox/InboxMenuButton.svelte b/plugins/notification-resources/src/components/inbox/InboxMenuButton.svelte new file mode 100644 index 0000000000..7117f559d7 --- /dev/null +++ b/plugins/notification-resources/src/components/inbox/InboxMenuButton.svelte @@ -0,0 +1,61 @@ + + + + onSelect(ev.detail)} +/> diff --git a/plugins/notification-resources/src/components/inbox/SettingsButton.svelte b/plugins/notification-resources/src/components/inbox/SettingsButton.svelte new file mode 100644 index 0000000000..b5da214e32 --- /dev/null +++ b/plugins/notification-resources/src/components/inbox/SettingsButton.svelte @@ -0,0 +1,28 @@ + + + + diff --git a/plugins/notification-resources/src/components/inbox/SettingsPopup.svelte b/plugins/notification-resources/src/components/inbox/SettingsPopup.svelte new file mode 100644 index 0000000000..cea6e97097 --- /dev/null +++ b/plugins/notification-resources/src/components/inbox/SettingsPopup.svelte @@ -0,0 +1,107 @@ + + + + + + + +
{ + dispatch('changeContent') + }} + on:keydown={onKeydown} +> +
+
+
+ dispatch('changeContent')}> + + {@const item = items[itemId]} +
+
+ + +
+
+
+
+ + diff --git a/plugins/notification-resources/src/inboxNotificationsClient.ts b/plugins/notification-resources/src/inboxNotificationsClient.ts index f594739c2f..0248a9bbf4 100644 --- a/plugins/notification-resources/src/inboxNotificationsClient.ts +++ b/plugins/notification-resources/src/inboxNotificationsClient.ts @@ -34,6 +34,7 @@ import notification, { } from '@hcengineering/notification' import { createQuery, getClient } from '@hcengineering/presentation' import { derived, get, writable } from 'svelte/store' +import { isActivityNotification } from './utils' /** * @public @@ -103,6 +104,7 @@ export class InboxNotificationsClientImpl implements InboxNotificationsClient { notification.class.InboxNotification, { _class: { $nin: [notification.class.ActivityInboxNotification] }, + archived: { $ne: true }, user: getCurrentAccount()._id }, (result: InboxNotification[]) => { @@ -118,6 +120,7 @@ export class InboxNotificationsClientImpl implements InboxNotificationsClient { this.activityInboxNotificationsQuery.query( notification.class.ActivityInboxNotification, { + archived: { $ne: true }, user: getCurrentAccount()._id }, (result: ActivityInboxNotification[]) => { @@ -249,28 +252,29 @@ export class InboxNotificationsClientImpl implements InboxNotificationsClient { } } - async deleteNotifications (client: TxOperations, ids: Array>): Promise { + async archiveNotifications (client: TxOperations, ids: Array>): Promise { const inboxNotifications = (get(this.inboxNotifications) ?? []).filter(({ _id }) => ids.includes(_id)) for (const notification of inboxNotifications) { - await client.remove(notification) + await client.update(notification, { archived: true }) } } - async deleteAllNotifications (): Promise { - const doneOp = await getClient().measure('deleteAllNotifications') + async archiveAllNotifications (): Promise { + const doneOp = await getClient().measure('archiveAllNotifications') const ops = getClient().apply(generateId()) try { const inboxNotifications = await ops.findAll( notification.class.InboxNotification, { - user: getCurrentAccount()._id + user: getCurrentAccount()._id, + archived: { $ne: true } }, { projection: { _id: 1, _class: 1, space: 1 } } ) const contexts = get(this.contexts) ?? [] for (const notification of inboxNotifications) { - await ops.removeDoc(notification._class, notification.space, notification._id) + await ops.updateDoc(notification._class, notification.space, notification._id, { archived: true }) } for (const context of contexts) { @@ -291,7 +295,8 @@ export class InboxNotificationsClientImpl implements InboxNotificationsClient { notification.class.InboxNotification, { user: getCurrentAccount()._id, - isViewed: { $ne: true } + isViewed: { $ne: true }, + archived: { $ne: true } }, { projection: { _id: 1, _class: 1, space: 1 } } ) @@ -317,9 +322,13 @@ export class InboxNotificationsClientImpl implements InboxNotificationsClient { notification.class.InboxNotification, { user: getCurrentAccount()._id, - isViewed: true + isViewed: true, + archived: { $ne: true } }, - { projection: { _id: 1, _class: 1, space: 1 } } + { + projection: { _id: 1, _class: 1, space: 1, docNotifyContext: 1 }, + sort: { createdOn: SortingOrder.Ascending } + } ) const contexts = get(this.contexts) ?? [] @@ -327,7 +336,17 @@ export class InboxNotificationsClientImpl implements InboxNotificationsClient { await ops.updateDoc(notification._class, notification.space, notification._id, { isViewed: false }) } for (const context of contexts) { - await ops.update(context, { lastViewedTimestamp: 0 }) + const firstUnread = inboxNotifications.find( + (it) => it.docNotifyContext === context._id && isActivityNotification(it) + ) + + if (firstUnread === undefined) { + continue + } + + const lastViewedTimestamp = (firstUnread.createdOn ?? firstUnread.modifiedOn) - 1 + + await ops.update(context, { lastViewedTimestamp }) } } finally { await ops.commit() diff --git a/plugins/notification-resources/src/index.ts b/plugins/notification-resources/src/index.ts index 957361b4cf..8443f63d59 100644 --- a/plugins/notification-resources/src/index.ts +++ b/plugins/notification-resources/src/index.ts @@ -38,12 +38,13 @@ import { canUnReadNotifyContext, readNotifyContext, unReadNotifyContext, - deleteContextNotifications, + archiveContextNotifications, hasInboxNotifications, archiveAll, readAll, unreadAll, - checkPermission + checkPermission, + unarchiveContextNotifications } from './utils' import { InboxNotificationsClientImpl } from './inboxNotificationsClient' @@ -86,7 +87,8 @@ export default async (): Promise => ({ UnpinDocNotifyContext: unpinDocNotifyContext, ReadNotifyContext: readNotifyContext, UnReadNotifyContext: unReadNotifyContext, - DeleteContextNotifications: deleteContextNotifications, + ArchiveContextNotifications: archiveContextNotifications, + UnarchiveContextNotifications: unarchiveContextNotifications, ArchiveAll: archiveAll, ReadAll: readAll, UnreadAll: unreadAll diff --git a/plugins/notification-resources/src/plugin.ts b/plugins/notification-resources/src/plugin.ts index 5268398eba..1f704ec294 100644 --- a/plugins/notification-resources/src/plugin.ts +++ b/plugins/notification-resources/src/plugin.ts @@ -34,6 +34,7 @@ export default mergeIds(notificationId, notification, { Activity: '' as IntlString, People: '' as IntlString, Read: '' as IntlString, - Unread: '' as IntlString + Unread: '' as IntlString, + Unreads: '' as IntlString } }) diff --git a/plugins/notification-resources/src/types.ts b/plugins/notification-resources/src/types.ts index 18b7730e9a..375a33a6a0 100644 --- a/plugins/notification-resources/src/types.ts +++ b/plugins/notification-resources/src/types.ts @@ -1,6 +1,14 @@ import type { Ref } from '@hcengineering/core' import type { DisplayInboxNotification, DocNotifyContext } from '@hcengineering/notification' +import type { IntlString } from '@hcengineering/platform' -export type InboxNotificationsFilter = 'all' | 'read' | 'unread' +export type InboxNotificationsFilter = 'all' | 'unread' export type InboxData = Map, DisplayInboxNotification[]> + +export interface SettingItem { + id: string + on: boolean + label: IntlString + onToggle: () => void +} diff --git a/plugins/notification-resources/src/utils.ts b/plugins/notification-resources/src/utils.ts index 97de0fbcb9..589161f6e6 100644 --- a/plugins/notification-resources/src/utils.ts +++ b/plugins/notification-resources/src/utils.ts @@ -143,23 +143,23 @@ export async function unReadNotifyContext (doc: DocNotifyContext): Promise /** * @public */ -export async function deleteContextNotifications (doc?: DocNotifyContext): Promise { +export async function archiveContextNotifications (doc?: DocNotifyContext): Promise { if (doc === undefined) { return } - const doneOp = await getClient().measure('deleteContextNotifications') + const doneOp = await getClient().measure('archiveContextNotifications') const ops = getClient().apply(doc._id) try { const notifications = await ops.findAll( notification.class.InboxNotification, - { docNotifyContext: doc._id }, + { docNotifyContext: doc._id, archived: { $ne: true } }, { projection: { _id: 1, _class: 1, space: 1 } } ) for (const notification of notifications) { - await ops.removeDoc(notification._class, notification.space, notification._id) + await ops.updateDoc(notification._class, notification.space, notification._id, { archived: true, isViewed: true }) } await ops.update(doc, { lastViewedTimestamp: Date.now() }) } finally { @@ -168,6 +168,33 @@ export async function deleteContextNotifications (doc?: DocNotifyContext): Promi } } +/** + * @public + */ +export async function unarchiveContextNotifications (doc?: DocNotifyContext): Promise { + if (doc === undefined) { + return + } + + const doneOp = await getClient().measure('unarchiveContextNotifications') + const ops = getClient().apply(doc._id) + + try { + const notifications = await ops.findAll( + notification.class.InboxNotification, + { docNotifyContext: doc._id, archived: true }, + { projection: { _id: 1, _class: 1, space: 1 } } + ) + + for (const notification of notifications) { + await ops.updateDoc(notification._class, notification.space, notification._id, { archived: false }) + } + } finally { + await ops.commit() + await doneOp() + } +} + enum OpWithMe { Add = 'add', Remove = 'remove' @@ -259,7 +286,7 @@ export async function archiveAll (): Promise { 'top', (result?: boolean) => { if (result === true) { - void client.deleteAllNotifications() + void client.archiveAllNotifications() } } ) @@ -300,10 +327,6 @@ export async function getDisplayInboxNotifications ( continue } - if (filter === 'read' && !notification.isViewed) { - continue - } - if (isActivityNotification(notification)) { activityNotifications.push(notification) } else { @@ -344,7 +367,10 @@ export async function getDisplayInboxNotifications ( const displayNotification = { ...activityNotification, - combinedIds: activityNotifications.filter(({ attachedTo }) => ids.includes(attachedTo)).map(({ _id }) => _id) + combinedIds: activityNotifications.filter(({ attachedTo }) => ids.includes(attachedTo)).map(({ _id }) => _id), + combinedMessages: activityNotifications + .map((a) => a.$lookup?.attachedTo) + .filter((m): m is ActivityMessage => m !== undefined) } result.push(displayNotification) @@ -353,7 +379,8 @@ export async function getDisplayInboxNotifications ( if (activityNotification !== undefined) { result.push({ ...activityNotification, - combinedIds: [activityNotification._id] + combinedIds: [activityNotification._id], + combinedMessages: [message] }) } } diff --git a/plugins/notification/src/index.ts b/plugins/notification/src/index.ts index 204204dc0f..c55fd7bf52 100644 --- a/plugins/notification/src/index.ts +++ b/plugins/notification/src/index.ts @@ -252,6 +252,7 @@ export interface InboxNotification extends Doc { body?: IntlString intlParams?: Record intlParamsNotLocalized?: Record + archived?: boolean } export interface ActivityInboxNotification extends InboxNotification { @@ -278,6 +279,7 @@ export interface MentionInboxNotification extends CommonInboxNotification { export interface DisplayActivityInboxNotification extends ActivityInboxNotification { combinedIds: Ref[] + combinedMessages: ActivityMessage[] } export type DisplayInboxNotification = DisplayActivityInboxNotification | InboxNotification @@ -315,8 +317,8 @@ export interface InboxNotificationsClient { readMessages: (client: TxOperations, ids: Ref[]) => Promise readNotifications: (client: TxOperations, ids: Array>) => Promise unreadNotifications: (client: TxOperations, ids: Array>) => Promise - deleteNotifications: (client: TxOperations, ids: Array>) => Promise - deleteAllNotifications: () => Promise + archiveNotifications: (client: TxOperations, ids: Array>) => Promise + archiveAllNotifications: () => Promise readAllNotifications: () => Promise unreadAllNotifications: () => Promise } @@ -401,7 +403,8 @@ const notification = plugin(notificationId, { UnpinDocNotifyContext: '' as Ref, UnReadNotifyContext: '' as Ref, ReadNotifyContext: '' as Ref, - DeleteContextNotifications: '' as Ref + ArchiveContextNotifications: '' as Ref, + UnarchiveContextNotifications: '' as Ref }, icon: { Notifications: '' as Asset, diff --git a/plugins/view-assets/assets/icons.svg b/plugins/view-assets/assets/icons.svg index 8ddfdd05af..b7c8f8d6b9 100644 --- a/plugins/view-assets/assets/icons.svg +++ b/plugins/view-assets/assets/icons.svg @@ -144,4 +144,7 @@ + + + diff --git a/plugins/view-assets/lang/en.json b/plugins/view-assets/lang/en.json index d7986cc0e5..5d694bd15c 100644 --- a/plugins/view-assets/lang/en.json +++ b/plugins/view-assets/lang/en.json @@ -120,6 +120,7 @@ "UnArchive": "Unarchive", "Pin": "Pin", "Unpin": "Unpin", + "Archived": "Archived", "MoreActions": "More actions" } } diff --git a/plugins/view-assets/lang/ru.json b/plugins/view-assets/lang/ru.json index 963168c039..5aafa1a0fc 100644 --- a/plugins/view-assets/lang/ru.json +++ b/plugins/view-assets/lang/ru.json @@ -117,6 +117,7 @@ "UnArchive": "Разархивировать", "Pin": "Закрепить", "Unpin": "Открепить", + "Archived": "Архивированные", "MoreActions": "Больше действий" } } diff --git a/plugins/view-assets/src/index.ts b/plugins/view-assets/src/index.ts index 3aa1879911..beb6fe1a50 100644 --- a/plugins/view-assets/src/index.ts +++ b/plugins/view-assets/src/index.ts @@ -50,5 +50,6 @@ loadMetadata(view.icon, { Image: `${icons}#image`, Table2: `${icons}#table2`, CodeBlock: `${icons}#code-block`, - SeparatorLine: `${icons}#separator-line` + SeparatorLine: `${icons}#separator-line`, + Circle: `${icons}#circle` }) diff --git a/plugins/view-resources/src/plugin.ts b/plugins/view-resources/src/plugin.ts index 08eee680e2..ed8e8cdc50 100644 --- a/plugins/view-resources/src/plugin.ts +++ b/plugins/view-resources/src/plugin.ts @@ -43,7 +43,6 @@ export default mergeIds(viewId, view, { DeletePopupNoPermissionLabel: '' as IntlString, DeletePopupCreatorLabel: '' as IntlString, DeletePopupOwnerLabel: '' as IntlString, - Archive: '' as IntlString, ArchiveConfirm: '' as IntlString, Assignees: '' as IntlString, Labels: '' as IntlString, diff --git a/plugins/view/src/index.ts b/plugins/view/src/index.ts index 419083b2b3..5166412134 100644 --- a/plugins/view/src/index.ts +++ b/plugins/view/src/index.ts @@ -193,8 +193,10 @@ const view = plugin(viewId, { NoGrouping: '' as IntlString, Type: '' as IntlString, UnArchive: '' as IntlString, + Archive: '' as IntlString, Save: '' as IntlString, PublicView: '' as IntlString, + Archived: '' as IntlString, MoreActions: '' as IntlString }, icon: { @@ -230,7 +232,8 @@ const view = plugin(viewId, { Image: '' as Asset, Table2: '' as Asset, CodeBlock: '' as Asset, - SeparatorLine: '' as Asset + SeparatorLine: '' as Asset, + Circle: '' as Asset }, category: { General: '' as Ref,