[FACTO] split of Lens.purs into States and Actions.

src/Gargantext/Pages/Layout/Actions.purs

@@ -8,6 +8,7 @@ import Control.Monad.Eff.Console (CONSOLE, log)
 import DOM (DOM)
 import Data.Array (length)
 import Data.Either (Either(..))
+import Data.Lens (Lens', Prism', lens, prism)
 
 import Gargantext.Pages.Corpus.Doc.Annotation   as D
 import Gargantext.Pages.Corpus.Doc.Body         as CA
@@ -108,3 +109,86 @@ performAction Initialize  _ state = void do
 
 performAction _ _ _ = void do
   modifyState id
+
+----------------------------------------------------------
+
+_landingAction :: Prism' Action L.Action
+_landingAction = prism LandingA \action ->
+  case action of
+    LandingA caction -> Right caction
+    _-> Left action
+
+_loginAction :: Prism' Action LN.Action
+_loginAction = prism LoginA \action ->
+  case action of
+    LoginA caction -> Right caction
+    _-> Left action
+
+_addCorpusAction :: Prism' Action AC.Action
+_addCorpusAction = prism AddCorpusA \action ->
+  case action of
+    AddCorpusA caction -> Right caction
+    _-> Left action
+
+_docViewAction :: Prism' Action DV.Action
+_docViewAction = prism DocViewA \action ->
+  case action of
+    DocViewA caction -> Right caction
+    _-> Left action
+
+_searchAction :: Prism' Action S.Action
+_searchAction = prism SearchA \action ->
+  case action of
+    SearchA caction -> Right caction
+    _-> Left action
+
+_userPageAction :: Prism' Action U.Action
+_userPageAction = prism UserPageA \action ->
+  case action of
+    UserPageA caction -> Right caction
+    _-> Left action
+
+_dashBoardAction :: Prism' Action Dsh.Action
+_dashBoardAction = prism DashboardA \action ->
+  case action of
+    DashboardA caction -> Right caction
+    _ -> Left action
+
+_docAnnotationViewAction :: Prism' Action D.Action
+_docAnnotationViewAction = prism DocAnnotationViewA \action ->
+  case action of
+    DocAnnotationViewA caction -> Right caction
+    _-> Left action
+
+_treeAction :: Prism' Action Tree.Action
+_treeAction = prism TreeViewA \action ->
+  case action of
+    TreeViewA caction -> Right caction
+    _-> Left action
+
+_tabviewAction :: Prism' Action TV.Action
+_tabviewAction = prism TabViewA \action ->
+  case action of
+    TabViewA caction -> Right caction
+    _-> Left action
+
+_corpusAction :: Prism' Action CA.Action
+_corpusAction = prism CorpusAnalysisA \action ->
+  case action of
+    CorpusAnalysisA caction -> Right caction
+    _-> Left action
+
+_graphExplorerAction :: Prism' Action GE.Action
+_graphExplorerAction = prism GraphExplorerA \action ->
+  case action of
+    GraphExplorerA caction -> Right caction
+    _-> Left action
+
+_ngAction :: Prism' Action NG.Action
+_ngAction = prism NgramsA \action ->
+  case action of
+    NgramsA caction -> Right caction
+    _-> Left action
+
+
+

src/Gargantext/Pages/Layout/Layout.purs

-module Gargantext.Layout where
+module Gargantext.Pages.Layout.Layout where
 
 import Prelude hiding (div)
 
@@ -11,7 +11,37 @@ 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.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)
+
+-- | [Naming] metrics indicator: reduce spaces between "," and "_"
+import Gargantext.Pages.Layout.States (         _addCorpusState
+                                      ,            _corpusState
+                                      ,          _dashBoardSate
+                                      , _docAnnotationViewState
+                                      ,           _docViewState
+                                      ,     _graphExplorerState
+                                      ,           _landingState
+                                      ,             _loginState
+                                      ,                _ngState
+                                      ,            _searchState
+                                      ,           _tabviewState
+                                      ,              _treeState
+                                      ,          _userPageState
+                                      )
+-- | [Naming] metrics indicator: reduce spaces between "," and "_"
+import Gargantext.Pages.Layout.Actions (         _addCorpusAction
+                                       ,            _corpusAction
+                                       ,         _dashBoardAction
+                                       , _docAnnotationViewAction
+                                       ,           _docViewAction
+                                       ,     _graphExplorerAction
+                                       ,           _landingAction
+                                       ,             _loginAction
+                                       ,                _ngAction
+                                       ,            _searchAction
+                                       ,           _tabviewAction
+                                       ,              _treeAction
+                                       ,          _userPageAction
+                                       )
 import Gargantext.Pages.Corpus as AC
 import Gargantext.Pages.Corpus.Doc.Annotation as D
 import Gargantext.Pages.Corpus.Doc.Body as CA
@@ -78,12 +108,13 @@ layout0 layout =
     outerLayout =
       cont $ fold
       [ withState \st ->
-         if ((\(LN.State s) -> s.loginC) st.loginState == true) then ls as
-         else outerLayout1
+         if ((\(LN.State s) -> s.loginC) st.loginState == true) 
+            then ls as
+            else outerLayout1
       , rs bs      ]
     ls   = over _render \render d p s c -> [ div [className "col-md-2" ] (render d p s c) ]
     rs   = over _render \render d p s c -> [ div [className "col-md-10"] (render d p s c) ]
-    cont = over _render \render d p s c -> [ div [ className "row"     ] (render d p s c) ]
+    cont = over _render \render d p s c -> [ div [className "row"      ] (render d p s c) ]
 
     as = focus _treeState _treeAction Tree.treeview
 

src/Gargantext/Pages/Layout/Lens.purs

-module Gargantext.Layout.Lens where
-
-
-import Data.Either (Either(..))
-import Data.Lens (Lens', Prism', lens, prism)
-
-import Gargantext.Components.Login          as LN
-import Gargantext.Components.Tree           as Tree
-import Gargantext.Pages.Corpus              as AC
-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.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.Layout.Actions        (Action(..))
-import Gargantext.Pages.Layout.States
-import Gargantext.Pages.Search              as S
-
----- Lens and Prism
-_landingState :: Lens' AppState L.State
-_landingState = lens (\s -> s.landingState) (\s ss -> s{landingState = ss})
-
-_landingAction :: Prism' Action L.Action
-_landingAction = prism LandingA \action ->
-  case action of
-    LandingA caction -> Right caction
-    _-> Left action
-
-_loginState :: Lens' AppState LN.State
-_loginState = lens (\s -> s.loginState) (\s ss -> s{loginState = ss})
-
-_loginAction :: Prism' Action LN.Action
-_loginAction = prism LoginA \action ->
-  case action of
-    LoginA caction -> Right caction
-    _-> Left action
-
-_addCorpusState :: Lens' AppState AC.State
-_addCorpusState = lens (\s -> s.addCorpusState) (\s ss -> s{addCorpusState = ss})
-
-_addCorpusAction :: Prism' Action AC.Action
-_addCorpusAction = prism AddCorpusA \action ->
-  case action of
-    AddCorpusA caction -> Right caction
-    _-> Left action
-
-_docViewState :: Lens' AppState DV.State
-_docViewState = lens (\s -> s.docViewState) (\s ss -> s{docViewState = ss})
-
-_docViewAction :: Prism' Action DV.Action
-_docViewAction = prism DocViewA \action ->
-  case action of
-    DocViewA caction -> Right caction
-    _-> Left action
-
-_searchState :: Lens' AppState S.State
-_searchState = lens (\s -> s.searchState) (\s ss -> s{searchState = ss})
-
-_searchAction :: Prism' Action S.Action
-_searchAction = prism SearchA \action ->
-  case action of
-    SearchA caction -> Right caction
-    _-> Left action
-
-_userPageState :: Lens' AppState U.State
-_userPageState = lens (\s -> s.userPage) (\s ss -> s{userPage = ss})
-
-_userPageAction :: Prism' Action U.Action
-_userPageAction = prism UserPageA \action ->
-  case action of
-    UserPageA caction -> Right caction
-    _-> Left action
-
-_dashBoardAction :: Prism' Action Dsh.Action
-_dashBoardAction = prism DashboardA \action ->
-  case action of
-    DashboardA caction -> Right caction
-    _ -> Left action
-
-_docAnnotationViewState :: Lens' AppState D.State
-_docAnnotationViewState = lens (\s -> s.docAnnotationView) (\s ss -> s{docAnnotationView = ss})
-
-_docAnnotationViewAction :: Prism' Action D.Action
-_docAnnotationViewAction = prism DocAnnotationViewA \action ->
-  case action of
-    DocAnnotationViewA caction -> Right caction
-    _-> Left action
-
-_treeState :: Lens' AppState Tree.State
-_treeState = lens (\s -> s.ntreeView) (\s ss -> s {ntreeView = ss})
-
-_treeAction :: Prism' Action Tree.Action
-_treeAction = prism TreeViewA \action ->
-  case action of
-    TreeViewA caction -> Right caction
-    _-> Left action
-
-_tabviewState :: Lens' AppState TV.State
-_tabviewState = lens (\s -> s.tabview) (\s ss -> s {tabview = ss})
-
-_tabviewAction :: Prism' Action TV.Action
-_tabviewAction = prism TabViewA \action ->
-  case action of
-    TabViewA caction -> Right caction
-    _-> Left action
-
-_corpusState :: Lens' AppState CA.State
-_corpusState = lens (\s -> s.corpusAnalysis) (\s ss -> s {corpusAnalysis = ss})
-
-_corpusAction :: Prism' Action CA.Action
-_corpusAction = prism CorpusAnalysisA \action ->
-  case action of
-    CorpusAnalysisA caction -> Right caction
-    _-> Left action
-
-_dashBoardSate :: Lens' AppState Dsh.State
-_dashBoardSate = lens (\s -> s.dashboard) (\s ss -> s {dashboard = ss})
-
-_graphExplorerState :: Lens' AppState GE.State
-_graphExplorerState = lens (\s -> s.graphExplorer) (\s ss -> s{graphExplorer = ss})
-
-_graphExplorerAction :: Prism' Action GE.Action
-_graphExplorerAction = prism GraphExplorerA \action ->
-  case action of
-    GraphExplorerA caction -> Right caction
-    _-> Left action
-
-_ngState :: Lens' AppState NG.State
-_ngState = lens (\s -> s.ngState) (\s ss -> s{ngState = ss})
-
-_ngAction :: Prism' Action NG.Action
-_ngAction = prism NgramsA \action ->
-  case action of
-    NgramsA caction -> Right caction
-    _-> Left action

src/Gargantext/Pages/Layout/States.purs

@@ -75,4 +75,44 @@ initAppState =
   , dashboard      : Dsh.initialState
   }
 
+---------------------------------------------------------
+_landingState :: Lens' AppState L.State
+_landingState = lens (\s -> s.landingState) (\s ss -> s{landingState = ss})
+
+_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})
+
+_docViewState :: Lens' AppState DV.State
+_docViewState = lens (\s -> s.docViewState) (\s ss -> s{docViewState = ss})
+
+_searchState :: Lens' AppState S.State
+_searchState = lens (\s -> s.searchState) (\s ss -> s{searchState = ss})
+
+_userPageState :: Lens' AppState U.State
+_userPageState = lens (\s -> s.userPage) (\s ss -> s{userPage = ss})
+
+_docAnnotationViewState :: Lens' AppState D.State
+_docAnnotationViewState = lens (\s -> s.docAnnotationView) (\s ss -> s{docAnnotationView = ss})
+
+_treeState :: Lens' AppState Tree.State
+_treeState = lens (\s -> s.ntreeView) (\s ss -> s {ntreeView = ss})
+
+_tabviewState :: Lens' AppState TV.State
+_tabviewState = lens (\s -> s.tabview) (\s ss -> s {tabview = ss})
+
+_corpusState :: Lens' AppState CA.State
+_corpusState = lens (\s -> s.corpusAnalysis) (\s ss -> s {corpusAnalysis = ss})
+
+_dashBoardSate :: Lens' AppState Dsh.State
+_dashBoardSate = lens (\s -> s.dashboard) (\s ss -> s {dashboard = ss})
+
+_graphExplorerState :: Lens' AppState GE.State
+_graphExplorerState = lens (\s -> s.graphExplorer) (\s ss -> s{graphExplorer = ss})
+
+_ngState :: Lens' AppState NG.State
+_ngState = lens (\s -> s.ngState) (\s ss -> s{ngState = ss})
+
 

src/Main.purs

@@ -12,8 +12,8 @@ import DOM.Node.ParentNode (QuerySelector(..))
 import DOM.Node.ParentNode (querySelector) as DOM
 import Data.Maybe (fromJust)
 
-import Gargantext.Layout (layoutSpec)
-import Gargantext.Layout.Dispatcher (dispatchAction)
+import Gargantext.Pages.Layout.Layout (layoutSpec)
+import Gargantext.Layout.Dispatcher   (dispatchAction)
 import Gargantext.Pages.Layout.States (initAppState)
 
 import Gargantext.Router (routeHandler, routing)