mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-19 15:48:04 +01:00
Add API Call to bulk score tasks (#11389)
* Add new API call to complete multiple task scorings in one call * Improve API response * Improve saving process * Improve handling for multiple tasks scored at once * Handle challenge task errors better * Improve check for alias * Improve check for task scorings * Fix merge errors * make nodemon ignore content_cache * Fix completing group tasks * fix test * fix tests (again) * typo * WIP(a11y): task modal updates * fix(tasks): borders in modal * fix(tasks): circley locks * fix(task-modal): placeholders * WIP(task-modal): disabled states, hide empty options, +/- restyle * fix(task-modal): box shadows instead of borders, habit control pointer * fix(task-modal): button states? * fix(modal): tighten up layout, new spacing utils * fix(tasks): more stylin * fix(tasks): habit hovers * fix(css): checklist labels, a11y colors * fix(css): one more missed hover issue * fix(css): lock Challenges, label fixes * fix(css): scope input/textarea changes * fix(style): task tweakies * fix(style): more button fixage * WIP(component): start select list story * working example of a templated selectList * fix(style): more button corrections * fix(lint): EOL * fix(buttons): factor btn-secondary to better override Bootstrap * fix(styles): standardize more buttons * wip: difficulty select - style fixes * selectDifficulty works! 🎉 - fix styles * change the dropdown-item sizes only for the selectList ones * selectTranslatedArray * changed many label margins * more correct dropdown style * fix(modals): button corrections * input-group styling + datetime picker without today button * Style/margins for "repeat every" - extract selectTag.vue * working tag-selection / update - cleanup * fix stories * fix svg color on create modal (purple) * fix task modal bottom padding * correct dropdown shadow * update dropdown-toggle caret size / color * fixed checklist style * sync checked state * selectTag padding * fix spacing between positive/negative streak inputs * toggle-checkbox + fix some spacings * disable repeat-on when its a groupTask * fix new checklist-item * fix toggle-checkbox style - fix difficulty style * fix checklist ui * add tags label , when there arent any tags selected * WORKING select-tag component 🎉 * fix taglist story * show max 5 items in tag dropdown + "X more" label * fix datetime clear button * replace m-b-xs to mb-1 (bootstrap) - fix input-group-text style * fix styles of advanced settings * fix delete task styles * always show grippy on hover of the item * extract modal-text-input mixin + fix the borders/dropshadow * fix(spacing): revert most to Bootstrap * feat(checklists): make local copy of master checklist non-editable also aggressively update checklists because they weren't syncing?? * fix(checklists): handle add/remove options better * feat(teams): manager notes field * fix select/dropdown styles * input border + icon colors * delete task underline color * fix checklist "delete icon" vertical position * selectTag fixes - normal open/close toggle working again - remove icon color * fixing icons: Trash can - Delete Little X - Remove Big X - Close Block - Block * fix taglist margins / icon sizes * wip margin overview (in storybook) * fix routerlink * remove unused method * new selectTag style + add markdown inside tagList + scrollable tag selection * fix selectTag / selectList active border * fix difficulty select (svg default color) * fix input padding-left + fix reset habit streak fullwidth / padding + "repeat every" gray text (no border) * feat(teams): improved approval request > approve > reward flow * fix(tests): address failures * fix(lint): oops only * fix(tasks): short-circuit group related logic * fix(tasks): more short circuiting * fix(tasks): more lines, less lint * fix(tasks): how do i keep missing these * feat(teams): provide assigning user summary * fix(teams): don't attempt to record assiging user if not supplied * fix advanced-settings styling / margin * fix merge + hide advanced streak settings when none enabled * fix styles * set Roboto font for advanced settings * Add Challenge flag to the tag list * add tag with enter, when no other tag is found * fix styles + tag cancel button * refactor footer / margin * split repeat fields into option mt-3 groups * button all the things * fix(tasks): style updates * no hover state for non-editable tasks on team board * keep assign/claim footer on task after requesting approval * disable more fields on user copy of team task, and remove hover states for them * fix(tasks): functional revisions * "Claim Rewards" instead of "x" in task approved notif * Remove default transition supplied by Bootstrap, apply individually to some elements * Delete individual tasks and related notifications when master task deleted from team board * Manager notes now save when supplied at task initial creation * Can no longer dismiss rewards from approved task by hitting Dismiss All * fix(tasks): clean tasksOrder also adjust related test expectation * fix(tests): adjust integration expectations * fix(test): ratzen fratzen only * fix lint * fix tests * fix(teams): checklist, notes * handleSharedCompletion: handle error, make sure it is run after the user task has been saved * fix typo * correctly handle errors in handleSharedCompletion when approving a task * fix(teams): improve disabled states * handleSharedCompletion: do not increase completions by 1 manually to adjust for last approval not saved yet * revert changes to config.json.example * fix(teams): more style fixage * add unit tests for findMultipleByIdOrAlias * exclude api v4 route from apidocs * BREAKING(teams): return 202 instead of 401 for approval request * fix(teams): better taskboard sync also re-re-fix checklist borders * scoreTasks: validate body * fix tests, move string to api errors * fix(tests): update expectations for breaking change * start updating api docs, process tasks sequentially to avoid conflicts with user._tmp * do not crash entire bulk operation in case of errors * save task only if modified * fix lint * undo changes to error handling: either all tasks scoring are successfull or none * remove stale code * do not return user._tmp when bulk scoring, it would be the last version only * make sure user._tmp.leveledUp is not lost when bulk scoring * rewards tests * mixed tests * fix tests, allow scoring the same task multiple times * finish integration tests * fix api docs for the bulk score route * refactor(task-modal): lockable label component * wip loading spinner * refactor(teams): move task scoring to mixin * fix(teams): style corrections * fix(btn): fix padding to have height of 32px * implement loading spinner * remove console.log warnings * fix(tasks): spacing and wording corrections * fix(teams): don't bork manager notes * fix(teams): assignment fix and more approval flow revisions * WIP(teams): use tag dropdown control for assignment * finish merge - never throw an error when a group task requires approval (wip - needs tests) * fix taskModal merge * fix merge * fix(task modal): add newline * fix(column.vue): add newline at end of file * mvp yesterdaily modal * fix tests * fix api docs for bulk scoring group tasks * separate task scoring and _tmp handling * handle _tmp when bulk scoring * rya: close modal before calling cron API, prevents issues with modals * rya: fix conflicts with other modals * add sounds, support for group plans, analytics * use asyncResource for group plans * fix lint * streak bonus: add comment about missing in rya * move yesterdailyModal * fix issues with level up modals and rya * add comments for future use, fix level up modals not showing up at levels with a quest drop * handle errors in rya modal * bundle quest and crit notifications Co-authored-by: Phillip Thelen <phillip@habitica.com> Co-authored-by: Phillip Thelen <viirus@pherth.net> Co-authored-by: Sabe Jones <sabrecat@gmail.com> Co-authored-by: negue <eugen.bolz@gmail.com>
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
import axios from 'axios';
|
||||
import Vue from 'vue';
|
||||
|
||||
import * as Analytics from '@/libs/analytics';
|
||||
@@ -15,29 +14,24 @@ export default {
|
||||
}),
|
||||
},
|
||||
methods: {
|
||||
async taskScore (task, direction) {
|
||||
if (this.castingSpell) return;
|
||||
async beforeTaskScore (task) {
|
||||
const { user } = this;
|
||||
|
||||
const Content = this.$store.state.content;
|
||||
if (this.castingSpell) return;
|
||||
|
||||
if (task.group.approval.required && !task.group.approval.approved) {
|
||||
task.group.approval.requested = true;
|
||||
const groupResponse = await axios.get(`/api/v4/groups/${task.group.id}`);
|
||||
const managers = Object.keys(groupResponse.data.data.managers);
|
||||
managers.push(groupResponse.data.data.leader._id);
|
||||
if (managers.indexOf(user._id) !== -1) {
|
||||
task.group.approval.approved = true;
|
||||
const { data: groupPlans } = await this.$store.dispatch('guilds:getGroupPlans');
|
||||
const groupPlan = groupPlans.find(g => g.id === task.group.id);
|
||||
if (groupPlan) {
|
||||
const managers = Object.keys(groupPlan.managers);
|
||||
managers.push(groupPlan.leader);
|
||||
if (managers.indexOf(user._id) !== -1) {
|
||||
task.group.approval.approved = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
scoreTask({ task, user, direction });
|
||||
} catch (err) {
|
||||
this.text(err.message);
|
||||
return;
|
||||
}
|
||||
|
||||
},
|
||||
playTaskScoreSound (task, direction) {
|
||||
switch (task.type) { // eslint-disable-line default-case
|
||||
case 'habit':
|
||||
this.$root.$emit('playSound', direction === 'up' ? 'Plus_Habit' : 'Minus_Habit');
|
||||
@@ -52,15 +46,40 @@ export default {
|
||||
this.$root.$emit('playSound', 'Reward');
|
||||
break;
|
||||
}
|
||||
},
|
||||
async taskScore (task, direction) {
|
||||
const { user } = this;
|
||||
|
||||
await this.beforeTaskScore(task);
|
||||
|
||||
try {
|
||||
scoreTask({ task, user, direction });
|
||||
} catch (err) {
|
||||
this.text(err.message);
|
||||
return;
|
||||
}
|
||||
|
||||
this.playTaskScoreSound(task, direction);
|
||||
|
||||
Analytics.updateUser();
|
||||
const response = await axios.post(`/api/v4/tasks/${task._id}/score/${direction}`);
|
||||
// used to notify drops, critical hits and other bonuses
|
||||
const tmp = response.data.data._tmp || {};
|
||||
const { crit } = tmp;
|
||||
const { drop } = tmp;
|
||||
const { firstDrops } = tmp;
|
||||
const { quest } = tmp;
|
||||
const response = await this.$store.dispatch('tasks:score', {
|
||||
taskId: task._id,
|
||||
direction,
|
||||
});
|
||||
|
||||
this.handleTaskScoreNotifications(response.data.data._tmp || {});
|
||||
},
|
||||
async handleTaskScoreNotifications (tmpObject = {}) {
|
||||
const { user } = this;
|
||||
const Content = this.$store.state.content;
|
||||
|
||||
// _tmp is used to notify drops, critical hits and other bonuses
|
||||
const {
|
||||
crit,
|
||||
drop,
|
||||
firstDrops,
|
||||
quest,
|
||||
} = tmpObject;
|
||||
|
||||
if (crit) {
|
||||
const critBonus = crit * 100 - 100;
|
||||
@@ -126,6 +145,9 @@ export default {
|
||||
} else if (drop.type === 'Quest') {
|
||||
// TODO $rootScope.selectedQuest = Content.quests[drop.key];
|
||||
// $rootScope.openModal('questDrop', {controller:'PartyCtrl', size:'sm'});
|
||||
// NOTE if a modal is shown again for quest drops
|
||||
// this code will likely need changes, see the NOTE
|
||||
// https://github.com/HabitRPG/habitica/blob/develop/website/client/src/components/notifications.vue#L640-L646
|
||||
} else {
|
||||
// Keep support for another type of drops that might be added
|
||||
this.drop(drop.dialog);
|
||||
|
||||
Reference in New Issue
Block a user