feat: adds ClearDate in DUE mode

roadmap.md

@@ -86,10 +86,6 @@
 
 ## In Progress
 
-- Remove date
-    * [x] NORMAL mode
-    * [x] DETAIL mode
-    * [ ] DUE mode
 - Some way to just see tasks with due dates
     * [x] Sort by date
     * [x] Scrollable
@@ -310,3 +306,7 @@
 - Remove `~` style sub-task complete parsing
 - MoveTo shouldn't show if nothing selected
 - Deleting a list can screw up current position
+- Remove date
+    * [x] NORMAL mode
+    * [x] DETAIL mode
+    * [x] DUE mode

src/Data/Taskell/List.hs

@@ -2,11 +2,13 @@
 
 module Data.Taskell.List
     ( List
+    , Update
     , title
     , tasks
     , create
     , empty
     , due
+    , clearDue
     , new
     , count
     , newAt

src/Data/Taskell/List/Internal.hs

@@ -11,7 +11,7 @@ import Control.Lens (element, makeLenses, (%%~), (%~), (&), (.~), (^.), (^?))
 import Data.Sequence as S (adjust', deleteAt, insertAt, update, (|>))
 
 import qualified Data.Taskell.Seq  as S
-import qualified Data.Taskell.Task as T (Task, Update, blank, contains, due, duplicate)
+import qualified Data.Taskell.Task as T (Task, Update, blank, clearDue, contains, due, duplicate)
 import           Types             (TaskIndex (TaskIndex))
 
 data List = List
@@ -42,6 +42,9 @@ due list = catMaybes (filt S.<#> (list ^. tasks))
   where
     filt int task = const (TaskIndex int, task) <$> task ^. T.due
 
+clearDue :: TaskIndex -> Update
+clearDue (TaskIndex int) = updateFn int T.clearDue
+
 newAt :: Int -> Update
 newAt idx = tasks %~ S.insertAt idx T.blank
 

src/Data/Taskell/Lists.hs

@@ -6,6 +6,7 @@ module Data.Taskell.Lists
     , updateLists
     , count
     , due
+    , clearDue
     , get
     , changeList
     , newList

src/Data/Taskell/Lists/Internal.hs

@@ -7,9 +7,10 @@ module Data.Taskell.Lists.Internal where
 import ClassyPrelude
 
 import Control.Lens  ((^.))
-import Data.Sequence as S (deleteAt, update, (!?), (|>))
+import Data.Sequence as S (adjust', deleteAt, update, (!?), (|>))
 
-import qualified Data.Taskell.List as L (List, append, count, due, empty, extract, searchFor)
+import qualified Data.Taskell.List as L (List, Update, append, clearDue, count, due, empty, extract,
+                                         searchFor)
 import qualified Data.Taskell.Seq  as S
 import qualified Data.Taskell.Task as T (Task, due)
 import           Types             (ListIndex (ListIndex), Pointer, TaskIndex (TaskIndex))
@@ -33,6 +34,12 @@ due lists = sortOn ((^. T.due) . snd) dues
     format x lst = (\(y, t) -> ((ListIndex x, y), t)) <$> L.due lst
     dues = concat $ format S.<#> lists
 
+clearDue :: Pointer -> Update
+clearDue (idx, tsk) = updateFn idx (L.clearDue tsk)
+
+updateFn :: ListIndex -> L.Update -> Update
+updateFn (ListIndex idx) fn = adjust' fn idx
+
 get :: Lists -> Int -> Maybe L.List
 get = (!?)
 

src/Data/Taskell/Task.hs

@@ -13,6 +13,7 @@ module Data.Taskell.Task
     , setDescription
     , appendDescription
     , setDue
+    , clearDue
     , getSubtask
     , addSubtask
     , hasSubtasks

src/Data/Taskell/Task/Internal.hs

@@ -57,6 +57,9 @@ setDue date task =
                  Just day -> task & due .~ Just day
                  Nothing  -> task
 
+clearDue :: Update
+clearDue task = task & due .~ Nothing
+
 getSubtask :: Int -> Task -> Maybe ST.Subtask
 getSubtask idx = (^? subtasks . ix idx)
 

src/Events/Actions/Modal/Due.hs

@@ -9,15 +9,20 @@ module Events.Actions.Modal.Due
 import ClassyPrelude
 
 import Events.Actions.Types      as A (ActionType (..))
-import Events.State              (normalMode)
+import Events.State              (normalMode, store, write)
 import Events.State.Modal.Detail (showDetail)
-import Events.State.Modal.Due    (goto, next, previous)
+import Events.State.Modal.Due    (clearDate, goto, next, previous)
 import Events.State.Types        (Stateful)
 import Graphics.Vty.Input.Events (Event (EvKey))
 import IO.Keyboard.Types         (Actions)
 
 events :: Actions
-events = [(A.Previous, previous), (A.Next, next), (A.Detail, (showDetail =<<) . goto)]
+events =
+    [ (A.Previous, previous)
+    , (A.Next, next)
+    , (A.Detail, (showDetail =<<) . goto)
+    , (A.ClearDate, (write =<<) . (clearDate =<<) . store)
+    ]
 
 event :: Event -> Stateful
 event (EvKey _ _) = normalMode

src/Events/State.hs

@@ -67,7 +67,7 @@ import Data.Char (digitToInt, ord)
 import qualified Data.Taskell.List  as L (List, deleteTask, duplicate, getTask, move, nearest, new,
                                           newAt, nextTask, prevTask, title, update)
 import qualified Data.Taskell.Lists as Lists
-import           Data.Taskell.Task  (Task, due, isBlank, name)
+import           Data.Taskell.Task  (Task, isBlank, name)
 import           Types
 
 import Events.State.Types
@@ -191,7 +191,7 @@ clearItem :: Stateful
 clearItem = setCurrentTaskText ""
 
 clearDate :: Stateful
-clearDate state = flip setCurrentTask state =<< (due .~ Nothing) <$> getCurrentTask state
+clearDate state = pure $ state & lists .~ Lists.clearDue (state ^. current) (state ^. lists)
 
 bottom :: Stateful
 bottom = pure . selectLast

src/Events/State/Modal/Due.hs

@@ -2,6 +2,7 @@
 
 module Events.State.Modal.Due
     ( showDue
+    , clearDate
     , previous
     , next
     , goto
@@ -12,7 +13,7 @@ import ClassyPrelude
 import Control.Lens  ((&), (.~), (^.))
 import Data.Sequence ((!?))
 
-import qualified Data.Taskell.Lists      as L (due)
+import qualified Data.Taskell.Lists      as L (clearDue, due)
 import           Events.State.Types      (Stateful, current, lists, mode)
 import           Events.State.Types.Mode (ModalType (Due), Mode (..))
 
@@ -52,3 +53,14 @@ goto state =
                 Just (pointer, _) -> pure $ state & current .~ pointer
                 Nothing           -> Nothing
         _ -> pure state
+
+clearDate :: Stateful
+clearDate state =
+    case state ^. mode of
+        Modal (Due due cur) ->
+            case due !? cur of
+                Just (pointer, _) -> do
+                    let cleared = state & lists .~ L.clearDue pointer (state ^. lists)
+                    pure $ cleared & mode .~ Modal (Due (L.due (cleared ^. lists)) 0)
+                Nothing -> Nothing
+        _ -> pure state