Merge branch 'dev' into 330-dev-minify

package.json

 {
     "name": "Gargantext",
-    "version": "0.0.3.4",
+    "version": "0.0.3.5",
     "scripts": {
         "generate-purs-packages-nix": "./nix/generate-purs-packages.nix",
         "generate-psc-packages-nix": "./nix/generate-packages-json.bash",

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

@@ -34,7 +34,7 @@ defaultSearch = { databases: Empty
                 , node_id  : Nothing
                 , lang     : Nothing
                 , term     : ""
-                , url: ""
+                , url      : ""
                 }
 
 type Props =
@@ -245,8 +245,8 @@ dataFieldNavCpt = here.component "dataFieldNav" cpt
 
       pure $ R.fragment
         [ H.div { className: "text-primary center"} [H.text "with DataField"]
-        , H.div {className: "nav nav-tabs"} ((liItem search') <$> dataFields)
-        , H.div {className: "center"} [ H.text
+        , H.div { className: "nav nav-tabs" } ((liItem search') <$> dataFields)
+        , H.div { className: "center" } [ H.text
                                         $ maybe "TODO: add Doc Instance" doc datafield
                                       ]
         ]

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

@@ -76,8 +76,8 @@ instance Doc DataField where
   doc Files        = "Zip files with formats.."
 derive instance Eq DataField
 instance JSON.WriteForeign DataField where
-  writeImpl Gargantext = JSON.writeImpl "Internal PubMed"
   writeImpl (External (Just db)) = JSON.writeImpl $ "External " <> show db
+  writeImpl Web = JSON.writeImpl $ "Web"
   writeImpl f = JSON.writeImpl $ show f
 
 ----------------------------------------
@@ -348,9 +348,10 @@ instance GT.ToQuery SearchQuery where
           pair k = maybe [] $ \v ->
             [ QP.keyFromString k /\ Just (QP.valueFromString $ show v) ]
 instance JSON.WriteForeign SearchQuery where
-  writeImpl (SearchQuery { databases, lang, node_id, query, selection }) =
+  writeImpl (SearchQuery { databases, datafield, lang, node_id, query, selection }) =
     JSON.writeImpl { query: String.replace (String.Pattern "\"") (String.Replacement "\\\"") query
-                   , databases: databases
+                   , databases
+                   , datafield
                    , lang: maybe "EN" show lang
                    , node_id: fromMaybe 0 node_id
                    , flowListWith: selection

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

@@ -10,7 +10,7 @@ import Reactix.DOM.HTML as H
 import Toestand as T
 
 import Gargantext.Components.App.Data (Boxes)
-import Gargantext.Components.Forest.Tree.Node.Action.Add (NodePopup(..), addNodeView)
+import Gargantext.Components.Forest.Tree.Node.Action.Add (addNodeView)
 import Gargantext.Components.Forest.Tree.Node.Action.Contact as Contact
 import Gargantext.Components.Forest.Tree.Node.Action.Delete (actionDelete)
 import Gargantext.Components.Forest.Tree.Node.Action.Documentation (actionDoc)
@@ -83,8 +83,7 @@ nodePopupCpt = here.component "nodePopupView" cpt where
       , H.div { className: "col-1" } [ editIcon renameIsOpen open ]
       , H.div { className: "col-1" }
         [ H.a { type: "button", on: { click: closePopover p }, title: "Close"
-              , className: glyphicon "window-close" } [] ]]] where
-           SettingsBox _ = settingsBox nodeType
+              , className: glyphicon "window-close" } [] ]]]
   editIcon _ true = H.div {} []
   editIcon isOpen false =
     H.a { className: glyphicon "pencil", id: "rename1"
@@ -110,7 +109,6 @@ nodePopupCpt = here.component "nodePopupView" cpt where
                 , dispatch
                 , id
                 , name
-                , nodePopup: Just NodePopup
                 , nodeType
                 , session
                 }
@@ -174,7 +172,6 @@ type PanelActionProps =
   , id        :: ID
   , dispatch  :: Action -> Aff Unit
   , name      :: Name
-  , nodePopup :: Maybe NodePopup
   , nodeType  :: GT.NodeType
   , session   :: Session
   )