Merge branch '350-dev-graph-search-in-forms-not-labels' of...

Merge branch '350-dev-graph-search-in-forms-not-labels' of ssh://gitlab.iscpif.fr:20022/gargantext/purescript-gargantext into dev

.gitlab-ci.yml

@@ -25,7 +25,7 @@ test:
   script:
     # find 0.14.2 purescript version here:
     # https://lazamar.co.uk/nix-versions/
-    - nix-env -i purescript-0.14.2 -f https://github.com/NixOS/nixpkgs/archive/bed08131cd29a85f19716d9351940bdc34834492.tar.gz
+    - nix-env -i purescript-0.14.4 -f https://github.com/NixOS/nixpkgs/archive/bed08131cd29a85f19716d9351940bdc34834492.tar.gz
     - nix-env -i git
     - nix-env -i nodejs
     - nix-env -i yarn

src/Gargantext/Components/GraphExplorer.purs

@@ -260,6 +260,7 @@ convert (GET.GraphData r) = Tuple r.metaData $ SigmaxT.Graph {nodes, edges}
     nodeFn _i nn@(GET.Node n) =
       Seq.singleton {
           borderColor: color
+        , children: n.children
         , color : color
         , equilateral: { numPoints: 3 }
         , gargType

src/Gargantext/Components/GraphExplorer/Search.purs

@@ -2,6 +2,7 @@ module Gargantext.Components.GraphExplorer.Search
   ( Props, nodeSearchControl ) where
 
 import Prelude
+import Data.Foldable (foldl)
 import Data.Sequence as Seq
 import Data.Set as Set
 import DOM.Simple.Console (log2)
@@ -25,32 +26,37 @@ type Props = (
   )
 
 -- | Whether a node matches a search string
+--   Searches given node and matches it's label or any of the children's labels.
 nodeMatchesSearch :: String -> Record SigmaxT.Node -> Boolean
-nodeMatchesSearch s n = queryMatchesLabel s n.label
+nodeMatchesSearch s n@{ children } =
+  foldl (\acc childLabel -> queryMatchesLabel s childLabel) initial children
+  where
+    initial = queryMatchesLabel s n.label
 
 searchNodes :: String -> Seq.Seq (Record SigmaxT.Node) -> Seq.Seq (Record SigmaxT.Node)
 searchNodes "" _ = Seq.empty
 searchNodes s nodes = Seq.filter (nodeMatchesSearch s) nodes
 
 nodeSearchControl :: R2.Component Props
-nodeSearchControl = R.createElement sizeButtonCpt
-
-sizeButtonCpt :: R.Component Props
-sizeButtonCpt = here.component "nodeSearchControl" cpt
+nodeSearchControl = R.createElement nodeSearchControlCpt
+nodeSearchControlCpt :: R.Component Props
+nodeSearchControlCpt = here.component "nodeSearchControl" cpt
   where
     cpt { graph, multiSelectEnabled, selectedNodeIds } _ = do
       search <- T.useBox ""
       search' <- T.useLive T.unequal search
       multiSelectEnabled' <- T.useLive T.unequal multiSelectEnabled
 
+      let doSearch s = triggerSearch graph s multiSelectEnabled' selectedNodeIds
+
       pure $ R.fragment
         [ inputWithAutocomplete { autocompleteSearch: autocompleteSearch graph
                                 , classes: "mx-2"
-                                , onAutocompleteClick: \s -> triggerSearch graph s multiSelectEnabled' selectedNodeIds
-                                , onEnterPress: \s -> triggerSearch graph s multiSelectEnabled' selectedNodeIds
+                                , onAutocompleteClick: doSearch
+                                , onEnterPress: doSearch
                                 , state: search } []
         , H.div { className: "btn input-group-addon"
-                , on: { click: \_ -> triggerSearch graph search' multiSelectEnabled' selectedNodeIds }
+                , on: { click: \_ -> doSearch search' }
                 }
           [ H.span { className: "fa fa-search" } [] ]
         ]
@@ -73,3 +79,4 @@ triggerSearch graph search multiSelectEnabled selectedNodeIds = do
 
   T.modify_ (\nodes ->
     Set.union matching $ if multiSelectEnabled then nodes else SigmaxT.emptyNodeIds) selectedNodeIds
+

src/Gargantext/Components/InputWithAutocomplete.purs

 module Gargantext.Components.InputWithAutocomplete where
 
 import Prelude
-import Data.Maybe (Maybe(..))
-import Data.Nullable (Nullable, null, toMaybe)
+
 import DOM.Simple as DOM
 import DOM.Simple.Event as DE
+import Data.Maybe (Maybe(..))
+import Data.Nullable (Nullable, null, toMaybe)
 import Effect (Effect)
 import Effect.Timer (setTimeout)
+import Gargantext.Utils.Reactix as R2
+import React.SyntheticEvent as E
 import Reactix as R
 import Reactix.DOM.HTML as H
-import React.SyntheticEvent as E
 import Toestand as T
 
-import Gargantext.Utils.Reactix as R2
-
 here :: R2.Here
 here = R2.here "Gargantext.Components.InputWithAutocomplete"
 

src/Gargantext/Config/Utils.purs

@@ -5,6 +5,7 @@ import Gargantext.Prelude
 import Data.Array as A
 import Data.Either (Either(..))
 import Data.Foldable (foldl)
+import Data.Maybe (fromMaybe)
 import Effect (Effect)
 import Effect.Aff (Aff)
 import Effect.Class (liftEffect)
@@ -41,7 +42,7 @@ handleErrorInAsyncProgress errors ap@(AsyncProgress { log, status: IsFinished })
 handleErrorInAsyncProgress _ _ = pure unit
 
 concatErrors :: AsyncProgress -> String
-concatErrors (AsyncProgress { log }) = foldl eventsErrorMessage "" log
+concatErrors (AsyncProgress { error, log }) = foldl eventsErrorMessage (fromMaybe "" error) log
   where
     eventsErrorMessage acc (AsyncTaskLog { events }) = (foldl eventErrorMessage "" events) <> "\n" <> acc
     eventErrorMessage acc (AsyncEvent { level: "ERROR", message }) = message <> "\n" <> acc

src/Gargantext/Hooks/Sigmax/Types.purs

@@ -35,6 +35,7 @@ type EdgeId = String
 
 type Node = (
     borderColor :: String
+  , children    :: Array String
   , color       :: String
   , equilateral :: { numPoints :: Int }
   , gargType    :: GT.Mode

src/Gargantext/Types.purs

@@ -736,8 +736,9 @@ derive newtype instance JSON.ReadForeign AsyncTaskWithType
 instance Eq AsyncTaskWithType where eq = genericEq
 
 newtype AsyncProgress = AsyncProgress
-  { id :: AsyncTaskID
-  , log :: Array AsyncTaskLog
+  { id     :: AsyncTaskID
+  , error  :: Maybe String
+  , log    :: Array AsyncTaskLog
   , status :: AsyncTaskStatus
   }
 derive instance Generic AsyncProgress _