[CLEAN] Sidebar (needs more love)

src/Gargantext/Components/GraphExplorer/Sidebar.purs

@@ -94,15 +94,20 @@ sideTab (Opened SideTabSelection) props =
                              )
                            )
                   ]
-                , RH.div { className: "tab-content" }
-                         [ removeButton "Remove candidate" CandidateTerm props nodesMap
-                         , removeButton "Remove stop"      StopTerm      props nodesMap
+                , RH.div { className: "tab-content flex-space-between" }
+                         [ removeButton "Move as candidate" CandidateTerm props nodesMap
+                         , removeButton "Move as stop"      StopTerm      props nodesMap
                          ]
 
                   ]
 
                 , RH.div { className: "col-md-12", id: "query" }
-                  [ query props.frontends props.metaData props.session nodesMap props.selectedNodeIds]
+                         [ query props.frontends
+                                 props.metaData
+                                 props.session
+                                 nodesMap
+                                 props.selectedNodeIds
+                         ]
                   ]
                 ]
               , RH.div { className: "tab-content", id: "myTabContent" }
@@ -126,9 +131,10 @@ sideTab (Opened SideTabSelection) props =
         if Set.isEmpty $ fst props'.selectedNodeIds then
           RH.div {} []
         else
-          RH.button { className: "btn btn-danger"
-                    , on: { click: onClickRemove rType props' nodesMap' }}
-          [ RH.text text ]
+          RH.button { className: "btn btn-info"
+                    , on: { click: onClickRemove rType props' nodesMap' }
+                    }
+                    [ RH.text text ]
 
       onClickRemove rType props' nodesMap' e = do
         let nodes = mapMaybe (\id -> Map.lookup id nodesMap')
@@ -221,17 +227,21 @@ query _ _ _ _ (selectedNodeIds /\ _) | Set.isEmpty selectedNodeIds = RH.div {} [
 query frontends (GET.MetaData metaData) session nodesMap (selectedNodeIds /\ _) =
   query' (head metaData.corpusId)
   where
-    query' Nothing = RH.div {} []
-    query' (Just corpusId) =
-      CGT.tabs {frontends, session, query: q <$> Set.toUnfoldable selectedNodeIds, sides: [side corpusId]}
-    q id = case Map.lookup id nodesMap of
+    query' Nothing         = RH.div {} []
+    query' (Just corpusId) = CGT.tabs { frontends
+                                      , session
+                                      , query: toQuery <$> Set.toUnfoldable selectedNodeIds
+                                      , sides: [side corpusId]
+                                      }
+
+    toQuery id = case Map.lookup id nodesMap of
       Nothing -> []
       Just n -> words n.label
-    side corpusId = GET.GraphSideCorpus {
-          corpusId
-        , listId: metaData.list.listId
-        , corpusLabel: metaData.title
-        }
+
+    side corpusId = GET.GraphSideCorpus { corpusId
+                                        , listId     : metaData.list.listId
+                                        , corpusLabel: metaData.title
+                                        }
 
 ------------------------------------------------------------------------
 

src/Gargantext/Components/Nodes/Corpus/Graph/Tabs.purs

@@ -11,8 +11,8 @@ import Gargantext.Components.Tab as Tab
 import Gargantext.Ends (Frontends)
 import Gargantext.Sessions (Session)
 
-type Props = (
-    frontends :: Frontends
+type Props =
+  ( frontends :: Frontends
   , query :: TextQuery
   , session :: Session
   , sides :: Array GraphSideCorpus
@@ -35,7 +35,7 @@ tab :: Frontends -> Session -> TextQuery -> GraphSideCorpus -> Tuple String R.El
 tab frontends session query (GraphSideCorpus {corpusId: nodeId, corpusLabel, listId}) =
   Tuple corpusLabel (docView dvProps)
   where
-    dvProps = {frontends, session, nodeId, listId, query, chart, totalRecords: 0, container}
-    chart = mempty
+    dvProps   = {frontends, session, nodeId, listId, query, chart, totalRecords: 0, container}
+    chart     = mempty
     container = T.graphContainer {title: corpusLabel}