Fix notification navigation (#9642)

Author: SasLord

desktop/src/main/start.ts

@@ -340,7 +340,7 @@ ipcMain.on('send-notification', (_event: any, notificationParams: NotificationPa
 
     notification.on('click', () => {
       mainWindow?.show()
-      mainWindow?.webContents.send('handle-notification-navigation', notificationParams.application)
+      mainWindow?.webContents.send('handle-notification-navigation', notificationParams)
     })
 
     notification.show()

desktop/src/ui/index.ts

@@ -18,13 +18,16 @@ import {
 } from '@hcengineering/ui'
 import { handleDownloadItem } from '@hcengineering/desktop-downloads'
 import notification, { notificationId } from '@hcengineering/notification'
+import { inboxId } from '@hcengineering/inbox'
 import { workbenchId, logOut } from '@hcengineering/workbench'
+import { encodeObjectURI } from '@hcengineering/view'
+import { resolveLocation } from '@hcengineering/notification-resources'
 
 import { isOwnerOrMaintainer } from '@hcengineering/core'
 import { configurePlatform } from './platform'
 import { setupTitleBarMenu } from './titleBarMenu'
 import { defineScreenShare, defineGetDisplayMedia } from './screenShare'
-import { CommandLogout, CommandSelectWorkspace, CommandOpenSettings, CommandOpenInbox, CommandOpenPlanner, CommandOpenOffice, CommandOpenApplication, LaunchApplication } from './types'
+import { CommandLogout, CommandSelectWorkspace, CommandOpenSettings, CommandOpenInbox, CommandOpenPlanner, CommandOpenOffice, CommandOpenApplication, LaunchApplication, NotificationParams } from './types'
 import { ipcMainExposed } from './typesUtils'
 import { themeStore } from '@hcengineering/theme'
 
@@ -156,13 +159,46 @@ window.addEventListener('DOMContentLoaded', () => {
     navigate(parseLocation(urlObject))
   })
 
-  ipcMain.handleNotificationNavigation((application) => {
-    // For now navigate only to Inbox
+  function navigateToUrl (path: string): void {
     const frontUrl = getMetadata(presentation.metadata.FrontUrl) ?? window.location.origin
-    const location = getCurrentResolvedLocation()
-    const urlString = `${frontUrl}/${workbenchId}/${location.path[1]}/${application ?? notificationId}`
-    const urlObject = new URL(urlString)
+    const urlObject = new URL(`${frontUrl}/${path}`)
     navigate(parseLocation(urlObject))
+  }
+
+  function getBasicNotificationPath (notificationParams: NotificationParams): string {
+    return `${workbenchId}/${notificationParams.application ?? notificationId}/${notificationId}`
+  }
+
+  ipcMain.handleNotificationNavigation((notificationParams: NotificationParams) => {
+    // Support for new inbox with cardId (card-based)
+    if (notificationParams.cardId != null) {
+      const currentLocation = getCurrentResolvedLocation()
+      navigateToUrl(`${workbenchId}/${currentLocation.path[1]}/${inboxId}/${notificationParams.cardId}`)
+      return
+    }
+
+    // Support for old inbox with objectId + objectClass (legacy)
+    if (notificationParams.objectId != null && notificationParams.objectClass != null) {
+      const encodedObjectURI = encodeObjectURI(notificationParams.objectId, notificationParams.objectClass)
+      const notificationLocation = {
+        path: [workbenchId, notificationParams.application, notificationId, encodedObjectURI],
+        fragment: undefined,
+        query: {}
+      }
+
+      void resolveLocation(notificationLocation).then((resolvedLocation) => {
+        if (resolvedLocation?.loc != null) {
+          navigate(resolvedLocation.loc)
+        } else {
+          navigateToUrl(`${workbenchId}/${notificationParams.application}/${notificationId}/${encodedObjectURI}`)
+        }
+      }).catch(() => {
+        navigateToUrl(getBasicNotificationPath(notificationParams))
+      })
+    } else {
+      // Fallback to basic notification navigation
+      navigateToUrl(getBasicNotificationPath(notificationParams))
+    }
   })
 
   ipcMain.handleUpdateDownloadProgress((progress) => {

desktop/src/ui/notifications.ts

@@ -166,7 +166,10 @@ export function configureNotifications (): void {
             silent: !preferences.playSound,
             application: inboxId,
             title: notification.content.title,
-            body: `${notification.content.senderName}: ${notification.content.shortText}`
+            body: `${notification.content.senderName}: ${notification.content.shortText}`,
+            cardId: notification.cardId,
+            objectId: notification.content.objectId,
+            objectClass: notification.content.objectClass
           })
         }
       })
@@ -216,6 +219,8 @@ export function configureNotifications (): void {
           electronAPI.sendNotification({
             silent: !preferences.playSound,
             application: notificationId,
+            objectId: notification.objectId,
+            objectClass: notification.objectClass,
             ...notificationData
           })
         }

desktop/src/ui/preload.ts

@@ -145,8 +145,8 @@ const expose: IPCMainExposed = {
   },
 
   handleNotificationNavigation: (callback) => {
-    ipcRenderer.on('handle-notification-navigation', (event, application) => {
-      callback(application)
+    ipcRenderer.on('handle-notification-navigation', (event, notificationParams) => {
+      callback(notificationParams)
     })
   },
 

desktop/src/ui/types.ts

@@ -1,6 +1,7 @@
 import { DownloadItem } from '@hcengineering/desktop-downloads'
 import { ScreenSource } from '@hcengineering/love'
 import { Plugin } from '@hcengineering/platform'
+import { Ref, Class, Doc } from '@hcengineering/core'
 import { IpcRendererEvent } from 'electron'
 
 export interface Config {
@@ -95,6 +96,9 @@ export interface NotificationParams {
   body: string
   silent: boolean
   application: Plugin
+  cardId?: string
+  objectId?: Ref<Doc>
+  objectClass?: Ref<Class<Doc>>
 }
 
 export const MenuBarActions = ['settings', 'select-workspace', 'logout', 'exit', 'undo', 'redo', 'cut', 'copy', 'paste', 'delete', 'select-all', 'reload', 'force-reload', 'toggle-devtools'
@@ -121,7 +125,7 @@ export interface IPCMainExposed {
   branding: () => Promise<Branding>
   on: (event: string, op: (channel: any, args: any[]) => void) => void
   handleDeepLink: (callback: (url: string) => void) => void
-  handleNotificationNavigation: (callback: (application: Plugin) => void) => void
+  handleNotificationNavigation: (callback: (notificationParams: NotificationParams) => void) => void
   handleUpdateDownloadProgress: (callback: (progress: number) => void) => void
   setFrontCookie: (host: string, name: string, value: string) => Promise<void>
   dockBounce: () => void

plugins/view-resources/src/utils.ts

@@ -1578,7 +1578,7 @@ export async function parseLinkId<T extends Doc> (
 ): Promise<Ref<T>> {
   const hierarchy = getClient().getHierarchy()
   const provider =
-    providers.find(({ _id }) => id === _class) ?? providers.find(({ _id }) => hierarchy.isDerived(_class, _id))
+    providers.find(({ _id }) => _id === _class) ?? providers.find(({ _id }) => hierarchy.isDerived(_class, _id))
 
   if (provider === undefined) {
     return id as Ref<T>