Merge branch 'dev-prettyNodeType-form' of...

Merge branch 'dev-prettyNodeType-form' of ssh://gitlab.iscpif.fr:20022/gargantext/purescript-gargantext into dev-merge

src/Gargantext/Components/Forest/Tree/Node/Action/Add.purs

@@ -70,7 +70,7 @@ addNodeView p@{ dispatch, nodeType, nodeTypes } = R.createElement el p []
       nodeName@(name' /\ setNodeName) <- R.useState' "Name"
       nodeType'@(nt /\ setNodeType)   <- R.useState' $ fromMaybe Folder $ head nodeTypes
 
-      let 
+      let
           SettingsBox {edit} = settingsBox nt
           (maybeChoose /\ nt') = if length nodeTypes > 1
                            then ([ formChoiceSafe nodeTypes Error setNodeType ] /\ nt)
@@ -78,7 +78,7 @@ addNodeView p@{ dispatch, nodeType, nodeTypes } = R.createElement el p []
                                                   <> show defaultNt
                                                   <> " with name:"
                                            ]
-                                  ] /\ defaultNt 
+                                  ] /\ defaultNt
                                  )
                               where
                                 defaultNt = (fromMaybe Error $ head nodeTypes)
@@ -89,8 +89,8 @@ addNodeView p@{ dispatch, nodeType, nodeTypes } = R.createElement el p []
                             , onValueChanged: \val -> setNodeName $ const val
                             , autoFocus: true
                             , className: "form-control"
-                            , defaultValue: name'
-                            , placeholder: name'
+                            , defaultValue: name' -- (prettyNodeType nt')
+                            , placeholder: name'  -- (prettyNodeType nt')
                             , type: "text"
                             }
                           else H.div {} []

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

@@ -2,9 +2,7 @@ module Gargantext.Components.Forest.Tree.Node.Box where
 
 import Data.Array as A
 import Data.Maybe (Maybe(..))
-import Data.Tuple (fst)
 import Data.Tuple.Nested ((/\))
-import DOM.Simple.Console (log2)
 import Effect.Aff (Aff)
 import Reactix as R
 import Reactix.DOM.HTML as H
@@ -28,13 +26,14 @@ import Gargantext.Components.Forest.Tree.Node.Action.Merge (mergeNode)
 import Gargantext.Components.Forest.Tree.Node.Box.Types (NodePopupProps, NodePopupS)
 import Gargantext.Components.Forest.Tree.Node.Settings (NodeAction(..), SettingsBox(..), glyphiconNodeAction, settingsBox)
 import Gargantext.Components.Forest.Tree.Node.Status (Status(..), hasStatus)
-import Gargantext.Components.Forest.Tree.Node.Tools (textInputBox, fragmentPT, panel, prettyNodeType)
+import Gargantext.Components.Forest.Tree.Node.Tools (textInputBox, fragmentPT, panel)
 import Gargantext.Sessions (Session)
-import Gargantext.Types (Name, ID)
+import Gargantext.Types (Name, ID, prettyNodeType)
 import Gargantext.Types as GT
 import Gargantext.Utils (glyphicon, glyphiconActive)
 import Gargantext.Utils.Reactix as R2
 
+thisModule :: String
 thisModule = "Gargantext.Components.Forest.Tree.Node.Box"
 
 

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

@@ -272,11 +272,6 @@ checkboxesListGroup xs (val /\ set) =
       ) xs
 
 
-prettyNodeType :: GT.NodeType -> String
-prettyNodeType nt = S.replace (S.Pattern "Node")   (S.Replacement " ")
-                  $ S.replace (S.Pattern "Folder") (S.Replacement " ")
-                  $ show nt
-
 
 -- START node link
 type NodeLinkProps = (
@@ -321,7 +316,7 @@ nodeLinkCpt = R.hooksComponentWithModule thisModule "nodeLink" cpt
                                            ]
                      , ReactTooltip.reactTooltip { id: tooltipId }
                                                  [ R2.row [ H.h4 {className: GT.fldr nodeType true}
-                                                                 [ H.text $ prettyNodeType nodeType ]
+                                                                 [ H.text $ GT.prettyNodeType nodeType ]
                                                           ]
                                                  , R2.row [ H.span {} [ H.text $ name ]]
                                                  ]

src/Gargantext/Prelude.purs

@@ -8,7 +8,6 @@ import Effect.Class (class MonadEffect, liftEffect)
 import Effect.Exception (catchException, throwException)
 import Effect.Unsafe (unsafePerformEffect)
 
-
 -- | JL: Astonishingly, not in the prelude
 --   AD: recent Preludes in Haskell much prefer identity
 --   then id can be used as a variable name (in records for instance)
@@ -40,4 +39,3 @@ xor :: Boolean -> Boolean -> Boolean
 xor true false = true
 xor false true = true
 xor _      _   = false
-

src/Gargantext/Types.purs

@@ -4,6 +4,7 @@ import Data.Argonaut (class DecodeJson, class EncodeJson, decodeJson, encodeJson
 import Data.Argonaut.Decode.Error (JsonDecodeError(..))
 import Data.Array as A
 import Data.Either (Either(..))
+import Data.String as S
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Eq (genericEq)
 import Data.Generic.Rep.Ord (genericCompare)
@@ -754,3 +755,15 @@ progressPercent (AsyncProgress {log}) = perc
         where
           nom = toNumber $ failed + succeeded
           denom = toNumber $ failed + succeeded + remaining
+
+---------------------------------------------------------------------------
+-- | GarganText Internal Sugar
+
+prettyNodeType :: NodeType -> String
+prettyNodeType nt = S.replace (S.Pattern "Node")   (S.Replacement " ")
+                  $ S.replace (S.Pattern "Folder") (S.Replacement " ")
+                  $ show nt
+
+
+
+