Merge pull request #1416 from eikek/dashboard-tables

Dashboard tables

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

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 {
+        if (logger.id == scribe.Logger.RootId) {
-          case Format.Fancy =>
+          cfg.format match {
-            l.withHandler(formatter = Formatter.enhanced, writer = SystemOutWriter)
+            case Format.Fancy =>
-          case Format.Plain =>
+              l.withHandler(formatter = Formatter.default, writer = SystemOutWriter)
-            l.withHandler(formatter = Formatter.classic, writer = SystemOutWriter)
+            case Format.Plain =>
-          case Format.Json =>
+              l.withHandler(formatter = Formatter.classic, writer = SystemOutWriter)
-            l.withHandler(writer = JsonWriter(SystemOutWriter))
+            case Format.Json =>
-          case Format.Logfmt =>
+              l.withHandler(writer = JsonWriter(SystemOutWriter))
-            l.withHandler(writer = LogfmtWriter(SystemOutWriter))
+            case Format.Logfmt =>
-        },
+              l.withHandler(writer = LogfmtWriter(SystemOutWriter))
+          }
+        } else l,
       _.replace()
     )
 

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

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
                 ]

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 ]

nix/module-joex.nix

@@ -18,7 +18,7 @@ let
     };
     logging = {
       minimum-level = "Info";
-      format = "Plain";
+      format = "Fancy";
     };
     mail-debug = false;
     jdbc = {

nix/module-server.nix

@@ -23,7 +23,7 @@ let
     };
     logging = {
       minimum-level = "Info";
-      format = "Plain";
+      format = "Fancy";
     };
     integration-endpoint = {
       enabled = false;

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
   )
 
 }