Merge branch 'dev-refactor-views-panel' of...

Merge branch 'dev-refactor-views-panel' of ssh://gitlab.iscpif.fr:20022/gargantext/purescript-gargantext into dev-merge

dist/styles/Graph.css

@@ -14,9 +14,12 @@
 #graph-explorer #toggle-container {
   position: absolute;
   z-index: 999;
-  right: 15px;
+  right: 25%;
   top: 10px;
-  width: 70%;
+  width: 50%;
+}
+#graph-explorer #toggle-container .container-fluid {
+  padding-top: 90px;
 }
 #graph-explorer #controls-container {
   position: absolute;
@@ -50,6 +53,7 @@
   border: 1px white solid;
   background-color: white;
   width: 28%;
+  z-index: 15;
 }
 #graph-explorer #sp-container #myTab {
   marginBottom: 18px;

dist/styles/Graph.sass

@@ -21,9 +21,11 @@
   #toggle-container
     position: absolute
     z-index: 999 // needs to appear above solid menu bar
-    right: 15px
+    right: 25%
     top: 10px
-    width: 70%
+    width: 50%
+    .container-fluid
+      padding-top: 90px
 
   #controls-container
     position: absolute
@@ -51,6 +53,7 @@
     border: 1px white solid
     background-color: white
     width: 28%
+    z-index: 15
 
     #myTab
       marginBottom: 18px

dist/styles/Tree.css

@@ -63,4 +63,11 @@
   opacity: var(--over50, 0);
 }
 
+#node-popup-tooltip .tree .node {
+  margin-top: 5px;
+}
+#node-popup-tooltip .tree .children .node {
+  padding-left: 15px;
+}
+
 /*# sourceMappingURL=Tree.css.map */

dist/styles/Tree.sass

@@ -60,3 +60,11 @@
 
     &:after
       opacity: var(--over50, 0)
+
+#node-popup-tooltip
+  .tree
+    .node
+      margin-top: 5px
+    .children
+      .node
+        padding-left: 15px

nix/purs-packages.nix

@@ -118,24 +118,6 @@
       sha256 = "0mbpb8xr9a7a4bvawhki7js5cbv7c0lv0vdwb6r8nmv6b61gzg27";
     };
   };
-  "codec" = {
-    name = "codec";
-    version = "v3.0.0";
-    src = pkgs.fetchgit {
-      url = "https://github.com/garyb/purescript-codec.git";
-      rev = "v3.0.0";
-      sha256 = "0jk0j4yss3d6scyb715p926ld8rmsfnv1h85zxpywv85xdingw9w";
-    };
-  };
-  "codec-argonaut" = {
-    name = "codec-argonaut";
-    version = "v7.1.0";
-    src = pkgs.fetchgit {
-      url = "https://github.com/garyb/purescript-codec-argonaut.git";
-      rev = "v7.1.0";
-      sha256 = "13aqci36xgxbahgpcxf2hsq9nsp0ljjd7nkzvpwxhhvy4n8yk1kk";
-    };
-  };
   "colors" = {
     name = "colors";
     version = "v5.0.0";
@@ -1072,15 +1054,6 @@
       sha256 = "03irk6n7jgsimhp9ckrg2ns7qbc8d383ls3sslxgir5mr8xdc44g";
     };
   };
-  "variant" = {
-    name = "variant";
-    version = "v6.0.1";
-    src = pkgs.fetchgit {
-      url = "https://github.com/natefaubion/purescript-variant.git";
-      rev = "v6.0.1";
-      sha256 = "0cn227q57zbqm6r1aw5kvnp1x8zkc1x7wx28yyz311lmy7k1mkql";
-    };
-  };
   "versions" = {
     name = "versions";
     version = "v5.0.1";

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

@@ -118,24 +118,25 @@ subTreeTreeViewCpt = R2.hooksComponent thisModule "subTreeTreeViewCpt" cpt
                     GT.LeftHanded  -> A.reverse
                     GT.RightHanded -> identity
 
-            pure $ H.div {} $ (ordering [ H.div { className: "node " <> GT.fldr nodeType true} []
-                                        , H.span { style : if validNodeType
-                                                                    then { color : "blue"
-                                                                         , "text-decoration": "underline"
-                                                                         }
-                                                                    else { color : ""
-                                                                         , "text-decoration": "none"
-                                                                         }
-                                                        , on: { click: onClick }
-                                                        }
-                                                        [ nodeText { isSelected: isSelected targetId valAction
-                                                                               , name: " " <> name
-                                                                               , handed
-                                                                               }
-                                                        ]
-                                       ]
-                            )
-                            <> children
+            pure $ H.div {} $ ordering [
+              H.div { className: "node " <> GT.fldr nodeType true} [
+                H.span { style : if validNodeType then
+                                   { color : "blue"
+                                   , "text-decoration": "underline"
+                                   }
+                                  else { color : ""
+                                       , "text-decoration": "none"
+                                       }
+                       , on: { click: onClick }
+                       } [
+                  nodeText { isSelected: isSelected targetId valAction
+                           , name: " " <> name
+                           , handed
+                           }
+                , H.span { className: "children" } children
+                ]
+              ]
+            ]
       where
 
         SubTreeParams { valitypes } = subTreeParams

src/Gargantext/Components/GraphExplorer.purs

@@ -187,7 +187,7 @@ explorerCpt = R2.hooksComponent thisModule "explorer" cpt
     mainLayout Types.LeftHanded (tree' /\ gc /\ gv /\ sdb) = [sdb, gc, gv, tree']
 
     outer = RH.div { className: "col-md-12" }
-    inner h = RH.div { className: "container-fluid " <> hClass, style: { paddingTop: "90px" } }
+    inner h = RH.div { className: "container-fluid " <> hClass }
       where
         hClass = case h of
           Types.LeftHanded -> "lefthanded"