wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-06-08 17:00:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix tabs nav (#6898)

Browse Source 
Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
This commit is contained in:
Kristina 2024-10-12 21:33:54 +04:00 committed by GitHub
parent b5c82bcb82
commit e63d50130b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/view-resources/src/components/navigator/NavLink.svelte
View File

@ -38,7 +38,7 @@
if (last != null) { if (last != null) {
try { try {
const newLocation: Location = JSON.parse(last) const newLocation: Location = JSON.parse(last)
if (newLocation.path[2] === app && newLocation.path[3] != null) { if (newLocation.path[1] === loc.path[1] && newLocation.path[2] === app && newLocation.path[3] != null) {
return newLocation return newLocation
} }
} catch (e) { } catch (e) {

4
plugins/workbench-resources/src/components/Workbench.svelte
View File

@ -175,7 +175,7 @@
const query = createQuery() const query = createQuery()
$: query.query( $: query.query(
workbench.class.WorkbenchTab, workbench.class.WorkbenchTab,
{}, { attachedTo: account._id },
(res) => { (res) => {
tabs = res tabs = res
tabsStore.set(tabs) tabsStore.set(tabs)
@ -788,7 +788,7 @@
/> />
</div> </div>
<!-- <ActivityStatus status="active" /> --> <!-- <ActivityStatus status="active" /> -->
<NavLink app={notificationId} shrink={0} restoreLastLocation> <NavLink app={notificationId} shrink={0}>
<AppItem <AppItem
icon={notification.icon.Notifications} icon={notification.icon.Notifications}
label={notification.string.Inbox} label={notification.string.Inbox}

2
plugins/workbench-resources/src/workbench.ts
View File

@ -199,7 +199,7 @@ export async function createTab (): Promise<void> {
try { try {
const last = localStorage.getItem(`${locationStorageKeyId}_${notificationId}`) const last = localStorage.getItem(`${locationStorageKeyId}_${notificationId}`)
const lastLocation: Location | undefined = last != null ? JSON.parse(last) : undefined const lastLocation: Location | undefined = last != null ? JSON.parse(last) : undefined
if (lastLocation != null && lastLocation.path[2] === notificationId) { if (lastLocation != null && lastLocation.path[1] === loc.path[1] && lastLocation.path[2] === notificationId) {
defaultUrl = locationToUrl(lastLocation) defaultUrl = locationToUrl(lastLocation)
} }
} catch (e) { } catch (e) {