From e616fde9b7675e720775df1ac1159f4d5897a0a4 Mon Sep 17 00:00:00 2001 From: eikek Date: Wed, 23 Feb 2022 22:48:00 +0100 Subject: [PATCH 1/3] Fix logger configuration --- .../logging/impl/ScribeConfigure.scala | 22 ++++++++++--------- project/TestSettings.scala | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/modules/logging/scribe/src/main/scala/docspell/logging/impl/ScribeConfigure.scala b/modules/logging/scribe/src/main/scala/docspell/logging/impl/ScribeConfigure.scala index d0324ef5..ace08881 100644 --- a/modules/logging/scribe/src/main/scala/docspell/logging/impl/ScribeConfigure.scala +++ b/modules/logging/scribe/src/main/scala/docspell/logging/impl/ScribeConfigure.scala @@ -44,16 +44,18 @@ object ScribeConfigure { _.clearHandlers(), _.withMinimumLevel(ScribeWrapper.convertLevel(cfg.minimumLevel)), l => - cfg.format match { - case Format.Fancy => - l.withHandler(formatter = Formatter.enhanced, writer = SystemOutWriter) - case Format.Plain => - l.withHandler(formatter = Formatter.classic, writer = SystemOutWriter) - case Format.Json => - l.withHandler(writer = JsonWriter(SystemOutWriter)) - case Format.Logfmt => - l.withHandler(writer = LogfmtWriter(SystemOutWriter)) - }, + if (logger.id == scribe.Logger.RootId) { + cfg.format match { + case Format.Fancy => + l.withHandler(formatter = Formatter.default, writer = SystemOutWriter) + case Format.Plain => + l.withHandler(formatter = Formatter.classic, writer = SystemOutWriter) + case Format.Json => + l.withHandler(writer = JsonWriter(SystemOutWriter)) + case Format.Logfmt => + l.withHandler(writer = LogfmtWriter(SystemOutWriter)) + } + } else l, _.replace() ) diff --git a/project/TestSettings.scala b/project/TestSettings.scala index cf8909e1..67073f6f 100644 --- a/project/TestSettings.scala +++ b/project/TestSettings.scala @@ -30,7 +30,7 @@ object TestSettingsPlugin extends AutoPlugin { val testSettings = Seq( libraryDependencies ++= inTest(Dependencies.munit, Dependencies.scribe), - testFrameworks += new TestFramework("munit.Framework") + testFrameworks += TestFrameworks.MUnit ) } From 8103e25e3245583c06dc68d712f25c07e3326544 Mon Sep 17 00:00:00 2001 From: eikek Date: Wed, 23 Feb 2022 23:26:11 +0100 Subject: [PATCH 2/3] Set default log format to fancy --- modules/joex/src/main/resources/reference.conf | 2 +- modules/restserver/src/main/resources/reference.conf | 2 +- nix/module-joex.nix | 2 +- nix/module-server.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/joex/src/main/resources/reference.conf b/modules/joex/src/main/resources/reference.conf index 58347c8c..5bb7bacf 100644 --- a/modules/joex/src/main/resources/reference.conf +++ b/modules/joex/src/main/resources/reference.conf @@ -22,7 +22,7 @@ docspell.joex { logging { # The format for the log messages. Can be one of: # Json, Logfmt, Fancy or Plain - format = "Plain" + format = "Fancy" # The minimum level to log. From lowest to highest: # Trace, Debug, Info, Warn, Error diff --git a/modules/restserver/src/main/resources/reference.conf b/modules/restserver/src/main/resources/reference.conf index afd77ae7..14b21372 100644 --- a/modules/restserver/src/main/resources/reference.conf +++ b/modules/restserver/src/main/resources/reference.conf @@ -25,7 +25,7 @@ docspell.server { logging { # The format for the log messages. Can be one of: # Json, Logfmt, Fancy or Plain - format = "Plain" + format = "Fancy" # The minimum level to log. From lowest to highest: # Trace, Debug, Info, Warn, Error diff --git a/nix/module-joex.nix b/nix/module-joex.nix index 99387dd1..b387df16 100644 --- a/nix/module-joex.nix +++ b/nix/module-joex.nix @@ -18,7 +18,7 @@ let }; logging = { minimum-level = "Info"; - format = "Plain"; + format = "Fancy"; }; mail-debug = false; jdbc = { diff --git a/nix/module-server.nix b/nix/module-server.nix index f0413a4f..12c8dea1 100644 --- a/nix/module-server.nix +++ b/nix/module-server.nix @@ -23,7 +23,7 @@ let }; logging = { minimum-level = "Info"; - format = "Plain"; + format = "Fancy"; }; integration-endpoint = { enabled = false; From b664b5771d1ea88961cba23d4c7fa7191022094b Mon Sep 17 00:00:00 2001 From: eikek Date: Wed, 23 Feb 2022 23:18:58 +0100 Subject: [PATCH 3/3] Fixes in dashboard table view - The first tag was rendered with slightly higher height than the rest - Columns between first and last are hidden on small screens - Use `break-all` to break all words if necessary without trying to keep whole words --- .../webapp/src/main/elm/Comp/BoxQueryView.elm | 32 +++++++++++++++++-- .../src/main/elm/Comp/ItemColumnView.elm | 2 +- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/modules/webapp/src/main/elm/Comp/BoxQueryView.elm b/modules/webapp/src/main/elm/Comp/BoxQueryView.elm index 574a8792..6bce5bf1 100644 --- a/modules/webapp/src/main/elm/Comp/BoxQueryView.elm +++ b/modules/webapp/src/main/elm/Comp/BoxQueryView.elm @@ -123,6 +123,12 @@ viewItemHead texts meta = let ( col1, cols ) = getColumns meta + + isSecond n = + n == 1 + + isNotLast n = + n > 1 && n < List.length cols in if not meta.showHeaders then [] @@ -131,7 +137,18 @@ viewItemHead texts meta = [ thead [] [ tr [] (List.map texts.itemColumn.header (col1 :: cols) - |> List.map (\n -> th [ class "text-left text-sm" ] [ text n ]) + |> List.indexedMap + (\index -> + \n -> + th + [ class "text-left text-sm" + , classList + [ ( "hidden sm:table-cell", isSecond index ) + , ( "hidden md:table-cell", isNotLast index ) + ] + ] + [ text n ] + ) ) ] ] @@ -143,12 +160,18 @@ viewItemRow texts settings meta item = ( col1, cols ) = getColumns meta + isSecond n = + n == 0 + + isNotLast n = + n > 0 && n < (List.length cols - 1) + render col = Comp.ItemColumnView.renderDiv texts.templateCtx settings col - [ class "flex flex-row flex-wrap space-x-1 space-y-1" ] + [ class "flex flex-row break-all flex-wrap space-x-1" ] item td1 = @@ -164,7 +187,10 @@ viewItemRow texts settings meta item = tdRem index col = td [ class "py-1 px-1" - , classList [ ( "hidden md:table-cell", index > 1 ) ] + , classList + [ ( "hidden sm:table-cell", isSecond index ) + , ( "hidden md:table-cell", isNotLast index ) + ] ] [ render col ] diff --git a/modules/webapp/src/main/elm/Comp/ItemColumnView.elm b/modules/webapp/src/main/elm/Comp/ItemColumnView.elm index 0c86f296..eeaf3378 100644 --- a/modules/webapp/src/main/elm/Comp/ItemColumnView.elm +++ b/modules/webapp/src/main/elm/Comp/ItemColumnView.elm @@ -29,7 +29,7 @@ renderDiv ctx settings col attr item = (List.map (\t -> div - [ class "label text-sm" + [ class "label text-sm mt-1" , class <| Data.UiSettings.tagColorString2 t settings ] [ text t.name ]