Merge inbox (#10057)

Author: kristina-fefelova

common/config/rush/pnpm-lock.yaml

@@ -1 +1 @@
-"0.7.269"
+"0.7.278"

common/scripts/version.txt

@@ -266,6 +266,9 @@
     "@hcengineering/ai-assistant": "^0.7.0",
     "@hcengineering/ai-assistant-assets": "^0.7.0",
     "@hcengineering/ai-assistant-resources": "^0.7.0",
+    "@hcengineering/inbox": "^0.7.0",
+    "@hcengineering/inbox-assets": "^0.7.0",
+    "@hcengineering/inbox-resources": "^0.7.0",
     "electron-squirrel-startup": "~1.0.0",
     "dotenv": "~16.0.0",
     "electron-context-menu": "^4.0.4",

desktop/package.json

@@ -34,20 +34,22 @@ import {
 } from '@hcengineering/ui'
 import { handleDownloadItem } from '@hcengineering/desktop-downloads'
 import notification, { notificationId } from '@hcengineering/notification'
-import { chatId } from '@hcengineering/chat'
+import { inboxId } from '@hcengineering/inbox'
 import workbench, { workbenchId, logOut } from '@hcengineering/workbench'
 import view, { Action, encodeObjectURI } from '@hcengineering/view'
 import { resolveLocation } from '@hcengineering/notification-resources'
+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'
 
 import { isOwnerOrMaintainer, getCurrentAccount, Ref } 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, NotificationParams, CommandCloseTab } from './types'
 import { ipcMainExposed } from './typesUtils'
-import { themeStore, ThemeVariant } from '@hcengineering/theme'
-import type { Application } from '@hcengineering/workbench'
-import { isAllowedToRole } from '@hcengineering/workbench-resources'
 import { IpcMessage } from './ipcMessages'
 
 function currentOsIsWindows (): boolean {
@@ -197,39 +199,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]}/${chatId}/${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))
     }
   })
 

desktop/src/ui/index.ts

@@ -29,7 +29,7 @@ import workbench, { workbenchId } from '@hcengineering/workbench'
 import desktopPreferences, { defaultNotificationPreference } from '@hcengineering/desktop-preferences'
 import { activePreferences } from '@hcengineering/desktop-preferences-resources'
 import { getDisplayInboxData, InboxNotificationsClientImpl } from '@hcengineering/notification-resources'
-import { chatId } from '@hcengineering/chat'
+import { inboxId } from '@hcengineering/inbox'
 import communication from '@hcengineering/communication'
 import { ipcMainExposed } from './typesUtils'
 
@@ -179,7 +179,7 @@ export function configureNotifications (): void {
           notificationHistory.set(notification.id, notification.created.getTime())
           electronAPI.sendNotification({
             silent: !preferences.playSound,
-            application: chatId,
+            application: inboxId,
             title: notification.content.title,
             body: `${notification.content.senderName}: ${notification.content.shortText}`,
             cardId: notification.cardId,

desktop/src/ui/notifications.ts

@@ -76,6 +76,7 @@ import { viewId } from '@hcengineering/view'
 import workbench, { workbenchId } from '@hcengineering/workbench'
 import { mailId } from '@hcengineering/mail'
 import { chatId } from '@hcengineering/chat'
+import { inboxId } from '@hcengineering/inbox'
 import { achievementId } from '@hcengineering/achievement'
 import communication, { communicationId } from '@hcengineering/communication'
 import { emojiId } from '@hcengineering/emoji'
@@ -133,6 +134,7 @@ import '@hcengineering/view-assets'
 import '@hcengineering/workbench-assets'
 import '@hcengineering/mail-assets'
 import '@hcengineering/chat-assets'
+import '@hcengineering/inbox-assets'
 import '@hcengineering/achievement-assets'
 import '@hcengineering/emoji-assets'
 import '@hcengineering/media-assets'
@@ -256,6 +258,7 @@ function configureI18n (): void {
   addStringsLoader(cardId, async (lang: string) => await import(`@hcengineering/card-assets/lang/${lang}.json`))
   addStringsLoader(mailId, async (lang: string) => await import(`@hcengineering/mail-assets/lang/${lang}.json`))
   addStringsLoader(chatId, async (lang: string) => await import(`@hcengineering/chat-assets/lang/${lang}.json`))
+  addStringsLoader(inboxId, async (lang: string) => await import(`@hcengineering/inbox-assets/lang/${lang}.json`))
   addStringsLoader(processId, async (lang: string) => await import(`@hcengineering/process-assets/lang/${lang}.json`))
   addStringsLoader(achievementId, async (lang: string) => await import(`@hcengineering/achievement-assets/lang/${lang}.json`))
   addStringsLoader(communicationId, async (lang: string) => await import(`@hcengineering/communication-assets/lang/${lang}.json`))
@@ -433,6 +436,7 @@ export async function configurePlatform (onWorkbenchConnect?: () => Promise<void
   addLocation(surveyId, () => import(/* webpackChunkName: "survey" */ '@hcengineering/survey-resources'))
   addLocation(cardId, () => import(/* webpackChunkName: "card" */ '@hcengineering/card-resources'))
   addLocation(chatId, () => import(/* webpackChunkName: "chat" */ '@hcengineering/chat-resources'))
+  addLocation(inboxId, () => import(/* webpackChunkName: "inbox" */ '@hcengineering/inbox-resources'))
   addLocation(processId, () => import(/* webpackChunkName: "process" */ '@hcengineering/process-resources'))
   addLocation(achievementId, () => import(/* webpackChunkName: "achievement" */ '@hcengineering/achievement-resources'))
   addLocation(communicationId, () => import(/* webpackChunkName: "communication" */ '@hcengineering/communication-resources'))

desktop/src/ui/platform.ts

@@ -286,6 +286,9 @@
     "@hcengineering/ai-assistant": "^0.7.0",
     "@hcengineering/ai-assistant-assets": "^0.7.0",
     "@hcengineering/ai-assistant-resources": "^0.7.0",
+    "@hcengineering/inbox": "^0.7.0",
+    "@hcengineering/inbox-assets": "^0.7.0",
+    "@hcengineering/inbox-resources": "^0.7.0",
     "readable-stream": "^4.7.0",
     "svelte": "^4.2.20"
   }

dev/prod/package.json

@@ -73,7 +73,8 @@ import { mailId } from '@hcengineering/mail'
 import { chatId } from '@hcengineering/chat'
 import github, { githubId } from '@hcengineering/github'
 import { bitrixId } from '@hcengineering/bitrix'
-import { achievementId } from '@hcengineering/achievement'
+import {inboxId} from '@hcengineering/inbox'
+import {achievementId} from '@hcengineering/achievement'
 import communication, { communicationId } from '@hcengineering/communication'
 import { emojiId } from '@hcengineering/emoji'
 import billingPlugin, { billingId } from '@hcengineering/billing'
@@ -129,6 +130,7 @@ import '@hcengineering/media-assets'
 import '@hcengineering/view-assets'
 import '@hcengineering/workbench-assets'
 import '@hcengineering/chat-assets'
+import '@hcengineering/inbox-assets'
 import '@hcengineering/mail-assets'
 import '@hcengineering/github-assets'
 import '@hcengineering/achievement-assets'
@@ -387,6 +389,7 @@ function configureI18n (): void {
     communicationId,
     async (lang: string) => await import(`@hcengineering/communication-assets/lang/${lang}.json`)
   )
+  addStringsLoader(inboxId, async (lang: string) => await import(`@hcengineering/inbox-assets/lang/${lang}.json`))
   addStringsLoader(emojiId, async (lang: string) => await import(`@hcengineering/emoji-assets/lang/${lang}.json`))
   addStringsLoader(billingId, async (lang: string) => await import(`@hcengineering/billing-assets/lang/${lang}.json`))
   addStringsLoader(

dev/prod/src/platform.ts

@@ -23,7 +23,7 @@ import {
   type ViewAction,
   type ViewActionAvailabilityFunction
 } from '@hcengineering/view'
-import { type NotificationGroup, type NotificationType } from '@hcengineering/notification'
+import { type NotificationGroup } from '@hcengineering/notification'
 
 export default mergeIds(activityId, activity, {
   string: {
@@ -44,7 +44,6 @@ export default mergeIds(activityId, activity, {
   ids: {
     ReactionAddedActivityViewlet: '' as Ref<DocUpdateMessageViewlet>,
     ActivityNotificationGroup: '' as Ref<NotificationGroup>,
-    AddReactionNotification: '' as Ref<NotificationType>,
     AddReactionAction: '' as Ref<Action>,
     SaveForLaterAction: '' as Ref<Action>,
     RemoveFromLaterAction: '' as Ref<Action>,

models/activity/src/plugin.ts

@@ -133,6 +133,7 @@
     "@hcengineering/model-emoji": "^0.7.0",
     "@hcengineering/model-billing": "^0.7.0",
     "@hcengineering/model-huly-mail": "^0.7.0",
-    "@hcengineering/model-ai-assistant": "^0.7.0"
+    "@hcengineering/model-ai-assistant": "^0.7.0",
+    "@hcengineering/model-inbox": "^0.7.0"
   }
 }