refactoring navigation into Layout

src/Gargantext/Pages/Layout/Action.purs

+module Gargantext.Layout.Action where
+
+import Prelude hiding (div)
+
+import Control.Monad.Cont.Trans (lift)
+import Control.Monad.Eff.Class (liftEff)
+import Control.Monad.Eff.Console (CONSOLE, log)
+import DOM (DOM)
+import Data.Array (length)
+import Data.Either (Either(..))
+import Gargantext.Components.Modals.Modal (modalShow)
+import Gargantext.Components.Tree as Tree
+import Gargantext.Layout.Types (Action(..), AppState)
+import Gargantext.Pages.Corpus.Doc.Document as DV
+import Network.HTTP.Affjax (AJAX)
+import Thermite (PerformAction, modifyState)
+
+performAction :: forall eff props. PerformAction ( dom :: DOM
+                                                 , ajax :: AJAX
+                                                 , console :: CONSOLE
+                                                 | eff
+                                                 ) AppState props Action
+performAction (SetRoute route)  _ _ = void do
+  modifyState $ _ {currentRoute = pure route}
+performAction (Search s)  _ _ = void do
+  modifyState $ _ {search = s}
+
+performAction (ShowLogin)  _ _ = void do
+  liftEff $ modalShow "loginModal"
+  modifyState $ _ {showLogin = true}
+
+performAction (ShowAddcorpus)  _ _ = void do
+  liftEff $ modalShow "addCorpus"
+  modifyState $ _ {showCorpus = true}
+
+performAction Go  _ _ = void do
+  liftEff $ modalShow "addCorpus"
+  modifyState $ _ {showCorpus = true}
+ -- _ <- lift $ setHash "/addCorpus"
+  --modifyState id
+
+performAction Initialize  _ state = void do
+  _ <- liftEff $ log "loading Initial nodes"
+  case state.initialized of
+    false -> do
+
+      lnodes <- lift $ Tree.loadDefaultNode
+
+      case lnodes of
+        Left err -> do
+          modifyState id
+        Right d -> do
+          page <- lift $ DV.loadPage
+          case page of
+            Left err -> do
+              modifyState id
+            Right docs -> do
+              modifyState $ _ { initialized = true
+                              , ntreeView = if length d > 0
+                                            then Tree.exampleTree
+                                           --then fnTransform $ unsafePartial $ fromJust $ head d
+                                           else Tree.initialState
+
+                              , docViewState = docs
+                              }
+    _ -> do
+      modifyState id
+
+performAction _ _ _ = void do
+  modifyState id

src/Gargantext/Pages/Layout/Dispatcher.purs

+module Gargantext.Layout.Dispatcher where
+
+import Prelude hiding (div)
+import Gargantext.Components.Login as LN
+import Gargantext.Layout.Types (Action(..))
+import Gargantext.Pages.Corpus as AC
+import Gargantext.Pages.Corpus.Doc.Annotation as D
+import Gargantext.Pages.Corpus.Doc.Document as DV
+import Gargantext.Pages.Corpus.Doc.Facets as TV
+import Gargantext.Pages.Corpus.Doc.Facets.Graph as GE
+import Gargantext.Pages.Corpus.Doc.Facets.Terms.NgramsTable as NG
+import Gargantext.Pages.Corpus.User.Users as U
+import Gargantext.Pages.Home as L
+import Gargantext.Pages.Search as S
+import Gargantext.Router (Routes(..))
+
+dispatchAction :: forall t115 t445 t447.
+                  Bind t445 => Applicative t445  =>
+                  (Action -> t445 t447) -> t115 -> Routes -> t445 Unit
+
+dispatchAction dispatcher _ Home = do
+  _ <- dispatcher Initialize
+  _ <- dispatcher $ SetRoute Home
+  _ <- dispatcher $ LandingA L.NoOp
+  pure unit
+
+dispatchAction dispatcher _ Login = do
+  _ <- dispatcher Initialize
+  _ <- dispatcher $ SetRoute Login
+  _ <- dispatcher $ LoginA LN.NoOp
+  pure unit
+
+dispatchAction dispatcher _ AddCorpus = do
+  _ <- dispatcher $ SetRoute AddCorpus
+  _ <- dispatcher $ AddCorpusA AC.LoadDatabaseDetails
+  pure unit
+
+dispatchAction dispatcher _ DocView = do
+  _ <- dispatcher $ SetRoute $ DocView
+  _ <- dispatcher $ DocViewA $ DV.LoadData
+  pure unit
+
+dispatchAction dispatcher _ SearchView = do
+  _ <- dispatcher $ SetRoute $ SearchView
+  _ <- dispatcher $ SearchA  $ S.NoOp
+  pure unit
+
+dispatchAction dispatcher _ (UserPage id) = do
+  _ <- dispatcher $ SetRoute  $ UserPage id
+  _ <- dispatcher $ UserPageA $ U.NoOp
+  _ <- dispatcher $ UserPageA $ U.FetchUser id
+  pure unit
+
+dispatchAction dispatcher _ (DocAnnotation i) = do
+  _ <- dispatcher $ SetRoute  $ DocAnnotation i
+  _ <- dispatcher $ DocAnnotationViewA $ D.NoOp
+  pure unit
+
+dispatchAction dispatcher _ Tabview = do
+  _ <- dispatcher $ SetRoute  $ Tabview
+  _ <- dispatcher $ TabViewA $ TV.NoOp
+  pure unit
+
+dispatchAction dispatcher _ CorpusAnalysis = do
+  _ <- dispatcher $ SetRoute  $ CorpusAnalysis
+  --_ <- dispatcher $ CorpusAnalysisA $ CA.NoOp
+  pure unit
+
+dispatchAction dispatcher _ PGraphExplorer = do
+  _ <- dispatcher $ SetRoute  $ PGraphExplorer
+  _ <- dispatcher $ GraphExplorerA $ GE.LoadGraph "imtNew.json"
+  pure unit
+
+dispatchAction dispatcher _ NGramsTable = do
+  _ <- dispatcher $ SetRoute  $ NGramsTable
+  _ <- dispatcher $ NgramsA $ NG.NoOp
+  pure unit
+
+dispatchAction dispatcher _ Dashboard = do
+  _ <- dispatcher $ SetRoute $ Dashboard
+  pure unit

src/Gargantext/Layout.purs → src/Gargantext/Pages/Layout/Layout.purs

@@ -10,7 +10,9 @@ import Data.Maybe (Maybe(Nothing, Just))
 import Gargantext.Components.Data.Lang (Lang(..))
 import Gargantext.Components.Login as LN
 import Gargantext.Components.Tree as Tree
-import Gargantext.Navigation (Action(..), AppState, E, _addCorpusAction, _addCorpusState, _corpusAction, _corpusState, _dashBoardAction, _dashBoardSate, _docAnnotationViewAction, _docAnnotationViewState, _docViewAction, _docViewState, _graphExplorerAction, _graphExplorerState, _landingAction, _landingState, _loginAction, _loginState, _ngAction, _ngState, _searchAction, _searchState, _tabviewAction, _tabviewState, _treeAction, _treeState, _userPageAction, _userPageState, performAction)
+import Gargantext.Layout.Action (performAction)
+import Gargantext.Layout.Lens (_addCorpusAction, _addCorpusState, _corpusAction, _corpusState, _dashBoardAction, _dashBoardSate, _docAnnotationViewAction, _docAnnotationViewState, _docViewAction, _docViewState, _graphExplorerAction, _graphExplorerState, _landingAction, _landingState, _loginAction, _loginState, _ngAction, _ngState, _searchAction, _searchState, _tabviewAction, _tabviewState, _treeAction, _treeState, _userPageAction, _userPageState)
+import Gargantext.Layout.Types (Action(..), AppState, E)
 import Gargantext.Pages.Corpus as AC
 import Gargantext.Pages.Corpus.Doc.Annotation as D
 import Gargantext.Pages.Corpus.Doc.Body as CA
@@ -316,69 +318,3 @@ layoutSpec =
     container :: Spec (E eff) AppState props Action -> Spec (E eff) AppState props Action
     container = over _render \render d p s c ->
       (render d p s c)
-
-dispatchAction :: forall t115 t445 t447.
-                  Bind t445 => Applicative t445  =>
-                  (Action -> t445 t447) -> t115 -> Routes -> t445 Unit
-
-dispatchAction dispatcher _ Home = do
-  _ <- dispatcher Initialize
-  _ <- dispatcher $ SetRoute Home
-  _ <- dispatcher $ LandingA L.NoOp
-  pure unit
-
-dispatchAction dispatcher _ Login = do
-  _ <- dispatcher Initialize
-  _ <- dispatcher $ SetRoute Login
-  _ <- dispatcher $ LoginA LN.NoOp
-  pure unit
-
-dispatchAction dispatcher _ AddCorpus = do
-  _ <- dispatcher $ SetRoute AddCorpus
-  _ <- dispatcher $ AddCorpusA AC.LoadDatabaseDetails
-  pure unit
-
-dispatchAction dispatcher _ DocView = do
-  _ <- dispatcher $ SetRoute $ DocView
-  _ <- dispatcher $ DocViewA $ DV.LoadData
-  pure unit
-
-dispatchAction dispatcher _ SearchView = do
-  _ <- dispatcher $ SetRoute $ SearchView
-  _ <- dispatcher $ SearchA  $ S.NoOp
-  pure unit
-
-dispatchAction dispatcher _ (UserPage id) = do
-  _ <- dispatcher $ SetRoute  $ UserPage id
-  _ <- dispatcher $ UserPageA $ U.NoOp
-  _ <- dispatcher $ UserPageA $ U.FetchUser id
-  pure unit
-
-dispatchAction dispatcher _ (DocAnnotation i) = do
-  _ <- dispatcher $ SetRoute  $ DocAnnotation i
-  _ <- dispatcher $ DocAnnotationViewA $ D.NoOp
-  pure unit
-
-dispatchAction dispatcher _ Tabview = do
-  _ <- dispatcher $ SetRoute  $ Tabview
-  _ <- dispatcher $ TabViewA $ TV.NoOp
-  pure unit
-
-dispatchAction dispatcher _ CorpusAnalysis = do
-  _ <- dispatcher $ SetRoute  $ CorpusAnalysis
-  --_ <- dispatcher $ CorpusAnalysisA $ CA.NoOp
-  pure unit
-
-dispatchAction dispatcher _ PGraphExplorer = do
-  _ <- dispatcher $ SetRoute  $ PGraphExplorer
-  _ <- dispatcher $ GraphExplorerA $ GE.LoadGraph "imtNew.json"
-  pure unit
-
-dispatchAction dispatcher _ NGramsTable = do
-  _ <- dispatcher $ SetRoute  $ NGramsTable
-  _ <- dispatcher $ NgramsA $ NG.NoOp
-  pure unit
-
-dispatchAction dispatcher _ Dashboard = do
-  _ <- dispatcher $ SetRoute $ Dashboard
-  pure unit

src/Gargantext/Navigation.purs → src/Gargantext/Pages/Layout/Lens.purs

-module Gargantext.Navigation where
+module Gargantext.Layout.Lens where
 
-import Prelude hiding (div)
+---- Lens and Prism
+import Gargantext.Layout.Types
 
-import Control.Monad.Cont.Trans (lift)
-import Control.Monad.Eff.Class (liftEff)
-import Control.Monad.Eff.Console (CONSOLE, log)
-import Gargantext.Pages.Corpus.Doc.Body as CA
-import DOM (DOM)
-import Data.Array (length)
 import Data.Either (Either(..))
 import Data.Lens (Lens', Prism', lens, prism)
-import Data.Maybe (Maybe(Just))
-import Gargantext.Pages.Corpus.Doc.Annotation as D
-import Gargantext.Pages.Corpus.Doc.Document as DV
+import Gargantext.Pages.Home as L
 import Gargantext.Components.Login as LN
-import Gargantext.Components.Modals.Modal (modalShow)
+import Gargantext.Pages.Corpus as AC
 import Gargantext.Components.Tree as Tree
+import Gargantext.Pages.Corpus.Doc.Annotation as D
+import Gargantext.Pages.Corpus.Doc.Body as CA
+import Gargantext.Pages.Corpus.Doc.Document as DV
+import Gargantext.Pages.Corpus.Doc.Facets as TV
 import Gargantext.Pages.Corpus.Doc.Facets.Dashboard as Dsh
-import Gargantext.Pages.Corpus as AC
-import Gargantext.Router (Routes(..))
-import Gargantext.Pages.Corpus.User.Users as U
 import Gargantext.Pages.Corpus.Doc.Facets.Graph as GE
-import Gargantext.Pages.Home as L
-import Network.HTTP.Affjax (AJAX)
 import Gargantext.Pages.Corpus.Doc.Facets.Terms.NgramsTable as NG
+import Gargantext.Pages.Corpus.User.Users as U
 import Gargantext.Pages.Search as S
-import Gargantext.Pages.Corpus.Doc.Facets as TV
-import Thermite (PerformAction, modifyState)
-
-type E e = (dom :: DOM, ajax :: AJAX, console :: CONSOLE | e)
-
-type AppState =
-  { currentRoute   :: Maybe Routes
-  , landingState   :: L.State
-  , loginState     :: LN.State
-  , addCorpusState :: AC.State
-  , docViewState   :: DV.State
-  , searchState    :: S.State
-  , userPage       :: U.State
-  , docAnnotationView   :: D.State
-  , ntreeView   :: Tree.State
-  , tabview :: TV.State
-  , search :: String
-  , corpusAnalysis :: CA.State
-  , showLogin :: Boolean
-  , showCorpus :: Boolean
-  , graphExplorer :: GE.State
-  , initialized :: Boolean
-  , ngState :: NG.State
-  , dashboard :: Dsh.State
-  }
-
-initAppState :: AppState
-initAppState =
-  { currentRoute   : Just Home
-  , landingState   : L.initialState
-  , loginState     : LN.initialState
-  , addCorpusState : AC.initialState
-  , docViewState   : DV.tdata
-  , searchState    : S.initialState
-  , userPage       : U.initialState
-  , docAnnotationView   : D.initialState
-  , ntreeView : Tree.exampleTree
-  , tabview : TV.initialState
-  , search : ""
-  , corpusAnalysis : CA.initialState
-  , showLogin : false
-  , showCorpus : false
-  , graphExplorer : GE.initialState
-  , initialized : false
-  , ngState : NG.initialState
-  , dashboard : Dsh.initialState
-  }
-
-data Action
-  = Initialize
-  | LandingA   L.Action
-  | LoginA     LN.Action
-  | SetRoute   Routes
-  | AddCorpusA AC.Action
-  | DocViewA   DV.Action
-  | SearchA    S.Action
-  | UserPageA  U.Action
-  | DocAnnotationViewA  D.Action
-  | TreeViewA  Tree.Action
-  | TabViewA TV.Action
-  | GraphExplorerA GE.Action
-  | DashboardA Dsh.Action
-  | Search String
-  | Go
-  | CorpusAnalysisA CA.Action
-  | ShowLogin
-  | ShowAddcorpus
-  | NgramsA  NG.Action
-
-
-performAction :: forall eff props. PerformAction ( dom :: DOM
-                                                 , ajax :: AJAX
-                                                 , console :: CONSOLE
-                                                 | eff
-                                                 ) AppState props Action
-performAction (SetRoute route)  _ _ = void do
-  modifyState $ _ {currentRoute = pure route}
-performAction (Search s)  _ _ = void do
-  modifyState $ _ {search = s}
-
-performAction (ShowLogin)  _ _ = void do
-  liftEff $ modalShow "loginModal"
-  modifyState $ _ {showLogin = true}
-
-performAction (ShowAddcorpus)  _ _ = void do
-  liftEff $ modalShow "addCorpus"
-  modifyState $ _ {showCorpus = true}
-
-performAction Go  _ _ = void do
-  liftEff $ modalShow "addCorpus"
-  modifyState $ _ {showCorpus = true}
- -- _ <- lift $ setHash "/addCorpus"
-  --modifyState id
-
-performAction Initialize  _ state = void do
-  _ <- liftEff $ log "loading Initial nodes"
-  case state.initialized of
-    false -> do
-
-      lnodes <- lift $ Tree.loadDefaultNode
-
-      case lnodes of
-        Left err -> do
-          modifyState id
-        Right d -> do
-          page <- lift $ DV.loadPage
-          case page of
-            Left err -> do
-              modifyState id
-            Right docs -> do
-              modifyState $ _ { initialized = true
-                              , ntreeView = if length d > 0
-                                            then Tree.exampleTree
-                                           --then fnTransform $ unsafePartial $ fromJust $ head d
-                                           else Tree.initialState
-
-                              , docViewState = docs
-                              }
-    _ -> do
-      modifyState id
-
-performAction _ _ _ = void do
-  modifyState id
 
 ---- Lens and Prism
 _landingState :: Lens' AppState L.State

src/Gargantext/Pages/Layout/Types.purs

+module Gargantext.Layout.Types where
+
+import Prelude hiding (div)
+
+import Control.Monad.Cont.Trans (lift)
+import Control.Monad.Eff.Class (liftEff)
+import Control.Monad.Eff.Console (CONSOLE, log)
+import Gargantext.Pages.Corpus.Doc.Body as CA
+import DOM (DOM)
+import Data.Array (length)
+import Data.Either (Either(..))
+import Data.Lens (Lens', Prism', lens, prism)
+import Data.Maybe (Maybe(Just))
+import Gargantext.Pages.Corpus.Doc.Annotation as D
+import Gargantext.Pages.Corpus.Doc.Document as DV
+import Gargantext.Components.Login as LN
+import Gargantext.Components.Modals.Modal (modalShow)
+import Gargantext.Components.Tree as Tree
+import Gargantext.Pages.Corpus.Doc.Facets.Dashboard as Dsh
+import Gargantext.Pages.Corpus as AC
+import Gargantext.Router (Routes(..))
+import Gargantext.Pages.Corpus.User.Users as U
+import Gargantext.Pages.Corpus.Doc.Facets.Graph as GE
+import Gargantext.Pages.Home as L
+import Network.HTTP.Affjax (AJAX)
+import Gargantext.Pages.Corpus.Doc.Facets.Terms.NgramsTable as NG
+import Gargantext.Pages.Search as S
+import Gargantext.Pages.Corpus.Doc.Facets as TV
+import Thermite (PerformAction, modifyState)
+
+type E e = (dom :: DOM, ajax :: AJAX, console :: CONSOLE | e)
+
+type AppState =
+  { currentRoute   :: Maybe Routes
+  , landingState   :: L.State
+  , loginState     :: LN.State
+  , addCorpusState :: AC.State
+  , docViewState   :: DV.State
+  , searchState    :: S.State
+  , userPage       :: U.State
+  , docAnnotationView   :: D.State
+  , ntreeView   :: Tree.State
+  , tabview :: TV.State
+  , search :: String
+  , corpusAnalysis :: CA.State
+  , showLogin :: Boolean
+  , showCorpus :: Boolean
+  , graphExplorer :: GE.State
+  , initialized :: Boolean
+  , ngState :: NG.State
+  , dashboard :: Dsh.State
+  }
+
+initAppState :: AppState
+initAppState =
+  { currentRoute   : Just Home
+  , landingState   : L.initialState
+  , loginState     : LN.initialState
+  , addCorpusState : AC.initialState
+  , docViewState   : DV.tdata
+  , searchState    : S.initialState
+  , userPage       : U.initialState
+  , docAnnotationView   : D.initialState
+  , ntreeView : Tree.exampleTree
+  , tabview : TV.initialState
+  , search : ""
+  , corpusAnalysis : CA.initialState
+  , showLogin : false
+  , showCorpus : false
+  , graphExplorer : GE.initialState
+  , initialized : false
+  , ngState : NG.initialState
+  , dashboard : Dsh.initialState
+  }
+
+data Action
+  = Initialize
+  | LandingA   L.Action
+  | LoginA     LN.Action
+  | SetRoute   Routes
+  | AddCorpusA AC.Action
+  | DocViewA   DV.Action
+  | SearchA    S.Action
+  | UserPageA  U.Action
+  | DocAnnotationViewA  D.Action
+  | TreeViewA  Tree.Action
+  | TabViewA TV.Action
+  | GraphExplorerA GE.Action
+  | DashboardA Dsh.Action
+  | Search String
+  | Go
+  | CorpusAnalysisA CA.Action
+  | ShowLogin
+  | ShowAddcorpus
+  | NgramsA  NG.Action

src/Main.purs

@@ -11,8 +11,9 @@ import DOM.HTML.Window (document) as DOM
 import DOM.Node.ParentNode (QuerySelector(..))
 import DOM.Node.ParentNode (querySelector) as DOM
 import Data.Maybe (fromJust)
-import Gargantext.Layout (dispatchAction, layoutSpec)
-import Gargantext.Navigation (initAppState)
+import Gargantext.Layout (layoutSpec)
+import Gargantext.Layout.Dispatcher (dispatchAction)
+import Gargantext.Layout.Types (initAppState)
 import Gargantext.Router (routeHandler, routing)
 import Network.HTTP.Affjax (AJAX)
 import Partial.Unsafe (unsafePartial)