diff --git a/common/script/index.js b/common/script/index.js index 3d015ddb9a..91b290c2ed 100644 --- a/common/script/index.js +++ b/common/script/index.js @@ -138,7 +138,6 @@ import releasePets from './ops/releasePets'; import releaseBoth from './ops/releaseBoth'; import releaseMounts from './ops/releaseMounts'; import updateTask from './ops/updateTask'; -import clearCompleted from './ops/clearCompleted'; import sell from './ops/sell'; import unlock from './ops/unlock'; import revive from './ops/revive'; @@ -179,7 +178,6 @@ api.ops = { releaseBoth, releaseMounts, updateTask, - clearCompleted, sell, unlock, revive, @@ -256,7 +254,6 @@ api.wrap = function wrapUser (user, main = true) { reroll: _.partial(importedOps.reroll, user), rebirth: _.partial(importedOps.rebirth, user), allocateNow: _.partial(importedOps.allocateNow, user), - clearCompleted: _.partial(importedOps.clearCompleted, user), sortTask: _.partial(importedOps.sortTask, user), updateTask: _.partial(importedOps.updateTask, user), deleteTask: _.partial(importedOps.deleteTask, user), diff --git a/common/script/ops/clearCompleted.js b/common/script/ops/clearCompleted.js deleted file mode 100644 index 26fb1727d9..0000000000 --- a/common/script/ops/clearCompleted.js +++ /dev/null @@ -1,10 +0,0 @@ -import _ from 'lodash'; - -// TODO move to client since it's only used there? -// TODO rename file to clearCompletedTodos - -module.exports = function clearCompletedTodos (todos) { - _.remove(todos, todo => { - return todo.completed && (!todo.challenge || !todo.challenge.id || todo.challenge.broken); - }); -}; diff --git a/common/script/ops/index.js b/common/script/ops/index.js index 2ad253b2e8..1ed5ea72f2 100644 --- a/common/script/ops/index.js +++ b/common/script/ops/index.js @@ -5,7 +5,6 @@ import reset from './reset'; import reroll from './reroll'; import rebirth from './rebirth'; import allocateNow from './allocateNow'; -import clearCompleted from './clearCompleted'; import sortTask from './sortTask'; import updateTask from './updateTask'; import deleteTask from './deleteTask'; @@ -56,7 +55,6 @@ module.exports = { reroll, rebirth, allocateNow, - clearCompleted, sortTask, updateTask, deleteTask, diff --git a/test/common/ops/clearCompleted.js b/test/common/ops/clearCompleted.js deleted file mode 100644 index 4dceb3c1f0..0000000000 --- a/test/common/ops/clearCompleted.js +++ /dev/null @@ -1,37 +0,0 @@ -import clearCompleted from '../../../common/script/ops/clearCompleted'; -import { - generateTodo, -} from '../../helpers/common.helper'; - -describe('shared.ops.clearCompleted', () => { - it('clear completed todos', () => { - let todos = [ - generateTodo({text: 'todo'}), - generateTodo({ - text: 'done', - completed: true, - }), - generateTodo({ - text: 'done chellenge broken', - completed: true, - challenge: { - id: 123, - broken: 'TASK_DELETED', - }, - }), - generateTodo({ - text: 'done chellenge not broken', - completed: true, - challenge: { - id: 123, - }, - }), - ]; - - clearCompleted(todos); - - expect(todos.length).to.equal(2); - expect(todos[0].text).to.equal('todo'); - expect(todos[1].text).to.equal('done chellenge not broken'); - }); -}); diff --git a/website/client/js/services/userServices.js b/website/client/js/services/userServices.js index 6d2fccd831..a4231298e0 100644 --- a/website/client/js/services/userServices.js +++ b/website/client/js/services/userServices.js @@ -292,11 +292,6 @@ angular.module('habitrpg') Tasks.deleteTask(data.params.id); }, - clearCompleted: function () { - user.ops.clearCompleted(user.todos); - Tasks.clearCompletedTodos(); - }, - readNotification: function (notificationId) { UserNotifications.readNotification(notificationId); },