bin/gargantext-cli/CLI/Server/Routes.hs

@@ -14,8 +14,8 @@ import Data.Aeson.Encode.Pretty
 import Data.ByteString qualified as B
 import Data.ByteString.Lazy qualified as BL
 import Gargantext.API.Routes.Named
+import Gargantext.Prelude
 import Options.Applicative
-import Prelude
 import Servant.API
 import Servant.API.Routes
 import Servant.API.WebSocket qualified as WS (WebSocketPending)
@@ -52,6 +52,6 @@ instance HasRoutes Raw where
 routesCLI :: CLIRoutes -> IO ()
 routesCLI = \case
   CLIR_list
-    -> printRoutes @(NamedRoutes API)
+    -> printRoutesSorted @(NamedRoutes API)
   (CLIR_export filePath)
     -> B.writeFile filePath . BL.toStrict $ encodePretty (getRoutes @(NamedRoutes API))

bin/update-project-dependencies

@@ -16,7 +16,7 @@ fi
 # with the `sha256sum` result calculated on the `cabal.project` and
 # `cabal.project.freeze`. This ensures the files stay deterministic so that CI
 # cache can kick in.
-expected_cabal_project_hash="963418e37a17d4bb67d4b885613144b36d290f612eea80355e82abc7e76b450c"
+expected_cabal_project_hash="9edc17eed5af9028fa78f4f0265409a535173a57a460e5ba2fee965e097dc37d"
 expected_cabal_project_freeze_hash="cd52143d3a9d285360b59c6371d3e258552c1bc115bd612024db3de1f7593ff7" 
 
 

cabal.project

@@ -146,7 +146,7 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/fpringle/servant-routes.git
-    tag: 7694f62af6bc1596d754b42af16da131ac403b3a
+    tag: c3c558d9278ef239a474f1e1b69afc461be60d01
 
 source-repository-package
     type: git

gargantext.cabal

@@ -120,7 +120,6 @@ library
       Gargantext.API.Admin.Orchestrator.Types
       Gargantext.API.Admin.Settings
       Gargantext.API.Auth.PolicyCheck
-      Gargantext.API.Count.Types
       Gargantext.API.Dev
       Gargantext.API.Errors
       Gargantext.API.Errors.Class
@@ -166,7 +165,6 @@ library
       Gargantext.API.Routes.Named.Contact
       Gargantext.API.Routes.Named.Context
       Gargantext.API.Routes.Named.Corpus
-      Gargantext.API.Routes.Named.Count
       Gargantext.API.Routes.Named.Document
       Gargantext.API.Routes.Named.EKG
       Gargantext.API.Routes.Named.File
@@ -332,7 +330,6 @@ library
       Gargantext.API.Admin.Auth
       Gargantext.API.Admin.FrontEnd
       Gargantext.API.Context
-      Gargantext.API.Count
       Gargantext.API.EKG
       Gargantext.API.GraphQL
       Gargantext.API.GraphQL.Annuaire

nix/pkgs.nix

@@ -19,6 +19,7 @@ rec {
     ghc966
     cabal_install
     pkgs.haskellPackages.alex
+    pkgs.haskellPackages.ghcid
     pkgs.haskellPackages.happy
     pkgs.haskellPackages.pretty-show
   ];

src/Gargantext/API/Count.hs

-{-|
-Module      : Gargantext.API.Count
-Description : Server API
-Copyright   : (c) CNRS, 2017-Present
-License     : AGPL + CECILL v3
-Maintainer  : team@gargantext.org
-Stability   : experimental
-Portability : POSIX
-
-Count API part of Gargantext.
--}
-
-{-# OPTIONS_GHC -fno-warn-deprecations #-}
-
-{-# LANGUAGE TemplateHaskell    #-}
-{-# LANGUAGE TypeOperators      #-}
-{-# LANGUAGE DeriveAnyClass     #-}
-
-module Gargantext.API.Count (
-    countAPI
-  ) where
-
-import Gargantext.API.Count.Types
-import Gargantext.API.Routes.Named.Count qualified as Named
-import Gargantext.Prelude
-import Servant.Server.Generic (AsServerT)
-
------------------------------------------------------------------------
--- TODO-ACCESS: CanCount
--- TODO-EVENTS: No events as this is a read only query.
------------------------------------------------------------------------
-countAPI :: Query -> Named.CountAPI (AsServerT m)
-countAPI _ = Named.CountAPI undefined

src/Gargantext/API/Count/Types.hs

-{-|
-Module      : Gargantext.API.Count.Types
-Description : 
-Copyright   : (c) CNRS, 2017-Present
-License     : AGPL + CECILL v3
-Maintainer  : team@gargantext.org
-Stability   : experimental
-Portability : POSIX
-
--}
-
-{-# LANGUAGE TemplateHaskell    #-}
-
-module Gargantext.API.Count.Types (
-    Scraper(..)
-  , QueryBool(..)
-  , Query(..)
-  , Message(..)
-  , Code
-  , Error
-  , Errors
-  , Counts(..)
-  , Count(..)
-
-  -- * functions
-  , scrapers
-  ) where
-
-import Data.Swagger ( ToSchema(..), genericDeclareNamedSchema )
-import Data.Text (pack)
-import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)
-import Gargantext.Prelude
-import Test.QuickCheck (elements)
-import Test.QuickCheck.Arbitrary (Arbitrary(..))
-
------------------------------------------------------------------------
-data Scraper = Pubmed | Hal | IsTex | Isidore
-  deriving (Eq, Show, Generic, Enum, Bounded)
-
-scrapers :: [Scraper]
-scrapers = [minBound..maxBound]
-
-instance FromJSON Scraper
-instance ToJSON   Scraper
-
-instance Arbitrary Scraper where
-    arbitrary = elements scrapers
-
-instance ToSchema Scraper
-
------------------------------------------------------------------------
-data QueryBool = QueryBool Text
-        deriving (Eq, Show, Generic)
-
-queries :: [QueryBool]
-queries =  [QueryBool (pack "(X OR X') AND (Y OR Y') NOT (Z OR Z')")]
---queries =  [QueryBool (pack "(X + X') * (Y + Y') - (Z + Z')")]
-
-instance Arbitrary QueryBool where
-    arbitrary = elements queries
-
-instance FromJSON QueryBool
-instance ToJSON   QueryBool
-
-instance ToSchema QueryBool
------------------------------------------------------------------------
-
-data Query = Query { query_query :: QueryBool
-                   , query_name  :: Maybe [Scraper]
-                   }
-                   deriving (Eq, Show, Generic)
-instance FromJSON Query
-instance ToJSON   Query
-
-instance Arbitrary Query where
-    arbitrary = elements [ Query q (Just n) 
-                         | q <- queries
-                         , n <- take 10 $ permutations scrapers
-                         ]
-
-instance ToSchema Query where
-  declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "query_")
-
------------------------------------------------------------------------
-type Code = Integer
-type Error  = Text
-type Errors = [Error]
-
------------------------------------------------------------------------
-data Message = Message Code Errors
-        deriving (Eq, Show, Generic)
-
-toMessage :: [(Code, Errors)] -> [Message]
-toMessage = map (\(c,err) -> Message c err)
-
-messages :: [Message]
-messages =  toMessage $ [ (400, ["Ill formed query             "])
-                        , (300, ["API connexion error          "])
-                        , (300, ["Internal Gargantext Error    "])
-                        ] <> take 10 ( repeat (200, [""]))
-
-instance Arbitrary Message where
-    arbitrary = elements messages
-
-instance ToSchema Message
------------------------------------------------------------------------
-data Counts = Counts { results :: [Either Message Count]
-                     } deriving (Eq, Show, Generic)
-
-
-instance Arbitrary Counts where
-    arbitrary = elements [Counts [ Right (Count Pubmed (Just 20 ))
-                                 , Right (Count IsTex  (Just 150))
-                                 , Right (Count Hal    (Just 150))
-                                 ]
-                         ]
-
-instance ToSchema Counts
-
------------------------------------------------------------------------
-data Count = Count { count_name    :: Scraper
-                   , count_count   :: Maybe Int
-                   }
-                   deriving (Eq, Show, Generic)
-
-instance ToSchema Count where
-  declareNamedSchema = genericDeclareNamedSchema (unPrefixSwagger "count_")
---instance Arbitrary Count where
---    arbitrary = Count <$> arbitrary <*> arbitrary <*> arbitrary
-
---
--- JSON instances
---
-
-instance FromJSON Message
-instance ToJSON   Message
-
-$(deriveJSON (unPrefix "count_") ''Count)
-
-instance FromJSON Counts
-instance ToJSON   Counts
-

src/Gargantext/API/Ngrams/List.hs

@@ -60,10 +60,13 @@ import Servant.Server.Generic (AsServerT)
 
 
 getAPI :: Named.GETAPI (AsServerT (GargM Env BackendInternalError))
-getAPI = Named.GETAPI $ \listId -> Named.ListEndpoints
-  { listJSONEp    = getJson listId
-  , listJSONZipEp = getJsonZip listId
-  , listTSVEp     = getTsv listId
+getAPI = Named.GETAPI
+  {
+    getListEp = \listId -> Named.ListEndpoints
+                            { listJSONEp    = getJson listId
+                            , listJSONZipEp = getJsonZip listId
+                            , listTSVEp     = getTsv listId
+                            }
   }
 
 --

src/Gargantext/API/Node.hs

@@ -32,7 +32,7 @@ import Gargantext.API.Admin.Auth (withNamedAccess, withNamedPolicyT, withPolicy,
 import Gargantext.API.Admin.EnvTypes (Env)
 import Gargantext.API.Auth.PolicyCheck ( nodeReadChecks, nodeWriteChecks, moveChecks, AccessPolicyManager, publishChecks )
 import Gargantext.API.Errors.Types (BackendInternalError)
-import Gargantext.API.Metrics
+import Gargantext.API.Metrics (chartApi, pieApi, scatterApi, treeApi, updateChart)
 import Gargantext.API.Ngrams.Types (TabType(..))
 import Gargantext.API.Node.DocumentsFromWriteNodes qualified as DFWN
 import Gargantext.API.Node.DocumentUpload qualified as DocumentUpload
@@ -40,7 +40,7 @@ import Gargantext.API.Node.File ( fileApi, fileAsyncApi )
 import Gargantext.API.Node.FrameCalcUpload qualified as FrameCalcUpload
 import Gargantext.API.Node.New ( postNode, postNodeAsyncAPI )
 import Gargantext.API.Node.Share qualified as Share
-import Gargantext.API.Node.Types
+import Gargantext.API.Node.Types (NodesToCategory(..), NodesToScore(..), RenameNode(..))
 import Gargantext.API.Node.Update qualified as Update
 import Gargantext.API.Prelude ( GargM, GargServer, IsGargServer )
 import Gargantext.API.Routes.Named.File qualified as Named
@@ -60,13 +60,13 @@ import Gargantext.Database.Action.Delete qualified as Action (deleteNode)
 import Gargantext.Database.Action.Flow.Pairing (pairing)
 import Gargantext.Database.Admin.Types.Hyperdata (HyperdataAny, HyperdataCorpus, HyperdataAnnuaire)
 import Gargantext.Database.Admin.Types.Hyperdata.Prelude ( HyperdataC )
-import Gargantext.Database.Admin.Types.Node
+import Gargantext.Database.Admin.Types.Node (CorpusId, NodeId, ParentId, RootId, UserId)
 import Gargantext.Database.Prelude (DBCmdExtra, JSONB)
-import Gargantext.Database.Query.Table.Node
+import Gargantext.Database.Query.Table.Node (defaultList, deleteNodes, getNodeWith, getNodesWithParentId)
 import Gargantext.Database.Query.Table.Node.Children (getChildren)
 import Gargantext.Database.Query.Table.NodeContext (nodeContextsCategory, nodeContextsScore)
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError)
-import Gargantext.Database.Query.Table.NodeNode
+import Gargantext.Database.Query.Table.NodeNode (SourceId(..), TargetId(..), pairCorpusWithAnnuaire, _nn_node2_id, getNodeNode)
 import Gargantext.Database.Query.Table.Node.UpdateOpaleye (updateHyperdata)
 import Gargantext.Database.Query.Table.Node.Update qualified as U (update, Update(..), publish)
 import Gargantext.Database.Query.Table.Node.Update (Update(..), update)
@@ -133,7 +133,7 @@ catApi :: CorpusId -> GargServer CatApi
 catApi cId cs' = do
   ret <- nodeContextsCategory $ map (\n -> (cId, n, ntc_category cs')) (ntc_nodesId cs')
   lId <- defaultList cId
-  _ <- updateChart cId (Just lId) Docs Nothing
+  _ <- updateChart cId (Just lId) Docs
   pure ret
 
 ------------------------------------------------------------------------
@@ -234,11 +234,11 @@ genericNodeAPI' :: forall a proxy. ( HyperdataC a )
                 -> Named.NodeAPI a (AsServerT (GargM Env BackendInternalError))
 genericNodeAPI' _ authenticatedUser targetNode =  Named.NodeAPI
   { nodeNodeAPI        = withNamedPolicyT authenticatedUser (nodeReadChecks targetNode) $
-                           Named.NodeNodeAPI $ getNodeWith targetNode (Proxy :: Proxy a)
+                           Named.NodeNodeAPI { getNodeEp = getNodeWith targetNode (Proxy :: Proxy a) }
   , renameAPI          = withNamedPolicyT authenticatedUser (nodeWriteChecks targetNode) $
-                           Named.RenameAPI   $ rename loggedInUserId targetNode
+                           Named.RenameAPI { renameEp = rename loggedInUserId targetNode }
   , postNodeAPI        = withNamedPolicyT authenticatedUser (nodeWriteChecks targetNode) $
-                           Named.PostNodeAPI $ postNode authenticatedUser targetNode
+                           Named.PostNodeAPI { postWithParentEp = postNode authenticatedUser targetNode }
   , postNodeAsyncAPI   = withNamedPolicyT authenticatedUser (nodeWriteChecks targetNode) $
                            postNodeAsyncAPI authenticatedUser targetNode
   , frameCalcUploadAPI = FrameCalcUpload.api authenticatedUser targetNode
@@ -247,29 +247,29 @@ genericNodeAPI' _ authenticatedUser targetNode =  Named.NodeAPI
                            Update.api targetNode
   , deleteEp           = withPolicy authenticatedUser (nodeWriteChecks targetNode) $
                            Action.deleteNode userRootId targetNode
-  , childrenAPI        = Named.ChildrenAPI $ getChildren targetNode (Proxy :: Proxy a)
+  , childrenAPI        = Named.ChildrenAPI { summaryChildrenEp = getChildren targetNode (Proxy :: Proxy a) }
   , tableAPI           = tableApi targetNode
   , tableNgramsAPI     = apiNgramsTableCorpus targetNode
-  , catAPI             = Named.CatAPI $ catApi targetNode
-  , scoreAPI           = Named.ScoreAPI $ scoreApi targetNode
+  , catAPI             = Named.CatAPI { categoriseEp = catApi targetNode }
+  , scoreAPI           = Named.ScoreAPI { scoreNodesEp = scoreApi targetNode }
   , searchAPI          = Search.api targetNode
-  , shareAPI           = Named.ShareNode $ Share.api userRootId targetNode
+  , shareAPI           = Named.ShareNode { shareNodeEp = Share.api userRootId targetNode }
   , unshareEp          = Share.unShare targetNode
   , publishAPI         = withNamedPolicyT authenticatedUser (publishChecks targetNode) $
-                           Named.PublishAPI $ \Named.PublishRequest{pubrq_policy} -> U.publish loggedInUserId targetNode pubrq_policy
+                           Named.PublishAPI { publishEp = \Named.PublishRequest{pubrq_policy} -> U.publish loggedInUserId targetNode pubrq_policy }
   ---- Pairing utilities
   , pairWithEp         = pairWith targetNode
   , pairsEp            = pairs targetNode
-  , pairingEp          = Named.PairingAPI $ getPair targetNode
+  , pairingEp          = Named.PairingAPI { getPairingEp = getPair targetNode }
   ---- VIZ
   , scatterAPI         = scatterApi targetNode
   , chartAPI           = chartApi targetNode
   , pieAPI             = pieApi targetNode
   , treeAPI            = treeApi targetNode
   , phyloAPI           = phyloAPI targetNode
-  , moveAPI            = Named.MoveAPI $ \parentId ->
+  , moveAPI            = Named.MoveAPI { moveNodeEp = \parentId ->
                            withPolicy authenticatedUser (moveChecks (SourceId targetNode) (TargetId parentId)) $
-                             moveNode loggedInUserId targetNode parentId
+                             moveNode loggedInUserId targetNode parentId }
   , fileAPI            = Named.FileAPI { fileDownloadEp = fileApi targetNode }
   , fileAsyncAPI       = fileAsyncApi authenticatedUser targetNode
   , dfwnAPI            = DFWN.api authenticatedUser targetNode

src/Gargantext/API/Node/Update.hs

@@ -92,11 +92,11 @@ updateNode lId (UpdateNodeParamsList Advanced) jobHandle = do
 
   _ <- case corpusId of
     Just cId -> do
-      _ <- Metrics.updatePie cId (Just lId) NgramsTypes.Authors Nothing
+      _ <- Metrics.updatePie cId (Just lId) NgramsTypes.Authors
       markProgress 1 jobHandle
       _ <- Metrics.updateTree cId (Just lId) NgramsTypes.Institutes MapTerm
       markProgress 1 jobHandle
-      _ <- Metrics.updatePie cId (Just lId) NgramsTypes.Sources Nothing
+      _ <- Metrics.updatePie cId (Just lId) NgramsTypes.Sources
       pure ()
     Nothing  -> pure ()
 
@@ -197,7 +197,7 @@ updateDocs cId jobHandle = do
   markProgress 1 jobHandle
   _ <- updateContextScore      cId lId
   markProgress 1 jobHandle
-  _ <- Metrics.updateChart'    cId lId NgramsTypes.Docs Nothing
+  _ <- Metrics.updateChart'    cId lId NgramsTypes.Docs
   markProgress 1 jobHandle
   -- printDebug "updateContextsScore" (cId, lId, u)
   pure ()

src/Gargantext/API/Routes/Named/Contact.hs

@@ -10,12 +10,12 @@ module Gargantext.API.Routes.Named.Contact (
   ) where
 
 
-import GHC.Generics (Generic)
 import Gargantext.API.Node.Contact.Types (AddContactParams(..))
 import Gargantext.API.Routes.Named.Node (NodeNodeAPI(..))
 import Gargantext.API.Worker (WorkerAPI)
 import Gargantext.Database.Admin.Types.Hyperdata.Contact (HyperdataContact)
 import Gargantext.Database.Admin.Types.Node (NodeId)
+import GHC.Generics (Generic)
 import Servant
 
 

src/Gargantext/API/Routes/Named/Corpus.hs

@@ -24,7 +24,7 @@ module Gargantext.API.Routes.Named.Corpus (
 import Data.Aeson.TH (deriveJSON)
 import Data.Swagger (ToSchema(..), genericDeclareNamedSchema)
 import Data.Text (Text)
-import GHC.Generics
+import GHC.Generics (Generic)
 import Gargantext.API.Node.Corpus.Export.Types (Corpus, CorpusSQLite)
 import Gargantext.API.Node.Types (NewWithForm, WithQuery)
 import Gargantext.API.Worker (WorkerAPI)

src/Gargantext/API/Routes/Named/Count.hs

-{-# LANGUAGE TypeOperators #-}
-
-module Gargantext.API.Routes.Named.Count (
-  -- * Routes types
-    CountAPI(..)
-
-  -- * Re-exports
-  , module X
-  ) where
-
-import GHC.Generics (Generic)
-import Gargantext.API.Count.Types as X
-import Servant
-
-
-newtype CountAPI mode = CountAPI
-  { postCountsEp :: mode :- Post '[JSON] X.Counts
-  } deriving Generic

src/Gargantext/API/Routes/Named/Metrics.hs

+{-|
+Module      : Gargantext.API.Routes.Named.Metrics
+Description : Server API
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+Metrics API routes
+
+-}
+
 {-# LANGUAGE TypeOperators #-}
 
 module Gargantext.API.Routes.Named.Metrics (
@@ -10,7 +23,6 @@ module Gargantext.API.Routes.Named.Metrics (
   ) where
 
 import Data.Text (Text)
-import Data.Time (UTCTime)
 import Data.Vector (Vector)
 import GHC.Generics (Generic)
 import Gargantext.API.HashedResponse (HashedResponse)
@@ -26,8 +38,6 @@ import Servant
 
 data TreeAPI mode = TreeAPI
   { treeChartEp       :: mode :- Summary " Tree API"
-                              :> QueryParam "from" UTCTime
-                              :> QueryParam "to"   UTCTime
                               :> QueryParam  "list"       ListId
                               :> QueryParamR "ngramsType" TabType
                               :> QueryParamR "listType"   ListType
@@ -50,7 +60,6 @@ data ScatterAPI mode = ScatterAPI
   { sepGenEp :: mode :- Summary "SepGen IncExc metrics"
                      :> QueryParam  "list"       ListId
                      :> QueryParamR "ngramsType" TabType
-                     :> QueryParam  "limit"      Limit
                      :> Get '[JSON] (HashedResponse Metrics)
   , scatterUpdateEp :: mode :- Summary "Scatter update"
                             :> QueryParam  "list"       ListId
@@ -67,15 +76,12 @@ data ScatterAPI mode = ScatterAPI
 
 data PieAPI mode = PieAPI
   { getPieChartEp :: mode :- Summary "Pie Chart"
-                          :> QueryParam "from" UTCTime
-                          :> QueryParam "to"   UTCTime
                           :> QueryParam  "list"       ListId
                           :> QueryParamR "ngramsType" TabType
                           :> Get '[JSON] (HashedResponse (ChartMetrics Histo))
   , pieChartUpdateEp :: mode :- Summary "Pie Chart update"
                              :> QueryParam  "list"       ListId
                              :> QueryParamR "ngramsType" TabType
-                             :> QueryParam  "limit"      Limit
                              :> Post '[JSON] ()
   , pieHashEp :: mode :- "hash"
                       :> Summary "Pie Hash"
@@ -87,15 +93,12 @@ data PieAPI mode = PieAPI
 
 data ChartAPI mode = ChartAPI
   { getChartEp :: mode :- Summary " Chart API"
-                       :> QueryParam "from" UTCTime
-                       :> QueryParam "to"   UTCTime
                        :> QueryParam  "list"       ListId
                        :> QueryParamR "ngramsType" TabType
                        :> Get '[JSON] (HashedResponse (ChartMetrics Histo))
   , updateChartEp :: mode :- Summary "Chart update"
                           :> QueryParam  "list"       ListId
                           :> QueryParamR "ngramsType" TabType
-                          :> QueryParam  "limit"      Limit
                           :> Post '[JSON] ()
   , chartHashEp :: mode :- "hash"
                         :> Summary "Chart Hash"

src/Gargantext/API/Routes/Named/Private.hs

@@ -30,19 +30,18 @@ import Gargantext.API.Auth.PolicyCheck (PolicyChecked)
 import Gargantext.API.Routes.Named.Contact (ContactAPI)
 import Gargantext.API.Routes.Named.Context (ContextAPI)
 import Gargantext.API.Routes.Named.Corpus (AddWithTempFile, AddWithQuery, CorpusExportAPI, MakeSubcorpusAPI)
-import Gargantext.API.Routes.Named.Count (CountAPI, Query)
 import Gargantext.API.Routes.Named.Document (DocumentExportAPI)
 import Gargantext.API.Routes.Named.List (GETAPI, JSONAPI, TSVAPI)
-import Gargantext.API.Routes.Named.Node
-import Gargantext.API.Routes.Named.Remote
-import Gargantext.API.Routes.Named.Share
-import Gargantext.API.Routes.Named.Table
-import Gargantext.API.Routes.Named.Tree
-import Gargantext.API.Routes.Named.Viz
-import Gargantext.Database.Admin.Types.Hyperdata.Any
-import Gargantext.Database.Admin.Types.Hyperdata.Corpus
-import Gargantext.Database.Admin.Types.Node
-import GHC.Generics
+import Gargantext.API.Routes.Named.Node (NodeAPI, NodesAPI, NodeNodeAPI, Roots)
+import Gargantext.API.Routes.Named.Remote (RemoteImportAPI)
+import Gargantext.API.Routes.Named.Share (ShareURL)
+import Gargantext.API.Routes.Named.Table (TableNgramsAPI)
+import Gargantext.API.Routes.Named.Tree (NodeTreeAPI, TreeFlatAPI)
+import Gargantext.API.Routes.Named.Viz (GraphAPI, PhyloExportAPI)
+import Gargantext.Database.Admin.Types.Hyperdata.Any (HyperdataAny)
+import Gargantext.Database.Admin.Types.Hyperdata.Corpus (HyperdataAnnuaire, HyperdataCorpus)
+import Gargantext.Database.Admin.Types.Node (ContextId, CorpusId, DocId, NodeId)
+import GHC.Generics (Generic)
 import Servant.API
 import Servant.Auth qualified as SA
 
@@ -81,9 +80,6 @@ data GargPrivateAPI' mode = GargPrivateAPI'
                                          :> NamedRoutes DocumentExportAPI
   , phyloExportAPI    :: mode :- "phylo" :> Capture "node_id" DocId
                                          :> NamedRoutes PhyloExportAPI
-  , countAPI :: mode :- "count" :> Summary "Count endpoint"
-                                :> ReqBody '[JSON] Query
-                                :> NamedRoutes CountAPI
   , graphAPI :: mode :- "graph" :> Summary "Graph endpoint"
                                 :> Capture "graph_id" NodeId
                                 :> NamedRoutes GraphAPI

src/Gargantext/API/Routes/Named/Remote.hs

+{-|
+Module      : Gargantext.API.Routes.Named.Remote
+Description : Server API
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+-}
+
 
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE TypeOperators #-}
+
 module Gargantext.API.Routes.Named.Remote (
   -- * Routes types
     RemoteExportAPI(..)
@@ -13,16 +25,15 @@ import Conduit qualified as C
 import Data.Aeson as JSON
 import Data.ByteString.Lazy qualified as BL
 import Data.ByteString qualified as BS
-import Data.Proxy
-import Data.Swagger hiding (Http)
+import Data.Proxy (Proxy(Proxy))
+import Data.Swagger (NamedSchema(..), ToSchema, declareNamedSchema, binarySchema, sketchStrictSchema)
 import Gargantext.API.Admin.Auth.Types (Token)
 import Gargantext.API.Auth.PolicyCheck (PolicyChecked)
 import Gargantext.Database.Admin.Types.Node ( NodeId (..) )
-import GHC.Generics
+import GHC.Generics (Generic)
 import Prelude
 import Servant.API
-import Servant.Client.Core.BaseUrl
-import Test.QuickCheck
+import Servant.Client.Core.BaseUrl (BaseUrl(..), parseBaseUrl, Scheme(Http))
 
 
 data RemoteExportAPI mode = RemoteExportAPI
@@ -42,9 +53,6 @@ data RemoteExportRequest =
   , _rer_instance_auth :: Token
   } deriving (Show, Eq, Generic)
 
-instance Arbitrary RemoteExportRequest where
-  arbitrary = RemoteExportRequest <$> (pure (BaseUrl Http "dev.sub.gargantext.org" 8008 "")) <*> arbitrary
-
 instance ToJSON RemoteExportRequest where
   toJSON RemoteExportRequest{..}
     = JSON.object [ "instance_url"  .= toJSON _rer_instance_url

src/Gargantext/API/Routes/Named/Share.hs

@@ -17,7 +17,7 @@ import Data.Aeson (withText)
 import Data.Swagger (ToSchema, declareNamedSchema)
 import Data.Text qualified as T
 import Gargantext.API.Node.Share.Types ( ShareNodeParams (..) )
-import Gargantext.Database.Admin.Types.Node
+import Gargantext.Database.Admin.Types.Node (NodeId, NodeType)
 import Gargantext.Prelude
 import Network.URI (parseURI)
 import Prelude (fail)

src/Gargantext/API/Search.hs

 {-|
-Module      : Gargantext.API.Count
+Module      : Gargantext.API.Search
 Description : Server API
 Copyright   : (c) CNRS, 2017-Present
 License     : AGPL + CECILL v3

src/Gargantext/API/Server/Named/Ngrams.hs

@@ -75,7 +75,8 @@ apiNgramsAsync nId =
     }
 
 tableNgramsPostChartsAsync :: ( HasNodeStory env err m
-                              , MonadJobStatus m )
+                              , MonadJobStatus m
+                              , MonadLogger m )
                             => UpdateTableNgramsCharts
                             -> JobHandle m
                             -> m ()
@@ -101,7 +102,7 @@ tableNgramsPostChartsAsync utn jobHandle = do
             Authors -> do
               -- printDebug "[tableNgramsPostChartsAsync] Authors, updating Pie, cId" cId
               markStarted 1 jobHandle
-              _ <- Metrics.updatePie cId (Just listId) tabType Nothing
+              _ <- Metrics.updatePie cId (Just listId) tabType
               markComplete jobHandle
             Institutes -> do
               -- printDebug "[tableNgramsPostChartsAsync] Institutes, updating Tree, cId" cId
@@ -118,7 +119,7 @@ tableNgramsPostChartsAsync utn jobHandle = do
             Sources -> do
               -- printDebug "[tableNgramsPostChartsAsync] Sources, updating chart, cId" cId
               markStarted 1 jobHandle
-              _ <- Metrics.updatePie cId (Just listId) tabType Nothing
+              _ <- Metrics.updatePie cId (Just listId) tabType
               markComplete jobHandle
             Terms -> do
               -- printDebug "[tableNgramsPostChartsAsync] Terms, updating Metrics (Histo), cId" cId

src/Gargantext/API/Server/Named/Private.hs

@@ -5,7 +5,6 @@ module Gargantext.API.Server.Named.Private where
 import Gargantext.API.Admin.Auth.Types (AuthenticatedUser(..))
 import Gargantext.API.Admin.EnvTypes (Env)
 import Gargantext.API.Context (contextAPI)
-import Gargantext.API.Count qualified as Count
 import Gargantext.API.Errors.Types (BackendInternalError)
 import Gargantext.API.Members (members)
 import Gargantext.API.Ngrams.List qualified as List
@@ -54,7 +53,6 @@ serverPrivateGargAPI' authenticatedUser@(AuthenticatedUser userNodeId userId)
        , tableNgramsAPI    = apiNgramsTableDoc authenticatedUser
        , phyloExportAPI    = PhyloExport.api userNodeId
        , documentExportAPI = documentExportAPI userNodeId
-       , countAPI          = Count.countAPI
        , graphAPI          = Viz.graphAPI authenticatedUser userId
        , treeAPI           = Tree.treeAPI authenticatedUser
        , treeFlatAPI       = Tree.treeFlatAPI authenticatedUser

src/Gargantext/Database/Query/Table/Node.hs

@@ -446,11 +446,11 @@ getOrMkList pId uId =
       mkList' pId' uId' = insertDefaultNode NodeList pId' uId'
 
 -- | TODO remove defaultList
-defaultList :: (HasNodeError err, HasDBid NodeType) => CorpusId -> DBCmd err ListId
+defaultList :: (HasNodeError err) => CorpusId -> DBCmd err ListId
 defaultList cId =
   maybe (nodeError (NoListFound cId)) (pure . view node_id) . headMay =<< getListsWithParentId cId
 
-getListsWithParentId :: HasDBid NodeType => NodeId -> DBCmd err [Node HyperdataList]
+getListsWithParentId :: NodeId -> DBCmd err [Node HyperdataList]
 getListsWithParentId n = runOpaQuery $ selectNodesWith' n (Just NodeList)
 
 -- | Returns the /root/ public node for the input user. By root we mean that

stack.yaml

@@ -134,7 +134,7 @@
   git: "https://github.com/delanoe/patches-map"
   subdirs:
   - .
-- commit: 7694f62af6bc1596d754b42af16da131ac403b3a
+- commit: c3c558d9278ef239a474f1e1b69afc461be60d01
   git: "https://github.com/fpringle/servant-routes.git"
   subdirs:
   - .

test/Test/Instances.hs

@@ -42,6 +42,7 @@ import Gargantext.API.Node.Update.Types qualified as NU
 import Gargantext.API.Node.Types (NewWithForm, NewWithTempFile(..), RenameNode(..), WithQuery)
 import Gargantext.API.Public.Types (PublicData(..))
 import Gargantext.API.Routes.Named.Publish (PublishRequest(..))
+import Gargantext.API.Routes.Named.Remote (RemoteExportRequest(..))
 import Gargantext.API.Search.Types (SearchQuery(..), SearchResult(..), SearchResultTypes(..), SearchType(..))
 import Gargantext.API.Table.Types (TableQuery(..))
 import Gargantext.API.Viz.Types (PhyloData)
@@ -58,6 +59,7 @@ import Gargantext.Database.Admin.Types.Hyperdata qualified as Hyperdata
 import Gargantext.Database.Admin.Types.Node (NodeId(..), UserId(..), NodeType(..))
 import Gargantext.Database.Query.Facet (OrderBy(..))
 import Gargantext.Prelude hiding (replace, Location)
+import Servant.Client.Core.BaseUrl (BaseUrl(..), Scheme(Http))
 import Text.Parsec.Error (ParseError, Message(..), newErrorMessage)
 import Text.Parsec.Pos
 import Test.QuickCheck
@@ -155,6 +157,11 @@ defaultPublicData =
 instance Arbitrary PublishRequest where
   arbitrary = PublishRequest <$> arbitraryBoundedEnum
 
+
+instance Arbitrary RemoteExportRequest where
+  arbitrary = RemoteExportRequest <$> (pure (BaseUrl Http "dev.sub.gargantext.org" 8008 "")) <*> arbitrary
+
+
 instance Arbitrary SearchQuery where
   arbitrary = elements [SearchQuery (RawQuery "electrodes") SearchDoc]
   -- arbitrary = elements [SearchQuery "electrodes" 1 ] --SearchDoc]