2019-10-08 18:45:38 +00:00
|
|
|
import { each, find, findIndex } from 'lodash';
|
2018-06-18 12:40:25 +00:00
|
|
|
import { model as Challenge } from '../../../../website/server/models/challenge';
|
|
|
|
|
import { model as Group } from '../../../../website/server/models/group';
|
|
|
|
|
import { model as User } from '../../../../website/server/models/user';
|
|
|
|
|
import * as Tasks from '../../../../website/server/models/task';
|
2016-09-03 08:54:55 +00:00
|
|
|
|
|
|
|
|
describe('Group Task Methods', () => {
|
2019-10-08 18:45:38 +00:00
|
|
|
let guild; let leader; let challenge; let
|
|
|
|
|
task;
|
|
|
|
|
const tasksToTest = {
|
2016-09-03 08:54:55 +00:00
|
|
|
habit: {
|
|
|
|
|
text: 'test habit',
|
|
|
|
|
type: 'habit',
|
|
|
|
|
up: false,
|
|
|
|
|
down: true,
|
|
|
|
|
},
|
|
|
|
|
todo: {
|
|
|
|
|
text: 'test todo',
|
|
|
|
|
type: 'todo',
|
|
|
|
|
},
|
|
|
|
|
daily: {
|
|
|
|
|
text: 'test daily',
|
|
|
|
|
type: 'daily',
|
|
|
|
|
frequency: 'daily',
|
|
|
|
|
everyX: 5,
|
|
|
|
|
startDate: new Date(),
|
|
|
|
|
},
|
|
|
|
|
reward: {
|
|
|
|
|
text: 'test reward',
|
|
|
|
|
type: 'reward',
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
function findLinkedTask (updatedLeadersTask) {
|
|
|
|
|
return updatedLeadersTask.group.taskId === task._id;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
beforeEach(async () => {
|
|
|
|
|
guild = new Group({
|
|
|
|
|
name: 'test party',
|
|
|
|
|
type: 'guild',
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
leader = new User({
|
|
|
|
|
guilds: [guild._id],
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
guild.leader = leader._id;
|
|
|
|
|
|
|
|
|
|
challenge = new Challenge({
|
|
|
|
|
name: 'Test Challenge',
|
|
|
|
|
shortName: 'Test',
|
|
|
|
|
leader: leader._id,
|
|
|
|
|
group: guild._id,
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
leader.challenges = [challenge._id];
|
|
|
|
|
|
|
|
|
|
await Promise.all([
|
|
|
|
|
guild.save(),
|
|
|
|
|
leader.save(),
|
|
|
|
|
challenge.save(),
|
|
|
|
|
]);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
each(tasksToTest, (taskValue, taskType) => {
|
|
|
|
|
context(`${taskType}`, () => {
|
2018-02-17 17:11:24 +00:00
|
|
|
beforeEach(async () => {
|
2016-09-03 08:54:55 +00:00
|
|
|
task = new Tasks[`${taskType}`](Tasks.Task.sanitize(taskValue));
|
|
|
|
|
task.group.id = guild._id;
|
|
|
|
|
await task.save();
|
2016-12-21 19:45:45 +00:00
|
|
|
if (task.checklist) {
|
|
|
|
|
task.checklist.push({
|
|
|
|
|
text: 'Checklist Item 1',
|
|
|
|
|
completed: false,
|
|
|
|
|
});
|
|
|
|
|
}
|
2016-09-03 08:54:55 +00:00
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('syncs an assigned task to a user', async () => {
|
|
|
|
|
await guild.syncTask(task, leader);
|
|
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
const updatedLeader = await User.findOne({ _id: leader._id });
|
|
|
|
|
const tagIndex = findIndex(updatedLeader.tags, { id: guild._id });
|
|
|
|
|
const newTag = updatedLeader.tags[tagIndex];
|
2016-12-21 19:45:45 +00:00
|
|
|
|
|
|
|
|
expect(newTag.id).to.equal(guild._id);
|
|
|
|
|
expect(newTag.name).to.equal(guild.name);
|
|
|
|
|
expect(newTag.group).to.equal(guild._id);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('create tags for a user when task is synced', async () => {
|
|
|
|
|
await guild.syncTask(task, leader);
|
|
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
const updatedLeader = await User.findOne({ _id: leader._id });
|
|
|
|
|
const updatedLeadersTasks = await Tasks.Task.find({ _id: { $in: updatedLeader.tasksOrder[`${taskType}s`] } });
|
|
|
|
|
const syncedTask = find(updatedLeadersTasks, findLinkedTask);
|
2016-09-03 08:54:55 +00:00
|
|
|
|
|
|
|
|
expect(task.group.assignedUsers).to.contain(leader._id);
|
|
|
|
|
expect(syncedTask).to.exist;
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('syncs updated info for assigned task to a user', async () => {
|
|
|
|
|
await guild.syncTask(task, leader);
|
2019-10-08 18:45:38 +00:00
|
|
|
const updatedTaskName = 'Update Task name';
|
2016-09-03 08:54:55 +00:00
|
|
|
task.text = updatedTaskName;
|
|
|
|
|
await guild.syncTask(task, leader);
|
|
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
const updatedLeader = await User.findOne({ _id: leader._id });
|
|
|
|
|
const updatedLeadersTasks = await Tasks.Task.find({ _id: { $in: updatedLeader.tasksOrder[`${taskType}s`] } });
|
|
|
|
|
const syncedTask = find(updatedLeadersTasks, findLinkedTask);
|
2016-09-03 08:54:55 +00:00
|
|
|
|
|
|
|
|
expect(task.group.assignedUsers).to.contain(leader._id);
|
|
|
|
|
expect(syncedTask).to.exist;
|
|
|
|
|
expect(syncedTask.text).to.equal(task.text);
|
|
|
|
|
});
|
|
|
|
|
|
2016-12-21 19:45:45 +00:00
|
|
|
it('syncs checklist items to an assigned user', async () => {
|
2016-09-03 08:54:55 +00:00
|
|
|
await guild.syncTask(task, leader);
|
|
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
const updatedLeader = await User.findOne({ _id: leader._id });
|
|
|
|
|
const updatedLeadersTasks = await Tasks.Task.find({ _id: { $in: updatedLeader.tasksOrder[`${taskType}s`] } });
|
|
|
|
|
const syncedTask = find(updatedLeadersTasks, findLinkedTask);
|
2016-09-03 08:54:55 +00:00
|
|
|
|
2016-12-21 19:45:45 +00:00
|
|
|
if (task.type !== 'daily' && task.type !== 'todo') return;
|
2016-09-03 08:54:55 +00:00
|
|
|
|
2016-12-21 19:45:45 +00:00
|
|
|
expect(syncedTask.checklist.length).to.equal(task.checklist.length);
|
|
|
|
|
expect(syncedTask.checklist[0].text).to.equal(task.checklist[0].text);
|
|
|
|
|
});
|
|
|
|
|
|
2018-02-17 17:11:24 +00:00
|
|
|
describe('syncs updated info', async () => {
|
2016-12-21 19:45:45 +00:00
|
|
|
let newMember;
|
|
|
|
|
|
|
|
|
|
beforeEach(async () => {
|
|
|
|
|
newMember = new User({
|
|
|
|
|
guilds: [guild._id],
|
|
|
|
|
});
|
|
|
|
|
await newMember.save();
|
|
|
|
|
|
|
|
|
|
await guild.syncTask(task, leader);
|
|
|
|
|
await guild.syncTask(task, newMember);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('syncs updated info for assigned task to all users', async () => {
|
2019-10-08 18:45:38 +00:00
|
|
|
const updatedTaskName = 'Update Task name';
|
2016-12-21 19:45:45 +00:00
|
|
|
task.text = updatedTaskName;
|
|
|
|
|
task.group.approval.required = true;
|
|
|
|
|
|
|
|
|
|
await guild.updateTask(task);
|
|
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
const updatedLeader = await User.findOne({ _id: leader._id });
|
|
|
|
|
const updatedLeadersTasks = await Tasks.Task.find({ _id: { $in: updatedLeader.tasksOrder[`${taskType}s`] } });
|
|
|
|
|
const syncedTask = find(updatedLeadersTasks, findLinkedTask);
|
2016-12-21 19:45:45 +00:00
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
const updatedMember = await User.findOne({ _id: newMember._id });
|
|
|
|
|
const updatedMemberTasks = await Tasks.Task.find({ _id: { $in: updatedMember.tasksOrder[`${taskType}s`] } });
|
|
|
|
|
const syncedMemberTask = find(updatedMemberTasks, findLinkedTask);
|
2016-09-03 08:54:55 +00:00
|
|
|
|
2016-12-21 19:45:45 +00:00
|
|
|
expect(task.group.assignedUsers).to.contain(leader._id);
|
|
|
|
|
expect(syncedTask).to.exist;
|
|
|
|
|
expect(syncedTask.text).to.equal(task.text);
|
|
|
|
|
expect(syncedTask.group.approval.required).to.equal(true);
|
|
|
|
|
|
|
|
|
|
expect(task.group.assignedUsers).to.contain(newMember._id);
|
|
|
|
|
expect(syncedMemberTask).to.exist;
|
|
|
|
|
expect(syncedMemberTask.text).to.equal(task.text);
|
|
|
|
|
expect(syncedMemberTask.group.approval.required).to.equal(true);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('syncs a new checklist item to all assigned users', async () => {
|
|
|
|
|
if (task.type !== 'daily' && task.type !== 'todo') return;
|
|
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
const newCheckListItem = {
|
2016-12-21 19:45:45 +00:00
|
|
|
text: 'Checklist Item 1',
|
|
|
|
|
completed: false,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
task.checklist.push(newCheckListItem);
|
|
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
await guild.updateTask(task, { newCheckListItem });
|
2016-12-21 19:45:45 +00:00
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
const updatedLeader = await User.findOne({ _id: leader._id });
|
|
|
|
|
const updatedLeadersTasks = await Tasks.Task.find({ _id: { $in: updatedLeader.tasksOrder[`${taskType}s`] } });
|
|
|
|
|
const syncedTask = find(updatedLeadersTasks, findLinkedTask);
|
2016-12-21 19:45:45 +00:00
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
const updatedMember = await User.findOne({ _id: newMember._id });
|
|
|
|
|
const updatedMemberTasks = await Tasks.Task.find({ _id: { $in: updatedMember.tasksOrder[`${taskType}s`] } });
|
|
|
|
|
const syncedMemberTask = find(updatedMemberTasks, findLinkedTask);
|
2016-12-21 19:45:45 +00:00
|
|
|
|
|
|
|
|
expect(syncedTask.checklist.length).to.equal(task.checklist.length);
|
|
|
|
|
expect(syncedTask.checklist[1].text).to.equal(task.checklist[1].text);
|
|
|
|
|
expect(syncedMemberTask.checklist.length).to.equal(task.checklist.length);
|
|
|
|
|
expect(syncedMemberTask.checklist[1].text).to.equal(task.checklist[1].text);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('syncs updated info for checklist in assigned task to all users when flag is passed', async () => {
|
|
|
|
|
if (task.type !== 'daily' && task.type !== 'todo') return;
|
|
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
const updateCheckListText = 'Updated checklist item';
|
2016-12-21 19:45:45 +00:00
|
|
|
if (task.checklist) {
|
|
|
|
|
task.checklist[0].text = updateCheckListText;
|
|
|
|
|
}
|
|
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
await guild.updateTask(task, { updateCheckListItems: [task.checklist[0]] });
|
2016-12-21 19:45:45 +00:00
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
const updatedLeader = await User.findOne({ _id: leader._id });
|
|
|
|
|
const updatedLeadersTasks = await Tasks.Task.find({ _id: { $in: updatedLeader.tasksOrder[`${taskType}s`] } });
|
|
|
|
|
const syncedTask = find(updatedLeadersTasks, findLinkedTask);
|
2016-12-21 19:45:45 +00:00
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
const updatedMember = await User.findOne({ _id: newMember._id });
|
|
|
|
|
const updatedMemberTasks = await Tasks.Task.find({ _id: { $in: updatedMember.tasksOrder[`${taskType}s`] } });
|
|
|
|
|
const syncedMemberTask = find(updatedMemberTasks, findLinkedTask);
|
2016-12-21 19:45:45 +00:00
|
|
|
|
|
|
|
|
expect(syncedTask.checklist.length).to.equal(task.checklist.length);
|
|
|
|
|
expect(syncedTask.checklist[0].text).to.equal(updateCheckListText);
|
|
|
|
|
expect(syncedMemberTask.checklist.length).to.equal(task.checklist.length);
|
|
|
|
|
expect(syncedMemberTask.checklist[0].text).to.equal(updateCheckListText);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('removes a checklist item in assigned task to all users when flag is passed with checklist id', async () => {
|
|
|
|
|
if (task.type !== 'daily' && task.type !== 'todo') return;
|
|
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
await guild.updateTask(task, { removedCheckListItemId: task.checklist[0].id });
|
2016-12-21 19:45:45 +00:00
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
const updatedLeader = await User.findOne({ _id: leader._id });
|
|
|
|
|
const updatedLeadersTasks = await Tasks.Task.find({ _id: { $in: updatedLeader.tasksOrder[`${taskType}s`] } });
|
|
|
|
|
const syncedTask = find(updatedLeadersTasks, findLinkedTask);
|
2016-12-21 19:45:45 +00:00
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
const updatedMember = await User.findOne({ _id: newMember._id });
|
|
|
|
|
const updatedMemberTasks = await Tasks.Task.find({ _id: { $in: updatedMember.tasksOrder[`${taskType}s`] } });
|
|
|
|
|
const syncedMemberTask = find(updatedMemberTasks, findLinkedTask);
|
2016-12-21 19:45:45 +00:00
|
|
|
|
|
|
|
|
expect(syncedTask.checklist.length).to.equal(0);
|
|
|
|
|
expect(syncedMemberTask.checklist.length).to.equal(0);
|
|
|
|
|
});
|
2016-09-03 08:54:55 +00:00
|
|
|
});
|
|
|
|
|
|
Teams UI Redesign and A11y Updates (#12142)
* 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! :tada: - 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 :tada:
* 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(teams): checklist, notes
* fix(teams): improve disabled states
* fix(teams): more style fixage
* BREAKING(teams): return 202 instead of 401 for approval request
* fix(teams): better taskboard sync
also re-re-fix checklist borders
* fix(tests): update expectations for breaking change
* refactor(task-modal): lockable label component
* refactor(teams): move task scoring to mixin
* fix(teams): style corrections
* 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
* refactor(tasks): better spacing, generic multi select
* fix(tasks): various visual and behavior updates
* fix(tasks): incidental style tweaks
* fix(teams): standardize approval request response
* refactor(teams): correct test, use res.respond message param
* fix(storybook): renamed component
* fix(teams): age approval-required To Do's
Fixes #8730
* fix(teams): sync personal data as well as team on mixin sync
* fix(teams): hide unclaim button, not whole footer; fix switch focus
* fix(achievements): unrevert width fix
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2020-07-25 12:37:10 +00:00
|
|
|
it('removes assigned tasks when master task is deleted', async () => {
|
2016-09-03 08:54:55 +00:00
|
|
|
await guild.syncTask(task, leader);
|
|
|
|
|
await guild.removeTask(task);
|
|
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
const updatedLeader = await User.findOne({ _id: leader._id });
|
Teams UI Redesign and A11y Updates (#12142)
* 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! :tada: - 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 :tada:
* 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(teams): checklist, notes
* fix(teams): improve disabled states
* fix(teams): more style fixage
* BREAKING(teams): return 202 instead of 401 for approval request
* fix(teams): better taskboard sync
also re-re-fix checklist borders
* fix(tests): update expectations for breaking change
* refactor(task-modal): lockable label component
* refactor(teams): move task scoring to mixin
* fix(teams): style corrections
* 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
* refactor(tasks): better spacing, generic multi select
* fix(tasks): various visual and behavior updates
* fix(tasks): incidental style tweaks
* fix(teams): standardize approval request response
* refactor(teams): correct test, use res.respond message param
* fix(storybook): renamed component
* fix(teams): age approval-required To Do's
Fixes #8730
* fix(teams): sync personal data as well as team on mixin sync
* fix(teams): hide unclaim button, not whole footer; fix switch focus
* fix(achievements): unrevert width fix
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2020-07-25 12:37:10 +00:00
|
|
|
const updatedLeadersTasks = await Tasks.Task.find({ userId: leader._id, type: taskType });
|
2019-10-08 18:45:38 +00:00
|
|
|
const syncedTask = find(updatedLeadersTasks, findLinkedTask);
|
2016-09-03 08:54:55 +00:00
|
|
|
|
Teams UI Redesign and A11y Updates (#12142)
* 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! :tada: - 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 :tada:
* 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(teams): checklist, notes
* fix(teams): improve disabled states
* fix(teams): more style fixage
* BREAKING(teams): return 202 instead of 401 for approval request
* fix(teams): better taskboard sync
also re-re-fix checklist borders
* fix(tests): update expectations for breaking change
* refactor(task-modal): lockable label component
* refactor(teams): move task scoring to mixin
* fix(teams): style corrections
* 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
* refactor(tasks): better spacing, generic multi select
* fix(tasks): various visual and behavior updates
* fix(tasks): incidental style tweaks
* fix(teams): standardize approval request response
* refactor(teams): correct test, use res.respond message param
* fix(storybook): renamed component
* fix(teams): age approval-required To Do's
Fixes #8730
* fix(teams): sync personal data as well as team on mixin sync
* fix(teams): hide unclaim button, not whole footer; fix switch focus
* fix(achievements): unrevert width fix
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2020-07-25 12:37:10 +00:00
|
|
|
expect(updatedLeader.tasksOrder[`${taskType}s`]).to.not.include(task._id);
|
|
|
|
|
expect(syncedTask).to.not.exist;
|
2016-09-03 08:54:55 +00:00
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('unlinks and deletes group tasks for a user when remove-all is specified', async () => {
|
|
|
|
|
await guild.syncTask(task, leader);
|
|
|
|
|
await guild.unlinkTask(task, leader, 'remove-all');
|
|
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
const updatedLeader = await User.findOne({ _id: leader._id });
|
|
|
|
|
const updatedLeadersTasks = await Tasks.Task.find({ _id: { $in: updatedLeader.tasksOrder[`${taskType}s`] } });
|
|
|
|
|
const syncedTask = find(updatedLeadersTasks, findLinkedTask);
|
2016-09-03 08:54:55 +00:00
|
|
|
|
|
|
|
|
expect(task.group.assignedUsers).to.not.contain(leader._id);
|
|
|
|
|
expect(syncedTask).to.not.exist;
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('unlinks and keeps group tasks for a user when keep-all is specified', async () => {
|
|
|
|
|
await guild.syncTask(task, leader);
|
|
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
let updatedLeader = await User.findOne({ _id: leader._id });
|
|
|
|
|
let updatedLeadersTasks = await Tasks.Task.find({ _id: { $in: updatedLeader.tasksOrder[`${taskType}s`] } });
|
|
|
|
|
const syncedTask = find(updatedLeadersTasks, findLinkedTask);
|
2016-09-03 08:54:55 +00:00
|
|
|
|
|
|
|
|
await guild.unlinkTask(task, leader, 'keep-all');
|
|
|
|
|
|
2019-10-08 18:45:38 +00:00
|
|
|
updatedLeader = await User.findOne({ _id: leader._id });
|
|
|
|
|
updatedLeadersTasks = await Tasks.Task.find({ _id: { $in: updatedLeader.tasksOrder[`${taskType}s`] } });
|
|
|
|
|
const updatedSyncedTask = find(
|
|
|
|
|
updatedLeadersTasks,
|
|
|
|
|
updatedLeadersTask => updatedLeadersTask._id === syncedTask._id,
|
|
|
|
|
);
|
2016-09-03 08:54:55 +00:00
|
|
|
|
|
|
|
|
expect(task.group.assignedUsers).to.not.contain(leader._id);
|
|
|
|
|
expect(updatedSyncedTask).to.exist;
|
2018-02-17 17:11:24 +00:00
|
|
|
expect(updatedSyncedTask.group._id).to.be.undefined;
|
2016-09-03 08:54:55 +00:00
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
});
|