From 072b09e030bd969afe7adf56c7f918e8434cd477 Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Wed, 5 May 2021 16:55:07 -0500
Subject: [PATCH] feat(teams): quick add Also fixes issue with lock icons Also
 hides task copies from personal task board

---
 .../client/src/components/tasks/column.vue    | 24 ++++++++++++++-----
 .../src/libs/store/helpers/filterTasks.js     |  5 +++-
 website/client/src/store/getters/tasks.js     |  2 +-
 website/common/script/ops/scoreTask.js        |  4 ++++
 website/server/libs/tasks/index.js            |  1 +
 5 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/website/client/src/components/tasks/column.vue b/website/client/src/components/tasks/column.vue
index 157118afb9..bc373ecc3c 100644
--- a/website/client/src/components/tasks/column.vue
+++ b/website/client/src/components/tasks/column.vue
@@ -43,7 +43,7 @@
       class="tasks-list"
     >
       <textarea
-        v-if="isUser"
+        v-if="isUser || canCreateTasks()"
         ref="quickAdd"
         v-model="quickAddText"
         class="quick-add"
@@ -350,6 +350,7 @@ import draggable from 'vuedraggable';
 import Task from './task';
 import ClearCompletedTodos from './clearCompletedTodos';
 import buyMixin from '@/mixins/buy';
+import sync from '@/mixins/sync';
 import { mapState, mapActions, mapGetters } from '@/libs/store';
 import shopItem from '../shops/shopItem';
 import BuyQuestModal from '@/components/shops/quests/buyQuestModal.vue';
@@ -382,7 +383,7 @@ export default {
     shopItem,
     draggable,
   },
-  mixins: [buyMixin, notifications],
+  mixins: [buyMixin, notifications, sync],
   // @TODO Set default values for props
   // allows for better control of props values
   // allows for better control of where this component is called
@@ -542,6 +543,7 @@ export default {
     ...mapActions({
       loadCompletedTodos: 'tasks:fetchCompletedTodos',
       createTask: 'tasks:create',
+      createGroupTasks: 'tasks:createGroupTasks',
     }),
     async taskSorted (data) {
       const filteredList = this.taskList;
@@ -606,7 +608,12 @@ export default {
       this.showPopovers = true;
       this.isDragging(false);
     },
-    quickAdd (ev) {
+    canCreateTasks () {
+      if (!this.group) return false;
+      return (this.group.leader && this.group.leader._id === this.user._id)
+        || (this.group.managers && Boolean(this.group.managers[this.user._id]));
+    },
+    async quickAdd (ev) {
       // Add a new line if Shift+Enter Pressed
       if (ev.shiftKey) {
         this.quickAddRows += 1;
@@ -620,13 +627,18 @@ export default {
 
       const tasks = text.split('\n').reverse().filter(taskText => (!!taskText)).map(taskText => {
         const task = taskDefaults({ type: this.type, text: taskText }, this.user);
-        task.tags = this.selectedTags.slice();
+        if (this.isUser) task.tags = this.selectedTags.slice();
         return task;
       });
 
       this.quickAddText = '';
       this.quickAddRows = 1;
-      this.createTask(tasks);
+      if (this.group) {
+        await this.createGroupTasks({ groupId: this.group.id, tasks });
+        this.sync();
+      } else {
+        this.createTask(tasks);
+      }
       this.$refs.quickAdd.blur();
       return true;
     },
@@ -687,7 +699,7 @@ export default {
     filterByLabel (taskList, type, filter) {
       if (!taskList) return [];
       const selectedFilter = getActiveFilter(type, filter, this.challenge);
-      return sortAndFilterTasks(taskList, selectedFilter);
+      return sortAndFilterTasks(taskList, selectedFilter, Boolean(this.group));
     },
     filterByTagList (taskList, tagList = []) {
       let filteredTaskList = taskList;
diff --git a/website/client/src/libs/store/helpers/filterTasks.js b/website/client/src/libs/store/helpers/filterTasks.js
index 727a0d62de..79a4d3cbbd 100644
--- a/website/client/src/libs/store/helpers/filterTasks.js
+++ b/website/client/src/libs/store/helpers/filterTasks.js
@@ -105,8 +105,11 @@ export function getActiveFilter (type, filterType, isChallenge) {
   return activeFilter(taskFilters)(type, filterType);
 }
 
-export function sortAndFilterTasks (tasks, selectedFilter) {
+export function sortAndFilterTasks (tasks, selectedFilter, group = false) {
   let sortedTasks = tasks.filter(selectedFilter.filterFn);
+  if (!group) {
+    sortedTasks = tasks.filter(task => !task.group.id);
+  }
   if (selectedFilter.sort) {
     sortedTasks = sortBy(sortedTasks, selectedFilter.sort);
   }
diff --git a/website/client/src/store/getters/tasks.js b/website/client/src/store/getters/tasks.js
index a194f385b1..a1778dee3a 100644
--- a/website/client/src/store/getters/tasks.js
+++ b/website/client/src/store/getters/tasks.js
@@ -118,7 +118,7 @@ function _nonInteractive (task, userId) {
   if (task.userId) return false;
   if (task.challenge && task.challenge.id) return true;
   if (
-    task.group
+    task.group && task.group.assignedUsers
     && task.group.assignedUsers.length > 0
     && task.group.assignedUsers.indexOf(userId) === -1
   ) return true;
diff --git a/website/common/script/ops/scoreTask.js b/website/common/script/ops/scoreTask.js
index 708ce1d5f8..51a58f8c51 100644
--- a/website/common/script/ops/scoreTask.js
+++ b/website/common/script/ops/scoreTask.js
@@ -303,6 +303,7 @@ export default function scoreTask (options = {}, req = {}, analytics) {
           user.achievements.streak = user.achievements.streak ? user.achievements.streak + 1 : 1;
           if (user.addNotification) user.addNotification('STREAK_ACHIEVEMENT');
         }
+        if (task.group) task.group.completedBy = user._id;
         task.completed = true;
 
         // Save history entry for daily
@@ -320,6 +321,7 @@ export default function scoreTask (options = {}, req = {}, analytics) {
           user.achievements.streak = user.achievements.streak ? user.achievements.streak - 1 : 0;
         }
         task.streak -= 1;
+        if (task.group && task.group.completedBy) task.group.completedBy = undefined;
         task.completed = false;
 
         // Delete history entry when daily unchecked
@@ -335,9 +337,11 @@ export default function scoreTask (options = {}, req = {}, analytics) {
       if (direction === 'up') {
         task.dateCompleted = new Date();
         task.completed = true;
+        if (task.group) task.group.completedBy = user._id;
       } else if (direction === 'down') {
         task.completed = false;
         task.dateCompleted = undefined;
+        if (task.group && task.group.completedBy) task.group.completedBy = undefined;
       }
 
       delta += _changeTaskValue(user, task, direction, times, cron);
diff --git a/website/server/libs/tasks/index.js b/website/server/libs/tasks/index.js
index 8bff8f98f7..24473c44cb 100644
--- a/website/server/libs/tasks/index.js
+++ b/website/server/libs/tasks/index.js
@@ -371,6 +371,7 @@ async function scoreTask (user, task, direction, req, res) {
       throw new BadRequest('Cannot uncheck task you did not complete if not a manager.');
     }
     rollbackUser = await User.findOne({ _id: task.group.completedBy });
+    task.group.completedBy = undefined;
   }
 
   if (rollbackUser) {