[ENV/DEVENV] Adding HasSettings class and instances (Reader).

src/Gargantext/API.hs

@@ -278,7 +278,7 @@ type API = SwaggerFrontAPI :<|> GargAPI :<|> Get '[HTML] Html
 ---------------------------------------------------------------------
 -- | Server declarations
 
-server :: (HasConnection env, HasRepo env)
+server :: (HasConnection env, HasRepo env, HasSettings env)
        => env -> IO (Server API)
 server env = do
   -- orchestrator <- scrapyOrchestrator env
@@ -318,7 +318,7 @@ gargMock :: Server GargAPI
 gargMock = mock apiGarg Proxy
 
 ---------------------------------------------------------------------
-makeApp :: (HasConnection env, HasRepo env)
+makeApp :: (HasConnection env, HasRepo env, HasSettings env)
         => env -> IO Application
 makeApp = fmap (serve api) . server
 

src/Gargantext/API/Node.hs

@@ -75,7 +75,7 @@ import qualified Data.Vector as Vec
 
 type GargServer api =
   forall env m.
-    (CmdM env ServantErr m, HasRepo env)
+    (CmdM env ServantErr m, HasRepo env, HasSettings env)
     => ServerT api m
 
 -------------------------------------------------------------------
@@ -406,11 +406,11 @@ getMetrics cId maybeListId tabType maybeLimit = do
     listType t m = maybe (panic errorMsg) fst $ Map.lookup t m
     errorMsg     = "API.Node.metrics: key absent"
   
-  {-
+  --{-
   let metrics' = Map.fromListWith (<>) $ map (\(Metric _ s1 s2 lt) -> (lt, [Vec.fromList [s1,s2]])) metrics
   _ <- liftIO $ Learn.grid metrics'
   en <- ask
-  printDebug "path" $  _fileFolder $ _env_settings en
+  printDebug "path" $  _fileFolder $ view repoSettings en
   --}
   pure $ Metrics metrics
 

src/Gargantext/API/Settings.hs

@@ -85,6 +85,9 @@ data Settings = Settings
 
 makeLenses ''Settings
 
+class HasSettings env where
+  repoSettings :: Getter env Settings
+
 
 parseJwk :: Text -> Jose.Jwk
 parseJwk secretStr = jwk
@@ -162,6 +165,9 @@ instance HasRepoSaver Env where
 instance HasRepo Env where
   repoEnv = env_repo
 
+instance HasSettings Env where
+  repoSettings = env_settings
+
 data MockEnv = MockEnv
   { _menv_firewall :: !FireWall
   }
@@ -251,6 +257,7 @@ newEnv port file = do
 data DevEnv = DevEnv
   { _dev_env_conn :: !Connection
   , _dev_env_repo :: !RepoEnv
+  , _dev_env_settings :: !Settings
   }
 
 makeLenses ''DevEnv
@@ -267,6 +274,9 @@ instance HasRepoSaver DevEnv where
 instance HasRepo DevEnv where
   repoEnv = dev_env_repo
 
+instance HasSettings DevEnv where
+  repoSettings = dev_env_settings
+
 cleanEnv :: HasRepo env => env -> IO ()
 cleanEnv env = do
   r <- takeMVar (env ^. repoEnv . renv_var)
@@ -286,6 +296,7 @@ withDevEnv iniPath k = do
       pure $ DevEnv
         { _dev_env_conn = conn
         , _dev_env_repo = repo
+        , _dev_env_settings = devSettings
         }
 
 -- | Run Cmd Sugar for the Repl (GHCI)