Merge remote-tracking branch 'origin/dev-tree-fixes' into dev-demo-merge

.psc-package/local/.set/packages.json

@@ -570,6 +570,16 @@
     "repo": "https://github.com/purescript/purescript-distributive.git",
     "version": "v4.0.0"
   },
+  "dom-filereader": {
+    "dependencies": [
+      "aff",
+      "arraybuffer-types",
+      "web-file",
+      "web-html"
+    ],
+    "repo": "https://github.com/nwolverson/purescript-dom-filereader",
+    "version": "v5.0.0"
+  },
   "dom-indexed": {
     "dependencies": [
       "media-types",

dist/styles/Login.css

@@ -82,7 +82,7 @@ li#rename  #rename-a{
 }
 
 
-#rename-tooltip {
+#node-popup-tooltip {
     position : absolute;
     left : 96px;
     top:-64px;
@@ -90,6 +90,28 @@ li#rename  #rename-a{
     z-index: 1000;
 
 }
+#create-node-tooltip {
+    position : absolute;
+    left : 96px;
+    top:-64px;
+    background-color: white;
+    z-index: 1000;
+
+}
+#create-node-tooltip .panel-body input {
+    min-width: 200px;
+}
+#file-type-tooltip {
+    position : absolute;
+    left : 96px;
+    top:-64px;
+    background-color: white;
+    z-index: 1000;
+
+}
+#file-type-tooltip .panel-body select {
+    min-width: 200px;
+}
 
 li a#rename {
     display:none;
@@ -106,6 +128,7 @@ li a#rename-leaf {
     display:none;
     position:absolute;
     text-decoration:none;
+    margin-left: 20px;
 }
 
 li:hover a#rename-leaf {
@@ -139,7 +162,7 @@ text-align: center;
     transform: scale(1.4);
 }
 
-#rename-tooltip:hover {
+#node-popup-tooltip:hover {
     border:none;
 }
 
@@ -155,7 +178,7 @@ text-align: center;
     left: -9px;
 }
 
-#rename-tooltip a:hover
+#node-popup-tooltip a:hover
 {
     text-decoration:none;
 }
@@ -184,3 +207,12 @@ text-align: center;
 #graph-tree .tree {
     margin-top: 27px;
 }
+
+.nopadding {
+    padding: 0 !important;
+    margin: 0 !important;
+}
+.row-no-padding > [class*="col-"] {
+    padding-left: 0 !important;
+    padding-right: 0 !important;
+}

package.json

@@ -26,12 +26,12 @@
         "@babel/preset-react": "^7.0.0",
         "@babel/preset-stage-2": "^7.0.0",
         "babel-core": "^7.0.0-bridge",
-        "react-testing-library": "^6.1.2",
         "envify": "^4.1.0",
         "http-server": "^0.11.1",
         "psc-package": "^3.0.1",
         "pulp": "^12.4.0",
         "purescript": "^0.12.4",
+        "react-testing-library": "^6.1.2",
         "spago": "^0.7.5"
     },
     "version": "0.0.0"

packages.dhall

@@ -173,6 +173,15 @@ let additions =
           ]
           "https://github.com/irresponsible/purescript-dom-simple"
           "v0.2.4"
+      , dom-filereader =
+	      mkPackage
+		  [ "aff"
+		  , "arraybuffer-types"
+		  , "web-file"
+		  , "web-html"
+		  ]
+		  "https://github.com/nwolverson/purescript-dom-filereader"
+		  "v5.0.0"
       , reactix =
           mkPackage
           [ "console"

psc-package.json

@@ -3,30 +3,31 @@
   "set": "local",
   "source": ".psc-package",
   "depends": [
-    "numbers",
-    "spec-quickcheck",
-    "spec-discovery",
-    "uint",
-    "js-timers",
-    "psci-support",
-    "css",
-    "generics-rep",
-    "maybe",
-    "routing",
-    "foreign-object",
+    "affjax",
     "argonaut",
+    "console",
+    "css",
+    "dom-filereader",
+    "dom-simple",
     "effect",
-    "web-html",
-    "thermite",
+    "foreign-object",
+    "generics-rep",
     "integers",
-    "random",
-    "affjax",
-    "console",
-    "strings",
-    "string-parsers",
+    "js-timers",
+    "maybe",
+    "numbers",
     "prelude",
-    "dom-simple",
+    "psci-support",
+    "random",
     "reactix",
-    "uri"
+    "routing",
+    "spec-discovery",
+    "spec-quickcheck",
+    "string-parsers",
+    "strings",
+    "thermite",
+    "uint",
+    "uri",
+    "web-html"
   ]
 }

src/Gargantext/Components/ContextMenu/ContextMenu.purs

@@ -24,7 +24,7 @@ import Reactix as R
 import Reactix.DOM.HTML as HTML
 import Reactix.SyntheticEvent as E
 
-import Gargantext.Utils.Reactix as R'
+import Gargantext.Utils.Reactix as R2
 
 type Props t = ( x :: Number, y :: Number, setMenu :: Maybe t -> Effect Unit)
 
@@ -71,14 +71,14 @@ contextMenuEffect setMenu rootRef _ =
           
 documentClickHandler :: forall t. (Maybe t -> Effect Unit) -> DOM.Element -> Callback DE.MouseEvent
 documentClickHandler hide menu =
-  R'.named "hideMenuOnClickOutside" $ callback $ \e ->
+  R2.named "hideMenuOnClickOutside" $ callback $ \e ->
     if Element.contains menu (DE.target e)
       then pure unit
       else hide Nothing
 
 documentScrollHandler :: forall t. (Maybe t -> Effect Unit) -> Callback DE.MouseEvent
 documentScrollHandler hide =
-  R'.named "hideMenuOnScroll" $ callback $ \e -> hide Nothing
+  R2.named "hideMenuOnScroll" $ callback $ \e -> hide Nothing
 
 position :: forall t. Record (Props t) -> DOMRect -> { left :: Number, top :: Number }
 position mouse {width: menuWidth, height: menuHeight} = {left, top}

src/Gargantext/Components/Search/SearchField.purs

@@ -93,4 +93,3 @@ submitButton (database /\ _) (term /\ _) (_ /\ setSearch) =
       case term of
         "" -> setSearch Nothing
         _ -> setSearch $ Just { database, term }
-

src/Gargantext/Config.purs

@@ -10,7 +10,7 @@ toUrl Front Corpus 1 == "http://localhost:2015/#/corpus/1"
 module Gargantext.Config where
 
 import Prelude
-import Data.Argonaut (class DecodeJson, decodeJson)
+import Data.Argonaut (class DecodeJson, decodeJson, class EncodeJson, encodeJson)
 import Data.Foldable (foldMap)
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Show (genericShow)
@@ -227,9 +227,9 @@ instance toUrlPath :: ToUrl Path where
 
 data NodeType = NodeUser
               | Annuaire
-                | NodeContact
+              | NodeContact
               | Corpus
-                  | Url_Document
+              | Url_Document
               | CorpusV3
               | Dashboard
               | Error
@@ -259,6 +259,57 @@ instance showNodeType :: Show NodeType where
   show Tree          = "NodeTree"
   show NodeList      = "NodeList"
 
+readNodeType :: String -> NodeType
+readNodeType "NodeAnnuaire"  = Annuaire
+readNodeType "NodeDashboard" = Dashboard
+readNodeType "Document"      = Url_Document
+readNodeType "NodeFolder"    = Folder
+readNodeType "NodeGraph"     = Graph
+readNodeType "Individu"      = Individu
+readNodeType "Node"          = Node
+readNodeType "Nodes"         = Nodes
+readNodeType "NodeCorpus"    = Corpus
+readNodeType "NodeCorpusV3"  = CorpusV3
+readNodeType "NodeUser"      = NodeUser
+readNodeType "NodeContact"   = NodeContact
+readNodeType "Tree"          = Tree
+readNodeType "NodeList"      = NodeList
+readNodeType _               = Error
+{-
+------------------------------------------------------------
+instance ordNodeType :: Ord NodeType where
+  compare n1 n2 = compare (show n1) (show n2)
+
+instance eqNodeType :: Eq NodeType where
+  eq n1 n2  = eq (show n1) (show n2)
+-}
+------------------------------------------------------------
+instance decodeJsonNodeType :: DecodeJson NodeType where
+  decodeJson json = do
+    obj <- decodeJson json
+    pure $ readNodeType obj
+
+instance encodeJsonNodeType :: EncodeJson NodeType where
+  encodeJson nodeType = encodeJson $ show nodeType
+
+nodeTypeUrl :: NodeType -> Url
+nodeTypeUrl Annuaire  = "annuaire"
+nodeTypeUrl Corpus    = "corpus"
+nodeTypeUrl CorpusV3  = "corpus"
+nodeTypeUrl Dashboard = "dashboard"
+nodeTypeUrl Url_Document  = "document"
+nodeTypeUrl Error     = "ErrorNodeType"
+nodeTypeUrl Folder    = "folder"
+nodeTypeUrl Graph     = "graph"
+nodeTypeUrl Individu  = "individu"
+nodeTypeUrl Node      = "node"
+nodeTypeUrl Nodes      = "nodes"
+nodeTypeUrl NodeUser  = "user"
+nodeTypeUrl NodeContact = "contact"
+nodeTypeUrl Tree      = "tree"
+nodeTypeUrl NodeList  = "list"
+------------------------------------------------------------
+
 type ListId = Int
 
 data Path
@@ -366,50 +417,3 @@ derive instance genericTabType :: Generic TabType _
 instance showTabType :: Show TabType where
   show = genericShow
 
-------------------------------------------------------------
-nodeTypeUrl :: NodeType -> Url
-nodeTypeUrl Annuaire  = "annuaire"
-nodeTypeUrl Corpus    = "corpus"
-nodeTypeUrl CorpusV3  = "corpus"
-nodeTypeUrl Dashboard = "dashboard"
-nodeTypeUrl Url_Document  = "document"
-nodeTypeUrl Error     = "ErrorNodeType"
-nodeTypeUrl Folder    = "folder"
-nodeTypeUrl Graph     = "graph"
-nodeTypeUrl Individu  = "individu"
-nodeTypeUrl Node      = "node"
-nodeTypeUrl Nodes      = "nodes"
-nodeTypeUrl NodeUser  = "user"
-nodeTypeUrl NodeContact = "contact"
-nodeTypeUrl Tree      = "tree"
-nodeTypeUrl NodeList  = "list"
-
-readNodeType :: String -> NodeType
-readNodeType "NodeAnnuaire"  = Annuaire
-readNodeType "NodeDashboard" = Dashboard
-readNodeType "Document"      = Url_Document
-readNodeType "NodeFolder"    = Folder
-readNodeType "NodeGraph"     = Graph
-readNodeType "Individu"      = Individu
-readNodeType "Node"          = Node
-readNodeType "Nodes"         = Nodes
-readNodeType "NodeCorpus"    = Corpus
-readNodeType "NodeCorpusV3"  = CorpusV3
-readNodeType "NodeUser"      = NodeUser
-readNodeType "NodeContact"   = NodeContact
-readNodeType "Tree"          = Tree
-readNodeType "NodeList"      = NodeList
-readNodeType _               = Error
-{-
-------------------------------------------------------------
-instance ordNodeType :: Ord NodeType where
-  compare n1 n2 = compare (show n1) (show n2)
-
-instance eqNodeType :: Eq NodeType where
-  eq n1 n2  = eq (show n1) (show n2)
--}
-------------------------------------------------------------
-instance decodeJsonNodeType :: DecodeJson NodeType where
-  decodeJson json = do
-    obj <- decodeJson json
-    pure $ readNodeType obj

src/Gargantext/Config/REST.purs

 module Gargantext.Config.REST where
 
+import Gargantext.Prelude
+
 import Affjax (defaultRequest, printResponseFormatError, request)
-import Affjax.RequestBody (RequestBody(..))
+import Affjax.RequestBody (RequestBody(..), string)
 import Affjax.RequestHeader (RequestHeader(..))
 import Affjax.ResponseFormat as ResponseFormat
 import Data.Argonaut (class DecodeJson, decodeJson, class EncodeJson, encodeJson)
 import Data.Either (Either(..))
 import Data.HTTP.Method (Method(..))
 import Data.Maybe (Maybe(..))
-import Data.MediaType.Common (applicationJSON)
+import Data.MediaType.Common (applicationFormURLEncoded, applicationJSON)
 import Effect.Aff (Aff, throwError)
 import Effect.Exception (error)
 
-import Gargantext.Prelude
-
 send :: forall a b. EncodeJson a => DecodeJson b =>
         Method -> String -> Maybe a -> Aff b
 send m url reqbody = do
@@ -58,3 +58,26 @@ deleteWithBody url = send DELETE url <<< Just
 
 post :: forall a b. EncodeJson a => DecodeJson b => String -> a -> Aff b
 post url = send POST url <<< Just
+
+postWwwUrlencoded :: forall b. DecodeJson b => String -> String -> Aff b
+postWwwUrlencoded url body = do
+  affResp <- request $ defaultRequest
+             { url = url
+             , responseFormat = ResponseFormat.json
+             , method = Left POST
+             , headers =  [ ContentType applicationFormURLEncoded
+                          , Accept applicationJSON
+                          ]
+             , content  = Just $ string body
+             }
+  case affResp.body of
+    Left err -> do
+      _ <-  logs $ printResponseFormatError err
+      throwError $ error $ printResponseFormatError err
+    Right json -> do
+      --_ <-  logs $ show json.status
+      --_ <-  logs $ show json.headers
+      --_ <-  logs $ show json.body
+      case decodeJson json of
+        Left err -> throwError $ error $ "decodeJson affResp.body: " <> err
+        Right b -> pure b

src/Gargantext/Pages/Corpus/Graph.purs

 module Gargantext.Pages.Corpus.Graph where
 
-import Effect.Unsafe
+import Effect.Unsafe (unsafePerformEffect)
 import Gargantext.Prelude hiding (max,min)
 
-import Affjax (defaultRequest, request)
-import Affjax.ResponseFormat (ResponseFormat(..), printResponseFormatError)
-import Affjax.ResponseFormat as ResponseFormat
 import Control.Monad.Cont.Trans (lift)
-import Data.Argonaut (class DecodeJson, class EncodeJson, decodeJson, jsonEmptyObject, (.?), (.??), (:=), (~>))
-import Data.Argonaut (decodeJson)
 import Data.Array (fold, length, mapWithIndex, (!!), null)
-import Data.Either (Either(..))
-import Data.HTTP.Method (Method(..))
-import Data.Int (fromString, toNumber)
+import Data.Int (toNumber)
 import Data.Int as Int
-import Data.Lens (Lens, Lens', over, (%~), (+~), (.~), (^.), review)
+import Data.Lens (Lens', over, (%~), (.~), (^.))
 import Data.Lens.Record (prop)
-import Data.Maybe (Maybe(..), fromJust, fromMaybe, isNothing)
+import Data.Maybe (Maybe(..), fromJust)
 import Data.Newtype (class Newtype)
 import Data.Number as Num
-import Data.String (joinWith)
 import Data.Set (Set)
 import Data.Set as Set
 import Data.Symbol (SProxy(..))
 import Data.Traversable (for_)
 import Effect (Effect)
-import Effect.Aff (Aff, attempt)
-import Effect.Aff.Class (liftAff)
+import Effect.Aff (Aff)
 import Effect.Class (liftEffect)
-import Effect.Console (log)
-import Effect.Uncurried (runEffectFn1, runEffectFn2)
 import Gargantext.Components.GraphExplorer.Sigmajs (Color(Color), SigmaEasing, SigmaGraphData(SigmaGraphData), SigmaNode, SigmaSettings, canvas, edgeShape, edgeShapes, forceAtlas2, setSigmaRef, getSigmaRef, cameras, CameraProps, getCameraProps, goTo, pauseForceAtlas2, sStyle, sigmaOnMouseMove, sigma, sigmaEasing, sigmaEdge, sigmaEnableWebGL, sigmaNode, sigmaSettings)
 import Gargantext.Components.GraphExplorer.Types (Cluster(..), MetaData(..), Edge(..), GraphData(..), Legend(..), Node(..), getLegendData)
 import Gargantext.Components.Login.Types (AuthData(..), TreeId)
 import Gargantext.Components.RandomText (words)
 import Gargantext.Components.Tree as Tree
 import Gargantext.Config as Config
-import Gargantext.Config.REST (get, post)
+import Gargantext.Config.REST (get)
 import Gargantext.Pages.Corpus.Graph.Tabs as GT
-import Gargantext.Prelude (flip)
 import Gargantext.Types (class Optional)
-import Gargantext.Utils (getter, toggleSet)
-import Math (cos, sin)
+import Gargantext.Utils (toggleSet)
 import Partial.Unsafe (unsafePartial)
 import React (ReactElement)
-import React.DOM (a, br', h2, button, div, form', input, li, li', menu, option, p, select, span, text, ul, ul')
-import React.DOM.Props (_id, _type, checked, className, defaultValue, href, max, min, name, onChange, onClick, placeholder, style, title, value, onMouseMove)
+import React.DOM (button, div, input, li, li', menu, p, span, text, ul')
+import React.DOM.Props (_id, _type, className, defaultValue, max, min, onChange, onClick, style, onMouseMove)
 import React.SyntheticEvent (SyntheticUIEvent, target)
-import Thermite (PerformAction, Render, Spec, _render, cmapProps, createClass, defaultPerformAction, defaultRender, modifyState, modifyState_, noState, simpleSpec, withState)
+import Thermite (PerformAction, Render, Spec, _render, cmapProps, defaultPerformAction, defaultRender, modifyState, modifyState_, noState, simpleSpec, withState)
 import Unsafe.Coerce (unsafeCoerce)
 import Web.HTML (window)
 import Web.HTML.Window (localStorage)

src/Gargantext/Utils/Reactix.purs

@@ -2,18 +2,22 @@ module Gargantext.Utils.Reactix
   where
 
 import Prelude
-import Data.Maybe ( Maybe(..) )
-import Data.Nullable ( Nullable, null, toMaybe )
-import Data.Traversable ( traverse_ )
-import Data.Tuple ( Tuple(..) )
-import Data.Tuple.Nested ( (/\) )
+
 import DOM.Simple.Event as DE
+import Data.Maybe (Maybe(..))
+import Data.Nullable (Nullable, null, toMaybe)
+import Data.Traversable (traverse_)
+import Data.Tuple (Tuple(..))
+import Data.Tuple.Nested ((/\))
 import Effect (Effect)
-import FFI.Simple ( (...), defineProperty )
-import React ( ReactElement )
+import Effect.Uncurried (mkEffectFn1)
+import FFI.Simple ((...), defineProperty)
+import React (ReactElement)
 import Reactix as R
+import Reactix.DOM.HTML (ElemFactory)
+import Reactix.React (createElement)
 import Reactix.SyntheticEvent as RE
-import Unsafe.Coerce ( unsafeCoerce )
+import Unsafe.Coerce (unsafeCoerce)
 newtype Point = Point { x :: Number, y :: Number }
 
 -- | Turns a ReactElement into a Reactix Element
@@ -40,3 +44,9 @@ useLayoutEffect1' :: forall a. a -> (Unit -> Effect Unit) -> R.Hooks Unit
 useLayoutEffect1' a f = R.useLayoutEffect1 a $ \_ ->
   do f unit
      pure $ \_ -> pure unit
+
+
+select :: ElemFactory
+select = createElement "select"
+
+effToggler (value /\ setValue) = mkEffectFn1 $ \_ -> setValue $ not value