Merge remote-tracking branch 'origin/506-dev-search-in-tree' into dev

src/Gargantext/API/Node.hs

@@ -62,7 +62,7 @@ import Gargantext.Database.Query.Table.Node.Update (Update(..), update)
 import Gargantext.Database.Query.Table.Node.UpdateOpaleye (updateHyperdata)
 import Gargantext.Database.Query.Table.NodeContext (nodeContextsCategory, nodeContextsScore)
 import Gargantext.Database.Query.Table.NodeNode
-import Gargantext.Database.Query.Tree (tree, TreeMode(..))
+import Gargantext.Database.Query.Tree (tree, tree_flat, TreeMode(..))
 import Gargantext.Prelude
 import Servant
 import Test.QuickCheck (elements)
@@ -336,6 +336,13 @@ treeAPI :: NodeId -> GargServer TreeAPI
 treeAPI id = tree TreeAdvanced id
         :<|> tree TreeFirstLevel id
 
+type TreeFlatAPI = QueryParams "type" NodeType
+                    :> QueryParam "query" Text
+                    :> Get '[JSON] [NodeTree]
+
+treeFlatAPI :: NodeId -> GargServer TreeFlatAPI
+treeFlatAPI = tree_flat
+
 ------------------------------------------------------------------------
 -- | TODO Check if the name is less than 255 char
 rename :: NodeId -> RenameNode -> Cmd err [Int]

src/Gargantext/API/Routes.hs

@@ -162,6 +162,10 @@ type GargPrivateAPI' =
            :<|> "tree"    :> Summary "Tree endpoint"
                           :> Capture "tree_id" NodeId
                           :> TreeAPI
+           -- Flat tree endpoint
+           :<|> "treeflat" :> Summary "Flat tree endpoint"
+                           :> Capture "tree_id" NodeId
+                           :> TreeFlatAPI
 
            :<|> "members" :> Summary "Team node members"
                           :> MembersAPI
@@ -252,6 +256,9 @@ serverPrivateGargAPI' (AuthenticatedUser (NodeId uid))
      :<|> withAccess (Proxy :: Proxy TreeAPI)        Proxy uid
           <$> PathNode <*> treeAPI
 
+     :<|> withAccess (Proxy :: Proxy TreeFlatAPI)    Proxy uid
+          <$> PathNode <*> treeFlatAPI
+
      :<|> members uid
      -- TODO access
      :<|> addCorpusWithForm  (RootId (NodeId uid))

src/Gargantext/Database/Query/Tree.hs

@@ -22,6 +22,7 @@ module Gargantext.Database.Query.Tree
   , isDescendantOf
   , isIn
   , tree
+  , tree_flat
   , TreeMode(..)
   , findNodesId
   , DbTreeNode(..)
@@ -43,6 +44,7 @@ import Control.Lens (view, toListOf, at, each, _Just, to, set, makeLenses)
 import Control.Monad.Error.Class (MonadError())
 import Data.List (tail, concat, nub)
 import qualified Data.List as List
+import qualified Data.Text as Text
 import Data.Map.Strict (Map, fromListWith, lookup)
 -- import Data.Monoid (mconcat)
 import Data.Proxy
@@ -95,7 +97,6 @@ tree TreeFirstLevel = tree_first_level
 -- (without shared folders)
 -- keeping this for teaching purpose only
 tree_basic :: (HasTreeError err, HasNodeError err)
-
            => RootId
            -> [NodeType]
            -> Cmd err (Tree NodeTree)
@@ -144,6 +145,22 @@ tree_first_level r nodeTypes = do
   -- printDebug (rPrefix "tree") ret
   pure ret
 
+-- | Fetch tree in a flattened form
+tree_flat :: (HasTreeError err, HasNodeError err)
+          => RootId
+          -> [NodeType]
+          -> Maybe Text
+          -> Cmd err [NodeTree]
+tree_flat r nodeTypes q = do
+  mainRoot <- findNodes r Private nodeTypes
+  publicRoots <- findNodes r PublicDirect nodeTypes
+  sharedRoots <- findNodes r SharedDirect nodeTypes
+  let ret = map toNodeTree (mainRoot <> sharedRoots <> publicRoots)
+  case q of
+    Just v -> pure $ filter (\(NodeTree {_nt_name}) -> Text.isInfixOf (Text.toLower v) (Text.toLower _nt_name)) ret
+    Nothing -> pure $ ret
+
+
 ------------------------------------------------------------------------
 data NodeMode = Private | Shared | Public | SharedDirect | PublicDirect
 
@@ -263,9 +280,9 @@ toTree m =
             -- m' ^.. at (Just $ _dt_nodeId root) . _Just . each . to (toTree' m')
             toListOf (at (Just $ _dt_nodeId root) . _Just . each . to (toTree' m')) m'
 
-        toNodeTree :: DbTreeNode
+toNodeTree :: DbTreeNode
             -> NodeTree
-        toNodeTree (DbTreeNode nId tId _ n) = NodeTree n (fromNodeTypeId tId) nId
+toNodeTree (DbTreeNode nId tId _ n) = NodeTree n (fromNodeTypeId tId) nId
 
 ------------------------------------------------------------------------
 toTreeParent :: [DbTreeNode]