nuttycom/aftok - Change ZIG57EE6RB22JGB3CT33EN2HVYCHCXBT5GROBTBMBLEMDTGQOOBQC

Fix project selection, end log end on project switch.

Created by Kris Nuttycombe on August 19, 2020

ZIG57EE6RB22JGB3CT33EN2HVYCHCXBT5GROBTBMBLEMDTGQOOBQC

Dependencies

In channels

main

Change contents

Deletion in client/src/Aftok/Project.purs at line 14 [3.532]
B:BD[3.887] → [3.887:916]
```
import Data.JSDate as JSDate
```
Insertion in client/src/Aftok/Project.purs at line 15 [3.532]
[3.954]
[3.996]
```
import Data.JSDate as JSDate
```
Insertion in client/src/Aftok/Project.purs at line 17 [3.532]
[3.1026]
[2.108]
```
import Data.Newtype (class Newtype)
```
Insertion in client/src/Aftok/Project.purs at line 32 [3.532]
[2.263]
[2.263]
```
import Halogen.HTML.Core (ClassName(..))
```
Replacement in client/src/Aftok/Project.purs at line 36 [3.532]
B:BD[2.332] → [2.332:368]
```
import Effect.Class.Console (error)
```
[2.332]
[2.368]
```
import Effect.Class.Console (log, error)
```

Insertion in client/src/Aftok/Project.purs at line 39 [3.532]

[2.404]

derive instance projectIdEq :: Eq ProjectId
derive instance newtypeProjectId :: Newtype ProjectId _

Insertion in client/src/Aftok/Project.purs at line 51 [3.532]
[3.1635]
[3.1635]
```
derive instance newtypeProject :: Newtype (Project' a) _
```

Replacement in client/src/Aftok/Project.purs at line 90 [3.532]

B:BD[2.1320] → [2.1320:1518]

       in HH.select
            [E.onSelectedIndexChange (Just <<< Select)]
            ([HH.option [P.selected true, P.disabled true] [HH.text "Select a project"]] <> map renderOption st.projects)

[2.1320]

[2.1518]

      in HH.div
           [P.classes (ClassName <$> ["form-group"])]
           [HH.label
             [ P.classes (ClassName <$> ["sr-only"])
             , P.for "projectSelect"
             ]
             [ HH.text "Project" ]
           ,HH.select
             [P.classes (ClassName <$> ["form-control"])
             ,P.id_ "projectSelect"
             ,E.onSelectedIndexChange (Just <<< Select)
             ]
             ([HH.option [P.selected true, P.disabled true] [HH.text "Select a project"]] <> map renderOption st.projects)
           ]

Replacement in client/src/Aftok/Project.purs at line 116 [3.532]

B:BD[2.1902] → [2.1902:1947]

        traverse_ H.raise (index projects i)

[2.1902]

[3.1869]

        log $ "Selected project index " <> show i
        traverse_ H.raise (index projects (i - 1))

Replacement in client/src/Aftok/Timeline.purs at line 13 [4.2287]

B:BD[2.2494] → [2.2494:2539]

import Data.Maybe (Maybe(..), maybe, isJust)

[2.2494]

[2.2539]

import Data.Foldable (any)
import Data.Maybe (Maybe(..), maybe, isJust, isNothing)
import Data.Newtype (unwrap)

Replacement in client/src/Aftok/Timeline.purs at line 58 [4.2287]
B:BD[4.3221] → [4.3221:3238]
```
type Interval = 
```
[4.3221]
[4.3238]
```
type Interval =
```
Replacement in client/src/Aftok/Timeline.purs at line 63 [4.2287]
B:BD[4.3283] → [4.3283:3306]
```
type TimelineLimits = 
```
[4.3283]
[5.301928]
```
type TimelineLimits =
```
Replacement in client/src/Aftok/Timeline.purs at line 69 [4.2287]
B:BD[4.3422] → [4.3422:3444]
```
type TimelineState = 
```
[4.3422]
[5.301976]
```
type TimelineState =
```
Replacement in client/src/Aftok/Timeline.purs at line 88 [4.2287]
B:BD[4.3688] → [2.3159:3173]
```
type Slots = 
```
[4.3688]
[2.3173]
```
type Slots =
```
Replacement in client/src/Aftok/Timeline.purs at line 99 [4.2287]
B:BD[6.259] → [2.3397:3408]
```
component 
```
[6.259]
[2.3408]
```
component
```
Replacement in client/src/Aftok/Timeline.purs at line 101 [4.2287]
B:BD[2.3439] → [2.3439:3460]
```
  .  Capability Aff 
```
[2.3439]
[2.3460]
```
  .  Capability Aff
```
Replacement in client/src/Aftok/Timeline.purs at line 104 [4.2287]
B:BD[2.3536] → [2.3536:3574]
```
component caps pcaps = H.mkComponent 
```
[2.3536]
[5.302289]
```
component caps pcaps = H.mkComponent
```
Replacement in client/src/Aftok/Timeline.purs at line 106 [4.2287]
∅:D[5.302306] → [4.4370:4382]
B:BD[4.4370] → [4.4370:4382]
B:BD[4.4382] → [5.302307:302343]
```
  , render 
  , eval: H.mkEval $ H.defaultEval 
```
[5.302306]
[5.302343]
```
  , render
  , eval: H.mkEval $ H.defaultEval
```
Replacement in client/src/Aftok/Timeline.purs at line 109 [4.2287]
B:BD[5.302371] → [5.302371:302409]
```
      , initialize = Just Initialize 
```
[5.302371]
[5.302409]
```
      , initialize = Just Initialize
```
Replacement in client/src/Aftok/Timeline.purs at line 113 [4.2287]
B:BD[5.302461] → [5.302461:302483]
```
    initialState _ = 
```
[5.302461]
[2.3575]
```
    initialState _ =
```

Replacement in client/src/Aftok/Timeline.purs at line 121 [4.2287]

∅:D[6.502] → [5.302724:302741]

∅:D[2.3797] → [5.302724:302741]

B:BD[5.302724] → [5.302724:302741]

B:BD[5.302741] → [2.3798:3820]

    render st = 
      let lineForm =

[2.3797]

[2.3820]

    render st =
      HH.section
        [P.classes (ClassName <$> ["section-border", "border-primary"])]
        [HH.div
          [P.classes (ClassName <$> ["container", "pt-6"])]
          [HH.h1
            [P.classes (ClassName <$> ["mb-0", "font-weight-bold", "text-center"])]
            [HH.text "Time Tracker"]
          ,HH.p
            [P.classes (ClassName <$> ["col-md-5", "text-muted", "text-center", "mx-auto"])]
            [HH.text "Today's project timeline"]
          ,HH.div_
            [HH.slot _projectList unit (Project.projectListComponent pcaps) unit (Just <<< ProjectSelected)]
          ]
          ,HH.div
            [P.classes (ClassName <$> if isNothing st.selectedProject then ["collapse"] else [])]

Insertion in client/src/Aftok/Timeline.purs at line 142 [4.2287]
[2.4075]
[2.4075]
```
                ,P.disabled (isJust st.active)
```
Insertion in client/src/Aftok/Timeline.purs at line 148 [4.2287]
[2.4281]
[2.4281]
```
                ,P.disabled (isNothing st.active)
```

Replacement in client/src/Aftok/Timeline.purs at line 153 [4.2287]

B:BD[5.303581] → [2.4338:5047]

       in HH.section 
          [P.classes (ClassName <$> ["section-border", "border-primary"])]
          ([HH.div
            [P.classes (ClassName <$> ["container-fluid", "pt-6"])]
            [HH.h1 
              [P.classes (ClassName <$> ["mb-0", "font-weight-bold", "text-center"])]
              [HH.text "Time Tracker"]
            ,HH.p
              [P.classes (ClassName <$> ["col-md-5", "text-muted", "text-center", "mx-auto"])]
              [HH.text "Today's project timeline"]
            ,HH.div_ 
              [HH.slot _projectList unit (Project.projectListComponent pcaps) unit (Just <<< ProjectSelected)]
            ]
          ] <> (if isJust st.selectedProject then lineForm else []))

[5.303581]

[4.4812]

Replacement in client/src/Aftok/Timeline.purs at line 162 [4.2287]
B:BD[5.303950] → [5.303950:303972]
```
            limits = 
```
[5.303950]
[5.303972]
```
            limits =
```

Replacement in client/src/Aftok/Timeline.purs at line 177 [4.2287]

B:BD[4.5215] → [2.5185:5213]

      ProjectSelected p ->

[4.5215]

[2.5213]

      ProjectSelected p -> do
        active <- isJust <$> H.gets (_.active)
        currentProject <- H.gets (_.selectedProject)
        log $ "Active: " <> show active <> "; " <> show ((_.projectName) <<< unwrap <$> currentProject)
        log $ "Selected: " <> show ((_.projectName) <<< unwrap $ p)
        when (active && any (\p' -> (unwrap p').projectId /= (unwrap p).projectId) currentProject)
             (traverse_ logEnd currentProject)

Deletion in client/src/Aftok/Timeline.purs at line 187 [4.2287]

B:BD[5.304266] → [2.5266:5497]

        let withProject (Project' p) = do
              logged <- lift $ caps.logStart p.projectId
              case logged of 
                Left _ -> log "Failed to start timer."
                Right t -> H.modify_ (start t)

Replacement in client/src/Aftok/Timeline.purs at line 188 [4.2287]

B:BD[2.5543] → [2.5543:5641]

        log $ "Project selected? " <> show (isJust project)
        traverse_ withProject project

[2.5543]

[5.304322]

        traverse_ logStart project

Replacement in client/src/Aftok/Timeline.purs at line 191 [4.2287]

B:BD[5.304343] → [2.5642:5953]

        let withProject (Project' p) = do
              logged <- lift $ caps.logEnd p.projectId
              case logged of 
                Left _ -> log "Failed to stop timer."
                Right t -> H.modify_ (stop t)
        project <- H.gets (_.selectedProject)
        traverse_ withProject project

[5.304343]

[5.304398]

        currentProject <- H.gets (_.selectedProject)
        traverse_ logEnd currentProject

Replacement in client/src/Aftok/Timeline.purs at line 198 [4.2287]

B:BD[5.304478] → [5.304478:304488]

lineHtml

[5.304478]

[5.304488]

    logStart :: Project -> H.HalogenM TimelineState TimelineAction Slots output Aff Unit
    logStart (Project' p) = do
      logged <- lift $ caps.logStart p.projectId
      case logged of
        Left _ -> log "Failed to start timer."
        Right t -> H.modify_ (start t)
    logEnd :: Project -> H.HalogenM TimelineState TimelineAction Slots output Aff Unit
    logEnd (Project' p) = do
      logged <- lift $ caps.logEnd p.projectId
      case logged of
        Left _ -> log "Failed to stop timer."
        Right t -> H.modify_ (stop t)
lineHtml

Replacement in client/src/Aftok/Timeline.purs at line 227 [4.2287]
B:BD[4.5481] → [5.304867:304881]
```
intervalHtml 
```
[4.5481]
[5.304881]
```
intervalHtml
```
Replacement in client/src/Aftok/Timeline.purs at line 229 [4.2287]
B:BD[5.304908] → [2.5954:5975]
∅:D[2.5975] → [5.304950:304965]
B:BD[5.304950] → [5.304950:304965]
```
  .  TimelineLimits 
  -> Interval 
```
[5.304908]
[5.304965]
```
  .  TimelineLimits
  -> Interval
```
Replacement in client/src/Aftok/Timeline.purs at line 232 [4.2287]
B:BD[5.305001] → [2.5976:6001]
```
intervalHtml limits i = 
```
[5.305001]
[6.1082]
```
intervalHtml limits i =
```

Replacement in client/src/Aftok/Timeline.purs at line 234 [4.2287]

B:BD[6.1128] → [6.1128:1204]

      ileft = ilen limits.start i.start 
      iwidth = ilen i.start i.end

[6.1128]

[3.3544]

      ileft = ilen limits.start i.start
      iwidth = ilen i.start i.end

Replacement in client/src/Aftok/Timeline.purs at line 239 [4.2287]
B:BD[5.305233] → [5.305233:305254]
```
    [ CSS.style do  
```
[5.305233]
[5.305254]
```
    [ CSS.style do
```
Replacement in client/src/Aftok/Timeline.purs at line 260 [4.2287]
B:BD[4.6275] → [4.6275:6288]
```
start t s = 
```
[4.6275]
[5.305764]
```
start t s =
```
Replacement in client/src/Aftok/Timeline.purs at line 265 [4.2287]
B:BD[4.6438] → [4.6438:6450]
```
stop t s = 
```
[4.6438]
[5.305825]
```
stop t s =
```
Replacement in client/src/Aftok/Timeline.purs at line 271 [4.2287]
B:BD[4.6639] → [4.6639:6654]
```
refresh t s = 
```
[4.6639]
[6.1347]
```
refresh t s =
```
Replacement in client/src/Aftok/Timeline.purs at line 273 [4.2287]
B:BD[6.1387] → [6.1387:1432]
```
    , active = map (_ { end = t }) s.active 
```
[6.1387]
[5.306012]
```
    , active = map (_ { end = t }) s.active
```
Replacement in client/src/Aftok/Timeline.purs at line 277 [4.2287]
B:BD[4.6800] → [5.306019:306039]
```
ilen _start _end = 
```
[4.6800]
[4.6813]
```
ilen _start _end =
```

Replacement in client/src/Aftok/Timeline.purs at line 281 [4.2287]

B:BD[4.6890] → [2.6002:6092]

logStart :: ProjectId -> Aff (Either TimelineError Instant)
logStart (ProjectId pid) = do

[4.6890]

[2.6092]

apiLogStart :: ProjectId -> Aff (Either TimelineError Instant)
apiLogStart (ProjectId pid) = do

Replacement in client/src/Aftok/Timeline.purs at line 292 [4.2287]

B:BD[2.6623] → [2.6623:6709]

logEnd :: ProjectId -> Aff (Either TimelineError Instant)
logEnd (ProjectId pid) = do

[2.6623]

[2.6709]

apiLogEnd :: ProjectId -> Aff (Either TimelineError Instant)
apiLogEnd (ProjectId pid) = do

Replacement in client/src/Aftok/Timeline.purs at line 304 [4.2287]
B:BD[2.7270] → [2.7270:7307]
```
apiCapability = { logStart, logEnd }
```
[2.7270]
[2.7307]
```
apiCapability = { logStart: apiLogStart, logEnd: apiLogEnd }
```
Replacement in client/src/Aftok/Timeline.purs at line 307 [4.2287]
B:BD[6.1466] → [6.1466:1484]
```
mockCapability = 
```
[6.1466]
[2.7309]
```
mockCapability =
```

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 589 [8.456]

B:BD[7.23482] → [7.23482:23571]

  [sql| SELECT p.id, p.project_name, p.inception_date, p.initiator_id, p.depreciation_fn

[7.23482]

[9.15643]

  [sql| SELECT DISTINCT ON (p.inception_date, p.id) p.id, p.project_name, p.inception_date, p.initiator_id, p.depreciation_fn

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 592 [8.456]
∅:D[9.15762] → [10.20139:20174]
B:BD[10.20139] → [10.20139:20174]
```
          OR p.initiator_id = ? |]
```
[9.15762]
[7.23572]
```
          OR p.initiator_id = ?
          ORDER BY p.inception_date, p.id |]
```
Insertion in lib/Aftok/Json.hs at line 16 [11.19]
[7.31084]
[7.31084]
```
import qualified Control.Lens                  as L
```

Insertion in lib/Aftok/Json.hs at line 44 [11.19]

[9.20856]

[7.32274]

import           Aftok.Database                 ( KeyedLogEntry )

Replacement in lib/Aftok/Json.hs at line 131 [11.19]
B:BD[12.2437] → [7.33234:33283]
```
idValue :: forall a . Lens' a UUID -> a -> Value
```
[12.2437]
[9.21821]
```
idValue :: forall a . Getter a UUID -> a -> Value
```

Replacement in lib/Aftok/Json.hs at line 134 [11.19]

B:BD[13.1700] → [7.33284:33340]

idJSON :: forall a . Text -> Lens' a UUID -> a -> Value

[13.1700]

[7.33340]

idJSON :: forall a . Text -> Getter a UUID -> a -> Value

Replacement in lib/Aftok/Json.hs at line 137 [11.19]

B:BD[11.486] → [10.26352:26421]

B:BD[10.26421] → [7.33384:33470]

qdbJSON :: Text -> (Lens' a UUID) -> (b -> Value) -> (a, b) -> Value
qdbJSON name l f (xid, x) =
  v1 $ obj [(name <> "Id") .= idValue l xid, name .= f x]

[11.486]

[14.249]

qdbJSON :: Text -> Getter a UUID -> Getter a Value -> a -> Value
qdbJSON name _id _value x =
  v1 $ obj
    [(name <> "Id") .= idValue _id x
    , name .= (x ^. _value)
    ]

Replacement in lib/Aftok/Json.hs at line 155 [11.19]

B:BD[10.26564] → [10.26564:26622]

qdbProjectJSON = qdbJSON "project" _ProjectId projectJSON

[10.26564]

[15.538]

qdbProjectJSON = qdbJSON "project" (_1 . _ProjectId) (_2 . L.to projectJSON)

Replacement in lib/Aftok/Json.hs at line 271 [11.19]

B:BD[7.36265] → [7.36265:36570]

  v2
    $ let widxRec :: (CreditTo (NetworkId, Address), NonEmpty Interval) -> Value
          widxRec (c, l) = object
            [ "creditTo" .= creditToJSON nmode c
            , "intervals" .= (intervalJSON <$> L.toList l)
            ]
      in  obj $ ["workIndex" .= fmap widxRec (MS.assocs widx)]

[7.36265]

[16.2061]

  v2 $ obj ["workIndex" .= fmap widxRec (MS.assocs widx)]
  where
    widxRec :: (CreditTo (NetworkId, Address), NonEmpty Interval) -> Value
    widxRec (c, l) = object
      [ "creditTo" .= creditToJSON nmode c
      , "intervals" .= (intervalJSON <$> L.toList l)
      ]

Replacement in lib/Aftok/Json.hs at line 287 [11.19]

B:BD[9.25152] → [7.36660:36708]

logEntryJSON nmode (LogEntry c ev m) = v2 $ obj

[9.25152]

[7.36708]

logEntryJSON nmode le = v2 $ obj (logEntryFields nmode le)
logEntryFields :: NetworkMode -> LogEntry (NetworkId, Address) -> [Pair]
logEntryFields nmode (LogEntry c ev m) =

Insertion in lib/Aftok/Json.hs at line 296 [11.19]

[17.5560]

keyedLogEntryJSON :: NetworkMode -> (EventId, KeyedLogEntry (NetworkId, Address)) -> Value
keyedLogEntryJSON nmode le = qdbJSON "event" (_1 . _EventId) (_2 . _3 . to (logEntryJSON nmode)) le

Replacement in lib/Aftok/Json.hs at line 320 [11.19]

B:BD[10.26772] → [10.26772:26836]

qdbBillableJSON = qdbJSON "billable" B._BillableId billableJSON

[10.26772]

[18.1844]

qdbBillableJSON = qdbJSON "billable" (_1 . B._BillableId) (_2 . to billableJSON)

Insertion in server/Aftok/Snaplet/WorkLog.hs at line 1 [19.5424]
[19.5424]
[20.2746]
```
{-# LANGUAGE TupleSections      #-}
```

Replacement in server/Aftok/Snaplet/WorkLog.hs at line 36 [19.5424]

B:BD[19.5831] → [21.18404:18475]

logWorkHandler :: (C.UTCTime -> LogEvent) -> S.Handler App App EventId

[19.5831]

[22.10122]

logWorkHandler :: (C.UTCTime -> LogEvent) -> S.Handler App App (EventId, KeyedLogEntry BTCNet)

Replacement in server/Aftok/Snaplet/WorkLog.hs at line 52 [19.5424]

B:BD[7.58627] → [7.58627:58697]

      Right entry -> snapEval $ createEvent pid uid (entry timestamp)

[7.58627]

[23.570]

      Right entry -> do
        eid <- snapEval $ createEvent pid uid (entry timestamp)
        ev  <- snapEval $ findEvent eid
        maybe
          (snapError 500 $ "An error occured retrieving the newly created event record.")
          (pure . (eid,))
          ev

Replacement in server/Main.hs at line 79 [24.5188]

B:BD[16.2570] → [7.63768:63844]

    logWorkRoute f = serveJSON eventIdJSON $ method POST (logWorkHandler f)

[16.2570]

[7.63844]

    logWorkRoute f =
      serveJSON (keyedLogEntryJSON nmode) $ method POST (logWorkHandler f)

Fix project selection, end log end on project switch.

Dependencies

In channels

Change contents

Deletion in client/src/Aftok/Project.purs at line 14 [3.532]

Insertion in client/src/Aftok/Project.purs at line 15 [3.532]

Insertion in client/src/Aftok/Project.purs at line 17 [3.532]

Insertion in client/src/Aftok/Project.purs at line 32 [3.532]

Replacement in client/src/Aftok/Project.purs at line 36 [3.532]

Insertion in client/src/Aftok/Project.purs at line 39 [3.532]

Insertion in client/src/Aftok/Project.purs at line 51 [3.532]

Replacement in client/src/Aftok/Project.purs at line 90 [3.532]

Replacement in client/src/Aftok/Project.purs at line 116 [3.532]

Replacement in client/src/Aftok/Timeline.purs at line 13 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 58 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 63 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 69 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 88 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 99 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 101 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 104 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 106 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 109 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 113 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 121 [4.2287]

Insertion in client/src/Aftok/Timeline.purs at line 142 [4.2287]

Insertion in client/src/Aftok/Timeline.purs at line 148 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 153 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 162 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 177 [4.2287]

Deletion in client/src/Aftok/Timeline.purs at line 187 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 188 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 191 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 198 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 227 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 229 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 232 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 234 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 239 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 260 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 265 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 271 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 273 [4.2287]

Replacement in client/src/Aftok/Timeline.purs at line 277 [4.2287]