Add fixes

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>

Author: kristina-fefelova

desktop/src/ui/index.ts

@@ -32,6 +32,8 @@ import { ipcMainExposed } from './typesUtils'
 import { themeStore, ThemeVariant } from '@hcengineering/theme'
 import type { Application } from '@hcengineering/workbench'
 import { isAllowedToRole } from '@hcengineering/workbench-resources'
+import card from '@hcengineering/card'
+import communication from '@hcengineering/communication'
 
 function currentOsIsWindows (): boolean {
   return (window as any).windowsPlatform === true
@@ -178,39 +180,44 @@ window.addEventListener('DOMContentLoaded', () => {
     navigate(parseLocation(urlObject))
   }
 
-  function getBasicNotificationPath (notificationParams: NotificationParams): string {
-    return `${workbenchId}/${notificationParams.application ?? notificationId}/${notificationId}`
+  function getBasicNotificationPath (worksapce: string, app: string): string {
+    return `${workbenchId}/${worksapce}/${app}`
   }
 
   ipcMain.handleNotificationNavigation((notificationParams: NotificationParams) => {
+    const currentLocation = getCurrentResolvedLocation()
+    const workspace = currentLocation.path[1]
     // Support for new inbox with cardId (card-based)
     if (notificationParams.cardId != null) {
-      const currentLocation = getCurrentResolvedLocation()
-      navigateToUrl(`${workbenchId}/${currentLocation.path[1]}/${inboxId}/${notificationParams.cardId}`)
+      const objectUri = encodeObjectURI(notificationParams.cardId, card.class.Card)
+      navigateToUrl(`${workbenchId}/${workspace}/${inboxId}/${objectUri}`)
       return
     }
 
+    const isCommunicationEnabled = getMetadata(communication.metadata.Enabled) ?? false
+    const app = isCommunicationEnabled ? inboxId : notificationParams.application
+
     // 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],
+        path: [workbenchId, workspace, app, encodedObjectURI],
         fragment: undefined,
-        query: {}
+        query: undefined
       }
 
       void resolveLocation(notificationLocation).then((resolvedLocation) => {
         if (resolvedLocation?.loc != null) {
           navigate(resolvedLocation.loc)
         } else {
-          navigateToUrl(`${workbenchId}/${notificationParams.application}/${notificationId}/${encodedObjectURI}`)
+          navigateToUrl(`${workbenchId}/${workspace}/${app}/${encodedObjectURI}`)
         }
       }).catch(() => {
-        navigateToUrl(getBasicNotificationPath(notificationParams))
+        navigateToUrl(getBasicNotificationPath(workspace, app))
       })
     } else {
       // Fallback to basic notification navigation
-      navigateToUrl(getBasicNotificationPath(notificationParams))
+      navigateToUrl(getBasicNotificationPath(workspace, app))
     }
   })
 

plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte

@@ -58,7 +58,6 @@
   export let embedded: boolean = false
   export let readonly: boolean = false
 
-  $: console.log(_id, _class)
   let lastId: Ref<Issue> | undefined
 
   const queryClient = createQuery()

pods/server/src/__start.ts

@@ -13,7 +13,7 @@ import { setDBExtraOptions } from '@hcengineering/postgres'
 import { serverConfigFromEnv } from '@hcengineering/server'
 import serverAiBot from '@hcengineering/server-ai-bot'
 import serverCalendar from '@hcengineering/server-calendar'
-import serverCard from '@hcengineering/Server-card'
+import serverCard from '@hcengineering/server-card'
 import serverCore, {
   initStatisticsContext,
   loadBrandingMap,