feat(new-debugger): Display running version

platonic-io · Mar 24, 2022 · dcea4ec · dcea4ec
1 parent 75aa484
commit dcea4ec
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/src/new-debugger/src/Debugger/State.hs b/src/new-debugger/src/Debugger/State.hs
@@ -2,6 +2,7 @@
 module Debugger.State where
 
 import Data.Aeson
+import Data.Int
 import GHC.Generics (Generic)
 
 import Data.Vector (Vector)
@@ -21,6 +22,7 @@ instance ToJSON DebEvent
 data InstanceState = InstanceState
  { isState :: String -- Should probably be per reactor
  , isCurrentEvent :: DebEvent
+ , isRunningVersion :: Int64
  , isSeqDia :: String
  , isLogs :: [String]
  , isSent :: [DebEvent]
@@ -29,6 +31,7 @@ data InstanceState = InstanceState
 data InstanceStateRepr = InstanceStateRepr
   { state :: String
   , currentEvent :: DebEvent
+  , runningVersion :: Int64
   , logs :: [String]
   , sent :: [DebEvent]
   } deriving Generic
@@ -45,6 +48,7 @@ fromRepr = fmap repr
     repr i = InstanceState
       { isState = state i
       , isCurrentEvent = currentEvent i
+      , isRunningVersion = runningVersion i
       , isSeqDia = "Sequence Diagram not supported yet!" -- should actually be built here
       , isLogs = logs i
       , isSent = sent i

diff --git a/src/new-debugger/src/Debugger/UI.hs b/src/new-debugger/src/Debugger/UI.hs
@@ -32,6 +32,7 @@ drawUI as = [ui]
              ]
            , vBox
              [ borderWithLabel (str "Input") $ renderMessage as
+             , vLimit 3 $ borderWithLabel (str "Version") $ renderVersion as
              , borderWithLabel (str "Output") $ renderSentMessage as
              ]
            ]
@@ -71,6 +72,9 @@ renderSeqDia as = renderToString as isSeqDia
 renderMessage :: AppState -> Widget ()
 renderMessage as = renderToString as (message . isCurrentEvent)
 
+renderVersion :: AppState -> Widget ()
+renderVersion as = renderToString as (show . isRunningVersion)
+
 renderSentMessage :: AppState -> Widget ()
 renderSentMessage as = renderToString as (addEmpty . unlines . map (renderEvent True) . isSent)
   where

diff --git a/src/sut/dumblog/src/Dumblog/Journal/Main.hs b/src/sut/dumblog/src/Dumblog/Journal/Main.hs
@@ -115,6 +115,7 @@ replayDebug originCommands originState = do
         is = InstanceStateRepr
              { state = show (ppEditExpr ansiWlPretty (ediff s s'))
              , currentEvent = ce
+             , runningVersion = v
              , logs = logLines
              , sent = [ DebEvent
                         { from = "dumblog"