remove 'source' property from displayData message

This commit is contained in:
MMesch 2018-07-14 10:47:29 +02:00
parent 1d9f7c357b
commit d5b56fbb51
6 changed files with 9 additions and 14 deletions

View File

@ -203,12 +203,9 @@ replyTo config execCount interface req@ExecuteRequest { getCode = code } replyHe
sendOutput x =
send $ PublishDisplayData
outputHeader
(languageName $ kernelLanguageInfo
config)
(displayOutput config x)
in run config code clearOutput sendOutput
liftIO . send $ PublishDisplayData outputHeader (languageName $ kernelLanguageInfo config)
(displayResult config res)
liftIO . send $ PublishDisplayData outputHeader (displayResult config res)
idleHeader <- dupHeader replyHeader StatusMessage

View File

@ -178,8 +178,7 @@ displayDataParser :: LByteString -> Message
displayDataParser = requestParser $ \obj -> do
dataDict :: Object <- obj .: "data"
let displayDatas = makeDisplayDatas dataDict
maybeSource <- obj .:? "source"
return $ PublishDisplayData noHeader (fromMaybe "" maybeSource) displayDatas
return $ PublishDisplayData noHeader displayDatas
requestParser parser content =
case parseEither parser decoded of

View File

@ -76,9 +76,9 @@ instance ToJSON Message where
object ["execution_state" .= executionState]
toJSON PublishStream { streamType = streamType, streamContent = content } =
object ["data" .= content, "name" .= streamType]
toJSON PublishDisplayData { source = src, displayData = datas } =
toJSON PublishDisplayData { displayData = datas } =
object
["source" .= src, "metadata" .= object [], "data" .= object (map displayDataToJson datas)]
["metadata" .= object [], "data" .= object (map displayDataToJson datas)]
toJSON PublishOutput { executionCount = execCount, reprText = reprText } =
object

View File

@ -366,7 +366,6 @@ data Message =
|
PublishDisplayData
{ header :: MessageHeader
, source :: String -- ^ The name of the data source.
, displayData :: [DisplayData] -- ^ A list of data representations.
}
|

View File

@ -145,7 +145,7 @@ handleMessage send replyHeader state msg = do
DispMsg widget disp -> do
dispHeader <- dupHeader replyHeader DisplayDataMessage
let dmsg = WidgetDisplay dispHeader "haskell" $ unwrap disp
let dmsg = WidgetDisplay dispHeader $ unwrap disp
sendMessage widget (toJSON $ CustomContent $ toJSON dmsg)
ClrOutput widget wait -> do
@ -170,11 +170,11 @@ handleMessage send replyHeader state msg = do
unwrap (Display ddatas) = ddatas
-- Override toJSON for PublishDisplayData for sending Display messages through [method .= custom]
data WidgetDisplay = WidgetDisplay MessageHeader String [DisplayData]
data WidgetDisplay = WidgetDisplay MessageHeader [DisplayData]
instance ToJSON WidgetDisplay where
toJSON (WidgetDisplay replyHeader source ddata) =
let pbval = toJSON $ PublishDisplayData replyHeader source ddata
toJSON (WidgetDisplay replyHeader ddata) =
let pbval = toJSON $ PublishDisplayData replyHeader ddata
in toJSON $ IPythonMessage replyHeader pbval DisplayDataMessage
-- Override toJSON for ClearOutput

View File

@ -63,7 +63,7 @@ publishResult send replyHeader displayed updateNeeded pagerOutput usePager resul
sendOutput (ManyDisplay manyOuts) = mapM_ sendOutput manyOuts
sendOutput (Display outs) = do
header <- dupHeader replyHeader DisplayDataMessage
send $ PublishDisplayData header "haskell" $ map (convertSvgToHtml . prependCss) outs
send $ PublishDisplayData header $ map (convertSvgToHtml . prependCss) outs
convertSvgToHtml (DisplayData MimeSvg svg) = html $ makeSvgImg $ base64 $ E.encodeUtf8 svg
convertSvgToHtml x = x