krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Task page : task filters (#9898)"

Browse Source 
This reverts commit 9919faeed8.
This commit is contained in:
Matteo Pagliazzi
2018-02-22 12:28:24 +01:00
parent deaf7fee81
commit d5e4be85e9
9 changed files with 127 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
website/client/store/getters/tasks.js
View File

@@ -1,11 +1,5 @@
import { shouldDo } from 'common/script/cron';
// Library / Utility function
import { orderSingleTypeTasks } from 'client/libs/store/helpers/orderTasks.js';
import { getActiveFilter } from 'client/libs/store/helpers/filterTasks.js';
import sortBy from 'lodash/sortBy';
// Return all the tags belonging to an user task
export function getTagsFor (store) {
return (task) => {
@@ -115,48 +109,3 @@ export function getTaskClasses (store) {
}
};
}
// Returns all list for given task type
export function getUnfilteredTaskList ({state}) {
return (type) => state.tasks.data[`${type}s`];
}
// Returns filtered, sorted, ordered, tag filtered, and search filtered task list
// @TODO: sort task list based on used preferences
export function getFilteredTaskList ({state, getters}) {
return ({
type,
filterType = '',
}) => {
// get requested tasks
// check if task list has been passed as override props
// assumption: type will always be passed as param
let requestedTasks = getters['tasks:getUnfilteredTaskList'](type);
let userPreferences = state.user.data.preferences;
let taskOrderForType = state.user.data.tasksOrder[type];
// order tasks based on user set task order
// Still needs unit test for this..
if (requestedTasks.length > 0 && ['scheduled', 'due'].indexOf(filterType.label) === -1) {
requestedTasks = orderSingleTypeTasks(requestedTasks, taskOrderForType);
}
// filter requested tasks by filter type
let selectedFilter = getActiveFilter(type, filterType);
// @TODO find a way (probably thru currying) to implicitly pass user preference data to task filters
if (type === 'daily' && (filterType === 'due' || filterType === 'notDue')) {
selectedFilter = {
...selectedFilter,
filterFn: selectedFilter.filterFn(userPreferences),
};
}
requestedTasks = requestedTasks.filter(selectedFilter.filterFn);
if (selectedFilter.sort) {
requestedTasks = sortBy(requestedTasks, selectedFilter.sort);
}
return requestedTasks;
};
}