Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BC-4550 - Browser back on page Tools does not lead to previous page #2889

Merged
merged 21 commits into from
Nov 6, 2023
Merged

BC-4550 - Browser back on page Tools does not lead to previous page #2889

Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2b932e7
fix broken component when coming from browser back button press
davwas Oct 26, 2023
453fdc4
fix broken component when coming from browser back button press v3
davwas Oct 26, 2023
ff0a3aa
log component state
davwas Oct 27, 2023
16a9c83
try updating whole wireframe
davwas Oct 27, 2023
5560323
try pageshow event
davwas Oct 27, 2023
26ff21a
try setting active tab on page mount
davwas Oct 27, 2023
9d1ee7e
set active tab if page was served from cache
davwas Oct 27, 2023
46fb681
catch router exception
davwas Oct 27, 2023
f6ab86d
uncomment code
davwas Oct 27, 2023
743ffb3
Merge branch 'main' into BC-4550-browser-back-on-tools-page
davwas Oct 27, 2023
081b13b
try forcing update
davwas Oct 27, 2023
4c745a9
try another fix
davwas Oct 28, 2023
6d90096
add pageshow listener back
davwas Oct 28, 2023
889a612
Merge branch 'main' into BC-4550-browser-back-on-tools-page
davwas Oct 30, 2023
b8b23b0
Merge branch 'main' into BC-4550-browser-back-on-tools-page
davwas Oct 30, 2023
ce991e6
remove comments
davwas Nov 2, 2023
b05dbe8
Merge remote-tracking branch 'origin/BC-4550-browser-back-on-tools-pa…
davwas Nov 2, 2023
5f0a0c8
remove error throwing
davwas Nov 2, 2023
36a022d
remove catch block
davwas Nov 2, 2023
147e39e
Merge branch 'main' into BC-4550-browser-back-on-tools-page
wiaderwek Nov 2, 2023
ec5eed7
Merge branch 'main' into BC-4550-browser-back-on-tools-page
davwas Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/pages/rooms/RoomDetails.page.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ export default defineComponent({
},
},
async created() {
if (this.$route.query && this.$route.query.tab) {
if (this.$route.query?.tab) {
this.setActiveTab(this.$route.query.tab);
}

Expand All @@ -419,7 +419,22 @@ export default defineComponent({

document.title = buildPageTitle(this.roomData.title);
},
mounted() {
window.addEventListener("pageshow", this.setActiveTabIfPageCached);
},
beforeDestroy() {
window.removeEventListener("pageshow", this.setActiveTabIfPageCached);
},
methods: {
setActiveTabIfPageCached(event) {
if (event.persisted) {
if (this.$route.query?.tab) {
this.setActiveTab(this.$route.query.tab);
} else {
this.setActiveTab("learn-content");
}
}
},
setActiveTab(tabName) {
const index = this.tabItems.findIndex(
(tabItem) => tabItem.name === tabName
Expand Down Expand Up @@ -494,7 +509,7 @@ export default defineComponent({
watch: {
tabIndex(newIndex) {
if (newIndex >= 0 && newIndex < this.tabItems.length) {
this.$router.replace({
this.$router.push({
query: { ...this.$route.query, tab: this.tabItems[newIndex].name },
});
}
Expand Down
Loading