Skip to content

Avoid duplicate GET activity in activity view #7194

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

Merged
merged 4 commits into from
Apr 12, 2025
Merged

Avoid duplicate GET activity in activity view #7194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e76645
Avoid duplicate GET activity
simfeld Apr 11, 2025
2414059
Move activity reload into scheduleEntryRouteChange
simfeld Apr 12, 2025
9f022eb
No await for activity reload
simfeld Apr 12, 2025
745ee8a
lint
simfeld Apr 12, 2025
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
3 changes: 1 addition & 2 deletions frontend/src/components/activity/ScheduleEntry.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,7 @@ export default {
await this.scheduleEntry.activity()._meta.load // wait if activity is being loaded as part of a collection
this.loading = false

// to avoid stale data, trigger reload (which includes embedded contentNode data). However, don't await in order to render early with cached data.
this.scheduleEntry.activity().$reload()
// no refresh of activity here because the requireActivityScheduleEntry guard already does a refresh
},

methods: {
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/helpers/scheduleEntryRouteChange.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ export default async function scheduleEntryRouteChange(activity, to, from, next)
to.params.scheduleEntryId !== from.params.scheduleEntryId ||
to.params.activityId !== from.params.activityId
) {
apiStore.get().activities({ id: to.params.activityId }).$reload()
// activity reload doesn't need to be awaited, but for scheduleEntry we want to
// ensure it exists and otherwise reroute
return await apiStore
.get()
.scheduleEntries({ id: to.params.scheduleEntryId })
Expand Down
Loading