Skip to content

Commit 49d5b82

Browse files
committed
Ensure isEditingSubmission gets updated on route change
1 parent 96c2e6c commit 49d5b82

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

web/src/plugins/router.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ const router = new VueRouter({
5454
{
5555
component: StepperView,
5656
path: '',
57+
props: true,
5758
children: [
5859
{
5960
name: 'Submission root',

web/src/views/SubmissionPortal/StepperView.vue

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import OrcidId from '@/components/Presentation/OrcidId.vue';
66
77
import { stateRefs } from '@/store';
88
import { getSubmissionLockedBy } from './store';
9-
import { useRouter } from '@/use/useRouter';
109
import { unlockSubmission } from './store/api';
1110
1211
export default defineComponent({
@@ -19,9 +18,7 @@ export default defineComponent({
1918
},
2019
},
2120
22-
setup() {
23-
const router = useRouter();
24-
21+
setup(props) {
2522
const loggedInUserHasLock = computed(() => {
2623
const lockedByUser = getSubmissionLockedBy();
2724
if (!lockedByUser) {
@@ -33,17 +30,12 @@ export default defineComponent({
3330
return false;
3431
});
3532
36-
const isEditingSubmission = computed(() => {
37-
if (router) {
38-
return !!router.currentRoute.params.id;
39-
}
40-
return false;
41-
});
33+
const isEditingSubmission = computed(() => props.id !== null);
4234
4335
window.addEventListener('beforeunload', () => {
4436
if (isEditingSubmission.value) {
45-
if (router) {
46-
unlockSubmission(router.currentRoute.params.id);
37+
if (props.id) {
38+
unlockSubmission(props.id);
4739
}
4840
}
4941
});

0 commit comments

Comments
 (0)