Update from WIP

src/Gargantext/API/Admin/EnvTypes.hs

@@ -51,7 +51,6 @@ import Gargantext.Core.NodeStory
 import Gargantext.Database.Prelude (HasConnectionPool(..))
 import Gargantext.Prelude hiding (to)
 import Gargantext.System.Logging
-import Gargantext.Utils.Jobs.Error
 import Gargantext.Utils.Jobs.Map (LoggerM, J(..), jTask, rjGetLog)
 import Gargantext.Utils.Jobs.Monad qualified as Jobs
 import Network.HTTP.Client (Manager)
@@ -186,21 +185,19 @@ data ConcreteJobHandle err =
   | JobHandle {
       _jh_id     :: !(SJ.JobID 'SJ.Safe)
     , _jh_logger :: LoggerM (GargM Env err) JobLog
-    , _jh_warnings :: [WarningDiagnostic]
     }
 
 -- | Creates a new /concrete/ 'JobHandle', given its underlying 'JobID' and the logging function to
 -- be used to report the status.
 mkJobHandle :: SJ.JobID 'SJ.Safe
             -> LoggerM (GargM Env err) JobLog
-            -> [WarningDiagnostic]
             -> ConcreteJobHandle err
 mkJobHandle jId = JobHandle jId
 
 -- | Updates the status of a 'JobHandle' by using the input 'updateJobStatus' function.
 updateJobProgress :: ConcreteJobHandle err -> (JobLog -> JobLog) -> GargM Env err ()
 updateJobProgress ConcreteNullHandle _ = pure ()
-updateJobProgress hdl@(JobHandle _ logStatus _) updateJobStatus =
+updateJobProgress hdl@(JobHandle _ logStatus) updateJobStatus =
   Jobs.getLatestJobStatus hdl >>= logStatus . updateJobStatus
 
 
@@ -214,7 +211,7 @@ instance Jobs.MonadJobStatus (GargM Env err) where
   noJobHandle Proxy = ConcreteNullHandle
 
   getLatestJobStatus ConcreteNullHandle = pure noJobLog
-  getLatestJobStatus (JobHandle jId _ _) = do
+  getLatestJobStatus (JobHandle jId _) = do
     mb_jb <- Jobs.findJob jId
     case mb_jb of
       Nothing -> pure noJobLog
@@ -229,7 +226,7 @@ instance Jobs.MonadJobStatus (GargM Env err) where
                                    l :< _ -> l
 
   withTracer _ ConcreteNullHandle f  = f ConcreteNullHandle
-  withTracer extraLogger (JobHandle jId logger _) n = n (JobHandle jId (\w -> logger w >> liftIO (extraLogger w)) [])
+  withTracer extraLogger (JobHandle jId logger) n = n (JobHandle jId (\w -> logger w >> liftIO (extraLogger w)))
 
   markStarted n jh = updateJobProgress jh (const $ jobLogStart (RemainingSteps n))
 

src/Gargantext/API/Job.hs

@@ -51,11 +51,7 @@ addErrorEvent :: ToHumanFriendlyError e => e -> JobLog -> JobLog
 addErrorEvent message = addEvent "ERROR" (mkHumanFriendly message)
 
 addWarningEvent :: WarningDiagnostic -> JobLog -> JobLog
-<<<<<<< HEAD
-addWarningEvent message = addEvent "ERROR" (renderWarningDiagnostic message)
-=======
 addWarningEvent message = addEvent "WARNING" (renderWarningDiagnostic message)
->>>>>>> 99c6b95c (warning in JobHandle and Monad)
 
 jobLogProgress :: Int -> JobLog -> JobLog
 jobLogProgress n jl = over (scst_succeeded . _Just) (+ n) $

src/Gargantext/Utils/Jobs/Internal.hs

@@ -27,7 +27,6 @@ import Servant.API.Alternative
 import Servant.API.ContentTypes
 
 import Gargantext.API.Errors.Types (BackendInternalError)
-import Gargantext.Utils.Jobs.Error
 import Gargantext.Utils.Jobs.Map
 import Gargantext.Utils.Jobs.Monad
 
@@ -44,7 +43,7 @@ serveJobsAPI
      , ToJSON event, ToJSON output, MimeRender JSON output
      , Foldable callback
      )
-  => (SJ.JobID 'SJ.Safe -> LoggerM m event -> [WarningDiagnostic] -> JobHandle m)
+  => (SJ.JobID 'SJ.Safe -> LoggerM m event -> JobHandle m)
   -> m env
   -> t
   -> (JobError -> BackendInternalError)