Merge branch 'dev' into dev-frame-calc-corpus-csv-upload

package.json

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

shell.nix

@@ -52,6 +52,13 @@ let
     pulp browserify --skip-compile -t dist/bundle.js --src-path output
   '';
 
+  minify-bundle = pkgs.writeShellScriptBin "minify-bundle" ''
+    #!/usr/bin/env bash
+    set -e
+
+    minify dist/bundle.js > dist/bundle.min.js
+  '';
+
   repl = pkgs.writeShellScriptBin "repl" ''
     #!/usr/bin/env bash
 
@@ -76,10 +83,12 @@ pkgs.mkShell {
     easy-ps.psc-package
     easy-ps.dhall-json-simple
     browserify
+    build-css
     build-purs
     build-watch
     build
-    build-css
+    minify-bundle
+    pkgs.minify
     pkgs.nodejs
     repl
     pkgs.pulp

src/Gargantext/Components/DocsTable.purs

@@ -275,8 +275,10 @@ pageLayoutCpt = here.component "pageLayout" cpt where
         handleResponse :: HashedResponse (TableResult Response) -> Tuple Int (Array DocumentsView)
         handleResponse (HashedResponse { hash, value: res }) = ret
           where
-
-            filters = filterDocs query
+            filterDocs' q ds = case cacheState' of
+              NT.CacheOff -> ds
+              NT.CacheOn -> filterDocs q ds
+            filters = filterDocs' query
                     >>> \res' -> case yearFilter' of
                       Nothing -> res'
                       Just year -> filterDocsByYear year res'

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

 module Gargantext.Components.Forest.Tree.Node.Action.Contact.Types where
 
 import Data.Generic.Rep (class Generic)
-import Data.Newtype (class Newtype)
 import Data.Show.Generic (genericShow)
+import Gargantext.Utils.SimpleJSON as GUSJ
 import Simple.JSON as JSON
 
 import Gargantext.Prelude (class Eq, class Show)
 
-newtype AddContactParams =
-  AddContactParams { firstname :: String, lastname :: String }
+data AddContactParams =
+    AddContactParams { firstname :: String, lastname :: String }
+  | AddContactParamsAdvanced { firstname :: String, lastname :: String }
 derive instance Eq AddContactParams
 derive instance Generic AddContactParams _
-derive instance Newtype AddContactParams _
 instance Show AddContactParams where show = genericShow
-derive newtype instance JSON.ReadForeign AddContactParams
-derive newtype instance JSON.WriteForeign AddContactParams
+instance JSON.ReadForeign AddContactParams where readImpl = GUSJ.taggedSumRep
+instance JSON.WriteForeign AddContactParams where
+  writeImpl (AddContactParams { firstname, lastname }) =
+    JSON.writeImpl { type: "AddContactParams"
+                   , values: { firstname, lastname } }
+  writeImpl (AddContactParamsAdvanced { firstname, lastname }) =
+    JSON.writeImpl { type: "AddContactParamsAdvanced"
+                   , values: { firstname, lastname } }
+
 

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

-module Gargantext.Components.Forest.Tree.Node.Action.Move where
+module Gargantext.Components.Forest.Tree.Node.Action.Move
+  ( moveNodeReq
+  , moveNode
+  ) where
 
 import Data.Either (Either)
 import Data.Maybe (Maybe(..))
 import Effect.Aff (Aff)
 import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(..))
 import Gargantext.Components.Forest.Tree.Node.Tools (submitButton, panel)
-import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (subTreeView, SubTreeParamsIn)
+import Gargantext.Components.Forest.Tree.Node.Tools.SubTree (SubTreeParamsIn, subTreeView)
 import Gargantext.Config.REST (RESTError)
 import Gargantext.Prelude
 import Gargantext.Routes (SessionRoute(..))
@@ -30,22 +33,47 @@ moveNodeCpt = here.component "moveNode" cpt
   where
     cpt { boxes, dispatch, id, nodeType, session, subTreeParams } _ = do
       action :: T.Box Action <- T.useBox (MoveNode {params: Nothing})
-      action' <- T.useLive T.unequal action
-
-      let button = case action' of
-              MoveNode { params } -> case params of
-                Just val -> submitButton (MoveNode {params: Just val}) dispatch
-                Nothing -> H.div {} []
-              _                   -> H.div {} []
 
       pure $
 
-        panel [ subTreeView { action
-                            , boxes
-                            , dispatch
-                            , id
-                            , nodeType
-                            , session
-                            , subTreeParams
-                            } []
-            ] button
+        moveNode' { action
+            , boxes
+            , dispatch
+            , id
+            , nodeType
+            , session
+            , subTreeParams
+            } []
+
+type Props =
+  ( action :: T.Box Action
+  | SubTreeParamsIn
+  )
+
+-- @XXX re-render issue -> clone component
+moveNode' :: R2.Component Props
+moveNode' = R.createElement moveNodeCpt'
+moveNodeCpt' :: R.Component Props
+moveNodeCpt' = here.component "foo" cpt where
+  cpt { boxes, dispatch, id, nodeType, session, subTreeParams, action } _ = do
+
+    action' <- T.useLive T.unequal action
+
+    let button = case action' of
+            MoveNode { params } -> case params of
+              Just val -> submitButton (MoveNode {params: Just val}) dispatch
+              Nothing -> H.div {} []
+            _                   -> H.div {} []
+
+    pure $
+
+      panel
+      [ subTreeView { action
+                      , boxes
+                      , dispatch
+                      , id
+                      , nodeType
+                      , session
+                      , subTreeParams
+                      } []
+      ] button

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

@@ -18,10 +18,18 @@ derive instance Generic UpdateNodeParams _
 instance Show UpdateNodeParams where show = genericShow
 instance JSON.ReadForeign UpdateNodeParams where readImpl = JSONG.untaggedSumRep
 instance JSON.WriteForeign UpdateNodeParams where
-  writeImpl (UpdateNodeParamsList { methodList }) = JSON.writeImpl { methodList }
-  writeImpl (UpdateNodeParamsGraph { methodGraph }) = JSON.writeImpl { methodGraph }
-  writeImpl (UpdateNodeParamsTexts { methodTexts }) = JSON.writeImpl { methodTexts }
-  writeImpl (UpdateNodeParamsBoard { methodBoard }) = JSON.writeImpl { methodBoard }
+  writeImpl (UpdateNodeParamsList { methodList }) =
+    JSON.writeImpl { type: "UpdateNodeParamsList"
+                   , values: methodList }
+  writeImpl (UpdateNodeParamsGraph { methodGraph }) =
+    JSON.writeImpl { type: "UpdateNodeParamsGraph"
+                   , methodGraph }
+  writeImpl (UpdateNodeParamsTexts { methodTexts }) =
+    JSON.writeImpl { type: "UpdateNodeParamsTexts"
+                   , methodTexts }
+  writeImpl (UpdateNodeParamsBoard { methodBoard }) =
+    JSON.writeImpl { type: "UpdateNodeParamsBoard"
+                   , methodBoard }
 
 ----------------------------------------------------------------------
 data Method = Basic | Advanced | WithModel

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

@@ -44,7 +44,7 @@ type SubTreeParamsProps =
   )
 
 subTreeView :: R2.Component SubTreeParamsProps
-subTreeView = R.createElement subTreeViewCpt
+subTreeView = R.createElement $ R.memo' subTreeViewCpt
 subTreeViewCpt :: R.Component SubTreeParamsProps
 subTreeViewCpt = here.component "subTreeView" cpt
   where

src/Gargantext/Components/Nodes/Home/Public.purs

@@ -9,7 +9,6 @@ import Effect.Aff (Aff)
 import Reactix as R
 import Reactix.DOM.HTML as H
 import Simple.JSON as JSON
-import Simple.JSON.Generics as JSONG
 
 import Gargantext.Config (publicBackend)
 import Gargantext.Config.REST (get, RESTError)
@@ -17,6 +16,7 @@ import Gargantext.Ends (backendUrl)
 import Gargantext.Hooks.Loader (useLoader)
 import Gargantext.Prelude
 import Gargantext.Utils.Reactix as R2
+import Gargantext.Utils.SimpleJSON as GUSJ
 
 here :: R2.Here
 here = R2.here "Gargantext.Components.Nodes.Home.Public"
@@ -35,9 +35,8 @@ data PublicData = PublicData
 
 derive instance Eq PublicData
 derive instance Generic PublicData _
-instance JSON.ReadForeign PublicData where readImpl = JSONG.untaggedSumRep
-instance Show PublicData where
-  show = genericShow
+instance JSON.ReadForeign PublicData where readImpl = GUSJ.taggedSumRep
+instance Show PublicData where show = genericShow
 
 ------------------------------------------------------------------------
 type LoadData :: forall k. Row k