Merge remote-tracking branch 'origin/adinapoli/issue-369' into dev

gargantext-settings.toml

@@ -19,6 +19,6 @@ allowed-origins = [
 
 use-origins-for-hosts = true
 
-[microservices]
-
-proxy-port = 8009
+[microservices.proxy]
+port    = 8009
+enabled = false

src/Gargantext/API/Admin/Settings/MicroServices.hs

@@ -13,12 +13,14 @@ import Toml
 data MicroServicesSettings =
   MicroServicesSettings {
     -- | The port where the microservices proxy will be listening on.
-    _msProxyPort :: Int
+    _msProxyPort    :: !Int
+  , _msProxyEnabled :: !Bool
   } deriving (Show, Eq)
 
 microServicesSettingsCodec :: TomlCodec MicroServicesSettings
 microServicesSettingsCodec = MicroServicesSettings
-  <$> Toml.int "proxy-port" .= _msProxyPort
+  <$> Toml.int  "port"    .= _msProxyPort
+  <*> Toml.bool "enabled" .= _msProxyEnabled
 
 mkProxyUrl :: GargConfig -> MicroServicesSettings -> BaseUrl
 mkProxyUrl GargConfig{..} MicroServicesSettings{..} =

src/Gargantext/API/Admin/Settings/TOML.hs

@@ -22,7 +22,7 @@ makeLenses ''GargTomlSettings
 settingsCodec :: TomlCodec GargTomlSettings
 settingsCodec = GargTomlSettings
   <$> (Toml.table corsSettingsCodec "cors" .= _gargCorsSettings)
-  <*> (Toml.table  microServicesSettingsCodec "microservices" .= _gargMicroServicesSettings)
+  <*> (Toml.table  microServicesSettingsCodec "microservices.proxy" .= _gargMicroServicesSettings)
 
 -- | Extends the 'allowed-origins' in the CORSettings with the URLs embellished
 -- with the proxy port.

src/Gargantext/Database/Action/Node.hs

@@ -25,6 +25,7 @@ import Data.Text qualified as T
 import Gargantext.API.Admin.Settings.MicroServices
 import Gargantext.API.Admin.Types (settings, _microservicesSettings, HasSettings)
 import Gargantext.Core
+import Gargantext.Core.Config (GargConfig(..))
 import Gargantext.Core.Types (Name)
 import Gargantext.Database.Admin.Types.Hyperdata
 import Gargantext.Database.Admin.Types.Hyperdata.Default
@@ -34,7 +35,6 @@ import Gargantext.Database.Query.Table.Node
 import Gargantext.Database.Query.Table.Node.Error
 import Gargantext.Database.Query.Table.Node.UpdateOpaleye (updateHyperdata)
 import Gargantext.Prelude hiding (hash)
-import Gargantext.Core.Config (GargConfig(..))
 import Gargantext.Prelude.Crypto.Hash (hash)
 import Servant.Client.Core.BaseUrl
 
@@ -96,8 +96,14 @@ mkNodeWithParent_ConfigureHyperdata NodeFrameNotebook (Just i) uId name = (:[])
 
 mkNodeWithParent_ConfigureHyperdata    _ _ _ _ = nodeError NotImplYet
 
-internalNotesProxy :: BaseUrl -> T.Text
-internalNotesProxy proxyUrl = T.pack $ showBaseUrl proxyUrl <> "/notes"
+-- | Creates the base URL for the notes microservices proxy, or defaults
+-- to the notes microservice if the proxy has been disabled from the settings.
+internalNotesProxy :: GargConfig -> MicroServicesSettings -> T.Text
+internalNotesProxy cfg msSettings
+  | _msProxyEnabled msSettings = T.pack $ showBaseUrl proxyUrl <> "/notes"
+  | otherwise                  = _gc_frame_write_url cfg
+  where
+    proxyUrl = mkProxyUrl cfg msSettings
 
 -- | Function not exposed
 mkNodeWithParent_ConfigureHyperdata' :: (HasNodeError err, HasDBid NodeType, HasSettings env)
@@ -116,7 +122,7 @@ mkNodeWithParent_ConfigureHyperdata' nt (Just i) uId name = do
   cfg <- view hasConfig
   stt <- view settings
   u <- case nt of
-        Notes -> pure $ internalNotesProxy (mkProxyUrl cfg $ _microservicesSettings stt)
+        Notes -> pure $ internalNotesProxy cfg (_microservicesSettings stt)
         Calc  -> pure $ _gc_frame_calc_url  cfg
         NodeFrameVisio -> pure $ _gc_frame_visio_url  cfg
         _              -> nodeError NeedsConfiguration

test-data/gargantext-settings.toml

@@ -19,6 +19,6 @@ allowed-origins = [
 
 use-origins-for-hosts = true
 
-[microservices]
-
-proxy-port = 8009
+[microservices.proxy]
+port    = 8009
+enabled = false