Merge branch 'dev-refact' into dev

dist/styles/Login.css

@@ -78,9 +78,10 @@ li#rename #rename-a {
   background-color: white;
   border: none;
 }
-#node-popup-tooltip .popup-container .istex-search.panel {
+#node-popup-tooltip .popup-container .frame-search.panel {
   border: 1px solid rgba(0, 0, 0, 0.2);
   box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
+  height: 600px;
   width: 1300px;
 }
 

dist/styles/Login.sass

@@ -70,9 +70,10 @@ li#rename
         justify-content: center
         background-color: white
         border: none
-    .istex-search.panel
+    .frame-search.panel
       border: 1px solid rgba(0,0,0,0.2)
       box-shadow: 0 2px 5px rgba(0,0,0,0.2)
+      height: 600px
       width: 1300px
 
 

src/Gargantext/Components/Forest/Tree/Node/Action/Search/Frame.purs

@@ -4,33 +4,56 @@ import DOM.Simple as DOM
 import DOM.Simple.Event (MessageEvent)
 import DOM.Simple.EventListener (Callback, addEventListener, callback)
 import DOM.Simple.Window (window)
+import Data.Generic.Rep (class Generic)
+import Data.Generic.Rep.Show (genericShow)
 import Data.Maybe (Maybe(..))
 import Data.Nullable (Nullable)
+import Data.String (toLower)
 import Data.Tuple (Tuple(..))
 import Data.Tuple.Nested ((/\))
 import Gargantext.Components.Forest.Tree.Node.Action.Search.Types (DataField(..), Search, isIsTex_Advanced)
-import Gargantext.Prelude (discard, identity, pure, unit, ($), (<>), (==))
+import Gargantext.Prelude (discard, identity, pure, unit, ($), (<>), (==), class Show, show)
 import Gargantext.Utils.Reactix as R2
 import Reactix as R
 import Reactix.DOM.HTML as H
 import URI.Extra.QueryPairs as NQP
 import URI.Query as Query
 
+--------------------
+
+data FrameSource = Istex | Searx
+
+derive instance genericFrameSource :: Generic FrameSource _
+
+instance showFrameSource :: Show FrameSource where
+  show = genericShow
+
 --------------------
 -- | Iframes
 searchIframes :: R.State Search
               -> R.Ref (Nullable DOM.Element)
               -> R.Element
 searchIframes search@(search' /\ _) iframeRef =
-  if isIsTex_Advanced search'.datafield then
-    H.div { className: "istex-search panel panel-default" }
-          [ iframeWith "https://istex.gargantext.org" search iframeRef ]
-  else
-    if Just Web == search'.datafield then
-      H.div { className: "istex-search panel panel-default" }
-            [ iframeWith "https://searx.gargantext.org" search iframeRef ]
+  if isIsTex_Advanced search'.datafield
+     then divIframe Istex search iframeRef
   else
-      H.div {} []
+    if Just Web == search'.datafield
+       then divIframe Searx search iframeRef
+       else H.div {} []
+
+divIframe :: FrameSource
+          -> R.State Search
+          -> R.Ref (Nullable DOM.Element)
+          -> R.Element
+divIframe frameSource search@(search' /\ _) iframeRef =
+    H.div { className: "frame-search panel panel-default" }
+          [ iframeWith (frameUrl frameSource)search iframeRef ]
+
+frameUrl :: FrameSource -> String
+frameUrl frameSource = frameUrl' (toLower $ show frameSource)
+  where
+    frameUrl' s = "https://" <> s <> ".frame.gargantext.org"
+
 
 iframeWith :: String
            -> R.State Search

src/Gargantext/Components/Forest/Tree/Node/Action/Search/SearchField.purs

@@ -7,14 +7,14 @@ import Data.Nullable (null)
 import Data.Newtype (over)
 import Data.Set as Set
 import Data.String (length)
-import Data.Tuple (fst)
 import Data.Tuple.Nested ((/\))
 import Effect (Effect)
 import Effect.Aff (launchAff_)
 import Effect.Class (liftEffect)
+import Gargantext.Components.Forest.Tree.Node.Tools (panel)
 import Gargantext.Components.Forest.Tree.Node.Action.Search.Types (DataField(..), Database(..), IMT_org(..), Org(..), SearchQuery(..), allIMTorgs, allOrgs, dataFields, defaultSearchQuery, doc, performSearch, datafield2database, Search)
 import Gargantext.Components.Lang (Lang)
-import Gargantext.Prelude (Unit, bind, discard, map, pure, show, ($), (&&), (<), (<$>), (<>), (==), read)
+import Gargantext.Prelude (Unit, bind, discard, map, pure, show, ($), (<), (<$>), (<>), (==), read)
 import Gargantext.Sessions (Session)
 import Gargantext.Components.Forest.Tree.Node.Action.Search.Frame (searchIframes)
 import Gargantext.Types as GT
@@ -22,20 +22,6 @@ import Gargantext.Utils.Reactix as R2
 import Reactix as R
 import Reactix.DOM.HTML as H
 
-select :: forall props.
-          R.IsComponent String props (Array R.Element)
-          => Record props
-          -> Array R.Element
-          -> R.Element
-select = R.createElement "select"
-
-eqSearch :: Search -> Search -> Boolean
-eqSearch s s' =    (s.databases == s'.databases)
-                && (s.datafield == s'.datafield)
-                && (s.lang      == s'.lang)
-                && (s.node_id   == s'.node_id)
-                && (s.term      == s'.term)
-
 defaultSearch :: Search
 defaultSearch = { databases: Empty
                 , datafield: Nothing
@@ -65,12 +51,7 @@ searchFieldComponent = R.hooksComponent "G.C.S.SearchField" cpt
   where
     cpt props@{onSearch, search: search@(s /\ _)} _ = do
       iframeRef <- R.useRef    null
-      pure $
-        H.div { className: "search-field-group", style: { width: "100%" } }
-          [
-            H.div { className: "row" }
-              [
-                H.div { className: "col-md-12" }
+      let params = 
                 [ searchInput {search}
                 , if length s.term < 3  -- search with love : <3
                   then
@@ -96,25 +77,18 @@ searchFieldComponent = R.hooksComponent "G.C.S.SearchField" cpt
  
                              , H.div {} [ searchIframes search iframeRef ]
 
-                             ]
-
-                ]
-              ]
-          , H.div { className : "panel-footer" }
-                [ if needsLang s.datafield
+                             , if needsLang s.datafield
                                 then langNav search props.langs
                                 else H.div {} []
-                , H.div {} []
-                , H.div {className: "flex-center"}
-                        [submitButton {onSearch, search, session: props.session}]
                              ]
+
                 ]
-    eqProps :: Record Props -> Record Props -> Boolean
-    eqProps p p' =    (p.databases  == p'.databases )
-                   && (p.langs      == p'.langs     )
-                   && (eqSearch (fst p.search) (fst p'.search))
---                   && (fst p.filters == fst p'.filters   )
-    componentIMT (search /\ setSearch) =
+      let button =  submitButton {onSearch, search, session: props.session}
+
+      pure $ panel params button
+
+
+componentIMT (search /\ setSearch) =
   R.fragment
   [ H.ul {} $ map liCpt allIMTorgs
   --, filterInput fi
@@ -131,7 +105,8 @@ searchFieldComponent = R.hooksComponent "G.C.S.SearchField" cpt
         then H.i {} [H.text  $ " " <> show org]
         else H.text $ " " <> show org
       ]
-    componentCNRS (search /\ setSearch) =
+
+componentCNRS (search /\ setSearch) =
   R.fragment [
     H.div {} []
   --, filterInput fi

src/Gargantext/Components/Forest/Tree/Node/Action/Upload/Types.purs

 module Gargantext.Components.Forest.Tree.Node.Action.Upload.Types where
 
-import Gargantext.Prelude (class Read, class Show, class Eq)
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Eq (genericEq)
 import Data.Generic.Rep.Show (genericShow)
-import Data.Maybe (Maybe(..), fromMaybe, maybe)
+import Data.Maybe (Maybe(..))
+import Gargantext.Prelude (class Read, class Show, class Eq)
 
 
 data FileType = CSV | CSV_HAL | WOS | PresseRIS

src/Gargantext/Components/Forest/Tree/Node/Tools.purs

@@ -179,8 +179,6 @@ formButton nodeType setNodeType =
 ------------------------------------------------------------------------
 ------------------------------------------------------------------------
 
-
-
 submitButton :: Action -> (Action -> Aff Unit) -> R.Element
 submitButton action dispatch =
   H.button { className : "btn btn-primary fa fa-" <> icon action

src/Gargantext/Config/REST.purs

 module Gargantext.Config.REST where
 
 import Affjax (defaultRequest, printResponseFormatError, request)
-import Affjax.RequestBody (RequestBody(..), formData, formURLEncoded, string)
+import Affjax.RequestBody (RequestBody(..), formData, formURLEncoded)
 import Affjax.RequestHeader as ARH
 import Affjax.ResponseFormat as ResponseFormat
 import DOM.Simple.Console (log)
 import Data.Argonaut (class DecodeJson, decodeJson, class EncodeJson, encodeJson)
-import Data.Array as A
 import Data.Either (Either(..))
 import Data.Foldable (foldMap)
 import Data.FormURLEncoded as FormURLEncoded
 import Data.HTTP.Method (Method(..))
 import Data.Maybe (Maybe(..))
 import Data.MediaType.Common (applicationFormURLEncoded, applicationJSON, multipartFormData)
-import Data.Tuple (Tuple(..))
+import Data.Tuple (Tuple)
 import Effect.Aff (Aff, throwError)
 import Effect.Class (liftEffect)
 import Effect.Exception (error)
-import Web.XHR.FormData as XHRFormData
-
 import Gargantext.Prelude
 import Gargantext.Utils.Reactix as R2
+import Web.XHR.FormData as XHRFormData
 
 type Token = String
 

src/Gargantext/Prelude.purs

 module Gargantext.Prelude (module Prelude, logs, id, class Read, read)
   where
 
-import Data.Maybe (Maybe(..))
+import Data.Maybe (Maybe)
 import Prelude (class Applicative, class Apply, class Bind, class BooleanAlgebra, class Bounded, class Category, class CommutativeRing, class Discard, class DivisionRing, class Eq, class EuclideanRing, class Field, class Functor, class HeytingAlgebra, class Monad, class Monoid, class Ord, class Ring, class Semigroup, class Semigroupoid, class Semiring, class Show, type (~>), Ordering(..), Unit, Void, absurd, add, ap, append, apply, between, bind, bottom, clamp, compare, comparing, compose, conj, const, degree, discard, disj, eq, flap, flip, gcd, identity, ifM, join, lcm, liftA1, liftM1, map, max, mempty, min, mod, mul, negate, not, notEq, one, otherwise, pure, recip, show, sub, top, unit, unless, unlessM, void, when, whenM, zero, (#), ($), ($>), (&&), (*), (*>), (+), (-), (/), (/=), (<), (<#>), (<$), (<$>), (<*), (<*>), (<<<), (<=), (<=<), (<>), (<@>), (=<<), (==), (>), (>=), (>=>), (>>=), (>>>), (||))
 import Effect.Console (log)
 import Effect.Class (class MonadEffect, liftEffect)

src/Gargantext/Utils/Popover.purs

 module Gargantext.Utils.Popover where
 
-import Data.Maybe (Maybe(..), maybe)
+import Data.Maybe (maybe)
 import Data.Nullable (Nullable, toMaybe)
 import DOM.Simple as DOM
-import DOM.Simple.Console (log2)
 import Effect (Effect)
 import Effect.Uncurried (EffectFn2, runEffectFn2)
-import FFI.Simple ((..), (...))
 import Reactix as R
 
 import Gargantext.Prelude