Merge branch 'dev-search-removal' into dev-backend-connection

src/Gargantext/Components/FacetsTable.purs

@@ -26,10 +26,12 @@ import React as React
 import React (ReactClass, ReactElement, Children)
 ------------------------------------------------------------------------
 import Gargantext.Prelude
-import Gargantext.Config (End(..), NodeType(..), OrderBy(..), Path(..), TabType, toUrl, endConfigStateful)
+import Gargantext.Config (End(..), NodeType(..), OrderBy(..), Path(..), TabType, toUrl, toLink, endConfigStateful)
 import Gargantext.Config.REST (put, post, deleteWithBody)
 import Gargantext.Components.Loader as Loader
+import Gargantext.Components.Search.Types (Category(..), CategoryQuery(..), favCategory, trashCategory, decodeCategory, putCategories)
 import Gargantext.Components.Table as T
+import Gargantext.Router as Router
 import Gargantext.Utils (toggleSet)
 import Gargantext.Utils.DecodeMaybe ((.|))
 import React.DOM (a, br', button, div, i, input, p, text, span)
@@ -83,9 +85,9 @@ initialState =
   }
 
 data Action
-  = MarkFavorites (Array Int)
+  = MarkCategory Category (Array Int)
   | ToggleDocumentToDelete Int
-  | Trash
+  | TrashDocuments
 
 newtype Pair = Pair
   { id    :: Int
@@ -106,9 +108,9 @@ newtype DocumentsView
     , score  :: Int
     , pairs  :: Array Pair
     , delete :: Boolean
+    , category :: Category
     }
 
-
 derive instance genericDocumentsView :: Generic DocumentsView _
 
 instance showDocumentsView :: Show DocumentsView where
@@ -118,7 +120,7 @@ newtype Response = Response
   { id         :: Int
   , created    :: String
   , hyperdata  :: Hyperdata
-  , favorite   :: Boolean
+  , category   :: Category
   , ngramCount :: Int
 -- , date      :: String
 -- , score     :: Int
@@ -174,7 +176,7 @@ instance decodeResponse :: DecodeJson Response where
     hyperdata  <- obj .? "hyperdata"
     favorite   <- obj .? "favorite"
     ngramCount <- obj .? "ngramCount"
-    pure $ Response { id, created, hyperdata, favorite, ngramCount }
+    pure $ Response { id, created, hyperdata, category: decodeCategory favorite, ngramCount }
 
 -- | Filter
 -- TODO: unused
@@ -194,12 +196,12 @@ layoutDocview :: Spec State Props Action
 layoutDocview = simpleSpec performAction render
   where
     performAction :: PerformAction State Props Action
-    performAction (MarkFavorites nids) {nodeId} _ =
-      void $ lift $ putFavorites nodeId (FavoriteQuery {favorites: nids})
+    performAction (MarkCategory category nids) {nodeId} _ =
+      void $ lift $ putCategories nodeId $ CategoryQuery {nodeIds: nids, category: favCategory category}
     --TODO add array of delete rows here
     performAction (ToggleDocumentToDelete nid) _ _ =
       modifyState_ \state -> state {documentIdsToDelete = toggleSet nid state.documentIdsToDelete}
-    performAction Trash {nodeId} {documentIdsToDelete} = do
+    performAction TrashDocuments {nodeId} {documentIdsToDelete} = do
       void $ lift $ deleteDocuments nodeId (DeleteDocumentQuery {documents: Set.toUnfoldable documentIdsToDelete})
       modifyState_ \{documentIdsToDelete, documentIdsDeleted} ->
         { documentIdsToDelete: mempty
@@ -229,7 +231,7 @@ layoutDocview = simpleSpec performAction render
             ]
           , div [className "col-md-12"]
              [ button [ style {backgroundColor: "peru", padding : "9px", color : "white", border : "white", float: "right"}
-                      , onClick $ (\_ -> dispatch Trash)
+                      , onClick $ (\_ -> dispatch TrashDocuments)
                       ]
                [  i [className "glyphitem glyphicon glyphicon-trash", style {marginRight : "9px"}] []
                ,  text "Trash it !"
@@ -245,12 +247,12 @@ layoutDocviewGraph :: Spec State Props Action
 layoutDocviewGraph = simpleSpec performAction render
   where
     performAction :: PerformAction State Props Action
-    performAction (MarkFavorites nids) {nodeId} _ =
-      void $ lift $ putFavorites nodeId (FavoriteQuery {favorites: nids})
+    performAction (MarkCategory category nids) {nodeId} _ =
+      void $ lift $ putCategories nodeId $ CategoryQuery {nodeIds: nids, category: favCategory category}
     --TODO add array of delete rows here
     performAction (ToggleDocumentToDelete nid) _ _ =
       modifyState_ \state -> state {documentIdsToDelete = toggleSet nid state.documentIdsToDelete}
-    performAction Trash {nodeId} {documentIdsToDelete} = do
+    performAction TrashDocuments {nodeId} {documentIdsToDelete} = do
       void $ lift $ deleteDocuments nodeId (DeleteDocumentQuery {documents: Set.toUnfoldable documentIdsToDelete})
       modifyState_ \{documentIdsToDelete, documentIdsDeleted} ->
         { documentIdsToDelete: mempty
@@ -275,7 +277,7 @@ layoutDocviewGraph = simpleSpec performAction render
                 , container
                 }
             , button [ style {backgroundColor: "peru", padding : "9px", color : "white", border : "white", float: "right"}
-                      , onClick $ (\_ -> dispatch Trash)
+                      , onClick $ (\_ -> dispatch TrashDocuments)
                       ]
                [  i [className "glyphitem glyphicon glyphicon-trash", style {marginRight : "9px"}] []
                ,  text "Trash it !"
@@ -303,7 +305,7 @@ loadPage {nodeId, listId, query, params: {limit, offset, orderBy}} = do
     res2corpus :: Response -> DocumentsView
     res2corpus (Response { id, created: date, ngramCount: score
                          , hyperdata: Hyperdata {title, source}
-                      -- favorite TODO
+                         , category
                          }) =
       DocumentsView
         { id
@@ -313,6 +315,7 @@ loadPage {nodeId, listId, query, params: {limit, offset, orderBy}} = do
         , score
         , pairs: []
         , delete: false
+        , category
         }
     convOrderBy (T.ASC  (T.ColumnName "Date")) = DateAsc
     convOrderBy (T.DESC (T.ColumnName "Date")) = DateDesc
@@ -363,7 +366,7 @@ renderPage loaderDispatch { totalRecords, dispatch, container
   ]
   where
     -- TODO: how to interprete other scores?
-    gi 0 = "glyphicon glyphicon-star-empty"
+    gi Favorite = "glyphicon glyphicon-star-empty"
     gi _ = "glyphicon glyphicon-star"
     isChecked id = Set.member id documentIdsToDelete
     isDeleted (DocumentsView {id}) = Set.member id documentIdsDeleted
@@ -371,7 +374,7 @@ renderPage loaderDispatch { totalRecords, dispatch, container
       | id > 1    = [a [href (toUrl endConfigStateful Front NodeContact (Just id)), target "blank"] [text label]]
       | otherwise = [text label]
     comma = span [] [text ", "]
-    rows = (\(DocumentsView {id,score,title,source,date,pairs,delete}) ->
+    rows = (\(DocumentsView {id,score,title,source,date,pairs,delete,category}) ->
                 let
                   strikeIfDeleted
                     | delete    = [style {textDecoration : "line-through"}]
@@ -379,13 +382,13 @@ renderPage loaderDispatch { totalRecords, dispatch, container
                 in
                 { row:
                     [ div []
-                      [ a [ className $ gi score
-                          , onClick $ const $ dispatch $ MarkFavorites [id]
+                      [ a [ className $ gi category
+                          , onClick $ const $ dispatch $ MarkCategory category [id]
                           ] []
                       ]
                     -- TODO show date: Year-Month-Day only
                     , div strikeIfDeleted [text date]
-                    , a (strikeIfDeleted <> [ href (toUrl endConfigStateful Front (ListDocument (Just listId)) (Just id))
+                    , a (strikeIfDeleted <> [ href $ toLink $ endConfigStateful Router.Document listId id
                                             , target "blank"])
                         [ text title ]
                     , div strikeIfDeleted [text source]
@@ -405,15 +408,6 @@ pageLoader props = React.createElement pageLoaderClass props []
 
 ---------------------------------------------------------
 
-newtype FavoriteQuery = FavoriteQuery
-                        { favorites :: Array Int
-                        }
-
-instance encodeJsonFQuery :: EncodeJson FavoriteQuery where
-  encodeJson (FavoriteQuery post)
-     = "favorites" := post.favorites
-       ~> jsonEmptyObject
-
 newtype DeleteDocumentQuery = DeleteDocumentQuery
   {
     documents :: Array Int
@@ -425,11 +419,5 @@ instance encodeJsonDDQuery :: EncodeJson DeleteDocumentQuery where
      = "documents" := post.documents
        ~> jsonEmptyObject
 
-putFavorites :: Int -> FavoriteQuery -> Aff (Array Int)
-putFavorites nodeId = put (toUrl endConfigStateful Back Node (Just nodeId) <> "/favorites")
-
-deleteFavorites :: Int -> FavoriteQuery -> Aff (Array Int)
-deleteFavorites nodeId = deleteWithBody (toUrl endConfigStateful Back Node (Just nodeId) <> "/favorites")
-
 deleteDocuments :: Int -> DeleteDocumentQuery -> Aff (Array Int)
 deleteDocuments nodeId = deleteWithBody (toUrl endConfigStateful Back Node (Just nodeId) <> "/documents")

src/Gargantext/Components/Login/Types.purs

 module Gargantext.Components.Login.Types where
 
 import Prelude
-import Data.Lens (Iso', iso)
 import Data.Argonaut ( class DecodeJson, class EncodeJson, decodeJson, jsonEmptyObject
-                     , (.?), (.??), (:=), (~>)
-                     )
+                      , (.?), (.??), (:=), (~>)
+                      )
+import Data.Generic.Rep (class Generic)
+import Data.Generic.Rep.Eq (genericEq)
+import Data.Lens (Iso', iso)
 import Data.Maybe (Maybe)
 
 type Username = String
@@ -30,6 +32,12 @@ newtype AuthData = AuthData
   , tree_id :: TreeId
   }
 
+
+derive instance genericAuthData :: Generic AuthData _
+
+instance eqAuthData :: Eq AuthData where
+  eq = genericEq
+
 _AuthData :: Iso' AuthData { token :: Token, tree_id :: TreeId }
 _AuthData = iso (\(AuthData v) -> v) AuthData
 

src/Gargantext/Components/NgramsTable.purs

@@ -40,6 +40,7 @@ import Gargantext.Components.Table as T
 import Gargantext.Prelude
 import Gargantext.Components.Loader as Loader
 import Gargantext.Components.NgramsTable.Core
+import Gargantext.Utils.Reactix as R2
 
 type State =
   CoreState
@@ -119,7 +120,7 @@ tableContainer { pageParams
                         , name "search", placeholder "Search"
                         , _type "value"
                         , value pageParams.searchQuery
-                        , onInput \e -> setSearchQuery (unsafeEventValue e)
+                        , onInput \e -> setSearchQuery (R2.unsafeEventValue e)
                         ]
                 , div [] (
                     if A.null props.tableBody && pageParams.searchQuery /= "" then [
@@ -134,7 +135,7 @@ tableContainer { pageParams
                         [ select  [ _id "picklistmenu"
                                   , className "form-control custom-select"
                                   , value (maybe "" show pageParams.termListFilter)
-                                  , onChange (\e -> setTermListFilter $ readTermList $ unsafeEventValue e)
+                                  , onChange (\e -> setTermListFilter $ readTermList $ R2.unsafeEventValue e)
                                   ] $ map optps1 termLists
                         ]
                       ]
@@ -143,7 +144,7 @@ tableContainer { pageParams
                         [ select  [ _id "picktermtype"
                                   , className "form-control custom-select"
                                   , value (maybe "" show pageParams.termSizeFilter)
-                                  , onChange (\e -> setTermSizeFilter $ readTermSize $ unsafeEventValue e)
+                                  , onChange (\e -> setTermSizeFilter $ readTermSize $ R2.unsafeEventValue e)
                                   ] $ map optps1 termSizes
                         ]
                       ]
@@ -420,6 +421,3 @@ optps1 :: forall a. Show a => { desc :: String, mval :: Maybe a } -> ReactElemen
 optps1 { desc, mval } = option [value val] [text desc]
   where
     val = maybe "" show mval
-
-unsafeEventValue :: forall event. event -> String
-unsafeEventValue e = (unsafeCoerce e).target.value

src/Gargantext/Components/Search/Types.purs

@@ -2,8 +2,11 @@ module Gargantext.Components.Search.Types where
 
 import Control.Monad.Cont.Trans (lift)
 import Data.Argonaut (class EncodeJson, jsonEmptyObject, (:=), (~>), encodeJson)
-import Data.Maybe (Maybe(..), fromMaybe, maybe)
 import Data.Array (head)
+import Data.Generic.Rep (class Generic)
+import Data.Generic.Rep.Eq (genericEq)
+import Data.Generic.Rep.Show (genericShow)
+import Data.Maybe (Maybe(..), fromMaybe, maybe)
 import Data.Newtype (class Newtype)
 import Data.Tuple (Tuple)
 import Data.Tuple.Nested ((/\))
@@ -14,9 +17,9 @@ import Thermite (PerformAction, modifyState)
 
 import Gargantext.Prelude
 import Gargantext.Types (class ToQuery)
-import Gargantext.Config.REST (post)
+import Gargantext.Config (End(..), NodeType(..), Path(..), toUrl)
+import Gargantext.Config.REST (post, put)
 import Gargantext.Components.Modals.Modal (modalHide)
-import Gargantext.Pages.Layout.Specs.AddCorpus.States (Response, State)
 import Gargantext.Utils (id)
 import URI.Extra.QueryPairs as QP
 
@@ -96,3 +99,51 @@ instance encodeJsonSearchQuery :: EncodeJson SearchQuery where
     ~>  "corpus_id"  := fromMaybe 0 corpus_id
     ~>  "files_id"   := files_id
     ~> jsonEmptyObject
+
+
+data Category = Trash | Normal | Favorite
+derive instance genericFavorite :: Generic Category _
+instance showCategory :: Show Category where
+  show = genericShow
+instance eqCategory :: Eq Category where
+  eq = genericEq
+instance encodeJsonCategory :: EncodeJson Category where
+  encodeJson Trash = encodeJson 0
+  encodeJson Normal = encodeJson 1
+  encodeJson Favorite = encodeJson 2
+
+favCategory :: Category -> Category
+favCategory Normal = Favorite
+favCategory Trash = Favorite
+favCategory Favorite = Normal
+
+trashCategory :: Category -> Category
+trashCategory Normal = Trash
+trashCategory Trash = Normal
+trashCategory Favorite = Trash
+
+
+decodeCategory :: Int -> Category
+decodeCategory 0 = Trash
+decodeCategory 1 = Normal
+decodeCategory 2 = Favorite
+decodeCategory _ = Normal
+
+
+
+newtype CategoryQuery = CategoryQuery {
+    nodeIds :: Array Int
+  , category :: Category
+  }
+
+instance encodeJsonCategoryQuery :: EncodeJson CategoryQuery where
+  encodeJson (CategoryQuery post) =
+    "ntc_nodesId" := post.nodeIds
+    ~> "ntc_category" := encodeJson post.category
+    ~> jsonEmptyObject
+
+categoryUrl :: Int -> String
+categoryUrl nodeId = toUrl Back Node (Just nodeId) <> "/category"
+
+putCategories :: Int -> CategoryQuery -> Aff (Array Int)
+putCategories nodeId = put $ categoryUrl nodeId

src/Gargantext/Components/Table.purs

@@ -14,6 +14,7 @@ import Thermite (PerformAction, Render, Spec, modifyState_, simpleSpec, StateCoT
 import Unsafe.Coerce (unsafeCoerce)
 
 import Gargantext.Prelude
+import Gargantext.Utils.Reactix as R2
 
 type TableContainerProps =
   { pageSizeControl     :: ReactElement
@@ -218,7 +219,7 @@ sizeDD :: PageSizes -> (Action -> Effect Unit) -> ReactElement
 sizeDD ps d
   = span []
     [ select [ className "form-control"
-             , onChange (\e -> d (ChangePageSize $ string2PageSize $ (unsafeCoerce e).target.value))
+             , onChange (\e -> d (ChangePageSize $ string2PageSize $ R2.unsafeEventValue e))
              ] $ map (optps ps) aryPS
     ]
 

src/Gargantext/Components/Tree.purs

@@ -699,6 +699,3 @@ uploadFile id fileType (UploadFileContents fileContents) = postWwwUrlencoded url
 
 fnTransform :: LNode -> FTree
 fnTransform n = NTree n []
-
-unsafeEventValue :: forall event. event -> String
-unsafeEventValue e = (unsafeCoerce e).target.value

src/Gargantext/Config.purs

@@ -146,7 +146,7 @@ showTabType' (TabPairing t) = show t
 data TabPostQuery = TabPostQuery {
     offset :: Int
   , limit :: Int
-  , orderBy :: Maybe OrderBy
+  , orderBy :: OrderBy
   , tabType :: TabType
   , query :: String
   }
@@ -225,10 +225,8 @@ pathUrl c (Chart {chartType, tabType}) i =
 routesPath :: R.Routes -> String
 routesPath R.Home = ""
 routesPath R.Login = "login"
-routesPath R.SearchView = "search"
 routesPath (R.Folder i) = "folder/" <> show i
 routesPath (R.Corpus i) = "corpus/" <> show i
-routesPath R.AddCorpus = "addCorpus"
 routesPath (R.CorpusDocument c l i) = "corpus/" <> show c <> "/list/" <> show l <> "/document/" <> show i
 routesPath (R.Document l i) = "list/" <> show l <> "/document/" <> show i
 routesPath (R.PGraphExplorer i) = "#/"

src/Gargantext/Pages/Annuaire/User/Contacts/Tabs/Specs.purs

@@ -78,7 +78,9 @@ statefulTabs =
         , tabType: TabPairing TabDocs
         , totalRecords: 4736
         , listId: defaultListId
-        , corpusId: Nothing}
+        , corpusId: Nothing
+        , showSearch: true
+        }
 
 ngramsViewSpec :: {mode :: Mode} -> Spec Tab.State Props Tab.Action
 ngramsViewSpec {mode} =

src/Gargantext/Pages/Corpus/Graph.purs

@@ -419,8 +419,9 @@ specOld = fold [treespec treeSpec, graphspec $ simpleSpec performAction render']
         Nothing ->
           simpleSpec defaultPerformAction defaultRender
         Just treeId ->
+          --cmapProps (const {root: treeId, mCurrentRoute: Nothing}) $ noState $ Tree.treeview
+          -- TODO
           simpleSpec defaultPerformAction defaultRender
-          --cmapProps (const {root: treeId, mCurrentRoute: Nothing}) (noState $ Tree.treeview Config.endConfigStateful)
     
     
     render' :: Render State {} Action

src/Gargantext/Pages/Corpus/Graph/Tabs.purs

@@ -4,7 +4,6 @@ import Prelude hiding (div)
 import Data.Lens (view)
 import Data.List (fromFoldable)
 import Data.Tuple (Tuple(..))
-import Gargantext.Config (TabType(..), TabSubType(..))
 import Gargantext.Components.GraphExplorer.Types (GraphSideCorpus(..))
 import Gargantext.Components.FacetsTable (TextQuery, docViewSpec)
 import Gargantext.Components.Table as T

src/Gargantext/Pages/Home/Specs.purs

@@ -10,14 +10,15 @@ import Gargantext.Components.Lang.Landing.EnUS as En
 import Gargantext.Components.Lang.Landing.FrFR as Fr
 import Gargantext.Components.Data.Landing (BlockText(..), BlockTexts(..), Button(..), LandingData(..))
 import Gargantext.Components.Data.Lang (Lang(..))
-import Gargantext.Pages.Home.States (State, initialState)
 import Gargantext.Pages.Home.Actions (Action, performAction)
 
+import Reactix as R
+import Reactix.DOM.HTML as H
 import React (ReactElement)
-import React.DOM (a, div, h3, i, img, p, span, text)
-import React.DOM.Props (Props, _id, aria, className, href, src, target, title, height, width)
-import Thermite (Render, Spec, simpleSpec, hideState, focusState)
+import React.DOM.Props (Props)
+import Thermite (Spec, hideState, focusState, Render, simpleSpec)
 
+import Gargantext.Utils.Reactix as R2
 
 -- Layout |
 
@@ -26,80 +27,82 @@ landingData FR = Fr.landingData
 landingData EN = En.landingData
 
 layoutLanding :: Lang -> Spec {} {} Void
-layoutLanding = hideState (const $ unwrap initialState)
-            <<< focusState (re _Newtype)
-            <<< layoutLanding' <<< landingData
+layoutLanding = layoutLanding' <<< landingData
 
 ------------------------------------------------------------------------
 
-layoutLanding' :: LandingData -> Spec State {} Action
-layoutLanding' hd = simpleSpec performAction render
+layoutLanding' :: LandingData -> Spec {} {} Void
+layoutLanding' hd = R2.elSpec $ R.hooksComponent "LayoutLanding" cpt
   where
-    render :: Render State {} Action
-    render dispatch _ state _ =
-      [ div [ className "container1" ] [ jumboTitle hd false                 ]
-      , div [ className "container1" ] [] -- TODO put research form
-      , div [ className "container1" ] [ blocksRandomText' hd                ]
-      ]
+    cpt {} _children = do
+      pure $ H.span {} [
+        H.div { className: "container1" }
+              [ jumboTitle hd false ]
+        , H.div { className: "container1" } [] -- TODO put research form
+        , H.div { className: "container1" } [ blocksRandomText' hd ]
+        ]
 ------------------------------------------------------------------------
 
-blocksRandomText' :: LandingData -> ReactElement
+blocksRandomText' :: LandingData -> R.Element
 blocksRandomText' (LandingData hd) = blocksRandomText hd.blockTexts
 
 
-blocksRandomText :: BlockTexts -> ReactElement
+blocksRandomText :: BlockTexts -> R.Element
 blocksRandomText (BlockTexts bt) =
-  div [ className "row" ] ( map showBlock bt.blocks )
+  H.div { className: "row" } ( map showBlock bt.blocks )
     where
-      showBlock :: BlockText -> ReactElement
+      showBlock :: BlockText -> R.Element
       showBlock (BlockText b) =
-        div [ className "col-md-4 content" ]
-              [ h3 [] [ a [ href b.href, title b.title]
-                          [ i [className b.icon] []
-                          , text ("   " <> b.titleText)
-                          ]
-                      ]
-              , p [] [ text b.text ]
-              , p [] [ docButton b.docButton ]
-              ]
-
-docButton :: Button -> ReactElement
-docButton (Button b) = a [ className "btn btn-outline-primary btn-sm spacing-class"
-              , href b.href
-              , target "blank"
-              , title b.title
-              ] [ span [ aria {hidden : true}
-                       , className "glyphicon glyphicon-hand-right"
-                       ]  []
-                , text b.text
-                ]
-
-jumboTitle :: LandingData -> Boolean -> ReactElement
-jumboTitle (LandingData hd) b = div jumbo
-                   [ div [className "row"             ]
-                     [ div [ className "col-md-12 content"]
-                           [ div [ className "center" ]
-                               [ div [_id "logo-designed" ]
-                                 [ img [ src "images/logo.png"
-                                       , title hd.logoTitle
-                                       ]
-                                 ]
-                               ]
-                           ]
-                     ]
-                   ]
-                  where
-                    jumbo = case b of
-                                 true  -> [className "jumbotron"]
-                                 false -> []
-
-imageEnter :: LandingData -> Props -> ReactElement
-imageEnter (LandingData hd) action =  div [className "row"]
-                           [ div [className "col-md-offset-5 col-md-6 content"]
-                             [ img [ src "images/Gargantextuel-212x300.jpg"
-                                   , _id "funnyimg"
-                                   , title hd.imageTitle
-                                   , action
-                                   ]
-                             ]
-                           ]
+        H.div { className: "col-md-4 content" }
+        [ H.h3 {} [ H.a { href: b.href, title: b.title}
+                    [ H.i {className: b.icon} []
+                    , H.text ("   " <> b.titleText)
+                    ]
+                  ]
+        , H.p {} [ H.text b.text ]
+        , H.p {} [ docButton b.docButton ]
+        ]
+
+docButton :: Button -> R.Element
+docButton (Button b) =
+  H.a { className: "btn btn-outline-primary btn-sm spacing-class"
+      , href: b.href
+      , target: "blank"
+      , title: b.title
+      } [ H.span { aria: {hidden : true}
+                 , className: "glyphicon glyphicon-hand-right"
+                 } []
+        , H.text b.text
+        ]
+
+jumboTitle :: LandingData -> Boolean -> R.Element
+jumboTitle (LandingData hd) b =
+  H.div {className: jumbo}
+  [ H.div { className: "row" }
+    [ H.div { className: "col-md-12 content" }
+      [ H.div { className: "center" }
+        [ H.div { id: "logo-designed" }
+          [ H.img { src: "images/logo.png"
+                  , title: hd.logoTitle
+                  }
+          ]
+        ]
+      ]
+    ]
+  ]
+  where
+    jumbo = case b of
+      true  -> "jumbotron"
+      false -> ""
+
+imageEnter :: LandingData -> Props -> R.Element
+imageEnter (LandingData hd) action =
+  H.div {className: "row"}
+  [ H.div {className: "col-md-offset-5 col-md-6 content"}
+    [ H.img { src: "images/Gargantextuel-212x300.jpg"
+            , id: "funnyimg"
+            , title: hd.imageTitle
+            , action
+            }
+    ]
+  ]

src/Gargantext/Pages/Layout.purs

@@ -3,14 +3,12 @@ module Gargantext.Pages.Layout where
 import Prelude hiding (div)
 -- import Gargantext.Components.Login as LN
 import Gargantext.Pages.Layout.Actions (Action(..))
-import Gargantext.Pages.Layout.Specs.AddCorpus as AC
 -- import Gargantext.Pages.Corpus.Tabs as TV
 
 import Gargantext.Pages.Corpus.Graph          as GE
 -- import Gargantext.Pages.Corpus.Tabs.Terms.NgramsTable as NG
 
 -- import Gargantext.Pages.Home as L
--- import Gargantext.Pages.Layout.Specs.Search as S
 import Gargantext.Router (Routes(..))
 
 dispatchAction :: forall ignored m.
@@ -25,17 +23,9 @@ dispatchAction dispatcher _ Login = do
   dispatcher $ SetRoute Login
   -- dispatcher $ LoginA TODO
 
-dispatchAction dispatcher _ AddCorpus = do
-  dispatcher $ SetRoute   AddCorpus
-  dispatcher $ AddCorpusA AC.LoadDatabaseDetails
-
 dispatchAction dispatcher _ (Corpus n) = do
   dispatcher $ SetRoute $ Corpus n
 
-dispatchAction dispatcher _ SearchView = do
-  dispatcher $ SetRoute SearchView
-  -- dispatcher $ SearchA TODO
-
 dispatchAction dispatcher _ (UserPage id) = do
   dispatcher $ SetRoute $ UserPage id
 

src/Gargantext/Pages/Layout/Actions.purs

@@ -13,8 +13,6 @@ import Gargantext.Components.Login                  as LN
 import Gargantext.Components.Modals.Modal              (modalShow)
 import Gargantext.Pages.Annuaire             as Annuaire
 import Gargantext.Pages.Corpus.Graph     as GE
-import Gargantext.Pages.Layout.Specs.AddCorpus      as AC
-import Gargantext.Pages.Layout.Specs.Search         as S
 import Gargantext.Pages.Layout.States                  (AppState)
 import Gargantext.Prelude
 import Gargantext.Router                               (Routes)
@@ -24,8 +22,6 @@ import Gargantext.Router                               (Routes)
 data Action
   = LoginA     LN.Action
   | SetRoute   Routes
-  | SearchA    S.Action
-  | AddCorpusA AC.Action
   | GraphExplorerA     GE.Action
   | AnnuaireAction     Annuaire.Action
   | ShowLogin
@@ -61,8 +57,6 @@ performAction ShowAddCorpus  _ _ = void do
 ---------------------------------------------------------
 
 performAction (LoginA          _) _ _ = pure unit
-performAction (AddCorpusA      _) _ _ = pure unit
-performAction (SearchA         _) _ _ = pure unit
 performAction (GraphExplorerA  _) _ _ = pure unit
 performAction (AnnuaireAction  _) _ _ = pure unit
   -- liftEffect $ modalShow "addCorpus"
@@ -76,18 +70,6 @@ _loginAction = prism LoginA \action ->
     LoginA caction -> Right caction
     _-> Left action
 
-_addCorpusAction :: Prism' Action AC.Action
-_addCorpusAction = prism AddCorpusA \action ->
-  case action of
-    AddCorpusA caction -> Right caction
-    _-> Left action
-
-_searchAction :: Prism' Action S.Action
-_searchAction = prism SearchA \action ->
-  case action of
-    SearchA caction -> Right caction
-    _-> Left action
-
 _annuaireAction :: Prism' Action Annuaire.Action
 _annuaireAction = prism AnnuaireAction \action ->
   case action of

src/Gargantext/Pages/Layout/Specs/AddCorpus.purs

-module Gargantext.Pages.Layout.Specs.AddCorpus
-  ( module Gargantext.Pages.Layout.Specs.AddCorpus.States
-  , module Gargantext.Pages.Layout.Specs.AddCorpus.Actions
-  , module Gargantext.Pages.Layout.Specs.AddCorpus.Specs
-  ) where
-
-import Gargantext.Pages.Layout.Specs.AddCorpus.States
-import Gargantext.Pages.Layout.Specs.AddCorpus.Actions
-import Gargantext.Pages.Layout.Specs.AddCorpus.Specs
-

src/Gargantext/Pages/Layout/Specs/AddCorpus/Actions.purs

-module Gargantext.Pages.Layout.Specs.AddCorpus.Actions where
-
-import Control.Monad.Cont.Trans (lift)
-import Data.Argonaut (class EncodeJson, jsonEmptyObject, (:=), (~>))
-import Effect.Aff (Aff)
-import Effect.Class (liftEffect)
-import Routing.Hash (setHash)
-import Thermite (PerformAction, modifyState)
-
-import Gargantext.Prelude
-import Gargantext.Config.REST (post)
-import Gargantext.Components.Modals.Modal (modalHide)
-import Gargantext.Pages.Layout.Specs.AddCorpus.States (Response, State)
-
-data Action
-  = SelectDatabase Boolean
-  | UnselectDatabase Boolean
-  | LoadDatabaseDetails
-  | GO
-
-performAction :: PerformAction State {} Action
-performAction (SelectDatabase selected) _ _ = void do
-  modifyState $ _ { select_database = selected }
-
-performAction (UnselectDatabase unselected) _ _ = void do
-  modifyState $ _ { unselect_database = unselected }
-
-performAction (LoadDatabaseDetails) _ _ = do
-  res <- lift $ getDatabaseDetails $ QueryString { query_query: "string",query_name: ["Pubmed"]}
-  void $ modifyState $ _ {response = res}
-
-performAction GO _ _ = do
-  liftEffect $ setHash "/corpus"
-  liftEffect $ modalHide "addCorpus"
-  pure unit
-
-
-newtype QueryString = QueryString
-  {
-    query_query :: String
-  , query_name :: Array String
-  }
-
-queryString :: QueryString
-queryString = QueryString
-  {
-  query_query: "string",
-  query_name: [
-    "Pubmed"
-  ]
-  }
-
-
-instance encodeJsonQueryString :: EncodeJson QueryString where
-  encodeJson (QueryString obj) =
-    "query_query"       := obj.query_query
-    ~> "query_name"        := obj.query_name
-    ~> jsonEmptyObject
-
-getDatabaseDetails :: QueryString -> Aff (Array Response)
-getDatabaseDetails reqBody = do
-  -- TODO let token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE1MTk5OTg1ODMsInVzZXJfaWQiOjUsImVtYWlsIjoiYWxleGFuZHJlLmRlbGFub2VAaXNjcGlmLmZyIiwidXNlcm5hbWUiOiJkZXZlbG9wZXIifQ.Os-3wuFNSmRIxCZi98oFNBu2zqGc0McO-dgDayozHJg"
-  post "http://localhost:8009/count" reqBody

src/Gargantext/Pages/Layout/Specs/AddCorpus/Specs.purs

-module Gargantext.Pages.Layout.Specs.AddCorpus.Specs where
-
-import Data.Lens (over)
-import Effect.Aff (Aff)
-import React (ReactElement)
-import React.DOM (button, div, h3, h5, li, span, text, ul)
-import React.DOM.Props (_data, _id, _type, aria, className, onClick, role)
-import Thermite (Render, Spec, _render, simpleSpec)
-
-import Gargantext.Prelude
-import Gargantext.Config.REST (post)
-import Gargantext.Pages.Layout.Specs.AddCorpus.Actions (Action(..), performAction)
-import Gargantext.Pages.Layout.Specs.AddCorpus.States (Query, Response(..), State)
-
-modalSpec :: Boolean -> String -> Spec State {} Action -> Spec State {} Action
-modalSpec sm t = over _render \render d p s c ->
-  [ div [ _id "addCorpus", className $ "modal myModal" <> if sm then "" else " fade"
-        , role "dialog"
-        , _data {show : true}
-        ][ div [ className "modal-dialog", role "document"]
-               [ div [ className "modal-content"]
-                     [ div [ className "modal-header"]
-                           [ h5 [ className "modal-title" ] [ text $ t ]
-                           , button [ _type "button"
-                                    , className "close"
-                                    , _data { dismiss : "modal"}
-                                    ] [ span [ aria {hidden : true}] [ text "X"] ]
-                           ]
-
-                      , div [ className "modal-body"] (render d p s c)
-                      ]
-                ]
-         ]
-   ]
-
-
-spec' :: Spec State {} Action
-spec' = modalSpec true "Search Results" layoutAddcorpus
-
-
-layoutModal :: forall e.  { response :: Array Response | e} -> Array ReactElement
-layoutModal state =
-      [button [ _type "button"
-             , _data { "toggle" : "modal"
-             , "target" : ".myModal"
-             }
-             ][text "Launch modal"]
-             , div [ className "modal fade myModal"
-                   , role "dialog"
-                   , _data {show : true}
-                   ][ div [ className "modal-dialog"
-                          , role "document"
-                          ] [ div [ className "modal-content"]
-                                  [ div [ className "modal-header"]
-                                        [ h5 [className "modal-title"]
-                                             [text "CorpusView"      ]
-                                        , button [ _type "button"
-                                                 , className "close"
-                                                 , _data { dismiss : "modal"}
-                                                 ] [ span [ aria {hidden : true}]
-                                                          [ text "X"]
-                                                   ]
-                                        ]
-
-                                  , div [ className "modal-body"]
-                                        [ ul [ className "list-group"] ( map fn1 state.response ) ]
-
-                                  , div [className "modal-footer"]
-                                        [ button [ _type "button"
-                                                 , className "btn btn-secondary"
-                                                 , _data {dismiss : "modal"}
-                                                 ] [ text "GO"]
-                                        ]
-                                   ]
-                            ]
-                     ]
-        ]
-      where
-        fn1 (Response o) =
-          li [className "list-group-item justify-content-between"]
-          [
-          span [] [text  o.name]
-          ,  span [className "badge badge-default badge-pill"] [ text $ show o.count]
-          ]
-
-
-layoutAddcorpus :: Spec State {} Action
-layoutAddcorpus = simpleSpec performAction render
-  where
-    render :: Render State {} Action
-    render dispatch _ state _ =
-      [ div [className "container1"] []
-      , div [className "container1"]
-        [ div [className "jumbotron"]
-          [ div [className "row"]
-           [ div [className "col-md-6"] (layoutModal state)
-           , div [className "col-md-6"]
-             [ h3 [] [text "Corpusview"]
-             , ul [className "list-group"] $ map fn1 state.response
-             , button [onClick \_ -> dispatch GO] [text "GO"]
-             ]
-           ]
-          ]
-        ]
-      ]
-      where
-        fn1 (Response o) =
-          li [className "list-group-item justify-content-between"]
-          [
-          span [] [text  o.name]
-          ,  span [className "badge badge-default badge-pill"] [ text $ show o.count]
-          ]
-
-
-
-countResults :: Query -> Aff Int
-countResults = post "http://localhost:8008/count"

src/Gargantext/Pages/Layout/Specs/AddCorpus/States.purs

-module Gargantext.Pages.Layout.Specs.AddCorpus.States where
-
-import Prelude hiding (div)
-import Data.Argonaut (class DecodeJson, class EncodeJson, decodeJson, encodeJson, jsonEmptyObject, (.?), (:=), (~>))
-
-type State =
-  { select_database :: Boolean
-  , unselect_database :: Boolean  --  dummy state
-  , response :: Array Response
-  }
-
-newtype Response = Response
-  {
-    count :: Int
-  , name :: String
-  }
-
-
-newtype Query = Query
-  {
-    query_query :: String
-  , query_name :: Array String
-  }
-
-
-instance encodeJsonQuery :: EncodeJson Query where
-  encodeJson (Query post)
-     = "query_query" := post.query_query
-    ~> "query_name" := post.query_name
-    ~> jsonEmptyObject
-
-
-
-instance decodeJsonresponse :: DecodeJson Response where
-  decodeJson json = do
-    obj   <- decodeJson json
-    count <- obj .? "count"
-    name  <- obj .? "name"
-    pure $ Response {count,name }
-
-initialState :: State
-initialState =
-  {
-    select_database   : true
-  , unselect_database : true
-  , response : []
-  }

src/Gargantext/Pages/Layout/Specs/Search.purs

-module Gargantext.Pages.Layout.Specs.Search where
-
-import Prelude hiding (div)
-
-import Effect.Class (liftEffect)
-import React.DOM (br', button, div, input, text)
-import React.DOM.Props (_id, _type, className, name, onClick, onInput, placeholder, value)
-import Routing.Hash (setHash)
-import Thermite (PerformAction, Render, Spec, modifyState, simpleSpec)
-import Unsafe.Coerce (unsafeCoerce)
-
-type State =
-  {
-    query :: String
-  }
-
-
-initialState :: State
-initialState =
-  {
-    query : "empty query"
-  }
-
-
-data Action
-  = GO
-  | SetQuery String
-
-
-unsafeEventValue :: forall event. event -> String
-unsafeEventValue e = (unsafeCoerce e).target.value
-
-searchSpec :: Spec State {} Action
-searchSpec = simpleSpec performAction render
-  where
-    performAction :: PerformAction State {} Action
-    performAction (SetQuery q) _ _ = void do
-      modifyState $ _ { query = q }
-
-    performAction GO _ _ = void do
-      liftEffect $ setHash "/addCorpus"
-
-    render :: Render State {} Action
-    render dispatch _ state _ =
-      [ div [className "container1"] []
-      , div [className "container1"]
-       [ div [className "jumbotron" ]
-         [ div [className "row"       ]
-           [ div [className "col-md-10" ]
-             [ br'
-             , br'
-             , div [ className "form-group"][]
-                   {-[ input [ className "form-control"
-                           , _id "id_password"
-                           , name "query"
-                           , placeholder "Query, URL or FILE (works best with Firefox or Chromium browsers)"
-                           , _type "text"
-                           , value state.query
-                           , onInput \e -> dispatch (SetQuery (unsafeEventValue e))
-                           ]
-                    , br'
-                    ]
-                    -}
-              ]
-            , div [ className "col-md-2"]
-                  [ br'
-                  , br'
-                  , button [onClick \_ -> dispatch GO] [text "GO"]
-                  ]
-            , br'
-            ]
-          ]
-        ]
-      ]

src/Gargantext/Pages/Layout/States.purs

@@ -9,15 +9,11 @@ import Gargantext.Components.Login                  as LN
 import Gargantext.Config (EndConfig, endConfigStateful)
 
 import Gargantext.Pages.Corpus.Graph     as GE
-import Gargantext.Pages.Layout.Specs.AddCorpus      as AC
-import Gargantext.Pages.Layout.Specs.Search         as S
 import Gargantext.Router                               (Routes(..))
 
 type AppState =
   { currentRoute       :: Maybe Routes
   , loginState         :: LN.State
-  , addCorpusState     :: AC.State
-  , searchState        :: S.State
   , showLogin          :: Boolean
   , showCorpus         :: Boolean
   , graphExplorerState :: GE.State
@@ -31,8 +27,6 @@ initAppState = do
   pure
     { currentRoute   : Just Home
     , loginState
-    , addCorpusState : AC.initialState
-    , searchState    : S.initialState
     , showLogin      : false
     , showCorpus     : false
     , graphExplorerState : GE.initialState
@@ -46,12 +40,6 @@ initAppState = do
 _loginState :: Lens' AppState LN.State
 _loginState = lens (\s -> s.loginState) (\s ss -> s{loginState = ss})
 
-_addCorpusState :: Lens' AppState AC.State
-_addCorpusState = lens (\s -> s.addCorpusState) (\s ss -> s{addCorpusState = ss})
-
-_searchState :: Lens' AppState S.State
-_searchState = lens (\s -> s.searchState) (\s ss -> s{searchState = ss})
-
 _graphExplorerState :: Lens' AppState GE.State
 _graphExplorerState = lens (\s -> s.graphExplorerState) (\s ss -> s{graphExplorerState = ss})
 

src/Gargantext/Pages/Texts/Tabs/Specs.purs

@@ -89,6 +89,7 @@ docViewSpec tst = R2.elSpec $ R.hooksComponent "DocViewSpecWithCorpus" cpt
         , totalRecords: 4737
         , listId: defaultListId
         , corpusId: Just corpusId
+        , showSearch: true
         }
         params TabMoreLikeFav = {
           nodeId: corpusId
@@ -98,6 +99,7 @@ docViewSpec tst = R2.elSpec $ R.hooksComponent "DocViewSpecWithCorpus" cpt
         , totalRecords: 4737
         , listId: defaultListId
         , corpusId: Just corpusId
+        , showSearch: false
         }
         params TabMoreLikeTrash = {
           nodeId: corpusId
@@ -107,6 +109,7 @@ docViewSpec tst = R2.elSpec $ R.hooksComponent "DocViewSpecWithCorpus" cpt
         , totalRecords: 4737
         , listId: defaultListId
         , corpusId: Just corpusId
+        , showSearch: false
         }
         params TabTrash = {
           nodeId: corpusId
@@ -116,6 +119,7 @@ docViewSpec tst = R2.elSpec $ R.hooksComponent "DocViewSpecWithCorpus" cpt
         , totalRecords: 4737
         , listId: defaultListId
         , corpusId: Nothing
+        , showSearch: true
         }
         -- DUMMY
         params _ = {
@@ -126,4 +130,5 @@ docViewSpec tst = R2.elSpec $ R.hooksComponent "DocViewSpecWithCorpus" cpt
         , totalRecords: 4737
         , listId: defaultListId
         , corpusId: Nothing
+        , showSearch: true
         }

src/Gargantext/Router.purs

@@ -16,10 +16,8 @@ import Web.Storage.Storage (getItem)
 data Routes
   = Home
   | Login
-  | SearchView
   | Folder             Int
     | Corpus           Int
-      | AddCorpus
       | Document       Int Int
       | CorpusDocument Int Int Int
       | PGraphExplorer Int
@@ -33,8 +31,6 @@ data Routes
 routing :: Match Routes
 routing = oneOf
   [ Login            <$   route "login"
-  , SearchView       <$   route "search"
-  , AddCorpus        <$   route "addCorpus"
   , Folder           <$> (route "folder"     *> int)
   , CorpusDocument   <$> (route "corpus" *> int) <*> (lit "list" *> int) <*> (lit "document" *> int)
   , Corpus           <$> (route "corpus"     *> int)
@@ -57,8 +53,6 @@ routing = oneOf
 
 instance showRoutes :: Show Routes where
   show Login            = "Login"
-  show AddCorpus        = "AddCorpus"
-  show SearchView       = "Search"
   show (UserPage i)     = "User"     <> show i
   show (ContactPage i)  = "Contact"  <> show i
   show (CorpusDocument _ _ i)     = "Document" <> show i

src/Gargantext/Utils/Reactix.purs

@@ -89,3 +89,7 @@ select = createDOMElement "select"
 
 effToggler :: forall e. R.State Boolean -> EffectFn1 e Unit
 effToggler (value /\ setValue) = mkEffectFn1 $ \e -> setValue $ const $ not value
+
+
+unsafeEventValue :: forall event. event -> String
+unsafeEventValue e = (unsafeCoerce e).target.value