maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(users/Profpatsch/whatcd-resolver): Remove dynatable

Browse source 
In favor of all-server-side rendering.

Change-Id: I439c31cc6184cd1f6f77843819eebfb396e0ace8
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8872
Reviewed-by: Profpatsch <mail@profpatsch.de>
Tested-by: BuildkiteCI
This commit is contained in:
Profpatsch 2023-06-29 14:33:26 +02:00
parent 68a9037d17
commit fa0b7d0804
1 changed files with 20 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

91
users/Profpatsch/whatcd-resolver/src/WhatcdResolver.hs
View file

@ -46,10 +46,9 @@ import System.Directory qualified as Dir
import System.Directory qualified as Xdg import System.Directory qualified as Xdg
import System.FilePath ((</>)) import System.FilePath ((</>))
import System.IO qualified as IO import System.IO qualified as IO
import Text.Blaze.Html (Html, (!)) import Text.Blaze.Html (Html)
import Text.Blaze.Html.Renderer.Utf8 qualified as Html import Text.Blaze.Html.Renderer.Utf8 qualified as Html
import Text.Blaze.Html5 qualified as Html import Text.Blaze.Html5 qualified as Html
import Text.Blaze.Html5.Attributes qualified as Attr
import UnliftIO import UnliftIO
htmlUi :: App () htmlUi :: App ()
@ -84,71 +83,17 @@ htmlUi = do
mkVal <$> (runTransaction $ getTorrentById dat) mkVal <$> (runTransaction $ getTorrentById dat)
_ -> h mainHtml _ -> h mainHtml
where where
tableData =
( [ "Group ID",
"Torrent ID",
"Artist",
"Name",
"Weight",
"Torrent"
],
\t ->
[ Enc.int t.groupId,
Enc.int t.torrentId,
Enc.text t.torrentGroupJson.artist,
Enc.text t.torrentGroupJson.groupName,
Enc.int t.seedingWeight,
Enc.value t.torrentJson
]
)
mkTable :: ([Text], t -> [Enc]) -> [t] -> Html
mkTable f ts = do
let headers = Html.thead (fst f <&> Html.toHtml @Text <&> Html.th & mconcat)
let keys = fst f <&> Text.toLower <&> Text.replace " " "_"
let json = Enc.list (\t -> Enc.object (zip keys (t & snd f))) ts
let tableDataScript =
Html.script
! Attr.type_ "application/json"
! Attr.id "table-data"
$ (json & Enc.encToBytesUtf8 & bytesToTextUtf8Unsafe & Html.text)
[hsx|
{tableDataScript}
<table id="table" class="table">
{headers}
<tbody>
</tbody>
</table>
<script>
var tableData = JSON.parse($("#table-data").text());
$("table").dynatable({
dataset: {
records: tableData
}
} )
</script>
|]
mainHtml = runTransaction $ do mainHtml = runTransaction $ do
bestTorrents <- getBestTorrents bestTorrentsTable <- getBestTorrentsTable
pure $ pure $
Html.docTypeHtml Html.docTypeHtml
[hsx| [hsx|
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.0/jquery.min.js" integrity="sha512-3gJwYpMe3QewGELv8k/BX9vcqhryRdzRMxVfq6ngyWXwo03GFEzjsUm8Q7RZcHPHksttq7/GFoxjCVUjkjvPdw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-9ndCyUaIbzAi2FUVXJi0CjmCapSmO7SnpJef0486qhLnuZ2cdeRhO02iuK6FUUVM" crossorigin="anonymous"> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-9ndCyUaIbzAi2FUVXJi0CjmCapSmO7SnpJef0486qhLnuZ2cdeRhO02iuK6FUUVM" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-geWF76RCwLtnZ8qwWowPQNguL3RmwHVBC9FhGdlKrxdiJJigb/j/68SIy3Te4Bkz" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-geWF76RCwLtnZ8qwWowPQNguL3RmwHVBC9FhGdlKrxdiJJigb/j/68SIy3Te4Bkz" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/Dynatable/0.3.1/jquery.dynatable.min.js" integrity="sha512-KJdW8vGZWsRYrhMlZ6d8dR/fbLBK/aPOI0xDTEnGysk8TiFffc0S6TLSeSg7Lzk84GhBu9wI+qQatBrnTAeEYQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="https://unpkg.com/htmx.org@1.9.2" integrity="sha384-L6OqL9pRWyyFU3+/bjdSri+iIphTN/bvYyM37tICVyOJkWZLpP2vGn6VUEXgzg6h" crossorigin="anonymous"></script> <script src="https://unpkg.com/htmx.org@1.9.2" integrity="sha384-L6OqL9pRWyyFU3+/bjdSri+iIphTN/bvYyM37tICVyOJkWZLpP2vGn6VUEXgzg6h" crossorigin="anonymous"></script>
<script>
$.dynatableSetup({
table: {
defaultColumnIdStyle: 'underscore'
}
});
</script>
</head> </head>
<body> <body>
<form <form
@ -161,8 +106,9 @@ htmlUi = do
name="redacted-search" /> name="redacted-search" />
<button type="submit">Search</button> <button type="submit">Search</button>
</form> </form>
<div id="redacted-search-results"></div> <div id="redacted-search-results">
{mkTable tableData bestTorrents} {bestTorrentsTable}
</div>
</body> </body>
|] |]
snipsSong = todo snipsSong = todo
@ -170,9 +116,9 @@ htmlUi = do
snipsRedactedSearch :: snipsRedactedSearch ::
( MonadLogger m, ( MonadLogger m,
MonadIO m, MonadIO m,
MonadThrow m,
MonadPostgres m, MonadPostgres m,
HasField "searchstr" r ByteString HasField "searchstr" r ByteString,
MonadThrow m
) => ) =>
r -> r ->
m Html m Html
@ -181,9 +127,13 @@ snipsRedactedSearch dat = do
redactedSearchAndInsert redactedSearchAndInsert
[ ("searchstr", dat.searchstr) [ ("searchstr", dat.searchstr)
] ]
best :: [TorrentData] <- runTransaction $ do runTransaction $ do
t t
getBestTorrents getBestTorrentsTable
getBestTorrentsTable :: (MonadPostgres m) => Transaction m Html
getBestTorrentsTable = do
best :: [TorrentData] <- getBestTorrents
let bestRows = let bestRows =
best best
& foldMap & foldMap
@ -194,7 +144,7 @@ snipsRedactedSearch dat = do
<td>{Html.toHtml @Text b.torrentGroupJson.artist}</td> <td>{Html.toHtml @Text b.torrentGroupJson.artist}</td>
<td>{Html.toHtml @Text b.torrentGroupJson.groupName}</td> <td>{Html.toHtml @Text b.torrentGroupJson.groupName}</td>
<td>{Html.toHtml @Int b.seedingWeight}</td> <td>{Html.toHtml @Int b.seedingWeight}</td>
<td><details hx-post="snips/redacted/torrentDataJson" hx-vals={Enc.encToBytesUtf8 $ Enc.object [("torrent-id", Enc.int b.torrentIdDb)]}></details></td> <td><details hx-trigger="toggle once" hx-post="snips/redacted/torrentDataJson" hx-vals={Enc.encToBytesUtf8 $ Enc.object [("torrent-id", Enc.int b.torrentIdDb)]}></details></td>
</tr> </tr>
|] |]
) )
@ -410,14 +360,13 @@ bla = do
pure (t1 >> t2 >> t3) pure (t1 >> t2 >> t3)
redactedSearchAndInsert :: redactedSearchAndInsert ::
( MonadLogger m1, ( MonadLogger m,
MonadIO m1, MonadIO m,
MonadThrow m1, MonadPostgres m,
MonadPostgres m2, MonadThrow m
MonadThrow m2
) => ) =>
[(ByteString, ByteString)] -> [(ByteString, ByteString)] ->
m1 (Transaction m2 ()) m (Transaction m ())
redactedSearchAndInsert x = redactedSearchAndInsert x =
redactedSearch redactedSearch
x x