, msg?: Acti
const name = (await getChannelName(object._id, object._class, object)) ?? (await translate(titleIntl, {}))
const tabName = await translate(chunter.string.ThreadIn, { name })
const loc = getCurrentLocation()
- const allowedPath = loc.path.join('/')
- const currentTAbs = get(sidebarStore).widgetsState.get(widget._id)?.tabs ?? []
- const tabsToClose = currentTAbs.filter((t) => t.isPinned !== true && t.allowedPath === allowedPath).map((t) => t.id)
+ if (loc.path[2] === chunterId || loc.path[2] === notificationId) {
+ loc.path[4] = message._id
+ }
+
+ const allowedPath = loc.path.join('/')
+ const currentTabs = get(sidebarStore).widgetsState.get(widget._id)?.tabs ?? []
+ const tabsToClose = currentTabs.filter((t) => t.isPinned !== true && t.allowedPath === allowedPath).map((t) => t.id)
if (tabsToClose.length > 0) {
sidebarStore.update((s) => {
diff --git a/plugins/notification-assets/lang/ru.json b/plugins/notification-assets/lang/ru.json
index ada9f03cc5..f46bcb90e7 100644
--- a/plugins/notification-assets/lang/ru.json
+++ b/plugins/notification-assets/lang/ru.json
@@ -11,7 +11,7 @@
"Remove": "Удалить нотификацию",
"RemoveAll": "Удалить все нотификации",
"MarkAllAsRead": "Отметить все нотификации как прочитанные",
- "MarkAsRead": "Отметить нотификация прочитанной",
+ "MarkAsRead": "Отметить прочитанным",
"MarkAsUnread": "Отметить непрочитанным",
"Archive": "Архивировать",
"Inbox": "Входящие",
diff --git a/plugins/notification-resources/src/components/DocNotifyContextCard.svelte b/plugins/notification-resources/src/components/DocNotifyContextCard.svelte
index 9c5b3fd89a..d9c8b7ef75 100644
--- a/plugins/notification-resources/src/components/DocNotifyContextCard.svelte
+++ b/plugins/notification-resources/src/components/DocNotifyContextCard.svelte
@@ -198,7 +198,7 @@
{
- dispatch('click', { context: value })
+ dispatch('click', { context: value, object })
}}
>
{#if isLoading}
@@ -266,7 +266,7 @@
on:click={(e) => {
e.preventDefault()
e.stopPropagation()
- dispatch('click', { context: value, notification: group[0] })
+ dispatch('click', { context: value, notification: group[0], object })
}}
/>
diff --git a/plugins/notification-resources/src/components/inbox/Inbox.svelte b/plugins/notification-resources/src/components/inbox/Inbox.svelte
index 079dce0cc1..5365b49ea1 100644
--- a/plugins/notification-resources/src/components/inbox/Inbox.svelte
+++ b/plugins/notification-resources/src/components/inbox/Inbox.svelte
@@ -256,7 +256,7 @@
const selectedNotification: InboxNotification | undefined = event?.detail?.notification
- void selectInboxContext(linkProviders, selectedContext, selectedNotification)
+ void selectInboxContext(linkProviders, selectedContext, selectedNotification, event?.detail.object)
}
async function updateSelectedPanel (selectedContext?: DocNotifyContext): Promise {
@@ -373,6 +373,7 @@
}
]
$: $deviceInfo.replacedPanel = replacedPanel
+
onDestroy(() => {
$deviceInfo.replacedPanel = undefined
unsubscribeLoc()
diff --git a/plugins/notification-resources/src/utils.ts b/plugins/notification-resources/src/utils.ts
index 1c7795dd7f..b3710c8675 100644
--- a/plugins/notification-resources/src/utils.ts
+++ b/plugins/notification-resources/src/utils.ts
@@ -583,7 +583,8 @@ export function resetInboxContext (): void {
export async function selectInboxContext (
linkProviders: LinkIdProvider[],
context: DocNotifyContext,
- notification?: WithLookup
+ notification?: WithLookup,
+ object?: Doc
): Promise {
const client = getClient()
const hierarchy = client.getHierarchy()
@@ -607,24 +608,42 @@ export async function selectInboxContext (
const message = (notification as WithLookup)?.$lookup?.attachedTo
if (objectClass === chunter.class.ThreadMessage) {
- const thread = await client.findOne(
- chunter.class.ThreadMessage,
- {
- _id: objectId as Ref
- },
- { projection: { _id: 1, attachedTo: 1 } }
- )
+ const thread =
+ object?._id === objectId
+ ? (object as ThreadMessage)
+ : await client.findOne(
+ chunter.class.ThreadMessage,
+ {
+ _id: objectId as Ref
+ },
+ { projection: { _id: 1, attachedTo: 1 } }
+ )
- void navigateToInboxDoc(linkProviders, objectId, objectClass, thread?.attachedTo, thread?._id)
+ void navigateToInboxDoc(
+ linkProviders,
+ thread?.objectId ?? objectId,
+ thread?.objectClass ?? objectClass,
+ thread?.attachedTo,
+ thread?._id
+ )
return
}
if (isReactionMessage(message)) {
const thread = loc.path[4] === objectId ? objectId : undefined
+ const reactedTo =
+ (object as ActivityMessage) ??
+ (await client.findOne(activity.class.ActivityMessage, { _id: message.attachedTo as Ref }))
+ const isThread = hierarchy.isDerived(reactedTo._class, chunter.class.ThreadMessage)
+ const channelId = isThread ? (reactedTo as ThreadMessage)?.objectId : reactedTo?.attachedTo ?? objectId
+ const channelClass = isThread
+ ? (reactedTo as ThreadMessage)?.objectClass
+ : reactedTo?.attachedToClass ?? objectClass
+
void navigateToInboxDoc(
linkProviders,
- objectId,
- objectClass,
+ channelId,
+ channelClass,
thread as Ref,
objectId as Ref
)
@@ -633,11 +652,13 @@ export async function selectInboxContext (
const selectedMsg = (notification as ActivityInboxNotification)?.attachedTo
const thread = selectedMsg !== objectId ? objectId : loc.path[4] === objectId ? objectId : undefined
+ const channelId = (object as ActivityMessage)?.attachedTo ?? message?.attachedTo ?? objectId
+ const channelClass = (object as ActivityMessage)?.attachedToClass ?? message?.attachedToClass ?? objectClass
void navigateToInboxDoc(
linkProviders,
- objectId,
- objectClass,
+ channelId,
+ channelClass,
thread as Ref,
selectedMsg ?? (objectId as Ref)
)
diff --git a/plugins/tracker-resources/src/components/issues/IssuesView.svelte b/plugins/tracker-resources/src/components/issues/IssuesView.svelte
index a631ef50e0..d92449af9d 100644
--- a/plugins/tracker-resources/src/components/issues/IssuesView.svelte
+++ b/plugins/tracker-resources/src/components/issues/IssuesView.svelte
@@ -28,7 +28,7 @@
$: if (query) updateSearchQuery(search)
let resultQuery: DocumentQuery = { ...searchQuery }
- $: if (!label && title) {
+ $: if (title) {
void translate(title, {}, $themeStore.language).then((res) => {
label = res
})
diff --git a/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte b/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte
index 7209b04357..880d765e1d 100644
--- a/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte
+++ b/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte
@@ -24,7 +24,7 @@
Breadcrumbs,
getCurrentLocation
} from '@hcengineering/ui'
- import { onDestroy } from 'svelte'
+ import { onDestroy, onMount } from 'svelte'
import { closeWidgetTab, sidebarStore, SidebarVariant, WidgetState, openWidgetTab, closeWidget } from '../../sidebar'
import WidgetsBar from './widgets/WidgetsBar.svelte'
@@ -46,36 +46,15 @@
$: widgetState = widget !== undefined ? $sidebarStore.widgetsState.get(widget._id) : undefined
$: tabId = widgetState?.tab
- $: tabs = getTabs(widget, widgetState)
+ $: tabs = widgetState?.tabs ?? []
$: tab = tabId !== undefined ? tabs.find((it) => it.id === tabId) ?? tabs[0] : tabs[0]
$: if ($sidebarStore.widget === undefined) {
sidebarStore.update((s) => ({ ...s, variant: SidebarVariant.MINI }))
}
- function getTabs (widget?: Widget, state?: WidgetState): WidgetTab[] {
- if (widget === undefined || !state?.tabs) return []
- const loc = getCurrentLocation()
-
- const result: WidgetTab[] = []
- for (const tab of state.tabs) {
- if (tab.allowedPath !== undefined && !tab.isPinned) {
- const path = loc.path.join('/')
- if (!path.startsWith(tab.allowedPath)) {
- void handleTabClose(tab.id, widget)
- continue
- }
- }
-
- result.push(tab)
- }
-
- return result
- }
-
- const unsubscribe = locationStore.subscribe((loc: Location) => {
+ function closeWrongTabs (loc: Location): void {
if (widget === undefined) return
-
for (const tab of tabs) {
if (tab.allowedPath !== undefined && !tab.isPinned) {
const path = loc.path.join('/')
@@ -84,6 +63,14 @@
}
}
}
+ }
+
+ const unsubscribe = locationStore.subscribe((loc: Location) => {
+ closeWrongTabs(loc)
+ })
+
+ onMount(() => {
+ closeWrongTabs(getCurrentLocation())
})
onDestroy(() => {
diff --git a/plugins/workbench-resources/src/sidebar.ts b/plugins/workbench-resources/src/sidebar.ts
index 8bf9a40e1b..ee1ff76cdd 100644
--- a/plugins/workbench-resources/src/sidebar.ts
+++ b/plugins/workbench-resources/src/sidebar.ts
@@ -203,7 +203,6 @@ export function openWidgetTab (widget: Ref, tab: string): void {
}
export function createWidgetTab (widget: Widget, tab: WidgetTab, newTab = false): void {
- openWidget(widget)
const state = get(sidebarStore)
const { widgetsState } = state
const widgetState = widgetsState.get(widget._id)
@@ -225,6 +224,7 @@ export function createWidgetTab (widget: Widget, tab: WidgetTab, newTab = false)
}
widgetsState.set(widget._id, {
+ ...widgetState,
_id: widget._id,
tabs: newTabs,
tab: tab.id
@@ -232,7 +232,9 @@ export function createWidgetTab (widget: Widget, tab: WidgetTab, newTab = false)
sidebarStore.set({
...state,
- widgetsState
+ widget: widget._id,
+ widgetsState,
+ variant: SidebarVariant.EXPANDED
})
}