Skip to content

Commit e63d501

Browse files
Fix tabs nav (#6898)
Signed-off-by: Kristina Fefelova <[email protected]>
1 parent b5c82bc commit e63d501

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

plugins/view-resources/src/components/navigator/NavLink.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
if (last != null) {
3939
try {
4040
const newLocation: Location = JSON.parse(last)
41-
if (newLocation.path[2] === app && newLocation.path[3] != null) {
41+
if (newLocation.path[1] === loc.path[1] && newLocation.path[2] === app && newLocation.path[3] != null) {
4242
return newLocation
4343
}
4444
} catch (e) {

plugins/workbench-resources/src/components/Workbench.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
const query = createQuery()
176176
$: query.query(
177177
workbench.class.WorkbenchTab,
178-
{},
178+
{ attachedTo: account._id },
179179
(res) => {
180180
tabs = res
181181
tabsStore.set(tabs)
@@ -788,7 +788,7 @@
788788
/>
789789
</div>
790790
<!-- <ActivityStatus status="active" /> -->
791-
<NavLink app={notificationId} shrink={0} restoreLastLocation>
791+
<NavLink app={notificationId} shrink={0}>
792792
<AppItem
793793
icon={notification.icon.Notifications}
794794
label={notification.string.Inbox}

plugins/workbench-resources/src/workbench.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ export async function createTab (): Promise<void> {
199199
try {
200200
const last = localStorage.getItem(`${locationStorageKeyId}_${notificationId}`)
201201
const lastLocation: Location | undefined = last != null ? JSON.parse(last) : undefined
202-
if (lastLocation != null && lastLocation.path[2] === notificationId) {
202+
if (lastLocation != null && lastLocation.path[1] === loc.path[1] && lastLocation.path[2] === notificationId) {
203203
defaultUrl = locationToUrl(lastLocation)
204204
}
205205
} catch (e) {

0 commit comments

Comments
 (0)