Merge

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

@@ -1480,7 +1480,7 @@
       "precise"
     ],
     "repo": "https://github.com/poorscript/purescript-markdown",
-    "version": "master"
+    "version": "2020-03-04"
   },
   "markdown-smolder": {
     "dependencies": [
@@ -1488,7 +1488,7 @@
       "smolder"
     ],
     "repo": "https://github.com/poorscript/purescript-markdown-smolder",
-    "version": "master"
+    "version": "2020-03-04"
   },
   "math": {
     "dependencies": [],
@@ -2061,7 +2061,7 @@
       "prelude"
     ],
     "repo": "https://github.com/purescript-contrib/purescript-precise",
-    "version": "master"
+    "version": "v4.0.0"
   },
   "prelude": {
     "dependencies": [],
@@ -2370,7 +2370,7 @@
       "unsafe-coerce"
     ],
     "repo": "https://github.com/irresponsible/purescript-reactix",
-    "version": "v0.4.2"
+    "version": "v0.4.3"
   },
   "read": {
     "dependencies": [
@@ -2988,8 +2988,8 @@
       "react",
       "react-dom"
     ],
-    "repo": "https://github.com/np/purescript-thermite.git",
-    "version": "hide"
+    "repo": "https://github.com/poorscript/purescript-thermite.git",
+    "version": "hide-2020-03-04"
   },
   "these": {
     "dependencies": [
@@ -3235,6 +3235,13 @@
     "repo": "https://github.com/natefaubion/purescript-variant.git",
     "version": "v6.0.1"
   },
+  "versions": {
+    "dependencies": [
+      "prelude"
+    ],
+    "repo": "https://github.com/hdgarrood/purescript-versions.git",
+    "version": "v5.0.1"
+  },
   "web-clipboard": {
     "dependencies": [
       "web-html"

README.md

@@ -88,8 +88,15 @@ Some options:
 Once you have node and yarn installed, you may install deps with:
 
 ```shell
-yarn install && yarn install-ps
+yarn install && yarn add psc-package && yarn install-ps && yarn build
 ```
+You need to copy index.html:
+```shell
+cp src/index.html dist/
+```
+
+(Be careful, to update or upgrade your install, maybe you need to remove
+old files in node_modules).
 
 ### Development
 

dist/icons/toAdd.css

+.fa{
+display:inline-block;
+font:normal normal normal 14px/1 ForkAwesome;
+font-size:inherit;
+text-rendering:auto;
+-webkit-font-smoothing:antialiased;
+-moz-osx-font-smoothing:grayscale}
+.fa-lg{
+font-size:1.33333333em;
+line-height:.75em;
+vertical-align:-15%}
+.fa-2x{
+font-size:2em}
+.fa-3x{
+font-size:3em}
+.fa-4x{
+font-size:4em}
+.fa-5x{
+font-size:5em}
+.fa-fw{
+width:1.28571429em;
+text-align:center}
+.fa-ul{
+padding-left:0;
+margin-left:2.14285714em;
+list-style-type:none}
+.fa-ul>li{
+position:relative}
+.fa-li{
+position:absolute;
+left:-2.14285714em;
+width:2.14285714em;
+top:.14285714em;
+text-align:center}
+.fa-li.fa-lg{
+left:-1.85714286em}
+.fa-border{
+padding:.2em .25em .15em;
+border:solid .08em #eee;
+border-radius:.1em}
+.fa-pull-left{
+float:left}
+.fa-pull-right{
+float:right}
+.fa.fa-pull-left{
+margin-right:.3em}
+.fa.fa-pull-right{
+margin-left:.3em}
+.pull-right{
+float:right}
+.pull-left{
+float:left}
+.fa.pull-left{
+margin-right:.3em}
+.fa.pull-right{
+margin-left:.3em}
+.fa-spin{
+-webkit-animation:fa-spin 2s infinite linear;
+animation:fa-spin 2s infinite linear}
+.fa-pulse{
+-webkit-animation:fa-spin 1s infinite steps(8);
+animation:fa-spin 1s infinite steps(8)}
+@-webkit-keyframes fa-spin{
+0%{
+-webkit-transform:rotate(0);
+transform:rotate(0)}
+100%{
+-webkit-transform:rotate(359deg);
+transform:rotate(359deg)}
+}
+@keyframes fa-spin{
+0%{
+-webkit-transform:rotate(0);
+transform:rotate(0)}
+100%{
+-webkit-transform:rotate(359deg);
+transform:rotate(359deg)}
+}
+.fa-rotate-90{
+-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";
+-webkit-transform:rotate(90deg);
+-ms-transform:rotate(90deg);
+transform:rotate(90deg)}
+.fa-rotate-180{
+-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";
+-webkit-transform:rotate(180deg);
+-ms-transform:rotate(180deg);
+transform:rotate(180deg)}
+.fa-rotate-270{
+-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";
+-webkit-transform:rotate(270deg);
+-ms-transform:rotate(270deg);
+transform:rotate(270deg)}
+.fa-flip-horizontal{
+-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";
+-webkit-transform:scale(-1,1);
+-ms-transform:scale(-1,1);
+transform:scale(-1,1)}
+.fa-flip-vertical{
+-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
+-webkit-transform:scale(1,-1);
+-ms-transform:scale(1,-1);
+transform:scale(1,-1)}
+:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-rotate-90{
+filter:none}
+.fa-stack{
+position:relative;
+display:inline-block;
+width:2em;
+height:2em;
+line-height:2em;
+vertical-align:middle}
+.fa-stack-1x,.fa-stack-2x{
+position:absolute;
+left:0;
+width:100%;
+text-align:center}
+.fa-stack-1x{
+line-height:inherit}
+.fa-stack-2x{
+font-size:2em}
+.fa-inverse{
+color:#fff}
+
+
+

dist/styles/CodeEditor.css

@@ -24,6 +24,7 @@
 .code-editor .editor .code-area {
   flex-grow: 1;
   max-height: 200px;
+  min-width: 25%;
   overflow: auto;
 }
 .code-editor .editor .code-area .code-container {

dist/styles/CodeEditor.sass

@@ -41,6 +41,7 @@
     .code-area
       flex-grow: 1
       max-height: 200px
+      min-width: 25%
       overflow: auto
       .code-container
         background-color: #fafafa

dist/styles/Graph.css

@@ -16,8 +16,8 @@
 #graph-explorer .graph-tree {
   position: absolute;
   max-height: 600px;
-  overflow-y: scroll;
   top: 170px;
+  background-color: #fff;
   z-index: 1;
 }
 #graph-explorer #graph-view {
@@ -26,13 +26,11 @@
 #graph-explorer #sp-container {
   position: absolute;
   max-height: 600px;
-  overflow-y: scroll;
   top: 170px;
-  z-index: 1;
   border: 1px white solid;
   background-color: white;
   left: 70%;
-  width: 30%;
+  width: 28%;
 }
 #graph-explorer #sp-container #myTab {
   marginBottom: 18px;

dist/styles/Graph.sass

 @mixin sidePanelCommon
   position: absolute
   max-height: 600px
-  overflow-y: scroll
+  //overflow-y: scroll
   top: 170px
-  z-index: 1
+  //z-index: 1
 
 #graph-explorer
   #toolbar
@@ -22,6 +22,8 @@
 
   .graph-tree
     @include sidePanelCommon
+    background-color: #fff
+    z-index: 1
 
   #graph-view
     height: 95%
@@ -31,7 +33,7 @@
     border: 1px white solid
     background-color: white
     left: 70%
-    width: 30%
+    width: 28%
 
     #myTab
       marginBottom: 18px

dist/styles/Login.css

+#dafixedtop {
+  z-index: 999;
+}
+
 .logoSmall {
   line-height: 15px;
   height: 10px;
@@ -46,9 +50,11 @@ li#rename #rename-a {
 }
 
 #node-popup-tooltip {
-  position: fixed;
   background-color: white;
-  z-index: 1000;
+  border-bottom-left-radius: 6px;
+  border-bottom-right-radius: 6px;
+  border-top-left-radius: 6px;
+  border-top-right-radius: 6px;
 }
 #node-popup-tooltip:hover {
   border: none;
@@ -61,6 +67,7 @@ li#rename #rename-a {
 #node-popup-tooltip .popup-container .panel {
   border: 1px solid rgba(0, 0, 0, 0.2);
   box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
+  margin-bottom: 0px;
 }
 #node-popup-tooltip .popup-container .panel .glyphicon-pencil {
   color: black;
@@ -99,23 +106,24 @@ li#rename #rename-a {
   min-width: 200px;
 }
 
-li a#rename {
-  display: none;
-  position: absolute;
-  text-decoration: none;
-  left: 26px;
+li .leaf {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
 }
-li a#rename-leaf {
-  display: none;
-  position: absolute;
-  text-decoration: none;
-  margin-left: 20px;
+li .leaf .folder-icon {
+  padding: 0 2 0 2;
 }
-li:hover a#rename {
+li .leaf a.settings {
+  cursor: pointer;
   display: block;
+  padding: 0 2 0 2;
+  text-decoration: none;
+  visibility: hidden;
+  z-index: 1;
 }
-li:hover a#rename-leaf {
-  display: block;
+li .leaf:hover a.settings {
+  visibility: visible;
 }
 
 .glyphitem {
@@ -135,17 +143,6 @@ li:hover a#rename-leaf {
   transform: scale(1.4);
 }
 
-#arrow {
-  width: 0;
-  height: 0;
-  border-top: 10px solid transparent;
-  border-bottom: 10px solid transparent;
-  border-right: 10px solid darkgray;
-  position: relative;
-  top: 55px;
-  left: -9px;
-}
-
 #sp-container {
   -webkit-transition: width 2s;
   transition: width 2s;
@@ -162,13 +159,6 @@ li:hover a#rename-leaf {
   height: auto;
 }
 
-.tree {
-  margin-top: 10px;
-}
-.tree .file-dropped {
-  background-color: #d8dfe5;
-}
-
 #graph-tree .tree {
   margin-top: 27px;
 }
@@ -211,4 +201,15 @@ a:focus, a:hover {
   cursor: pointer;
 }
 
+.copy-from-corpus .tree .node {
+  padding-left: 10px;
+}
+.copy-from-corpus .tree .node .name.clickable {
+  color: #337ab7;
+  cursor: pointer;
+}
+.copy-from-corpus .tree .node .name.clickable:hover {
+  text-decoration: underline;
+}
+
 /*# sourceMappingURL=Login.css.map */

dist/styles/Login.sass

+#dafixedtop
+  z-index: 999  // correction for the popover
+
 .logoSmall
   line-height: 15px
   height: 10px
@@ -45,12 +48,11 @@ li#rename
 
 
 #node-popup-tooltip
-  //position : absolute
-  position: fixed
-  //left : 96px
-  //top: -64px
   background-color: white
-  z-index: 1000
+  border-bottom-left-radius: 6px
+  border-bottom-right-radius: 6px
+  border-top-left-radius: 6px
+  border-top-right-radius: 6px
   &:hover
     border: none
     text-decoration: none
@@ -60,6 +62,7 @@ li#rename
     .panel
       border: 1px solid rgba(0,0,0,0.2)
       box-shadow: 0 2px 5px rgba(0,0,0,0.2)
+      margin-bottom: 0px
       .glyphicon-pencil
         color: black
       .panel-body
@@ -96,24 +99,25 @@ li#rename
       min-width: 200px
 
 li
-  a#rename
-    display: none
-    position: absolute
-    text-decoration: none
-    left: 26px
+  .leaf
+    display: flex
+    flex-direction: row
+    justify-content: flex-start
 
-  a#rename-leaf
-    display: none
-    position: absolute
-    text-decoration: none
-    margin-left: 20px
+    .folder-icon
+      padding: 0 2 0 2
 
-  &:hover
-    a#rename
+    a.settings
+      cursor: pointer
       display: block
+      padding: 0 2 0 2
+      text-decoration: none
+      visibility: hidden
+      z-index: 1
 
-    a#rename-leaf
-      display: block
+    &:hover
+      a.settings
+        visibility: visible
 
 
 .glyphitem
@@ -132,16 +136,6 @@ li
     opacity: 1
     transform: scale(1.4)
 
-#arrow
-  width: 0
-  height: 0
-  border-top: 10px solid transparent
-  border-bottom: 10px solid transparent
-  border-right:10px solid darkgray
-  position : relative
-  top: 55px
-  left: -9px
-
 #sp-container
   -webkit-transition: width 2s  // For Safari 3.1 to 6.0
   transition: width 2s
@@ -156,11 +150,6 @@ li
     overflow: visible
     height: auto
 
-.tree
-  margin-top: 10px
-  .file-dropped
-    background-color: #d8dfe5
-
 #graph-tree
   .tree
     margin-top: 27px
@@ -197,3 +186,14 @@ li
 
 a:focus, a:hover
   cursor: pointer
+
+.copy-from-corpus
+  .tree
+    .node
+      padding-left: 10px
+      .name
+        &.clickable
+          color: #337ab7
+          cursor: pointer
+          &:hover
+            text-decoration: underline

dist/styles/Tree.css

+.tree {
+  margin-top: 10px;
+}
+.tree .file-dropped {
+  background-color: #d8dfe5;
+}
+.tree .node-actions {
+  padding-left: 5px;
+}
+.tree .node-actions .update-button.enabled {
+  cursor: pointer;
+}
+.tree .node-actions .update-button.disabled {
+  cursor: wait;
+}
+
+/*# sourceMappingURL=Tree.css.map */

dist/styles/Tree.sass

+.tree
+  margin-top: 10px
+  .file-dropped
+    background-color: #d8dfe5
+  .node-actions
+    padding-left: 5px
+    .update-button
+      &.enabled
+        cursor: pointer
+      &.disabled
+        cursor: wait

dist/styles/highlightjs-solarized-light.css

+/*
+
+Orginal Style from ethanschoonover.com/solarized (c) Jeremy Hull <sourdrums@gmail.com>
+
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  background: #fdf6e3;
+  color: #657b83;
+}
+
+.hljs-comment,
+.hljs-quote {
+  color: #93a1a1;
+}
+
+/* Solarized Green */
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-addition {
+  color: #859900;
+}
+
+/* Solarized Cyan */
+.hljs-number,
+.hljs-string,
+.hljs-meta .hljs-meta-string,
+.hljs-literal,
+.hljs-doctag,
+.hljs-regexp {
+  color: #2aa198;
+}
+
+/* Solarized Blue */
+.hljs-title,
+.hljs-section,
+.hljs-name,
+.hljs-selector-id,
+.hljs-selector-class {
+  color: #268bd2;
+}
+
+/* Solarized Yellow */
+.hljs-attribute,
+.hljs-attr,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-class .hljs-title,
+.hljs-type {
+  color: #b58900;
+}
+
+/* Solarized Orange */
+.hljs-symbol,
+.hljs-bullet,
+.hljs-subst,
+.hljs-meta,
+.hljs-meta .hljs-keyword,
+.hljs-selector-attr,
+.hljs-selector-pseudo,
+.hljs-link {
+  color: #cb4b16;
+}
+
+/* Solarized Red */
+.hljs-built_in,
+.hljs-deletion {
+  color: #dc322f;
+}
+
+.hljs-formula {
+  background: #eee8d5;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}

docker-env.sh

@@ -13,53 +13,76 @@ dockerrun(){
   sudo docker run -u "$UID" -e PATH="$P" -v $PWD:/app -w /app "$@"
 }
 
+NODE=node:buster-garg
+
+dockerrunnode(){
+  dockerrun "$NODE" "$@"
+}
+
 unalias npm yarn bower pulp repl &>/dev/null || :
 unset   npm yarn bower pulp repl &>/dev/null || :
 
 npm(){
-  dockerrun node npm "$@"
+  dockerrunnode npm "$@"
 }
 
 yarn(){
-  dockerrun node yarn "$@"
+  dockerrunnode yarn "$@"
 }
 
 bower(){
-  dockerrun node bower "$@"
+  dockerrunnode bower "$@"
 }
 
 dependencies(){
-  dockerrun node psc-dependencies "$@"
+  dockerrunnode psc-dependencies "$@"
 }
 
 package(){
-  dockerrun node psc-package "$@"
+  dockerrunnode psc-package "$@"
 }
 
 pulp(){
-  dockerrun node pulp --psc-package "$@"
+  dockerrunnode pulp --psc-package "$@"
 }
 
 repl(){
-  dockerrun -ti node pulp --psc-package repl "$@"
+  dockerrun -ti "$NODE" pulp --psc-package repl "$@"
+}
+
+sass(){
+  dockerrunnode yarn sass
 }
 
 check(){
   pulp test "$@"
 }
 
+pscpackagehack(){
+  cp $HOME/bin/psc-package node_modules/.bin
+}
+
 setup(){
   yarn install     &&
   yarn rebuild-set &&
+  pscpackagehack   &&
   yarn install-ps
 }
 
 build(){
-  pulp browserify --to dist/bundle.js
+  echo prefer: compile
+  yarn build
+ #pulp browserify --to dist/bundle.js
+}
+
+compile(){
+  yarn compile
 }
 
 serve(){
-  dockerrun node http-server -p 2015 --cors dist
+ #yarn dev
+ #dockerrunnode http-server -p 2015 --cors dist
+  dockerrunnode webpack-dev-server --env dev --mode development
 }
 
 dev(){

package.json

 {
+    "name": "Gargantext",
+    "version": "0.0.1.3.2",
     "scripts": {
         "rebase-set": "spago package-set-upgrade && spago psc-package-insdhall",
         "rebuild-set": "spago psc-package-insdhall",
@@ -25,6 +27,7 @@
         "highlightjs": "^9.16.2",
         "prop-types": "15.6.2",
         "react": "^16.10",
+        "react-awesome-popover": "^6.1.1",
         "react-dom": "^16.10",
         "sigma": "git://github.com/poorscript/sigma.js#garg"
     },
@@ -50,7 +53,7 @@
         "imports-loader": "^0.8.0",
         "mini-css-extract-plugin": "^0.5.0",
         "psc": "^0.1.1",
-        "psc-package": "^3.0.1",
+        "psc-package": "^4.0.0",
         "pulp": "^13.0.0",
         "purescript": "^0.13.6",
         "purescript-language-server": "^0.12.7",

packages.dhall

-{-
-Welcome to Spacchetti local packages!
-
-Below are instructions for how to edit this file for most use
-cases, so that you don't need to know Dhall to use it.
-
-## Warning: Don't Move This Top-Level Comment!
-
-Due to how `dhall format` currently works, this comment's
-instructions cannot appear near corresponding sections below
-because `dhall format` will delete the comment. However,
-it will not delete a top-level comment like this one.
-
-## Use Cases
-
-Most will want to do one or both of these options:
-1. Override/Patch a package's dependency
-2. Add a package not already in the default package set
-
-This file will continue to work whether you use one or both options.
-Instructions for each option are explained below.
-
-### Overriding/Patching a package
-
-Purpose:
-- Change a package's dependency to a newer/older release than the
-    default package set's release
-- Use your own modified version of some dependency that may
-    include new API, changed API, removed API by
-    using your custom git repo of the library rather than
-    the package set's repo
-
-Syntax:
-Replace the overrides' "{=}" (an empty record) with the following idea
-The "//" or "⫽" means "merge these two records and
-  when they have the same value, use the one on the right:"
--------------------------------
-let override =
-  { packageName =
-      upstream.packageName ⫽ { updateEntity1 = "new value", updateEntity2 = "new value" }
-  , packageName =
-      upstream.packageName ⫽ { version = "v4.0.0" }
-  , packageName =
-      upstream.packageName // { repo = "https://www.example.com/path/to/new/repo.git" }
-  }
--------------------------------
-
-Example:
--------------------------------
-let overrides =
-  { halogen =
-      upstream.halogen ⫽ { version = "master" }
-  , halogen-vdom =
-      upstream.halogen-vdom ⫽ { version = "v4.0.0" }
-  }
--------------------------------
-
-### Additions
-
-Purpose:
-- Add packages that aren't alread included in the default package set
-
-Syntax:
-Replace the additions' "{=}" (an empty record) with the following idea:
--------------------------------
-let additions =
-  { "package-name" =
-       mkPackage
-         [ "dependency1"
-         , "dependency2"
-         ]
-         "https://example.com/path/to/git/repo.git"
-         "tag ('v4.0.0') or branch ('master')"
-  , "package-name" =
-       mkPackage
-         [ "dependency1"
-         , "dependency2"
-         ]
-         "https://example.com/path/to/git/repo.git"
-         "tag ('v4.0.0') or branch ('master')"
-  , etc.
-  }
--------------------------------
-
-Example:
--------------------------------
-let additions =
-  { benchotron =
-      mkPackage
-        [ "arrays"
-        , "exists"
-        , "profunctor"
-        , "strings"
-        , "quickcheck"
-        , "lcg"
-        , "transformers"
-        , "foldable-traversable"
-        , "exceptions"
-        , "node-fs"
-        , "node-buffer"
-        , "node-readline"
-        , "datetime"
-        , "now"
-        ]
-        "https://github.com/hdgarrood/purescript-benchotron.git"
-        "v7.0.0"
-  }
--------------------------------
--}
-
 let mkPackage =
       https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.2-20190804/src/mkPackage.dhall sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57
 
 let upstream =
-      https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.2-20190804/src/packages.dhall sha256:2230fc547841b54bca815eb0058414aa03ed7b675042f8b3dda644e1952824e5
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.2-20190804/packages.dhall sha256:2230fc547841b54bca815eb0058414aa03ed7b675042f8b3dda644e1952824e5
 
 let overrides =
       { thermite =
@@ -125,13 +15,11 @@ let overrides =
             , "react"
             , "react-dom"
             ]
-          "https://github.com/np/purescript-thermite.git"
-          "hide"
+            "https://github.com/poorscript/purescript-thermite.git"
+            "hide-2020-03-04"
       , globals =
           mkPackage
-          [ "functions"
-          , "maybe"
-          ]
+            [ "functions", "maybe" ]
             "https://github.com/purescript/purescript-globals"
             "v4.1.0"
       }
@@ -194,24 +82,18 @@ let additions =
       , markdown =
           mkPackage
             [ "precise" ]
-          {- "https://github.com/slamdata/purescript-markdown"
-          "v12.0.0" -}
             "https://github.com/poorscript/purescript-markdown"
-          "master"
+            "2020-03-04"
       , markdown-smolder =
           mkPackage
-          [ "markdown"
-          , "smolder" ]
-          {- "https://github.com/hgiasac/purescript-markdown-smolder"
-          "v2.0.1" -}
+            [ "markdown", "smolder" ]
             "https://github.com/poorscript/purescript-markdown-smolder"
-          "master"
+            "2020-03-04"
       , precise =
           mkPackage
             [ "prelude" ]
             "https://github.com/purescript-contrib/purescript-precise"
-          {- "v3.0.1" -}
-          "master"
+            "v4.0.0"
       , reactix =
           mkPackage
             [ "aff"
@@ -224,7 +106,7 @@ let additions =
             , "unsafe-coerce"
             ]
             "https://github.com/irresponsible/purescript-reactix"
-          "v0.4.2"
+            "v0.4.3"
       , tuples-native =
           mkPackage
             [ "generics-rep", "prelude", "typelevel", "unsafe-coerce" ]
@@ -248,9 +130,16 @@ let additions =
             ]
             "https://github.com/slamdata/purescript-uri"
             "v7.0.0"
-       , read = mkPackage ["prelude", "maybe", "strings"]
+      , read =
+          mkPackage
+            [ "prelude", "maybe", "strings" ]
             "https://github.com/truqu/purescript-read"
             "v1.0.1"
+      , versions =
+          mkPackage
+            [ "prelude" ]
+            "https://github.com/hdgarrood/purescript-versions.git"
+            "v5.0.1"
       }
 
-in  upstream // overrides // additions
+in  upstream ⫽ overrides ⫽ additions

pinned.nix

+import (
+  builtins.fetchTarball {
+    url = "https://github.com/nixos/nixpkgs/archive/ece829033b7b8f4e81261fef5427144df4147bc4.tar.gz";
+    sha256 = "07n91k3d9i9pym8npsszha9mnvg4d1r0l0ldnhk4g8sx15vv1br5";
+  }
+)

psc-package.json

 {
   "name": "gargantext",
   "set": "local",
-  "source": ".psc-package",
+  "source": ".psc-package/local/.set/packages.json",
   "depends": [
     "affjax",
     "argonaut",
@@ -27,6 +27,7 @@
     "random",
     "reactix",
     "read",
+    "record-extra",
     "routing",
     "sequences",
     "smolder",
@@ -39,6 +40,7 @@
     "tuples-native",
     "uint",
     "uri",
+    "versions",
     "web-html"
   ]
 }

shell.nix

+{ pkgs ? import ./pinned.nix {} }:
+let
+  easy-ps = import (
+    pkgs.fetchFromGitHub {
+      owner = "justinwoo";
+      repo = "easy-purescript-nix";
+      rev = "14e7d85431e9f9838d7107d18cb79c7fa534f54e";
+      sha256 = "0lmkppidmhnayv0919990ifdd61f9d23dzjzr8amz7hjgc74yxs0";
+    }
+  ) {
+    inherit pkgs;
+  };
+
+  soba = import (
+    pkgs.fetchFromGitHub {
+      owner = "justinwoo";
+      repo = "soba";
+      rev = "2add8804bce7e7c1ab5eb1c3d8f6783e938a04d3";
+      sha256 = "1qagyklcllr2sxdb315prw33af6g37762zgk2ahh3ifxpns6ifxx";
+    }
+  ) {
+    inherit pkgs;
+  };
+
+  purs-packages = import ./purs-packages.nix { inherit pkgs; };
+
+  cpPackage = pp:
+    let
+      target = ".psc-package/local/${pp.name}/${pp.version}";
+    in
+      ''
+        mkdir -p ${target}
+        cp --no-preserve=mode,ownership,timestamp -r ${pp.fetched.outPath}/* ${target}
+      '';
+
+  install-purs-packages = pkgs.writeShellScriptBin "install-purs-packages" ''
+    #!/usr/bin/env bash
+    ${builtins.toString (builtins.map cpPackage (builtins.attrValues purs-packages))}
+    echo done installing deps.
+  '';
+
+  build-purs = pkgs.writeShellScriptBin "build-purs" ''
+    #!/usr/bin/env bash
+    purs compile "src/**/*.purs" ".psc-package/*/*/*/src/**/*.purs"
+  '';
+
+  storePath = x: ''"${x.fetched.outPath}/src/**/*.purs"'';
+
+  build-purs-from-store = pkgs.writeShellScriptBin "build-purs-from-store" ''
+    #!/usr/bin/env bash
+    purs compile "src/**/*.purs" \
+      ${builtins.toString (builtins.map storePath (builtins.attrValues purs-packages))}
+  '';
+in
+pkgs.mkShell {
+  buildInputs = [
+    easy-ps.purs
+    easy-ps.psc-package
+    soba
+    install-purs-packages
+    build-purs
+    build-purs-from-store
+    pkgs.yarn
+  ];
+}
+
+## how to build the project with nix dependencies:
+#
+# 1. start a nix shell (e.g. `nix-shell -j 20`, this uses 20 jobs to fetch deps)
+# 2. run `yarn` to install npm deps
+# 3. run `install-purs-packages` if you want dependencies locally, available for psc-package and for inspection
+# 4. run `build-purs` to build from local sources. otherwise use `build-purs-from-store`.
+#
+# note that the purescript compiler uses filepaths and timestamps, so using the above two commands
+# interchangeably will lead to constant rebuilding of the entire project.
+#
+## how to update purs-packages.nix
+#
+# 1. run `soba insdhall` to generate packages.json
+# 2. run `soba nix` to generate a nix derivation from packages.json
+

src/Gargantext/Components/App.purs

@@ -6,8 +6,14 @@ import Data.Array (fromFoldable)
 import Data.Foldable (intercalate)
 import Data.Maybe (Maybe(..), maybe')
 import Data.Tuple (fst, snd)
-import Gargantext.Components.Data.Lang (Lang(..))
-import Gargantext.Components.Folder (folder)
+import Data.Tuple.Nested ((/\))
+import Effect (Effect)
+import Effect.Aff (launchAff_)
+import Effect.Class (liftEffect)
+import Reactix as R
+import Reactix.DOM.HTML as H
+
+import Gargantext.Components.Lang (LandingLang(..))
 import Gargantext.Components.Forest (forest)
 import Gargantext.Components.GraphExplorer (explorerLayout)
 import Gargantext.Components.Login (login)
@@ -27,8 +33,7 @@ import Gargantext.Routes (AppRoute(..))
 import Gargantext.Sessions (Sessions, useSessions)
 import Gargantext.Sessions as Sessions
 import Gargantext.Utils.Reactix as R2
-import Reactix as R
-import Reactix.DOM.HTML as H
+import Gargantext.Version as GV
 
 -- TODO (what does this mean?)
 -- tree changes endConfig state => trigger endConfig change in outerLayout, layoutFooter etc
@@ -46,21 +51,36 @@ appCpt = R.hooksComponent "G.C.App.app" cpt where
     showLogin  <- R.useState' false
     showCorpus <- R.useState' false
 
-    let forested      = forestLayout frontends (fst sessions) (fst route) (snd showLogin)
+    treeReload <- R.useState' 0
+
+    let forested child = forestLayout { child
+                                      , frontends
+                                      , reload: treeReload
+                                      , route:  fst route
+                                      , sessions: fst sessions
+                                      , showLogin: snd showLogin }
     let mCurrentRoute = fst route
     let backends      = fromFoldable defaultBackends
-    let withSession = \sid f -> maybe' (\_ -> forested $ homeLayout EN) f $ Sessions.lookup sid (fst sessions)
+    let ff f session = R.fragment [ f session, version { session }  ]
+    let withSession sid f =
+          maybe' (const $ forested $ homeLayout LL_EN) (ff f) $ Sessions.lookup sid (fst sessions)
+
     pure $ case fst showLogin of
       true -> forested $ login { sessions, backends, visible: showLogin }
       false ->
         case fst route of
-          Home  -> forested $ homeLayout EN
+          Home  -> forested $ homeLayout LL_EN
           Login -> login { sessions, backends, visible: showLogin }
-          Folder sid _      -> withSession sid $ \_ -> forested (folder {})
-          Corpus sid nodeId -> withSession sid $ \session -> forested $ corpusLayout { nodeId, session }
+          --Folder sid _      -> withSession sid $ \_ -> forested (folder {})
+          Folder sid nodeId -> withSession sid $ \session -> forested $ corpusLayout { key: show nodeId, nodeId, session }
+          FolderPrivate sid nodeId -> withSession sid $ \session -> forested $ corpusLayout { key: show nodeId, nodeId, session }
+          FolderPublic sid nodeId -> withSession sid $ \session -> forested $ corpusLayout { key: show nodeId, nodeId, session }
+          FolderShared sid nodeId -> withSession sid $ \session -> forested $ corpusLayout { key: show nodeId, nodeId, session }
+          Team sid nodeId -> withSession sid $ \session -> forested $ corpusLayout { key: show nodeId, nodeId, session }
+          Corpus sid nodeId -> withSession sid $ \session -> forested $ corpusLayout { key: show nodeId, nodeId, session }
           Texts sid nodeId  -> withSession sid $ \session -> forested $ textsLayout { nodeId, session, frontends }
           Lists sid nodeId  -> withSession sid $ \session -> forested $ listsLayout { nodeId, session }
-          Dashboard sid _nodeId  -> withSession sid $ \session -> forested $ dashboardLayout {}
+          Dashboard sid nodeId  -> withSession sid $ \session -> forested $ dashboardLayout { nodeId, session }
           Annuaire sid nodeId    -> withSession sid $ \session -> forested $ annuaireLayout { frontends, nodeId, session }
           UserPage sid nodeId    -> withSession sid $ \session -> forested $ userLayout { frontends, nodeId, session }
           ContactPage sid aId nodeId -> withSession sid $ \session -> forested $ annuaireUserLayout { annuaireId: aId, frontends, nodeId, session }
@@ -73,18 +93,32 @@ appCpt = R.hooksComponent "G.C.App.app" cpt where
             withSession sid $
               \session ->
                 simpleLayout $
-                  explorerLayout { graphId, mCurrentRoute, session
-                                 , sessions: (fst sessions), frontends
-                                 , showLogin }
+                  explorerLayout { frontends
+                                 , graphId
+                                 , mCurrentRoute
+                                 , session
+                                 , sessions: (fst sessions)
+                                 , showLogin
+                                 , treeReload }
 
-forestLayout :: Frontends -> Sessions -> AppRoute -> R2.Setter Boolean -> R.Element -> R.Element
-forestLayout frontends sessions route showLogin child = do
-  R.fragment [ topBar {}, R2.row [main], footer {} ]
+type ForestLayoutProps =
+  (
+    child :: R.Element
+  , frontends :: Frontends
+  , reload :: R.State Int
+  , route :: AppRoute
+  , sessions :: Sessions
+  , showLogin :: R2.Setter Boolean
+  )
+
+forestLayout :: Record ForestLayoutProps -> R.Element
+forestLayout { child, frontends, reload, route, sessions, showLogin } = do
+  R.fragment [ topBar {}, R2.row [main], footer { } ]
   where
     main =
       R.fragment
       [ H.div {className: "col-md-2", style: {paddingTop: "60px"}}
-              [ forest {sessions, route, frontends, showLogin } ]
+              [ forest { frontends, reload, route, sessions, showLogin } ]
       , mainPage child
       ]
 
@@ -215,20 +249,52 @@ liNav (LiNav { title : title'
                           ]
                   ]
 
+type VersionProps =
+  (
+    session :: Sessions.Session
+  )
+
+version :: Record VersionProps -> R.Element
+version props = R.createElement versionCpt props []
+
+versionCpt :: R.Component VersionProps
+versionCpt = R.hooksComponent "G.C.A.version" cpt
+  where
+    cpt { session } _ = do
+      (ver /\ setVer) <- R.useState' "No Backend Version"
+
+      R.useEffect' $ do
+        launchAff_ $ do
+          v <- GV.getBackendVersion session
+          liftEffect $ setVer $ const v
+
+      pure $ H.div { className: "container" } [
+        H.footer {}
+          [
+            H.span {} [ H.text $ "Frontend version: " <> GV.version <> ", " ]
+          , H.span {} [ H.text $ "backend version: "  <> ver ]
+          , warning ver GV.version
+          ]
+      ]
+    warning backendVer frontendVer =
+      if backendVer == frontendVer then
+        H.div {} []
+      else
+        H.div { className: "text-danger" } [ H.text "Versions do not match" ]
+
 footer :: {} -> R.Element
 footer props = R.createElement footerCpt props []
 
 footerCpt :: R.Component ()
-footerCpt = R.staticComponent "G.C.Layout.footer" cpt
+footerCpt = R.hooksComponent "G.C.A.footer" cpt
   where
-    cpt _ _ =
-      H.div { className: "container" }
+    cpt _ _ = do
+      pure $ H.div { className: "container" }
         [ H.hr {}
         , H.footer {}
           [ H.p {}
             [ H.text "Gargantext "
             , H.span {className: "glyphicon glyphicon-registration-mark"} []
-          , H.text ", version 4.0"
             , H.a { href: "http://www.cnrs.fr"
                   , target: "blank"
                   , title: "Project hosted by CNRS."
@@ -245,4 +311,3 @@ footerCpt = R.staticComponent "G.C.Layout.footer" cpt
             , H.text "."
             ]]
         ]
-

src/Gargantext/Components/CodeEditor.purs

 module Gargantext.Components.CodeEditor where
 
+import DOM.Simple.Types (Element)
 import Data.Argonaut.Parser (jsonParser)
 import Data.Either (either, Either(..))
 import Data.Generic.Rep (class Generic)
@@ -8,11 +9,10 @@ import Data.Generic.Rep.Show (genericShow)
 import Data.Maybe (Maybe(..))
 import Data.Nullable (Nullable, null, toMaybe)
 import Data.String.Utils (endsWith)
-import Data.Tuple (fst)
+import Data.Tuple (fst, snd)
 import Data.Tuple.Nested ((/\))
-import DOM.Simple.Types (Element)
 import Effect (Effect)
-import FFI.Simple ((.=), delay)
+import FFI.Simple ((.=))
 import Reactix as R
 import Reactix.DOM.HTML as H
 import Text.Markdown.SlamDown.Parser (parseMd)
@@ -99,17 +99,10 @@ codeEditorCpt = R.hooksComponent "G.C.CE.CodeEditor" cpt
     cpt {code, defaultCodeType, onChange} _ = do
       controls <- initControls code defaultCodeType
 
-      -- Initial rendering of elements with given data
-
-      -- Note: delay is necessary here, otherwise initially the HTML won't get
-      -- rendered (DOM Element refs are still null)
-      R.useEffectOnce $ delay unit $ \_ -> do
-        _ <- renderHtml code controls
-        pure $ pure unit
-
-      R.useEffectOnce $ delay unit $ \_ -> do
-        _ <- setCodeOverlay controls code
-        pure $ pure unit
+      R.useEffect2' (fst controls.codeS) (fst controls.codeType) $ do
+        let code' = fst controls.codeS
+        setCodeOverlay controls code'
+        renderHtml code' controls
 
       pure $ H.div { className: "code-editor" } [
           toolbar {controls, onChange}
@@ -127,7 +120,7 @@ codeEditorCpt = R.hooksComponent "G.C.CE.CodeEditor" cpt
                           -- , contentEditable: "true"
                         , ref: controls.codeOverlayElRef
                         , rows: 30
-                          --, on: { input: onEditChange (fst codeType) codeElRef htmlRef editorCodeRef error }
+                          --, on: { input: onEditChange (fst codeType) codeElRef htmlRef codeRef error }
                         } []
                ]
              ]
@@ -158,11 +151,9 @@ codeEditorCpt = R.hooksComponent "G.C.CE.CodeEditor" cpt
     previewHidden _ = " hidden"
 
     onEditChange :: forall e. Record Controls -> (CodeType -> Code -> Effect Unit) -> e -> Effect Unit
-    onEditChange controls@{codeElRef, codeOverlayElRef, codeType: (codeType /\ _), editorCodeRef} onChange e = do
+    onEditChange controls@{codeElRef, codeOverlayElRef, codeType: (codeType /\ _), codeS} onChange e = do
       let code = R2.unsafeEventValue e
-      R.setRef editorCodeRef code
-      setCodeOverlay controls code
-      renderHtml (R.readRef controls.editorCodeRef) controls
+      snd codeS $ const code
       onChange codeType code
 
 setCodeOverlay :: Record Controls -> Code -> Effect Unit
@@ -214,11 +205,9 @@ toolbarCpt = R.hooksComponent "G.C.CE.toolbar" cpt
     -- Handle rerendering of preview when viewType changed
     onChangeCodeType :: forall e. Record ToolbarProps -> e -> Effect Unit
     onChangeCodeType {controls, onChange} _ = do
-      setCodeOverlay controls code
-      renderHtml code controls
       onChange (fst controls.codeType) code
       where
-        code = R.readRef controls.editorCodeRef
+        code = fst controls.codeS
 
 
 type ErrorComponentProps =
@@ -251,9 +240,10 @@ codeTypeSelectorCpt = R.hooksComponent "G.C.CE.CodeTypeSelector" cpt
   where
     cpt {codeType, onChange} _ = do
       pure $ R2.select { className: "form-control"
+                       , defaultValue: show $ fst codeType
                        , on: { change: onSelectChange codeType onChange }
                        , style: { width: "150px" }
-                , value: show $ fst codeType }
+                       }
         (option <$> [Haskell, JSON, Markdown])
 
     option :: CodeType -> R.Element
@@ -310,9 +300,9 @@ viewTypeSelectorCpt = R.hooksComponent "G.C.CE.ViewTypeSelector" cpt
 type Controls =
   (
       codeElRef :: R.Ref (Nullable Element)
+    , codeS :: R.State Code
     , codeType :: R.State CodeType
     , codeOverlayElRef :: R.Ref (Nullable Element)
-    , editorCodeRef :: R.Ref Code
     , error :: R.State (Maybe Error)
     , htmlElRef :: R.Ref (Nullable Element)
     , viewType :: R.State ViewType
@@ -321,19 +311,25 @@ type Controls =
 initControls :: Code -> CodeType -> R.Hooks (Record Controls)
 initControls code defaultCodeType = do
   htmlElRef <- R.useRef null
+  codeS <- R.useState' code
   codeElRef <- R.useRef null
   codeOverlayElRef <- R.useRef null
   codeType <- R.useState' defaultCodeType
-  editorCodeRef <- R.useRef code
   error <- R.useState' Nothing
-  viewType <- R.useState' Both
+  viewType <- R.useState' Preview
 
   pure $ {
       codeElRef
+    , codeS
     , codeType
     , codeOverlayElRef
-    , editorCodeRef
     , error
     , htmlElRef
     , viewType
     }
+
+reinitControls :: Record Controls -> Code -> CodeType -> Effect Unit
+reinitControls c@{codeType, codeS, error} code defaultCodeType = do
+  snd codeType $ const defaultCodeType
+  snd codeS $ const code
+  snd error $ const Nothing

src/Gargantext/Components/DocsTable.purs

@@ -33,7 +33,7 @@ import Gargantext.Utils.Reactix as R2
 import Gargantext.Routes as Routes
 import Gargantext.Routes (SessionRoute(NodeAPI))
 import Gargantext.Sessions (Session, sessionId, post, delete, put)
-import Gargantext.Types (NodeType(..), OrderBy(..), TabType, TabPostQuery(..), AffTableResult)
+import Gargantext.Types (NodeType(..), OrderBy(..), TabType, TabPostQuery(..), AffTableResult, NodeID)
 ------------------------------------------------------------------------
 
 data Category = Trash | UnRead | Checked | Topic | Favorite
@@ -143,7 +143,6 @@ categoryRoute nodeId = NodeAPI Node (Just nodeId) "category"
 putCategories :: Session -> Int -> CategoryQuery -> Aff (Array Int)
 putCategories session nodeId = put session $ categoryRoute nodeId
 
-type NodeID = Int
 type TotalRecords = Int
 
 type LayoutProps =
@@ -343,7 +342,7 @@ loadPage session {nodeId, tabType, query, listId, corpusId, params: {limit, offs
   let docs = res2corpus <$> res.docs
   pure $
     if mock then
-      Tuple 4737 (take limit $ drop offset sampleData)
+      Tuple 0 (take limit $ drop offset sampleData)
     else
       Tuple res.count docs
   where

src/Gargantext/Components/FacetsTable.purs

@@ -25,13 +25,12 @@ import Gargantext.Components.Table as T
 import Gargantext.Routes (SessionRoute(Search, NodeAPI))
 import Gargantext.Routes as Routes
 import Gargantext.Sessions (Session, sessionId, post, deleteWithBody)
-import Gargantext.Types (NodeType(..), OrderBy(..), NodePath(..))
+import Gargantext.Types (NodeType(..), OrderBy(..), NodePath(..), NodeID)
 import Gargantext.Utils (toggleSet, zeroPad)
 import Gargantext.Utils.DecodeMaybe ((.|))
 import Gargantext.Utils.Reactix as R2
 ------------------------------------------------------------------------
 
-type NodeID = Int
 type TotalRecords = Int
 
 -- Example:

src/Gargantext/Components/Forest.purs

@@ -4,21 +4,23 @@ import Gargantext.Prelude
 
 import Data.Array as A
 import Data.Maybe (Maybe(..))
-import Data.Set (Set)
 import Data.Set as Set
 import Data.Tuple (fst)
 import Data.Tuple.Nested ((/\))
+import Effect (Effect)
+import Reactix as R
+import Reactix.DOM.HTML as H
+
 import Gargantext.Components.Forest.Tree (treeView)
-import Gargantext.Components.Login.Types (TreeId)
+import Gargantext.Components.Forest.Tree.Node.Action (Reload)
 import Gargantext.Ends (Frontends)
 import Gargantext.Routes (AppRoute)
-import Gargantext.Sessions (Session(..), Sessions, unSessions)
+import Gargantext.Sessions (Session(..), Sessions, OpenNodes, unSessions)
 import Gargantext.Utils.Reactix as R2
-import Reactix as R
-import Reactix.DOM.HTML as H
 
 type Props =
   ( frontends :: Frontends
+  , reload :: R.State Int
   , route     :: AppRoute
   , sessions  :: Sessions
   , showLogin :: R2.Setter Boolean
@@ -29,15 +31,19 @@ forest props = R.createElement forestCpt props []
 
 forestCpt :: R.Component Props
 forestCpt = R.hooksComponent "G.C.Forest.forest" cpt where
-  cpt {frontends, route, sessions, showLogin } _ = do
-    openNodes <- R2.useLocalStorageState R2.openNodesKey (Set.empty :: Set TreeId)
-    R2.useCache (frontends /\ route /\ sessions /\ fst openNodes) (cpt' openNodes showLogin)
-  cpt' openNodes showLogin (frontends /\ route /\ sessions /\ openNodesState) = do
+  cpt { frontends, reload: extReload, route, sessions, showLogin } _ = do
+    -- NOTE: this is a hack to reload the tree view on demand
+    reload <- R.useState' (0 :: Reload)
+    openNodes <- R2.useLocalStorageState R2.openNodesKey (Set.empty :: OpenNodes)
+    R2.useCache
+      (frontends /\ route /\ sessions /\ fst openNodes /\ fst extReload /\ fst reload)
+      (cpt' openNodes reload showLogin)
+  cpt' openNodes reload showLogin (frontends /\ route /\ sessions /\ _ /\ _ /\ _) = do
     pure $ R.fragment $ A.cons (plus showLogin) trees
     where
       trees = tree <$> unSessions sessions
       tree s@(Session {treeId}) =
-        treeView { root: treeId, frontends, mCurrentRoute: Just route, session: s, openNodes }
+        treeView { root: treeId, frontends, mCurrentRoute: Just route, session: s, openNodes, reload }
 
 plus :: R2.Setter Boolean -> R.Element
 plus showLogin =
@@ -51,4 +57,4 @@ plus showLogin =
   -- [ H.i { className: "material-icons md-36"} [] ]
   where
     click _ = do
-      showLogin (const true)
+      showLogin $ const true

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

@@ -22,6 +22,7 @@ data NodeAction = Documentation NodeType
                 | Move     | Clone  | Delete
                 | Share    | Link NodeType
                 | Add (Array NodeType)
+                | CopyFromCorpus
 
 
 instance eqNodeAction :: Eq NodeAction where
@@ -36,6 +37,7 @@ instance eqNodeAction :: Eq NodeAction where
   eq Share Share       = true
   eq (Link x) (Link y) = true && (x == y)
   eq (Add x) (Add y)   = true && (x == y)
+  eq CopyFromCorpus CopyFromCorpus = true
   eq _ _               = false
 
 instance showNodeAction :: Show NodeAction where
@@ -50,6 +52,7 @@ instance showNodeAction :: Show NodeAction where
   show Share             = "Share"
   show (Link x)          = "Link to " <> show x
   show (Add xs)          = foldl (\a b -> a <> show b) "Add " xs
+  show CopyFromCorpus    = "Copy from corpus"
 
 
 glyphiconNodeAction :: NodeAction -> String
@@ -60,6 +63,7 @@ glyphiconNodeAction SearchBox         = "search"
 glyphiconNodeAction Upload            = "upload"
 glyphiconNodeAction (Link _)          = "transfer"
 glyphiconNodeAction Download          = "download"
+glyphiconNodeAction CopyFromCorpus    = "random"
 glyphiconNodeAction _                 = ""
 
 
@@ -78,33 +82,25 @@ settingsBox NodeUser = SettingsBox {
     show: true
   , edit : false
   , doc  : Documentation NodeUser
-  , buttons : [ SearchBox
-              , Add [ FolderPrivate
-                    , FolderShared
-                    , FolderPublic
-                    ]
-              , Delete
-              ]
+  , buttons : [ Delete ]
   }
 
 settingsBox FolderPrivate = SettingsBox {
     show: true
   , edit : false
   , doc  : Documentation FolderPrivate
-  , buttons : [ SearchBox
-              , Add [ Corpus
+  , buttons : [ Add [ Corpus
                     , Folder
                     , Annuaire
                     ]
-              , Delete]
+              ]
   }
 
 settingsBox Team = SettingsBox {
     show: true
-  , edit : false
+  , edit : true
   , doc  : Documentation Team
-  , buttons : [ SearchBox
-              , Add [ Corpus
+  , buttons : [ Add [ Corpus
                     , Folder
                     , Annuaire
                     ]
@@ -116,7 +112,7 @@ settingsBox FolderShared = SettingsBox {
   , edit : true
   , doc  : Documentation FolderShared
   , buttons : [ Add [Team, FolderShared]
-              , Delete
+              -- , Delete
               ]
   }
 
@@ -124,11 +120,9 @@ settingsBox FolderPublic = SettingsBox {
     show: true
   , edit : false
   , doc  : Documentation FolderPublic
-  , buttons : [{-, SearchBox
-                                                    , Add [ Corpus
+  , buttons : [ Add [ Corpus
                     , Folder
-                                                          ]-}
-    Delete
+                    ]
     ]
   }
 
@@ -136,8 +130,7 @@ settingsBox Folder = SettingsBox {
     show: true
   , edit : true
   , doc  : Documentation Folder
-  , buttons : [ SearchBox
-              , Add [ Corpus
+  , buttons : [ Add [ Corpus
                     , Folder
                     , Annuaire
                     ]
@@ -150,10 +143,10 @@ settingsBox Corpus = SettingsBox {
   , edit : true
   , doc  : Documentation Corpus
   , buttons : [ SearchBox
-              , Add [ NodeList
+              {- , Add [ NodeList
                     , Graph
                     , Dashboard
-                    ]
+                    ] -}
               , Upload
               , Download
                 --, Share
@@ -170,7 +163,7 @@ settingsBox Texts = SettingsBox {
   , doc  : Documentation Texts
   , buttons : [ Upload
               , Download
-              , Delete
+              -- , Delete
               ]
   }
 
@@ -178,8 +171,7 @@ settingsBox Graph = SettingsBox {
     show: true
   , edit : false
   , doc  : Documentation Graph
-  , buttons : [ Documentation Graph
-              , Download
+  , buttons : [ Download -- TODO as GEXF or JSON
               , Delete
               ]
   }
@@ -189,8 +181,9 @@ settingsBox NodeList = SettingsBox {
   , edit : false
   , doc  : Documentation NodeList
   , buttons : [ Upload
+              , CopyFromCorpus
               , Download
-              , Delete
+              -- , Delete
               ]
   }
 
@@ -198,14 +191,16 @@ settingsBox Dashboard = SettingsBox {
     show: true
   , edit : false
   , doc  : Documentation Dashboard
-  , buttons : [Delete]
+  , buttons : []
   }
 
 settingsBox Annuaire = SettingsBox {
     show: true
   , edit : false
   , doc  : Documentation Annuaire
-  , buttons : [Delete]
+  , buttons : [ Upload
+              , Delete 
+              ]
   }
 
 settingsBox _ = SettingsBox {

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

@@ -7,20 +7,23 @@ import Data.Generic.Rep.Show (genericShow)
 import Data.Maybe (Maybe(..))
 import Data.Newtype (class Newtype)
 import Effect.Aff (Aff)
+import Prelude hiding (div)
+
+import Gargantext.Components.Lang (Lang)
 import Gargantext.Routes (SessionRoute(..))
 import Gargantext.Sessions (Session, get, put, post, delete)
-import Gargantext.Types (NodeType(..), AsyncTask(..))
-import Prelude hiding (div)
+import Gargantext.Types as GT
 
-data Action = Submit       String
+data Action = CreateSubmit String GT.NodeType
             | DeleteNode
-            | CreateSubmit String NodeType
-            | UploadFile   FileType UploadFileContents
+            | SearchQuery GT.AsyncTaskWithType
+            | Submit       String
+            | UploadFile  GT.NodeType FileType (Maybe String) UploadFileContents
 
 -----------------------------------------------------
 -- UploadFile Action
 -- file upload types
-data FileType = CSV | CSV_HAL | PresseRIS
+data FileType = CSV | CSV_HAL | WOS | PresseRIS
 
 derive instance genericFileType :: Generic FileType _
 
@@ -31,14 +34,16 @@ instance showFileType :: Show FileType where
     show = genericShow
 
 readFileType :: String -> Maybe FileType
-readFileType "CSV_HAL"   = Just CSV_HAL
 readFileType "CSV"       = Just CSV
+readFileType "CSV_HAL"   = Just CSV_HAL
 readFileType "PresseRIS" = Just PresseRIS
+readFileType "WOS"       = Just WOS
 readFileType _           = Nothing
 
 data DroppedFile = DroppedFile {
     contents :: UploadFileContents
   , fileType :: Maybe FileType
+  , lang     :: Maybe Lang
     }
 type FileHash = String
 
@@ -47,19 +52,22 @@ type ID   = Int
 type Reload = Int
 
 newtype UploadFileContents = UploadFileContents String
-
+type UploadFile = {
+    contents :: UploadFileContents
+  , name     :: String
+  }
 
 createNode :: Session -> ID -> CreateValue -> Aff (Array ID)
-createNode session parentId = post session $ NodeAPI Node (Just parentId) ""
+createNode session parentId = post session $ NodeAPI GT.Node (Just parentId) ""
 
 renameNode :: Session -> ID -> RenameValue -> Aff (Array ID)
-renameNode session renameNodeId = put session $ NodeAPI Node (Just renameNodeId) "rename"
+renameNode session renameNodeId = put session $ NodeAPI GT.Node (Just renameNodeId) "rename"
 
 deleteNode :: Session -> ID -> Aff ID
-deleteNode session nodeId = delete session $ NodeAPI Node (Just nodeId) ""
+deleteNode session nodeId = delete session $ NodeAPI GT.Node (Just nodeId) ""
 
 loadNode :: Session -> ID -> Aff FTree
-loadNode session nodeId = get session $ NodeAPI Tree (Just nodeId) ""
+loadNode session nodeId = get session $ NodeAPI GT.Tree (Just nodeId) ""
 
 
 newtype RenameValue = RenameValue
@@ -75,7 +83,7 @@ instance encodeJsonRenameValue :: EncodeJson RenameValue where
 newtype CreateValue = CreateValue
   {
     name :: Name
-  , nodeType :: NodeType
+  , nodeType :: GT.NodeType
   }
 
 instance encodeJsonCreateValue :: EncodeJson CreateValue where
@@ -86,15 +94,14 @@ instance encodeJsonCreateValue :: EncodeJson CreateValue where
 
 data NTree a = NTree a (Array (NTree a))
 type FTree = NTree LNode
-type Tree = { tree :: FTree, asyncTasks :: Array AsyncTask }
+type Tree = { tree :: FTree, asyncTasks :: Array GT.AsyncTaskWithType }
 
 instance ntreeFunctor :: Functor NTree where
   map f (NTree x ary) = NTree (f x) (map (map f) ary)
 
-
 newtype LNode = LNode { id :: ID
                       , name :: Name
-                      , nodeType :: NodeType
+                      , nodeType :: GT.NodeType
                       }
 
 derive instance newtypeLNode :: Newtype LNode _

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

@@ -16,20 +16,21 @@ import Reactix.DOM.HTML as H
 
 -- START Create Node
 
+type Dispatch = Action -> Aff Unit
+
 data NodePopup = CreatePopup | NodePopup
 
 type CreateNodeProps =
   ( id       :: ID
+  , dispatch :: Dispatch
   , name     :: Name
   , nodeType :: NodeType
+  , nodeTypes :: Array NodeType
   )
 
-createNodeView :: (Action -> Aff Unit)
-               -> Record CreateNodeProps
-               -> R.State (Maybe NodePopup)
-               -> Array NodeType
+createNodeView :: Record CreateNodeProps
                -> R.Element
-createNodeView d p@{nodeType} (_ /\ setPopupOpen) nodeTypes = R.createElement el p []
+createNodeView p@{ dispatch, nodeType, nodeTypes } = R.createElement el p []
   where
     el = R.hooksComponent "CreateNodeView" cpt
     cpt {id, name} _ = do
@@ -94,8 +95,9 @@ createNodeView d p@{nodeType} (_ /\ setPopupOpen) nodeTypes = R.createElement el
           [ H.button {className: "btn btn-primary text-center"
                      , type: "button"
                      , onClick: mkEffectFn1 $ \_ -> do
-                         setPopupOpen $ const Nothing
-                         launchAff    $ d $ CreateSubmit name' nt
+                         -- TODO
+                         --setPopupOpen $ const Nothing
+                         launchAff    $ dispatch $ CreateSubmit name' nt
                      } [H.text "Add"]
           ]
 

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

@@ -12,14 +12,19 @@ import Gargantext.Types (NodeType)
 import Gargantext.Utils.Reactix as R2
 
 
+type Dispatch = Action -> Aff Unit
+
 -- | START Rename Box
 type RenameBoxProps =
   ( id :: ID
+  , dispatch :: Dispatch
   , name :: Name
-  , nodeType :: NodeType)
+  , nodeType :: NodeType
+  , renameBoxOpen :: R.State Boolean
+  )
 
-renameBox :: (Action -> Aff Unit) -> Record RenameBoxProps -> R.State Boolean -> R.Element
-renameBox d p (true /\ setRenameBoxOpen) = R.createElement el p []
+renameBox :: Record RenameBoxProps -> R.Element
+renameBox p@{ dispatch, renameBoxOpen: (true /\ setRenameBoxOpen) } = R.createElement el p []
   where
     el = R.hooksComponent "RenameBox" cpt
     cpt {id, name, nodeType} _ = do
@@ -44,7 +49,7 @@ renameBox d p (true /\ setRenameBoxOpen) = R.createElement el p []
               , type: "button"
               , onClick: mkEffectFn1 $ \_ -> do
                     setRenameBoxOpen $ const false
-                    launchAff $ d $ Submit newName
+                    launchAff $ dispatch $ Submit newName
               , title: "Rename"
               } []
         cancelBtn =
@@ -53,7 +58,7 @@ renameBox d p (true /\ setRenameBoxOpen) = R.createElement el p []
               , onClick: mkEffectFn1 $ \_ -> setRenameBoxOpen $ const false
               , title: "Cancel"
               } []
-renameBox _ p (false /\ _) = R.createElement el p []
+renameBox p@{ renameBoxOpen: (false /\ _) } = R.createElement el p []
   where
     el = R.hooksComponent "RenameBox" cpt
     cpt {name} _ = pure $ H.div {} []

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

@@ -12,7 +12,7 @@ import Effect.Timer (clearInterval, setInterval)
 import Gargantext.Components.Forest.Tree.Node.Action (ID)
 import Gargantext.Routes (SessionRoute(..))
 import Gargantext.Sessions (Session, get)
-import Gargantext.Types (AsyncProgress(..), AsyncTask(..), AsyncTaskStatus(..), NodeType(..), progressPercent)
+import Gargantext.Types as GT
 import Partial.Unsafe (unsafePartial)
 
 import Reactix as R
@@ -21,7 +21,7 @@ import Reactix.DOM.HTML as H
 
 type Props =
   (
-    asyncTask :: AsyncTask
+    asyncTask :: GT.AsyncTaskWithType
   , corpusId  :: ID
   , onFinish  :: Unit -> Effect Unit
   , session   :: Session
@@ -34,17 +34,17 @@ asyncProgressBar p = R.createElement asyncProgressBarCpt p []
 asyncProgressBarCpt :: R.Component Props
 asyncProgressBarCpt = R.hooksComponent "G.C.F.T.N.asyncProgressBar" cpt
   where
-    cpt props@{asyncTask: (AsyncTask {id}), corpusId, onFinish} _ = do
+    cpt props@{asyncTask: (GT.AsyncTaskWithType {task: GT.AsyncTask {id}}), corpusId, onFinish} _ = do
       (progress /\ setProgress) <- R.useState' 0.0
       intervalIdRef <- R.useRef Nothing
 
       R.useEffectOnce' $ do
         intervalId <- setInterval 1000 $ do
           launchAff_ $ do
-            asyncProgress@(AsyncProgress {status}) <- queryProgress props
+            asyncProgress@(GT.AsyncProgress {status}) <- queryProgress props
             liftEffect do
-              setProgress \p -> min 100.0 $ progressPercent asyncProgress
-              if (status == Finished) || (status == Killed) || (status == Failed) then do
+              setProgress \p -> min 100.0 $ GT.progressPercent asyncProgress
+              if (status == GT.Finished) || (status == GT.Killed) || (status == GT.Failed) then do
                 _ <- case R.readRef intervalIdRef of
                   Nothing -> pure unit
                   Just iid -> clearInterval iid
@@ -68,7 +68,8 @@ asyncProgressBarCpt = R.hooksComponent "G.C.F.T.N.asyncProgressBar" cpt
     toInt :: Number -> Int
     toInt n = unsafePartial $ fromJust $ fromNumber n
 
-queryProgress :: Record Props -> Aff AsyncProgress
-queryProgress {asyncTask: AsyncTask {id}, corpusId, session} = get session p
+queryProgress :: Record Props -> Aff GT.AsyncProgress
+queryProgress {asyncTask: GT.AsyncTaskWithType {task: GT.AsyncTask {id}, typ}, corpusId, session} = get session p
   where
-    p = NodeAPI Corpus (Just corpusId) $ "add/form/async/" <> id <> "/poll?limit=1"
+    p = NodeAPI GT.Corpus (Just corpusId) $ path <> id <> "/poll?limit=1"
+    path = GT.asyncTaskTypePath typ

src/Gargantext/Components/Graph.purs

@@ -204,7 +204,7 @@ type SigmaSettings =
   -- selected nodes <=> special label
 sigmaSettings :: {|SigmaSettings}
 sigmaSettings =
-  { animationsTime: 5500.0
+  { animationsTime: 30000.0
   , autoRescale: true
   , autoResize: true
   , batchEdgesDrawing: true
@@ -217,7 +217,7 @@ sigmaSettings =
   , defaultLabelSize: 8.0                -- (old tina: showLabelsIfZoom)
   , defaultNodeBorderColor : "#000"   -- <- if nodeBorderColor = 'default'
   , defaultNodeColor: "#FFF"
-  , doubleClickEnabled: false
+  , doubleClickEnabled: false -- indicates whether or not the graph can be zoomed on double-click
   , drawEdgeLabels: true
   , drawEdges: true
   , drawLabels: true
@@ -228,12 +228,12 @@ sigmaSettings =
   , edgeHoverPrecision: 2.0
   , edgeHoverSizeRatio: 2.0
   , enableHovering: true
-  , font: "Droid Sans"                -- font params
+  , font: "arial"                -- font params
   , fontStyle: "bold"
   , hideEdgesOnMove: true
-  , labelSize : "fixed"
+  , labelSize : "proportional" -- alt : proportional
   , labelSizeRatio: 2.0               -- label size in ratio of node size
-  , labelThreshold: 5.0               -- min node cam size to start showing label
+  , labelThreshold: 7.0               -- min node cam size to start showing label
   , maxEdgeSize: 1.0
   , maxNodeSize: 8.0
   , minEdgeSize: 0.5              -- in fact used in tina as edge size
@@ -256,7 +256,7 @@ sigmaSettings =
   , verbose : true
   , zoomMax: 1.7
   , zoomMin: 0.0
-  , zoomingRatio: 3.2
+  , zoomingRatio: 1.7
   }
   
 type ForceAtlas2Settings =
@@ -280,17 +280,17 @@ type ForceAtlas2Settings =
 
 forceAtlas2Settings :: {|ForceAtlas2Settings}
 forceAtlas2Settings =
-  { adjustSizes : false
+  { adjustSizes : true
   , barnesHutOptimize   : true
-  , edgeWeightInfluence : 0.0
+  , edgeWeightInfluence : 1.0
     -- fixedY : false
   , gravity : 1.0
-  , iterationsPerRender : 4.0
-  , linLogMode : true  -- false
+  , iterationsPerRender : 10.0
+  , linLogMode : false  -- false
   , outboundAttractionDistribution: false
-  , scalingRatio : 4.0
+  , scalingRatio : 10.0
   , skipHidden: false
-  , slowDown : 0.7
-  , startingIterations : 2.0
+  , slowDown : 1.0
+  , startingIterations : 10.0
   , strongGravityMode : false
   }

src/Gargantext/Components/Lang/Data/Lang.purs

-module Gargantext.Components.Data.Lang where
-
-data Lang = EN | FR