From e87a9e56230419a2a86d260e5729688600f40582 Mon Sep 17 00:00:00 2001
From: Stephan Barth <stephan.barth@uniworx.de>
Date: Mon, 7 Oct 2024 19:04:55 +0200
Subject: [PATCH] chore(versionbump): Add Instances, reordered modules,
 postponed network version bump.

---
 src/Data/Aeson/Types/Instances.hs    | 42 ++++++++++++++++++++++++++++
 src/Data/Aeson/Types/InstancesPre.hs |  2 +-
 src/Handler/Utils/Widgets.hs         |  7 +++--
 src/Import/NoModel.hs                |  2 +-
 src/Jobs/Handler/Files.hs            |  2 +-
 src/Jobs/HealthReport.hs             |  8 ++++--
 6 files changed, 56 insertions(+), 7 deletions(-)
 create mode 100644 src/Data/Aeson/Types/Instances.hs

diff --git a/src/Data/Aeson/Types/Instances.hs b/src/Data/Aeson/Types/Instances.hs
new file mode 100644
index 000000000..d0cbf5131
--- /dev/null
+++ b/src/Data/Aeson/Types/Instances.hs
@@ -0,0 +1,42 @@
+-- SPDX-FileCopyrightText: 2022 Gregor Kleen <gregor.kleen@ifi.lmu.de>,Sarah Vaupel <vaupel.sarah@campus.lmu.de>
+--
+-- SPDX-License-Identifier: AGPL-3.0-or-later
+
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Data.Aeson.Types.Instances
+  (
+  ) where
+
+import Data.Aeson.Types.InstancesPre()
+
+import Import.NoModel
+-- import Database.Persist.Quasi
+-- import Database.Persist.TH.Directory
+-- import Model.Types hiding (_maxPoints, _passingPoints)
+-- import Cron.Types
+
+-- import Data.CaseInsensitive (original)
+-- import Data.CaseInsensitive.Instances ()
+
+-- import Settings.Cluster (ClusterSettingsKey)
+
+import Text.Blaze (ToMarkup(..))
+
+-- import Database.Persist.Sql (BackendKey(..))
+
+-- import qualified Database.Esqueleto.Legacy as E
+
+
+
+import qualified Data.Aeson as Aeson
+import qualified Data.Aeson.Key as Aeson
+
+
+
+instance ToMarkup Aeson.Key where
+  toMarkup = toMarkup . Aeson.toText
+
+instance ToMessage Aeson.Key where
+  toMessage = Aeson.toText
+
diff --git a/src/Data/Aeson/Types/InstancesPre.hs b/src/Data/Aeson/Types/InstancesPre.hs
index 1e1faa09c..ec31d5ef7 100644
--- a/src/Data/Aeson/Types/InstancesPre.hs
+++ b/src/Data/Aeson/Types/InstancesPre.hs
@@ -4,7 +4,7 @@
 
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
-module Data.Aeson.Types.Instances
+module Data.Aeson.Types.InstancesPre
   (
   ) where
 
diff --git a/src/Handler/Utils/Widgets.hs b/src/Handler/Utils/Widgets.hs
index 1e5f6bdc2..31021e8d6 100644
--- a/src/Handler/Utils/Widgets.hs
+++ b/src/Handler/Utils/Widgets.hs
@@ -13,7 +13,10 @@ import Text.Hamlet (shamletFile)
 import Handler.Utils.DateTime
 
 import qualified Data.Char as Char
-import qualified Data.HashMap.Strict as Aeson -- ON UPDATE replace with: import qualified Data.Aeson.KeyMap as Aeson
+-- import qualified Data.HashMap.Strict as Aeson -- ON UPDATE replace with: import qualified Data.Aeson.KeyMap as Aeson
+import qualified Data.Aeson.KeyMap as Aeson
+
+import Data.Aeson.Types.Instances()
 
 ---------
 -- Simple utilities for consistent display
@@ -271,4 +274,4 @@ jsonWidget x = jsonWidgetAux $ toJSON x
               <dt .deflist__dt>#{k}
               <dd .deflist__dd>^{jsonWidgetAux v}
         |]
-      
\ No newline at end of file
+      
diff --git a/src/Import/NoModel.hs b/src/Import/NoModel.hs
index 513c015ac..cc5b29bef 100644
--- a/src/Import/NoModel.hs
+++ b/src/Import/NoModel.hs
@@ -189,7 +189,7 @@ import Data.Time.Calendar.Instances as Import ()
 import Data.Time.Format.Instances as Import ()
 import Network.Mail.Mime.Instances as Import
 import Yesod.Core.Instances as Import ()
-import Data.Aeson.Types.Instances as Import ()
+import Data.Aeson.Types.InstancesPre as Import ()
 import Database.Esqueleto.Instances as Import ()
 import Numeric.Natural.Instances as Import ()
 import Text.Blaze.Instances as Import ()
diff --git a/src/Jobs/Handler/Files.hs b/src/Jobs/Handler/Files.hs
index 158a92f47..55b33cb1c 100644
--- a/src/Jobs/Handler/Files.hs
+++ b/src/Jobs/Handler/Files.hs
@@ -47,7 +47,7 @@ import Jobs.Handler.Intervals.Utils
 import Data.IntervalMap.Strict (IntervalMap)
 import qualified Data.IntervalMap.Strict as IntervalMap
 
-import Control.Concurrent.STM.TVar (stateTVar)
+-- import Control.Concurrent.STM.TVar (stateTVar)
 
 import qualified Data.Foldable as F
 
diff --git a/src/Jobs/HealthReport.hs b/src/Jobs/HealthReport.hs
index 1f503321b..2390028ba 100644
--- a/src/Jobs/HealthReport.hs
+++ b/src/Jobs/HealthReport.hs
@@ -27,8 +27,9 @@ import Auth.LDAP
 
 import qualified Data.CaseInsensitive as CI
 
-import qualified Network.HaskellNet.SMTP as SMTP
-import UnliftIO.Pool (withResource)
+-- not used due to commented out code due to incomplete version bump
+-- import qualified Network.HaskellNet.SMTP as SMTP
+-- import UnliftIO.Pool (withResource)
 
 import Jobs.Queue
 
@@ -131,6 +132,8 @@ dispatchHealthCheckLDAPAdmins = fmap HealthLDAPAdmins . yesodTimeout (^. _appHea
 
 
 dispatchHealthCheckSMTPConnect :: Handler HealthReport
+dispatchHealthCheckSMTPConnect = fmap HealthSMTPConnect . yesodTimeout (^. _appHealthCheckSMTPConnectTimeout) (Just False) $ return Nothing -- dummy value
+{- Versionbump: SMTP has changed; for now, just commented out
 dispatchHealthCheckSMTPConnect = fmap HealthSMTPConnect . yesodTimeout (^. _appHealthCheckSMTPConnectTimeout) (Just False) $ do
   smtpPool <- getsYesod appSmtpPool
   for smtpPool . flip withResource $ \smtpConn -> do
@@ -140,6 +143,7 @@ dispatchHealthCheckSMTPConnect = fmap HealthSMTPConnect . yesodTimeout (^. _appH
       _   -> do
         $logErrorS "Mail" $ "NOOP failed: " <> tshow response
         return False
+-}
 
 
 dispatchHealthCheckWidgetMemcached :: Handler HealthReport