Verified Commit bfd483a3 authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski

Merge branch 'dev' into 330-dev-minify

parents 6d0bb19b 1a77f58e
Pipeline #1831 canceled with stage
{ {
"name": "Gargantext", "name": "Gargantext",
"version": "0.0.3.4", "version": "0.0.3.5",
"scripts": { "scripts": {
"generate-purs-packages-nix": "./nix/generate-purs-packages.nix", "generate-purs-packages-nix": "./nix/generate-purs-packages.nix",
"generate-psc-packages-nix": "./nix/generate-packages-json.bash", "generate-psc-packages-nix": "./nix/generate-packages-json.bash",
......
...@@ -34,7 +34,7 @@ defaultSearch = { databases: Empty ...@@ -34,7 +34,7 @@ defaultSearch = { databases: Empty
, node_id : Nothing , node_id : Nothing
, lang : Nothing , lang : Nothing
, term : "" , term : ""
, url: "" , url : ""
} }
type Props = type Props =
...@@ -245,8 +245,8 @@ dataFieldNavCpt = here.component "dataFieldNav" cpt ...@@ -245,8 +245,8 @@ dataFieldNavCpt = here.component "dataFieldNav" cpt
pure $ R.fragment pure $ R.fragment
[ H.div { className: "text-primary center"} [H.text "with DataField"] [ H.div { className: "text-primary center"} [H.text "with DataField"]
, H.div {className: "nav nav-tabs"} ((liItem search') <$> dataFields) , H.div { className: "nav nav-tabs" } ((liItem search') <$> dataFields)
, H.div {className: "center"} [ H.text , H.div { className: "center" } [ H.text
$ maybe "TODO: add Doc Instance" doc datafield $ maybe "TODO: add Doc Instance" doc datafield
] ]
] ]
......
...@@ -76,8 +76,8 @@ instance Doc DataField where ...@@ -76,8 +76,8 @@ instance Doc DataField where
doc Files = "Zip files with formats.." doc Files = "Zip files with formats.."
derive instance Eq DataField derive instance Eq DataField
instance JSON.WriteForeign DataField where instance JSON.WriteForeign DataField where
writeImpl Gargantext = JSON.writeImpl "Internal PubMed"
writeImpl (External (Just db)) = JSON.writeImpl $ "External " <> show db writeImpl (External (Just db)) = JSON.writeImpl $ "External " <> show db
writeImpl Web = JSON.writeImpl $ "Web"
writeImpl f = JSON.writeImpl $ show f writeImpl f = JSON.writeImpl $ show f
---------------------------------------- ----------------------------------------
...@@ -348,9 +348,10 @@ instance GT.ToQuery SearchQuery where ...@@ -348,9 +348,10 @@ instance GT.ToQuery SearchQuery where
pair k = maybe [] $ \v -> pair k = maybe [] $ \v ->
[ QP.keyFromString k /\ Just (QP.valueFromString $ show v) ] [ QP.keyFromString k /\ Just (QP.valueFromString $ show v) ]
instance JSON.WriteForeign SearchQuery where 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 JSON.writeImpl { query: String.replace (String.Pattern "\"") (String.Replacement "\\\"") query
, databases: databases , databases
, datafield
, lang: maybe "EN" show lang , lang: maybe "EN" show lang
, node_id: fromMaybe 0 node_id , node_id: fromMaybe 0 node_id
, flowListWith: selection , flowListWith: selection
......
...@@ -10,7 +10,7 @@ import Reactix.DOM.HTML as H ...@@ -10,7 +10,7 @@ import Reactix.DOM.HTML as H
import Toestand as T import Toestand as T
import Gargantext.Components.App.Data (Boxes) 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.Contact as Contact
import Gargantext.Components.Forest.Tree.Node.Action.Delete (actionDelete) import Gargantext.Components.Forest.Tree.Node.Action.Delete (actionDelete)
import Gargantext.Components.Forest.Tree.Node.Action.Documentation (actionDoc) import Gargantext.Components.Forest.Tree.Node.Action.Documentation (actionDoc)
...@@ -83,8 +83,7 @@ nodePopupCpt = here.component "nodePopupView" cpt where ...@@ -83,8 +83,7 @@ nodePopupCpt = here.component "nodePopupView" cpt where
, H.div { className: "col-1" } [ editIcon renameIsOpen open ] , H.div { className: "col-1" } [ editIcon renameIsOpen open ]
, H.div { className: "col-1" } , H.div { className: "col-1" }
[ H.a { type: "button", on: { click: closePopover p }, title: "Close" [ H.a { type: "button", on: { click: closePopover p }, title: "Close"
, className: glyphicon "window-close" } [] ]]] where , className: glyphicon "window-close" } [] ]]]
SettingsBox _ = settingsBox nodeType
editIcon _ true = H.div {} [] editIcon _ true = H.div {} []
editIcon isOpen false = editIcon isOpen false =
H.a { className: glyphicon "pencil", id: "rename1" H.a { className: glyphicon "pencil", id: "rename1"
...@@ -110,7 +109,6 @@ nodePopupCpt = here.component "nodePopupView" cpt where ...@@ -110,7 +109,6 @@ nodePopupCpt = here.component "nodePopupView" cpt where
, dispatch , dispatch
, id , id
, name , name
, nodePopup: Just NodePopup
, nodeType , nodeType
, session , session
} }
...@@ -174,7 +172,6 @@ type PanelActionProps = ...@@ -174,7 +172,6 @@ type PanelActionProps =
, id :: ID , id :: ID
, dispatch :: Action -> Aff Unit , dispatch :: Action -> Aff Unit
, name :: Name , name :: Name
, nodePopup :: Maybe NodePopup
, nodeType :: GT.NodeType , nodeType :: GT.NodeType
, session :: Session , session :: Session
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment