Merge branch 'dev' into dev-prettyNodeType-form

.gitignore

@@ -30,3 +30,5 @@ bundle.js
 # docker
 /.bash_history
 /.lesshst
+/dist/js/**/*.map
+/dist/styles/**/*.map

dist/index.html

@@ -4,9 +4,9 @@
         <meta charset="utf-8"/>
         <title>CNRS GarganText</title>
         <link rel="stylesheet" href="icons/forkawesome.css">
-        <link href="styles/login.min.css" rel="stylesheet">
-        <link href="styles/bootstrap.min.css" rel="stylesheet">
-        <link rel="stylesheet" type="text/css" href="styles/highlightjs-solarized-light.css"/>
+        <!-- <link href="styles/bootstrap.min.css" rel="stylesheet"> -->
+        <link id="bootstrap-css" href="styles/bootstrap-default.css" rel="stylesheet" />
+        <link rel="stylesheet" type="text/css" href="styles/highlightjs-solarized-light.css" />
         <link href="styles/sass.css" rel="stylesheet" type="text/css" />
         <style> * {margin: 0; padding: 0; list-style: none;} </style>
     </head>

dist/styles/bootstrap-reboot.css

+/*!
+ * Bootstrap Reboot v4.4.1 (https://getbootstrap.com/)
+ * Copyright 2011-2019 The Bootstrap Authors
+ * Copyright 2011-2019 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
+ */
+*,
+*::before,
+*::after {
+  box-sizing: border-box;
+}
+
+html {
+  font-family: sans-serif;
+  line-height: 1.15;
+  -webkit-text-size-adjust: 100%;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
+  display: block;
+}
+
+body {
+  margin: 0;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  font-size: 1rem;
+  font-weight: 400;
+  line-height: 1.5;
+  color: #212529;
+  text-align: left;
+  background-color: #fff;
+}
+
+[tabindex="-1"]:focus:not(:focus-visible) {
+  outline: 0 !important;
+}
+
+hr {
+  box-sizing: content-box;
+  height: 0;
+  overflow: visible;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  margin-top: 0;
+  margin-bottom: 0.5rem;
+}
+
+p {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+abbr[title],
+abbr[data-original-title] {
+  text-decoration: underline;
+  -webkit-text-decoration: underline dotted;
+  text-decoration: underline dotted;
+  cursor: help;
+  border-bottom: 0;
+  -webkit-text-decoration-skip-ink: none;
+  text-decoration-skip-ink: none;
+}
+
+address {
+  margin-bottom: 1rem;
+  font-style: normal;
+  line-height: inherit;
+}
+
+ol,
+ul,
+dl {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+ol ol,
+ul ul,
+ol ul,
+ul ol {
+  margin-bottom: 0;
+}
+
+dt {
+  font-weight: 700;
+}
+
+dd {
+  margin-bottom: .5rem;
+  margin-left: 0;
+}
+
+blockquote {
+  margin: 0 0 1rem;
+}
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+small {
+  font-size: 80%;
+}
+
+sub,
+sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -.25em;
+}
+
+sup {
+  top: -.5em;
+}
+
+a {
+  color: #007bff;
+  text-decoration: none;
+  background-color: transparent;
+}
+
+a:hover {
+  color: #0056b3;
+  text-decoration: underline;
+}
+
+a:not([href]) {
+  color: inherit;
+  text-decoration: none;
+}
+
+a:not([href]):hover {
+  color: inherit;
+  text-decoration: none;
+}
+
+pre,
+code,
+kbd,
+samp {
+  font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+  font-size: 1em;
+}
+
+pre {
+  margin-top: 0;
+  margin-bottom: 1rem;
+  overflow: auto;
+}
+
+figure {
+  margin: 0 0 1rem;
+}
+
+img {
+  vertical-align: middle;
+  border-style: none;
+}
+
+svg {
+  overflow: hidden;
+  vertical-align: middle;
+}
+
+table {
+  border-collapse: collapse;
+}
+
+caption {
+  padding-top: 0.75rem;
+  padding-bottom: 0.75rem;
+  color: #6c757d;
+  text-align: left;
+  caption-side: bottom;
+}
+
+th {
+  text-align: inherit;
+}
+
+label {
+  display: inline-block;
+  margin-bottom: 0.5rem;
+}
+
+button {
+  border-radius: 0;
+}
+
+button:focus {
+  outline: 1px dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+}
+
+input,
+button,
+select,
+optgroup,
+textarea {
+  margin: 0;
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+}
+
+button,
+input {
+  overflow: visible;
+}
+
+button,
+select {
+  text-transform: none;
+}
+
+select {
+  word-wrap: normal;
+}
+
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  -webkit-appearance: button;
+}
+
+button:not(:disabled),
+[type="button"]:not(:disabled),
+[type="reset"]:not(:disabled),
+[type="submit"]:not(:disabled) {
+  cursor: pointer;
+}
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+  padding: 0;
+  border-style: none;
+}
+
+input[type="radio"],
+input[type="checkbox"] {
+  box-sizing: border-box;
+  padding: 0;
+}
+
+input[type="date"],
+input[type="time"],
+input[type="datetime-local"],
+input[type="month"] {
+  -webkit-appearance: listbox;
+}
+
+textarea {
+  overflow: auto;
+  resize: vertical;
+}
+
+fieldset {
+  min-width: 0;
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+legend {
+  display: block;
+  width: 100%;
+  max-width: 100%;
+  padding: 0;
+  margin-bottom: .5rem;
+  font-size: 1.5rem;
+  line-height: inherit;
+  color: inherit;
+  white-space: normal;
+}
+
+progress {
+  vertical-align: baseline;
+}
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+[type="search"] {
+  outline-offset: -2px;
+  -webkit-appearance: none;
+}
+
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+::-webkit-file-upload-button {
+  font: inherit;
+  -webkit-appearance: button;
+}
+
+output {
+  display: inline-block;
+}
+
+summary {
+  display: list-item;
+  cursor: pointer;
+}
+
+template {
+  display: none;
+}
+
+[hidden] {
+  display: none !important;
+}
+/*# sourceMappingURL=bootstrap-reboot.css.map */
\ No newline at end of file

dist/styles/bootstrap-reboot.min.css

+/*!
+ * Bootstrap Reboot v4.4.1 (https://getbootstrap.com/)
+ * Copyright 2011-2019 The Bootstrap Authors
+ * Copyright 2011-2019 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
+ */*,::after,::before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";font-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}[tabindex="-1"]:focus:not(:focus-visible){outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0;-webkit-text-decoration-skip-ink:none;text-decoration-skip-ink:none}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent}a:hover{color:#0056b3;text-decoration:underline}a:not([href]){color:inherit;text-decoration:none}a:not([href]):hover{color:inherit;text-decoration:none}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg{overflow:hidden;vertical-align:middle}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}select{word-wrap:normal}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}
+/*# sourceMappingURL=bootstrap-reboot.min.css.map */
\ No newline at end of file

dist/styles/sass.css

 /* styles for menu.html template (navbar etc) */
-#dafixedtop .navbar-text, #graphsfixedtop .navbar-text {
-  margin: 0;
-  padding-top: 15px;
-  padding-bottom: 15px;
-  float: none;
-}
-
+/* #dafixedtop .navbar-text, #graphsfixedtop .navbar-text */
+/*     margin: 0 */
+/*     padding-top: 15px */
+/*     padding-bottom: 15px */
+/*     float: none */
 #corporatop.nav-tabs > li {
   padding-left: 1;
   padding-right: 1;
@@ -85,56 +83,23 @@
   display: none;
 }
 
-#graph-explorer #toolbar {
-  display: flex;
-  flex-direction: column;
-}
-#graph-explorer #toolbar ul {
-  display: flex;
-  flex-direction: row;
-  margin: 0;
-}
-#graph-explorer #toolbar ul li {
-  display: flex;
-  max-width: 200px;
-}
-#graph-explorer #toggle-container {
-  position: fixed;
-  z-index: 999;
-  right: 25%;
-  top: 10px;
-  width: 50%;
-}
-#graph-explorer #toggle-container .container-fluid {
-  padding-top: 90px;
-}
-#graph-explorer #controls-container {
-  position: fixed;
-  z-index: 999;
-  backdrop-filter: blur(4px);
-  background: rgba(255, 255, 255, 0.75);
-  overflow: auto;
-  left: 0;
-  right: 0;
-  top: 60px;
-}
-#graph-explorer .graph-tree {
-  position: absolute;
-  max-height: 600px;
-  top: 170px;
-  background-color: #fff;
-  z-index: 1;
-}
-#graph-explorer .lefthanded .graph-tree {
-  left: 80%;
-}
-#graph-explorer .righthanded .graph-tree {
-  left: 0%;
+#graph-explorer {
+  margin-left: 20rem;
+  margin-right: 20rem;
+  padding-top: 0px;
 }
-#graph-explorer #graph-view {
-  height: 95%;
+
+.graph-container {
+  /* #toggle-container */
+  /*   position: fixed */
+  /*   z-index: 999 // needs to appear above solid menu bar */
+  /*   right: 25% */
+  /*   top: 10px */
+  /*   width: 50% */
+  /*   .container-fluid */
+  /*     padding-top: 90px */
 }
-#graph-explorer #sp-container {
+.graph-container #sp-container {
   position: absolute;
   max-height: 600px;
   top: 170px;
@@ -143,25 +108,57 @@
   width: 28%;
   z-index: 15;
 }
-#graph-explorer #sp-container #myTab {
+.graph-container #sp-container #myTab {
   marginBottom: 18px;
   marginTop: 18px;
 }
-#graph-explorer #sp-container #myTabContent {
+.graph-container #sp-container #myTabContent {
   borderBottom: 1px solid black;
   paddingBottom: 19px;
 }
-#graph-explorer #sp-container #horizontal-checkbox ul {
+.graph-container #sp-container #horizontal-checkbox ul {
   display: inline;
   float: left;
 }
-#graph-explorer .lefthanded #sp-container {
+.graph-container .lefthanded #sp-container {
   left: 0%;
 }
-#graph-explorer .righthanded #sp-container {
+.graph-container .righthanded #sp-container {
   left: 70%;
 }
-#graph-explorer #tree {
+.graph-container .graph-tree {
+  position: absolute;
+  max-height: 600px;
+  top: 170px;
+  background-color: #fff;
+  z-index: 1;
+}
+.graph-container .lefthanded .graph-tree {
+  left: 80%;
+}
+.graph-container .righthanded .graph-tree {
+  left: 0%;
+}
+.graph-container #controls-container {
+  position: fixed;
+  z-index: 999;
+  backdrop-filter: blur(4px);
+  background: rgba(255, 255, 255, 0.75);
+  overflow: auto;
+  left: 0;
+  right: 0;
+  top: 60px;
+}
+.graph-container #controls-container .nav-item {
+  padding-left: 0.8rem;
+}
+.graph-container .graph-row {
+  height: 100%;
+}
+.graph-container .graph-row #graph-view {
+  height: 95%;
+}
+.graph-container #tree {
   position: absolute;
   z-index: 1;
 }
@@ -178,12 +175,6 @@
   z-index: 999;
 }
 
-.logoSmall {
-  line-height: 15px;
-  height: 10px;
-  padding: 10px 10px;
-}
-
 #logo-designed {
   border: 15px;
 }
@@ -247,24 +238,25 @@ li#rename #rename-a {
   display: flex;
   flex-direction: colum;
 }
-#node-popup-tooltip .popup-container .panel {
+#node-popup-tooltip .popup-container > .card {
   border: 1px solid rgba(0, 0, 0, 0.2);
   box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
   margin-bottom: 0px;
+  width: 34rem;
 }
-#node-popup-tooltip .popup-container .panel .glyphicon-pencil {
+#node-popup-tooltip .popup-container > .card .fa-pencil {
   color: black;
 }
-#node-popup-tooltip .popup-container .panel .panel-body {
+#node-popup-tooltip .popup-container > .card .card-body {
   display: flex;
   justify-content: center;
   background-color: white;
   border: none;
 }
-#node-popup-tooltip .popup-container .panel .panel-body .spacer {
+#node-popup-tooltip .popup-container > .card .card-body .spacer {
   margin: 10px;
 }
-#node-popup-tooltip .popup-container .frame-search.panel {
+#node-popup-tooltip .popup-container .frame-search.card {
   border: 1px solid rgba(0, 0, 0, 0.2);
   box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
   height: 600px;
@@ -278,7 +270,7 @@ li#rename #rename-a {
   background-color: white;
   z-index: 1000;
 }
-#create-node-tooltip .panel-body input {
+#create-node-tooltip .card-body input {
   min-width: 200px;
 }
 
@@ -289,7 +281,7 @@ li#rename #rename-a {
   background-color: white;
   z-index: 1000;
 }
-#file-type-tooltip .panel-body select {
+#file-type-tooltip .card-body select {
   min-width: 200px;
 }
 
@@ -335,11 +327,6 @@ li#rename #rename-a {
   margin: 0 !important;
 }
 
-.row-no-padding > [class*=col-] {
-  padding-left: 0 !important;
-  padding-right: 0 !important;
-}
-
 .tab-pane .reload-btn {
   padding-right: 6px;
 }
@@ -375,9 +362,14 @@ body > .tree ul > li:first-child::before {
 li .leaf {
   display: flex;
   flex-direction: row;
+  color: #005a9aff;
 }
 li .leaf .folder-icon {
   padding: 0 2 0 2;
+  cursor: pointer;
+}
+li .leaf .node-link {
+  cursor: pointer;
 }
 li .leaf a.settings {
   cursor: pointer;
@@ -483,7 +475,6 @@ li .leaf:hover a.settings {
   margin-top: 1px;
 }
 .tree .node.node-type-valid .text {
-  color: blue;
   text-decoration: underline;
 }
 
@@ -531,8 +522,20 @@ li .leaf:hover a.settings {
   padding-left: 15px;
 }
 
+.panel-actions .almost-useable {
+  color: orange;
+}
+.panel-actions .development-in-progress {
+  color: red;
+}
+.panel-actions .ok-to-use {
+  color: black;
+}
+
 .code-editor-heading {
-  display: flex;
+  /* .buttons-right */
+  /*   display: flex */
+  /*   justify-content: flex-end */
 }
 .code-editor-heading .renameable {
   flex-grow: 2;
@@ -540,20 +543,7 @@ li .leaf:hover a.settings {
 .code-editor-heading .renameable .text {
   padding-right: 10px;
 }
-.code-editor-heading .buttons-right {
-  display: flex;
-  justify-content: flex-end;
-}
 
-.code-editor .toolbar {
-  display: flex;
-  justify-content: flex-start;
-  width: 100%;
-}
-.code-editor .editor {
-  display: flex;
-  width: 100%;
-}
 .code-editor .editor .code-area {
   flex-grow: 1;
   max-height: 200px;
@@ -683,23 +673,22 @@ li .leaf:hover a.settings {
 .simple-layout {
   height: 100%;
 }
+.simple-layout .license {
+  padding-top: 10px;
+}
 .simple-layout .spinner {
   position: absolute;
   left: 50%;
   top: 50%;
 }
 
+.table tr td {
+  color: #005a9aff;
+}
 .table tr td .active {
   font-weight: bold;
   text-decoration: underline;
 }
-.table tr td .column-tag {
-  align-items: center;
-}
-.table tr td .column-tag .doc-chooser {
-  cursor: pointer;
-  padding: 10px;
-}
 .table tr td .ngrams-selector {
   display: flex;
 }
@@ -710,10 +699,39 @@ li .leaf:hover a.settings {
   text-decoration: line-through;
 }
 
+.action-search {
+  margin: 10px;
+}
+
 .context-menu {
   position: fixed;
 }
 
+.search-bar {
+  margin: 10px;
+}
+
+/* */
+.body ul li {
+  color: #005a9aff;
+}
+.body ul .nav {
+  color: #005a9aff;
+}
+
+.btn-primary {
+  color: white;
+  background-color: #005a9aff;
+  border-color: black;
+}
+
+ul .nav {
+  color: #005a9aff;
+}
+ul li {
+  color: #005a9aff;
+}
+
 .range {
   width: 400px;
   /* some space for the right knob */
@@ -721,6 +739,7 @@ li .leaf:hover a.settings {
 }
 .range .range-slider {
   position: relative;
+  width: 85%;
 }
 .range .range-slider .scale {
   position: absolute;
@@ -754,4 +773,53 @@ li .leaf:hover a.settings {
   height: 20px;
 }
 
+.range-simple input {
+  width: 85%;
+}
+
+.annotation-run {
+  cursor: pointer;
+}
+.annotation-run.candidate-term.graph-term.stop-term {
+  color: #000;
+  background-image: linear-gradient(rgba(184, 184, 184, 0.34), rgba(184, 184, 184, 0.34)), linear-gradient(rgba(149, 210, 149, 0.33), rgba(149, 210, 149, 0.33)), linear-gradient(rgba(245, 148, 153, 0.33), rgba(245, 148, 153, 0.33));
+}
+.annotation-run.candidate-term.graph-term {
+  color: #000;
+  background-image: linear-gradient(rgba(184, 184, 184, 0.5), rgba(184, 184, 184, 0.5)), linear-gradient(rgba(149, 210, 149, 0.5), rgba(149, 210, 149, 0.5));
+}
+.annotation-run.candidate-term.stop-term {
+  color: #000;
+  background-image: linear-gradient(rgba(184, 184, 184, 0.5), rgba(184, 184, 184, 0.5)), linear-gradient(rgba(245, 148, 153, 0.5), rgba(245, 148, 153, 0.5));
+}
+.annotation-run.graph-term.stop-term {
+  color: #000;
+  background-image: linear-gradient(rgba(149, 210, 149, 0.5), rgba(149, 210, 149, 0.5)), linear-gradient(rgba(245, 148, 153, 0.5), rgba(245, 148, 153, 0.5));
+}
+.annotation-run.candidate-term {
+  color: #000;
+  background-color: #B8B8B876;
+}
+.annotation-run.graph-term {
+  color: #000;
+  background-color: #95D29593;
+}
+.annotation-run.stop-term {
+  color: #000;
+  background-color: #F5949931;
+}
+
+.context-menu .candidate-term {
+  color: #000;
+  background-color: #B8B8B876;
+}
+.context-menu .graph-term {
+  color: #000;
+  background-color: #95D29593;
+}
+.context-menu .stop-term {
+  color: #000;
+  background-color: #F5949931;
+}
+
 /*# sourceMappingURL=sass.css.map */

dist/styles/sass.css.map

-{"version":3,"sourceRoot":"","sources":["../../src/sass/_menu.sass","../../src/sass/_context_menu.sass","../../src/sass/_graph.sass","../../src/sass/_login.sass","../../src/sass/_tree.sass","../../src/sass/_code_editor.sass","../../src/sass/_styles.sass","../../src/sass/_range_slider.sass"],"names":[],"mappings":"AAAA;AAEA;EACI;EACA;EACA;EACA;;;AAEJ;EACI;EACA;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;;;AAEF;AACI;EACA;;;AAEJ;AACI;EACA;;;AAGJ;AACA;EACI;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;EACA;;;AAEF;EACE;;;AC7CF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;;;ACjBA;EACE;EACA;;AAEA;EACE;EACA;EACA;;AACA;EACE;EACA;;AAEN;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EAtCA;EACA;EAEA;EAqCE;EACA;;AACF;EACE;;AACF;EACE;;AAEF;EACE;;AAEF;EAlDA;EACA;EAEA;EAiDE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;EACA;;AAGA;EACE;EACA;;AACN;EACE;;AACF;EACE;;AAEF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;ACrFJ;EACE;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;;AACA;EACE;EACA;;;AAEJ;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAGF;EACE;;AAEE;EACE;EACA;;AACA;EACE;;;AAIJ;EACE;EACA;EACA;EACA;;;AAKJ;EACE;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACA;EACE;EACA;EACA;;AACA;EACE;;AACF;EACE;EACA;EACA;EACA;;AACA;EACE;;AACN;EACE;EACA;EACA;EACA;;;AAGN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAGF;EACE;;;AAEJ;EACI;EACA;;;AAEJ;EACI;EACA;;;AAGF;EACE;;;AAEJ;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AC1KF;EACE;;;AAGA;EACE;EACA;;AACA;EACE;;AACF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AAER;EACE;;AAEE;EACE;;AACA;EACE;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;EACA;EACA;;AACF;EACE;;AACF;EACE;EACA;EACA;EAEA;EACA;EACA;;AAEA;EACE;;AACF;EACE;;AAGN;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AAIR;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAEV;EACE;;AACF;EACE;;AAEE;EACE;;AACF;EACE;;AACN;EACE;;AAEE;EACE;EACA;;;AAGR;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAIF;EACE;;AAEA;EACE;;;AC/HR;EACE;;AAEA;EACE;;AACA;EACE;;AACJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;;AACF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EArDR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AA2DM;EACE;EACA;EACA;EACA;EACA;EA7DR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAmEE;EACE;EACA;EACA;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAGE;EACE;;AAEF;EACE;;;ACtGV;EACE;;AACF;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAGE;EACE;EACA;;AAEF;EACE;EACA;;;AAEV;EACE;;AACA;EACE;EACA;EACA;;;AAKE;EACE;EACA;;AACF;EACE;;AACA;EACE;EACA;;AACJ;EACE;;AACA;EACE;;AACJ;EACE;;;AAER;EACE;;;AChDF;EACE;AACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EAEA;EAEA;;AAEA;EACE;EAEA;EACA;EACA","file":"sass.css"}
+{"version":3,"sourceRoot":"","sources":["../../src/sass/_menu.sass","../../src/sass/_context_menu.sass","../../src/sass/_graph.sass","../../src/sass/_login.sass","../../src/sass/_tree.sass","../../src/sass/_code_editor.sass","../../src/sass/_styles.sass","../../src/sass/_range_slider.sass","../../src/sass/_annotation.sass"],"names":[],"mappings":"AAAA;AAEA;AACA;AACA;AACA;AACA;AAEA;EACI;EACA;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;;;AAEF;AACI;EACA;;;AAEJ;AACI;EACA;;;AAGJ;AACA;EACI;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;EACA;;;AAEF;EACE;;;AC7CF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;;;AClBF;EACE;EACA;EACA;;;AAEF;AAkCE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAxCA;EAZA;EACA;EAEA;EAWE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;EACA;;AAGA;EACE;EACA;;AACN;EACE;;AACF;EACE;;AAEF;EApCA;EACA;EAEA;EAmCE;EACA;;AACF;EACE;;AACF;EACE;;AAWF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEJ;EACE;;AAEA;EACE;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;ACpFJ;EACE;;;AAOF;EACE;;AACA;EACE;EACA;;;AAEJ;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAGF;EACE;;AAEE;EACE;EACA;;AACA;EACE;;;AAIJ;EACE;EACA;EACA;EACA;;;AAKJ;EACE;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;;AACF;EACE;EACA;EACA;EACA;;AACA;EACE;;AACN;EACE;EACA;EACA;EACA;;;AAGN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAGF;EACE;;;AAEJ;EACI;EACA;;;AAGF;EACE;;;AAEJ;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;ACvKF;EACE;;;AAGA;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AAER;EACE;;AAEE;EACE;;AACA;EACE;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;EACA;EACA;;AACF;EACE;;AACF;EACE;EACA;EACA;EAEA;EACA;EACA;;AAEA;EACE;;AACF;EACE;;AAGN;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AAIR;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAEV;EACE;;AACF;EACE;;AAEE;EACE;;AACF;EACE;;AACN;EACE;;AAEE;EACE;;;AAGR;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAIF;EACE;;AAEA;EACE;;;AAGN;EACE;;AACF;EACE;;AACF;EACE;;;AC7IJ;AAKE;AACA;AACA;;AANA;EACE;;AACA;EACE;;;AAOF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EA7CR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAmDM;EACE;EACA;EACA;EACA;EACA;EArDR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AA2DE;EACE;EACA;EACA;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAGE;EACE;;AAEF;EACE;;;AC9FV;EACE;;AACF;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAGE;EACE;EACA;;AAEF;EACE;EACA;;;AAEV;EACE;;AACA;EACE;;AACF;EACE;EACA;EACA;;;AAIA;EACE;;AACA;EACE;EACA;;AACF;EACE;;AACA;EACE;;AACJ;EACE;;;AAER;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;AAGI;EACE;;AACF;EACE;;;AAEN;EACE;EACA;EACA;;;AAIA;EACE;;AACF;EACE;;;ACxEJ;EACE;AACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EAEA;EAEA;;AAEA;EACE;EAEA;EACA;EACA;;;AAGN;EACE;;;ACzBJ;EACE;;AAEA;EANE;EACA;;AAQF;EAbE;EACA;;AAeF;EAhBE;EACA;;AAkBF;EAnBE;EACA;;AAqBF;EA1BE;EACA,kBALyB;;AAiC3B;EA7BE;EACA,kBANqB;;AAqCvB;EAhCE;EACA,kBAJoB;;;AAuCtB;EApCE;EACA,kBALyB;;AA2C3B;EAvCE;EACA,kBANqB;;AA+CvB;EA1CE;EACA,kBAJoB","file":"sass.css"}
\ No newline at end of file

index.html

@@ -3,16 +3,16 @@
     <head>
         <meta charset="utf-8"/>
         <title>CNRS GarganText</title>
-        <link rel="stylesheet" href="dist/icons/forkawesome.css">
-        <link href="dist/styles/login.min.css" rel="stylesheet">
-        <link href="dist/styles/bootstrap.min.css" rel="stylesheet">
-        <link rel="stylesheet" type="text/css" href="dist/styles/highlightjs-solarized-light.css"/>
-        <link href="dist/styles/sass.css" rel="stylesheet" type="text/css" />
+        <link rel="stylesheet" href="icons/forkawesome.css">
+        <!-- <link href="styles/bootstrap.min.css" rel="stylesheet"> -->
+        <link id="bootstrap-css" href="styles/bootstrap-default.css" rel="stylesheet" />
+        <link rel="stylesheet" type="text/css" href="styles/highlightjs-solarized-light.css" />
+        <link href="styles/sass.css" rel="stylesheet" type="text/css" />
         <style> * {margin: 0; padding: 0; list-style: none;} </style>
     </head>
     <body>
         <div id="app" class ="container-fluid"></div>
         <div id="portal"></div>
-        <script src="app.js"></script>
+        <script src="bundle.js"></script>
     </body>
 </html>

nix/easy-ps.nix

@@ -6,7 +6,7 @@ import
       owner = "justinwoo";
       repo = "easy-purescript-nix";
       rev = "7ebddd8613cf6736dbecef9fce4c32f2a104ef82";
-      sha256 = "0lmkppidmhnayv0919990ifdd61f9d23dzjzr8amz7hjgc74yxs0";
+      sha256 = "1g1hlybld298kimd1varvwiflpb0k7sdqlmcqha3kswjvy5z4k6k";
     }
   ) {
   inherit pkgs;

nix/pinned.nix

 import (
   builtins.fetchTarball {
     url = "https://github.com/NixOS/nixpkgs/archive/20.03.tar.gz";
-    sha256 = "07n91k3d9i9pym8npsszha9mnvg4d1r0l0ldnhk4g8sx15vv1br5";
+    sha256 = "0182ys095dfx02vl2a20j1hz92dx3mfgz2a6fhn31bqlp1wa8hlq";
   }
 )

package.json

 {
     "name": "Gargantext",
-    "version": "0.0.2.0",
+    "version": "0.0.2.7.1",
     "scripts": {
         "rebase-set": "spago package-set-upgrade && spago psc-package-insdhall",
         "rebuild-set": "spago psc-package-insdhall",
         "install-ps": "psc-package install",
         "compile": "pulp build",
         "build": "pulp browserify -t dist/bundle.js",
-        "css": "sass src/sass/sass.sass:dist/styles/sass.css",
+        "css": "sass src/sass/sass.sass:dist/styles/sass.css && sass src/sass/bootstrap/default.sass:dist/styles/bootstrap-default.css && cp node_modules/bootstrap-dark/src/bootstrap-dark.css dist/styles/bootstrap-dark.css && sass src/sass/bootstrap/greyson.scss:dist/styles/bootstrap-greyson.css && sass src/sass/bootstrap/monotony.scss:dist/styles/bootstrap-monotony.css",
         "docs": "pulp docs -- --format html",
         "repl": "pulp repl",
         "clean": "rm -Rf output node_modules",
@@ -24,6 +24,8 @@
     "dependencies": {
         "aes-js": "^3.1.1",
         "base-x": "^3.0.2",
+        "bootstrap": "4.4.1",
+        "bootstrap-dark": "^1.0.3",
         "create-react-class": "^15.6.3",
         "echarts": "^4.1.0",
         "echarts-for-react": "^2.0.14",

src/Gargantext/AsyncTasks.purs

@@ -16,6 +16,7 @@ import Gargantext.Prelude
 import Gargantext.Types as GT
 import Gargantext.Utils as GU
 import Gargantext.Utils.Reactix as R2
+import Gargantext.Utils.Reload as GUR
 
 
 localStorageKey :: String
@@ -48,16 +49,15 @@ removeTaskFromList ts (GT.AsyncTaskWithType { task: GT.AsyncTask { id: id' } })
   A.filter (\(GT.AsyncTaskWithType { task: GT.AsyncTask { id: id'' } }) -> id' /= id'') ts
 
 type ReductorProps = (
-    appReload  :: GT.ReloadS
-  , treeReload :: GT.ReloadS
+    appReload  :: GUR.ReloadS
+  , treeReload :: GUR.ReloadS
   , storage    :: Storage
   )
 
 type Reductor = R2.Reductor (Record ReductorProps) Action
 type ReductorAction = Action -> Effect Unit
-type OnFinish = Effect Unit
 
-useTasks :: GT.ReloadS -> GT.ReloadS -> R.Hooks Reductor
+useTasks :: GUR.ReloadS -> GUR.ReloadS -> R.Hooks Reductor
 useTasks appReload treeReload = R2.useReductor act initializer unit
   where
     act :: R2.Actor (Record ReductorProps) Action
@@ -73,12 +73,19 @@ data Action =
 
 action :: Record ReductorProps -> Action -> Effect (Record ReductorProps)
 action p@{ treeReload, storage } (Insert nodeId t) = do
-  _ <- snd treeReload $ (_ + 1)
+  _ <- GUR.bump treeReload
   let newStorage = Map.alter (maybe (Just [t]) (\ts -> Just $ A.cons t ts)) nodeId storage
   pure $ p { storage = newStorage }
 action p (Finish nodeId t) = do
   action p (Remove nodeId t)
-action p@{ appReload, storage } (Remove nodeId t) = do
-  _ <- snd appReload $ (_ + 1)
+action p@{ appReload, treeReload, storage } (Remove nodeId t@(GT.AsyncTaskWithType { typ })) = do
+  _ <- if GT.asyncTaskTriggersAppReload typ then
+    GUR.bump appReload
+  else
+    pure unit
+  _ <- if GT.asyncTaskTriggersTreeReload typ then
+    GUR.bump treeReload
+  else
+    pure unit
   let newStorage = Map.alter (maybe Nothing $ (\ts -> Just $ removeTaskFromList ts t)) nodeId storage
   pure $ p { storage = newStorage }

src/Gargantext/Components/Annotation/AnnotatedField.purs

@@ -23,8 +23,8 @@ import Reactix.DOM.HTML as HTML
 import Reactix.SyntheticEvent as E
 
 import Gargantext.Types (CTabNgramType(..), TermList)
-import Gargantext.Components.Annotation.Utils ( termBootstrapClass )
-import Gargantext.Components.NgramsTable.Core (NgramsTable, NgramsTerm, findNgramTermList, highlightNgrams, normNgram)
+import Gargantext.Components.Annotation.Utils ( termBootstrapClass, termClass )
+import Gargantext.Components.NgramsTable.Core
 import Gargantext.Components.Annotation.Menu ( annotationMenu, MenuType(..) )
 import Gargantext.Utils.Selection as Sel
 
@@ -131,5 +131,7 @@ annotatedRunComponent = R.staticComponent "AnnotatedRun" cpt
         elt =
           case list of
              Nothing -> HTML.span { on: { mouseUp: cb } }
-             Just l  -> HTML.span { className: "annotation-run bg-" <> termBootstrapClass l
-                                  , on: { click: cb } }
+             Just l  -> HTML.span { -- className: "annotation-run bg-" <> termBootstrapClass l
+                                    className: "annotation-run " <> termClass l
\ No newline at end of file
+                                  , on: { click: cb } 
+                                  }

src/Gargantext/Components/Annotation/Utils.purs

@@ -10,4 +10,4 @@ termClass CandidateTerm = "candidate-term"
 termBootstrapClass :: TermList -> String
 termBootstrapClass MapTerm = "success"
 termBootstrapClass StopTerm = "danger"
-termBootstrapClass CandidateTerm = "warning"
+termBootstrapClass CandidateTerm = "primary"

src/Gargantext/Components/App.purs

@@ -13,7 +13,8 @@ import Gargantext.Components.GraphExplorer (explorerLayout)
 import Gargantext.Components.Lang (LandingLang(..))
 import Gargantext.Components.Login (login)
 import Gargantext.Components.Nodes.Annuaire (annuaireLayout)
-import Gargantext.Components.Nodes.Annuaire.User.Contacts (annuaireUserLayout, userLayout)
+import Gargantext.Components.Nodes.Annuaire.User (userLayout)
+import Gargantext.Components.Nodes.Annuaire.User.Contact (contactLayout)
 import Gargantext.Components.Nodes.Corpus (corpusLayout)
 import Gargantext.Components.Nodes.Corpus.Dashboard (dashboardLayout)
 import Gargantext.Components.Nodes.Corpus.Document (documentMainLayout)
@@ -30,6 +31,7 @@ import Gargantext.Routes (AppRoute(..))
 import Gargantext.Sessions (useSessions)
 import Gargantext.Sessions as Sessions
 import Gargantext.Types as GT
+import Gargantext.Utils.Reload as GUR
 
 thisModule :: String
 thisModule = "Gargantext.Components.App"
@@ -48,12 +50,12 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
     route      <- useHashRouter router Home
 
     asyncTasksRef <- R.useRef Nothing
-    treeReloadRef <- R.useRef Nothing
+    treeReloadRef <- GUR.newI
 
     showLogin  <- R.useState' false
     backend    <- R.useState' Nothing
 
-    appReload  <- R.useState' 0
+    appReload  <- GUR.new
 
     showCorpus <- R.useState' false
 
@@ -64,9 +66,9 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
     let forested = forestLayout { appReload
                                 , asyncTasksRef
                                 , backend
+                                , currentRoute: fst route
                                 , frontends
                                 , handed
-                                , route: fst route
                                 , sessions: fst sessions
                                 , showLogin: snd showLogin
                                 , treeReloadRef
@@ -74,9 +76,9 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
     let forestedTB = forestLayoutWithTopBar { appReload
                                             , asyncTasksRef
                                             , backend
+                                            , currentRoute: fst route
                                             , frontends
                                             , handed
-                                            , route: fst route
                                             , sessions: fst sessions
                                             , showLogin: snd showLogin
                                             , treeReloadRef
@@ -89,7 +91,6 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
                      , visible: showLogin
                      }
           ]
-    let mCurrentRoute     = fst route
     let withSession sid f = maybe' defaultView (ff f) (Sessions.lookup sid (fst sessions))
 
     let sessionUpdate s = snd sessions $ Sessions.Update s
@@ -101,17 +102,6 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
           Annuaire sid nodeId        -> withSession sid $ \session -> forested [
             annuaireLayout { frontends, nodeId, session }
           ]
-          ContactPage sid aId nodeId                -> withSession sid $ \session -> forested [
-            annuaireUserLayout {
-                annuaireId: aId
-              , appReload
-              , asyncTasksRef
-              , frontends
-              , nodeId
-              , session
-              , treeReloadRef
-              }
-            ]
           Corpus sid nodeId        -> withSession sid $ \session -> forested [
             corpusLayout { nodeId, session }
           ]
@@ -119,7 +109,7 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
             documentMainLayout { listId, mCorpusId: Just corpusId,  nodeId, session } []
           ]
           Dashboard sid nodeId       -> withSession sid $ \session -> forested [
-            dashboardLayout { nodeId, session }
+            dashboardLayout { nodeId, session } []
           ]
           Document sid listId nodeId ->
             withSession sid $
@@ -139,9 +129,9 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
                       appReload
                     , asyncTasksRef
                     , backend
+                    , currentRoute: fst route
                     , frontends
                     , handed
-                    , route: fst route
                     , sessions: fst sessions
                     , showLogin: snd showLogin
                     , treeReloadRef
@@ -162,10 +152,10 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
                 simpleLayout { handed } [
                   explorerLayout { asyncTasksRef
                                  , backend
+                                 , currentRoute: fst route
                                  , frontends
                                  , graphId
                                  , handed: fst handed
-                                 , mCurrentRoute
                                  , session
                                  , sessions: (fst sessions)
                                  , showLogin
@@ -190,9 +180,9 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
                       appReload
                     , asyncTasksRef
                     , backend
+                    , currentRoute: fst route
                     , frontends
                     , handed
-                    , route: fst route
                     , sessions: fst sessions
                     , showLogin: snd showLogin
                     , treeReloadRef
@@ -204,6 +194,8 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
                     , sessionUpdate
                 }
               } []
+----------------------------------------------------------------------------------------
+-- | TODO refact UserPage and ContactPage
           UserPage sid nodeId        -> withSession sid $ \session -> forested [
             userLayout {
                 appReload
@@ -214,3 +206,17 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
               , treeReloadRef
               }
             ]
+
+          ContactPage sid aId nodeId                -> withSession sid $ \session -> forested [
+            contactLayout {
+                annuaireId: aId
+              , appReload
+              , asyncTasksRef
+              , frontends
+              , nodeId
+              , session
+              , treeReloadRef
+              }
+            ]
+
+

src/Gargantext/Components/Category.purs

@@ -29,7 +29,7 @@ import Reactix.DOM.HTML as H
 import Gargantext.Prelude
 
 import Gargantext.Components.Category.Types
-import Gargantext.Components.DocsTable.Types (DocumentsView(..), LocalCategories)
+import Gargantext.Components.DocsTable.Types (DocumentsView(..), LocalCategories, LocalUserScore)
 import Gargantext.Ends (Frontends, url)
 import Gargantext.Hooks.Loader (useLoaderWithCacheAPI, HashedResponse(..))
 import Gargantext.Utils.Reactix as R2
@@ -43,17 +43,68 @@ thisModule :: String
 thisModule = "Gargantext.Components.Category"
 
 ------------------------------------------------------------------------
+type RatingProps =
+  ( score              :: Star
+  , nodeId             :: NodeID
+  , row                :: DocumentsView
+  , session            :: Session
+  , setLocalCategories :: R.Setter LocalUserScore
+  )
+
+rating :: R2.Component RatingProps
+rating = R.createElement ratingCpt
+
+ratingCpt :: R.Component RatingProps
+ratingCpt = R.hooksComponentWithModule thisModule "rating" cpt
+  where
+    cpt { score, nodeId, row: DocumentsView r, session, setLocalCategories } _ = do
+      pure $ H.div {className:"flex"} divs
+        where
+          divs = map (\s -> H.div { className : icon score s
+                                  , on: {click: onClick score s}
+                                  } []) stars
+
+          icon Star_0 Star_0  = "fa fa-times-circle"
+          icon _ Star_0       = "fa fa-times"
+          icon c s            = if star2score c < star2score s
+                                  then "fa fa-star-o"
+                                  else "fa fa-star"
+
+          onClick score c = \_-> do
+            setLocalCategories $ Map.insert r._id c
+            void $ launchAff
+                 $ putRating session nodeId
+                 $ RatingQuery {nodeIds: [r._id], rating: c}
+
+newtype RatingQuery =
+  RatingQuery { nodeIds :: Array Int
+              , rating  :: Star
+              }
+
+instance encodeJsonRatingQuery :: EncodeJson RatingQuery where
+  encodeJson (RatingQuery post) =
+    "ntc_nodesId" := post.nodeIds
+    ~> "ntc_category" := encodeJson post.rating
+    ~> jsonEmptyObject
+
+putRating :: Session -> Int -> RatingQuery -> Aff (Array Int)
+putRating session nodeId = put session $ ratingRoute nodeId
+  where
+    ratingRoute :: Int -> SessionRoute
+    ratingRoute nodeId = NodeAPI Node (Just nodeId) "category"
 
 
-type CarousselProps = (
-    category           :: Category
+
+------------------------------------------------------------------------
+type CarousselProps =
+  ( category           :: Category
   , nodeId             :: NodeID
   , row                :: DocumentsView
   , session            :: Session
   , setLocalCategories :: R.Setter LocalCategories
   )
 
--- caroussel :: Category -> R.Element
+
 caroussel :: R2.Component CarousselProps
 caroussel = R.createElement carousselCpt
 
@@ -79,30 +130,32 @@ carousselCpt = R.hooksComponentWithModule thisModule "caroussel" cpt
 
         onClick c = \_-> do
           setLocalCategories $ Map.insert r._id c
-          void $ launchAff $ putCategories session nodeId $ CategoryQuery {nodeIds: [r._id], category: c}
+          void $ launchAff
+               $ putCategories session nodeId
+               $ CategoryQuery {nodeIds: [r._id], category: c}
 
 icon :: Category -> Boolean -> String
-icon cat b = btn b $ "glyphicon glyphicon-" <> (color $ size b $ icon' cat b)
+icon cat b = btn b $ "fa fa-" <> (color $ size b $ icon' cat b)
   where
     icon' :: Category -> Boolean -> String
-    icon' Trash   false = "remove"
-    icon' Trash   true  = "remove-sign"
+    icon' Trash   false = "times"
+    icon' Trash   true  = "times-circle"
 
-    icon' UnRead  true  = "question-sign"
-    icon' UnRead  false = "question-sign"
+    icon' UnRead  false = "question"
+    icon' UnRead  true  = "question-circle"
 
-    icon' Checked true  = "ok-sign"
-    icon' Checked false = "ok"
+    icon' Checked false = "check"
+    icon' Checked true  = "check-circle"
 
+    icon' Topic  false = "star-o"
     icon' Topic  true  = "star"
-    icon' Topic  false = "star-empty"
 
+    icon' Favorite false = "heart-o"
     icon' Favorite true = "heart"
-    icon' Favorite false = "heart-empty"
 
     size :: Boolean -> String -> String
     size true  s = s <> " btn-lg"
-    size false s = s <> " btn-xs"
+    size false s = s <> " btn-sm"
 
     color :: String -> String
     color x = x <> " text-primary"
@@ -111,7 +164,7 @@ icon cat b = btn b $ "glyphicon glyphicon-" <> (color $ size b $ icon' cat b)
     btn true s = s
     btn false s = "btn " <> s
 
-
+-------------------------------------------------------------------------
 newtype CategoryQuery = CategoryQuery {
     nodeIds :: Array Int
   , category :: Category

src/Gargantext/Components/Category/Types.purs

@@ -8,7 +8,40 @@ import Data.Generic.Rep.Show (genericShow)
 import Gargantext.Prelude
 
 ------------------------------------------------------------------------
+data Star = Star_0 | Star_1 | Star_2 | Star_3 | Star_4
 
+stars :: Array Star
+stars = [Star_0, Star_1, Star_2, Star_3, Star_4]
+
+derive instance genericStar :: Generic Star _
+
+instance showStar :: Show Star where
+  show = genericShow
+instance eqStar :: Eq Star where
+  eq = genericEq
+instance decodeJsonStar :: DecodeJson Star where
+  decodeJson json = do
+    obj <- decodeJson json
+    pure $ decodeStar obj
+instance encodeJsonStar :: EncodeJson Star where
+  encodeJson x    = encodeJson (star2score x)
+
+decodeStar :: Int -> Star
+decodeStar 0 = Star_0
+decodeStar 1 = Star_1
+decodeStar 2 = Star_2
+decodeStar 3 = Star_3
+decodeStar 4 = Star_4
+decodeStar _ = Star_4
+
+star2score :: Star -> Int
+star2score Star_0 = 0
+star2score Star_1 = 1
+star2score Star_2 = 2
+star2score Star_3 = 3
+star2score Star_4 = 4
+
+------------------------------------------------------------------------
 data Category = Trash | UnRead | Checked | Topic | Favorite
 
 categories :: Array Category

src/Gargantext/Components/CodeEditor.purs

@@ -24,6 +24,7 @@ import Gargantext.Prelude
 import Gargantext.Utils.HighlightJS as HLJS
 import Gargantext.Utils.Reactix as R2
 
+thisModule :: String
 thisModule = "Gargantext.Components.CodeEditor"
 
 type Code = String
@@ -117,25 +118,24 @@ codeEditorCpt = R.hooksComponentWithModule thisModule "codeEditor" cpt
         setCodeOverlay controls code'
         renderHtml code' controls
 
-      pure $ H.div { className: "code-editor" } [
-          toolbar {controls, onChange}
-        , H.div { className: "row error" } [
-           errorComponent {error: controls.error}
-        ]
-        , H.div { className: "row editor" } [
-           H.div { className: "code-area " <> (codeHidden $ fst controls.viewType) } [
-             H.div { className: "code-container" } [
-               H.textarea { defaultValue: code
-                          , on: { change: onEditChange controls onChange }
-                          , placeholder: "Type some code..."
-                          , ref: controls.codeElRef } [ ]
-               , H.pre  { className: (langClass $ fst controls.codeType)
-                          -- , contentEditable: "true"
-                        , ref: controls.codeOverlayElRef
-                        , rows: 30
-                          --, on: { input: onEditChange (fst codeType) codeElRef htmlRef codeRef error }
-                        } []
-               ]
+      pure $ H.div { className: "code-editor" }
+        [ toolbar {controls, onChange}
+        , H.div { className: "row error" }
+          [ errorComponent {error: controls.error} ]
+        , H.div { className: "row editor" }
+          [ H.div { className: "code-area " <> (codeHidden $ fst controls.viewType) }
+            [ H.div { className: "code-container" }
+              [ H.textarea { defaultValue: code
+                           , on: { change: onEditChange controls onChange }
+                           , placeholder: "Type some code..."
+                           , ref: controls.codeElRef } [ ]
+              , H.pre  { className: (langClass $ fst controls.codeType)
+                         -- , contentEditable: "true"
+                       , ref: controls.codeOverlayElRef
+                       , rows: 30
+                         --, on: { input: onEditChange (fst codeType) codeElRef htmlRef codeRef error }
+                       } []
+              ]
              ]
            , H.div { className: "v-divider " <> (dividerHidden $ fst controls.viewType) } [ H.text " " ]
            , H.div { className: "html " <> (langClass $ fst controls.codeType) <> (previewHidden $ fst controls.viewType)
@@ -147,11 +147,11 @@ codeEditorCpt = R.hooksComponentWithModule thisModule "codeEditor" cpt
     codeHidden :: ViewType -> String
     codeHidden Code = ""
     codeHidden Both = ""
-    codeHidden _ = " hidden"
+    codeHidden _ = " d-none"
 
     dividerHidden :: ViewType -> String
     dividerHidden Both = ""
-    dividerHidden _ = " hidden"
+    dividerHidden _ = " d-none"
 
     langClass :: CodeType -> String
     langClass Haskell  = " language-haskell"
@@ -162,7 +162,7 @@ codeEditorCpt = R.hooksComponentWithModule thisModule "codeEditor" cpt
     previewHidden :: ViewType -> String
     previewHidden Preview = ""
     previewHidden Both = ""
-    previewHidden _ = " hidden"
+    previewHidden _ = " d-none"
 
     onEditChange :: forall e. Record Controls -> (CodeType -> Code -> Effect Unit) -> e -> Effect Unit
     onEditChange controls@{codeElRef, codeOverlayElRef, codeType: (codeType /\ _), codeS} onChange e = do
@@ -208,13 +208,16 @@ toolbarCpt = R.hooksComponentWithModule thisModule "toolbar" cpt
   where
     cpt props@{controls: {codeType, error, viewType}} _ = do
       pure $
-        H.div { className: "row toolbar" } [
-             codeTypeSelector {
-                  codeType
-                , onChange: onChangeCodeType props
-                }
-           , viewTypeSelector {state: viewType}
-           ]
+        H.div { className: "row toolbar" }
+          [ H.div { className: "col-2" }
+               [ codeTypeSelector {
+                   codeType
+                 , onChange: onChangeCodeType props
+                 }
+               ]
+          , H.div { className: "col-1" }
+             [ viewTypeSelector {state: viewType} ]
+          ]
 
     -- Handle rerendering of preview when viewType changed
     onChangeCodeType :: forall e. Record ToolbarProps -> e -> Effect Unit
@@ -289,18 +292,19 @@ viewTypeSelectorCpt :: R.Component ViewTypeSelectorProps
 viewTypeSelectorCpt = R.hooksComponentWithModule thisModule "viewTypeSelector" cpt
   where
     cpt {state} _ =
-      pure $ H.div { className: "btn-group" } [
+      pure $ H.div { className: "btn-group"
+                   , role: "group" } [
           viewTypeButton Code state
         , viewTypeButton Both state
         , viewTypeButton Preview state
         ]
 
     viewTypeButton viewType (state /\ setState) =
-      H.label {
-        className: "btn btn-default" <> active
-        , on: { click: onClick }
-      } [
-        H.i { className: "glyphicon " <> (icon viewType) } []
+      H.button { className: "btn btn-primary" <> active
+               , on: { click: onClick }
+               , type: "button"
+               } [
+        H.i { className: "fa " <> (icon viewType) } []
       ]
       where
         active = if viewType == state then " active" else ""
@@ -308,9 +312,9 @@ viewTypeSelectorCpt = R.hooksComponentWithModule thisModule "viewTypeSelector" c
         onClick _ = do
           setState $ const viewType
 
-    icon Preview = "glyphicon-eye-open"
-    icon Both = "glyphicon-transfer"
-    icon Code = "glyphicon-pencil"
+    icon Preview = "fa-eye"
+    icon Both = "fa-columns"
+    icon Code = "fa-pencil"
 
 type Controls =
   (

src/Gargantext/Components/ContextMenu/ContextMenu.purs

@@ -48,7 +48,7 @@ contextMenuCpt = R.hooksComponentWithModule thisModule "contextMenu" cpt
       R.useLayoutEffect2 root rect (contextMenuEffect onClose root)
       let cs = [
             HTML.div { className: "popover-content" }
-            [ HTML.div { className: "panel panel-default" }
+            [ HTML.div { className: "card" }
               [ HTML.ul { className: "list-group" }
                 children
               ]

src/Gargantext/Components/DocsTable/Types.purs

@@ -3,24 +3,26 @@ module Gargantext.Components.DocsTable.Types where
 import Data.Argonaut (class DecodeJson, class EncodeJson, decodeJson, jsonEmptyObject, (.:), (:=), (~>))
 import Data.Map (Map)
 import Data.Map as Map
+import Data.Maybe (Maybe(..))
 import Data.Tuple (Tuple(..))
 
 import Gargantext.Prelude
 
-import Gargantext.Components.Category.Types (Category(..), decodeCategory)
+import Gargantext.Components.Category.Types (Category(..), decodeCategory, Star(..), decodeStar)
 
 data Action
   = MarkCategory Int Category
 
 newtype DocumentsView
   = DocumentsView
-    { _id    :: Int
-    , category :: Category
-    , date   :: Int
-    , ngramCount :: Int
-    , source :: String
-    , title  :: String
-    , url    :: String
+    { _id        :: Int
+    , category   :: Star
+    , date       :: Int
+    , ngramCount :: Maybe Int
+    , score      :: Maybe Int
+    , source     :: String
+    , title      :: String
+    , url        :: String
     }
 
 {-
@@ -36,48 +38,51 @@ instance encodeJsonSearchType :: Argonaut.EncodeJson SearchType where
 instance decodeDocumentsView :: DecodeJson DocumentsView where
   decodeJson json = do
     obj <- decodeJson json
-    _id <- obj .: "id"
-    category <- obj .: "category"
-    date <- obj .: "date"
+    _id <- obj        .: "id"
+    category <- obj   .: "category"
+    date <- obj       .: "date"
     ngramCount <- obj .: "ngramCount"
-    source <- obj .: "source"
-    title <- obj .: "title"
-    url <- obj .: "url"
-    pure $ DocumentsView { _id, category, date, ngramCount, source, title, url }
+    score <- obj      .: "score"
+    source <- obj     .: "source"
+    title <- obj      .: "title"
+    url <- obj        .: "url"
+    pure $ DocumentsView { _id, category, date, ngramCount, score, source, title, url }
 instance encodeDocumentsView :: EncodeJson DocumentsView where
   encodeJson (DocumentsView dv) =
-       "id" := dv._id
-    ~> "category" := dv.category
-    ~> "date" := dv.date
+       "id"        := dv._id
+    ~> "category"   := dv.category
+    ~> "date"       := dv.date
     ~> "ngramCount" := dv.ngramCount
-    ~> "source" := dv.source
-    ~> "title" := dv.title
-    ~> "url" := dv.url
+    ~> "score"      := dv.score
+    ~> "source"     := dv.source
+    ~> "title"      := dv.title
+    ~> "url"        := dv.url
     ~> jsonEmptyObject
 
 
 newtype Response = Response
   { cid        :: Int
   , hyperdata  :: Hyperdata
-  , category   :: Category
-  , ngramCount :: Int
+  , category   :: Star
+  , ngramCount :: Maybe Int
+  , score      :: Maybe Int
   , title      :: String
   }
 
 
 newtype Hyperdata = Hyperdata
-  { title  :: String
-  , source :: String
-  , pub_year   :: Int
+  { title    :: String
+  , source   :: String
+  , pub_year :: Int
   }
 
 
 instance decodeHyperdata :: DecodeJson Hyperdata where
   decodeJson json = do
     obj    <- decodeJson json
-    title  <- obj .: "title"
-    source <- obj .: "source"
     pub_year <- obj .: "publication_year"
+    source <- obj   .: "source"
+    title  <- obj   .: "title"
     pure $ Hyperdata { title,source, pub_year}
 
 instance decodeResponse :: DecodeJson Response where
@@ -86,12 +91,14 @@ instance decodeResponse :: DecodeJson Response where
     category   <- obj .: "category"
     cid        <- obj .: "id"
     hyperdata  <- obj .: "hyperdata"
-    ngramCount <- obj .: "id"
+    ngramCount <- obj .: "ngramCount"
+    score      <- obj .: "score"
     title      <- obj .: "title"
-    pure $ Response { cid, title, category: decodeCategory category, ngramCount, hyperdata }
-
+    --pure $ Response { category: decodeCategory category, cid, hyperdata, ngramCount, score, title }
+    pure $ Response { category: decodeStar category, cid, hyperdata, ngramCount, score, title }
 
 type LocalCategories = Map Int Category
+type LocalUserScore  = Map Int Star
 type Query = String
 
 ---------------------------------------------------------
@@ -101,8 +108,9 @@ sampleData' = DocumentsView { _id : 1
                             , date : 2010
                             , title : "title"
                             , source : "source"
-                            , category : UnRead
-                            , ngramCount : 1}
+                            , category : Star_1
+                            , ngramCount : Just 1
+                            , score: Just 1 }
 
 sampleData :: Array DocumentsView
 --sampleData = replicate 10 sampleData'
@@ -111,8 +119,9 @@ sampleData = map (\(Tuple t s) -> DocumentsView { _id : 1
                                                 , date : 2017
                                                 , title: t
                                                 , source: s
-                                                , category : UnRead
-                                                , ngramCount : 10}) sampleDocuments
+                                                , category : Star_1
+                                                , ngramCount : Just 10
+                                                , score: Just 1 }) sampleDocuments
 
 sampleDocuments :: Array (Tuple String String)
 sampleDocuments = [Tuple "Macroscopic dynamics of the fusion process" "Journal de Physique Lettres",Tuple "Effects of static and cyclic fatigue at high temperature upon reaction bonded silicon nitride" "Journal de Physique Colloques",Tuple "Reliability of metal/glass-ceramic junctions made by solid state bonding" "Journal de Physique Colloques",Tuple "High temperature mechanical properties and intergranular structure of sialons" "Journal de Physique Colloques",Tuple "SOLUTIONS OF THE LANDAU-VLASOV EQUATION IN NUCLEAR PHYSICS" "Journal de Physique Colloques",Tuple "A STUDY ON THE FUSION REACTION 139La + 12C AT 50 MeV/u WITH THE VUU EQUATION" "Journal de Physique Colloques",Tuple "Atomic structure of \"vitreous\" interfacial films in sialon" "Journal de Physique Colloques",Tuple "MICROSTRUCTURAL AND ANALYTICAL CHARACTERIZATION OF Al2O3/Al-Mg COMPOSITE INTERFACES" "Journal de Physique Colloques",Tuple "Development of oxidation resistant high temperature NbTiAl alloys and intermetallics" "Journal de Physique IV Colloque",Tuple "Determination of brazed joint constitutive law by inverse method" "Journal de Physique IV Colloque",Tuple "Two dimensional estimates from ocean SAR images" "Nonlinear Processes in Geophysics",Tuple "Comparison Between New Carbon Nanostructures Produced by Plasma with Industrial Carbon Black Grades" "Journal de Physique III",Tuple "<i>Letter to the Editor:</i> SCIPION, a new flexible ionospheric sounder in Senegal" "Annales Geophysicae",Tuple "Is reducibility in nuclear multifragmentation related to thermal scaling?" "Physics Letters B",Tuple "Independence of fragment charge distributions of the size of heavy multifragmenting sources" "Physics Letters B",Tuple "Hard photons and neutral pions as probes of hot and dense nuclear matter" "Nuclear Physics A",Tuple "Surveying the nuclear caloric curve" "Physics Letters B",Tuple "A hot expanding source in 50 A MeV Xe+Sn central reactions" "Physics Letters B"]

src/Gargantext/Components/Forest.purs

@@ -6,7 +6,7 @@ import Data.Maybe (Maybe(..), fromMaybe)
 import Data.Set as Set
 import Data.Tuple (fst, snd)
 import Data.Tuple.Nested ((/\))
-import DOM.Simple.Console (log)
+import DOM.Simple.Console (log, log2)
 import Reactix as R
 import Reactix.DOM.HTML as H
 
@@ -17,85 +17,86 @@ import Gargantext.Ends (Frontends, Backend(..))
 import Gargantext.Prelude
 import Gargantext.Routes (AppRoute)
 import Gargantext.Sessions (Session(..), Sessions, OpenNodes, unSessions)
-import Gargantext.Types (Reload, ReloadS, Handed(..))
+import Gargantext.Types (Handed(..))
 import Gargantext.Utils.Reactix as R2
+import Gargantext.Utils.Reload as GUR
 
 thisModule :: String
 thisModule = "Gargantext.Components.Forest"
 
 type Props = (
-    appReload     :: ReloadS
+    appReload     :: GUR.ReloadS
   , asyncTasksRef :: R.Ref (Maybe GAT.Reductor)
   , backend       :: R.State (Maybe Backend)
+  , currentRoute  :: AppRoute
   , frontends     :: Frontends
   , handed        :: Handed
-  , route         :: AppRoute
   , sessions      :: Sessions
   , showLogin     :: R.Setter Boolean
-  , treeReloadRef :: R.Ref (Maybe ReloadS)
+  , treeReloadRef :: GUR.ReloadWithInitializeRef
   )
 
 forest :: R2.Component Props
 forest = R.createElement forestCpt
 
 forestCpt :: R.Component Props
-forestCpt = R.hooksComponentWithModule thisModule "forest" cpt where
-  cpt { appReload
-      , asyncTasksRef
-      , backend
-      , frontends
-      , handed
-      , route
-      , sessions
-      , showLogin
-      , treeReloadRef } _ = do
-    -- NOTE: this is a hack to reload the tree view on demand
-    reload     <- R.useState' (0 :: Reload)
-    asyncTasks <- GAT.useTasks appReload reload
-    openNodes  <- R2.useLocalStorageState R2.openNodesKey (Set.empty :: OpenNodes)
-
-    -- TODO If `treeReloadRef` is set, `reload` state should be updated
-    R.useEffect' $ do
-      R.setRef asyncTasksRef $ Just asyncTasks
-      case R.readRef treeReloadRef of
-        Nothing -> R.setRef treeReloadRef $ Just reload
-        Just _  -> pure unit
-
-    R2.useCache (
-        frontends
-      /\ route
-      /\ sessions
-      /\ fst openNodes
-      /\ fst appReload
-      /\ fst reload
-      /\ (fst asyncTasks).storage
-      /\ handed
-      )
-      (cpt' openNodes asyncTasks reload showLogin backend)
-  cpt' openNodes asyncTasks reload showLogin backend (frontends /\ route /\ sessions /\ _ /\ _ /\ _ /\ _ /\ handed) = do
-    pure $ R2.row $ [plus handed showLogin backend] <> trees
-    where
-      trees = tree <$> unSessions sessions
-      tree s@(Session {treeId}) =
-        treeView { asyncTasks
-                 , frontends
-                 , handed
-                 , mCurrentRoute: Just route
-                 , openNodes
-                 , reload
-                 , root: treeId
-                 , session: s
-                 }
+forestCpt = R.hooksComponentWithModule thisModule "forest" cpt
+  where
+    cpt { appReload
+        , asyncTasksRef
+        , backend
+        , currentRoute
+        , frontends
+        , handed
+        , sessions
+        , showLogin
+        , treeReloadRef } _ = do
+      -- NOTE: this is a hack to reload the tree view on demand
+      reload     <- GUR.new
+      asyncTasks <- GAT.useTasks appReload reload
+      openNodes  <- R2.useLocalStorageState R2.openNodesKey (Set.empty :: OpenNodes)
+
+      -- TODO If `treeReloadRef` is set, `reload` state should be updated
+      R.useEffect' $ do
+        R.setRef asyncTasksRef $ Just asyncTasks
+        GUR.initializeI treeReloadRef reload
+
+      R2.useCache (
+          frontends
+        /\ currentRoute
+        /\ sessions
+        /\ fst openNodes
+        /\ fst appReload
+        /\ fst reload
+        /\ (fst asyncTasks).storage
+        /\ handed
+        )
+        (cpt' openNodes asyncTasks appReload reload showLogin backend)
+    cpt' openNodes asyncTasks appReload reload showLogin backend (frontends /\ currentRoute /\ sessions /\ _ /\ _ /\ _ /\ _ /\ handed) = do
+      pure $ H.div { className: "forest" } $ [plus handed showLogin backend] <> trees
+      where
+        trees = tree <$> unSessions sessions
+        tree s@(Session {treeId}) =
+          treeView { appReload
+                  , asyncTasks
+                    , currentRoute
+                  , frontends
+                  , handed
+                  , openNodes
+                  , reload
+                  , root: treeId
+                  , session: s
+                  } []
 
 plus :: Handed -> R.Setter Boolean -> R.State (Maybe Backend) -> R.Element
-plus handed showLogin backend = H.div { className: handedClass } [
-  H.button { title: "Add or remove connections to the server(s)."
+plus handed showLogin backend = H.div { className: "row" } [
+  H.button { className: "btn btn-primary col-5 " <> if handed == RightHanded then "ml-1 mr-auto" else "ml-auto mr-1"
            , on: {click}
-           , className: "btn btn-default"
+           , title: "Add or remove connections to the server(s)."
            }
           [ H.div { "type": ""
-                  , className: "fa fa-universal-access fa-lg"
-                  } [H.text " Log "]
+                  , className: "fa fa-universal-access"  -- fa-lg
+                  } [H.text " Log in/out "]
           , H.div {} [H.text "    "]
   --, H.div { "type": "", className: "fa fa-plus-circle fa-lg"} []
   --, H.div { "type": "", className: "fa fa-minus-circle fa-lg"} []
@@ -104,26 +105,21 @@ plus handed showLogin backend = H.div { className: handedClass } [
   -- TODO same as the one in the Login Modal (same CSS)
   -- [ H.i { className: "material-icons md-36"} [] ]
   where
-    handedClass = if handed == RightHanded then
-                        "flex-start"  -- TODO we should use lefthanded SASS class here
-                  else
-                        "flex-end"
-
     click _ = (snd backend) (const Nothing)
             *> showLogin (const true)
 
 
 -------------------------
 type ForestLayoutProps = (
-    appReload     :: ReloadS
+    appReload     :: GUR.ReloadS
   , asyncTasksRef :: R.Ref (Maybe GAT.Reductor)
   , backend       :: R.State (Maybe Backend)
+  , currentRoute  :: AppRoute
   , frontends     :: Frontends
   , handed        :: R.State Handed
-  , route         :: AppRoute
   , sessions      :: Sessions
   , showLogin     :: R.Setter Boolean
-  , treeReloadRef :: R.Ref (Maybe ReloadS)
+  , treeReloadRef :: GUR.ReloadWithInitializeRef
   )
 
 forestLayout :: R2.Component ForestLayoutProps
@@ -171,9 +167,9 @@ forestLayoutRawCpt = R.hooksComponentWithModule thisModule "forestLayoutRaw" cpt
     cpt { appReload
         , asyncTasksRef
         , backend
+        , currentRoute
         , frontends
         , handed
-        , route
         , sessions
         , showLogin
         , treeReloadRef } children = do
@@ -187,9 +183,9 @@ forestLayoutRawCpt = R.hooksComponentWithModule thisModule "forestLayoutRaw" cpt
           forest { appReload
                  , asyncTasksRef
                  , backend
+                 , currentRoute
                  , frontends
                  , handed: fst handed
-                 , route
                  , sessions
                  , showLogin
                  , treeReloadRef } []

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

@@ -2,6 +2,7 @@ module Gargantext.Components.Forest.Tree.Node.Action where
 
 import Data.Maybe (Maybe(..))
 import Effect.Aff (Aff)
+
 import Gargantext.Prelude (class Show, Unit)
 import Gargantext.Sessions (Session)
 import Gargantext.Types  as GT
@@ -28,6 +29,7 @@ data Action = AddNode     String GT.NodeType
             | UploadArbitraryFile  (Maybe String) UploadFileBlob
             | DownloadNode
             | RefreshTree
+            | ClosePopover
 
             | ShareTeam   String
             | AddContact  AddContactParams
@@ -55,22 +57,23 @@ setTreeOut a   _             = a
 
 
 instance showShow :: Show Action where
-  show (AddNode     _ _    )        = "AddNode"
-  show (DeleteNode  _      )        = "DeleteNode"
-  show (RenameNode  _      )        = "RenameNode"
-  show (UpdateNode  _      )        = "UpdateNode"
-  show (ShareTeam   _      )        = "ShareTeam"
-  show (AddContact  _      )        = "AddContact"
-  show (SharePublic _      )        = "SharePublic"
-  show (DoSearch    _      )        = "SearchQuery"
-  show (UploadFile  _ _ _ _)        = "UploadFile"
+  show (AddNode     _ _    )      = "AddNode"
+  show (DeleteNode  _      )      = "DeleteNode"
+  show (RenameNode  _      )      = "RenameNode"
+  show (UpdateNode  _      )      = "UpdateNode"
+  show (ShareTeam   _      )      = "ShareTeam"
+  show (AddContact  _      )      = "AddContact"
+  show (SharePublic _      )      = "SharePublic"
+  show (DoSearch    _      )      = "SearchQuery"
+  show (UploadFile  _ _ _ _)      = "UploadFile"
   show (UploadArbitraryFile  _ _) = "UploadArbitraryFile"
-  show  RefreshTree                 = "RefreshTree"
-  show  DownloadNode                = "Download"
-  show (MoveNode  _ )               = "MoveNode"
-  show (MergeNode _ )               = "MergeNode"
-  show (LinkNode  _ )               = "LinkNode"
-  show NoAction                     = "NoAction"
+  show  RefreshTree               = "RefreshTree"
+  show  ClosePopover              = "ClosePopover"
+  show  DownloadNode              = "Download"
+  show (MoveNode  _ )             = "MoveNode"
+  show (MergeNode _ )             = "MergeNode"
+  show (LinkNode  _ )             = "LinkNode"
+  show NoAction                   = "NoAction"
 
 -----------------------------------------------------------------------
 icon :: Action -> String
@@ -85,6 +88,7 @@ icon (DoSearch   _)               = glyphiconNodeAction SearchBox
 icon (UploadFile _ _ _ _)         = glyphiconNodeAction Upload
 icon (UploadArbitraryFile _ _ ) = glyphiconNodeAction Upload
 icon  RefreshTree                 = glyphiconNodeAction Refresh
+icon  ClosePopover                = glyphiconNodeAction CloseNodePopover
 icon  DownloadNode                = glyphiconNodeAction Download
 icon (MoveNode _ )                = glyphiconNodeAction (Move  { subTreeParams : SubTreeParams {showtypes:[], valitypes:[] }})
 icon (MergeNode _ )               = glyphiconNodeAction (Merge { subTreeParams : SubTreeParams {showtypes:[], valitypes:[] }})
@@ -95,20 +99,21 @@ icon NoAction                     = "hand-o-right"
 -- icon _             = "hand-o-right"
 
 text :: Action -> String
-text (AddNode     _ _    )        = "Add !"
-text (DeleteNode _       )        = "Delete !"
-text (RenameNode  _      )        = "Rename !"
-text (UpdateNode  _      )        = "Update !"
-text (ShareTeam   _      )        = "Share with team !"
-text (AddContact  _      )        = "Add contact !"
-text (SharePublic _      )        = "Publish !"
-text (DoSearch    _      )        = "Launch search !"
-text (UploadFile  _ _ _ _)        = "Upload File !"
+text (AddNode     _ _    )      = "Add !"
+text (DeleteNode _       )      = "Delete !"
+text (RenameNode  _      )      = "Rename !"
+text (UpdateNode  _      )      = "Update !"
+text (ShareTeam   _      )      = "Share with team !"
+text (AddContact  _      )      = "Add contact !"
+text (SharePublic _      )      = "Publish !"
+text (DoSearch    _      )      = "Launch search !"
+text (UploadFile  _ _ _ _)      = "Upload File !"
 text (UploadArbitraryFile  _ _) = "Upload arbitrary file !"
-text  RefreshTree                 = "Refresh Tree !"
-text DownloadNode                 = "Download !"
-text (MoveNode  _ )               = "Move !"
-text (MergeNode _ )               = "Merge !"
-text (LinkNode  _ )               = "Link !"
-text NoAction                     = "No Action"
+text  RefreshTree               = "Refresh Tree !"
+text  ClosePopover              = "Close Popover !"
+text DownloadNode               = "Download !"
+text (MoveNode  _ )             = "Move !"
+text (MergeNode _ )             = "Merge !"
+text (LinkNode  _ )             = "Link !"
+text NoAction                   = "No Action"
 -----------------------------------------------------------------------