Revert "Refactoring & Feature: edit/delete controls of tasks (#11357)"

This reverts commit 70b6501135.

test/client/unit/specs/store/getters/tasks/canDelete.js

@@ -6,7 +6,7 @@ describe('canDelete getter', () => {
 
 
     const task = {userId: 1, challenge: {id: 2}};
-    expect(store.getters['tasks:canDelete'](task, 'challenge', true, null, null)).to.equal(false);
+    expect(store.getters['tasks:canDelete'](task)).to.equal(false);
   });
 
   it('can delete broken challenge task', () => {
@@ -14,6 +14,6 @@ describe('canDelete getter', () => {
 
 
     const task = {userId: 1, challenge: {id: 2, broken: true}};
-    expect(store.getters['tasks:canDelete'](task, 'challenge', true, null, null)).to.equal(true);
+    expect(store.getters['tasks:canDelete'](task)).to.equal(true);
   });
 });

test/client/unit/specs/store/getters/tasks/canEdit.js

@@ -1,19 +0,0 @@
-import generateStore from 'client/store';
-
-describe('canEdit getter', () => {
-  it('cannot Edit active challenge task', () => {
-    const store = generateStore();
-
-
-    const task = {userId: 1, challenge: {id: 2}};
-    expect(store.getters['tasks:canEdit'](task, 'challenge', true, null, null)).to.equal(false);
-  });
-
-  it('can Edit broken challenge task', () => {
-    const store = generateStore();
-
-
-    const task = {userId: 1, challenge: {id: 2, broken: true}};
-    expect(store.getters['tasks:canEdit'](task, 'challenge', true, null, null)).to.equal(true);
-  });
-});

website/client/components/challenges/challengeDetail.vue

@@ -57,7 +57,7 @@
         :type="column",
         :key="column",
         :taskListOverride='tasksByType[column]',
-        :challenge="challenge"
+        :showOptions="showOptions",
         @editTask="editTask",
         @taskDestroyed="taskDestroyed",
         v-if='tasksByType[column].length > 0')
@@ -252,6 +252,9 @@ export default {
     canJoin () {
       return !this.isMember;
     },
+    showOptions () {
+      return this.isLeader;
+    },
   },
   mounted () {
     if (!this.searchId) this.searchId = this.challengeId;

website/client/components/group-plans/taskInformation.vue

@@ -41,6 +41,7 @@
       :type="column",
       :key="column",
       :taskListOverride='tasksByType[column]',
+      :showOptions="showOptions"
       v-on:editTask="editTask",
       v-on:loadGroupCompletedTodos="loadGroupCompletedTodos",
       v-on:taskDestroyed="taskDestroyed",
@@ -176,6 +177,9 @@ export default {
       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]);
     },
+    showOptions () {
+      return this.canCreateTasks;
+    },
   },
   methods: {
     async load () {

website/client/components/tasks/column.vue

@@ -45,10 +45,10 @@
         v-for="task in taskList",
         :key="task.id", :task="task",
         :isUser="isUser",
+        :showOptions="showOptions"
         @editTask="editTask",
         @moveTo="moveTo",
         :group='group',
-        :challenge="challenge"
         v-on:taskDestroyed='taskDestroyed'
       )
     template(v-if="hasRewardsList")
@@ -311,7 +311,10 @@ export default {
     selectedTags: {},
     taskListOverride: {},
     group: {},
-    challenge: {},
+    showOptions: {
+      type: Boolean,
+      default: true,
+    },
   }, // @TODO: maybe we should store the group on state?
   data () {
     const icons = Object.freeze({

website/client/components/tasks/task.vue

@@ -27,7 +27,7 @@
               div(slot="dropdown-toggle", draggable=false)
                 .svg-icon.dropdown-icon(v-html="icons.menu")
               div(slot="dropdown-content", draggable=false)
-                .dropdown-item.edit-task-item(ref="editTaskItem" v-if="showEdit")
+                .dropdown-item.edit-task-item(ref="editTaskItem")
                   span.dropdown-icon-item
                     span.svg-icon.inline.edit-icon(v-html="icons.edit")
                     span.text {{ $t('edit') }}
@@ -39,7 +39,7 @@
                   span.dropdown-icon-item
                     span.svg-icon.inline.push-to-bottom(v-html="icons.bottom")
                     span.text {{ $t('taskToBottom') }}
-                .dropdown-item(@click="destroy", v-if="showDelete")
+                .dropdown-item(@click="destroy", v-if="canDelete(task)")
                   span.dropdown-icon-item.delete-task-item
                     span.svg-icon.inline.delete(v-html="icons.delete")
                     span.text {{ $t('delete') }}
@@ -553,7 +553,6 @@ import axios from 'axios';
 import scoreTask from 'common/script/ops/scoreTask';
 import Vue from 'vue';
 import * as Analytics from 'client/libs/analytics';
-import isEmpty from 'lodash/isEmpty';
 
 import positiveIcon from 'assets/svg/positive.svg';
 import negativeIcon from 'assets/svg/negative.svg';
@@ -588,7 +587,7 @@ export default {
   directives: {
     markdown: markdownDirective,
   },
-  props: ['task', 'isUser', 'group', 'challenge', 'dueDate'], // @TODO: maybe we should store the group on state?
+  props: ['task', 'isUser', 'group', 'dueDate', 'showOptions'], // @TODO: maybe we should store the group on state?
   data () {
     return {
       random: uuid.v4(), // used to avoid conflicts between checkboxes ids
@@ -622,7 +621,6 @@ export default {
       getTagsFor: 'tasks:getTagsFor',
       getTaskClasses: 'tasks:getTaskClasses',
       canDelete: 'tasks:canDelete',
-      canEdit: 'tasks:canEdit',
     }),
     hasChecklist () {
       return this.task.checklist && this.task.checklist.length > 0;
@@ -702,27 +700,6 @@ export default {
 
       return this.task.challenge.shortName ? this.task.challenge.shortName.toString() : '';
     },
-    isChallangeTask () {
-      return !isEmpty(this.task.challenge);
-    },
-    isGroupTask () {
-      return !isEmpty(this.task.group) && (this.task.group.taskId || this.task.group.id);
-    },
-    taskCategory () {
-      let taskCategory = 'default';
-      if (this.isGroupTask) taskCategory = 'group';
-      else if (this.isChallangeTask) taskCategory = 'challenge';
-      return taskCategory;
-    },
-    showDelete () {
-      return this.canDelete(this.task, this.taskCategory, this.isUser, this.group, this.challenge);
-    },
-    showEdit () {
-      return this.canEdit(this.task, this.taskCategory, this.isUser, this.group, this.challenge);
-    },
-    showOptions () {
-      return this.showEdit || this.showDelete || this.isUser;
-    },
   },
   methods: {
     ...mapActions({
@@ -736,7 +713,7 @@ export default {
       this.scoreChecklistItem({taskId: this.task._id, itemId: item.id});
     },
     edit (e, task) {
-      if (this.isRunningYesterdailies || !this.showEdit) return;
+      if (this.isRunningYesterdailies) return;
 
       // Prevent clicking on a link from opening the edit modal
       const target = e.target || e.srcElement;

website/client/store/getters/tasks.js

@@ -37,64 +37,11 @@ function getTaskColor (task) {
   }
 }
 
-export function canDelete (store) {
+export function canDelete () {
-  return (task, taskCategory, isTaskFromUserDashboard, group, challenge) => {
+  return (task) => {
-    let isUserCanDeleteTask = isTaskFromUserDashboard;
+    let isUserChallenge = Boolean(task.userId);
-    const user = store.state.user.data;
+    let activeChallenge = isUserChallenge && task.challenge && task.challenge.id && !task.challenge.broken;
-
+    return !activeChallenge;
-    switch (taskCategory) {
-      case 'challenge':
-        if (challenge && !isTaskFromUserDashboard) {
-          let isUserChallenge = user.id === challenge.leader.id;
-          isUserCanDeleteTask = isUserChallenge || task.challenge.broken;
-        } else {
-          isUserCanDeleteTask = task.challenge.broken;
-        }
-        break;
-      case 'group':
-        if (group && !isTaskFromUserDashboard) {
-          isUserCanDeleteTask =
-          group.leader &&
-          group.leader._id === user._id || group.managers &&
-          Boolean(group.managers[user._id]);
-        } else {
-          isUserCanDeleteTask = false;
-        }
-        break;
-      default:
-        break;
-    }
-    return Boolean(isUserCanDeleteTask);
-  };
-}
-
-export function canEdit (store) {
-  return (task, taskCategory, isTaskFromUserDashboard, group, challenge) => {
-    let isUserCanEditTask = isTaskFromUserDashboard;
-    const user = store.state.user.data;
-    switch (taskCategory) {
-      case 'challenge':
-        if (challenge && !isTaskFromUserDashboard) {
-          let isUserChallenge = user.id === challenge.leader.id;
-          isUserCanEditTask = isUserChallenge || task.challenge.broken;
-        } else {
-          isUserCanEditTask = task.challenge.broken;
-        }
-        break;
-      case 'group':
-        if (group && !isTaskFromUserDashboard) {
-          isUserCanEditTask =
-          group.leader &&
-          group.leader._id === user._id || group.managers &&
-          Boolean(group.managers[user._id]);
-        } else {
-          isUserCanEditTask = false;
-        }
-        break;
-      default:
-        break;
-    }
-    return Boolean(isUserCanEditTask);
   };
 }