From 32bed159615b96ebab23766d748a844b1ba42f41 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 17 Feb 2022 16:20:58 +0100 Subject: [PATCH] feat(system-msg): display volatile cluster settings in msg list --- src/Handler/SystemMessage.hs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Handler/SystemMessage.hs b/src/Handler/SystemMessage.hs index 00e034c3f..e37367582 100644 --- a/src/Handler/SystemMessage.hs +++ b/src/Handler/SystemMessage.hs @@ -15,6 +15,7 @@ import Data.Map ((!)) import qualified Data.Map.Lazy as Map import qualified Data.List.NonEmpty as NonEmpty import qualified Data.Set as Set +import qualified Data.Text as Text (intercalate) import qualified Database.Esqueleto.Legacy as E @@ -202,6 +203,7 @@ postMessageListR = do , sortable Nothing (i18nCell MsgSystemMessageId) $ \DBRow{ dbrOutput = (Entity smId _, _) } -> anchorCellM' (encrypt smId) MessageR ciphertext , sortable (Just "from") (i18nCell MsgSystemMessageFrom) $ \DBRow{ dbrOutput = (Entity _ SystemMessage{..}, _) } -> cell $ maybe mempty (formatTimeW SelFormatDateTime) systemMessageFrom , sortable (Just "to") (i18nCell MsgSystemMessageTo) $ \DBRow{ dbrOutput = (Entity _ SystemMessage{..}, _) } -> cell $ maybe mempty (formatTimeW SelFormatDateTime) systemMessageTo + , sortable (Just "on-volatile-cluster-settings") (i18nCell MsgSystemMessageOnVolatileClusterSettings) $ \DBRow{ dbrOutput = (Entity _ SystemMessage{..}, _) } -> cell . toWidget . unlines . fmap (\(k,v) -> Text.intercalate " = " [tshow k, tshow v]) $ Set.toList systemMessageOnVolatileClusterSettings , sortable (Just "news-only") (i18nCell MsgSystemMessageNewsOnly) $ \DBRow { dbrOutput = (Entity _ SystemMessage{..}, _) } -> tickmarkCell systemMessageNewsOnly , sortable (Just "authenticated") (i18nCell MsgSystemMessageAuthenticatedOnly) $ \DBRow{ dbrOutput = (Entity _ SystemMessage{..}, _) } -> tickmarkCell systemMessageAuthenticatedOnly , sortable (Just "severity") (i18nCell MsgSystemMessageSeverity) $ \DBRow{ dbrOutput = (Entity _ SystemMessage{..}, _) } -> i18nCell systemMessageSeverity @@ -230,6 +232,9 @@ postMessageListR = do , ( "to" , SortColumn $ \systemMessage -> systemMessage E.^. SystemMessageTo ) + , ( "on-volatile-cluster-settings" + , SortColumn $ \systemMessage -> systemMessage E.^. SystemMessageOnVolatileClusterSettings + ) , ( "news-only" , SortColumn $ \systemMessage -> systemMessage E.^. SystemMessageNewsOnly )