Add config field to select visible table columns and their order (#113)

* Add support for new `Age` column that shows the age of a task in a human readable fuzzy way

---------

Co-authored-by: Adrian Sieber <[email protected]>

Author: apraga

Dockerfile

@@ -6,7 +6,6 @@ WORKDIR /tasklite
 COPY stack.yaml stack.yaml
 
 COPY tasklite/README.md tasklite/README.md
-COPY tasklite/example-config.yaml tasklite/example-config.yaml
 COPY tasklite/package.yaml tasklite/package.yaml
 
 COPY tasklite-core/README.md tasklite-core/README.md
@@ -35,7 +34,7 @@ FROM haskell:9.8.4-slim-bullseye
 RUN apt-get update && \
     apt-get install -y libgmp10
 COPY --from=builder \
-    /tasklite/tasklite/example-config.yaml \
+    /tasklite-core/example-config.yaml \
     /root/.config/tasklite/config.yaml
 COPY --from=builder /root/.local/bin/tasklite /usr/local/bin/tasklite
 

haskell.png

@@ -1,4 +1,9 @@
 tableName: tasks
+
+# Select columns and their order for the table view.
+# `body` should be the last column, as its width varies for each task.
+columns: [id, prio, openedUtc, age, body]
+
 idWidth: 4
 idStyle: green
 priorityStyle: magenta
@@ -8,6 +13,10 @@ bodyClosedStyle: black
 closedStyle: dull black
 dueStyle: yellow
 overdueStyle: red
+# Shows `Opened UTC` column per default.
+# Set this to `true` to show an `Age` column with a
+# human readable duration of the task's age.
+# useDuration: false
 tagStyle: blue
 utcFormat: YYYY-MM-DD H:MI:S
 #| FIXME: Blocked by https://github.com/vincenthz/hs-hourglass/issue

tasklite-core/example-config.yaml

@@ -227,6 +227,28 @@ addHookFilesToConfig config = do
     (config, [])
 
 
+data Column = IdCol | PrioCol | OpenedUTCCol | AgeCol | BodyCol | EmptyCol
+  deriving (Eq, Show, Generic)
+
+
+instance ToJSON Column where
+  toJSON IdCol = String "id"
+  toJSON PrioCol = String "prio"
+  toJSON OpenedUTCCol = String "openedUtc"
+  toJSON AgeCol = String "age"
+  toJSON BodyCol = String "body"
+  toJSON EmptyCol = String ""
+instance FromJSON Column where
+  parseJSON = withText "Column" $ \value -> do
+    case value of
+      "id" -> pure IdCol
+      "prio" -> pure PrioCol
+      "openedUtc" -> pure OpenedUTCCol
+      "age" -> pure AgeCol
+      "body" -> pure BodyCol
+      _ -> pure EmptyCol
+
+
 data Config = Config
   { tableName :: Text
   , idStyle :: AnsiStyle
@@ -240,6 +262,7 @@ data Config = Config
   , tagStyle :: AnsiStyle
   , utcFormat :: TimeFormatString
   , utcFormatShort :: TimeFormatString
+  , columns :: [Column]
   , dataDir :: FilePath
   , dbName :: FilePath
   , dateWidth :: Int
@@ -271,6 +294,7 @@ instance FromJSON Config where
     utcFormat       <- o .:? "utcFormat" .!= defaultConfig.utcFormat
     utcFormatShort  <- o .:? "utcFormatShort" .!= defaultConfig.utcFormatShort
     dataDir         <- o .:? "dataDir" .!= defaultConfig.dataDir
+    columns         <- o .:? "columns" .!= defaultConfig.columns
     dbName          <- o .:? "dbName" .!= defaultConfig.dbName
     dateWidth       <- o .:? "dateWidth" .!= defaultConfig.dateWidth
     bodyWidth       <- o .:? "bodyWidth" .!= defaultConfig.bodyWidth
@@ -367,6 +391,7 @@ defaultConfig =
     , tagStyle = color Blue
     , utcFormat = toFormat ("YYYY-MM-DD H:MI:S" :: [Char])
     , utcFormatShort = toFormat ("YYYY-MM-DD H:MI" :: [Char])
+    , columns = [IdCol, PrioCol, OpenedUTCCol, BodyCol]
     , dataDir = ""
     , dbName = "main.db"
     , dateWidth = 10