From dfe7385611561ae19cc76ae035f70a36ec3934b7 Mon Sep 17 00:00:00 2001 From: RMidhunSuresh Date: Thu, 17 Jun 2021 14:22:48 +0530 Subject: [PATCH] Accommodate "rightpanel" navigation segment Signed-off-by: RMidhunSuresh --- src/domain/session/RoomGridViewModel.js | 1 + src/domain/session/leftpanel/LeftPanelViewModel.js | 7 ++++++- src/domain/session/room/RoomViewModel.js | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/domain/session/RoomGridViewModel.js b/src/domain/session/RoomGridViewModel.js index dddc603b..c0aa5a52 100644 --- a/src/domain/session/RoomGridViewModel.js +++ b/src/domain/session/RoomGridViewModel.js @@ -83,6 +83,7 @@ export class RoomGridViewModel extends ViewModel { let path = this.navigation.path.until("rooms"); path = path.with(this.navigation.segment("room", roomId)); if (detailsShown) { + path = path.with(this.navigation.segment("rightpanel", true)); path = path.with(this.navigation.segment("details", true)); } this.navigation.applyPath(path); diff --git a/src/domain/session/leftpanel/LeftPanelViewModel.js b/src/domain/session/leftpanel/LeftPanelViewModel.js index 061c640c..45f1f02b 100644 --- a/src/domain/session/leftpanel/LeftPanelViewModel.js +++ b/src/domain/session/leftpanel/LeftPanelViewModel.js @@ -93,8 +93,13 @@ export class LeftPanelViewModel extends ViewModel { } _pathForDetails(path) { + let _path = path; const details = this.navigation.path.get("details"); - return details?.value ? path.with(details) : path; + if (details?.value) { + _path = _path.with(this.navigation.segment("rightpanel")); + _path = _path.with(details) + } + return _path; } toggleGrid() { diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js index 38835db3..30dae699 100644 --- a/src/domain/session/room/RoomViewModel.js +++ b/src/domain/session/room/RoomViewModel.js @@ -290,6 +290,7 @@ export class RoomViewModel extends ViewModel { openDetailsPanel() { let path = this.navigation.path.until("room"); + path = path.with(this.navigation.segment("rightpanel", true)); path = path.with(this.navigation.segment("details", true)); this.navigation.applyPath(path); }