From 1a188afbd7d9f378e6a92624c14025575cc0eded Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Wed, 10 Mar 2021 23:14:35 +0100
Subject: [PATCH] Re-add ui-version to keep browser resource cache in
 service-worker

---
 .../src/main/scala/docspell/restserver/webapp/Flags.scala | 8 +++++---
 .../scala/docspell/restserver/webapp/TemplateRoutes.scala | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala b/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala
index 3966445e..bcd041d3 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala
@@ -18,11 +18,12 @@ case class Flags(
     fullTextSearchEnabled: Boolean,
     maxPageSize: Int,
     maxNoteLength: Int,
-    showClassificationSettings: Boolean
+    showClassificationSettings: Boolean,
+    uiVersion: Int
 )
 
 object Flags {
-  def apply(cfg: Config): Flags =
+  def apply(cfg: Config, uiVersion: Int): Flags =
     Flags(
       cfg.appName,
       getBaseUrl(cfg),
@@ -32,7 +33,8 @@ object Flags {
       cfg.fullTextSearch.enabled,
       cfg.maxItemPageSize,
       cfg.maxNoteLength,
-      cfg.showClassificationSettings
+      cfg.showClassificationSettings,
+      uiVersion
     )
 
   private def getBaseUrl(cfg: Config): String =
diff --git a/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala
index f13dd4be..b42592ac 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala
@@ -133,10 +133,11 @@ object TemplateRoutes {
   )
 
   object IndexData {
+    private[this] val uiVersion = 2
 
     def apply(cfg: Config): IndexData =
       IndexData(
-        Flags(cfg),
+        Flags(cfg, uiVersion),
         chooseUi,
         Seq(
           "/app/assets" + Webjars.clipboardjs + "/clipboard.min.js",
@@ -145,7 +146,7 @@ object TemplateRoutes {
         ),
         s"/app/assets/docspell-webapp/${BuildInfo.version}/favicon",
         s"/app/assets/docspell-webapp/${BuildInfo.version}/docspell.js",
-        Flags(cfg).asJson.spaces2
+        Flags(cfg, uiVersion).asJson.spaces2
       )
 
     private def chooseUi: Seq[String] =