krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

reload completed tasks after resync is finished - always reload completed tasks (#10614)

Browse Source
This commit is contained in:
negue
2018-08-24 22:04:59 +02:00
committed by Sabe Jones
parent ba307af963
commit 6fb9030b96
3 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/client/components/header/menu.vue
View File

@@ -396,12 +396,13 @@ export default {
toggleUserDropdown () { toggleUserDropdown () {
this.isUserDropdownOpen = !this.isUserDropdownOpen; this.isUserDropdownOpen = !this.isUserDropdownOpen;
}, },
sync () { async sync () {
this.$root.$emit('habitica::resync-requested'); this.$root.$emit('habitica::resync-requested');
return Promise.all([ await Promise.all([
this.$store.dispatch('user:fetch', {forceLoad: true}), this.$store.dispatch('user:fetch', {forceLoad: true}),
this.$store.dispatch('tasks:fetchUserTasks', {forceLoad: true}), this.$store.dispatch('tasks:fetchUserTasks', {forceLoad: true}),
]); ]);
this.$root.$emit('habitica::resync-completed');
}, },
async getUserGroupPlans () { async getUserGroupPlans () {
this.$store.state.groupPlans = await this.$store.dispatch('guilds:getGroupPlans'); this.$store.state.groupPlans = await this.$store.dispatch('guilds:getGroupPlans');

4
website/client/components/tasks/column.vue
View File

@@ -449,9 +449,9 @@ export default {
}); });
if (this.type !== 'todo') return; if (this.type !== 'todo') return;
this.$root.$on('habitica::resync-requested', () => { this.$root.$on('habitica::resync-completed', () => {
if (this.activeFilter.label !== 'complete2') return; if (this.activeFilter.label !== 'complete2') return;
this.loadCompletedTodos(true); this.loadCompletedTodos();
}); });
}, },
destroyed () { destroyed () {

15
website/client/store/actions/tasks.js
View File

@@ -19,13 +19,13 @@ export function fetchUserTasks (store, options = {}) {
}); });
} }
export async function fetchCompletedTodos (store, forceLoad = false) { export async function fetchCompletedTodos (store) {
// Wait for the user to be loaded before deserializing // Wait for the user to be loaded before deserializing
// because user.tasksOrder is necessary // because user.tasksOrder is necessary
await store.dispatch('tasks:fetchUserTasks'); await store.dispatch('tasks:fetchUserTasks');
const loadStatus = store.state.completedTodosStatus; const loadStatus = store.state.completedTodosStatus;
if (loadStatus === 'NOT_LOADED' || forceLoad) { if (loadStatus !== 'LOADING') {
store.state.completedTodosStatus = 'LOADING'; store.state.completedTodosStatus = 'LOADING';
const response = await axios.get('/api/v4/tasks/user?type=completedTodos'); const response = await axios.get('/api/v4/tasks/user?type=completedTodos');
@@ -36,17 +36,6 @@ export async function fetchCompletedTodos (store, forceLoad = false) {
tasks.todos.push(...completedTodos); tasks.todos.push(...completedTodos);
store.state.completedTodosStatus = 'LOADED'; store.state.completedTodosStatus = 'LOADED';
} else if (status === 'LOADED') {
return;
} else if (loadStatus === 'LOADING') {
const watcher = store.watch(state => state.completedTodosStatus, (newLoadingStatus) => {
watcher(); // remove the watcher
if (newLoadingStatus === 'LOADED') {
return;
} else {
throw new Error(); // TODO add reason?
}
});
} }
} }